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

Comparing libev/ev.c (file contents):
Revision 1.12 by root, Wed Oct 31 09:23:17 2007 UTC vs.
Revision 1.49 by root, Sat Nov 3 16:16:58 2007 UTC

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

Diff Legend

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