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.48 by root, Sat Nov 3 12:19:31 2007 UTC

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

Diff Legend

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