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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines