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

Comparing libev/ev.c (file contents):
Revision 1.19 by root, Wed Oct 31 17:55:55 2007 UTC vs.
Revision 1.50 by root, Sat Nov 3 19:41:55 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines