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

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

Diff Legend

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