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

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

Diff Legend

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