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

Comparing libev/ev.c (file contents):
Revision 1.24 by root, Wed Oct 31 20:46:44 2007 UTC vs.
Revision 1.47 by root, Sat Nov 3 11:44:44 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
294 signals [signum - 1].gotsig = 1; 414 signals [signum - 1].gotsig = 1;
295 415
296 if (!gotsig) 416 if (!gotsig)
297 { 417 {
298 gotsig = 1; 418 gotsig = 1;
299 write (sigpipe [1], &gotsig, 1); 419 write (sigpipe [1], &signum, 1);
300 } 420 }
301} 421}
302 422
303static void 423static void
304sigcb (struct ev_io *iow, int revents) 424sigcb (struct ev_io *iow, int revents)
305{ 425{
306 struct ev_signal *w; 426 struct ev_signal *w;
307 int sig; 427 int signum;
308 428
429 read (sigpipe [0], &revents, 1);
309 gotsig = 0; 430 gotsig = 0;
310 read (sigpipe [0], &revents, 1);
311 431
312 for (sig = signalmax; sig--; ) 432 for (signum = signalmax; signum--; )
313 if (signals [sig].gotsig) 433 if (signals [signum].gotsig)
314 { 434 {
315 signals [sig].gotsig = 0; 435 signals [signum].gotsig = 0;
316 436
317 for (w = signals [sig].head; w; w = w->next) 437 for (w = signals [signum].head; w; w = w->next)
318 event ((W)w, EV_SIGNAL); 438 event ((W)w, EV_SIGNAL);
319 } 439 }
320} 440}
321 441
322static void 442static void
323siginit (void) 443siginit (void)
324{ 444{
445#ifndef WIN32
325 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 446 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
326 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 447 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
327 448
328 /* rather than sort out wether we really need nb, set it */ 449 /* rather than sort out wether we really need nb, set it */
329 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 450 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
330 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 451 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
452#endif
331 453
332 evio_set (&sigev, sigpipe [0], EV_READ); 454 ev_io_set (&sigev, sigpipe [0], EV_READ);
333 evio_start (&sigev); 455 ev_io_start (&sigev);
334} 456}
335 457
336/*****************************************************************************/ 458/*****************************************************************************/
337 459
338static struct ev_idle **idles; 460static struct ev_idle **idles;
347/*****************************************************************************/ 469/*****************************************************************************/
348 470
349static struct ev_child *childs [PID_HASHSIZE]; 471static struct ev_child *childs [PID_HASHSIZE];
350static struct ev_signal childev; 472static struct ev_signal childev;
351 473
474#ifndef WIN32
475
352#ifndef WCONTINUED 476#ifndef WCONTINUED
353# define WCONTINUED 0 477# define WCONTINUED 0
354#endif 478#endif
355 479
356static void 480static void
481child_reap (struct ev_signal *sw, int chain, int pid, int status)
482{
483 struct ev_child *w;
484
485 for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
486 if (w->pid == pid || !w->pid)
487 {
488 w->priority = sw->priority; /* need to do it *now* */
489 w->rpid = pid;
490 w->rstatus = status;
491 printf ("rpid %p %d %d\n", w, pid, w->pid);//D
492 event ((W)w, EV_CHILD);
493 }
494}
495
496static void
357childcb (struct ev_signal *sw, int revents) 497childcb (struct ev_signal *sw, int revents)
358{ 498{
359 struct ev_child *w;
360 int pid, status; 499 int pid, status;
361 500
501 printf ("chld %x\n", revents);//D
362 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 502 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
363 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 503 {
364 if (w->pid == pid || w->pid == -1) 504 /* make sure we are called again until all childs have been reaped */
365 {
366 w->status = status;
367 event ((W)w, EV_CHILD); 505 event ((W)sw, EV_SIGNAL);
368 } 506
507 child_reap (sw, pid, pid, status);
508 child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
509 }
369} 510}
511
512#endif
370 513
371/*****************************************************************************/ 514/*****************************************************************************/
372 515
516#if EV_USE_KQUEUE
517# include "ev_kqueue.c"
518#endif
373#if HAVE_EPOLL 519#if EV_USE_EPOLL
374# include "ev_epoll.c" 520# include "ev_epoll.c"
375#endif 521#endif
522#if EV_USE_POLL
523# include "ev_poll.c"
524#endif
376#if HAVE_SELECT 525#if EV_USE_SELECT
377# include "ev_select.c" 526# include "ev_select.c"
378#endif 527#endif
379 528
380int 529int
381ev_version_major (void) 530ev_version_major (void)
387ev_version_minor (void) 536ev_version_minor (void)
388{ 537{
389 return EV_VERSION_MINOR; 538 return EV_VERSION_MINOR;
390} 539}
391 540
541/* return true if we are running with elevated privileges and ignore env variables */
542static int
543enable_secure ()
544{
545 return getuid () != geteuid ()
546 || getgid () != getegid ();
547}
548
392int ev_init (int flags) 549int ev_init (int methods)
393{ 550{
394 if (!ev_method) 551 if (!ev_method)
395 { 552 {
396#if HAVE_MONOTONIC 553#if EV_USE_MONOTONIC
397 { 554 {
398 struct timespec ts; 555 struct timespec ts;
399 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 556 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
400 have_monotonic = 1; 557 have_monotonic = 1;
401 } 558 }
402#endif 559#endif
403 560
404 ev_now = ev_time (); 561 ev_now = ev_time ();
405 now = get_clock (); 562 now = get_clock ();
563 now_floor = now;
406 diff = ev_now - now; 564 diff = ev_now - now;
407 565
408 if (pipe (sigpipe)) 566 if (pipe (sigpipe))
409 return 0; 567 return 0;
410 568
569 if (methods == EVMETHOD_AUTO)
570 if (!enable_secure () && getenv ("LIBEV_METHODS"))
571 methods = atoi (getenv ("LIBEV_METHODS"));
572 else
411 ev_method = EVMETHOD_NONE; 573 methods = EVMETHOD_ANY;
574
575 ev_method = 0;
576#if EV_USE_KQUEUE
577 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
578#endif
412#if HAVE_EPOLL 579#if EV_USE_EPOLL
413 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 580 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
414#endif 581#endif
582#if EV_USE_POLL
583 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
584#endif
415#if HAVE_SELECT 585#if EV_USE_SELECT
416 if (ev_method == EVMETHOD_NONE) select_init (flags); 586 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
417#endif 587#endif
418 588
419 if (ev_method) 589 if (ev_method)
420 { 590 {
421 evw_init (&sigev, sigcb); 591 ev_watcher_init (&sigev, sigcb);
592 ev_set_priority (&sigev, EV_MAXPRI);
422 siginit (); 593 siginit ();
423 594
595#ifndef WIN32
424 evsignal_init (&childev, childcb, SIGCHLD); 596 ev_signal_init (&childev, childcb, SIGCHLD);
597 ev_set_priority (&childev, EV_MAXPRI);
425 evsignal_start (&childev); 598 ev_signal_start (&childev);
599#endif
426 } 600 }
427 } 601 }
428 602
429 return ev_method; 603 return ev_method;
430} 604}
431 605
432/*****************************************************************************/ 606/*****************************************************************************/
433 607
434void 608void
435ev_prefork (void) 609ev_fork_prepare (void)
436{ 610{
437 /* nop */ 611 /* nop */
438} 612}
439 613
440void 614void
441ev_postfork_parent (void) 615ev_fork_parent (void)
442{ 616{
443 /* nop */ 617 /* nop */
444} 618}
445 619
446void 620void
447ev_postfork_child (void) 621ev_fork_child (void)
448{ 622{
449#if HAVE_EPOLL 623#if EV_USE_EPOLL
450 if (ev_method == EVMETHOD_EPOLL) 624 if (ev_method == EVMETHOD_EPOLL)
451 epoll_postfork_child (); 625 epoll_postfork_child ();
452#endif 626#endif
453 627
454 evio_stop (&sigev); 628 ev_io_stop (&sigev);
455 close (sigpipe [0]); 629 close (sigpipe [0]);
456 close (sigpipe [1]); 630 close (sigpipe [1]);
457 pipe (sigpipe); 631 pipe (sigpipe);
458 siginit (); 632 siginit ();
459} 633}
460 634
461/*****************************************************************************/ 635/*****************************************************************************/
462 636
463static void 637static 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) 638call_pending (void)
491{ 639{
640 int pri;
641
642 for (pri = NUMPRI; pri--; )
492 while (pendingcnt) 643 while (pendingcnt [pri])
493 { 644 {
494 ANPENDING *p = pendings + --pendingcnt; 645 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
495 646
496 if (p->w) 647 if (p->w)
497 { 648 {
498 p->w->pending = 0; 649 p->w->pending = 0;
499 p->w->cb (p->w, p->events); 650 p->w->cb (p->w, p->events);
500 } 651 }
501 } 652 }
502} 653}
503 654
504static void 655static void
505timers_reify (void) 656timers_reify (void)
506{ 657{
507 while (timercnt && timers [0]->at <= now) 658 while (timercnt && timers [0]->at <= now)
508 { 659 {
509 struct ev_timer *w = timers [0]; 660 struct ev_timer *w = timers [0];
510
511 event ((W)w, EV_TIMEOUT);
512 661
513 /* first reschedule or stop timer */ 662 /* first reschedule or stop timer */
514 if (w->repeat) 663 if (w->repeat)
515 { 664 {
665 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
516 w->at = now + w->repeat; 666 w->at = now + w->repeat;
517 assert (("timer timeout in the past, negative repeat?", w->at > now));
518 downheap ((WT *)timers, timercnt, 0); 667 downheap ((WT *)timers, timercnt, 0);
519 } 668 }
520 else 669 else
521 evtimer_stop (w); /* nonrepeating: stop timer */ 670 ev_timer_stop (w); /* nonrepeating: stop timer */
671
672 event ((W)w, EV_TIMEOUT);
522 } 673 }
523} 674}
524 675
525static void 676static void
526periodics_reify (void) 677periodics_reify (void)
531 682
532 /* first reschedule or stop timer */ 683 /* first reschedule or stop timer */
533 if (w->interval) 684 if (w->interval)
534 { 685 {
535 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 686 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
536 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 687 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
537 downheap ((WT *)periodics, periodiccnt, 0); 688 downheap ((WT *)periodics, periodiccnt, 0);
538 } 689 }
539 else 690 else
540 evperiodic_stop (w); /* nonrepeating: stop timer */ 691 ev_periodic_stop (w); /* nonrepeating: stop timer */
541 692
542 event ((W)w, EV_TIMEOUT); 693 event ((W)w, EV_PERIODIC);
543 } 694 }
544} 695}
545 696
546static void 697static void
547periodics_reschedule (ev_tstamp diff) 698periodics_reschedule (ev_tstamp diff)
557 { 708 {
558 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 709 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
559 710
560 if (fabs (diff) >= 1e-4) 711 if (fabs (diff) >= 1e-4)
561 { 712 {
562 evperiodic_stop (w); 713 ev_periodic_stop (w);
563 evperiodic_start (w); 714 ev_periodic_start (w);
564 715
565 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 716 i = 0; /* restart loop, inefficient, but time jumps should be rare */
566 } 717 }
567 } 718 }
568 } 719 }
569} 720}
570 721
722static int
723time_update_monotonic (void)
724{
725 now = get_clock ();
726
727 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
728 {
729 ev_now = now + diff;
730 return 0;
731 }
732 else
733 {
734 now_floor = now;
735 ev_now = ev_time ();
736 return 1;
737 }
738}
739
571static void 740static void
572time_update (void) 741time_update (void)
573{ 742{
574 int i; 743 int i;
575 744
576 ev_now = ev_time (); 745#if EV_USE_MONOTONIC
577
578 if (have_monotonic) 746 if (expect_true (have_monotonic))
579 { 747 {
580 ev_tstamp odiff = diff; 748 if (time_update_monotonic ())
581
582 for (i = 4; --i; ) /* loop a few times, before making important decisions */
583 { 749 {
584 now = get_clock (); 750 ev_tstamp odiff = diff;
751
752 for (i = 4; --i; ) /* loop a few times, before making important decisions */
753 {
585 diff = ev_now - now; 754 diff = ev_now - now;
586 755
587 if (fabs (odiff - diff) < MIN_TIMEJUMP) 756 if (fabs (odiff - diff) < MIN_TIMEJUMP)
588 return; /* all is well */ 757 return; /* all is well */
589 758
590 ev_now = ev_time (); 759 ev_now = ev_time ();
760 now = get_clock ();
761 now_floor = now;
762 }
763
764 periodics_reschedule (diff - odiff);
765 /* no timer adjustment, as the monotonic clock doesn't jump */
591 } 766 }
592
593 periodics_reschedule (diff - odiff);
594 /* no timer adjustment, as the monotonic clock doesn't jump */
595 } 767 }
596 else 768 else
769#endif
597 { 770 {
771 ev_now = ev_time ();
772
598 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 773 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
599 { 774 {
600 periodics_reschedule (ev_now - now); 775 periodics_reschedule (ev_now - now);
601 776
602 /* adjust timers. this is easy, as the offset is the same for all */ 777 /* adjust timers. this is easy, as the offset is the same for all */
603 for (i = 0; i < timercnt; ++i) 778 for (i = 0; i < timercnt; ++i)
611int ev_loop_done; 786int ev_loop_done;
612 787
613void ev_loop (int flags) 788void ev_loop (int flags)
614{ 789{
615 double block; 790 double block;
616 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 791 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
617 792
618 do 793 do
619 { 794 {
620 /* queue check watchers (and execute them) */ 795 /* queue check watchers (and execute them) */
621 if (preparecnt) 796 if (expect_false (preparecnt))
622 { 797 {
623 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 798 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
624 call_pending (); 799 call_pending ();
625 } 800 }
626 801
629 804
630 /* calculate blocking time */ 805 /* calculate blocking time */
631 806
632 /* we only need this for !monotonic clockor timers, but as we basically 807 /* we only need this for !monotonic clockor timers, but as we basically
633 always have timers, we just calculate it always */ 808 always have timers, we just calculate it always */
809#if EV_USE_MONOTONIC
810 if (expect_true (have_monotonic))
811 time_update_monotonic ();
812 else
813#endif
814 {
634 ev_now = ev_time (); 815 ev_now = ev_time ();
816 now = ev_now;
817 }
635 818
636 if (flags & EVLOOP_NONBLOCK || idlecnt) 819 if (flags & EVLOOP_NONBLOCK || idlecnt)
637 block = 0.; 820 block = 0.;
638 else 821 else
639 { 822 {
640 block = MAX_BLOCKTIME; 823 block = MAX_BLOCKTIME;
641 824
642 if (timercnt) 825 if (timercnt)
643 { 826 {
644 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 827 ev_tstamp to = timers [0]->at - now + method_fudge;
645 if (block > to) block = to; 828 if (block > to) block = to;
646 } 829 }
647 830
648 if (periodiccnt) 831 if (periodiccnt)
649 { 832 {
702 head = &(*head)->next; 885 head = &(*head)->next;
703 } 886 }
704} 887}
705 888
706static void 889static void
707ev_clear (W w) 890ev_clear_pending (W w)
708{ 891{
709 if (w->pending) 892 if (w->pending)
710 { 893 {
711 pendings [w->pending - 1].w = 0; 894 pendings [ABSPRI (w)][w->pending - 1].w = 0;
712 w->pending = 0; 895 w->pending = 0;
713 } 896 }
714} 897}
715 898
716static void 899static void
717ev_start (W w, int active) 900ev_start (W w, int active)
718{ 901{
902 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
903 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
904
719 w->active = active; 905 w->active = active;
720} 906}
721 907
722static void 908static void
723ev_stop (W w) 909ev_stop (W w)
726} 912}
727 913
728/*****************************************************************************/ 914/*****************************************************************************/
729 915
730void 916void
731evio_start (struct ev_io *w) 917ev_io_start (struct ev_io *w)
732{ 918{
919 int fd = w->fd;
920
733 if (ev_is_active (w)) 921 if (ev_is_active (w))
734 return; 922 return;
735 923
736 int fd = w->fd; 924 assert (("ev_io_start called with negative fd", fd >= 0));
737 925
738 ev_start ((W)w, 1); 926 ev_start ((W)w, 1);
739 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 927 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
740 wlist_add ((WL *)&anfds[fd].head, (WL)w); 928 wlist_add ((WL *)&anfds[fd].head, (WL)w);
741 929
742 ++fdchangecnt; 930 fd_change (fd);
743 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
744 fdchanges [fdchangecnt - 1] = fd;
745} 931}
746 932
747void 933void
748evio_stop (struct ev_io *w) 934ev_io_stop (struct ev_io *w)
749{ 935{
750 ev_clear ((W)w); 936 ev_clear_pending ((W)w);
751 if (!ev_is_active (w)) 937 if (!ev_is_active (w))
752 return; 938 return;
753 939
754 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 940 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
755 ev_stop ((W)w); 941 ev_stop ((W)w);
756 942
757 ++fdchangecnt; 943 fd_change (w->fd);
758 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
759 fdchanges [fdchangecnt - 1] = w->fd;
760} 944}
761 945
762void 946void
763evtimer_start (struct ev_timer *w) 947ev_timer_start (struct ev_timer *w)
764{ 948{
765 if (ev_is_active (w)) 949 if (ev_is_active (w))
766 return; 950 return;
767 951
768 w->at += now; 952 w->at += now;
769 953
770 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 954 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
771 955
772 ev_start ((W)w, ++timercnt); 956 ev_start ((W)w, ++timercnt);
773 array_needsize (timers, timermax, timercnt, ); 957 array_needsize (timers, timermax, timercnt, );
774 timers [timercnt - 1] = w; 958 timers [timercnt - 1] = w;
775 upheap ((WT *)timers, timercnt - 1); 959 upheap ((WT *)timers, timercnt - 1);
776} 960}
777 961
778void 962void
779evtimer_stop (struct ev_timer *w) 963ev_timer_stop (struct ev_timer *w)
780{ 964{
781 ev_clear ((W)w); 965 ev_clear_pending ((W)w);
782 if (!ev_is_active (w)) 966 if (!ev_is_active (w))
783 return; 967 return;
784 968
785 if (w->active < timercnt--) 969 if (w->active < timercnt--)
786 { 970 {
792 976
793 ev_stop ((W)w); 977 ev_stop ((W)w);
794} 978}
795 979
796void 980void
797evtimer_again (struct ev_timer *w) 981ev_timer_again (struct ev_timer *w)
798{ 982{
799 if (ev_is_active (w)) 983 if (ev_is_active (w))
800 { 984 {
801 if (w->repeat) 985 if (w->repeat)
802 { 986 {
803 w->at = now + w->repeat; 987 w->at = now + w->repeat;
804 downheap ((WT *)timers, timercnt, w->active - 1); 988 downheap ((WT *)timers, timercnt, w->active - 1);
805 } 989 }
806 else 990 else
807 evtimer_stop (w); 991 ev_timer_stop (w);
808 } 992 }
809 else if (w->repeat) 993 else if (w->repeat)
810 evtimer_start (w); 994 ev_timer_start (w);
811} 995}
812 996
813void 997void
814evperiodic_start (struct ev_periodic *w) 998ev_periodic_start (struct ev_periodic *w)
815{ 999{
816 if (ev_is_active (w)) 1000 if (ev_is_active (w))
817 return; 1001 return;
818 1002
819 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 1003 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
820 1004
821 /* this formula differs from the one in periodic_reify because we do not always round up */ 1005 /* this formula differs from the one in periodic_reify because we do not always round up */
822 if (w->interval) 1006 if (w->interval)
823 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1007 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
824 1008
827 periodics [periodiccnt - 1] = w; 1011 periodics [periodiccnt - 1] = w;
828 upheap ((WT *)periodics, periodiccnt - 1); 1012 upheap ((WT *)periodics, periodiccnt - 1);
829} 1013}
830 1014
831void 1015void
832evperiodic_stop (struct ev_periodic *w) 1016ev_periodic_stop (struct ev_periodic *w)
833{ 1017{
834 ev_clear ((W)w); 1018 ev_clear_pending ((W)w);
835 if (!ev_is_active (w)) 1019 if (!ev_is_active (w))
836 return; 1020 return;
837 1021
838 if (w->active < periodiccnt--) 1022 if (w->active < periodiccnt--)
839 { 1023 {
842 } 1026 }
843 1027
844 ev_stop ((W)w); 1028 ev_stop ((W)w);
845} 1029}
846 1030
1031#ifndef SA_RESTART
1032# define SA_RESTART 0
1033#endif
1034
847void 1035void
848evsignal_start (struct ev_signal *w) 1036ev_signal_start (struct ev_signal *w)
849{ 1037{
850 if (ev_is_active (w)) 1038 if (ev_is_active (w))
851 return; 1039 return;
1040
1041 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
852 1042
853 ev_start ((W)w, 1); 1043 ev_start ((W)w, 1);
854 array_needsize (signals, signalmax, w->signum, signals_init); 1044 array_needsize (signals, signalmax, w->signum, signals_init);
855 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1045 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
856 1046
857 if (!w->next) 1047 if (!w->next)
858 { 1048 {
859 struct sigaction sa; 1049 struct sigaction sa;
860 sa.sa_handler = sighandler; 1050 sa.sa_handler = sighandler;
861 sigfillset (&sa.sa_mask); 1051 sigfillset (&sa.sa_mask);
862 sa.sa_flags = 0; 1052 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
863 sigaction (w->signum, &sa, 0); 1053 sigaction (w->signum, &sa, 0);
864 } 1054 }
865} 1055}
866 1056
867void 1057void
868evsignal_stop (struct ev_signal *w) 1058ev_signal_stop (struct ev_signal *w)
869{ 1059{
870 ev_clear ((W)w); 1060 ev_clear_pending ((W)w);
871 if (!ev_is_active (w)) 1061 if (!ev_is_active (w))
872 return; 1062 return;
873 1063
874 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1064 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
875 ev_stop ((W)w); 1065 ev_stop ((W)w);
876 1066
877 if (!signals [w->signum - 1].head) 1067 if (!signals [w->signum - 1].head)
878 signal (w->signum, SIG_DFL); 1068 signal (w->signum, SIG_DFL);
879} 1069}
880 1070
1071void
881void evidle_start (struct ev_idle *w) 1072ev_idle_start (struct ev_idle *w)
882{ 1073{
883 if (ev_is_active (w)) 1074 if (ev_is_active (w))
884 return; 1075 return;
885 1076
886 ev_start ((W)w, ++idlecnt); 1077 ev_start ((W)w, ++idlecnt);
887 array_needsize (idles, idlemax, idlecnt, ); 1078 array_needsize (idles, idlemax, idlecnt, );
888 idles [idlecnt - 1] = w; 1079 idles [idlecnt - 1] = w;
889} 1080}
890 1081
1082void
891void evidle_stop (struct ev_idle *w) 1083ev_idle_stop (struct ev_idle *w)
892{ 1084{
893 ev_clear ((W)w); 1085 ev_clear_pending ((W)w);
894 if (ev_is_active (w)) 1086 if (ev_is_active (w))
895 return; 1087 return;
896 1088
897 idles [w->active - 1] = idles [--idlecnt]; 1089 idles [w->active - 1] = idles [--idlecnt];
898 ev_stop ((W)w); 1090 ev_stop ((W)w);
899} 1091}
900 1092
1093void
901void evprepare_start (struct ev_prepare *w) 1094ev_prepare_start (struct ev_prepare *w)
902{ 1095{
903 if (ev_is_active (w)) 1096 if (ev_is_active (w))
904 return; 1097 return;
905 1098
906 ev_start ((W)w, ++preparecnt); 1099 ev_start ((W)w, ++preparecnt);
907 array_needsize (prepares, preparemax, preparecnt, ); 1100 array_needsize (prepares, preparemax, preparecnt, );
908 prepares [preparecnt - 1] = w; 1101 prepares [preparecnt - 1] = w;
909} 1102}
910 1103
1104void
911void evprepare_stop (struct ev_prepare *w) 1105ev_prepare_stop (struct ev_prepare *w)
912{ 1106{
913 ev_clear ((W)w); 1107 ev_clear_pending ((W)w);
914 if (ev_is_active (w)) 1108 if (ev_is_active (w))
915 return; 1109 return;
916 1110
917 prepares [w->active - 1] = prepares [--preparecnt]; 1111 prepares [w->active - 1] = prepares [--preparecnt];
918 ev_stop ((W)w); 1112 ev_stop ((W)w);
919} 1113}
920 1114
1115void
921void evcheck_start (struct ev_check *w) 1116ev_check_start (struct ev_check *w)
922{ 1117{
923 if (ev_is_active (w)) 1118 if (ev_is_active (w))
924 return; 1119 return;
925 1120
926 ev_start ((W)w, ++checkcnt); 1121 ev_start ((W)w, ++checkcnt);
927 array_needsize (checks, checkmax, checkcnt, ); 1122 array_needsize (checks, checkmax, checkcnt, );
928 checks [checkcnt - 1] = w; 1123 checks [checkcnt - 1] = w;
929} 1124}
930 1125
1126void
931void evcheck_stop (struct ev_check *w) 1127ev_check_stop (struct ev_check *w)
932{ 1128{
933 ev_clear ((W)w); 1129 ev_clear_pending ((W)w);
934 if (ev_is_active (w)) 1130 if (ev_is_active (w))
935 return; 1131 return;
936 1132
937 checks [w->active - 1] = checks [--checkcnt]; 1133 checks [w->active - 1] = checks [--checkcnt];
938 ev_stop ((W)w); 1134 ev_stop ((W)w);
939} 1135}
940 1136
1137void
941void evchild_start (struct ev_child *w) 1138ev_child_start (struct ev_child *w)
942{ 1139{
943 if (ev_is_active (w)) 1140 if (ev_is_active (w))
944 return; 1141 return;
945 1142
946 ev_start ((W)w, 1); 1143 ev_start ((W)w, 1);
947 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1144 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
948} 1145}
949 1146
1147void
950void evchild_stop (struct ev_child *w) 1148ev_child_stop (struct ev_child *w)
951{ 1149{
952 ev_clear ((W)w); 1150 ev_clear_pending ((W)w);
953 if (ev_is_active (w)) 1151 if (ev_is_active (w))
954 return; 1152 return;
955 1153
956 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1154 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
957 ev_stop ((W)w); 1155 ev_stop ((W)w);
971once_cb (struct ev_once *once, int revents) 1169once_cb (struct ev_once *once, int revents)
972{ 1170{
973 void (*cb)(int revents, void *arg) = once->cb; 1171 void (*cb)(int revents, void *arg) = once->cb;
974 void *arg = once->arg; 1172 void *arg = once->arg;
975 1173
976 evio_stop (&once->io); 1174 ev_io_stop (&once->io);
977 evtimer_stop (&once->to); 1175 ev_timer_stop (&once->to);
978 free (once); 1176 free (once);
979 1177
980 cb (revents, arg); 1178 cb (revents, arg);
981} 1179}
982 1180
996ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1194ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
997{ 1195{
998 struct ev_once *once = malloc (sizeof (struct ev_once)); 1196 struct ev_once *once = malloc (sizeof (struct ev_once));
999 1197
1000 if (!once) 1198 if (!once)
1001 cb (EV_ERROR, arg); 1199 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1002 else 1200 else
1003 { 1201 {
1004 once->cb = cb; 1202 once->cb = cb;
1005 once->arg = arg; 1203 once->arg = arg;
1006 1204
1007 evw_init (&once->io, once_cb_io); 1205 ev_watcher_init (&once->io, once_cb_io);
1008
1009 if (fd >= 0) 1206 if (fd >= 0)
1010 { 1207 {
1011 evio_set (&once->io, fd, events); 1208 ev_io_set (&once->io, fd, events);
1012 evio_start (&once->io); 1209 ev_io_start (&once->io);
1013 } 1210 }
1014 1211
1015 evw_init (&once->to, once_cb_to); 1212 ev_watcher_init (&once->to, once_cb_to);
1016
1017 if (timeout >= 0.) 1213 if (timeout >= 0.)
1018 { 1214 {
1019 evtimer_set (&once->to, timeout, 0.); 1215 ev_timer_set (&once->to, timeout, 0.);
1020 evtimer_start (&once->to); 1216 ev_timer_start (&once->to);
1021 } 1217 }
1022 } 1218 }
1023} 1219}
1024 1220
1025/*****************************************************************************/ 1221/*****************************************************************************/
1036 1232
1037static void 1233static void
1038ocb (struct ev_timer *w, int revents) 1234ocb (struct ev_timer *w, int revents)
1039{ 1235{
1040 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1236 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
1041 evtimer_stop (w); 1237 ev_timer_stop (w);
1042 evtimer_start (w); 1238 ev_timer_start (w);
1043} 1239}
1044 1240
1045static void 1241static void
1046scb (struct ev_signal *w, int revents) 1242scb (struct ev_signal *w, int revents)
1047{ 1243{
1048 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1244 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1049 evio_stop (&wio); 1245 ev_io_stop (&wio);
1050 evio_start (&wio); 1246 ev_io_start (&wio);
1051} 1247}
1052 1248
1053static void 1249static void
1054gcb (struct ev_signal *w, int revents) 1250gcb (struct ev_signal *w, int revents)
1055{ 1251{
1059 1255
1060int main (void) 1256int main (void)
1061{ 1257{
1062 ev_init (0); 1258 ev_init (0);
1063 1259
1064 evio_init (&wio, sin_cb, 0, EV_READ); 1260 ev_io_init (&wio, sin_cb, 0, EV_READ);
1065 evio_start (&wio); 1261 ev_io_start (&wio);
1066 1262
1067 struct ev_timer t[10000]; 1263 struct ev_timer t[10000];
1068 1264
1069#if 0 1265#if 0
1070 int i; 1266 int i;
1071 for (i = 0; i < 10000; ++i) 1267 for (i = 0; i < 10000; ++i)
1072 { 1268 {
1073 struct ev_timer *w = t + i; 1269 struct ev_timer *w = t + i;
1074 evw_init (w, ocb, i); 1270 ev_watcher_init (w, ocb, i);
1075 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1271 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1076 evtimer_start (w); 1272 ev_timer_start (w);
1077 if (drand48 () < 0.5) 1273 if (drand48 () < 0.5)
1078 evtimer_stop (w); 1274 ev_timer_stop (w);
1079 } 1275 }
1080#endif 1276#endif
1081 1277
1082 struct ev_timer t1; 1278 struct ev_timer t1;
1083 evtimer_init (&t1, ocb, 5, 10); 1279 ev_timer_init (&t1, ocb, 5, 10);
1084 evtimer_start (&t1); 1280 ev_timer_start (&t1);
1085 1281
1086 struct ev_signal sig; 1282 struct ev_signal sig;
1087 evsignal_init (&sig, scb, SIGQUIT); 1283 ev_signal_init (&sig, scb, SIGQUIT);
1088 evsignal_start (&sig); 1284 ev_signal_start (&sig);
1089 1285
1090 struct ev_check cw; 1286 struct ev_check cw;
1091 evcheck_init (&cw, gcb); 1287 ev_check_init (&cw, gcb);
1092 evcheck_start (&cw); 1288 ev_check_start (&cw);
1093 1289
1094 struct ev_idle iw; 1290 struct ev_idle iw;
1095 evidle_init (&iw, gcb); 1291 ev_idle_init (&iw, gcb);
1096 evidle_start (&iw); 1292 ev_idle_start (&iw);
1097 1293
1098 ev_loop (0); 1294 ev_loop (0);
1099 1295
1100 return 0; 1296 return 0;
1101} 1297}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines