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

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

Diff Legend

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