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

Comparing libev/ev.c (file contents):
Revision 1.57 by root, Sun Nov 4 16:43:53 2007 UTC vs.
Revision 1.75 by root, Tue Nov 6 19:29:20 2007 UTC

… …
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31#ifndef EV_STANDALONE 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33
34# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1
36# define EV_USE_REALTIME 1
37# endif
38
39# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1
41# endif
42
43# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1
45# endif
46
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1
49# endif
50
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1
53# endif
54
33#endif 55#endif
34 56
35#include <math.h> 57#include <math.h>
36#include <stdlib.h> 58#include <stdlib.h>
37#include <unistd.h>
38#include <fcntl.h> 59#include <fcntl.h>
39#include <signal.h>
40#include <stddef.h> 60#include <stddef.h>
41 61
42#include <stdio.h> 62#include <stdio.h>
43 63
44#include <assert.h> 64#include <assert.h>
45#include <errno.h> 65#include <errno.h>
46#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
47#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
48# include <sys/wait.h> 74# include <sys/wait.h>
49#endif 75#endif
50#include <sys/time.h>
51#include <time.h>
52
53/**/ 76/**/
54 77
55#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
56# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
57#endif 80#endif
58 81
59#ifndef EV_USE_SELECT 82#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1 83# define EV_USE_SELECT 1
61#endif 84#endif
62 85
63#ifndef EV_USEV_POLL 86#ifndef EV_USE_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */ 87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif 88#endif
66 89
67#ifndef EV_USE_EPOLL 90#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0 91# define EV_USE_EPOLL 0
69#endif 92#endif
70 93
71#ifndef EV_USE_KQUEUE 94#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
73#endif 106#endif
74 107
75#ifndef EV_USE_REALTIME 108#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1 109# define EV_USE_REALTIME 1
77#endif 110#endif
… …
115typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
117 150
118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
119 152
153#include "ev_win32.c"
154
120/*****************************************************************************/ 155/*****************************************************************************/
121 156
157static void (*syserr_cb)(const char *msg);
158
159void ev_set_syserr_cb (void (*cb)(const char *msg))
160{
161 syserr_cb = cb;
162}
163
164static void
165syserr (const char *msg)
166{
167 if (!msg)
168 msg = "(libev) system error";
169
170 if (syserr_cb)
171 syserr_cb (msg);
172 else
173 {
174 perror (msg);
175 abort ();
176 }
177}
178
179static void *(*alloc)(void *ptr, long size);
180
181void ev_set_allocator (void *(*cb)(void *ptr, long size))
182{
183 alloc = cb;
184}
185
186static void *
187ev_realloc (void *ptr, long size)
188{
189 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
190
191 if (!ptr && size)
192 {
193 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
194 abort ();
195 }
196
197 return ptr;
198}
199
200#define ev_malloc(size) ev_realloc (0, (size))
201#define ev_free(ptr) ev_realloc ((ptr), 0)
202
203/*****************************************************************************/
204
122typedef struct 205typedef struct
123{ 206{
124 struct ev_watcher_list *head; 207 WL head;
125 unsigned char events; 208 unsigned char events;
126 unsigned char reify; 209 unsigned char reify;
127} ANFD; 210} ANFD;
128 211
129typedef struct 212typedef struct
… …
185ev_now (EV_P) 268ev_now (EV_P)
186{ 269{
187 return rt_now; 270 return rt_now;
188} 271}
189 272
190#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
191 274
192#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
193 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
194 { \ 277 { \
195 int newcnt = cur; \ 278 int newcnt = cur; \
196 do \ 279 do \
197 { \ 280 { \
198 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
199 } \ 282 } \
200 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
201 \ 284 \
202 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
203 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
204 cur = newcnt; \ 287 cur = newcnt; \
205 } 288 }
289
290#define array_slim(type,stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 }
297
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
206 305
207/*****************************************************************************/ 306/*****************************************************************************/
208 307
209static void 308static void
210anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
227 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
228 return; 327 return;
229 } 328 }
230 329
231 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
232 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
233 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
234 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
235} 334}
236 335
237static void 336static void
… …
276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
277 events |= w->events; 376 events |= w->events;
278 377
279 anfd->reify = 0; 378 anfd->reify = 0;
280 379
281 if (anfd->events != events)
282 {
283 method_modify (EV_A_ fd, anfd->events, events); 380 method_modify (EV_A_ fd, anfd->events, events);
284 anfd->events = events; 381 anfd->events = events;
285 }
286 } 382 }
287 383
288 fdchangecnt = 0; 384 fdchangecnt = 0;
289} 385}
290 386
291static void 387static void
292fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
293{ 389{
294 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
295 return; 391 return;
296 392
297 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
298 394
299 ++fdchangecnt; 395 ++fdchangecnt;
300 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
301 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
302} 398}
303 399
304static void 400static void
305fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
311 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
312 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
313 } 409 }
314} 410}
315 411
412static int
413fd_valid (int fd)
414{
415#ifdef WIN32
416 return !!win32_get_osfhandle (fd);
417#else
418 return fcntl (fd, F_GETFD) != -1;
419#endif
420}
421
316/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
317static void 423static void
318fd_ebadf (EV_P) 424fd_ebadf (EV_P)
319{ 425{
320 int fd; 426 int fd;
321 427
322 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
323 if (anfds [fd].events) 429 if (anfds [fd].events)
324 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
325 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
326} 432}
327 433
328/* called on ENOMEM in select/poll to kill some fds and retry */ 434/* called on ENOMEM in select/poll to kill some fds and retry */
329static void 435static void
330fd_enomem (EV_P) 436fd_enomem (EV_P)
331{ 437{
332 int fd = anfdmax; 438 int fd;
333 439
334 while (fd--) 440 for (fd = anfdmax; fd--; )
335 if (anfds [fd].events) 441 if (anfds [fd].events)
336 { 442 {
337 close (fd);
338 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
339 return; 444 return;
340 } 445 }
341} 446}
342 447
343/* susually called after fork if method needs to re-arm all fds from scratch */ 448/* usually called after fork if method needs to re-arm all fds from scratch */
344static void 449static void
345fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
346{ 451{
347 int fd; 452 int fd;
348 453
349 /* this should be highly optimised to not do anything but set a flag */ 454 /* this should be highly optimised to not do anything but set a flag */
350 for (fd = 0; fd < anfdmax; ++fd) 455 for (fd = 0; fd < anfdmax; ++fd)
351 if (anfds [fd].events) 456 if (anfds [fd].events)
352 { 457 {
353 anfds [fd].events = 0; 458 anfds [fd].events = 0;
354 fd_change (fd); 459 fd_change (EV_A_ fd);
355 } 460 }
356} 461}
357 462
358/*****************************************************************************/ 463/*****************************************************************************/
359 464
… …
363 WT w = heap [k]; 468 WT w = heap [k];
364 469
365 while (k && heap [k >> 1]->at > w->at) 470 while (k && heap [k >> 1]->at > w->at)
366 { 471 {
367 heap [k] = heap [k >> 1]; 472 heap [k] = heap [k >> 1];
368 heap [k]->active = k + 1; 473 ((W)heap [k])->active = k + 1;
369 k >>= 1; 474 k >>= 1;
370 } 475 }
371 476
372 heap [k] = w; 477 heap [k] = w;
373 heap [k]->active = k + 1; 478 ((W)heap [k])->active = k + 1;
374 479
375} 480}
376 481
377static void 482static void
378downheap (WT *heap, int N, int k) 483downheap (WT *heap, int N, int k)
… …
388 493
389 if (w->at <= heap [j]->at) 494 if (w->at <= heap [j]->at)
390 break; 495 break;
391 496
392 heap [k] = heap [j]; 497 heap [k] = heap [j];
393 heap [k]->active = k + 1; 498 ((W)heap [k])->active = k + 1;
394 k = j; 499 k = j;
395 } 500 }
396 501
397 heap [k] = w; 502 heap [k] = w;
398 heap [k]->active = k + 1; 503 ((W)heap [k])->active = k + 1;
399} 504}
400 505
401/*****************************************************************************/ 506/*****************************************************************************/
402 507
403typedef struct 508typedef struct
404{ 509{
405 struct ev_watcher_list *head; 510 WL head;
406 sig_atomic_t volatile gotsig; 511 sig_atomic_t volatile gotsig;
407} ANSIG; 512} ANSIG;
408 513
409static ANSIG *signals; 514static ANSIG *signals;
410static int signalmax; 515static int signalmax;
411 516
412static int sigpipe [2]; 517static int sigpipe [2];
413static sig_atomic_t volatile gotsig; 518static sig_atomic_t volatile gotsig;
519static struct ev_io sigev;
414 520
415static void 521static void
416signals_init (ANSIG *base, int count) 522signals_init (ANSIG *base, int count)
417{ 523{
418 while (count--) 524 while (count--)
… …
425} 531}
426 532
427static void 533static void
428sighandler (int signum) 534sighandler (int signum)
429{ 535{
536#if WIN32
537 signal (signum, sighandler);
538#endif
539
430 signals [signum - 1].gotsig = 1; 540 signals [signum - 1].gotsig = 1;
431 541
432 if (!gotsig) 542 if (!gotsig)
433 { 543 {
434 int old_errno = errno; 544 int old_errno = errno;
435 gotsig = 1; 545 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
436 write (sigpipe [1], &signum, 1); 549 write (sigpipe [1], &signum, 1);
550#endif
437 errno = old_errno; 551 errno = old_errno;
438 } 552 }
439} 553}
440 554
441static void 555static void
442sigcb (EV_P_ struct ev_io *iow, int revents) 556sigcb (EV_P_ struct ev_io *iow, int revents)
443{ 557{
444 struct ev_watcher_list *w; 558 WL w;
445 int signum; 559 int signum;
446 560
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
447 read (sigpipe [0], &revents, 1); 564 read (sigpipe [0], &revents, 1);
565#endif
448 gotsig = 0; 566 gotsig = 0;
449 567
450 for (signum = signalmax; signum--; ) 568 for (signum = signalmax; signum--; )
451 if (signals [signum].gotsig) 569 if (signals [signum].gotsig)
452 { 570 {
… …
474 ev_unref (EV_A); /* child watcher should not keep loop alive */ 592 ev_unref (EV_A); /* child watcher should not keep loop alive */
475} 593}
476 594
477/*****************************************************************************/ 595/*****************************************************************************/
478 596
597static struct ev_child *childs [PID_HASHSIZE];
598
479#ifndef WIN32 599#ifndef WIN32
600
601static struct ev_signal childev;
480 602
481#ifndef WCONTINUED 603#ifndef WCONTINUED
482# define WCONTINUED 0 604# define WCONTINUED 0
483#endif 605#endif
484 606
… …
488 struct ev_child *w; 610 struct ev_child *w;
489 611
490 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 612 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
491 if (w->pid == pid || !w->pid) 613 if (w->pid == pid || !w->pid)
492 { 614 {
493 w->priority = sw->priority; /* need to do it *now* */ 615 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
494 w->rpid = pid; 616 w->rpid = pid;
495 w->rstatus = status; 617 w->rstatus = status;
496 event (EV_A_ (W)w, EV_CHILD); 618 event (EV_A_ (W)w, EV_CHILD);
497 } 619 }
498} 620}
499 621
500static void 622static void
… …
520# include "ev_kqueue.c" 642# include "ev_kqueue.c"
521#endif 643#endif
522#if EV_USE_EPOLL 644#if EV_USE_EPOLL
523# include "ev_epoll.c" 645# include "ev_epoll.c"
524#endif 646#endif
525#if EV_USEV_POLL 647#if EV_USE_POLL
526# include "ev_poll.c" 648# include "ev_poll.c"
527#endif 649#endif
528#if EV_USE_SELECT 650#if EV_USE_SELECT
529# include "ev_select.c" 651# include "ev_select.c"
530#endif 652#endif
… …
582 methods = atoi (getenv ("LIBEV_METHODS")); 704 methods = atoi (getenv ("LIBEV_METHODS"));
583 else 705 else
584 methods = EVMETHOD_ANY; 706 methods = EVMETHOD_ANY;
585 707
586 method = 0; 708 method = 0;
709#if EV_USE_WIN32
710 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
711#endif
587#if EV_USE_KQUEUE 712#if EV_USE_KQUEUE
588 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 713 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
589#endif 714#endif
590#if EV_USE_EPOLL 715#if EV_USE_EPOLL
591 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 716 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
592#endif 717#endif
593#if EV_USEV_POLL 718#if EV_USE_POLL
594 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
595#endif 720#endif
596#if EV_USE_SELECT 721#if EV_USE_SELECT
597 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
598#endif 723#endif
724
725 ev_watcher_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI);
599 } 727 }
600} 728}
601 729
602void 730void
603loop_destroy (EV_P) 731loop_destroy (EV_P)
604{ 732{
733 int i;
734
735#if EV_USE_WIN32
736 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
737#endif
605#if EV_USE_KQUEUE 738#if EV_USE_KQUEUE
606 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 739 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
607#endif 740#endif
608#if EV_USE_EPOLL 741#if EV_USE_EPOLL
609 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 742 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
610#endif 743#endif
611#if EV_USEV_POLL 744#if EV_USE_POLL
612 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 745 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
613#endif 746#endif
614#if EV_USE_SELECT 747#if EV_USE_SELECT
615 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 748 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
616#endif 749#endif
617 750
751 for (i = NUMPRI; i--; )
752 array_free (pending, [i]);
753
754 /* have to use the microsoft-never-gets-it-right macro */
755 array_free_microshit (fdchange);
756 array_free_microshit (timer);
757 array_free_microshit (periodic);
758 array_free_microshit (idle);
759 array_free_microshit (prepare);
760 array_free_microshit (check);
761
618 method = 0; 762 method = 0;
619 /*TODO*/
620} 763}
621 764
622void 765static void
623loop_fork (EV_P) 766loop_fork (EV_P)
624{ 767{
625 /*TODO*/
626#if EV_USE_EPOLL 768#if EV_USE_EPOLL
627 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 769 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
628#endif 770#endif
629#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
630 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 772 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
631#endif 773#endif
774
775 if (ev_is_active (&sigev))
776 {
777 /* default loop */
778
779 ev_ref (EV_A);
780 ev_io_stop (EV_A_ &sigev);
781 close (sigpipe [0]);
782 close (sigpipe [1]);
783
784 while (pipe (sigpipe))
785 syserr ("(libev) error creating pipe");
786
787 siginit (EV_A);
788 }
789
790 postfork = 0;
632} 791}
633 792
634#if EV_MULTIPLICITY 793#if EV_MULTIPLICITY
635struct ev_loop * 794struct ev_loop *
636ev_loop_new (int methods) 795ev_loop_new (int methods)
637{ 796{
638 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 797 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
798
799 memset (loop, 0, sizeof (struct ev_loop));
639 800
640 loop_init (EV_A_ methods); 801 loop_init (EV_A_ methods);
641 802
642 if (ev_methods (EV_A)) 803 if (ev_method (EV_A))
643 return loop; 804 return loop;
644 805
645 return 0; 806 return 0;
646} 807}
647 808
648void 809void
649ev_loop_destroy (EV_P) 810ev_loop_destroy (EV_P)
650{ 811{
651 loop_destroy (EV_A); 812 loop_destroy (EV_A);
652 free (loop); 813 ev_free (loop);
653} 814}
654 815
655void 816void
656ev_loop_fork (EV_P) 817ev_loop_fork (EV_P)
657{ 818{
658 loop_fork (EV_A); 819 postfork = 1;
659} 820}
660 821
661#endif 822#endif
662 823
663#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
… …
686 847
687 loop_init (EV_A_ methods); 848 loop_init (EV_A_ methods);
688 849
689 if (ev_method (EV_A)) 850 if (ev_method (EV_A))
690 { 851 {
691 ev_watcher_init (&sigev, sigcb);
692 ev_set_priority (&sigev, EV_MAXPRI);
693 siginit (EV_A); 852 siginit (EV_A);
694 853
695#ifndef WIN32 854#ifndef WIN32
696 ev_signal_init (&childev, childcb, SIGCHLD); 855 ev_signal_init (&childev, childcb, SIGCHLD);
697 ev_set_priority (&childev, EV_MAXPRI); 856 ev_set_priority (&childev, EV_MAXPRI);
… …
711{ 870{
712#if EV_MULTIPLICITY 871#if EV_MULTIPLICITY
713 struct ev_loop *loop = default_loop; 872 struct ev_loop *loop = default_loop;
714#endif 873#endif
715 874
875#ifndef WIN32
716 ev_ref (EV_A); /* child watcher */ 876 ev_ref (EV_A); /* child watcher */
717 ev_signal_stop (EV_A_ &childev); 877 ev_signal_stop (EV_A_ &childev);
878#endif
718 879
719 ev_ref (EV_A); /* signal watcher */ 880 ev_ref (EV_A); /* signal watcher */
720 ev_io_stop (EV_A_ &sigev); 881 ev_io_stop (EV_A_ &sigev);
721 882
722 close (sigpipe [0]); sigpipe [0] = 0; 883 close (sigpipe [0]); sigpipe [0] = 0;
… …
724 885
725 loop_destroy (EV_A); 886 loop_destroy (EV_A);
726} 887}
727 888
728void 889void
729ev_default_fork (EV_P) 890ev_default_fork (void)
730{ 891{
731 loop_fork (EV_A); 892#if EV_MULTIPLICITY
893 struct ev_loop *loop = default_loop;
894#endif
732 895
733 ev_io_stop (EV_A_ &sigev); 896 if (method)
734 close (sigpipe [0]); 897 postfork = 1;
735 close (sigpipe [1]);
736 pipe (sigpipe);
737
738 ev_ref (EV_A); /* signal watcher */
739 siginit (EV_A);
740} 898}
741 899
742/*****************************************************************************/ 900/*****************************************************************************/
743 901
744static void 902static void
… …
760} 918}
761 919
762static void 920static void
763timers_reify (EV_P) 921timers_reify (EV_P)
764{ 922{
765 while (timercnt && timers [0]->at <= mn_now) 923 while (timercnt && ((WT)timers [0])->at <= mn_now)
766 { 924 {
767 struct ev_timer *w = timers [0]; 925 struct ev_timer *w = timers [0];
926
927 assert (("inactive timer on timer heap detected", ev_is_active (w)));
768 928
769 /* first reschedule or stop timer */ 929 /* first reschedule or stop timer */
770 if (w->repeat) 930 if (w->repeat)
771 { 931 {
772 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 932 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
773 w->at = mn_now + w->repeat; 933 ((WT)w)->at = mn_now + w->repeat;
774 downheap ((WT *)timers, timercnt, 0); 934 downheap ((WT *)timers, timercnt, 0);
775 } 935 }
776 else 936 else
777 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 937 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
778 938
… …
781} 941}
782 942
783static void 943static void
784periodics_reify (EV_P) 944periodics_reify (EV_P)
785{ 945{
786 while (periodiccnt && periodics [0]->at <= rt_now) 946 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
787 { 947 {
788 struct ev_periodic *w = periodics [0]; 948 struct ev_periodic *w = periodics [0];
949
950 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
789 951
790 /* first reschedule or stop timer */ 952 /* first reschedule or stop timer */
791 if (w->interval) 953 if (w->interval)
792 { 954 {
793 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 955 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
794 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 956 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
795 downheap ((WT *)periodics, periodiccnt, 0); 957 downheap ((WT *)periodics, periodiccnt, 0);
796 } 958 }
797 else 959 else
798 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 960 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
799 961
… …
811 { 973 {
812 struct ev_periodic *w = periodics [i]; 974 struct ev_periodic *w = periodics [i];
813 975
814 if (w->interval) 976 if (w->interval)
815 { 977 {
816 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 978 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
817 979
818 if (fabs (diff) >= 1e-4) 980 if (fabs (diff) >= 1e-4)
819 { 981 {
820 ev_periodic_stop (EV_A_ w); 982 ev_periodic_stop (EV_A_ w);
821 ev_periodic_start (EV_A_ w); 983 ev_periodic_start (EV_A_ w);
… …
882 { 1044 {
883 periodics_reschedule (EV_A); 1045 periodics_reschedule (EV_A);
884 1046
885 /* adjust timers. this is easy, as the offset is the same for all */ 1047 /* adjust timers. this is easy, as the offset is the same for all */
886 for (i = 0; i < timercnt; ++i) 1048 for (i = 0; i < timercnt; ++i)
887 timers [i]->at += rt_now - mn_now; 1049 ((WT)timers [i])->at += rt_now - mn_now;
888 } 1050 }
889 1051
890 mn_now = rt_now; 1052 mn_now = rt_now;
891 } 1053 }
892} 1054}
… …
918 { 1080 {
919 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1081 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
920 call_pending (EV_A); 1082 call_pending (EV_A);
921 } 1083 }
922 1084
1085 /* we might have forked, so reify kernel state if necessary */
1086 if (expect_false (postfork))
1087 loop_fork (EV_A);
1088
923 /* update fd-related kernel structures */ 1089 /* update fd-related kernel structures */
924 fd_reify (EV_A); 1090 fd_reify (EV_A);
925 1091
926 /* calculate blocking time */ 1092 /* calculate blocking time */
927 1093
… …
943 { 1109 {
944 block = MAX_BLOCKTIME; 1110 block = MAX_BLOCKTIME;
945 1111
946 if (timercnt) 1112 if (timercnt)
947 { 1113 {
948 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1114 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
949 if (block > to) block = to; 1115 if (block > to) block = to;
950 } 1116 }
951 1117
952 if (periodiccnt) 1118 if (periodiccnt)
953 { 1119 {
954 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1120 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
955 if (block > to) block = to; 1121 if (block > to) block = to;
956 } 1122 }
957 1123
958 if (block < 0.) block = 0.; 1124 if (block < 0.) block = 0.;
959 } 1125 }
… …
1051 return; 1217 return;
1052 1218
1053 assert (("ev_io_start called with negative fd", fd >= 0)); 1219 assert (("ev_io_start called with negative fd", fd >= 0));
1054 1220
1055 ev_start (EV_A_ (W)w, 1); 1221 ev_start (EV_A_ (W)w, 1);
1056 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1222 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1057 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1223 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1058 1224
1059 fd_change (EV_A_ fd); 1225 fd_change (EV_A_ fd);
1060} 1226}
1061 1227
… …
1076ev_timer_start (EV_P_ struct ev_timer *w) 1242ev_timer_start (EV_P_ struct ev_timer *w)
1077{ 1243{
1078 if (ev_is_active (w)) 1244 if (ev_is_active (w))
1079 return; 1245 return;
1080 1246
1081 w->at += mn_now; 1247 ((WT)w)->at += mn_now;
1082 1248
1083 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1249 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1084 1250
1085 ev_start (EV_A_ (W)w, ++timercnt); 1251 ev_start (EV_A_ (W)w, ++timercnt);
1086 array_needsize (timers, timermax, timercnt, ); 1252 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1087 timers [timercnt - 1] = w; 1253 timers [timercnt - 1] = w;
1088 upheap ((WT *)timers, timercnt - 1); 1254 upheap ((WT *)timers, timercnt - 1);
1255
1256 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1089} 1257}
1090 1258
1091void 1259void
1092ev_timer_stop (EV_P_ struct ev_timer *w) 1260ev_timer_stop (EV_P_ struct ev_timer *w)
1093{ 1261{
1094 ev_clear_pending (EV_A_ (W)w); 1262 ev_clear_pending (EV_A_ (W)w);
1095 if (!ev_is_active (w)) 1263 if (!ev_is_active (w))
1096 return; 1264 return;
1097 1265
1266 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1267
1098 if (w->active < timercnt--) 1268 if (((W)w)->active < timercnt--)
1099 { 1269 {
1100 timers [w->active - 1] = timers [timercnt]; 1270 timers [((W)w)->active - 1] = timers [timercnt];
1101 downheap ((WT *)timers, timercnt, w->active - 1); 1271 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1102 } 1272 }
1103 1273
1104 w->at = w->repeat; 1274 ((WT)w)->at = w->repeat;
1105 1275
1106 ev_stop (EV_A_ (W)w); 1276 ev_stop (EV_A_ (W)w);
1107} 1277}
1108 1278
1109void 1279void
… …
1111{ 1281{
1112 if (ev_is_active (w)) 1282 if (ev_is_active (w))
1113 { 1283 {
1114 if (w->repeat) 1284 if (w->repeat)
1115 { 1285 {
1116 w->at = mn_now + w->repeat; 1286 ((WT)w)->at = mn_now + w->repeat;
1117 downheap ((WT *)timers, timercnt, w->active - 1); 1287 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1118 } 1288 }
1119 else 1289 else
1120 ev_timer_stop (EV_A_ w); 1290 ev_timer_stop (EV_A_ w);
1121 } 1291 }
1122 else if (w->repeat) 1292 else if (w->repeat)
… …
1131 1301
1132 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1302 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1133 1303
1134 /* this formula differs from the one in periodic_reify because we do not always round up */ 1304 /* this formula differs from the one in periodic_reify because we do not always round up */
1135 if (w->interval) 1305 if (w->interval)
1136 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1306 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1137 1307
1138 ev_start (EV_A_ (W)w, ++periodiccnt); 1308 ev_start (EV_A_ (W)w, ++periodiccnt);
1139 array_needsize (periodics, periodicmax, periodiccnt, ); 1309 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1140 periodics [periodiccnt - 1] = w; 1310 periodics [periodiccnt - 1] = w;
1141 upheap ((WT *)periodics, periodiccnt - 1); 1311 upheap ((WT *)periodics, periodiccnt - 1);
1312
1313 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1142} 1314}
1143 1315
1144void 1316void
1145ev_periodic_stop (EV_P_ struct ev_periodic *w) 1317ev_periodic_stop (EV_P_ struct ev_periodic *w)
1146{ 1318{
1147 ev_clear_pending (EV_A_ (W)w); 1319 ev_clear_pending (EV_A_ (W)w);
1148 if (!ev_is_active (w)) 1320 if (!ev_is_active (w))
1149 return; 1321 return;
1150 1322
1323 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1324
1151 if (w->active < periodiccnt--) 1325 if (((W)w)->active < periodiccnt--)
1152 { 1326 {
1153 periodics [w->active - 1] = periodics [periodiccnt]; 1327 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1154 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1328 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1155 } 1329 }
1156 1330
1157 ev_stop (EV_A_ (W)w); 1331 ev_stop (EV_A_ (W)w);
1158} 1332}
1159 1333
… …
1162{ 1336{
1163 if (ev_is_active (w)) 1337 if (ev_is_active (w))
1164 return; 1338 return;
1165 1339
1166 ev_start (EV_A_ (W)w, ++idlecnt); 1340 ev_start (EV_A_ (W)w, ++idlecnt);
1167 array_needsize (idles, idlemax, idlecnt, ); 1341 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1168 idles [idlecnt - 1] = w; 1342 idles [idlecnt - 1] = w;
1169} 1343}
1170 1344
1171void 1345void
1172ev_idle_stop (EV_P_ struct ev_idle *w) 1346ev_idle_stop (EV_P_ struct ev_idle *w)
1173{ 1347{
1174 ev_clear_pending (EV_A_ (W)w); 1348 ev_clear_pending (EV_A_ (W)w);
1175 if (ev_is_active (w)) 1349 if (ev_is_active (w))
1176 return; 1350 return;
1177 1351
1178 idles [w->active - 1] = idles [--idlecnt]; 1352 idles [((W)w)->active - 1] = idles [--idlecnt];
1179 ev_stop (EV_A_ (W)w); 1353 ev_stop (EV_A_ (W)w);
1180} 1354}
1181 1355
1182void 1356void
1183ev_prepare_start (EV_P_ struct ev_prepare *w) 1357ev_prepare_start (EV_P_ struct ev_prepare *w)
1184{ 1358{
1185 if (ev_is_active (w)) 1359 if (ev_is_active (w))
1186 return; 1360 return;
1187 1361
1188 ev_start (EV_A_ (W)w, ++preparecnt); 1362 ev_start (EV_A_ (W)w, ++preparecnt);
1189 array_needsize (prepares, preparemax, preparecnt, ); 1363 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1190 prepares [preparecnt - 1] = w; 1364 prepares [preparecnt - 1] = w;
1191} 1365}
1192 1366
1193void 1367void
1194ev_prepare_stop (EV_P_ struct ev_prepare *w) 1368ev_prepare_stop (EV_P_ struct ev_prepare *w)
1195{ 1369{
1196 ev_clear_pending (EV_A_ (W)w); 1370 ev_clear_pending (EV_A_ (W)w);
1197 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1198 return; 1372 return;
1199 1373
1200 prepares [w->active - 1] = prepares [--preparecnt]; 1374 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1201 ev_stop (EV_A_ (W)w); 1375 ev_stop (EV_A_ (W)w);
1202} 1376}
1203 1377
1204void 1378void
1205ev_check_start (EV_P_ struct ev_check *w) 1379ev_check_start (EV_P_ struct ev_check *w)
1206{ 1380{
1207 if (ev_is_active (w)) 1381 if (ev_is_active (w))
1208 return; 1382 return;
1209 1383
1210 ev_start (EV_A_ (W)w, ++checkcnt); 1384 ev_start (EV_A_ (W)w, ++checkcnt);
1211 array_needsize (checks, checkmax, checkcnt, ); 1385 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1212 checks [checkcnt - 1] = w; 1386 checks [checkcnt - 1] = w;
1213} 1387}
1214 1388
1215void 1389void
1216ev_check_stop (EV_P_ struct ev_check *w) 1390ev_check_stop (EV_P_ struct ev_check *w)
1217{ 1391{
1218 ev_clear_pending (EV_A_ (W)w); 1392 ev_clear_pending (EV_A_ (W)w);
1219 if (ev_is_active (w)) 1393 if (ev_is_active (w))
1220 return; 1394 return;
1221 1395
1222 checks [w->active - 1] = checks [--checkcnt]; 1396 checks [((W)w)->active - 1] = checks [--checkcnt];
1223 ev_stop (EV_A_ (W)w); 1397 ev_stop (EV_A_ (W)w);
1224} 1398}
1225 1399
1226#ifndef SA_RESTART 1400#ifndef SA_RESTART
1227# define SA_RESTART 0 1401# define SA_RESTART 0
… …
1237 return; 1411 return;
1238 1412
1239 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1413 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1240 1414
1241 ev_start (EV_A_ (W)w, 1); 1415 ev_start (EV_A_ (W)w, 1);
1242 array_needsize (signals, signalmax, w->signum, signals_init); 1416 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1243 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1417 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1244 1418
1245 if (!w->next) 1419 if (!((WL)w)->next)
1246 { 1420 {
1421#if WIN32
1422 signal (w->signum, sighandler);
1423#else
1247 struct sigaction sa; 1424 struct sigaction sa;
1248 sa.sa_handler = sighandler; 1425 sa.sa_handler = sighandler;
1249 sigfillset (&sa.sa_mask); 1426 sigfillset (&sa.sa_mask);
1250 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1427 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1251 sigaction (w->signum, &sa, 0); 1428 sigaction (w->signum, &sa, 0);
1429#endif
1252 } 1430 }
1253} 1431}
1254 1432
1255void 1433void
1256ev_signal_stop (EV_P_ struct ev_signal *w) 1434ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1306 void (*cb)(int revents, void *arg) = once->cb; 1484 void (*cb)(int revents, void *arg) = once->cb;
1307 void *arg = once->arg; 1485 void *arg = once->arg;
1308 1486
1309 ev_io_stop (EV_A_ &once->io); 1487 ev_io_stop (EV_A_ &once->io);
1310 ev_timer_stop (EV_A_ &once->to); 1488 ev_timer_stop (EV_A_ &once->to);
1311 free (once); 1489 ev_free (once);
1312 1490
1313 cb (revents, arg); 1491 cb (revents, arg);
1314} 1492}
1315 1493
1316static void 1494static void
… …
1326} 1504}
1327 1505
1328void 1506void
1329ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1507ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1330{ 1508{
1331 struct ev_once *once = malloc (sizeof (struct ev_once)); 1509 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1332 1510
1333 if (!once) 1511 if (!once)
1334 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1512 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1335 else 1513 else
1336 { 1514 {

Diff Legend

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