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.35 by root, Thu Nov 1 11:55:54 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines