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

Comparing libev/ev.c (file contents):
Revision 1.16 by root, Wed Oct 31 13:57:34 2007 UTC vs.
Revision 1.50 by root, Sat Nov 3 19:41:55 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines