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

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

Diff Legend

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