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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines