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

Comparing libev/ev.c (file contents):
Revision 1.10 by root, Wed Oct 31 07:36:03 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
53/**/
54
14#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
15# ifdef CLOCK_MONOTONIC 81#ifndef CLOCK_MONOTONIC
82# undef EV_USE_MONOTONIC
16# define HAVE_MONOTONIC 1 83# define EV_USE_MONOTONIC 0
17# endif 84#endif
18#endif
19 85
20#ifndef HAVE_SELECT
21# define HAVE_SELECT 1
22#endif
23
24#ifndef HAVE_EPOLL
25# define HAVE_EPOLL 0
26#endif
27
28#ifndef HAVE_REALTIME 86#ifndef CLOCK_REALTIME
29# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 87# undef EV_USE_REALTIME
88# define EV_USE_REALTIME 0
30#endif 89#endif
90
91/**/
31 92
32#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) */
33#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 */
34 97
35#include "ev.h" 98#include "ev.h"
36 99
37struct ev_watcher { 100#if __GNUC__ >= 3
38 EV_WATCHER (ev_watcher); 101# define expect(expr,value) __builtin_expect ((expr),(value))
39}; 102# define inline inline
103#else
104# define expect(expr,value) (expr)
105# define inline static
106#endif
40 107
41struct ev_watcher_list { 108#define expect_false(expr) expect ((expr) != 0, 0)
42 EV_WATCHER_LIST (ev_watcher_list); 109#define expect_true(expr) expect ((expr) != 0, 1)
43}; 110
111#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
112#define ABSPRI(w) ((w)->priority - EV_MINPRI)
44 113
45typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
46typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT;
47 117
48static ev_tstamp now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, now, diff; /* monotonic clock */
49ev_tstamp ev_now; 119ev_tstamp ev_now;
50int ev_method; 120int ev_method;
51 121
52static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
53 123
58/*****************************************************************************/ 128/*****************************************************************************/
59 129
60ev_tstamp 130ev_tstamp
61ev_time (void) 131ev_time (void)
62{ 132{
63#if HAVE_REALTIME 133#if EV_USE_REALTIME
64 struct timespec ts; 134 struct timespec ts;
65 clock_gettime (CLOCK_REALTIME, &ts); 135 clock_gettime (CLOCK_REALTIME, &ts);
66 return ts.tv_sec + ts.tv_nsec * 1e-9; 136 return ts.tv_sec + ts.tv_nsec * 1e-9;
67#else 137#else
68 struct timeval tv; 138 struct timeval tv;
72} 142}
73 143
74static ev_tstamp 144static ev_tstamp
75get_clock (void) 145get_clock (void)
76{ 146{
77#if HAVE_MONOTONIC 147#if EV_USE_MONOTONIC
78 if (have_monotonic) 148 if (expect_true (have_monotonic))
79 { 149 {
80 struct timespec ts; 150 struct timespec ts;
81 clock_gettime (CLOCK_MONOTONIC, &ts); 151 clock_gettime (CLOCK_MONOTONIC, &ts);
82 return ts.tv_sec + ts.tv_nsec * 1e-9; 152 return ts.tv_sec + ts.tv_nsec * 1e-9;
83 } 153 }
84#endif 154#endif
85 155
86 return ev_time (); 156 return ev_time ();
87} 157}
88 158
159#define array_roundsize(base,n) ((n) | 4 & ~3)
160
89#define array_needsize(base,cur,cnt,init) \ 161#define array_needsize(base,cur,cnt,init) \
90 if ((cnt) > cur) \ 162 if (expect_false ((cnt) > cur)) \
91 { \ 163 { \
92 int newcnt = cur ? cur << 1 : 16; \ 164 int newcnt = cur; \
93 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 \
94 base = realloc (base, sizeof (*base) * (newcnt)); \ 171 base = realloc (base, sizeof (*base) * (newcnt)); \
95 init (base + cur, newcnt - cur); \ 172 init (base + cur, newcnt - cur); \
96 cur = newcnt; \ 173 cur = newcnt; \
97 } 174 }
98 175
99/*****************************************************************************/ 176/*****************************************************************************/
100 177
101typedef struct 178typedef struct
102{ 179{
103 struct ev_io *head; 180 struct ev_watcher_list *head;
104 unsigned char wev, rev; /* want, received event set */ 181 unsigned char events;
182 unsigned char reify;
105} ANFD; 183} ANFD;
106 184
107static ANFD *anfds; 185static ANFD *anfds;
108static int anfdmax; 186static int anfdmax;
109 187
110static int *fdchanges;
111static int fdchangemax, fdchangecnt;
112
113static void 188static void
114anfds_init (ANFD *base, int count) 189anfds_init (ANFD *base, int count)
115{ 190{
116 while (count--) 191 while (count--)
117 { 192 {
118 base->head = 0; 193 base->head = 0;
119 base->wev = base->rev = EV_NONE; 194 base->events = EV_NONE;
195 base->reify = 0;
196
120 ++base; 197 ++base;
121 } 198 }
122} 199}
123 200
124typedef struct 201typedef struct
125{ 202{
126 W w; 203 W w;
127 int events; 204 int events;
128} ANPENDING; 205} ANPENDING;
129 206
130static ANPENDING *pendings; 207static ANPENDING *pendings [NUMPRI];
131static int pendingmax, pendingcnt; 208static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
132 209
133static void 210static void
134event (W w, int events) 211event (W w, int events)
135{ 212{
213 if (w->pending)
214 {
215 pendings [ABSPRI (w)][w->pending - 1].events |= events;
216 return;
217 }
218
136 w->pending = ++pendingcnt; 219 w->pending = ++pendingcnt [ABSPRI (w)];
137 array_needsize (pendings, pendingmax, pendingcnt, ); 220 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
138 pendings [pendingcnt - 1].w = w; 221 pendings [ABSPRI (w)][w->pending - 1].w = w;
139 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);
140} 232}
141 233
142static void 234static void
143fd_event (int fd, int events) 235fd_event (int fd, int events)
144{ 236{
145 ANFD *anfd = anfds + fd; 237 ANFD *anfd = anfds + fd;
146 struct ev_io *w; 238 struct ev_io *w;
147 239
148 for (w = anfd->head; w; w = w->next) 240 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
149 { 241 {
150 int ev = w->events & events; 242 int ev = w->events & events;
151 243
152 if (ev) 244 if (ev)
153 event ((W)w, ev); 245 event ((W)w, ev);
154 } 246 }
155} 247}
156 248
249/*****************************************************************************/
250
251static int *fdchanges;
252static int fdchangemax, fdchangecnt;
253
157static void 254static void
158queue_events (W *events, int eventcnt, int type) 255fd_reify (void)
159{ 256{
160 int i; 257 int i;
161 258
162 for (i = 0; i < eventcnt; ++i) 259 for (i = 0; i < fdchangecnt; ++i)
163 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 }
164} 332}
165 333
166/*****************************************************************************/ 334/*****************************************************************************/
167 335
168static struct ev_timer **atimers; 336static struct ev_timer **timers;
169static int atimermax, atimercnt; 337static int timermax, timercnt;
170 338
171static struct ev_timer **rtimers; 339static struct ev_periodic **periodics;
172static int rtimermax, rtimercnt; 340static int periodicmax, periodiccnt;
173 341
174static void 342static void
175upheap (struct ev_timer **timers, int k) 343upheap (WT *timers, int k)
176{ 344{
177 struct ev_timer *w = timers [k]; 345 WT w = timers [k];
178 346
179 while (k && timers [k >> 1]->at > w->at) 347 while (k && timers [k >> 1]->at > w->at)
180 { 348 {
181 timers [k] = timers [k >> 1]; 349 timers [k] = timers [k >> 1];
182 timers [k]->active = k + 1; 350 timers [k]->active = k + 1;
187 timers [k]->active = k + 1; 355 timers [k]->active = k + 1;
188 356
189} 357}
190 358
191static void 359static void
192downheap (struct ev_timer **timers, int N, int k) 360downheap (WT *timers, int N, int k)
193{ 361{
194 struct ev_timer *w = timers [k]; 362 WT w = timers [k];
195 363
196 while (k < (N >> 1)) 364 while (k < (N >> 1))
197 { 365 {
198 int j = k << 1; 366 int j = k << 1;
199 367
214 382
215/*****************************************************************************/ 383/*****************************************************************************/
216 384
217typedef struct 385typedef struct
218{ 386{
219 struct ev_signal *head; 387 struct ev_watcher_list *head;
220 sig_atomic_t gotsig; 388 sig_atomic_t volatile gotsig;
221} ANSIG; 389} ANSIG;
222 390
223static ANSIG *signals; 391static ANSIG *signals;
224static int signalmax; 392static int signalmax;
225 393
226static int sigpipe [2]; 394static int sigpipe [2];
227static sig_atomic_t gotsig; 395static sig_atomic_t volatile gotsig;
228static struct ev_io sigev; 396static struct ev_io sigev;
229 397
230static void 398static void
231signals_init (ANSIG *base, int count) 399signals_init (ANSIG *base, int count)
232{ 400{
233 while (count--) 401 while (count--)
234 { 402 {
235 base->head = 0; 403 base->head = 0;
236 base->gotsig = 0; 404 base->gotsig = 0;
405
237 ++base; 406 ++base;
238 } 407 }
239} 408}
240 409
241static void 410static void
243{ 412{
244 signals [signum - 1].gotsig = 1; 413 signals [signum - 1].gotsig = 1;
245 414
246 if (!gotsig) 415 if (!gotsig)
247 { 416 {
417 int old_errno = errno;
248 gotsig = 1; 418 gotsig = 1;
249 write (sigpipe [1], &gotsig, 1); 419 write (sigpipe [1], &signum, 1);
420 errno = old_errno;
250 } 421 }
251} 422}
252 423
253static void 424static void
254sigcb (struct ev_io *iow, int revents) 425sigcb (struct ev_io *iow, int revents)
255{ 426{
256 struct ev_signal *w; 427 struct ev_watcher_list *w;
257 int sig; 428 int signum;
258 429
430 read (sigpipe [0], &revents, 1);
259 gotsig = 0; 431 gotsig = 0;
260 read (sigpipe [0], &revents, 1);
261 432
262 for (sig = signalmax; sig--; ) 433 for (signum = signalmax; signum--; )
263 if (signals [sig].gotsig) 434 if (signals [signum].gotsig)
264 { 435 {
265 signals [sig].gotsig = 0; 436 signals [signum].gotsig = 0;
266 437
267 for (w = signals [sig].head; w; w = w->next) 438 for (w = signals [signum].head; w; w = w->next)
268 event ((W)w, EV_SIGNAL); 439 event ((W)w, EV_SIGNAL);
269 } 440 }
270} 441}
271 442
272static void 443static void
273siginit (void) 444siginit (void)
274{ 445{
446#ifndef WIN32
275 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 447 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
276 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 448 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
277 449
278 /* rather than sort out wether we really need nb, set it */ 450 /* rather than sort out wether we really need nb, set it */
279 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 451 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
280 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 452 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
453#endif
281 454
282 evio_set (&sigev, sigpipe [0], EV_READ); 455 ev_io_set (&sigev, sigpipe [0], EV_READ);
283 evio_start (&sigev); 456 ev_io_start (&sigev);
284} 457}
285 458
286/*****************************************************************************/ 459/*****************************************************************************/
287 460
288static struct ev_idle **idles; 461static struct ev_idle **idles;
289static int idlemax, idlecnt; 462static int idlemax, idlecnt;
290 463
464static struct ev_prepare **prepares;
465static int preparemax, preparecnt;
466
291static struct ev_check **checks; 467static struct ev_check **checks;
292static int checkmax, checkcnt; 468static int checkmax, checkcnt;
293 469
294/*****************************************************************************/ 470/*****************************************************************************/
295 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
296#if HAVE_EPOLL 518#if EV_USE_EPOLL
297# include "ev_epoll.c" 519# include "ev_epoll.c"
298#endif 520#endif
521#if EV_USE_POLL
522# include "ev_poll.c"
523#endif
299#if HAVE_SELECT 524#if EV_USE_SELECT
300# include "ev_select.c" 525# include "ev_select.c"
301#endif 526#endif
302 527
303int ev_init (int flags) 528int
529ev_version_major (void)
304{ 530{
305#if HAVE_MONOTONIC 531 return EV_VERSION_MAJOR;
306 { 532}
307 struct timespec ts;
308 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
309 have_monotonic = 1;
310 }
311#endif
312 533
313 ev_now = ev_time (); 534int
314 now = get_clock (); 535ev_version_minor (void)
315 diff = ev_now - now; 536{
537 return EV_VERSION_MINOR;
538}
316 539
317 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
318 return 0; 545 return 0;
319 546#else
320 ev_method = EVMETHOD_NONE; 547 return getuid () != geteuid ()
321#if HAVE_EPOLL 548 || getgid () != getegid ();
322 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
323#endif 549#endif
324#if HAVE_SELECT 550}
325 if (ev_method == EVMETHOD_NONE) select_init (flags);
326#endif
327 551
552int ev_init (int methods)
553{
328 if (ev_method) 554 if (!ev_method)
555 {
556#if EV_USE_MONOTONIC
329 { 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 {
330 evw_init (&sigev, sigcb, 0); 594 ev_watcher_init (&sigev, sigcb);
595 ev_set_priority (&sigev, EV_MAXPRI);
331 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 }
332 } 604 }
333 605
334 return ev_method; 606 return ev_method;
335} 607}
336 608
337/*****************************************************************************/ 609/*****************************************************************************/
338 610
339void ev_prefork (void) 611void
612ev_fork_prepare (void)
340{ 613{
614 /* nop */
341} 615}
342 616
617void
343void ev_postfork_parent (void) 618ev_fork_parent (void)
344{ 619{
620 /* nop */
345} 621}
346 622
623void
347void ev_postfork_child (void) 624ev_fork_child (void)
348{ 625{
349#if HAVE_EPOLL 626#if EV_USE_EPOLL
350 if (ev_method == EVMETHOD_EPOLL) 627 if (ev_method == EVMETHOD_EPOLL)
351 epoll_postfork_child (); 628 epoll_postfork_child ();
352#endif 629#endif
353 630
354 evio_stop (&sigev); 631 ev_io_stop (&sigev);
355 close (sigpipe [0]); 632 close (sigpipe [0]);
356 close (sigpipe [1]); 633 close (sigpipe [1]);
357 pipe (sigpipe); 634 pipe (sigpipe);
358 siginit (); 635 siginit ();
359} 636}
360 637
361/*****************************************************************************/ 638/*****************************************************************************/
362 639
363static void 640static void
364fd_reify (void) 641call_pending (void)
365{ 642{
366 int i; 643 int pri;
367 644
368 for (i = 0; i < fdchangecnt; ++i) 645 for (pri = NUMPRI; pri--; )
369 { 646 while (pendingcnt [pri])
370 int fd = fdchanges [i];
371 ANFD *anfd = anfds + fd;
372 struct ev_io *w;
373
374 int wev = 0;
375
376 for (w = anfd->head; w; w = w->next)
377 wev |= w->events;
378
379 if (anfd->wev != wev)
380 { 647 {
381 method_modify (fd, anfd->wev, wev); 648 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
382 anfd->wev = wev;
383 }
384 }
385 649
386 fdchangecnt = 0;
387}
388
389static void
390call_pending ()
391{
392 int i;
393
394 for (i = 0; i < pendingcnt; ++i)
395 {
396 ANPENDING *p = pendings + i;
397
398 if (p->w) 650 if (p->w)
399 { 651 {
400 p->w->pending = 0; 652 p->w->pending = 0;
401 p->w->cb (p->w, p->events); 653 p->w->cb (p->w, p->events);
402 } 654 }
403 } 655 }
404
405 pendingcnt = 0;
406} 656}
407 657
408static void 658static void
409timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now) 659timers_reify (void)
410{ 660{
411 while (timercnt && timers [0]->at <= now) 661 while (timercnt && timers [0]->at <= now)
412 { 662 {
413 struct ev_timer *w = timers [0]; 663 struct ev_timer *w = timers [0];
414 664
415 /* first reschedule or stop timer */ 665 /* first reschedule or stop timer */
416 if (w->repeat) 666 if (w->repeat)
417 { 667 {
418 if (w->is_abs) 668 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
419 w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat;
420 else
421 w->at = now + w->repeat; 669 w->at = now + w->repeat;
422
423 assert (w->at > now);
424
425 downheap (timers, timercnt, 0); 670 downheap ((WT *)timers, timercnt, 0);
426 } 671 }
427 else 672 else
673 ev_timer_stop (w); /* nonrepeating: stop timer */
674
675 event ((W)w, EV_TIMEOUT);
676 }
677}
678
679static void
680periodics_reify (void)
681{
682 while (periodiccnt && periodics [0]->at <= ev_now)
683 {
684 struct ev_periodic *w = periodics [0];
685
686 /* first reschedule or stop timer */
687 if (w->interval)
428 { 688 {
429 evtimer_stop (w); /* nonrepeating: stop timer */ 689 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
430 --timercnt; /* maybe pass by reference instead? */ 690 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
691 downheap ((WT *)periodics, periodiccnt, 0);
431 } 692 }
693 else
694 ev_periodic_stop (w); /* nonrepeating: stop timer */
432 695
433 event ((W)w, EV_TIMEOUT); 696 event ((W)w, EV_PERIODIC);
434 } 697 }
435} 698}
436 699
437static void 700static void
438time_update () 701periodics_reschedule (ev_tstamp diff)
439{ 702{
440 int i; 703 int i;
441 ev_now = ev_time ();
442 704
443 if (have_monotonic) 705 /* adjust periodics after time jump */
706 for (i = 0; i < periodiccnt; ++i)
444 { 707 {
445 ev_tstamp odiff = diff; 708 struct ev_periodic *w = periodics [i];
446 709
447 /* detecting time jumps is much more difficult */ 710 if (w->interval)
448 for (i = 2; --i; ) /* loop a few times, before making important decisions */
449 { 711 {
450 now = get_clock (); 712 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
451 diff = ev_now - now;
452 713
453 if (fabs (odiff - diff) < MIN_TIMEJUMP) 714 if (fabs (diff) >= 1e-4)
454 return; /* all is well */ 715 {
716 ev_periodic_stop (w);
717 ev_periodic_start (w);
455 718
456 ev_now = ev_time (); 719 i = 0; /* restart loop, inefficient, but time jumps should be rare */
720 }
457 } 721 }
722 }
723}
458 724
459 /* time jump detected, reschedule atimers */ 725static int
460 for (i = 0; i < atimercnt; ++i) 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
744time_update (void)
745{
746 int i;
747
748#if EV_USE_MONOTONIC
749 if (expect_true (have_monotonic))
750 {
751 if (time_update_monotonic ())
461 { 752 {
462 struct ev_timer *w = atimers [i]; 753 ev_tstamp odiff = diff;
463 w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat; 754
755 for (i = 4; --i; ) /* loop a few times, before making important decisions */
756 {
757 diff = ev_now - now;
758
759 if (fabs (odiff - diff) < MIN_TIMEJUMP)
760 return; /* all is well */
761
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 */
464 } 769 }
465 } 770 }
466 else 771 else
772#endif
467 { 773 {
774 ev_now = ev_time ();
775
468 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))
469 /* time jump detected, adjust rtimers */ 777 {
778 periodics_reschedule (ev_now - now);
779
780 /* adjust timers. this is easy, as the offset is the same for all */
470 for (i = 0; i < rtimercnt; ++i) 781 for (i = 0; i < timercnt; ++i)
471 rtimers [i]->at += ev_now - now; 782 timers [i]->at += diff;
783 }
472 784
473 now = ev_now; 785 now = ev_now;
474 } 786 }
475} 787}
476 788
477int ev_loop_done; 789int ev_loop_done;
478 790
479void ev_loop (int flags) 791void ev_loop (int flags)
480{ 792{
481 double block; 793 double block;
482 ev_loop_done = flags & EVLOOP_ONESHOT; 794 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
483
484 if (checkcnt)
485 {
486 queue_events ((W *)checks, checkcnt, EV_CHECK);
487 call_pending ();
488 }
489 795
490 do 796 do
491 { 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
492 /* update fd-related kernel structures */ 805 /* update fd-related kernel structures */
493 fd_reify (); 806 fd_reify ();
494 807
495 /* calculate blocking time */ 808 /* calculate blocking time */
809
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 {
818 ev_now = ev_time ();
819 now = ev_now;
820 }
821
496 if (flags & EVLOOP_NONBLOCK || idlecnt) 822 if (flags & EVLOOP_NONBLOCK || idlecnt)
497 block = 0.; 823 block = 0.;
498 else 824 else
499 { 825 {
500 block = MAX_BLOCKTIME; 826 block = MAX_BLOCKTIME;
501 827
502 if (rtimercnt) 828 if (timercnt)
503 { 829 {
504 ev_tstamp to = rtimers [0]->at - get_clock () + method_fudge; 830 ev_tstamp to = timers [0]->at - now + method_fudge;
505 if (block > to) block = to; 831 if (block > to) block = to;
506 } 832 }
507 833
508 if (atimercnt) 834 if (periodiccnt)
509 { 835 {
510 ev_tstamp to = atimers [0]->at - ev_time () + method_fudge; 836 ev_tstamp to = periodics [0]->at - ev_now + method_fudge;
511 if (block > to) block = to; 837 if (block > to) block = to;
512 } 838 }
513 839
514 if (block < 0.) block = 0.; 840 if (block < 0.) block = 0.;
515 } 841 }
518 844
519 /* update ev_now, do magic */ 845 /* update ev_now, do magic */
520 time_update (); 846 time_update ();
521 847
522 /* queue pending timers and reschedule them */ 848 /* queue pending timers and reschedule them */
523 /* absolute timers first */ 849 timers_reify (); /* relative timers called last */
524 timers_reify (atimers, atimercnt, ev_now); 850 periodics_reify (); /* absolute timers called first */
525 /* relative timers second */
526 timers_reify (rtimers, rtimercnt, now);
527 851
528 /* queue idle watchers unless io or timers are pending */ 852 /* queue idle watchers unless io or timers are pending */
529 if (!pendingcnt) 853 if (!pendingcnt)
530 queue_events ((W *)idles, idlecnt, EV_IDLE); 854 queue_events ((W *)idles, idlecnt, EV_IDLE);
531 855
532 /* queue check and possibly idle watchers */ 856 /* queue check watchers, to be executed first */
857 if (checkcnt)
533 queue_events ((W *)checks, checkcnt, EV_CHECK); 858 queue_events ((W *)checks, checkcnt, EV_CHECK);
534 859
535 call_pending (); 860 call_pending ();
536 } 861 }
537 while (!ev_loop_done); 862 while (!ev_loop_done);
863
864 if (ev_loop_done != 2)
865 ev_loop_done = 0;
538} 866}
539 867
540/*****************************************************************************/ 868/*****************************************************************************/
541 869
542static void 870static void
560 head = &(*head)->next; 888 head = &(*head)->next;
561 } 889 }
562} 890}
563 891
564static 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
565ev_start (W w, int active) 903ev_start (W w, int active)
566{ 904{
567 w->pending = 0; 905 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
906 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
907
568 w->active = active; 908 w->active = active;
569} 909}
570 910
571static void 911static void
572ev_stop (W w) 912ev_stop (W w)
573{ 913{
574 if (w->pending)
575 pendings [w->pending - 1].w = 0;
576
577 w->active = 0; 914 w->active = 0;
578 /* nop */
579} 915}
580 916
581/*****************************************************************************/ 917/*****************************************************************************/
582 918
583void 919void
584evio_start (struct ev_io *w) 920ev_io_start (struct ev_io *w)
585{ 921{
922 int fd = w->fd;
923
586 if (ev_is_active (w)) 924 if (ev_is_active (w))
587 return; 925 return;
588 926
589 int fd = w->fd; 927 assert (("ev_io_start called with negative fd", fd >= 0));
590 928
591 ev_start ((W)w, 1); 929 ev_start ((W)w, 1);
592 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 930 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
593 wlist_add ((WL *)&anfds[fd].head, (WL)w); 931 wlist_add ((WL *)&anfds[fd].head, (WL)w);
594 932
595 ++fdchangecnt; 933 fd_change (fd);
596 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
597 fdchanges [fdchangecnt - 1] = fd;
598} 934}
599 935
600void 936void
601evio_stop (struct ev_io *w) 937ev_io_stop (struct ev_io *w)
602{ 938{
939 ev_clear_pending ((W)w);
603 if (!ev_is_active (w)) 940 if (!ev_is_active (w))
604 return; 941 return;
605 942
606 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 943 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
607 ev_stop ((W)w); 944 ev_stop ((W)w);
608 945
609 ++fdchangecnt; 946 fd_change (w->fd);
610 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
611 fdchanges [fdchangecnt - 1] = w->fd;
612} 947}
613 948
614void 949void
615evtimer_start (struct ev_timer *w) 950ev_timer_start (struct ev_timer *w)
616{ 951{
617 if (ev_is_active (w)) 952 if (ev_is_active (w))
618 return; 953 return;
619 954
620 if (w->is_abs) 955 w->at += now;
956
957 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
958
959 ev_start ((W)w, ++timercnt);
960 array_needsize (timers, timermax, timercnt, );
961 timers [timercnt - 1] = w;
962 upheap ((WT *)timers, timercnt - 1);
963}
964
965void
966ev_timer_stop (struct ev_timer *w)
967{
968 ev_clear_pending ((W)w);
969 if (!ev_is_active (w))
970 return;
971
972 if (w->active < timercnt--)
973 {
974 timers [w->active - 1] = timers [timercnt];
975 downheap ((WT *)timers, timercnt, w->active - 1);
621 { 976 }
622 /* this formula differs from the one in timer_reify becuse we do not round up */ 977
978 w->at = w->repeat;
979
980 ev_stop ((W)w);
981}
982
983void
984ev_timer_again (struct ev_timer *w)
985{
986 if (ev_is_active (w))
987 {
623 if (w->repeat) 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))
1004 return;
1005
1006 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1007
1008 /* this formula differs from the one in periodic_reify because we do not always round up */
1009 if (w->interval)
624 w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat; 1010 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
625 1011
626 ev_start ((W)w, ++atimercnt); 1012 ev_start ((W)w, ++periodiccnt);
627 array_needsize (atimers, atimermax, atimercnt, ); 1013 array_needsize (periodics, periodicmax, periodiccnt, );
628 atimers [atimercnt - 1] = w; 1014 periodics [periodiccnt - 1] = w;
629 upheap (atimers, atimercnt - 1); 1015 upheap ((WT *)periodics, periodiccnt - 1);
630 }
631 else
632 {
633 w->at += now;
634
635 ev_start ((W)w, ++rtimercnt);
636 array_needsize (rtimers, rtimermax, rtimercnt, );
637 rtimers [rtimercnt - 1] = w;
638 upheap (rtimers, rtimercnt - 1);
639 }
640
641} 1016}
642 1017
643void 1018void
644evtimer_stop (struct ev_timer *w) 1019ev_periodic_stop (struct ev_periodic *w)
645{ 1020{
1021 ev_clear_pending ((W)w);
646 if (!ev_is_active (w)) 1022 if (!ev_is_active (w))
647 return; 1023 return;
648 1024
649 if (w->is_abs)
650 {
651 if (w->active < atimercnt--) 1025 if (w->active < periodiccnt--)
652 {
653 atimers [w->active - 1] = atimers [atimercnt];
654 downheap (atimers, atimercnt, w->active - 1);
655 }
656 } 1026 {
657 else 1027 periodics [w->active - 1] = periodics [periodiccnt];
658 { 1028 downheap ((WT *)periodics, periodiccnt, w->active - 1);
659 if (w->active < rtimercnt--)
660 {
661 rtimers [w->active - 1] = rtimers [rtimercnt];
662 downheap (rtimers, rtimercnt, w->active - 1);
663 }
664 } 1029 }
665 1030
666 ev_stop ((W)w); 1031 ev_stop ((W)w);
667} 1032}
668 1033
1034#ifndef SA_RESTART
1035# define SA_RESTART 0
1036#endif
1037
669void 1038void
670evsignal_start (struct ev_signal *w) 1039ev_signal_start (struct ev_signal *w)
671{ 1040{
672 if (ev_is_active (w)) 1041 if (ev_is_active (w))
673 return; 1042 return;
1043
1044 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
674 1045
675 ev_start ((W)w, 1); 1046 ev_start ((W)w, 1);
676 array_needsize (signals, signalmax, w->signum, signals_init); 1047 array_needsize (signals, signalmax, w->signum, signals_init);
677 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1048 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
678 1049
679 if (!w->next) 1050 if (!w->next)
680 { 1051 {
681 struct sigaction sa; 1052 struct sigaction sa;
682 sa.sa_handler = sighandler; 1053 sa.sa_handler = sighandler;
683 sigfillset (&sa.sa_mask); 1054 sigfillset (&sa.sa_mask);
684 sa.sa_flags = 0; 1055 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
685 sigaction (w->signum, &sa, 0); 1056 sigaction (w->signum, &sa, 0);
686 } 1057 }
687} 1058}
688 1059
689void 1060void
690evsignal_stop (struct ev_signal *w) 1061ev_signal_stop (struct ev_signal *w)
691{ 1062{
1063 ev_clear_pending ((W)w);
692 if (!ev_is_active (w)) 1064 if (!ev_is_active (w))
693 return; 1065 return;
694 1066
695 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1067 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
696 ev_stop ((W)w); 1068 ev_stop ((W)w);
697 1069
698 if (!signals [w->signum - 1].head) 1070 if (!signals [w->signum - 1].head)
699 signal (w->signum, SIG_DFL); 1071 signal (w->signum, SIG_DFL);
700} 1072}
701 1073
1074void
702void evidle_start (struct ev_idle *w) 1075ev_idle_start (struct ev_idle *w)
703{ 1076{
704 if (ev_is_active (w)) 1077 if (ev_is_active (w))
705 return; 1078 return;
706 1079
707 ev_start ((W)w, ++idlecnt); 1080 ev_start ((W)w, ++idlecnt);
708 array_needsize (idles, idlemax, idlecnt, ); 1081 array_needsize (idles, idlemax, idlecnt, );
709 idles [idlecnt - 1] = w; 1082 idles [idlecnt - 1] = w;
710} 1083}
711 1084
1085void
712void evidle_stop (struct ev_idle *w) 1086ev_idle_stop (struct ev_idle *w)
713{ 1087{
1088 ev_clear_pending ((W)w);
1089 if (ev_is_active (w))
1090 return;
1091
714 idles [w->active - 1] = idles [--idlecnt]; 1092 idles [w->active - 1] = idles [--idlecnt];
715 ev_stop ((W)w); 1093 ev_stop ((W)w);
716} 1094}
717 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
718void evcheck_start (struct ev_check *w) 1119ev_check_start (struct ev_check *w)
719{ 1120{
720 if (ev_is_active (w)) 1121 if (ev_is_active (w))
721 return; 1122 return;
722 1123
723 ev_start ((W)w, ++checkcnt); 1124 ev_start ((W)w, ++checkcnt);
724 array_needsize (checks, checkmax, checkcnt, ); 1125 array_needsize (checks, checkmax, checkcnt, );
725 checks [checkcnt - 1] = w; 1126 checks [checkcnt - 1] = w;
726} 1127}
727 1128
1129void
728void evcheck_stop (struct ev_check *w) 1130ev_check_stop (struct ev_check *w)
729{ 1131{
1132 ev_clear_pending ((W)w);
1133 if (ev_is_active (w))
1134 return;
1135
730 checks [w->active - 1] = checks [--checkcnt]; 1136 checks [w->active - 1] = checks [--checkcnt];
731 ev_stop ((W)w); 1137 ev_stop ((W)w);
732} 1138}
733 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
734/*****************************************************************************/ 1161/*****************************************************************************/
735 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
736#if 0 1226#if 0
737 1227
1228struct ev_io wio;
1229
738static void 1230static void
739sin_cb (struct ev_io *w, int revents) 1231sin_cb (struct ev_io *w, int revents)
740{ 1232{
741 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents); 1233 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
742} 1234}
743 1235
744static void 1236static void
745ocb (struct ev_timer *w, int revents) 1237ocb (struct ev_timer *w, int revents)
746{ 1238{
747 //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);
748 evtimer_stop (w); 1240 ev_timer_stop (w);
749 evtimer_start (w); 1241 ev_timer_start (w);
750} 1242}
751 1243
752static void 1244static void
753scb (struct ev_signal *w, int revents) 1245scb (struct ev_signal *w, int revents)
754{ 1246{
755 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1247 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1248 ev_io_stop (&wio);
1249 ev_io_start (&wio);
756} 1250}
757 1251
758static void 1252static void
759gcb (struct ev_signal *w, int revents) 1253gcb (struct ev_signal *w, int revents)
760{ 1254{
761 fprintf (stderr, "generic %x\n", revents); 1255 fprintf (stderr, "generic %x\n", revents);
1256
762} 1257}
763 1258
764int main (void) 1259int main (void)
765{ 1260{
766 struct ev_io sin;
767
768 ev_init (0); 1261 ev_init (0);
769 1262
770 evw_init (&sin, sin_cb, 55);
771 evio_set (&sin, 0, EV_READ); 1263 ev_io_init (&wio, sin_cb, 0, EV_READ);
772 evio_start (&sin); 1264 ev_io_start (&wio);
773 1265
774 struct ev_timer t[10000]; 1266 struct ev_timer t[10000];
775 1267
776#if 0 1268#if 0
777 int i; 1269 int i;
778 for (i = 0; i < 10000; ++i) 1270 for (i = 0; i < 10000; ++i)
779 { 1271 {
780 struct ev_timer *w = t + i; 1272 struct ev_timer *w = t + i;
781 evw_init (w, ocb, i); 1273 ev_watcher_init (w, ocb, i);
782 evtimer_set_abs (w, drand48 (), 0.99775533); 1274 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
783 evtimer_start (w); 1275 ev_timer_start (w);
784 if (drand48 () < 0.5) 1276 if (drand48 () < 0.5)
785 evtimer_stop (w); 1277 ev_timer_stop (w);
786 } 1278 }
787#endif 1279#endif
788 1280
789 struct ev_timer t1; 1281 struct ev_timer t1;
790 evw_init (&t1, ocb, 0); 1282 ev_timer_init (&t1, ocb, 5, 10);
791 evtimer_set_abs (&t1, 5, 10);
792 evtimer_start (&t1); 1283 ev_timer_start (&t1);
793 1284
794 struct ev_signal sig; 1285 struct ev_signal sig;
795 evw_init (&sig, scb, 65535);
796 evsignal_set (&sig, SIGQUIT); 1286 ev_signal_init (&sig, scb, SIGQUIT);
797 evsignal_start (&sig); 1287 ev_signal_start (&sig);
798 1288
799 struct ev_check cw; 1289 struct ev_check cw;
800 evw_init (&cw, gcb, 0); 1290 ev_check_init (&cw, gcb);
801 evcheck_start (&cw); 1291 ev_check_start (&cw);
802 1292
803 struct ev_idle iw; 1293 struct ev_idle iw;
804 evw_init (&iw, gcb, 0); 1294 ev_idle_init (&iw, gcb);
805 evidle_start (&iw); 1295 ev_idle_start (&iw);
806 1296
807 ev_loop (0); 1297 ev_loop (0);
808 1298
809 return 0; 1299 return 0;
810} 1300}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines