Wed, 05 Jun 2024 19:50:44 +0200
add extra nullptr check in the event loop to handle the case when the finish ptr is set to NULL after it was already scheduled
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
44
3da1f7b6847f
added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
43
diff
changeset
|
4 | * Copyright 2013 Olaf Wintermann. All rights reserved. |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
e8619defde14
added event handler
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 |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include <stdio.h> |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include <stdlib.h> |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <atomic.h> |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | |
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
33 | #include "../util/io.h" |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
34 | |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include "event_solaris.h" |
e8619defde14
added event handler
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 | |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
39 | EVHandler* evhandler_create(EventHandlerConfig *cfg) { |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
40 | EVHandler *ev = malloc(sizeof(EVHandler)); |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
41 | ev->current = 0; |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
42 | ev->instances = calloc(cfg->nthreads, sizeof(void*)); |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
43 | ev->numins = cfg->nthreads; |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
45 | for(int i=0;i<cfg->nthreads;i++) { |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
46 | EventHandler *handler = malloc(sizeof(EventHandler)); |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
47 | ev->instances[i] = handler; |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
48 | |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
49 | handler->port = port_create(); |
443
ef3c8a0e1fee
improve daemon startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
50 | if(handler->port < 0) { |
ef3c8a0e1fee
improve daemon startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
51 | log_ereport(LOG_FAILURE, "evhandler_create: port_create: %s", strerror(errno)); |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | return NULL; |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
55 | SYS_THREAD t = systhread_start( |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
56 | 0, |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
57 | 0, |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
58 | (thrstartfunc)ev_handle_events, |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
59 | handler); |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
60 | systhread_detach(t); |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | return ev; |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | |
529
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
66 | |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
67 | void ev_handle_events(EventHandler *ev) { |
529
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
68 | port_event_t events[EV_MAX_EVENTS]; |
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
69 | Event *finished[EV_MAX_EVENTS]; |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | struct timespec timeout; |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | timeout.tv_nsec = 0; |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | timeout.tv_sec = 600; |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | for(;;) { |
79
f48cea237ec3
fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
75 | // wait for events |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | uint_t nev = 1; |
529
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
77 | int ret = port_getn(ev->port, events, EV_MAX_EVENTS, &nev, &timeout); |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | if(ret == -1) { |
79
f48cea237ec3
fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
79 | // TODO: check for error |
35
4417619a9bbd
using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
30
diff
changeset
|
80 | perror("port_getn"); |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | continue; |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | |
529
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
84 | 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
|
85 | ev->numret = 0; |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | for(int i=0;i<nev;i++) { |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
87 | Event *event = events[i].portev_user; |
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
88 | if(events[i].portev_source == PORT_SOURCE_AIO) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
89 | aiocb_t *aiocb = (aiocb_t*)events[i].portev_object; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
90 | if(event) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
91 | aiocb_s *aio = (aiocb_s*)event->object; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
92 | aio->result = aiocb->aio_resultp.aio_return; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
93 | aio->result_errno = aiocb->aio_resultp.aio_errno; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
94 | if(event->fn) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
95 | if(!event->fn(ev, event) && event->finish) { |
529
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
96 | finished[numfinished++] = event; |
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
97 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
98 | } |
43
8ac56edb4e94
fixed solaris build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
35
diff
changeset
|
99 | } |
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
100 | free(aiocb); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
101 | } else { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
102 | if(event->fn) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
103 | if(event->fn(ev, event)) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
104 | /* |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
105 | * on solaris we have to reassociate the fd after |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
106 | * each event |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
107 | * we do this if the event function returns 1 |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
108 | */ |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
109 | if(port_associate( |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
110 | ev->port, |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
111 | PORT_SOURCE_FD, |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
112 | (uintptr_t)event->object, |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
113 | ev_convert2sys_events(event->events), |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
114 | event)) |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
115 | { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
116 | perror("port_associate"); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
117 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
118 | } else if(event->finish) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
119 | event->finish(ev, event); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
120 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
121 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
122 | } |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
123 | } |
529
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
124 | // call event finish handlers |
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
125 | 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:
443
diff
changeset
|
126 | Event *event = finished[i]; |
537
ad44e72fbf50
add extra nullptr check in the event loop to handle the case when the finish ptr is set to NULL after it was already scheduled
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
127 | // check again if the finish callback is set |
ad44e72fbf50
add extra nullptr check in the event loop to handle the case when the finish ptr is set to NULL after it was already scheduled
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
128 | if(finished[i]->finish) { |
ad44e72fbf50
add extra nullptr check in the event loop to handle the case when the finish ptr is set to NULL after it was already scheduled
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
129 | finished[i]->finish(ev, event); |
ad44e72fbf50
add extra nullptr check in the event loop to handle the case when the finish ptr is set to NULL after it was already scheduled
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
130 | } |
529
cd606400f0ba
change execution order of event handler and event finish functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
443
diff
changeset
|
131 | } |
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
|
132 | // 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
|
133 | 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
|
134 | 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
|
135 | 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
|
136 | } |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
137 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
138 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
139 | |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
140 | int ev_convert2sys_events(int events) { |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
141 | int e = 0; |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
142 | if((events & EVENT_POLLIN) == EVENT_POLLIN) { |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
143 | e |= POLLIN; |
30
27c7511c0e34
new proppatch, mkcol and delete method
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
144 | } |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
145 | if((events & EVENT_POLLOUT) == EVENT_POLLOUT) { |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
146 | e |= POLLOUT; |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
147 | } |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
148 | return e; |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
149 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
150 | |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
151 | |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
152 | int ev_pollin(EventHandler *h, int fd, Event *event) { |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
153 | event->object = (intptr_t)fd; |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
154 | event->events = EVENT_POLLIN; |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
155 | return port_associate( |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
156 | h->port, |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
157 | PORT_SOURCE_FD, |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | (uintptr_t)fd, |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | POLLIN, |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | event); |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
162 | |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
163 | int ev_pollout(EventHandler *h, int fd, Event *event) { |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
164 | event->object = (intptr_t)fd; |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
165 | event->events = EVENT_POLLOUT; |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
166 | return port_associate( |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
167 | h->port, |
29
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
168 | PORT_SOURCE_FD, |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
169 | (uintptr_t)fd, |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
170 | POLLOUT, |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
171 | event); |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
172 | } |
e8619defde14
added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
173 | |
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
174 | int ev_remove_poll(EventHandler *h, int fd) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
175 | return port_dissociate(h->port, PORT_SOURCE_FD, (uintptr_t)fd); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
176 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
177 | |
187
4384bfbb7e26
adds platform independent aio functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
172
diff
changeset
|
178 | int event_send(EventHandler *h, Event *event) { |
159
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
179 | event->object = 0; |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
180 | event->events = 0; |
9ba9f8befa80
makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
153
diff
changeset
|
181 | return port_send(h->port, 0, event); |
43
8ac56edb4e94
fixed solaris build
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
35
diff
changeset
|
182 | } |
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
183 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
184 | static int ev_aio(int fd, aiocb_s *cb, WSBool read) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
185 | EventHandler *ev = cb->evhandler; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
186 | if(!ev) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
187 | return -1; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
188 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
189 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
190 | aiocb_t *aiocb = malloc(sizeof(aiocb_t)); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
191 | if(!aiocb) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
192 | return -1; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
193 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
194 | ZERO(aiocb, sizeof(aiocb_t)); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
195 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
196 | aiocb->aio_fildes = fd; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
197 | aiocb->aio_buf = cb->buf; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
198 | aiocb->aio_nbytes = cb->nbytes; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
199 | aiocb->aio_offset = cb->offset; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
200 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
201 | port_notify_t *portnotify = malloc(sizeof(port_notify_t)); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
202 | if(!portnotify) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
203 | free(aiocb); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
204 | return -1; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
205 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
206 | portnotify->portnfy_port = ev->port; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
207 | portnotify->portnfy_user = cb->event; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
208 | aiocb->aio_sigevent.sigev_notify = SIGEV_PORT; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
209 | aiocb->aio_sigevent.sigev_value.sival_ptr = portnotify; |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
210 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
211 | if(read) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
212 | return aio_read(aiocb); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
213 | } else { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
214 | return aio_write(aiocb); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
215 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
216 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
217 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
218 | int ev_aioread(int fd, aiocb_s *cb) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
219 | return ev_aio(fd, cb, TRUE); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
220 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
221 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
222 | int ev_aiowrite(int fd, aiocb_s *cb) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
223 | return ev_aio(fd, cb, FALSE); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
224 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
225 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
226 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
227 | int event_pollin(EventHandler *ev, SYS_NETFD fd, Event *event) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
228 | return ((IOStream*)fd)->poll(fd, ev, IO_POLL_IN, event); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
229 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
230 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
231 | int event_pollout(EventHandler *ev, SYS_NETFD fd, Event *event) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
232 | return ((IOStream*)fd)->poll(fd, ev, IO_POLL_OUT, event); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
233 | } |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
234 | |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
235 | int event_removepoll(EventHandler *ev, SYS_NETFD fd) { |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
236 | return ((IOStream*)fd)->poll(fd, ev, IO_POLL_NONE, NULL); |
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
159
diff
changeset
|
237 | } |
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
|
238 | |
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
|
239 | 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
|
240 | 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
|
241 | } |