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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines