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

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

Diff Legend

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