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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines