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

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

Diff Legend

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