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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines