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

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

Diff Legend

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