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

Comparing libev/ev.c (file contents):
Revision 1.14 by root, Wed Oct 31 11:52:12 2007 UTC vs.
Revision 1.49 by root, Sat Nov 3 16:16:58 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines