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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines