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

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

Diff Legend

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