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

Diff Legend

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