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

Comparing libev/ev.c (file contents):
Revision 1.17 by root, Wed Oct 31 14:44:15 2007 UTC vs.
Revision 1.48 by root, Sat Nov 3 12:19:31 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
… …
270{ 413{
271 signals [signum - 1].gotsig = 1; 414 signals [signum - 1].gotsig = 1;
272 415
273 if (!gotsig) 416 if (!gotsig)
274 { 417 {
418 int old_errno = errno;
275 gotsig = 1; 419 gotsig = 1;
276 write (sigpipe [1], &gotsig, 1); 420 write (sigpipe [1], &signum, 1);
421 errno = old_errno;
277 } 422 }
278} 423}
279 424
280static void 425static void
281sigcb (struct ev_io *iow, int revents) 426sigcb (struct ev_io *iow, int revents)
282{ 427{
283 struct ev_signal *w; 428 struct ev_signal *w;
284 int sig; 429 int signum;
285 430
431 read (sigpipe [0], &revents, 1);
286 gotsig = 0; 432 gotsig = 0;
287 read (sigpipe [0], &revents, 1);
288 433
289 for (sig = signalmax; sig--; ) 434 for (signum = signalmax; signum--; )
290 if (signals [sig].gotsig) 435 if (signals [signum].gotsig)
291 { 436 {
292 signals [sig].gotsig = 0; 437 signals [signum].gotsig = 0;
293 438
294 for (w = signals [sig].head; w; w = w->next) 439 for (w = signals [signum].head; w; w = w->next)
295 event ((W)w, EV_SIGNAL); 440 event ((W)w, EV_SIGNAL);
296 } 441 }
297} 442}
298 443
299static void 444static void
300siginit (void) 445siginit (void)
301{ 446{
447#ifndef WIN32
302 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 448 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
303 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 449 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
304 450
305 /* rather than sort out wether we really need nb, set it */ 451 /* rather than sort out wether we really need nb, set it */
306 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 452 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
307 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 453 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
454#endif
308 455
309 evio_set (&sigev, sigpipe [0], EV_READ); 456 ev_io_set (&sigev, sigpipe [0], EV_READ);
310 evio_start (&sigev); 457 ev_io_start (&sigev);
311} 458}
312 459
313/*****************************************************************************/ 460/*****************************************************************************/
314 461
315static struct ev_idle **idles; 462static struct ev_idle **idles;
316static int idlemax, idlecnt; 463static int idlemax, idlecnt;
317 464
465static struct ev_prepare **prepares;
466static int preparemax, preparecnt;
467
318static struct ev_check **checks; 468static struct ev_check **checks;
319static int checkmax, checkcnt; 469static int checkmax, checkcnt;
320 470
321/*****************************************************************************/ 471/*****************************************************************************/
322 472
473static struct ev_child *childs [PID_HASHSIZE];
474static struct ev_signal childev;
475
476#ifndef WIN32
477
478#ifndef WCONTINUED
479# define WCONTINUED 0
480#endif
481
482static void
483child_reap (struct ev_signal *sw, int chain, int pid, int status)
484{
485 struct ev_child *w;
486
487 for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
488 if (w->pid == pid || !w->pid)
489 {
490 w->priority = sw->priority; /* need to do it *now* */
491 w->rpid = pid;
492 w->rstatus = status;
493 printf ("rpid %p %d %d\n", w, pid, w->pid);//D
494 event ((W)w, EV_CHILD);
495 }
496}
497
498static void
499childcb (struct ev_signal *sw, int revents)
500{
501 int pid, status;
502
503 printf ("chld %x\n", revents);//D
504 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
505 {
506 /* make sure we are called again until all childs have been reaped */
507 event ((W)sw, EV_SIGNAL);
508
509 child_reap (sw, pid, pid, status);
510 child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
511 }
512}
513
514#endif
515
516/*****************************************************************************/
517
518#if EV_USE_KQUEUE
519# include "ev_kqueue.c"
520#endif
323#if HAVE_EPOLL 521#if EV_USE_EPOLL
324# include "ev_epoll.c" 522# include "ev_epoll.c"
325#endif 523#endif
524#if EV_USE_POLL
525# include "ev_poll.c"
526#endif
326#if HAVE_SELECT 527#if EV_USE_SELECT
327# include "ev_select.c" 528# include "ev_select.c"
328#endif 529#endif
329 530
531int
532ev_version_major (void)
533{
534 return EV_VERSION_MAJOR;
535}
536
537int
538ev_version_minor (void)
539{
540 return EV_VERSION_MINOR;
541}
542
543/* return true if we are running with elevated privileges and ignore env variables */
544static int
545enable_secure ()
546{
547 return getuid () != geteuid ()
548 || getgid () != getegid ();
549}
550
330int ev_init (int flags) 551int ev_init (int methods)
331{ 552{
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) 553 if (!ev_method)
554 {
555#if EV_USE_MONOTONIC
356 { 556 {
557 struct timespec ts;
558 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
559 have_monotonic = 1;
560 }
561#endif
562
563 ev_now = ev_time ();
564 now = get_clock ();
565 now_floor = now;
566 diff = ev_now - now;
567
568 if (pipe (sigpipe))
569 return 0;
570
571 if (methods == EVMETHOD_AUTO)
572 if (!enable_secure () && getenv ("LIBEV_METHODS"))
573 methods = atoi (getenv ("LIBEV_METHODS"));
574 else
575 methods = EVMETHOD_ANY;
576
577 ev_method = 0;
578#if EV_USE_KQUEUE
579 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
580#endif
581#if EV_USE_EPOLL
582 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
583#endif
584#if EV_USE_POLL
585 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
586#endif
587#if EV_USE_SELECT
588 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
589#endif
590
591 if (ev_method)
592 {
357 evw_init (&sigev, sigcb); 593 ev_watcher_init (&sigev, sigcb);
594 ev_set_priority (&sigev, EV_MAXPRI);
358 siginit (); 595 siginit ();
596
597#ifndef WIN32
598 ev_signal_init (&childev, childcb, SIGCHLD);
599 ev_set_priority (&childev, EV_MAXPRI);
600 ev_signal_start (&childev);
601#endif
602 }
359 } 603 }
360 604
361 return ev_method; 605 return ev_method;
362} 606}
363 607
364/*****************************************************************************/ 608/*****************************************************************************/
365 609
366void ev_prefork (void) 610void
611ev_fork_prepare (void)
367{ 612{
368 /* nop */ 613 /* nop */
369} 614}
370 615
616void
371void ev_postfork_parent (void) 617ev_fork_parent (void)
372{ 618{
373 /* nop */ 619 /* nop */
374} 620}
375 621
622void
376void ev_postfork_child (void) 623ev_fork_child (void)
377{ 624{
378#if HAVE_EPOLL 625#if EV_USE_EPOLL
379 if (ev_method == EVMETHOD_EPOLL) 626 if (ev_method == EVMETHOD_EPOLL)
380 epoll_postfork_child (); 627 epoll_postfork_child ();
381#endif 628#endif
382 629
383 evio_stop (&sigev); 630 ev_io_stop (&sigev);
384 close (sigpipe [0]); 631 close (sigpipe [0]);
385 close (sigpipe [1]); 632 close (sigpipe [1]);
386 pipe (sigpipe); 633 pipe (sigpipe);
387 siginit (); 634 siginit ();
388} 635}
389 636
390/*****************************************************************************/ 637/*****************************************************************************/
391 638
392static void 639static void
393fd_reify (void) 640call_pending (void)
394{ 641{
395 int i; 642 int pri;
396 643
397 for (i = 0; i < fdchangecnt; ++i) 644 for (pri = NUMPRI; pri--; )
398 { 645 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 { 646 {
410 method_modify (fd, anfd->wev, wev); 647 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
411 anfd->wev = wev;
412 }
413 }
414 648
415 fdchangecnt = 0;
416}
417
418static void
419call_pending ()
420{
421 int i;
422
423 for (i = 0; i < pendingcnt; ++i)
424 {
425 ANPENDING *p = pendings + i;
426
427 if (p->w) 649 if (p->w)
428 { 650 {
429 p->w->pending = 0; 651 p->w->pending = 0;
430 p->w->cb (p->w, p->events); 652 p->w->cb (p->w, p->events);
431 } 653 }
432 } 654 }
433
434 pendingcnt = 0;
435} 655}
436 656
437static void 657static void
438timers_reify () 658timers_reify (void)
439{ 659{
440 while (timercnt && timers [0]->at <= now) 660 while (timercnt && timers [0]->at <= now)
441 { 661 {
442 struct ev_timer *w = timers [0]; 662 struct ev_timer *w = timers [0];
443
444 event ((W)w, EV_TIMEOUT);
445 663
446 /* first reschedule or stop timer */ 664 /* first reschedule or stop timer */
447 if (w->repeat) 665 if (w->repeat)
448 { 666 {
667 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
449 w->at = now + w->repeat; 668 w->at = now + w->repeat;
450 assert (("timer timeout in the past, negative repeat?", w->at > now));
451 downheap ((WT *)timers, timercnt, 0); 669 downheap ((WT *)timers, timercnt, 0);
452 } 670 }
453 else 671 else
454 evtimer_stop (w); /* nonrepeating: stop timer */ 672 ev_timer_stop (w); /* nonrepeating: stop timer */
455 }
456}
457 673
674 event ((W)w, EV_TIMEOUT);
675 }
676}
677
458static void 678static void
459periodics_reify () 679periodics_reify (void)
460{ 680{
461 while (periodiccnt && periodics [0]->at <= ev_now) 681 while (periodiccnt && periodics [0]->at <= ev_now)
462 { 682 {
463 struct ev_periodic *w = periodics [0]; 683 struct ev_periodic *w = periodics [0];
464 684
465 /* first reschedule or stop timer */ 685 /* first reschedule or stop timer */
466 if (w->interval) 686 if (w->interval)
467 { 687 {
468 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 688 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
469 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 689 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
470 downheap ((WT *)periodics, periodiccnt, 0); 690 downheap ((WT *)periodics, periodiccnt, 0);
471 } 691 }
472 else 692 else
473 evperiodic_stop (w); /* nonrepeating: stop timer */ 693 ev_periodic_stop (w); /* nonrepeating: stop timer */
474 694
475 event ((W)w, EV_TIMEOUT); 695 event ((W)w, EV_PERIODIC);
476 } 696 }
477} 697}
478 698
479static void 699static void
480periodics_reschedule (ev_tstamp diff) 700periodics_reschedule (ev_tstamp diff)
… …
490 { 710 {
491 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 711 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
492 712
493 if (fabs (diff) >= 1e-4) 713 if (fabs (diff) >= 1e-4)
494 { 714 {
495 evperiodic_stop (w); 715 ev_periodic_stop (w);
496 evperiodic_start (w); 716 ev_periodic_start (w);
497 717
498 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 718 i = 0; /* restart loop, inefficient, but time jumps should be rare */
499 } 719 }
500 } 720 }
501 } 721 }
502} 722}
503 723
504static void 724static int
725time_update_monotonic (void)
726{
727 now = get_clock ();
728
729 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
730 {
731 ev_now = now + diff;
732 return 0;
733 }
734 else
735 {
736 now_floor = now;
737 ev_now = ev_time ();
738 return 1;
739 }
740}
741
742static void
505time_update () 743time_update (void)
506{ 744{
507 int i; 745 int i;
508 746
509 ev_now = ev_time (); 747#if EV_USE_MONOTONIC
510
511 if (have_monotonic) 748 if (expect_true (have_monotonic))
512 { 749 {
513 ev_tstamp odiff = diff; 750 if (time_update_monotonic ())
514
515 for (i = 4; --i; ) /* loop a few times, before making important decisions */
516 { 751 {
517 now = get_clock (); 752 ev_tstamp odiff = diff;
753
754 for (i = 4; --i; ) /* loop a few times, before making important decisions */
755 {
518 diff = ev_now - now; 756 diff = ev_now - now;
519 757
520 if (fabs (odiff - diff) < MIN_TIMEJUMP) 758 if (fabs (odiff - diff) < MIN_TIMEJUMP)
521 return; /* all is well */ 759 return; /* all is well */
522 760
523 ev_now = ev_time (); 761 ev_now = ev_time ();
762 now = get_clock ();
763 now_floor = now;
764 }
765
766 periodics_reschedule (diff - odiff);
767 /* no timer adjustment, as the monotonic clock doesn't jump */
524 } 768 }
525
526 periodics_reschedule (diff - odiff);
527 /* no timer adjustment, as the monotonic clock doesn't jump */
528 } 769 }
529 else 770 else
771#endif
530 { 772 {
773 ev_now = ev_time ();
774
531 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 775 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
532 { 776 {
533 periodics_reschedule (ev_now - now); 777 periodics_reschedule (ev_now - now);
534 778
535 /* adjust timers. this is easy, as the offset is the same for all */ 779 /* adjust timers. this is easy, as the offset is the same for all */
536 for (i = 0; i < timercnt; ++i) 780 for (i = 0; i < timercnt; ++i)
… …
544int ev_loop_done; 788int ev_loop_done;
545 789
546void ev_loop (int flags) 790void ev_loop (int flags)
547{ 791{
548 double block; 792 double block;
549 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 793 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
550
551 if (checkcnt)
552 {
553 queue_events ((W *)checks, checkcnt, EV_CHECK);
554 call_pending ();
555 }
556 794
557 do 795 do
558 { 796 {
797 /* queue check watchers (and execute them) */
798 if (expect_false (preparecnt))
799 {
800 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
801 call_pending ();
802 }
803
559 /* update fd-related kernel structures */ 804 /* update fd-related kernel structures */
560 fd_reify (); 805 fd_reify ();
561 806
562 /* calculate blocking time */ 807 /* calculate blocking time */
563 808
564 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 809 /* we only need this for !monotonic clockor timers, but as we basically
810 always have timers, we just calculate it always */
811#if EV_USE_MONOTONIC
812 if (expect_true (have_monotonic))
813 time_update_monotonic ();
814 else
815#endif
816 {
565 ev_now = ev_time (); 817 ev_now = ev_time ();
818 now = ev_now;
819 }
566 820
567 if (flags & EVLOOP_NONBLOCK || idlecnt) 821 if (flags & EVLOOP_NONBLOCK || idlecnt)
568 block = 0.; 822 block = 0.;
569 else 823 else
570 { 824 {
571 block = MAX_BLOCKTIME; 825 block = MAX_BLOCKTIME;
572 826
573 if (timercnt) 827 if (timercnt)
574 { 828 {
575 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 829 ev_tstamp to = timers [0]->at - now + method_fudge;
576 if (block > to) block = to; 830 if (block > to) block = to;
577 } 831 }
578 832
579 if (periodiccnt) 833 if (periodiccnt)
580 { 834 {
… …
589 843
590 /* update ev_now, do magic */ 844 /* update ev_now, do magic */
591 time_update (); 845 time_update ();
592 846
593 /* queue pending timers and reschedule them */ 847 /* queue pending timers and reschedule them */
848 timers_reify (); /* relative timers called last */
594 periodics_reify (); /* absolute timers first */ 849 periodics_reify (); /* absolute timers called first */
595 timers_reify (); /* relative timers second */
596 850
597 /* queue idle watchers unless io or timers are pending */ 851 /* queue idle watchers unless io or timers are pending */
598 if (!pendingcnt) 852 if (!pendingcnt)
599 queue_events ((W *)idles, idlecnt, EV_IDLE); 853 queue_events ((W *)idles, idlecnt, EV_IDLE);
600 854
601 /* queue check and possibly idle watchers */ 855 /* queue check watchers, to be executed first */
856 if (checkcnt)
602 queue_events ((W *)checks, checkcnt, EV_CHECK); 857 queue_events ((W *)checks, checkcnt, EV_CHECK);
603 858
604 call_pending (); 859 call_pending ();
605 } 860 }
606 while (!ev_loop_done); 861 while (!ev_loop_done);
607 862
… …
632 head = &(*head)->next; 887 head = &(*head)->next;
633 } 888 }
634} 889}
635 890
636static void 891static void
637ev_clear (W w) 892ev_clear_pending (W w)
638{ 893{
639 if (w->pending) 894 if (w->pending)
640 { 895 {
641 pendings [w->pending - 1].w = 0; 896 pendings [ABSPRI (w)][w->pending - 1].w = 0;
642 w->pending = 0; 897 w->pending = 0;
643 } 898 }
644} 899}
645 900
646static void 901static void
647ev_start (W w, int active) 902ev_start (W w, int active)
648{ 903{
904 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
905 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
906
649 w->active = active; 907 w->active = active;
650} 908}
651 909
652static void 910static void
653ev_stop (W w) 911ev_stop (W w)
… …
656} 914}
657 915
658/*****************************************************************************/ 916/*****************************************************************************/
659 917
660void 918void
661evio_start (struct ev_io *w) 919ev_io_start (struct ev_io *w)
662{ 920{
921 int fd = w->fd;
922
663 if (ev_is_active (w)) 923 if (ev_is_active (w))
664 return; 924 return;
665 925
666 int fd = w->fd; 926 assert (("ev_io_start called with negative fd", fd >= 0));
667 927
668 ev_start ((W)w, 1); 928 ev_start ((W)w, 1);
669 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 929 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
670 wlist_add ((WL *)&anfds[fd].head, (WL)w); 930 wlist_add ((WL *)&anfds[fd].head, (WL)w);
671 931
672 ++fdchangecnt; 932 fd_change (fd);
673 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
674 fdchanges [fdchangecnt - 1] = fd;
675} 933}
676 934
677void 935void
678evio_stop (struct ev_io *w) 936ev_io_stop (struct ev_io *w)
679{ 937{
680 ev_clear ((W)w); 938 ev_clear_pending ((W)w);
681 if (!ev_is_active (w)) 939 if (!ev_is_active (w))
682 return; 940 return;
683 941
684 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 942 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
685 ev_stop ((W)w); 943 ev_stop ((W)w);
686 944
687 ++fdchangecnt; 945 fd_change (w->fd);
688 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
689 fdchanges [fdchangecnt - 1] = w->fd;
690} 946}
691 947
692void 948void
693evtimer_start (struct ev_timer *w) 949ev_timer_start (struct ev_timer *w)
694{ 950{
695 if (ev_is_active (w)) 951 if (ev_is_active (w))
696 return; 952 return;
697 953
698 w->at += now; 954 w->at += now;
699 955
700 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 956 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
701 957
702 ev_start ((W)w, ++timercnt); 958 ev_start ((W)w, ++timercnt);
703 array_needsize (timers, timermax, timercnt, ); 959 array_needsize (timers, timermax, timercnt, );
704 timers [timercnt - 1] = w; 960 timers [timercnt - 1] = w;
705 upheap ((WT *)timers, timercnt - 1); 961 upheap ((WT *)timers, timercnt - 1);
706} 962}
707 963
708void 964void
709evtimer_stop (struct ev_timer *w) 965ev_timer_stop (struct ev_timer *w)
710{ 966{
711 ev_clear ((W)w); 967 ev_clear_pending ((W)w);
712 if (!ev_is_active (w)) 968 if (!ev_is_active (w))
713 return; 969 return;
714 970
715 if (w->active < timercnt--) 971 if (w->active < timercnt--)
716 { 972 {
… …
722 978
723 ev_stop ((W)w); 979 ev_stop ((W)w);
724} 980}
725 981
726void 982void
727evtimer_again (struct ev_timer *w) 983ev_timer_again (struct ev_timer *w)
728{ 984{
729 if (ev_is_active (w)) 985 if (ev_is_active (w))
730 { 986 {
731 if (w->repeat) 987 if (w->repeat)
732 { 988 {
733 w->at = now + w->repeat; 989 w->at = now + w->repeat;
734 downheap ((WT *)timers, timercnt, w->active - 1); 990 downheap ((WT *)timers, timercnt, w->active - 1);
735 } 991 }
736 else 992 else
737 evtimer_stop (w); 993 ev_timer_stop (w);
738 } 994 }
739 else if (w->repeat) 995 else if (w->repeat)
740 evtimer_start (w); 996 ev_timer_start (w);
741} 997}
742 998
743void 999void
744evperiodic_start (struct ev_periodic *w) 1000ev_periodic_start (struct ev_periodic *w)
745{ 1001{
746 if (ev_is_active (w)) 1002 if (ev_is_active (w))
747 return; 1003 return;
748 1004
749 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 1005 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
750 1006
751 /* this formula differs from the one in periodic_reify because we do not always round up */ 1007 /* this formula differs from the one in periodic_reify because we do not always round up */
752 if (w->interval) 1008 if (w->interval)
753 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1009 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
754 1010
… …
757 periodics [periodiccnt - 1] = w; 1013 periodics [periodiccnt - 1] = w;
758 upheap ((WT *)periodics, periodiccnt - 1); 1014 upheap ((WT *)periodics, periodiccnt - 1);
759} 1015}
760 1016
761void 1017void
762evperiodic_stop (struct ev_periodic *w) 1018ev_periodic_stop (struct ev_periodic *w)
763{ 1019{
764 ev_clear ((W)w); 1020 ev_clear_pending ((W)w);
765 if (!ev_is_active (w)) 1021 if (!ev_is_active (w))
766 return; 1022 return;
767 1023
768 if (w->active < periodiccnt--) 1024 if (w->active < periodiccnt--)
769 { 1025 {
… …
772 } 1028 }
773 1029
774 ev_stop ((W)w); 1030 ev_stop ((W)w);
775} 1031}
776 1032
1033#ifndef SA_RESTART
1034# define SA_RESTART 0
1035#endif
1036
777void 1037void
778evsignal_start (struct ev_signal *w) 1038ev_signal_start (struct ev_signal *w)
779{ 1039{
780 if (ev_is_active (w)) 1040 if (ev_is_active (w))
781 return; 1041 return;
1042
1043 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
782 1044
783 ev_start ((W)w, 1); 1045 ev_start ((W)w, 1);
784 array_needsize (signals, signalmax, w->signum, signals_init); 1046 array_needsize (signals, signalmax, w->signum, signals_init);
785 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1047 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
786 1048
787 if (!w->next) 1049 if (!w->next)
788 { 1050 {
789 struct sigaction sa; 1051 struct sigaction sa;
790 sa.sa_handler = sighandler; 1052 sa.sa_handler = sighandler;
791 sigfillset (&sa.sa_mask); 1053 sigfillset (&sa.sa_mask);
792 sa.sa_flags = 0; 1054 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
793 sigaction (w->signum, &sa, 0); 1055 sigaction (w->signum, &sa, 0);
794 } 1056 }
795} 1057}
796 1058
797void 1059void
798evsignal_stop (struct ev_signal *w) 1060ev_signal_stop (struct ev_signal *w)
799{ 1061{
800 ev_clear ((W)w); 1062 ev_clear_pending ((W)w);
801 if (!ev_is_active (w)) 1063 if (!ev_is_active (w))
802 return; 1064 return;
803 1065
804 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1066 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
805 ev_stop ((W)w); 1067 ev_stop ((W)w);
806 1068
807 if (!signals [w->signum - 1].head) 1069 if (!signals [w->signum - 1].head)
808 signal (w->signum, SIG_DFL); 1070 signal (w->signum, SIG_DFL);
809} 1071}
810 1072
1073void
811void evidle_start (struct ev_idle *w) 1074ev_idle_start (struct ev_idle *w)
812{ 1075{
813 if (ev_is_active (w)) 1076 if (ev_is_active (w))
814 return; 1077 return;
815 1078
816 ev_start ((W)w, ++idlecnt); 1079 ev_start ((W)w, ++idlecnt);
817 array_needsize (idles, idlemax, idlecnt, ); 1080 array_needsize (idles, idlemax, idlecnt, );
818 idles [idlecnt - 1] = w; 1081 idles [idlecnt - 1] = w;
819} 1082}
820 1083
1084void
821void evidle_stop (struct ev_idle *w) 1085ev_idle_stop (struct ev_idle *w)
822{ 1086{
823 ev_clear ((W)w); 1087 ev_clear_pending ((W)w);
824 if (ev_is_active (w)) 1088 if (ev_is_active (w))
825 return; 1089 return;
826 1090
827 idles [w->active - 1] = idles [--idlecnt]; 1091 idles [w->active - 1] = idles [--idlecnt];
828 ev_stop ((W)w); 1092 ev_stop ((W)w);
829} 1093}
830 1094
1095void
1096ev_prepare_start (struct ev_prepare *w)
1097{
1098 if (ev_is_active (w))
1099 return;
1100
1101 ev_start ((W)w, ++preparecnt);
1102 array_needsize (prepares, preparemax, preparecnt, );
1103 prepares [preparecnt - 1] = w;
1104}
1105
1106void
1107ev_prepare_stop (struct ev_prepare *w)
1108{
1109 ev_clear_pending ((W)w);
1110 if (ev_is_active (w))
1111 return;
1112
1113 prepares [w->active - 1] = prepares [--preparecnt];
1114 ev_stop ((W)w);
1115}
1116
1117void
831void evcheck_start (struct ev_check *w) 1118ev_check_start (struct ev_check *w)
832{ 1119{
833 if (ev_is_active (w)) 1120 if (ev_is_active (w))
834 return; 1121 return;
835 1122
836 ev_start ((W)w, ++checkcnt); 1123 ev_start ((W)w, ++checkcnt);
837 array_needsize (checks, checkmax, checkcnt, ); 1124 array_needsize (checks, checkmax, checkcnt, );
838 checks [checkcnt - 1] = w; 1125 checks [checkcnt - 1] = w;
839} 1126}
840 1127
1128void
841void evcheck_stop (struct ev_check *w) 1129ev_check_stop (struct ev_check *w)
842{ 1130{
843 ev_clear ((W)w); 1131 ev_clear_pending ((W)w);
844 if (ev_is_active (w)) 1132 if (ev_is_active (w))
845 return; 1133 return;
846 1134
847 checks [w->active - 1] = checks [--checkcnt]; 1135 checks [w->active - 1] = checks [--checkcnt];
1136 ev_stop ((W)w);
1137}
1138
1139void
1140ev_child_start (struct ev_child *w)
1141{
1142 if (ev_is_active (w))
1143 return;
1144
1145 ev_start ((W)w, 1);
1146 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1147}
1148
1149void
1150ev_child_stop (struct ev_child *w)
1151{
1152 ev_clear_pending ((W)w);
1153 if (ev_is_active (w))
1154 return;
1155
1156 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
848 ev_stop ((W)w); 1157 ev_stop ((W)w);
849} 1158}
850 1159
851/*****************************************************************************/ 1160/*****************************************************************************/
852 1161
… …
862once_cb (struct ev_once *once, int revents) 1171once_cb (struct ev_once *once, int revents)
863{ 1172{
864 void (*cb)(int revents, void *arg) = once->cb; 1173 void (*cb)(int revents, void *arg) = once->cb;
865 void *arg = once->arg; 1174 void *arg = once->arg;
866 1175
867 evio_stop (&once->io); 1176 ev_io_stop (&once->io);
868 evtimer_stop (&once->to); 1177 ev_timer_stop (&once->to);
869 free (once); 1178 free (once);
870 1179
871 cb (revents, arg); 1180 cb (revents, arg);
872} 1181}
873 1182
… …
887ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1196ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
888{ 1197{
889 struct ev_once *once = malloc (sizeof (struct ev_once)); 1198 struct ev_once *once = malloc (sizeof (struct ev_once));
890 1199
891 if (!once) 1200 if (!once)
892 cb (EV_ERROR, arg); 1201 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
893 else 1202 else
894 { 1203 {
895 once->cb = cb; 1204 once->cb = cb;
896 once->arg = arg; 1205 once->arg = arg;
897 1206
898 evw_init (&once->io, once_cb_io); 1207 ev_watcher_init (&once->io, once_cb_io);
899
900 if (fd >= 0) 1208 if (fd >= 0)
901 { 1209 {
902 evio_set (&once->io, fd, events); 1210 ev_io_set (&once->io, fd, events);
903 evio_start (&once->io); 1211 ev_io_start (&once->io);
904 } 1212 }
905 1213
906 evw_init (&once->to, once_cb_to); 1214 ev_watcher_init (&once->to, once_cb_to);
907
908 if (timeout >= 0.) 1215 if (timeout >= 0.)
909 { 1216 {
910 evtimer_set (&once->to, timeout, 0.); 1217 ev_timer_set (&once->to, timeout, 0.);
911 evtimer_start (&once->to); 1218 ev_timer_start (&once->to);
912 } 1219 }
913 } 1220 }
914} 1221}
915 1222
916/*****************************************************************************/ 1223/*****************************************************************************/
… …
927 1234
928static void 1235static void
929ocb (struct ev_timer *w, int revents) 1236ocb (struct ev_timer *w, int revents)
930{ 1237{
931 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1238 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
932 evtimer_stop (w); 1239 ev_timer_stop (w);
933 evtimer_start (w); 1240 ev_timer_start (w);
934} 1241}
935 1242
936static void 1243static void
937scb (struct ev_signal *w, int revents) 1244scb (struct ev_signal *w, int revents)
938{ 1245{
939 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1246 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
940 evio_stop (&wio); 1247 ev_io_stop (&wio);
941 evio_start (&wio); 1248 ev_io_start (&wio);
942} 1249}
943 1250
944static void 1251static void
945gcb (struct ev_signal *w, int revents) 1252gcb (struct ev_signal *w, int revents)
946{ 1253{
… …
950 1257
951int main (void) 1258int main (void)
952{ 1259{
953 ev_init (0); 1260 ev_init (0);
954 1261
955 evio_init (&wio, sin_cb, 0, EV_READ); 1262 ev_io_init (&wio, sin_cb, 0, EV_READ);
956 evio_start (&wio); 1263 ev_io_start (&wio);
957 1264
958 struct ev_timer t[10000]; 1265 struct ev_timer t[10000];
959 1266
960#if 0 1267#if 0
961 int i; 1268 int i;
962 for (i = 0; i < 10000; ++i) 1269 for (i = 0; i < 10000; ++i)
963 { 1270 {
964 struct ev_timer *w = t + i; 1271 struct ev_timer *w = t + i;
965 evw_init (w, ocb, i); 1272 ev_watcher_init (w, ocb, i);
966 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1273 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
967 evtimer_start (w); 1274 ev_timer_start (w);
968 if (drand48 () < 0.5) 1275 if (drand48 () < 0.5)
969 evtimer_stop (w); 1276 ev_timer_stop (w);
970 } 1277 }
971#endif 1278#endif
972 1279
973 struct ev_timer t1; 1280 struct ev_timer t1;
974 evtimer_init (&t1, ocb, 5, 10); 1281 ev_timer_init (&t1, ocb, 5, 10);
975 evtimer_start (&t1); 1282 ev_timer_start (&t1);
976 1283
977 struct ev_signal sig; 1284 struct ev_signal sig;
978 evsignal_init (&sig, scb, SIGQUIT); 1285 ev_signal_init (&sig, scb, SIGQUIT);
979 evsignal_start (&sig); 1286 ev_signal_start (&sig);
980 1287
981 struct ev_check cw; 1288 struct ev_check cw;
982 evcheck_init (&cw, gcb); 1289 ev_check_init (&cw, gcb);
983 evcheck_start (&cw); 1290 ev_check_start (&cw);
984 1291
985 struct ev_idle iw; 1292 struct ev_idle iw;
986 evidle_init (&iw, gcb); 1293 ev_idle_init (&iw, gcb);
987 evidle_start (&iw); 1294 ev_idle_start (&iw);
988 1295
989 ev_loop (0); 1296 ev_loop (0);
990 1297
991 return 0; 1298 return 0;
992} 1299}

Diff Legend

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