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

Comparing libev/event.c (file contents):
Revision 1.15 by root, Sun Nov 4 20:38:07 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 <sys/time.h>
35#include <assert.h> 42#include <assert.h>
36 43
37#include "ev.h" 44#ifndef WIN32
45# include <sys/time.h>
46#endif
47
48#ifdef EV_EVENT_H
49# include EV_EVENT_H
50#else
38#include "event.h" 51# include "event.h"
52#endif
39 53
40#if EV_MULTIPLICITY 54#if EV_MULTIPLICITY
41# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 55# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
42# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 56# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
43#else 57#else
… …
49struct event_base 63struct event_base
50{ 64{
51 int dummy; 65 int dummy;
52}; 66};
53 67
54static struct event_base *x_cur; 68static struct event_base *ev_x_cur;
55 69
56static void 70static void
57tv_set (struct timeval *tv, ev_tstamp at) 71ev_tv_set (struct timeval *tv, ev_tstamp at)
58{ 72{
59 tv->tv_sec = (long)at; 73 tv->tv_sec = (long)at;
60 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6); 74 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
61} 75}
62 76
63static ev_tstamp 77static ev_tstamp
64tv_get (struct timeval *tv) 78ev_tv_get (struct timeval *tv)
65{ 79{
66 if (tv) 80 if (tv)
67 return tv->tv_sec + tv->tv_usec * 1e-6; 81 return tv->tv_sec + tv->tv_usec * 1e-6;
68 else 82 else
69 return -1.; 83 return -1.;
… …
82} 96}
83 97
84void *event_init (void) 98void *event_init (void)
85{ 99{
86#if EV_MULTIPLICITY 100#if EV_MULTIPLICITY
87 if (x_cur) 101 if (ev_x_cur)
88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 102 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
89 else 103 else
90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 104 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
91#else 105#else
92 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));
93 107
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 108 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
95#endif 109#endif
96 110
97 return x_cur; 111 return ev_x_cur;
98} 112}
99 113
100void event_base_free (struct event_base *base) 114void event_base_free (struct event_base *base)
101{ 115{
102 dLOOPbase; 116 dLOOPbase;
103 117
104#if EV_MULTIPLICITY 118#if EV_MULTIPLICITY
105 if (ev_default_loop (EVMETHOD_AUTO) != loop) 119 if (ev_default_loop (EVFLAG_AUTO) != loop)
106 ev_loop_destroy (loop); 120 ev_loop_destroy (loop);
107#endif 121#endif
108} 122}
109 123
110int event_dispatch (void) 124int event_dispatch (void)
111{ 125{
112 return event_base_dispatch (x_cur); 126 return event_base_dispatch (ev_x_cur);
113} 127}
114 128
115#ifdef EV_STANDALONE 129#ifdef EV_STANDALONE
116void event_set_log_callback (event_log_cb cb) 130void event_set_log_callback (event_log_cb cb)
117{ 131{
… …
119} 133}
120#endif 134#endif
121 135
122int event_loop (int flags) 136int event_loop (int flags)
123{ 137{
124 return event_base_loop (x_cur, flags); 138 return event_base_loop (ev_x_cur, flags);
125} 139}
126 140
127int event_loopexit (struct timeval *tv) 141int event_loopexit (struct timeval *tv)
128{ 142{
129 return event_base_loopexit (x_cur, tv); 143 return event_base_loopexit (ev_x_cur, tv);
130} 144}
131 145
132static void 146static void
133x_cb (struct event *ev, int revents) 147ev_x_cb (struct event *ev, int revents)
134{ 148{
135 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 149 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
136 150
137 ev->ev_res = revents; 151 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 152 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
139} 153}
140 154
141static void 155static void
142x_cb_sig (EV_P_ struct ev_signal *w, int revents) 156ev_x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 157{
144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 158 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
145}
146 159
160 if (revents & EV_ERROR)
161 event_del (ev);
162
163 ev_x_cb (ev, revents);
164}
165
147static void 166static void
148x_cb_io (EV_P_ struct ev_io *w, int revents) 167ev_x_cb_io (EV_P_ struct ev_io *w, int revents)
149{ 168{
150 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));
151 170
152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 171 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
153 ev_io_stop (EV_A_ w); 172 event_del (ev);
154 173
155 x_cb (ev, revents); 174 ev_x_cb (ev, revents);
156} 175}
157 176
158static void 177static void
159x_cb_to (EV_P_ struct ev_timer *w, int revents) 178ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
160{ 179{
161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to)); 180 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
162 181
163 event_del (ev); 182 event_del (ev);
164 183
165 x_cb (ev, revents); 184 ev_x_cb (ev, revents);
166} 185}
167 186
168void 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)
169{ 188{
170 printf ("event set %p\n", ev);//D
171 if (events & EV_SIGNAL) 189 if (events & EV_SIGNAL)
172 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 190 ev_init (&ev->iosig.sig, ev_x_cb_sig);
173 else 191 else
174 ev_watcher_init (&ev->iosig.io, x_cb_io); 192 ev_init (&ev->iosig.io, ev_x_cb_io);
175 193
176 ev_watcher_init (&ev->to, x_cb_to); 194 ev_init (&ev->to, ev_x_cb_to);
177 195
178 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 */
179 ev->ev_fd = fd; 197 ev->ev_fd = fd;
180 ev->ev_events = events; 198 ev->ev_events = events;
181 ev->ev_pri = 0; 199 ev->ev_pri = 0;
182 ev->ev_callback = cb; 200 ev->ev_callback = cb;
183 ev->ev_arg = arg; 201 ev->ev_arg = arg;
184 ev->ev_res = 0; 202 ev->ev_res = 0;
203 ev->ev_flags = EVLIST_INIT;
185} 204}
186 205
187int 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)
188{ 207{
189 return event_base_once (x_cur, fd, events, cb, arg, tv); 208 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
190} 209}
191 210
192int event_add (struct event *ev, struct timeval *tv) 211int event_add (struct event *ev, struct timeval *tv)
193{ 212{
194 printf ("event add %p %p\n", ev, &ev->to);//D
195 dLOOPev; 213 dLOOPev;
196 214
197 /* disable all watchers */
198 event_del (ev);
199
200 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
201 { 216 {
217 if (!ev_is_active (&ev->iosig.sig))
218 {
202 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 219 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
203 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 }
204 } 224 }
205 else if (ev->ev_events & (EV_READ | EV_WRITE)) 225 else if (ev->ev_events & (EV_READ | EV_WRITE))
206 { 226 {
227 if (!ev_is_active (&ev->iosig.io))
228 {
207 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));
208 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 }
209 } 234 }
210 235
211 if (tv) 236 if (tv)
212 { 237 {
213 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 {
214 ev_timer_start (EV_A_ &ev->to); 244 ev_timer_stop (EV_A_ &ev->to);
245 ev->ev_flags &= ~EVLIST_TIMEOUT;
215 } 246 }
247
248 ev->ev_flags |= EVLIST_ACTIVE;
216 249
217 return 0; 250 return 0;
218} 251}
219 252
220int event_del (struct event *ev) 253int event_del (struct event *ev)
221{ 254{
222 printf ("event del %p\n", ev);//D
223 dLOOPev; 255 dLOOPev;
224 256
225 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
226 {
227 /* sig */
228 if (ev_is_active (&ev->iosig.sig))
229 ev_signal_stop (EV_A_ &ev->iosig.sig); 258 ev_signal_stop (EV_A_ &ev->iosig.sig);
230 } 259 else if (ev->ev_events & (EV_READ | EV_WRITE))
231 else
232 {
233 /* io */
234 if (ev_is_active (&ev->iosig.io))
235 ev_io_stop (EV_A_ &ev->iosig.io); 260 ev_io_stop (EV_A_ &ev->iosig.io);
236 }
237 261
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
239 if (ev_is_active (&ev->to)) 262 if (ev_is_active (&ev->to))
240 ev_timer_stop (EV_A_ &ev->to); 263 ev_timer_stop (EV_A_ &ev->to);
241 264
265 ev->ev_flags = EVLIST_INIT;
266
242 return 0; 267 return 0;
268}
269
270void event_active (struct event *ev, int res, short ncalls)
271{
272 dLOOPev;
273
274 if (res & EV_TIMEOUT)
275 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
276
277 if (res & EV_SIGNAL)
278 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
279
280 if (res & (EV_READ | EV_WRITE))
281 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
243} 282}
244 283
245int event_pending (struct event *ev, short events, struct timeval *tv) 284int event_pending (struct event *ev, short events, struct timeval *tv)
246{ 285{
286 short revents = 0;
247 dLOOPev; 287 dLOOPev;
248
249 short revents = 0;
250 288
251 if (ev->ev_events & EV_SIGNAL) 289 if (ev->ev_events & EV_SIGNAL)
252 { 290 {
253 /* sig */ 291 /* sig */
254 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))
255 revents |= EV_SIGNAL; 293 revents |= EV_SIGNAL;
256 } 294 }
257 else 295 else if (ev->ev_events & (EV_READ | EV_WRITE))
258 { 296 {
259 /* io */ 297 /* io */
260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io)) 298 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
261 revents |= ev->ev_events & (EV_READ | EV_WRITE); 299 revents |= ev->ev_events & (EV_READ | EV_WRITE);
262 } 300 }
… …
264 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))
265 { 303 {
266 revents |= EV_TIMEOUT; 304 revents |= EV_TIMEOUT;
267 305
268 if (tv) 306 if (tv)
269 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 :) */
270 } 308 }
271 309
272 return events & revents; 310 return events & revents;
273} 311}
274 312
275int event_priority_init (int npri) 313int event_priority_init (int npri)
276{ 314{
277 return event_base_priority_init (x_cur, npri); 315 return event_base_priority_init (ev_x_cur, npri);
278} 316}
279 317
280int event_priority_set (struct event *ev, int pri) 318int event_priority_set (struct event *ev, int pri)
281{ 319{
282 ev->ev_pri = pri; 320 ev->ev_pri = pri;
… …
304{ 342{
305 return event_base_loop (base, 0); 343 return event_base_loop (base, 0);
306} 344}
307 345
308static void 346static void
309x_loopexit_cb (int revents, void *base) 347ev_x_loopexit_cb (int revents, void *base)
310{ 348{
311 dLOOPbase; 349 dLOOPbase;
312 350
313 ev_unloop (EV_A_ EVUNLOOP_ONCE); 351 ev_unloop (EV_A_ EVUNLOOP_ONE);
314} 352}
315 353
316int event_base_loopexit (struct event_base *base, struct timeval *tv) 354int event_base_loopexit (struct event_base *base, struct timeval *tv)
317{ 355{
356 ev_tstamp after = ev_tv_get (tv);
318 dLOOPbase; 357 dLOOPbase;
319 ev_tstamp after = tv_get (tv);
320 358
321 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);
322 360
323 return -1; 361 return 0;
324} 362}
325 363
326struct x_once 364struct ev_x_once
327{ 365{
328 int fd; 366 int fd;
329 void (*cb)(int, short, void *); 367 void (*cb)(int, short, void *);
330 void *arg; 368 void *arg;
331}; 369};
332 370
333static void 371static void
334x_once_cb (int revents, void *arg) 372ev_x_once_cb (int revents, void *arg)
335{ 373{
336 struct x_once *once = arg; 374 struct ev_x_once *once = (struct ev_x_once *)arg;
337 375
338 once->cb (once->fd, revents, once->arg); 376 once->cb (once->fd, (short)revents, once->arg);
339 free (once); 377 free (once);
340} 378}
341 379
342int 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)
343{ 381{
382 struct ev_x_once *once = (struct ev_x_once *)malloc (sizeof (struct ev_x_once));
344 dLOOPbase; 383 dLOOPbase;
345 struct x_once *once = malloc (sizeof (struct x_once));
346 384
347 if (!once) 385 if (!once)
348 return -1; 386 return -1;
349 387
350 once->fd = fd; 388 once->fd = fd;
351 once->cb = cb; 389 once->cb = cb;
352 once->arg = arg; 390 once->arg = arg;
353 391
354 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);
355 393
356 return 0; 394 return 0;
357} 395}
358 396
359int 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