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

Comparing libev/ev.c (file contents):
Revision 1.31 by root, Thu Nov 1 09:05:33 2007 UTC vs.
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC

1/* 1/*
2 * libev event processing core, watcher management
3 *
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved. 5 * All rights reserved.
4 * 6 *
5 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 8 * modification, are permitted provided that the following conditions are
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 30 */
29#if EV_USE_CONFIG_H 31#ifndef EV_STANDALONE
30# include "config.h" 32# include "config.h"
31#endif 33#endif
32 34
33#include <math.h> 35#include <math.h>
34#include <stdlib.h> 36#include <stdlib.h>
40#include <stdio.h> 42#include <stdio.h>
41 43
42#include <assert.h> 44#include <assert.h>
43#include <errno.h> 45#include <errno.h>
44#include <sys/types.h> 46#include <sys/types.h>
47#ifndef WIN32
45#include <sys/wait.h> 48# include <sys/wait.h>
49#endif
46#include <sys/time.h> 50#include <sys/time.h>
47#include <time.h> 51#include <time.h>
48 52
53/**/
54
49#ifndef EV_USE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
50# ifdef CLOCK_MONOTONIC
51# define EV_USE_MONOTONIC 1 56# define EV_USE_MONOTONIC 1
52# endif
53#endif 57#endif
54 58
55#ifndef EV_USE_SELECT 59#ifndef EV_USE_SELECT
56# define EV_USE_SELECT 1 60# define EV_USE_SELECT 1
57#endif 61#endif
58 62
63#ifndef EV_USEV_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif
66
59#ifndef EV_USE_EPOLL 67#ifndef EV_USE_EPOLL
60# define EV_USE_EPOLL 0 68# define EV_USE_EPOLL 0
61#endif 69#endif
62 70
71#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0
73#endif
74
75#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1
77#endif
78
79/**/
80
81#ifndef CLOCK_MONOTONIC
82# undef EV_USE_MONOTONIC
83# define EV_USE_MONOTONIC 0
84#endif
85
63#ifndef CLOCK_REALTIME 86#ifndef CLOCK_REALTIME
87# undef EV_USE_REALTIME
64# define EV_USE_REALTIME 0 88# define EV_USE_REALTIME 0
65#endif 89#endif
66#ifndef EV_USE_REALTIME 90
67# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ 91/**/
68#endif
69 92
70#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 93#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
71#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */ 94#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
72#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 95#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
73#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 96/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
74 97
75#include "ev.h" 98#include "ev.h"
99
100#if __GNUC__ >= 3
101# define expect(expr,value) __builtin_expect ((expr),(value))
102# define inline inline
103#else
104# define expect(expr,value) (expr)
105# define inline static
106#endif
107
108#define expect_false(expr) expect ((expr) != 0, 0)
109#define expect_true(expr) expect ((expr) != 0, 1)
110
111#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
112#define ABSPRI(w) ((w)->priority - EV_MINPRI)
76 113
77typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
78typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
79typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
80 117
81static ev_tstamp now, diff; /* monotonic clock */ 118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
82ev_tstamp ev_now;
83int ev_method;
84
85static int have_monotonic; /* runtime */
86
87static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
88static void (*method_modify)(int fd, int oev, int nev);
89static void (*method_poll)(ev_tstamp timeout);
90 119
91/*****************************************************************************/ 120/*****************************************************************************/
92 121
93ev_tstamp 122typedef struct
123{
124 struct ev_watcher_list *head;
125 unsigned char events;
126 unsigned char reify;
127} ANFD;
128
129typedef struct
130{
131 W w;
132 int events;
133} ANPENDING;
134
135#ifdef EV_MULTIPLICITY
136
137struct ev_loop
138{
139# define VAR(name,decl) decl;
140# include "ev_vars.h"
141};
142# undef VAR
143# include "ev_wrap.h"
144
145#else
146
147# define VAR(name,decl) static decl;
148# include "ev_vars.h"
149# undef VAR
150
151#endif
152
153/*****************************************************************************/
154
155inline ev_tstamp
94ev_time (void) 156ev_time (void)
95{ 157{
96#if EV_USE_REALTIME 158#if EV_USE_REALTIME
97 struct timespec ts; 159 struct timespec ts;
98 clock_gettime (CLOCK_REALTIME, &ts); 160 clock_gettime (CLOCK_REALTIME, &ts);
102 gettimeofday (&tv, 0); 164 gettimeofday (&tv, 0);
103 return tv.tv_sec + tv.tv_usec * 1e-6; 165 return tv.tv_sec + tv.tv_usec * 1e-6;
104#endif 166#endif
105} 167}
106 168
107static ev_tstamp 169inline ev_tstamp
108get_clock (void) 170get_clock (void)
109{ 171{
110#if EV_USE_MONOTONIC 172#if EV_USE_MONOTONIC
111 if (have_monotonic) 173 if (expect_true (have_monotonic))
112 { 174 {
113 struct timespec ts; 175 struct timespec ts;
114 clock_gettime (CLOCK_MONOTONIC, &ts); 176 clock_gettime (CLOCK_MONOTONIC, &ts);
115 return ts.tv_sec + ts.tv_nsec * 1e-9; 177 return ts.tv_sec + ts.tv_nsec * 1e-9;
116 } 178 }
117#endif 179#endif
118 180
119 return ev_time (); 181 return ev_time ();
120} 182}
121 183
184ev_tstamp
185ev_now (EV_P)
186{
187 return rt_now;
188}
189
122#define array_roundsize(base,n) ((n) | 4 & ~3) 190#define array_roundsize(base,n) ((n) | 4 & ~3)
123 191
124#define array_needsize(base,cur,cnt,init) \ 192#define array_needsize(base,cur,cnt,init) \
125 if ((cnt) > cur) \ 193 if (expect_false ((cnt) > cur)) \
126 { \ 194 { \
127 int newcnt = cur; \ 195 int newcnt = cur; \
128 do \ 196 do \
129 { \ 197 { \
130 newcnt = array_roundsize (base, newcnt << 1); \ 198 newcnt = array_roundsize (base, newcnt << 1); \
136 cur = newcnt; \ 204 cur = newcnt; \
137 } 205 }
138 206
139/*****************************************************************************/ 207/*****************************************************************************/
140 208
141typedef struct
142{
143 struct ev_io *head;
144 int events;
145} ANFD;
146
147static ANFD *anfds;
148static int anfdmax;
149
150static void 209static void
151anfds_init (ANFD *base, int count) 210anfds_init (ANFD *base, int count)
152{ 211{
153 while (count--) 212 while (count--)
154 { 213 {
155 base->head = 0; 214 base->head = 0;
156 base->events = EV_NONE; 215 base->events = EV_NONE;
216 base->reify = 0;
217
157 ++base; 218 ++base;
158 } 219 }
159} 220}
160 221
161typedef struct
162{
163 W w;
164 int events;
165} ANPENDING;
166
167static ANPENDING *pendings;
168static int pendingmax, pendingcnt;
169
170static void 222static void
171event (W w, int events) 223event (EV_P_ W w, int events)
172{ 224{
225 if (w->pending)
226 {
227 pendings [ABSPRI (w)][w->pending - 1].events |= events;
228 return;
229 }
230
173 w->pending = ++pendingcnt; 231 w->pending = ++pendingcnt [ABSPRI (w)];
174 array_needsize (pendings, pendingmax, pendingcnt, ); 232 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
175 pendings [pendingcnt - 1].w = w; 233 pendings [ABSPRI (w)][w->pending - 1].w = w;
176 pendings [pendingcnt - 1].events = events; 234 pendings [ABSPRI (w)][w->pending - 1].events = events;
177} 235}
178 236
179static void 237static void
180queue_events (W *events, int eventcnt, int type) 238queue_events (EV_P_ W *events, int eventcnt, int type)
181{ 239{
182 int i; 240 int i;
183 241
184 for (i = 0; i < eventcnt; ++i) 242 for (i = 0; i < eventcnt; ++i)
185 event (events [i], type); 243 event (EV_A_ events [i], type);
186} 244}
187 245
188static void 246static void
189fd_event (int fd, int events) 247fd_event (EV_P_ int fd, int events)
190{ 248{
191 ANFD *anfd = anfds + fd; 249 ANFD *anfd = anfds + fd;
192 struct ev_io *w; 250 struct ev_io *w;
193 251
194 for (w = anfd->head; w; w = w->next) 252 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
195 { 253 {
196 int ev = w->events & events; 254 int ev = w->events & events;
197 255
198 if (ev) 256 if (ev)
199 event ((W)w, ev); 257 event (EV_A_ (W)w, ev);
200 } 258 }
201} 259}
202 260
203/*****************************************************************************/ 261/*****************************************************************************/
204 262
205static int *fdchanges;
206static int fdchangemax, fdchangecnt;
207
208static void 263static void
209fd_reify (void) 264fd_reify (EV_P)
210{ 265{
211 int i; 266 int i;
212 267
213 for (i = 0; i < fdchangecnt; ++i) 268 for (i = 0; i < fdchangecnt; ++i)
214 { 269 {
216 ANFD *anfd = anfds + fd; 271 ANFD *anfd = anfds + fd;
217 struct ev_io *w; 272 struct ev_io *w;
218 273
219 int events = 0; 274 int events = 0;
220 275
221 for (w = anfd->head; w; w = w->next) 276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
222 events |= w->events; 277 events |= w->events;
223 278
224 anfd->events &= ~EV_REIFY; 279 anfd->reify = 0;
225 280
226 if (anfd->events != events) 281 if (anfd->events != events)
227 { 282 {
228 method_modify (fd, anfd->events, events); 283 method_modify (EV_A_ fd, anfd->events, events);
229 anfd->events = events; 284 anfd->events = events;
230 } 285 }
231 } 286 }
232 287
233 fdchangecnt = 0; 288 fdchangecnt = 0;
234} 289}
235 290
236static void 291static void
237fd_change (int fd) 292fd_change (EV_P_ int fd)
238{ 293{
239 if (anfds [fd].events & EV_REIFY || fdchangecnt < 0) 294 if (anfds [fd].reify || fdchangecnt < 0)
240 return; 295 return;
241 296
242 anfds [fd].events |= EV_REIFY; 297 anfds [fd].reify = 1;
243 298
244 ++fdchangecnt; 299 ++fdchangecnt;
245 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 300 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
246 fdchanges [fdchangecnt - 1] = fd; 301 fdchanges [fdchangecnt - 1] = fd;
247} 302}
248 303
304static void
305fd_kill (EV_P_ int fd)
306{
307 struct ev_io *w;
308
309 while ((w = (struct ev_io *)anfds [fd].head))
310 {
311 ev_io_stop (EV_A_ w);
312 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
313 }
314}
315
249/* called on EBADF to verify fds */ 316/* called on EBADF to verify fds */
250static void 317static void
251fd_recheck (void) 318fd_ebadf (EV_P)
252{ 319{
253 int fd; 320 int fd;
254 321
255 for (fd = 0; fd < anfdmax; ++fd) 322 for (fd = 0; fd < anfdmax; ++fd)
256 if (anfds [fd].events) 323 if (anfds [fd].events)
257 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 324 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
258 while (anfds [fd].head) 325 fd_kill (EV_A_ fd);
326}
327
328/* called on ENOMEM in select/poll to kill some fds and retry */
329static void
330fd_enomem (EV_P)
331{
332 int fd = anfdmax;
333
334 while (fd--)
335 if (anfds [fd].events)
259 { 336 {
260 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT); 337 close (fd);
261 ev_io_stop (anfds [fd].head); 338 fd_kill (EV_A_ fd);
339 return;
262 } 340 }
263} 341}
264 342
265/*****************************************************************************/ 343/*****************************************************************************/
266 344
267static struct ev_timer **timers;
268static int timermax, timercnt;
269
270static struct ev_periodic **periodics;
271static int periodicmax, periodiccnt;
272
273static void 345static void
274upheap (WT *timers, int k) 346upheap (WT *heap, int k)
275{ 347{
276 WT w = timers [k]; 348 WT w = heap [k];
277 349
278 while (k && timers [k >> 1]->at > w->at) 350 while (k && heap [k >> 1]->at > w->at)
279 { 351 {
280 timers [k] = timers [k >> 1]; 352 heap [k] = heap [k >> 1];
281 timers [k]->active = k + 1; 353 heap [k]->active = k + 1;
282 k >>= 1; 354 k >>= 1;
283 } 355 }
284 356
285 timers [k] = w; 357 heap [k] = w;
286 timers [k]->active = k + 1; 358 heap [k]->active = k + 1;
287 359
288} 360}
289 361
290static void 362static void
291downheap (WT *timers, int N, int k) 363downheap (WT *heap, int N, int k)
292{ 364{
293 WT w = timers [k]; 365 WT w = heap [k];
294 366
295 while (k < (N >> 1)) 367 while (k < (N >> 1))
296 { 368 {
297 int j = k << 1; 369 int j = k << 1;
298 370
299 if (j + 1 < N && timers [j]->at > timers [j + 1]->at) 371 if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
300 ++j; 372 ++j;
301 373
302 if (w->at <= timers [j]->at) 374 if (w->at <= heap [j]->at)
303 break; 375 break;
304 376
305 timers [k] = timers [j]; 377 heap [k] = heap [j];
306 timers [k]->active = k + 1; 378 heap [k]->active = k + 1;
307 k = j; 379 k = j;
308 } 380 }
309 381
310 timers [k] = w; 382 heap [k] = w;
311 timers [k]->active = k + 1; 383 heap [k]->active = k + 1;
312} 384}
313 385
314/*****************************************************************************/ 386/*****************************************************************************/
315 387
316typedef struct 388typedef struct
317{ 389{
318 struct ev_signal *head; 390 struct ev_watcher_list *head;
319 sig_atomic_t gotsig; 391 sig_atomic_t volatile gotsig;
320} ANSIG; 392} ANSIG;
321 393
322static ANSIG *signals; 394static ANSIG *signals;
323static int signalmax; 395static int signalmax;
324 396
325static int sigpipe [2]; 397static int sigpipe [2];
326static sig_atomic_t gotsig; 398static sig_atomic_t volatile gotsig;
327static struct ev_io sigev;
328 399
329static void 400static void
330signals_init (ANSIG *base, int count) 401signals_init (ANSIG *base, int count)
331{ 402{
332 while (count--) 403 while (count--)
333 { 404 {
334 base->head = 0; 405 base->head = 0;
335 base->gotsig = 0; 406 base->gotsig = 0;
407
336 ++base; 408 ++base;
337 } 409 }
338} 410}
339 411
340static void 412static void
342{ 414{
343 signals [signum - 1].gotsig = 1; 415 signals [signum - 1].gotsig = 1;
344 416
345 if (!gotsig) 417 if (!gotsig)
346 { 418 {
419 int old_errno = errno;
347 gotsig = 1; 420 gotsig = 1;
348 write (sigpipe [1], &gotsig, 1); 421 write (sigpipe [1], &signum, 1);
422 errno = old_errno;
349 } 423 }
350} 424}
351 425
352static void 426static void
353sigcb (struct ev_io *iow, int revents) 427sigcb (EV_P_ struct ev_io *iow, int revents)
354{ 428{
355 struct ev_signal *w; 429 struct ev_watcher_list *w;
356 int sig; 430 int signum;
357 431
432 read (sigpipe [0], &revents, 1);
358 gotsig = 0; 433 gotsig = 0;
359 read (sigpipe [0], &revents, 1);
360 434
361 for (sig = signalmax; sig--; ) 435 for (signum = signalmax; signum--; )
362 if (signals [sig].gotsig) 436 if (signals [signum].gotsig)
363 { 437 {
364 signals [sig].gotsig = 0; 438 signals [signum].gotsig = 0;
365 439
366 for (w = signals [sig].head; w; w = w->next) 440 for (w = signals [signum].head; w; w = w->next)
367 event ((W)w, EV_SIGNAL); 441 event (EV_A_ (W)w, EV_SIGNAL);
368 } 442 }
369} 443}
370 444
371static void 445static void
372siginit (void) 446siginit (EV_P)
373{ 447{
448#ifndef WIN32
374 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 449 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
375 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 450 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
376 451
377 /* rather than sort out wether we really need nb, set it */ 452 /* rather than sort out wether we really need nb, set it */
378 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 453 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
379 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 454 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
455#endif
380 456
381 ev_io_set (&sigev, sigpipe [0], EV_READ); 457 ev_io_set (&sigev, sigpipe [0], EV_READ);
382 ev_io_start (&sigev); 458 ev_io_start (EV_A_ &sigev);
459 ev_unref (EV_A); /* child watcher should not keep loop alive */
383} 460}
384 461
385/*****************************************************************************/ 462/*****************************************************************************/
386 463
387static struct ev_idle **idles; 464#ifndef WIN32
388static int idlemax, idlecnt;
389
390static struct ev_prepare **prepares;
391static int preparemax, preparecnt;
392
393static struct ev_check **checks;
394static int checkmax, checkcnt;
395
396/*****************************************************************************/
397
398static struct ev_child *childs [PID_HASHSIZE];
399static struct ev_signal childev;
400 465
401#ifndef WCONTINUED 466#ifndef WCONTINUED
402# define WCONTINUED 0 467# define WCONTINUED 0
403#endif 468#endif
404 469
405static void 470static void
406childcb (struct ev_signal *sw, int revents) 471child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
407{ 472{
408 struct ev_child *w; 473 struct ev_child *w;
474
475 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
476 if (w->pid == pid || !w->pid)
477 {
478 w->priority = sw->priority; /* need to do it *now* */
479 w->rpid = pid;
480 w->rstatus = status;
481 event (EV_A_ (W)w, EV_CHILD);
482 }
483}
484
485static void
486childcb (EV_P_ struct ev_signal *sw, int revents)
487{
409 int pid, status; 488 int pid, status;
410 489
411 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 490 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
412 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 491 {
413 if (w->pid == pid || w->pid == -1) 492 /* make sure we are called again until all childs have been reaped */
414 { 493 event (EV_A_ (W)sw, EV_SIGNAL);
415 w->status = status; 494
416 event ((W)w, EV_CHILD); 495 child_reap (EV_A_ sw, pid, pid, status);
417 } 496 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
497 }
418} 498}
499
500#endif
419 501
420/*****************************************************************************/ 502/*****************************************************************************/
421 503
504#if EV_USE_KQUEUE
505# include "ev_kqueue.c"
506#endif
422#if EV_USE_EPOLL 507#if EV_USE_EPOLL
423# include "ev_epoll.c" 508# include "ev_epoll.c"
424#endif 509#endif
510#if EV_USEV_POLL
511# include "ev_poll.c"
512#endif
425#if EV_USE_SELECT 513#if EV_USE_SELECT
426# include "ev_select.c" 514# include "ev_select.c"
427#endif 515#endif
428 516
429int 517int
436ev_version_minor (void) 524ev_version_minor (void)
437{ 525{
438 return EV_VERSION_MINOR; 526 return EV_VERSION_MINOR;
439} 527}
440 528
441int ev_init (int flags) 529/* return true if we are running with elevated privileges and should ignore env variables */
530static int
531enable_secure (void)
442{ 532{
533#ifdef WIN32
534 return 0;
535#else
536 return getuid () != geteuid ()
537 || getgid () != getegid ();
538#endif
539}
540
541int
542ev_method (EV_P)
543{
544 return method;
545}
546
547static void
548loop_init (EV_P_ int methods)
549{
443 if (!ev_method) 550 if (!method)
444 { 551 {
445#if EV_USE_MONOTONIC 552#if EV_USE_MONOTONIC
446 { 553 {
447 struct timespec ts; 554 struct timespec ts;
448 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 555 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
449 have_monotonic = 1; 556 have_monotonic = 1;
450 } 557 }
451#endif 558#endif
452 559
453 ev_now = ev_time (); 560 rt_now = ev_time ();
454 now = get_clock (); 561 mn_now = get_clock ();
562 now_floor = mn_now;
455 diff = ev_now - now; 563 rtmn_diff = rt_now - mn_now;
456 564
457 if (pipe (sigpipe)) 565 if (pipe (sigpipe))
458 return 0; 566 return 0;
459 567
568 if (methods == EVMETHOD_AUTO)
569 if (!enable_secure () && getenv ("LIBmethodS"))
570 methods = atoi (getenv ("LIBmethodS"));
571 else
460 ev_method = EVMETHOD_NONE; 572 methods = EVMETHOD_ANY;
573
574 method = 0;
575#if EV_USE_KQUEUE
576 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
577#endif
461#if EV_USE_EPOLL 578#if EV_USE_EPOLL
462 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 579 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
580#endif
581#if EV_USEV_POLL
582 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
463#endif 583#endif
464#if EV_USE_SELECT 584#if EV_USE_SELECT
465 if (ev_method == EVMETHOD_NONE) select_init (flags); 585 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
466#endif 586#endif
467 587
468 if (ev_method) 588 if (method)
469 { 589 {
470 ev_watcher_init (&sigev, sigcb); 590 ev_watcher_init (&sigev, sigcb);
591 ev_set_priority (&sigev, EV_MAXPRI);
471 siginit (); 592 siginit (EV_A);
472 593
594#ifndef WIN32
473 ev_signal_init (&childev, childcb, SIGCHLD); 595 ev_signal_init (&childev, childcb, SIGCHLD);
596 ev_set_priority (&childev, EV_MAXPRI);
474 ev_signal_start (&childev); 597 ev_signal_start (EV_A_ &childev);
598 ev_unref (EV_A); /* child watcher should not keep loop alive */
599#endif
475 } 600 }
476 } 601 }
477 602
478 return ev_method; 603 return method;
479} 604}
605
606#ifdef EV_MULTIPLICITY
607
608struct ev_loop *
609ev_loop_new (int methods)
610{
611 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
612
613 loop_init (EV_A_ methods);
614
615 return loop;
616}
617
618void
619ev_loop_delete (EV_P)
620{
621 /*TODO*/
622 free (loop);
623}
624
625#else
626
627int
628ev_init (int methods)
629{
630 loop_init ();
631}
632
633#endif
480 634
481/*****************************************************************************/ 635/*****************************************************************************/
482 636
483void 637void
484ev_prefork (void) 638ev_fork_prepare (void)
485{ 639{
486 /* nop */ 640 /* nop */
487} 641}
488 642
489void 643void
490ev_postfork_parent (void) 644ev_fork_parent (void)
491{ 645{
492 /* nop */ 646 /* nop */
493} 647}
494 648
495void 649void
496ev_postfork_child (void) 650ev_fork_child (void)
497{ 651{
652 /*TODO*/
653#if !EV_MULTIPLICITY
498#if EV_USE_EPOLL 654#if EV_USE_EPOLL
499 if (ev_method == EVMETHOD_EPOLL) 655 if (method == EVMETHOD_EPOLL)
500 epoll_postfork_child (); 656 epoll_postfork_child (EV_A);
501#endif 657#endif
502 658
503 ev_io_stop (&sigev); 659 ev_io_stop (EV_A_ &sigev);
504 close (sigpipe [0]); 660 close (sigpipe [0]);
505 close (sigpipe [1]); 661 close (sigpipe [1]);
506 pipe (sigpipe); 662 pipe (sigpipe);
507 siginit (); 663 siginit (EV_A);
664#endif
508} 665}
509 666
510/*****************************************************************************/ 667/*****************************************************************************/
511 668
512static void 669static void
513call_pending (void) 670call_pending (EV_P)
514{ 671{
672 int pri;
673
674 for (pri = NUMPRI; pri--; )
515 while (pendingcnt) 675 while (pendingcnt [pri])
516 { 676 {
517 ANPENDING *p = pendings + --pendingcnt; 677 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
518 678
519 if (p->w) 679 if (p->w)
520 { 680 {
521 p->w->pending = 0; 681 p->w->pending = 0;
522 p->w->cb (p->w, p->events); 682 p->w->cb (EV_A_ p->w, p->events);
523 } 683 }
524 } 684 }
525} 685}
526 686
527static void 687static void
528timers_reify (void) 688timers_reify (EV_P)
529{ 689{
530 while (timercnt && timers [0]->at <= now) 690 while (timercnt && timers [0]->at <= mn_now)
531 { 691 {
532 struct ev_timer *w = timers [0]; 692 struct ev_timer *w = timers [0];
533 693
534 /* first reschedule or stop timer */ 694 /* first reschedule or stop timer */
535 if (w->repeat) 695 if (w->repeat)
536 { 696 {
697 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
537 w->at = now + w->repeat; 698 w->at = mn_now + w->repeat;
538 assert (("timer timeout in the past, negative repeat?", w->at > now));
539 downheap ((WT *)timers, timercnt, 0); 699 downheap ((WT *)timers, timercnt, 0);
540 } 700 }
541 else 701 else
542 ev_timer_stop (w); /* nonrepeating: stop timer */ 702 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
543 703
544 event ((W)w, EV_TIMEOUT); 704 event (EV_A_ (W)w, EV_TIMEOUT);
545 } 705 }
546} 706}
547 707
548static void 708static void
549periodics_reify (void) 709periodics_reify (EV_P)
550{ 710{
551 while (periodiccnt && periodics [0]->at <= ev_now) 711 while (periodiccnt && periodics [0]->at <= rt_now)
552 { 712 {
553 struct ev_periodic *w = periodics [0]; 713 struct ev_periodic *w = periodics [0];
554 714
555 /* first reschedule or stop timer */ 715 /* first reschedule or stop timer */
556 if (w->interval) 716 if (w->interval)
557 { 717 {
558 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 718 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
559 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 719 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
560 downheap ((WT *)periodics, periodiccnt, 0); 720 downheap ((WT *)periodics, periodiccnt, 0);
561 } 721 }
562 else 722 else
563 ev_periodic_stop (w); /* nonrepeating: stop timer */ 723 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
564 724
565 event ((W)w, EV_TIMEOUT); 725 event (EV_A_ (W)w, EV_PERIODIC);
566 } 726 }
567} 727}
568 728
569static void 729static void
570periodics_reschedule (ev_tstamp diff) 730periodics_reschedule (EV_P)
571{ 731{
572 int i; 732 int i;
573 733
574 /* adjust periodics after time jump */ 734 /* adjust periodics after time jump */
575 for (i = 0; i < periodiccnt; ++i) 735 for (i = 0; i < periodiccnt; ++i)
576 { 736 {
577 struct ev_periodic *w = periodics [i]; 737 struct ev_periodic *w = periodics [i];
578 738
579 if (w->interval) 739 if (w->interval)
580 { 740 {
581 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 741 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
582 742
583 if (fabs (diff) >= 1e-4) 743 if (fabs (diff) >= 1e-4)
584 { 744 {
585 ev_periodic_stop (w); 745 ev_periodic_stop (EV_A_ w);
586 ev_periodic_start (w); 746 ev_periodic_start (EV_A_ w);
587 747
588 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 748 i = 0; /* restart loop, inefficient, but time jumps should be rare */
589 } 749 }
590 } 750 }
591 } 751 }
592} 752}
593 753
754inline int
755time_update_monotonic (EV_P)
756{
757 mn_now = get_clock ();
758
759 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
760 {
761 rt_now = rtmn_diff + mn_now;
762 return 0;
763 }
764 else
765 {
766 now_floor = mn_now;
767 rt_now = ev_time ();
768 return 1;
769 }
770}
771
594static void 772static void
595time_update (void) 773time_update (EV_P)
596{ 774{
597 int i; 775 int i;
598 776
599 ev_now = ev_time (); 777#if EV_USE_MONOTONIC
600
601 if (have_monotonic) 778 if (expect_true (have_monotonic))
602 { 779 {
603 ev_tstamp odiff = diff; 780 if (time_update_monotonic (EV_A))
604
605 for (i = 4; --i; ) /* loop a few times, before making important decisions */
606 { 781 {
607 now = get_clock (); 782 ev_tstamp odiff = rtmn_diff;
783
784 for (i = 4; --i; ) /* loop a few times, before making important decisions */
785 {
608 diff = ev_now - now; 786 rtmn_diff = rt_now - mn_now;
609 787
610 if (fabs (odiff - diff) < MIN_TIMEJUMP) 788 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
611 return; /* all is well */ 789 return; /* all is well */
612 790
613 ev_now = ev_time (); 791 rt_now = ev_time ();
792 mn_now = get_clock ();
793 now_floor = mn_now;
794 }
795
796 periodics_reschedule (EV_A);
797 /* no timer adjustment, as the monotonic clock doesn't jump */
798 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
614 } 799 }
615
616 periodics_reschedule (diff - odiff);
617 /* no timer adjustment, as the monotonic clock doesn't jump */
618 } 800 }
619 else 801 else
802#endif
620 { 803 {
621 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 804 rt_now = ev_time ();
805
806 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
622 { 807 {
623 periodics_reschedule (ev_now - now); 808 periodics_reschedule (EV_A);
624 809
625 /* adjust timers. this is easy, as the offset is the same for all */ 810 /* adjust timers. this is easy, as the offset is the same for all */
626 for (i = 0; i < timercnt; ++i) 811 for (i = 0; i < timercnt; ++i)
627 timers [i]->at += diff; 812 timers [i]->at += rt_now - mn_now;
628 } 813 }
629 814
630 now = ev_now; 815 mn_now = rt_now;
631 } 816 }
632} 817}
633 818
634int ev_loop_done; 819void
820ev_ref (EV_P)
821{
822 ++activecnt;
823}
635 824
825void
826ev_unref (EV_P)
827{
828 --activecnt;
829}
830
831static int loop_done;
832
833void
636void ev_loop (int flags) 834ev_loop (EV_P_ int flags)
637{ 835{
638 double block; 836 double block;
639 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 837 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
640 838
641 do 839 do
642 { 840 {
643 /* queue check watchers (and execute them) */ 841 /* queue check watchers (and execute them) */
644 if (preparecnt) 842 if (expect_false (preparecnt))
645 { 843 {
646 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 844 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
647 call_pending (); 845 call_pending (EV_A);
648 } 846 }
649 847
650 /* update fd-related kernel structures */ 848 /* update fd-related kernel structures */
651 fd_reify (); 849 fd_reify (EV_A);
652 850
653 /* calculate blocking time */ 851 /* calculate blocking time */
654 852
655 /* we only need this for !monotonic clockor timers, but as we basically 853 /* we only need this for !monotonic clockor timers, but as we basically
656 always have timers, we just calculate it always */ 854 always have timers, we just calculate it always */
855#if EV_USE_MONOTONIC
856 if (expect_true (have_monotonic))
857 time_update_monotonic (EV_A);
858 else
859#endif
860 {
657 ev_now = ev_time (); 861 rt_now = ev_time ();
862 mn_now = rt_now;
863 }
658 864
659 if (flags & EVLOOP_NONBLOCK || idlecnt) 865 if (flags & EVLOOP_NONBLOCK || idlecnt)
660 block = 0.; 866 block = 0.;
661 else 867 else
662 { 868 {
663 block = MAX_BLOCKTIME; 869 block = MAX_BLOCKTIME;
664 870
665 if (timercnt) 871 if (timercnt)
666 { 872 {
667 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 873 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
668 if (block > to) block = to; 874 if (block > to) block = to;
669 } 875 }
670 876
671 if (periodiccnt) 877 if (periodiccnt)
672 { 878 {
673 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 879 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
674 if (block > to) block = to; 880 if (block > to) block = to;
675 } 881 }
676 882
677 if (block < 0.) block = 0.; 883 if (block < 0.) block = 0.;
678 } 884 }
679 885
680 method_poll (block); 886 method_poll (EV_A_ block);
681 887
682 /* update ev_now, do magic */ 888 /* update rt_now, do magic */
683 time_update (); 889 time_update (EV_A);
684 890
685 /* queue pending timers and reschedule them */ 891 /* queue pending timers and reschedule them */
686 timers_reify (); /* relative timers called last */ 892 timers_reify (EV_A); /* relative timers called last */
687 periodics_reify (); /* absolute timers called first */ 893 periodics_reify (EV_A); /* absolute timers called first */
688 894
689 /* queue idle watchers unless io or timers are pending */ 895 /* queue idle watchers unless io or timers are pending */
690 if (!pendingcnt) 896 if (!pendingcnt)
691 queue_events ((W *)idles, idlecnt, EV_IDLE); 897 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
692 898
693 /* queue check watchers, to be executed first */ 899 /* queue check watchers, to be executed first */
694 if (checkcnt) 900 if (checkcnt)
695 queue_events ((W *)checks, checkcnt, EV_CHECK); 901 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
696 902
697 call_pending (); 903 call_pending (EV_A);
698 } 904 }
699 while (!ev_loop_done); 905 while (activecnt && !loop_done);
700 906
701 if (ev_loop_done != 2) 907 if (loop_done != 2)
702 ev_loop_done = 0; 908 loop_done = 0;
909}
910
911void
912ev_unloop (EV_P_ int how)
913{
914 loop_done = how;
703} 915}
704 916
705/*****************************************************************************/ 917/*****************************************************************************/
706 918
707static void 919inline void
708wlist_add (WL *head, WL elem) 920wlist_add (WL *head, WL elem)
709{ 921{
710 elem->next = *head; 922 elem->next = *head;
711 *head = elem; 923 *head = elem;
712} 924}
713 925
714static void 926inline void
715wlist_del (WL *head, WL elem) 927wlist_del (WL *head, WL elem)
716{ 928{
717 while (*head) 929 while (*head)
718 { 930 {
719 if (*head == elem) 931 if (*head == elem)
724 936
725 head = &(*head)->next; 937 head = &(*head)->next;
726 } 938 }
727} 939}
728 940
729static void 941inline void
730ev_clear (W w) 942ev_clear_pending (EV_P_ W w)
731{ 943{
732 if (w->pending) 944 if (w->pending)
733 { 945 {
734 pendings [w->pending - 1].w = 0; 946 pendings [ABSPRI (w)][w->pending - 1].w = 0;
735 w->pending = 0; 947 w->pending = 0;
736 } 948 }
737} 949}
738 950
739static void 951inline void
740ev_start (W w, int active) 952ev_start (EV_P_ W w, int active)
741{ 953{
954 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
955 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
956
742 w->active = active; 957 w->active = active;
958 ev_ref (EV_A);
743} 959}
744 960
745static void 961inline void
746ev_stop (W w) 962ev_stop (EV_P_ W w)
747{ 963{
964 ev_unref (EV_A);
748 w->active = 0; 965 w->active = 0;
749} 966}
750 967
751/*****************************************************************************/ 968/*****************************************************************************/
752 969
753void 970void
754ev_io_start (struct ev_io *w) 971ev_io_start (EV_P_ struct ev_io *w)
755{ 972{
973 int fd = w->fd;
974
756 if (ev_is_active (w)) 975 if (ev_is_active (w))
757 return; 976 return;
758 977
759 int fd = w->fd; 978 assert (("ev_io_start called with negative fd", fd >= 0));
760 979
761 ev_start ((W)w, 1); 980 ev_start (EV_A_ (W)w, 1);
762 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 981 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
763 wlist_add ((WL *)&anfds[fd].head, (WL)w); 982 wlist_add ((WL *)&anfds[fd].head, (WL)w);
764 983
765 fd_change (fd); 984 fd_change (EV_A_ fd);
766} 985}
767 986
768void 987void
769ev_io_stop (struct ev_io *w) 988ev_io_stop (EV_P_ struct ev_io *w)
770{ 989{
771 ev_clear ((W)w); 990 ev_clear_pending (EV_A_ (W)w);
772 if (!ev_is_active (w)) 991 if (!ev_is_active (w))
773 return; 992 return;
774 993
775 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 994 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
776 ev_stop ((W)w); 995 ev_stop (EV_A_ (W)w);
777 996
778 fd_change (w->fd); 997 fd_change (EV_A_ w->fd);
779} 998}
780 999
781void 1000void
782ev_timer_start (struct ev_timer *w) 1001ev_timer_start (EV_P_ struct ev_timer *w)
783{ 1002{
784 if (ev_is_active (w)) 1003 if (ev_is_active (w))
785 return; 1004 return;
786 1005
787 w->at += now; 1006 w->at += mn_now;
788 1007
789 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 1008 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
790 1009
791 ev_start ((W)w, ++timercnt); 1010 ev_start (EV_A_ (W)w, ++timercnt);
792 array_needsize (timers, timermax, timercnt, ); 1011 array_needsize (timers, timermax, timercnt, );
793 timers [timercnt - 1] = w; 1012 timers [timercnt - 1] = w;
794 upheap ((WT *)timers, timercnt - 1); 1013 upheap ((WT *)timers, timercnt - 1);
795} 1014}
796 1015
797void 1016void
798ev_timer_stop (struct ev_timer *w) 1017ev_timer_stop (EV_P_ struct ev_timer *w)
799{ 1018{
800 ev_clear ((W)w); 1019 ev_clear_pending (EV_A_ (W)w);
801 if (!ev_is_active (w)) 1020 if (!ev_is_active (w))
802 return; 1021 return;
803 1022
804 if (w->active < timercnt--) 1023 if (w->active < timercnt--)
805 { 1024 {
807 downheap ((WT *)timers, timercnt, w->active - 1); 1026 downheap ((WT *)timers, timercnt, w->active - 1);
808 } 1027 }
809 1028
810 w->at = w->repeat; 1029 w->at = w->repeat;
811 1030
812 ev_stop ((W)w); 1031 ev_stop (EV_A_ (W)w);
813} 1032}
814 1033
815void 1034void
816ev_timer_again (struct ev_timer *w) 1035ev_timer_again (EV_P_ struct ev_timer *w)
817{ 1036{
818 if (ev_is_active (w)) 1037 if (ev_is_active (w))
819 { 1038 {
820 if (w->repeat) 1039 if (w->repeat)
821 { 1040 {
822 w->at = now + w->repeat; 1041 w->at = mn_now + w->repeat;
823 downheap ((WT *)timers, timercnt, w->active - 1); 1042 downheap ((WT *)timers, timercnt, w->active - 1);
824 } 1043 }
825 else 1044 else
826 ev_timer_stop (w); 1045 ev_timer_stop (EV_A_ w);
827 } 1046 }
828 else if (w->repeat) 1047 else if (w->repeat)
829 ev_timer_start (w); 1048 ev_timer_start (EV_A_ w);
830} 1049}
831 1050
832void 1051void
833ev_periodic_start (struct ev_periodic *w) 1052ev_periodic_start (EV_P_ struct ev_periodic *w)
834{ 1053{
835 if (ev_is_active (w)) 1054 if (ev_is_active (w))
836 return; 1055 return;
837 1056
838 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 1057 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
839 1058
840 /* this formula differs from the one in periodic_reify because we do not always round up */ 1059 /* this formula differs from the one in periodic_reify because we do not always round up */
841 if (w->interval) 1060 if (w->interval)
842 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1061 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
843 1062
844 ev_start ((W)w, ++periodiccnt); 1063 ev_start (EV_A_ (W)w, ++periodiccnt);
845 array_needsize (periodics, periodicmax, periodiccnt, ); 1064 array_needsize (periodics, periodicmax, periodiccnt, );
846 periodics [periodiccnt - 1] = w; 1065 periodics [periodiccnt - 1] = w;
847 upheap ((WT *)periodics, periodiccnt - 1); 1066 upheap ((WT *)periodics, periodiccnt - 1);
848} 1067}
849 1068
850void 1069void
851ev_periodic_stop (struct ev_periodic *w) 1070ev_periodic_stop (EV_P_ struct ev_periodic *w)
852{ 1071{
853 ev_clear ((W)w); 1072 ev_clear_pending (EV_A_ (W)w);
854 if (!ev_is_active (w)) 1073 if (!ev_is_active (w))
855 return; 1074 return;
856 1075
857 if (w->active < periodiccnt--) 1076 if (w->active < periodiccnt--)
858 { 1077 {
859 periodics [w->active - 1] = periodics [periodiccnt]; 1078 periodics [w->active - 1] = periodics [periodiccnt];
860 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1079 downheap ((WT *)periodics, periodiccnt, w->active - 1);
861 } 1080 }
862 1081
863 ev_stop ((W)w); 1082 ev_stop (EV_A_ (W)w);
864} 1083}
865 1084
1085#ifndef SA_RESTART
1086# define SA_RESTART 0
1087#endif
1088
866void 1089void
867ev_signal_start (struct ev_signal *w) 1090ev_signal_start (EV_P_ struct ev_signal *w)
868{ 1091{
869 if (ev_is_active (w)) 1092 if (ev_is_active (w))
870 return; 1093 return;
871 1094
1095 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1096
872 ev_start ((W)w, 1); 1097 ev_start (EV_A_ (W)w, 1);
873 array_needsize (signals, signalmax, w->signum, signals_init); 1098 array_needsize (signals, signalmax, w->signum, signals_init);
874 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1099 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
875 1100
876 if (!w->next) 1101 if (!w->next)
877 { 1102 {
878 struct sigaction sa; 1103 struct sigaction sa;
879 sa.sa_handler = sighandler; 1104 sa.sa_handler = sighandler;
880 sigfillset (&sa.sa_mask); 1105 sigfillset (&sa.sa_mask);
881 sa.sa_flags = 0; 1106 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
882 sigaction (w->signum, &sa, 0); 1107 sigaction (w->signum, &sa, 0);
883 } 1108 }
884} 1109}
885 1110
886void 1111void
887ev_signal_stop (struct ev_signal *w) 1112ev_signal_stop (EV_P_ struct ev_signal *w)
888{ 1113{
889 ev_clear ((W)w); 1114 ev_clear_pending (EV_A_ (W)w);
890 if (!ev_is_active (w)) 1115 if (!ev_is_active (w))
891 return; 1116 return;
892 1117
893 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1118 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
894 ev_stop ((W)w); 1119 ev_stop (EV_A_ (W)w);
895 1120
896 if (!signals [w->signum - 1].head) 1121 if (!signals [w->signum - 1].head)
897 signal (w->signum, SIG_DFL); 1122 signal (w->signum, SIG_DFL);
898} 1123}
899 1124
900void 1125void
901ev_idle_start (struct ev_idle *w) 1126ev_idle_start (EV_P_ struct ev_idle *w)
902{ 1127{
903 if (ev_is_active (w)) 1128 if (ev_is_active (w))
904 return; 1129 return;
905 1130
906 ev_start ((W)w, ++idlecnt); 1131 ev_start (EV_A_ (W)w, ++idlecnt);
907 array_needsize (idles, idlemax, idlecnt, ); 1132 array_needsize (idles, idlemax, idlecnt, );
908 idles [idlecnt - 1] = w; 1133 idles [idlecnt - 1] = w;
909} 1134}
910 1135
911void 1136void
912ev_idle_stop (struct ev_idle *w) 1137ev_idle_stop (EV_P_ struct ev_idle *w)
913{ 1138{
914 ev_clear ((W)w); 1139 ev_clear_pending (EV_A_ (W)w);
915 if (ev_is_active (w)) 1140 if (ev_is_active (w))
916 return; 1141 return;
917 1142
918 idles [w->active - 1] = idles [--idlecnt]; 1143 idles [w->active - 1] = idles [--idlecnt];
919 ev_stop ((W)w); 1144 ev_stop (EV_A_ (W)w);
920} 1145}
921 1146
922void 1147void
923ev_prepare_start (struct ev_prepare *w) 1148ev_prepare_start (EV_P_ struct ev_prepare *w)
924{ 1149{
925 if (ev_is_active (w)) 1150 if (ev_is_active (w))
926 return; 1151 return;
927 1152
928 ev_start ((W)w, ++preparecnt); 1153 ev_start (EV_A_ (W)w, ++preparecnt);
929 array_needsize (prepares, preparemax, preparecnt, ); 1154 array_needsize (prepares, preparemax, preparecnt, );
930 prepares [preparecnt - 1] = w; 1155 prepares [preparecnt - 1] = w;
931} 1156}
932 1157
933void 1158void
934ev_prepare_stop (struct ev_prepare *w) 1159ev_prepare_stop (EV_P_ struct ev_prepare *w)
935{ 1160{
936 ev_clear ((W)w); 1161 ev_clear_pending (EV_A_ (W)w);
937 if (ev_is_active (w)) 1162 if (ev_is_active (w))
938 return; 1163 return;
939 1164
940 prepares [w->active - 1] = prepares [--preparecnt]; 1165 prepares [w->active - 1] = prepares [--preparecnt];
941 ev_stop ((W)w); 1166 ev_stop (EV_A_ (W)w);
942} 1167}
943 1168
944void 1169void
945ev_check_start (struct ev_check *w) 1170ev_check_start (EV_P_ struct ev_check *w)
946{ 1171{
947 if (ev_is_active (w)) 1172 if (ev_is_active (w))
948 return; 1173 return;
949 1174
950 ev_start ((W)w, ++checkcnt); 1175 ev_start (EV_A_ (W)w, ++checkcnt);
951 array_needsize (checks, checkmax, checkcnt, ); 1176 array_needsize (checks, checkmax, checkcnt, );
952 checks [checkcnt - 1] = w; 1177 checks [checkcnt - 1] = w;
953} 1178}
954 1179
955void 1180void
956ev_check_stop (struct ev_check *w) 1181ev_check_stop (EV_P_ struct ev_check *w)
957{ 1182{
958 ev_clear ((W)w); 1183 ev_clear_pending (EV_A_ (W)w);
959 if (ev_is_active (w)) 1184 if (ev_is_active (w))
960 return; 1185 return;
961 1186
962 checks [w->active - 1] = checks [--checkcnt]; 1187 checks [w->active - 1] = checks [--checkcnt];
963 ev_stop ((W)w); 1188 ev_stop (EV_A_ (W)w);
964} 1189}
965 1190
966void 1191void
967ev_child_start (struct ev_child *w) 1192ev_child_start (EV_P_ struct ev_child *w)
968{ 1193{
969 if (ev_is_active (w)) 1194 if (ev_is_active (w))
970 return; 1195 return;
971 1196
972 ev_start ((W)w, 1); 1197 ev_start (EV_A_ (W)w, 1);
973 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1198 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
974} 1199}
975 1200
976void 1201void
977ev_child_stop (struct ev_child *w) 1202ev_child_stop (EV_P_ struct ev_child *w)
978{ 1203{
979 ev_clear ((W)w); 1204 ev_clear_pending (EV_A_ (W)w);
980 if (ev_is_active (w)) 1205 if (ev_is_active (w))
981 return; 1206 return;
982 1207
983 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1208 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
984 ev_stop ((W)w); 1209 ev_stop (EV_A_ (W)w);
985} 1210}
986 1211
987/*****************************************************************************/ 1212/*****************************************************************************/
988 1213
989struct ev_once 1214struct ev_once
993 void (*cb)(int revents, void *arg); 1218 void (*cb)(int revents, void *arg);
994 void *arg; 1219 void *arg;
995}; 1220};
996 1221
997static void 1222static void
998once_cb (struct ev_once *once, int revents) 1223once_cb (EV_P_ struct ev_once *once, int revents)
999{ 1224{
1000 void (*cb)(int revents, void *arg) = once->cb; 1225 void (*cb)(int revents, void *arg) = once->cb;
1001 void *arg = once->arg; 1226 void *arg = once->arg;
1002 1227
1003 ev_io_stop (&once->io); 1228 ev_io_stop (EV_A_ &once->io);
1004 ev_timer_stop (&once->to); 1229 ev_timer_stop (EV_A_ &once->to);
1005 free (once); 1230 free (once);
1006 1231
1007 cb (revents, arg); 1232 cb (revents, arg);
1008} 1233}
1009 1234
1010static void 1235static void
1011once_cb_io (struct ev_io *w, int revents) 1236once_cb_io (EV_P_ struct ev_io *w, int revents)
1012{ 1237{
1013 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1238 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1014} 1239}
1015 1240
1016static void 1241static void
1017once_cb_to (struct ev_timer *w, int revents) 1242once_cb_to (EV_P_ struct ev_timer *w, int revents)
1018{ 1243{
1019 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1244 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1020} 1245}
1021 1246
1022void 1247void
1023ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1248ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1024{ 1249{
1025 struct ev_once *once = malloc (sizeof (struct ev_once)); 1250 struct ev_once *once = malloc (sizeof (struct ev_once));
1026 1251
1027 if (!once) 1252 if (!once)
1028 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1253 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1033 1258
1034 ev_watcher_init (&once->io, once_cb_io); 1259 ev_watcher_init (&once->io, once_cb_io);
1035 if (fd >= 0) 1260 if (fd >= 0)
1036 { 1261 {
1037 ev_io_set (&once->io, fd, events); 1262 ev_io_set (&once->io, fd, events);
1038 ev_io_start (&once->io); 1263 ev_io_start (EV_A_ &once->io);
1039 } 1264 }
1040 1265
1041 ev_watcher_init (&once->to, once_cb_to); 1266 ev_watcher_init (&once->to, once_cb_to);
1042 if (timeout >= 0.) 1267 if (timeout >= 0.)
1043 { 1268 {
1044 ev_timer_set (&once->to, timeout, 0.); 1269 ev_timer_set (&once->to, timeout, 0.);
1045 ev_timer_start (&once->to); 1270 ev_timer_start (EV_A_ &once->to);
1046 } 1271 }
1047 } 1272 }
1048} 1273}
1049 1274
1050/*****************************************************************************/ 1275/*****************************************************************************/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines