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

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

1/*
2 * libev event processing core, watcher management
3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions are
9 * met:
10 *
11 * * Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 *
14 * * Redistributions in binary form must reproduce the above
15 * copyright notice, this list of conditions and the following
16 * disclaimer in the documentation and/or other materials provided
17 * with the distribution.
18 *
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31#ifndef EV_STANDALONE
32# include "config.h"
33#endif
34
1#include <math.h> 35#include <math.h>
2#include <stdlib.h> 36#include <stdlib.h>
3#include <unistd.h> 37#include <unistd.h>
4#include <fcntl.h> 38#include <fcntl.h>
5#include <signal.h> 39#include <signal.h>
40#include <stddef.h>
6 41
7#include <stdio.h> 42#include <stdio.h>
8 43
9#include <assert.h> 44#include <assert.h>
10#include <errno.h> 45#include <errno.h>
46#include <sys/types.h>
47#ifndef WIN32
48# include <sys/wait.h>
49#endif
11#include <sys/time.h> 50#include <sys/time.h>
12#include <time.h> 51#include <time.h>
13 52
14#define HAVE_EPOLL 1 53/**/
15 54
16#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
17# ifdef CLOCK_MONOTONIC 81#ifndef CLOCK_MONOTONIC
82# undef EV_USE_MONOTONIC
18# define HAVE_MONOTONIC 1 83# define EV_USE_MONOTONIC 0
19# endif 84#endif
20#endif
21 85
22#ifndef HAVE_SELECT
23# define HAVE_SELECT 1
24#endif
25
26#ifndef HAVE_EPOLL
27# define HAVE_EPOLL 0
28#endif
29
30#ifndef HAVE_REALTIME 86#ifndef CLOCK_REALTIME
31# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 87# undef EV_USE_REALTIME
88# define EV_USE_REALTIME 0
32#endif 89#endif
90
91/**/
33 92
34#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) */
35#define MAX_BLOCKTIME 60. 94#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
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 */
36 97
37#include "ev.h" 98#include "ev.h"
38 99
39struct ev_watcher { 100#if __GNUC__ >= 3
40 EV_WATCHER (ev_watcher); 101# define expect(expr,value) __builtin_expect ((expr),(value))
41}; 102# define inline inline
103#else
104# define expect(expr,value) (expr)
105# define inline static
106#endif
42 107
43struct ev_watcher_list { 108#define expect_false(expr) expect ((expr) != 0, 0)
44 EV_WATCHER_LIST (ev_watcher_list); 109#define expect_true(expr) expect ((expr) != 0, 1)
45};
46 110
47struct ev_watcher_time { 111#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
48 EV_WATCHER_TIME (ev_watcher_time); 112#define ABSPRI(w) ((w)->priority - EV_MINPRI)
49};
50 113
51typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
52typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
53typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
54 117
55static ev_tstamp now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, now, diff; /* monotonic clock */
56ev_tstamp ev_now; 119ev_tstamp ev_now;
57int ev_method; 120int ev_method;
58 121
59static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
60 123
65/*****************************************************************************/ 128/*****************************************************************************/
66 129
67ev_tstamp 130ev_tstamp
68ev_time (void) 131ev_time (void)
69{ 132{
70#if HAVE_REALTIME 133#if EV_USE_REALTIME
71 struct timespec ts; 134 struct timespec ts;
72 clock_gettime (CLOCK_REALTIME, &ts); 135 clock_gettime (CLOCK_REALTIME, &ts);
73 return ts.tv_sec + ts.tv_nsec * 1e-9; 136 return ts.tv_sec + ts.tv_nsec * 1e-9;
74#else 137#else
75 struct timeval tv; 138 struct timeval tv;
79} 142}
80 143
81static ev_tstamp 144static ev_tstamp
82get_clock (void) 145get_clock (void)
83{ 146{
84#if HAVE_MONOTONIC 147#if EV_USE_MONOTONIC
85 if (have_monotonic) 148 if (expect_true (have_monotonic))
86 { 149 {
87 struct timespec ts; 150 struct timespec ts;
88 clock_gettime (CLOCK_MONOTONIC, &ts); 151 clock_gettime (CLOCK_MONOTONIC, &ts);
89 return ts.tv_sec + ts.tv_nsec * 1e-9; 152 return ts.tv_sec + ts.tv_nsec * 1e-9;
90 } 153 }
91#endif 154#endif
92 155
93 return ev_time (); 156 return ev_time ();
94} 157}
95 158
159#define array_roundsize(base,n) ((n) | 4 & ~3)
160
96#define array_needsize(base,cur,cnt,init) \ 161#define array_needsize(base,cur,cnt,init) \
97 if ((cnt) > cur) \ 162 if (expect_false ((cnt) > cur)) \
98 { \ 163 { \
99 int newcnt = cur ? cur << 1 : 16; \ 164 int newcnt = cur; \
100 fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\ 165 do \
166 { \
167 newcnt = array_roundsize (base, newcnt << 1); \
168 } \
169 while ((cnt) > newcnt); \
170 \
101 base = realloc (base, sizeof (*base) * (newcnt)); \ 171 base = realloc (base, sizeof (*base) * (newcnt)); \
102 init (base + cur, newcnt - cur); \ 172 init (base + cur, newcnt - cur); \
103 cur = newcnt; \ 173 cur = newcnt; \
104 } 174 }
105 175
106/*****************************************************************************/ 176/*****************************************************************************/
107 177
108typedef struct 178typedef struct
109{ 179{
110 struct ev_io *head; 180 struct ev_watcher_list *head;
111 unsigned char wev, rev; /* want, received event set */ 181 unsigned char events;
182 unsigned char reify;
112} ANFD; 183} ANFD;
113 184
114static ANFD *anfds; 185static ANFD *anfds;
115static int anfdmax; 186static int anfdmax;
116 187
117static int *fdchanges;
118static int fdchangemax, fdchangecnt;
119
120static void 188static void
121anfds_init (ANFD *base, int count) 189anfds_init (ANFD *base, int count)
122{ 190{
123 while (count--) 191 while (count--)
124 { 192 {
125 base->head = 0; 193 base->head = 0;
126 base->wev = base->rev = EV_NONE; 194 base->events = EV_NONE;
195 base->reify = 0;
196
127 ++base; 197 ++base;
128 } 198 }
129} 199}
130 200
131typedef struct 201typedef struct
132{ 202{
133 W w; 203 W w;
134 int events; 204 int events;
135} ANPENDING; 205} ANPENDING;
136 206
137static ANPENDING *pendings; 207static ANPENDING *pendings [NUMPRI];
138static int pendingmax, pendingcnt; 208static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
139 209
140static void 210static void
141event (W w, int events) 211event (W w, int events)
142{ 212{
213 if (w->pending)
214 {
215 pendings [ABSPRI (w)][w->pending - 1].events |= events;
216 return;
217 }
218
143 w->pending = ++pendingcnt; 219 w->pending = ++pendingcnt [ABSPRI (w)];
144 array_needsize (pendings, pendingmax, pendingcnt, ); 220 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
145 pendings [pendingcnt - 1].w = w; 221 pendings [ABSPRI (w)][w->pending - 1].w = w;
146 pendings [pendingcnt - 1].events = events; 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);
147} 232}
148 233
149static void 234static void
150fd_event (int fd, int events) 235fd_event (int fd, int events)
151{ 236{
152 ANFD *anfd = anfds + fd; 237 ANFD *anfd = anfds + fd;
153 struct ev_io *w; 238 struct ev_io *w;
154 239
155 for (w = anfd->head; w; w = w->next) 240 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
156 { 241 {
157 int ev = w->events & events; 242 int ev = w->events & events;
158 243
159 if (ev) 244 if (ev)
160 event ((W)w, ev); 245 event ((W)w, ev);
161 } 246 }
162} 247}
163 248
249/*****************************************************************************/
250
251static int *fdchanges;
252static int fdchangemax, fdchangecnt;
253
164static void 254static void
165queue_events (W *events, int eventcnt, int type) 255fd_reify (void)
166{ 256{
167 int i; 257 int i;
168 258
169 for (i = 0; i < eventcnt; ++i) 259 for (i = 0; i < fdchangecnt; ++i)
170 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 }
305}
306
307/* called on EBADF to verify fds */
308static void
309fd_ebadf (void)
310{
311 int fd;
312
313 for (fd = 0; fd < anfdmax; ++fd)
314 if (anfds [fd].events)
315 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
316 fd_kill (fd);
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 }
171} 332}
172 333
173/*****************************************************************************/ 334/*****************************************************************************/
174 335
175static struct ev_timer **timers; 336static struct ev_timer **timers;
221 382
222/*****************************************************************************/ 383/*****************************************************************************/
223 384
224typedef struct 385typedef struct
225{ 386{
226 struct ev_signal *head; 387 struct ev_watcher_list *head;
227 sig_atomic_t gotsig; 388 sig_atomic_t volatile gotsig;
228} ANSIG; 389} ANSIG;
229 390
230static ANSIG *signals; 391static ANSIG *signals;
231static int signalmax; 392static int signalmax;
232 393
233static int sigpipe [2]; 394static int sigpipe [2];
234static sig_atomic_t gotsig; 395static sig_atomic_t volatile gotsig;
235static struct ev_io sigev; 396static struct ev_io sigev;
236 397
237static void 398static void
238signals_init (ANSIG *base, int count) 399signals_init (ANSIG *base, int count)
239{ 400{
240 while (count--) 401 while (count--)
241 { 402 {
242 base->head = 0; 403 base->head = 0;
243 base->gotsig = 0; 404 base->gotsig = 0;
405
244 ++base; 406 ++base;
245 } 407 }
246} 408}
247 409
248static void 410static void
250{ 412{
251 signals [signum - 1].gotsig = 1; 413 signals [signum - 1].gotsig = 1;
252 414
253 if (!gotsig) 415 if (!gotsig)
254 { 416 {
417 int old_errno = errno;
255 gotsig = 1; 418 gotsig = 1;
256 write (sigpipe [1], &gotsig, 1); 419 write (sigpipe [1], &signum, 1);
420 errno = old_errno;
257 } 421 }
258} 422}
259 423
260static void 424static void
261sigcb (struct ev_io *iow, int revents) 425sigcb (struct ev_io *iow, int revents)
262{ 426{
263 struct ev_signal *w; 427 struct ev_watcher_list *w;
264 int sig; 428 int signum;
265 429
430 read (sigpipe [0], &revents, 1);
266 gotsig = 0; 431 gotsig = 0;
267 read (sigpipe [0], &revents, 1);
268 432
269 for (sig = signalmax; sig--; ) 433 for (signum = signalmax; signum--; )
270 if (signals [sig].gotsig) 434 if (signals [signum].gotsig)
271 { 435 {
272 signals [sig].gotsig = 0; 436 signals [signum].gotsig = 0;
273 437
274 for (w = signals [sig].head; w; w = w->next) 438 for (w = signals [signum].head; w; w = w->next)
275 event ((W)w, EV_SIGNAL); 439 event ((W)w, EV_SIGNAL);
276 } 440 }
277} 441}
278 442
279static void 443static void
280siginit (void) 444siginit (void)
281{ 445{
446#ifndef WIN32
282 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 447 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
283 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 448 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
284 449
285 /* rather than sort out wether we really need nb, set it */ 450 /* rather than sort out wether we really need nb, set it */
286 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 451 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
287 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 452 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
453#endif
288 454
289 evio_set (&sigev, sigpipe [0], EV_READ); 455 ev_io_set (&sigev, sigpipe [0], EV_READ);
290 evio_start (&sigev); 456 ev_io_start (&sigev);
291} 457}
292 458
293/*****************************************************************************/ 459/*****************************************************************************/
294 460
295static struct ev_idle **idles; 461static struct ev_idle **idles;
296static int idlemax, idlecnt; 462static int idlemax, idlecnt;
297 463
464static struct ev_prepare **prepares;
465static int preparemax, preparecnt;
466
298static struct ev_check **checks; 467static struct ev_check **checks;
299static int checkmax, checkcnt; 468static int checkmax, checkcnt;
300 469
301/*****************************************************************************/ 470/*****************************************************************************/
302 471
472static struct ev_child *childs [PID_HASHSIZE];
473static struct ev_signal childev;
474
475#ifndef WIN32
476
477#ifndef WCONTINUED
478# define WCONTINUED 0
479#endif
480
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
497childcb (struct ev_signal *sw, int revents)
498{
499 int pid, status;
500
501 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
502 {
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
303#if HAVE_EPOLL 518#if EV_USE_EPOLL
304# include "ev_epoll.c" 519# include "ev_epoll.c"
305#endif 520#endif
521#if EV_USE_POLL
522# include "ev_poll.c"
523#endif
306#if HAVE_SELECT 524#if EV_USE_SELECT
307# include "ev_select.c" 525# include "ev_select.c"
308#endif 526#endif
309 527
310int ev_init (int flags) 528int
529ev_version_major (void)
311{ 530{
312#if HAVE_MONOTONIC 531 return EV_VERSION_MAJOR;
313 { 532}
314 struct timespec ts;
315 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
316 have_monotonic = 1;
317 }
318#endif
319 533
320 ev_now = ev_time (); 534int
321 now = get_clock (); 535ev_version_minor (void)
322 diff = ev_now - now; 536{
537 return EV_VERSION_MINOR;
538}
323 539
324 if (pipe (sigpipe)) 540/* return true if we are running with elevated privileges and should ignore env variables */
541static int
542enable_secure ()
543{
544#ifdef WIN32
325 return 0; 545 return 0;
326 546#else
327 ev_method = EVMETHOD_NONE; 547 return getuid () != geteuid ()
328#if HAVE_EPOLL 548 || getgid () != getegid ();
329 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
330#endif 549#endif
331#if HAVE_SELECT 550}
332 if (ev_method == EVMETHOD_NONE) select_init (flags);
333#endif
334 551
552int ev_init (int methods)
553{
335 if (ev_method) 554 if (!ev_method)
555 {
556#if EV_USE_MONOTONIC
336 { 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)
593 {
337 evw_init (&sigev, sigcb); 594 ev_watcher_init (&sigev, sigcb);
595 ev_set_priority (&sigev, EV_MAXPRI);
338 siginit (); 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
603 }
339 } 604 }
340 605
341 return ev_method; 606 return ev_method;
342} 607}
343 608
344/*****************************************************************************/ 609/*****************************************************************************/
345 610
346void ev_prefork (void) 611void
612ev_fork_prepare (void)
347{ 613{
348 /* nop */ 614 /* nop */
349} 615}
350 616
617void
351void ev_postfork_parent (void) 618ev_fork_parent (void)
352{ 619{
353 /* nop */ 620 /* nop */
354} 621}
355 622
623void
356void ev_postfork_child (void) 624ev_fork_child (void)
357{ 625{
358#if HAVE_EPOLL 626#if EV_USE_EPOLL
359 if (ev_method == EVMETHOD_EPOLL) 627 if (ev_method == EVMETHOD_EPOLL)
360 epoll_postfork_child (); 628 epoll_postfork_child ();
361#endif 629#endif
362 630
363 evio_stop (&sigev); 631 ev_io_stop (&sigev);
364 close (sigpipe [0]); 632 close (sigpipe [0]);
365 close (sigpipe [1]); 633 close (sigpipe [1]);
366 pipe (sigpipe); 634 pipe (sigpipe);
367 siginit (); 635 siginit ();
368} 636}
369 637
370/*****************************************************************************/ 638/*****************************************************************************/
371 639
372static void 640static void
373fd_reify (void) 641call_pending (void)
374{ 642{
375 int i; 643 int pri;
376 644
377 for (i = 0; i < fdchangecnt; ++i) 645 for (pri = NUMPRI; pri--; )
378 { 646 while (pendingcnt [pri])
379 int fd = fdchanges [i];
380 ANFD *anfd = anfds + fd;
381 struct ev_io *w;
382
383 int wev = 0;
384
385 for (w = anfd->head; w; w = w->next)
386 wev |= w->events;
387
388 if (anfd->wev != wev)
389 { 647 {
390 method_modify (fd, anfd->wev, wev); 648 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
391 anfd->wev = wev;
392 }
393 }
394 649
395 fdchangecnt = 0;
396}
397
398static void
399call_pending ()
400{
401 int i;
402
403 for (i = 0; i < pendingcnt; ++i)
404 {
405 ANPENDING *p = pendings + i;
406
407 if (p->w) 650 if (p->w)
408 { 651 {
409 p->w->pending = 0; 652 p->w->pending = 0;
410 p->w->cb (p->w, p->events); 653 p->w->cb (p->w, p->events);
411 } 654 }
412 } 655 }
413
414 pendingcnt = 0;
415} 656}
416 657
417static void 658static void
418timers_reify () 659timers_reify (void)
419{ 660{
420 while (timercnt && timers [0]->at <= now) 661 while (timercnt && timers [0]->at <= now)
421 { 662 {
422 struct ev_timer *w = timers [0]; 663 struct ev_timer *w = timers [0];
423 664
424 /* first reschedule or stop timer */ 665 /* first reschedule or stop timer */
425 if (w->repeat) 666 if (w->repeat)
426 { 667 {
668 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
427 w->at = now + w->repeat; 669 w->at = now + w->repeat;
428 assert (("timer timeout in the past, negative repeat?", w->at > now));
429 downheap ((WT *)timers, timercnt, 0); 670 downheap ((WT *)timers, timercnt, 0);
430 } 671 }
431 else 672 else
432 evtimer_stop (w); /* nonrepeating: stop timer */ 673 ev_timer_stop (w); /* nonrepeating: stop timer */
433 674
434 event ((W)w, EV_TIMEOUT); 675 event ((W)w, EV_TIMEOUT);
435 } 676 }
436} 677}
437 678
438static void 679static void
439periodics_reify () 680periodics_reify (void)
440{ 681{
441 while (periodiccnt && periodics [0]->at <= ev_now) 682 while (periodiccnt && periodics [0]->at <= ev_now)
442 { 683 {
443 struct ev_periodic *w = periodics [0]; 684 struct ev_periodic *w = periodics [0];
444 685
445 /* first reschedule or stop timer */ 686 /* first reschedule or stop timer */
446 if (w->interval) 687 if (w->interval)
447 { 688 {
448 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;
449 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));
450 downheap ((WT *)periodics, periodiccnt, 0); 691 downheap ((WT *)periodics, periodiccnt, 0);
451 } 692 }
452 else 693 else
453 evperiodic_stop (w); /* nonrepeating: stop timer */ 694 ev_periodic_stop (w); /* nonrepeating: stop timer */
454 695
455 event ((W)w, EV_TIMEOUT); 696 event ((W)w, EV_PERIODIC);
456 } 697 }
457} 698}
458 699
459static void 700static void
460time_jump (ev_tstamp diff) 701periodics_reschedule (ev_tstamp diff)
461{ 702{
462 int i; 703 int i;
463 704
464 /* adjust periodics */ 705 /* adjust periodics after time jump */
465 for (i = 0; i < periodiccnt; ++i) 706 for (i = 0; i < periodiccnt; ++i)
466 { 707 {
467 struct ev_periodic *w = periodics [i]; 708 struct ev_periodic *w = periodics [i];
468 709
469 if (w->interval) 710 if (w->interval)
470 { 711 {
471 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;
472 713
473 if (fabs (diff) >= 1e-4) 714 if (fabs (diff) >= 1e-4)
474 { 715 {
475 evperiodic_stop (w); 716 ev_periodic_stop (w);
476 evperiodic_start (w); 717 ev_periodic_start (w);
477 718
478 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 719 i = 0; /* restart loop, inefficient, but time jumps should be rare */
479 } 720 }
480 } 721 }
481 } 722 }
482
483 /* adjust timers. this is easy, as the offset is the same for all */
484 for (i = 0; i < timercnt; ++i)
485 timers [i]->at += diff;
486} 723}
487 724
488static 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
489time_update () 744time_update (void)
490{ 745{
491 int i; 746 int i;
492 747
493 ev_now = ev_time (); 748#if EV_USE_MONOTONIC
494
495 if (have_monotonic) 749 if (expect_true (have_monotonic))
496 { 750 {
497 ev_tstamp odiff = diff; 751 if (time_update_monotonic ())
498
499 for (i = 4; --i; ) /* loop a few times, before making important decisions */
500 { 752 {
501 now = get_clock (); 753 ev_tstamp odiff = diff;
754
755 for (i = 4; --i; ) /* loop a few times, before making important decisions */
756 {
502 diff = ev_now - now; 757 diff = ev_now - now;
503 758
504 if (fabs (odiff - diff) < MIN_TIMEJUMP) 759 if (fabs (odiff - diff) < MIN_TIMEJUMP)
505 return; /* all is well */ 760 return; /* all is well */
506 761
507 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 */
508 } 769 }
509
510 time_jump (diff - odiff);
511 } 770 }
512 else 771 else
772#endif
513 { 773 {
774 ev_now = ev_time ();
775
514 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))
515 time_jump (ev_now - now); 777 {
778 periodics_reschedule (ev_now - now);
779
780 /* adjust timers. this is easy, as the offset is the same for all */
781 for (i = 0; i < timercnt; ++i)
782 timers [i]->at += diff;
783 }
516 784
517 now = ev_now; 785 now = ev_now;
518 } 786 }
519} 787}
520 788
521int ev_loop_done; 789int ev_loop_done;
522 790
523void ev_loop (int flags) 791void ev_loop (int flags)
524{ 792{
525 double block; 793 double block;
526 ev_loop_done = flags & EVLOOP_ONESHOT; 794 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
527
528 if (checkcnt)
529 {
530 queue_events ((W *)checks, checkcnt, EV_CHECK);
531 call_pending ();
532 }
533 795
534 do 796 do
535 { 797 {
798 /* queue check watchers (and execute them) */
799 if (expect_false (preparecnt))
800 {
801 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
802 call_pending ();
803 }
804
536 /* update fd-related kernel structures */ 805 /* update fd-related kernel structures */
537 fd_reify (); 806 fd_reify ();
538 807
539 /* calculate blocking time */ 808 /* calculate blocking time */
540 809
541 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 810 /* we only need this for !monotonic clockor timers, but as we basically
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 {
542 ev_now = ev_time (); 818 ev_now = ev_time ();
819 now = ev_now;
820 }
543 821
544 if (flags & EVLOOP_NONBLOCK || idlecnt) 822 if (flags & EVLOOP_NONBLOCK || idlecnt)
545 block = 0.; 823 block = 0.;
546 else 824 else
547 { 825 {
548 block = MAX_BLOCKTIME; 826 block = MAX_BLOCKTIME;
549 827
550 if (timercnt) 828 if (timercnt)
551 { 829 {
552 ev_tstamp to = timers [0]->at - get_clock () + method_fudge; 830 ev_tstamp to = timers [0]->at - now + method_fudge;
553 if (block > to) block = to; 831 if (block > to) block = to;
554 } 832 }
555 833
556 if (periodiccnt) 834 if (periodiccnt)
557 { 835 {
566 844
567 /* update ev_now, do magic */ 845 /* update ev_now, do magic */
568 time_update (); 846 time_update ();
569 847
570 /* queue pending timers and reschedule them */ 848 /* queue pending timers and reschedule them */
849 timers_reify (); /* relative timers called last */
571 periodics_reify (); /* absolute timers first */ 850 periodics_reify (); /* absolute timers called first */
572 timers_reify (); /* relative timers second */
573 851
574 /* queue idle watchers unless io or timers are pending */ 852 /* queue idle watchers unless io or timers are pending */
575 if (!pendingcnt) 853 if (!pendingcnt)
576 queue_events ((W *)idles, idlecnt, EV_IDLE); 854 queue_events ((W *)idles, idlecnt, EV_IDLE);
577 855
578 /* queue check and possibly idle watchers */ 856 /* queue check watchers, to be executed first */
857 if (checkcnt)
579 queue_events ((W *)checks, checkcnt, EV_CHECK); 858 queue_events ((W *)checks, checkcnt, EV_CHECK);
580 859
581 call_pending (); 860 call_pending ();
582 } 861 }
583 while (!ev_loop_done); 862 while (!ev_loop_done);
863
864 if (ev_loop_done != 2)
865 ev_loop_done = 0;
584} 866}
585 867
586/*****************************************************************************/ 868/*****************************************************************************/
587 869
588static void 870static void
606 head = &(*head)->next; 888 head = &(*head)->next;
607 } 889 }
608} 890}
609 891
610static void 892static void
893ev_clear_pending (W w)
894{
895 if (w->pending)
896 {
897 pendings [ABSPRI (w)][w->pending - 1].w = 0;
898 w->pending = 0;
899 }
900}
901
902static void
611ev_start (W w, int active) 903ev_start (W w, int active)
612{ 904{
613 w->pending = 0; 905 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
906 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
907
614 w->active = active; 908 w->active = active;
615} 909}
616 910
617static void 911static void
618ev_stop (W w) 912ev_stop (W w)
619{ 913{
620 if (w->pending)
621 pendings [w->pending - 1].w = 0;
622
623 w->active = 0; 914 w->active = 0;
624} 915}
625 916
626/*****************************************************************************/ 917/*****************************************************************************/
627 918
628void 919void
629evio_start (struct ev_io *w) 920ev_io_start (struct ev_io *w)
630{ 921{
922 int fd = w->fd;
923
631 if (ev_is_active (w)) 924 if (ev_is_active (w))
632 return; 925 return;
633 926
634 int fd = w->fd; 927 assert (("ev_io_start called with negative fd", fd >= 0));
635 928
636 ev_start ((W)w, 1); 929 ev_start ((W)w, 1);
637 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 930 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
638 wlist_add ((WL *)&anfds[fd].head, (WL)w); 931 wlist_add ((WL *)&anfds[fd].head, (WL)w);
639 932
640 ++fdchangecnt; 933 fd_change (fd);
641 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
642 fdchanges [fdchangecnt - 1] = fd;
643} 934}
644 935
645void 936void
646evio_stop (struct ev_io *w) 937ev_io_stop (struct ev_io *w)
647{ 938{
939 ev_clear_pending ((W)w);
648 if (!ev_is_active (w)) 940 if (!ev_is_active (w))
649 return; 941 return;
650 942
651 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 943 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
652 ev_stop ((W)w); 944 ev_stop ((W)w);
653 945
654 ++fdchangecnt; 946 fd_change (w->fd);
655 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
656 fdchanges [fdchangecnt - 1] = w->fd;
657} 947}
658 948
659
660void 949void
661evtimer_start (struct ev_timer *w) 950ev_timer_start (struct ev_timer *w)
662{ 951{
663 if (ev_is_active (w)) 952 if (ev_is_active (w))
664 return; 953 return;
665 954
666 w->at += now; 955 w->at += now;
956
957 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
667 958
668 ev_start ((W)w, ++timercnt); 959 ev_start ((W)w, ++timercnt);
669 array_needsize (timers, timermax, timercnt, ); 960 array_needsize (timers, timermax, timercnt, );
670 timers [timercnt - 1] = w; 961 timers [timercnt - 1] = w;
671 upheap ((WT *)timers, timercnt - 1); 962 upheap ((WT *)timers, timercnt - 1);
672} 963}
673 964
674void 965void
675evtimer_stop (struct ev_timer *w) 966ev_timer_stop (struct ev_timer *w)
676{ 967{
968 ev_clear_pending ((W)w);
677 if (!ev_is_active (w)) 969 if (!ev_is_active (w))
678 return; 970 return;
679 971
680 if (w->active < timercnt--) 972 if (w->active < timercnt--)
681 { 973 {
682 timers [w->active - 1] = timers [timercnt]; 974 timers [w->active - 1] = timers [timercnt];
683 downheap ((WT *)timers, timercnt, w->active - 1); 975 downheap ((WT *)timers, timercnt, w->active - 1);
684 } 976 }
685 977
978 w->at = w->repeat;
979
686 ev_stop ((W)w); 980 ev_stop ((W)w);
687} 981}
688 982
689void 983void
690evperiodic_start (struct ev_periodic *w) 984ev_timer_again (struct ev_timer *w)
691{ 985{
692 if (ev_is_active (w)) 986 if (ev_is_active (w))
987 {
988 if (w->repeat)
989 {
990 w->at = now + w->repeat;
991 downheap ((WT *)timers, timercnt, w->active - 1);
992 }
993 else
994 ev_timer_stop (w);
995 }
996 else if (w->repeat)
997 ev_timer_start (w);
998}
999
1000void
1001ev_periodic_start (struct ev_periodic *w)
1002{
1003 if (ev_is_active (w))
693 return; 1004 return;
1005
1006 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
694 1007
695 /* 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 */
696 if (w->interval) 1009 if (w->interval)
697 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1010 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
698 1011
701 periodics [periodiccnt - 1] = w; 1014 periodics [periodiccnt - 1] = w;
702 upheap ((WT *)periodics, periodiccnt - 1); 1015 upheap ((WT *)periodics, periodiccnt - 1);
703} 1016}
704 1017
705void 1018void
706evperiodic_stop (struct ev_periodic *w) 1019ev_periodic_stop (struct ev_periodic *w)
707{ 1020{
1021 ev_clear_pending ((W)w);
708 if (!ev_is_active (w)) 1022 if (!ev_is_active (w))
709 return; 1023 return;
710 1024
711 if (w->active < periodiccnt--) 1025 if (w->active < periodiccnt--)
712 { 1026 {
715 } 1029 }
716 1030
717 ev_stop ((W)w); 1031 ev_stop ((W)w);
718} 1032}
719 1033
1034#ifndef SA_RESTART
1035# define SA_RESTART 0
1036#endif
1037
720void 1038void
721evsignal_start (struct ev_signal *w) 1039ev_signal_start (struct ev_signal *w)
722{ 1040{
723 if (ev_is_active (w)) 1041 if (ev_is_active (w))
724 return; 1042 return;
1043
1044 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
725 1045
726 ev_start ((W)w, 1); 1046 ev_start ((W)w, 1);
727 array_needsize (signals, signalmax, w->signum, signals_init); 1047 array_needsize (signals, signalmax, w->signum, signals_init);
728 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1048 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
729 1049
730 if (!w->next) 1050 if (!w->next)
731 { 1051 {
732 struct sigaction sa; 1052 struct sigaction sa;
733 sa.sa_handler = sighandler; 1053 sa.sa_handler = sighandler;
734 sigfillset (&sa.sa_mask); 1054 sigfillset (&sa.sa_mask);
735 sa.sa_flags = 0; 1055 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
736 sigaction (w->signum, &sa, 0); 1056 sigaction (w->signum, &sa, 0);
737 } 1057 }
738} 1058}
739 1059
740void 1060void
741evsignal_stop (struct ev_signal *w) 1061ev_signal_stop (struct ev_signal *w)
742{ 1062{
1063 ev_clear_pending ((W)w);
743 if (!ev_is_active (w)) 1064 if (!ev_is_active (w))
744 return; 1065 return;
745 1066
746 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1067 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
747 ev_stop ((W)w); 1068 ev_stop ((W)w);
748 1069
749 if (!signals [w->signum - 1].head) 1070 if (!signals [w->signum - 1].head)
750 signal (w->signum, SIG_DFL); 1071 signal (w->signum, SIG_DFL);
751} 1072}
752 1073
1074void
753void evidle_start (struct ev_idle *w) 1075ev_idle_start (struct ev_idle *w)
754{ 1076{
755 if (ev_is_active (w)) 1077 if (ev_is_active (w))
756 return; 1078 return;
757 1079
758 ev_start ((W)w, ++idlecnt); 1080 ev_start ((W)w, ++idlecnt);
759 array_needsize (idles, idlemax, idlecnt, ); 1081 array_needsize (idles, idlemax, idlecnt, );
760 idles [idlecnt - 1] = w; 1082 idles [idlecnt - 1] = w;
761} 1083}
762 1084
1085void
763void evidle_stop (struct ev_idle *w) 1086ev_idle_stop (struct ev_idle *w)
764{ 1087{
1088 ev_clear_pending ((W)w);
1089 if (ev_is_active (w))
1090 return;
1091
765 idles [w->active - 1] = idles [--idlecnt]; 1092 idles [w->active - 1] = idles [--idlecnt];
766 ev_stop ((W)w); 1093 ev_stop ((W)w);
767} 1094}
768 1095
1096void
1097ev_prepare_start (struct ev_prepare *w)
1098{
1099 if (ev_is_active (w))
1100 return;
1101
1102 ev_start ((W)w, ++preparecnt);
1103 array_needsize (prepares, preparemax, preparecnt, );
1104 prepares [preparecnt - 1] = w;
1105}
1106
1107void
1108ev_prepare_stop (struct ev_prepare *w)
1109{
1110 ev_clear_pending ((W)w);
1111 if (ev_is_active (w))
1112 return;
1113
1114 prepares [w->active - 1] = prepares [--preparecnt];
1115 ev_stop ((W)w);
1116}
1117
1118void
769void evcheck_start (struct ev_check *w) 1119ev_check_start (struct ev_check *w)
770{ 1120{
771 if (ev_is_active (w)) 1121 if (ev_is_active (w))
772 return; 1122 return;
773 1123
774 ev_start ((W)w, ++checkcnt); 1124 ev_start ((W)w, ++checkcnt);
775 array_needsize (checks, checkmax, checkcnt, ); 1125 array_needsize (checks, checkmax, checkcnt, );
776 checks [checkcnt - 1] = w; 1126 checks [checkcnt - 1] = w;
777} 1127}
778 1128
1129void
779void evcheck_stop (struct ev_check *w) 1130ev_check_stop (struct ev_check *w)
780{ 1131{
1132 ev_clear_pending ((W)w);
1133 if (ev_is_active (w))
1134 return;
1135
781 checks [w->active - 1] = checks [--checkcnt]; 1136 checks [w->active - 1] = checks [--checkcnt];
782 ev_stop ((W)w); 1137 ev_stop ((W)w);
783} 1138}
784 1139
1140void
1141ev_child_start (struct ev_child *w)
1142{
1143 if (ev_is_active (w))
1144 return;
1145
1146 ev_start ((W)w, 1);
1147 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1148}
1149
1150void
1151ev_child_stop (struct ev_child *w)
1152{
1153 ev_clear_pending ((W)w);
1154 if (ev_is_active (w))
1155 return;
1156
1157 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1158 ev_stop ((W)w);
1159}
1160
785/*****************************************************************************/ 1161/*****************************************************************************/
786 1162
1163struct ev_once
1164{
1165 struct ev_io io;
1166 struct ev_timer to;
1167 void (*cb)(int revents, void *arg);
1168 void *arg;
1169};
1170
1171static void
1172once_cb (struct ev_once *once, int revents)
1173{
1174 void (*cb)(int revents, void *arg) = once->cb;
1175 void *arg = once->arg;
1176
1177 ev_io_stop (&once->io);
1178 ev_timer_stop (&once->to);
1179 free (once);
1180
1181 cb (revents, arg);
1182}
1183
1184static void
1185once_cb_io (struct ev_io *w, int revents)
1186{
1187 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1188}
1189
1190static void
1191once_cb_to (struct ev_timer *w, int revents)
1192{
1193 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1194}
1195
1196void
1197ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1198{
1199 struct ev_once *once = malloc (sizeof (struct ev_once));
1200
1201 if (!once)
1202 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1203 else
1204 {
1205 once->cb = cb;
1206 once->arg = arg;
1207
1208 ev_watcher_init (&once->io, once_cb_io);
1209 if (fd >= 0)
1210 {
1211 ev_io_set (&once->io, fd, events);
1212 ev_io_start (&once->io);
1213 }
1214
1215 ev_watcher_init (&once->to, once_cb_to);
1216 if (timeout >= 0.)
1217 {
1218 ev_timer_set (&once->to, timeout, 0.);
1219 ev_timer_start (&once->to);
1220 }
1221 }
1222}
1223
1224/*****************************************************************************/
1225
787#if 1 1226#if 0
788 1227
789struct ev_io wio; 1228struct ev_io wio;
790 1229
791static void 1230static void
792sin_cb (struct ev_io *w, int revents) 1231sin_cb (struct ev_io *w, int revents)
796 1235
797static void 1236static void
798ocb (struct ev_timer *w, int revents) 1237ocb (struct ev_timer *w, int revents)
799{ 1238{
800 //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);
801 evtimer_stop (w); 1240 ev_timer_stop (w);
802 evtimer_start (w); 1241 ev_timer_start (w);
803} 1242}
804 1243
805static void 1244static void
806scb (struct ev_signal *w, int revents) 1245scb (struct ev_signal *w, int revents)
807{ 1246{
808 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1247 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
809 evio_stop (&wio); 1248 ev_io_stop (&wio);
810 evio_start (&wio); 1249 ev_io_start (&wio);
811} 1250}
812 1251
813static void 1252static void
814gcb (struct ev_signal *w, int revents) 1253gcb (struct ev_signal *w, int revents)
815{ 1254{
819 1258
820int main (void) 1259int main (void)
821{ 1260{
822 ev_init (0); 1261 ev_init (0);
823 1262
824 evio_init (&wio, sin_cb, 0, EV_READ); 1263 ev_io_init (&wio, sin_cb, 0, EV_READ);
825 evio_start (&wio); 1264 ev_io_start (&wio);
826 1265
827 struct ev_timer t[10000]; 1266 struct ev_timer t[10000];
828 1267
829#if 0 1268#if 0
830 int i; 1269 int i;
831 for (i = 0; i < 10000; ++i) 1270 for (i = 0; i < 10000; ++i)
832 { 1271 {
833 struct ev_timer *w = t + i; 1272 struct ev_timer *w = t + i;
834 evw_init (w, ocb, i); 1273 ev_watcher_init (w, ocb, i);
835 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1274 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
836 evtimer_start (w); 1275 ev_timer_start (w);
837 if (drand48 () < 0.5) 1276 if (drand48 () < 0.5)
838 evtimer_stop (w); 1277 ev_timer_stop (w);
839 } 1278 }
840#endif 1279#endif
841 1280
842 struct ev_timer t1; 1281 struct ev_timer t1;
843 evtimer_init (&t1, ocb, 5, 10); 1282 ev_timer_init (&t1, ocb, 5, 10);
844 evtimer_start (&t1); 1283 ev_timer_start (&t1);
845 1284
846 struct ev_signal sig; 1285 struct ev_signal sig;
847 evsignal_init (&sig, scb, SIGQUIT); 1286 ev_signal_init (&sig, scb, SIGQUIT);
848 evsignal_start (&sig); 1287 ev_signal_start (&sig);
849 1288
850 struct ev_check cw; 1289 struct ev_check cw;
851 evcheck_init (&cw, gcb); 1290 ev_check_init (&cw, gcb);
852 evcheck_start (&cw); 1291 ev_check_start (&cw);
853 1292
854 struct ev_idle iw; 1293 struct ev_idle iw;
855 evidle_init (&iw, gcb); 1294 ev_idle_init (&iw, gcb);
856 evidle_start (&iw); 1295 ev_idle_start (&iw);
857 1296
858 ev_loop (0); 1297 ev_loop (0);
859 1298
860 return 0; 1299 return 0;
861} 1300}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines