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

Diff Legend

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