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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines