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

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

Diff Legend

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