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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines