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.47 by root, Sat Nov 3 11:44:44 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines