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

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines