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

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

Diff Legend

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