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

Comparing libev/ev.c (file contents):
Revision 1.3 by root, Tue Oct 30 21:45:00 2007 UTC vs.
Revision 1.14 by root, Wed Oct 31 11:52:12 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines