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

Comparing libev/ev.c (file contents):
Revision 1.38 by root, Thu Nov 1 15:21:13 2007 UTC vs.
Revision 1.52 by root, Sat Nov 3 22:10:39 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines