Sat, 21 Jan 2017 16:40:59 +0100
improves sessionhandler logging
69 | 1 | /* |
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
3 | * | |
4 | * Copyright 2013 Olaf Wintermann. All rights reserved. | |
5 | * | |
6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions are met: | |
8 | * | |
9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | |
11 | * | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | |
15 | * | |
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | |
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | |
28 | ||
29 | #include <stdio.h> | |
30 | #include <stdlib.h> | |
31 | ||
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
32 | #include "../util/atomic.h" |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
33 | |
69 | 34 | #include "event_bsd.h" |
35 | ||
36 | event_handler_t* evhandler_create(int numthreads) { | |
37 | event_handler_t *ev = malloc(sizeof(event_handler_t)); | |
38 | if(ev == NULL) { | |
39 | return NULL; | |
40 | } | |
41 | ||
42 | ev->ports = calloc(numthreads, sizeof(int)); | |
43 | if(ev->ports == NULL) { | |
44 | free(ev); | |
45 | return NULL; | |
46 | } | |
47 | ev->nports = numthreads; | |
48 | ev->lp = 0; | |
49 | ||
50 | /* create ports event threads */ | |
51 | for(int i=0;i<numthreads;i++) { | |
52 | /* create port */ | |
53 | //ev->ports[i] = port_create(); | |
54 | ev->ports[i] = kqueue(); | |
55 | if(ev->ports[i] == 0) { | |
56 | free(ev->ports); | |
57 | free(ev); | |
58 | return NULL; | |
59 | } | |
60 | ||
61 | /* | |
62 | * start a new handler thread | |
63 | * the thread needs the event port and a pointer to the event handler | |
64 | */ | |
65 | ev_thr_conf_t *conf = malloc(sizeof(ev_thr_conf_t)); | |
66 | if(conf == NULL) { | |
67 | free(ev->ports); | |
68 | free(ev); | |
69 | return NULL; | |
70 | } | |
71 | conf->handler = ev; | |
72 | conf->port = ev->ports[i]; | |
73 | ||
79
f48cea237ec3
fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
74 | systhread_start(0, 0, (thrstartfunc)ev_handle_events, conf); |
69 | 75 | /* TODO: error handling */ |
76 | } | |
77 | ||
78 | return ev; | |
79 | } | |
80 | ||
81 | void ev_handle_events(ev_thr_conf_t *conf) { | |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
82 | event_handler_t *ev = conf->handler; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
83 | int kq = conf->port; |
69 | 84 | |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
85 | free(conf); |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
86 | |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
87 | struct timespec timeout; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
88 | timeout.tv_nsec = 0; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
89 | timeout.tv_sec = 600; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
90 | |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
91 | struct kevent events[16]; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
92 | |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
93 | for(;;) { |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
94 | // wait for events |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
95 | int nev; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
96 | nev = kevent(kq, NULL, 0, events, 16, &timeout); |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
97 | if(nev == -1) { |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
98 | // TODO: check for error |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
99 | perror("kevent"); |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
100 | continue; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
101 | } |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
102 | |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
103 | for(int i=0;i<nev;i++) { |
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
109
diff
changeset
|
104 | event_t *event = (event_t*)events[i].udata; |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
105 | if(event->fn) { |
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
111
diff
changeset
|
106 | int ep = event->poll; |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
107 | if(event->fn(ev, event)) { |
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
111
diff
changeset
|
108 | // TODO: reassociate? |
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
111
diff
changeset
|
109 | // TODO: check ep and event->poll |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
110 | } else if(event->finish) { |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
111 | event->finish(ev, event); |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
112 | } |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
113 | } |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
114 | } |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
115 | } |
69 | 116 | } |
117 | ||
118 | /* returns a event handler port */ | |
119 | int ev_get_port(event_handler_t *h) { | |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
120 | int nps = h->nports; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
121 | if(nps == 1) { |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
122 | return h->ports[0]; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
123 | } |
69 | 124 | |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
125 | int cp = h->lp % nps; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
126 | ws_atomic_inc32(&h->lp); |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
127 | |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
128 | return h->ports[cp]; |
69 | 129 | } |
130 | ||
131 | int ev_pollin(event_handler_t *h, int fd, event_t *event) { | |
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
111
diff
changeset
|
132 | event->poll = EVENT_POLLIN; |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
133 | struct kevent kev; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
134 | EV_SET(&kev, fd, EVFILT_READ, EV_ADD, 0, 0, event); |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
135 | return kevent(ev_get_port(h), &kev, 1, NULL, 0, NULL); |
69 | 136 | } |
137 | ||
138 | int ev_pollout(event_handler_t *h, int fd, event_t *event) { | |
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
111
diff
changeset
|
139 | event->poll = EVENT_POLLOUT; |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
140 | struct kevent kev; |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
141 | EV_SET(&kev, fd, EVFILT_WRITE, EV_ADD, 0, 0, event); |
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
142 | return kevent(ev_get_port(h), &kev, 1, NULL, 0, NULL); |
69 | 143 | } |
144 | ||
145 | int evt_send(event_handler_t *h, event_t *event) { | |
109
8a0a7754f123
experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
79
diff
changeset
|
146 | return 0; |
69 | 147 | } |