src/server/daemon/event_bsd.c

Sun, 02 Jun 2024 16:02:36 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 02 Jun 2024 16:02:36 +0200
changeset 532
d8212d4f24f2
parent 531
9b15b1f72bef
child 537
ad44e72fbf50
permissions
-rw-r--r--

stop cgi read-event processing if an error occured

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"
433
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
33 #include "../util/io.h"
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
34
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 #include "event_bsd.h"
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36
531
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
37 #include "httprequest.h"
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
38
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
39 EVHandler* evhandler_create(EventHandlerConfig *cfg) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
40 EVHandler *ev = malloc(sizeof(EVHandler));
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
41 ev->current = 0;
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
42 ev->instances = calloc(cfg->nthreads, sizeof(void*));
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
43 ev->numins = cfg->nthreads;
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
44
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
45 for(int i=0;i<cfg->nthreads;i++) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
46 EventHandler *handler = malloc(sizeof(EventHandler));
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
47 ev->instances[i] = handler;
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
48
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
49 handler->kqueue = kqueue();
443
ef3c8a0e1fee improve daemon startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 433
diff changeset
50 if(handler->kqueue < 0) {
ef3c8a0e1fee improve daemon startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 433
diff changeset
51 log_ereport(LOG_FAILURE, "evhandler_create: kqueue: %s", strerror(errno));
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
52 return NULL;
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
53 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
54
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
55 SYS_THREAD t = systhread_start(
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
56 0,
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
57 0,
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
58 (thrstartfunc)ev_handle_events,
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
59 handler);
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
60 systhread_detach(t);
69
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
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
63 return ev;
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
64 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
65
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
66
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
67 void ev_handle_events(EventHandler *ev) {
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
68 struct timespec timeout;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
69 timeout.tv_nsec = 0;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
70 timeout.tv_sec = 600;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
71
529
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
72 struct kevent events[EV_MAX_EVENTS];
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
73 struct kevent changes[EV_MAX_EVENTS*2];
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
74 Event *finished[EV_MAX_EVENTS];
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
75 int numchanges = 0;
529
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
76 int numfinished;
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
77
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
78 for(;;) {
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
79 // wait for events
529
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
80 int nev = kevent(ev->kqueue, changes, numchanges, events, EV_MAX_EVENTS, &timeout);
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
81 if(nev == -1) {
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
82 log_ereport(LOG_FAILURE, "kevent: %s", strerror(errno));
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
83 continue;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
84 }
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
85
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
86 numchanges = 0;
529
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
87 int numfinished = 0;
531
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
88 ev->numret = 0;
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
89 for(int i=0;i<nev;i++) {
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
90 Event *event = (Event*)events[i].udata;
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
91 if(!event) {
266
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
92 if(events[i].flags == 0) {
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
93 log_ereport(LOG_WARN, "Unknown kevent (ident=%d)", (int)events[i].ident);
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
94 }
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
95 // don't warn in case flags is not 0, because socket EOF events
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
96 // are triggered even if we apply EV_DELETE in the changelist
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
97 // the only way to stop this is to apply the changelist without
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
98 // getting new events, but that comes with a performance penalty
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
99
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
100 continue;
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
101 }
342
ebd1e67c3d5f fix invalid memory access in event_bsd.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 266
diff changeset
102 int event_events = event->events;
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
103
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
104 if(event->fn) {
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
105 int saved_ev = event->events;
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
106 if(!event->fn(ev, event)) {
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
107 // 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
108
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
109 if(event->finish) {
529
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
110 finished[numfinished++] = event;
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
111 }
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
112
342
ebd1e67c3d5f fix invalid memory access in event_bsd.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 266
diff changeset
113 event_events = 0;
ebd1e67c3d5f fix invalid memory access in event_bsd.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 266
diff changeset
114 } else {
ebd1e67c3d5f fix invalid memory access in event_bsd.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 266
diff changeset
115 event_events = event->events;
263
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
116 }
533f9097d712 fix kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 260
diff changeset
117
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
118 // if events have changed, we need to add/remove filters
342
ebd1e67c3d5f fix invalid memory access in event_bsd.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 266
diff changeset
119 if(saved_ev != event_events) {
ebd1e67c3d5f fix invalid memory access in event_bsd.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 266
diff changeset
120 int e = event_events;
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
121 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
122 if((e & EVENT_POLLIN) != (saved_ev & EVENT_POLLIN)) {
266
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
123 if((e & EVENT_POLLIN) == EVENT_POLLIN) {
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
124 // add
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
125 EV_SET(&changes[numchanges++], e_fd, EVFILT_READ, EV_ADD, 0, 0, event);
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
126 } else {
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
127 // delete
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
128 EV_SET(&changes[numchanges++], e_fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
129 }
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
130 }
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
131 if((e & EVENT_POLLOUT) != (saved_ev & EVENT_POLLOUT)) {
266
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
132 if((e & EVENT_POLLOUT) == EVENT_POLLOUT) {
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
133 // add
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
134 EV_SET(&changes[numchanges++], e_fd, EVFILT_WRITE, EV_ADD, 0, 0, event);
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
135 } else {
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
136 // delete
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
137 EV_SET(&changes[numchanges++], e_fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
783467806e2d fix kqueue event deletion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 265
diff changeset
138 }
265
59f99038a576 fix wrong kqueue usage: split ws events into multiple kevent filters
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 264
diff changeset
139 }
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
140 }
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
141 }
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
142 }
529
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
143 // call event finish handlers
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
144 for(int i=0;i<numfinished;i++) {
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
145 Event *event = finished[i];
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
146 finished[i]->finish(ev, event);
cd606400f0ba change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 503
diff changeset
147 }
531
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
148 // execute return calls
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
149 for(int i=0;i<ev->numret;i++) {
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
150 EVReturn ret = ev->fnreturn[i];
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
151 nsapi_saf_return(ret.sn, ret.rq, ret.ret);
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
152 }
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
153 }
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
154 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
155
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
156 int ev_pollin(EventHandler *h, int fd, Event *event) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
157 event->events = EVENT_POLLIN;
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
158 struct kevent kev;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
159 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
160 return kevent(h->kqueue, &kev, 1, NULL, 0, NULL);
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
161 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
162
170
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
163 int ev_pollout(EventHandler *h, int fd, Event *event) {
711d00eeed25 refactors kqueue event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
164 event->events = EVENT_POLLOUT;
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
165 struct kevent kev;
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
166 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
167 return kevent(h->kqueue, &kev, 1, NULL, 0, NULL);
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
168 }
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
169
260
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
170 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
171 struct kevent kev;
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
172 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
173 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
174 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
175 int r2 = kevent(h->kqueue, &kev, 1, NULL, 0, NULL);
503
aeaf7db26fac fix webdav mkcol error status codes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 443
diff changeset
176 // in case r1 or r2 was successful, we return 0 (no error)
264
81f202caea5b add ev_remove_poll kqueue implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 263
diff changeset
177 return r1 != -1 || r2 != -1 ? 0 : 1;
260
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
178 }
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
179
187
4384bfbb7e26 adds platform independent aio functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 170
diff changeset
180 int event_send(EventHandler *h, Event *event) {
109
8a0a7754f123 experimental BSD support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
181 return 0;
69
4a10bc0ee80d compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
182 }
260
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
183
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
184 // TODO: remove this fake aio
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
185 int ev_aioread(int fd, aiocb_s *cb) {
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
186 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
187 cb->result = result;
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
188 if(result < 0) {
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
189 cb->result_errno = errno;
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
190 }
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
191 return event_send(cb->evhandler, cb->event);
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
192 }
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
193
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
194 int ev_aiowrite(int fd, aiocb_s *cb) {
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
195 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
196 cb->result = result;
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
197 if(result < 0) {
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
198 cb->result_errno = errno;
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
199 }
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
200 return event_send(cb->evhandler, cb->event);
4779a6fb4fbe fix freebsd build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 187
diff changeset
201 }
433
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
202
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
203
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
204 int event_pollin(EventHandler *ev, SYS_NETFD fd, Event *event) {
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
205 return ((IOStream*)fd)->poll(fd, ev, IO_POLL_IN, event);
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
206 }
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
207
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
208 int event_pollout(EventHandler *ev, SYS_NETFD fd, Event *event) {
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
209 return ((IOStream*)fd)->poll(fd, ev, IO_POLL_OUT, event);
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
210 }
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
211
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
212 int event_removepoll(EventHandler *ev, SYS_NETFD fd) {
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
213 return ((IOStream*)fd)->poll(fd, ev, IO_POLL_NONE, NULL);
39fe86ae4db0 use non-blocking IO for pipes and socket in send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 342
diff changeset
214 }
531
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
215
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
216
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
217 void ev_saf_return(EventHandler *h, Session *sn, Request *rq, int ret) {
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
218 h->fnreturn[h->numret++] = (EVReturn){ sn, rq, ret };
9b15b1f72bef change nsapi_function_return behavior: move saf return to the end of the event cycle
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 529
diff changeset
219 }

mercurial