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

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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines