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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines