ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/event.c
(Generate patch)

Comparing libev/event.c (file contents):
Revision 1.24 by root, Fri Nov 9 17:07:59 2007 UTC vs.
Revision 1.37 by root, Wed Oct 29 17:50:57 2008 UTC

1/* 1/*
2 * libevent compatibility layer 2 * libevent compatibility layer
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#include <stddef.h> 40#include <stddef.h>
33#include <stdlib.h> 41#include <stdlib.h>
34#include <assert.h> 42#include <assert.h>
… …
55struct event_base 63struct event_base
56{ 64{
57 int dummy; 65 int dummy;
58}; 66};
59 67
60static struct event_base *x_cur; 68static struct event_base *ev_x_cur;
61 69
62static void 70static void
63tv_set (struct timeval *tv, ev_tstamp at) 71ev_tv_set (struct timeval *tv, ev_tstamp at)
64{ 72{
65 tv->tv_sec = (long)at; 73 tv->tv_sec = (long)at;
66 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6); 74 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
67} 75}
68 76
69static ev_tstamp 77static ev_tstamp
70tv_get (struct timeval *tv) 78ev_tv_get (struct timeval *tv)
71{ 79{
72 if (tv) 80 if (tv)
73 return tv->tv_sec + tv->tv_usec * 1e-6; 81 return tv->tv_sec + tv->tv_usec * 1e-6;
74 else 82 else
75 return -1.; 83 return -1.;
… …
88} 96}
89 97
90void *event_init (void) 98void *event_init (void)
91{ 99{
92#if EV_MULTIPLICITY 100#if EV_MULTIPLICITY
93 if (x_cur) 101 if (ev_x_cur)
94 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 102 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
95 else 103 else
96 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 104 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
97#else 105#else
98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 106 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur));
99 107
100 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); 108 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
101#endif 109#endif
102 110
103 return x_cur; 111 return ev_x_cur;
104} 112}
105 113
106void event_base_free (struct event_base *base) 114void event_base_free (struct event_base *base)
107{ 115{
108 dLOOPbase; 116 dLOOPbase;
109 117
110#if EV_MULTIPLICITY 118#if EV_MULTIPLICITY
111 if (ev_default_loop (EVMETHOD_AUTO) != loop) 119 if (ev_default_loop (EVFLAG_AUTO) != loop)
112 ev_loop_destroy (loop); 120 ev_loop_destroy (loop);
113#endif 121#endif
114} 122}
115 123
116int event_dispatch (void) 124int event_dispatch (void)
117{ 125{
118 return event_base_dispatch (x_cur); 126 return event_base_dispatch (ev_x_cur);
119} 127}
120 128
121#ifdef EV_STANDALONE 129#ifdef EV_STANDALONE
122void event_set_log_callback (event_log_cb cb) 130void event_set_log_callback (event_log_cb cb)
123{ 131{
… …
125} 133}
126#endif 134#endif
127 135
128int event_loop (int flags) 136int event_loop (int flags)
129{ 137{
130 return event_base_loop (x_cur, flags); 138 return event_base_loop (ev_x_cur, flags);
131} 139}
132 140
133int event_loopexit (struct timeval *tv) 141int event_loopexit (struct timeval *tv)
134{ 142{
135 return event_base_loopexit (x_cur, tv); 143 return event_base_loopexit (ev_x_cur, tv);
136} 144}
137 145
138static void 146static void
139x_cb (struct event *ev, int revents) 147ev_x_cb (struct event *ev, int revents)
140{ 148{
141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 149 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
142 150
143 ev->ev_res = revents; 151 ev->ev_res = revents;
144 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 152 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
145} 153}
146 154
147static void 155static void
148x_cb_sig (EV_P_ struct ev_signal *w, int revents) 156ev_x_cb_sig (EV_P_ struct ev_signal *w, int revents)
149{ 157{
150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig)); 158 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
151 159
152 if (revents & EV_ERROR) 160 if (revents & EV_ERROR)
153 event_del (ev); 161 event_del (ev);
154 162
155 x_cb (ev, revents); 163 ev_x_cb (ev, revents);
156} 164}
157 165
158static void 166static void
159x_cb_io (EV_P_ struct ev_io *w, int revents) 167ev_x_cb_io (EV_P_ struct ev_io *w, int revents)
160{ 168{
161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 169 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
162 170
163 if (revents & EV_ERROR) 171 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
164 event_del (ev); 172 event_del (ev);
165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 ev_io_stop (EV_A_ w);
167 173
168 x_cb (ev, revents); 174 ev_x_cb (ev, revents);
169} 175}
170 176
171static void 177static void
172x_cb_to (EV_P_ struct ev_timer *w, int revents) 178ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
173{ 179{
174 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to)); 180 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
175 181
176 event_del (ev); 182 event_del (ev);
177 183
178 x_cb (ev, revents); 184 ev_x_cb (ev, revents);
179} 185}
180 186
181void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 187void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
182{ 188{
183 if (events & EV_SIGNAL) 189 if (events & EV_SIGNAL)
184 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 190 ev_init (&ev->iosig.sig, ev_x_cb_sig);
185 else 191 else
186 ev_watcher_init (&ev->iosig.io, x_cb_io); 192 ev_init (&ev->iosig.io, ev_x_cb_io);
187 193
188 ev_watcher_init (&ev->to, x_cb_to); 194 ev_init (&ev->to, ev_x_cb_to);
189 195
190 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 196 ev->ev_base = ev_x_cur; /* not threadsafe, but it's how libevent works */
191 ev->ev_fd = fd; 197 ev->ev_fd = fd;
192 ev->ev_events = events; 198 ev->ev_events = events;
193 ev->ev_pri = 0; 199 ev->ev_pri = 0;
194 ev->ev_callback = cb; 200 ev->ev_callback = cb;
195 ev->ev_arg = arg; 201 ev->ev_arg = arg;
196 ev->ev_res = 0; 202 ev->ev_res = 0;
203 ev->ev_flags = EVLIST_INIT;
197} 204}
198 205
199int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 206int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
200{ 207{
201 return event_base_once (x_cur, fd, events, cb, arg, tv); 208 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
202} 209}
203 210
204int event_add (struct event *ev, struct timeval *tv) 211int event_add (struct event *ev, struct timeval *tv)
205{ 212{
206 dLOOPev; 213 dLOOPev;
207 214
208 /* disable all watchers */
209 event_del (ev);
210
211 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
212 { 216 {
217 if (!ev_is_active (&ev->iosig.sig))
218 {
213 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 219 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
214 ev_signal_start (EV_A_ &ev->iosig.sig); 220 ev_signal_start (EV_A_ &ev->iosig.sig);
221
222 ev->ev_flags |= EVLIST_SIGNAL;
223 }
215 } 224 }
216 else if (ev->ev_events & (EV_READ | EV_WRITE)) 225 else if (ev->ev_events & (EV_READ | EV_WRITE))
217 { 226 {
227 if (!ev_is_active (&ev->iosig.io))
228 {
218 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 229 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
219 ev_io_start (EV_A_ &ev->iosig.io); 230 ev_io_start (EV_A_ &ev->iosig.io);
231
232 ev->ev_flags |= EVLIST_INSERTED;
233 }
220 } 234 }
221 235
222 if (tv) 236 if (tv)
223 { 237 {
224 ev_timer_set (&ev->to, tv_get (tv), 0.); 238 ev->to.repeat = ev_tv_get (tv);
239 ev_timer_again (EV_A_ &ev->to);
240 ev->ev_flags |= EVLIST_TIMEOUT;
241 }
242 else
243 {
225 ev_timer_start (EV_A_ &ev->to); 244 ev_timer_stop (EV_A_ &ev->to);
245 ev->ev_flags &= ~EVLIST_TIMEOUT;
226 } 246 }
247
248 ev->ev_flags |= EVLIST_ACTIVE;
227 249
228 return 0; 250 return 0;
229} 251}
230 252
231int event_del (struct event *ev) 253int event_del (struct event *ev)
232{ 254{
233 dLOOPev; 255 dLOOPev;
234 256
235 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
236 {
237 /* sig */
238 if (ev_is_active (&ev->iosig.sig))
239 ev_signal_stop (EV_A_ &ev->iosig.sig); 258 ev_signal_stop (EV_A_ &ev->iosig.sig);
240 }
241 else if (ev->ev_events & (EV_READ | EV_WRITE)) 259 else if (ev->ev_events & (EV_READ | EV_WRITE))
242 {
243 /* io */
244 if (ev_is_active (&ev->iosig.io))
245 ev_io_stop (EV_A_ &ev->iosig.io); 260 ev_io_stop (EV_A_ &ev->iosig.io);
246 }
247 261
248 if (ev_is_active (&ev->to)) 262 if (ev_is_active (&ev->to))
249 ev_timer_stop (EV_A_ &ev->to); 263 ev_timer_stop (EV_A_ &ev->to);
250 264
265 ev->ev_flags = EVLIST_INIT;
266
251 return 0; 267 return 0;
252} 268}
253 269
254void event_active (struct event *ev, int res, short ncalls) 270void event_active (struct event *ev, int res, short ncalls)
255{ 271{
… …
267 283
268int event_pending (struct event *ev, short events, struct timeval *tv) 284int event_pending (struct event *ev, short events, struct timeval *tv)
269{ 285{
270 short revents = 0; 286 short revents = 0;
271 dLOOPev; 287 dLOOPev;
272
273 288
274 if (ev->ev_events & EV_SIGNAL) 289 if (ev->ev_events & EV_SIGNAL)
275 { 290 {
276 /* sig */ 291 /* sig */
277 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) 292 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
… …
287 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) 302 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
288 { 303 {
289 revents |= EV_TIMEOUT; 304 revents |= EV_TIMEOUT;
290 305
291 if (tv) 306 if (tv)
292 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 307 ev_tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
293 } 308 }
294 309
295 return events & revents; 310 return events & revents;
296} 311}
297 312
298int event_priority_init (int npri) 313int event_priority_init (int npri)
299{ 314{
300 return event_base_priority_init (x_cur, npri); 315 return event_base_priority_init (ev_x_cur, npri);
301} 316}
302 317
303int event_priority_set (struct event *ev, int pri) 318int event_priority_set (struct event *ev, int pri)
304{ 319{
305 ev->ev_pri = pri; 320 ev->ev_pri = pri;
… …
327{ 342{
328 return event_base_loop (base, 0); 343 return event_base_loop (base, 0);
329} 344}
330 345
331static void 346static void
332x_loopexit_cb (int revents, void *base) 347ev_x_loopexit_cb (int revents, void *base)
333{ 348{
334 dLOOPbase; 349 dLOOPbase;
335 350
336 ev_unloop (EV_A_ EVUNLOOP_ONCE); 351 ev_unloop (EV_A_ EVUNLOOP_ONE);
337} 352}
338 353
339int event_base_loopexit (struct event_base *base, struct timeval *tv) 354int event_base_loopexit (struct event_base *base, struct timeval *tv)
340{ 355{
341 ev_tstamp after = tv_get (tv); 356 ev_tstamp after = ev_tv_get (tv);
342 dLOOPbase; 357 dLOOPbase;
343 358
344 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 359 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., ev_x_loopexit_cb, (void *)base);
345 360
346 return -1; 361 return 0;
347} 362}
348 363
349struct x_once 364struct ev_x_once
350{ 365{
351 int fd; 366 int fd;
352 void (*cb)(int, short, void *); 367 void (*cb)(int, short, void *);
353 void *arg; 368 void *arg;
354}; 369};
355 370
356static void 371static void
357x_once_cb (int revents, void *arg) 372ev_x_once_cb (int revents, void *arg)
358{ 373{
359 struct x_once *once = (struct x_once *)arg; 374 struct ev_x_once *once = (struct ev_x_once *)arg;
360 375
361 once->cb (once->fd, revents, once->arg); 376 once->cb (once->fd, (short)revents, once->arg);
362 free (once); 377 free (once);
363} 378}
364 379
365int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 380int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
366{ 381{
367 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once)); 382 struct ev_x_once *once = (struct ev_x_once *)malloc (sizeof (struct ev_x_once));
368 dLOOPbase; 383 dLOOPbase;
369 384
370 if (!once) 385 if (!once)
371 return -1; 386 return -1;
372 387
373 once->fd = fd; 388 once->fd = fd;
374 once->cb = cb; 389 once->cb = cb;
375 once->arg = arg; 390 once->arg = arg;
376 391
377 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 392 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), ev_tv_get (tv), ev_x_once_cb, (void *)once);
378 393
379 return 0; 394 return 0;
380} 395}
381 396
382int event_base_priority_init (struct event_base *base, int npri) 397int event_base_priority_init (struct event_base *base, int npri)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines