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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines