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

Comparing libev/ev.c (file contents):
Revision 1.18 by root, Wed Oct 31 16:29:52 2007 UTC vs.
Revision 1.47 by root, Sat Nov 3 11:44:44 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines