src/server/daemon/event_bsd.c

Thu, 03 Dec 2020 12:38:46 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Thu, 03 Dec 2020 12:38:46 +0100
branch
webdav
changeset 265
59f99038a576
parent 264
81f202caea5b
child 266
783467806e2d
permissions
-rw-r--r--

fix wrong kqueue usage: split ws events into multiple kevent filters

69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
4 * Copyright 2013 Olaf Wintermann. All rights reserved.
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
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
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
34 #include "event_bsd.h"
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
36 EVHandler* evhandler_create(EventHandlerConfig *cfg) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
37 EVHandler *ev = malloc(sizeof(EVHandler));
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
38 ev->current = 0;
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
39 ev->instances = calloc(cfg->nthreads, sizeof(void*));
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
40 ev->numins = cfg->nthreads;
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
42 for(int i=0;i<cfg->nthreads;i++) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
43 EventHandler *handler = malloc(sizeof(EventHandler));
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
44 ev->instances[i] = handler;
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
45
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
46 handler->kqueue = kqueue();
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
47 if(handler->kqueue == 0) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
48 // TODO: error
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
49 return NULL;
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
50 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
51
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
52 SYS_THREAD t = systhread_start(
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
53 0,
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
54 0,
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
55 (thrstartfunc)ev_handle_events,
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
56 handler);
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
57 systhread_detach(t);
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
58 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
59
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
60 return ev;
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
61 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
62
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
63
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
64 void ev_handle_events(EventHandler *ev) {
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
65 struct timespec timeout;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
66 timeout.tv_nsec = 0;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
67 timeout.tv_sec = 600;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
68
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
69 struct kevent events[64];
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
70 struct kevent changes[128];
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
71 int numchanges = 0;
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
72
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
73 for(;;) {
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
74 // wait for events
264
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
75 int nev = kevent(ev->kqueue, changes, numchanges, events, 64, &timeout);
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
76 if(nev == -1) {
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
77 // TODO: check for error
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
78 log_ereport(LOG_FAILURE, "kevent: %s", strerror(errno));
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
79 continue;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
80 }
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
81
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
82 numchanges = 0;
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
83 for(int i=0;i<nev;i++) {
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
84 Event *event = (Event*)events[i].udata;
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
85 if(!event) {
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
86 log_ereport(LOG_WARN, "Unknown kevent (ident=%d)", (int)events[i].ident);
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
87 continue;
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
88 }
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
89
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
90 if(event->fn) {
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
91 int saved_ev = event->events;
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
92 if(!event->fn(ev, event)) {
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
93 // ret 0 => remove event
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
94
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
95 if(event->finish) {
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
96 event->finish(ev, event);
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
97 }
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
98
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
99 event->events = 0;
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
100 }
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
101
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
102 // if events have changed, we need to add/remove filters
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
103 if(saved_ev != event->events) {
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
104 int e = event->events;
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
105 int e_fd = events[i].ident;
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
106 if((e & EVENT_POLLIN) != (saved_ev & EVENT_POLLIN)) {
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
107 int f = (e & EVENT_POLLIN) == EVENT_POLLIN ? EV_ADD : EV_DELETE;
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
108 EV_SET(&changes[numchanges++], e_fd, EVFILT_READ, f, 0, 0, event);
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
109 }
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
110 if((e & EVENT_POLLOUT) != (saved_ev & EVENT_POLLOUT)) {
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
111 int f = (e & EVENT_POLLOUT) == EVENT_POLLOUT ? EV_ADD : EV_DELETE;
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
112 EV_SET(&changes[numchanges++], e_fd, EVFILT_WRITE, f, 0, 0, event);
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
113 }
109
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 }
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
116 }
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
117 }
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
118 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
119
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
120 int ev_convert2sys_events(int events) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
121 int e = 0;
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
122 if((events & EVENT_POLLIN) == EVENT_POLLIN) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
123 e |= EVFILT_READ;
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
124 }
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
125 if((events & EVENT_POLLOUT) == EVENT_POLLOUT) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
126 e |= EVFILT_WRITE;
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
127 }
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
128 return e;
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
129 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
130
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
131 int ev_pollin(EventHandler *h, int fd, Event *event) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
132 event->events = 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);
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
135 return kevent(h->kqueue, &kev, 1, NULL, 0, NULL);
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
136 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
137
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
138 int ev_pollout(EventHandler *h, int fd, Event *event) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
139 event->events = 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);
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
142 return kevent(h->kqueue, &kev, 1, NULL, 0, NULL);
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
143 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
144
260
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
145 int ev_remove_poll(EventHandler *h, int fd) {
264
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
146 struct kevent kev;
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
147 EV_SET(&kev, fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
148 int r1 = kevent(h->kqueue, &kev, 1, NULL, 0, NULL);
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
149 EV_SET(&kev, fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
150 int r2 = kevent(h->kqueue, &kev, 1, NULL, 0, NULL);
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
151 // in caase r1 or r2 was successful, we return 0 (no error)
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
152 return r1 != -1 || r2 != -1 ? 0 : 1;
260
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
153 }
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
154
187
4384bfbb7e26 adds platform independent aio functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 170
diff changeset
155 int event_send(EventHandler *h, Event *event) {
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
156 return 0;
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
157 }
260
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
158
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
159 // TODO: remove this fake aio
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
160 int ev_aioread(int fd, aiocb_s *cb) {
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
161 ssize_t result = pread(fd, cb->buf, cb->nbytes, cb->offset);
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
162 cb->result = result;
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
163 if(result < 0) {
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
164 cb->result_errno = errno;
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
165 }
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
166 return event_send(cb->evhandler, cb->event);
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
167 }
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
168
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
169 int ev_aiowrite(int fd, aiocb_s *cb) {
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
170 ssize_t result = pwrite(fd, cb->buf, cb->nbytes, cb->offset);
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
171 cb->result = result;
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
172 if(result < 0) {
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
173 cb->result_errno = errno;
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
174 }
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
175 return event_send(cb->evhandler, cb->event);
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
176 }

mercurial