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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines