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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines