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

Comparing libev/ev.c (file contents):
Revision 1.16 by root, Wed Oct 31 13:57:34 2007 UTC vs.
Revision 1.45 by root, Sat Nov 3 09:19:58 2007 UTC

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

Diff Legend

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