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

Comparing libev/ev.c (file contents):
Revision 1.9 by root, Wed Oct 31 07:24:17 2007 UTC vs.
Revision 1.46 by root, Sat Nov 3 09:20:12 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines