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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines