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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines