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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines