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

Comparing libev/ev.c (file contents):
Revision 1.199 by root, Tue Dec 25 07:05:45 2007 UTC vs.
Revision 1.235 by root, Wed May 7 14:45:17 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
39 39
40#ifdef __cplusplus 40#ifdef __cplusplus
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44/* this big block deduces configuration from config.h */
44#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
45# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
46# include EV_CONFIG_H 47# include EV_CONFIG_H
47# else 48# else
48# include "config.h" 49# include "config.h"
… …
118# else 119# else
119# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
120# endif 121# endif
121# endif 122# endif
122 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
123#endif 132#endif
124 133
125#include <math.h> 134#include <math.h>
126#include <stdlib.h> 135#include <stdlib.h>
127#include <fcntl.h> 136#include <fcntl.h>
… …
152# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
153# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
154# endif 163# endif
155#endif 164#endif
156 165
157/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
158 167
159#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
160# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
161#endif 170#endif
162 171
… …
179# define EV_USE_POLL 1 188# define EV_USE_POLL 1
180# endif 189# endif
181#endif 190#endif
182 191
183#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
184# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
185#endif 198#endif
186 199
187#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
188# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
189#endif 202#endif
… …
191#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
192# define EV_USE_PORT 0 205# define EV_USE_PORT 0
193#endif 206#endif
194 207
195#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
196# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
197#endif 214#endif
198 215
199#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL 217# if EV_MINIMAL
201# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
210# else 227# else
211# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
212# endif 229# endif
213#endif 230#endif
214 231
215/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
216 241
217#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
218# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
219# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
220#endif 245#endif
… …
239# include <sys/inotify.h> 264# include <sys/inotify.h>
240#endif 265#endif
241 266
242#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
243# include <winsock.h> 268# include <winsock.h>
269#endif
270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
244#endif 281#endif
245 282
246/**/ 283/**/
247 284
248/* 285/*
… …
263# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
264# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
265#else 302#else
266# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
267# define noinline 304# define noinline
268# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
269# define inline 306# define inline
270# endif 307# endif
271#endif 308#endif
272 309
273#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
288 325
289typedef ev_watcher *W; 326typedef ev_watcher *W;
290typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
291typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
292 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
293#if EV_USE_MONOTONIC 333#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */ 335/* giving it a reasonably high chance of working on typical architetcures */
296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 337#endif
298 338
299#ifdef _WIN32 339#ifdef _WIN32
300# include "ev_win32.c" 340# include "ev_win32.c"
301#endif 341#endif
… …
323 perror (msg); 363 perror (msg);
324 abort (); 364 abort ();
325 } 365 }
326} 366}
327 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
328static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 384
330void 385void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 387{
333 alloc = cb; 388 alloc = cb;
334} 389}
335 390
336inline_speed void * 391inline_speed void *
337ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
338{ 393{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
340 395
341 if (!ptr && size) 396 if (!ptr && size)
342 { 397 {
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
344 abort (); 399 abort ();
… …
451 ts.tv_sec = (time_t)delay; 506 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 508
454 nanosleep (&ts, 0); 509 nanosleep (&ts, 0);
455#elif defined(_WIN32) 510#elif defined(_WIN32)
456 Sleep (delay * 1e3); 511 Sleep ((unsigned long)(delay * 1e3));
457#else 512#else
458 struct timeval tv; 513 struct timeval tv;
459 514
460 tv.tv_sec = (time_t)delay; 515 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
464#endif 519#endif
465 } 520 }
466} 521}
467 522
468/*****************************************************************************/ 523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
469 526
470int inline_size 527int inline_size
471array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
472{ 529{
473 int ncur = cur + 1; 530 int ncur = cur + 1;
474 531
475 do 532 do
476 ncur <<= 1; 533 ncur <<= 1;
477 while (cnt > ncur); 534 while (cnt > ncur);
478 535
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
481 { 538 {
482 ncur *= elem; 539 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
484 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem; 542 ncur /= elem;
486 } 543 }
487 544
488 return ncur; 545 return ncur;
… …
600 657
601#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
602 if (events) 659 if (events)
603 { 660 {
604 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
605 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
606 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
607 } 668 }
608#endif 669#endif
609 670
610 { 671 {
… …
698 } 759 }
699} 760}
700 761
701/*****************************************************************************/ 762/*****************************************************************************/
702 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define HEAP0 3 /* index of first element in heap */
774
775/* towards the root */
703void inline_speed 776void inline_speed
704upheap (WT *heap, int k) 777upheap (WT *heap, int k)
705{ 778{
706 WT w = heap [k]; 779 WT w = heap [k];
707 780
708 while (k) 781 for (;;)
709 { 782 {
710 int p = (k - 1) >> 1; 783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
711 784
712 if (heap [p]->at <= w->at) 785 if (p >= HEAP0 || heap [p]->at <= w->at)
713 break; 786 break;
714 787
715 heap [k] = heap [p]; 788 heap [k] = heap [p];
716 ((W)heap [k])->active = k + 1; 789 ev_active (heap [k]) = k;
717 k = p; 790 k = p;
718 } 791 }
719 792
720 heap [k] = w; 793 heap [k] = w;
721 ((W)heap [k])->active = k + 1; 794 ev_active (heap [k]) = k;
722} 795}
723 796
797/* away from the root */
724void inline_speed 798void inline_speed
725downheap (WT *heap, int N, int k) 799downheap (WT *heap, int N, int k)
726{ 800{
727 WT w = heap [k]; 801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
728 803
729 for (;;) 804 for (;;)
730 { 805 {
806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
809
810 // find minimum child
811 if (expect_true (pos +3 < E))
812 {
813 (minpos = pos + 0), (minat = (*minpos)->at);
814 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
815 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
816 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
817 }
818 else
819 {
820 if (pos >= E)
821 break;
822
823 (minpos = pos + 0), (minat = (*minpos)->at);
824 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
825 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
826 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
827 }
828
829 if (w->at <= minat)
830 break;
831
832 ev_active (*minpos) = k;
833 heap [k] = *minpos;
834
835 k = minpos - heap;
836 }
837
838 heap [k] = w;
839 ev_active (heap [k]) = k;
840}
841
842#else // 4HEAP
843
844#define HEAP0 1
845
846/* towards the root */
847void inline_speed
848upheap (WT *heap, int k)
849{
850 WT w = heap [k];
851
852 for (;;)
853 {
854 int p = k >> 1;
855
856 /* maybe we could use a dummy element at heap [0]? */
857 if (!p || heap [p]->at <= w->at)
858 break;
859
860 heap [k] = heap [p];
861 ev_active (heap [k]) = k;
862 k = p;
863 }
864
865 heap [k] = w;
866 ev_active (heap [k]) = k;
867}
868
869/* away from the root */
870void inline_speed
871downheap (WT *heap, int N, int k)
872{
873 WT w = heap [k];
874
875 for (;;)
876 {
731 int c = (k << 1) + 1; 877 int c = k << 1;
732 878
733 if (c >= N) 879 if (c > N)
734 break; 880 break;
735 881
736 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 882 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
737 ? 1 : 0; 883 ? 1 : 0;
738 884
739 if (w->at <= heap [c]->at) 885 if (w->at <= heap [c]->at)
740 break; 886 break;
741 887
742 heap [k] = heap [c]; 888 heap [k] = heap [c];
743 ((W)heap [k])->active = k + 1; 889 ((W)heap [k])->active = k;
744 890
745 k = c; 891 k = c;
746 } 892 }
747 893
748 heap [k] = w; 894 heap [k] = w;
749 ((W)heap [k])->active = k + 1; 895 ev_active (heap [k]) = k;
750} 896}
897#endif
751 898
752void inline_size 899void inline_size
753adjustheap (WT *heap, int N, int k) 900adjustheap (WT *heap, int N, int k)
754{ 901{
755 upheap (heap, k); 902 upheap (heap, k);
… …
759/*****************************************************************************/ 906/*****************************************************************************/
760 907
761typedef struct 908typedef struct
762{ 909{
763 WL head; 910 WL head;
764 sig_atomic_t volatile gotsig; 911 EV_ATOMIC_T gotsig;
765} ANSIG; 912} ANSIG;
766 913
767static ANSIG *signals; 914static ANSIG *signals;
768static int signalmax; 915static int signalmax;
769 916
770static int sigpipe [2]; 917static EV_ATOMIC_T gotsig;
771static sig_atomic_t volatile gotsig;
772static ev_io sigev;
773 918
774void inline_size 919void inline_size
775signals_init (ANSIG *base, int count) 920signals_init (ANSIG *base, int count)
776{ 921{
777 while (count--) 922 while (count--)
… …
781 926
782 ++base; 927 ++base;
783 } 928 }
784} 929}
785 930
786static void 931/*****************************************************************************/
787sighandler (int signum)
788{
789#if _WIN32
790 signal (signum, sighandler);
791#endif
792
793 signals [signum - 1].gotsig = 1;
794
795 if (!gotsig)
796 {
797 int old_errno = errno;
798 gotsig = 1;
799 write (sigpipe [1], &signum, 1);
800 errno = old_errno;
801 }
802}
803
804void noinline
805ev_feed_signal_event (EV_P_ int signum)
806{
807 WL w;
808
809#if EV_MULTIPLICITY
810 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
811#endif
812
813 --signum;
814
815 if (signum < 0 || signum >= signalmax)
816 return;
817
818 signals [signum].gotsig = 0;
819
820 for (w = signals [signum].head; w; w = w->next)
821 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
822}
823
824static void
825sigcb (EV_P_ ev_io *iow, int revents)
826{
827 int signum;
828
829 read (sigpipe [0], &revents, 1);
830 gotsig = 0;
831
832 for (signum = signalmax; signum--; )
833 if (signals [signum].gotsig)
834 ev_feed_signal_event (EV_A_ signum + 1);
835}
836 932
837void inline_speed 933void inline_speed
838fd_intern (int fd) 934fd_intern (int fd)
839{ 935{
840#ifdef _WIN32 936#ifdef _WIN32
… …
845 fcntl (fd, F_SETFL, O_NONBLOCK); 941 fcntl (fd, F_SETFL, O_NONBLOCK);
846#endif 942#endif
847} 943}
848 944
849static void noinline 945static void noinline
850siginit (EV_P) 946evpipe_init (EV_P)
851{ 947{
948 if (!ev_is_active (&pipeev))
949 {
950#if EV_USE_EVENTFD
951 if ((evfd = eventfd (0, 0)) >= 0)
952 {
953 evpipe [0] = -1;
954 fd_intern (evfd);
955 ev_io_set (&pipeev, evfd, EV_READ);
956 }
957 else
958#endif
959 {
960 while (pipe (evpipe))
961 syserr ("(libev) error creating signal/async pipe");
962
852 fd_intern (sigpipe [0]); 963 fd_intern (evpipe [0]);
853 fd_intern (sigpipe [1]); 964 fd_intern (evpipe [1]);
965 ev_io_set (&pipeev, evpipe [0], EV_READ);
966 }
854 967
855 ev_io_set (&sigev, sigpipe [0], EV_READ);
856 ev_io_start (EV_A_ &sigev); 968 ev_io_start (EV_A_ &pipeev);
857 ev_unref (EV_A); /* child watcher should not keep loop alive */ 969 ev_unref (EV_A); /* watcher should not keep loop alive */
970 }
971}
972
973void inline_size
974evpipe_write (EV_P_ EV_ATOMIC_T *flag)
975{
976 if (!*flag)
977 {
978 int old_errno = errno; /* save errno because write might clobber it */
979
980 *flag = 1;
981
982#if EV_USE_EVENTFD
983 if (evfd >= 0)
984 {
985 uint64_t counter = 1;
986 write (evfd, &counter, sizeof (uint64_t));
987 }
988 else
989#endif
990 write (evpipe [1], &old_errno, 1);
991
992 errno = old_errno;
993 }
994}
995
996static void
997pipecb (EV_P_ ev_io *iow, int revents)
998{
999#if EV_USE_EVENTFD
1000 if (evfd >= 0)
1001 {
1002 uint64_t counter;
1003 read (evfd, &counter, sizeof (uint64_t));
1004 }
1005 else
1006#endif
1007 {
1008 char dummy;
1009 read (evpipe [0], &dummy, 1);
1010 }
1011
1012 if (gotsig && ev_is_default_loop (EV_A))
1013 {
1014 int signum;
1015 gotsig = 0;
1016
1017 for (signum = signalmax; signum--; )
1018 if (signals [signum].gotsig)
1019 ev_feed_signal_event (EV_A_ signum + 1);
1020 }
1021
1022#if EV_ASYNC_ENABLE
1023 if (gotasync)
1024 {
1025 int i;
1026 gotasync = 0;
1027
1028 for (i = asynccnt; i--; )
1029 if (asyncs [i]->sent)
1030 {
1031 asyncs [i]->sent = 0;
1032 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1033 }
1034 }
1035#endif
858} 1036}
859 1037
860/*****************************************************************************/ 1038/*****************************************************************************/
861 1039
1040static void
1041ev_sighandler (int signum)
1042{
1043#if EV_MULTIPLICITY
1044 struct ev_loop *loop = &default_loop_struct;
1045#endif
1046
1047#if _WIN32
1048 signal (signum, ev_sighandler);
1049#endif
1050
1051 signals [signum - 1].gotsig = 1;
1052 evpipe_write (EV_A_ &gotsig);
1053}
1054
1055void noinline
1056ev_feed_signal_event (EV_P_ int signum)
1057{
1058 WL w;
1059
1060#if EV_MULTIPLICITY
1061 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1062#endif
1063
1064 --signum;
1065
1066 if (signum < 0 || signum >= signalmax)
1067 return;
1068
1069 signals [signum].gotsig = 0;
1070
1071 for (w = signals [signum].head; w; w = w->next)
1072 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1073}
1074
1075/*****************************************************************************/
1076
862static WL childs [EV_PID_HASHSIZE]; 1077static WL childs [EV_PID_HASHSIZE];
863 1078
864#ifndef _WIN32 1079#ifndef _WIN32
865 1080
866static ev_signal childev; 1081static ev_signal childev;
867 1082
1083#ifndef WIFCONTINUED
1084# define WIFCONTINUED(status) 0
1085#endif
1086
868void inline_speed 1087void inline_speed
869child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1088child_reap (EV_P_ int chain, int pid, int status)
870{ 1089{
871 ev_child *w; 1090 ev_child *w;
1091 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
872 1092
873 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1093 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1094 {
874 if (w->pid == pid || !w->pid) 1095 if ((w->pid == pid || !w->pid)
1096 && (!traced || (w->flags & 1)))
875 { 1097 {
876 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1098 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
877 w->rpid = pid; 1099 w->rpid = pid;
878 w->rstatus = status; 1100 w->rstatus = status;
879 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1101 ev_feed_event (EV_A_ (W)w, EV_CHILD);
880 } 1102 }
1103 }
881} 1104}
882 1105
883#ifndef WCONTINUED 1106#ifndef WCONTINUED
884# define WCONTINUED 0 1107# define WCONTINUED 0
885#endif 1108#endif
… …
894 if (!WCONTINUED 1117 if (!WCONTINUED
895 || errno != EINVAL 1118 || errno != EINVAL
896 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1119 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
897 return; 1120 return;
898 1121
899 /* make sure we are called again until all childs have been reaped */ 1122 /* make sure we are called again until all children have been reaped */
900 /* we need to do it this way so that the callback gets called before we continue */ 1123 /* we need to do it this way so that the callback gets called before we continue */
901 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1124 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
902 1125
903 child_reap (EV_A_ sw, pid, pid, status); 1126 child_reap (EV_A_ pid, pid, status);
904 if (EV_PID_HASHSIZE > 1) 1127 if (EV_PID_HASHSIZE > 1)
905 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1128 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
906} 1129}
907 1130
908#endif 1131#endif
909 1132
910/*****************************************************************************/ 1133/*****************************************************************************/
… …
1028 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1251 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1029 have_monotonic = 1; 1252 have_monotonic = 1;
1030 } 1253 }
1031#endif 1254#endif
1032 1255
1033 ev_rt_now = ev_time (); 1256 ev_rt_now = ev_time ();
1034 mn_now = get_clock (); 1257 mn_now = get_clock ();
1035 now_floor = mn_now; 1258 now_floor = mn_now;
1036 rtmn_diff = ev_rt_now - mn_now; 1259 rtmn_diff = ev_rt_now - mn_now;
1037 1260
1038 io_blocktime = 0.; 1261 io_blocktime = 0.;
1039 timeout_blocktime = 0.; 1262 timeout_blocktime = 0.;
1263 backend = 0;
1264 backend_fd = -1;
1265 gotasync = 0;
1266#if EV_USE_INOTIFY
1267 fs_fd = -2;
1268#endif
1040 1269
1041 /* pid check not overridable via env */ 1270 /* pid check not overridable via env */
1042#ifndef _WIN32 1271#ifndef _WIN32
1043 if (flags & EVFLAG_FORKCHECK) 1272 if (flags & EVFLAG_FORKCHECK)
1044 curpid = getpid (); 1273 curpid = getpid ();
… …
1047 if (!(flags & EVFLAG_NOENV) 1276 if (!(flags & EVFLAG_NOENV)
1048 && !enable_secure () 1277 && !enable_secure ()
1049 && getenv ("LIBEV_FLAGS")) 1278 && getenv ("LIBEV_FLAGS"))
1050 flags = atoi (getenv ("LIBEV_FLAGS")); 1279 flags = atoi (getenv ("LIBEV_FLAGS"));
1051 1280
1052 if (!(flags & 0x0000ffffUL)) 1281 if (!(flags & 0x0000ffffU))
1053 flags |= ev_recommended_backends (); 1282 flags |= ev_recommended_backends ();
1054
1055 backend = 0;
1056 backend_fd = -1;
1057#if EV_USE_INOTIFY
1058 fs_fd = -2;
1059#endif
1060 1283
1061#if EV_USE_PORT 1284#if EV_USE_PORT
1062 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1285 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1063#endif 1286#endif
1064#if EV_USE_KQUEUE 1287#if EV_USE_KQUEUE
… …
1072#endif 1295#endif
1073#if EV_USE_SELECT 1296#if EV_USE_SELECT
1074 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1297 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1075#endif 1298#endif
1076 1299
1077 ev_init (&sigev, sigcb); 1300 ev_init (&pipeev, pipecb);
1078 ev_set_priority (&sigev, EV_MAXPRI); 1301 ev_set_priority (&pipeev, EV_MAXPRI);
1079 } 1302 }
1080} 1303}
1081 1304
1082static void noinline 1305static void noinline
1083loop_destroy (EV_P) 1306loop_destroy (EV_P)
1084{ 1307{
1085 int i; 1308 int i;
1309
1310 if (ev_is_active (&pipeev))
1311 {
1312 ev_ref (EV_A); /* signal watcher */
1313 ev_io_stop (EV_A_ &pipeev);
1314
1315#if EV_USE_EVENTFD
1316 if (evfd >= 0)
1317 close (evfd);
1318#endif
1319
1320 if (evpipe [0] >= 0)
1321 {
1322 close (evpipe [0]);
1323 close (evpipe [1]);
1324 }
1325 }
1086 1326
1087#if EV_USE_INOTIFY 1327#if EV_USE_INOTIFY
1088 if (fs_fd >= 0) 1328 if (fs_fd >= 0)
1089 close (fs_fd); 1329 close (fs_fd);
1090#endif 1330#endif
… …
1127#if EV_FORK_ENABLE 1367#if EV_FORK_ENABLE
1128 array_free (fork, EMPTY); 1368 array_free (fork, EMPTY);
1129#endif 1369#endif
1130 array_free (prepare, EMPTY); 1370 array_free (prepare, EMPTY);
1131 array_free (check, EMPTY); 1371 array_free (check, EMPTY);
1372#if EV_ASYNC_ENABLE
1373 array_free (async, EMPTY);
1374#endif
1132 1375
1133 backend = 0; 1376 backend = 0;
1134} 1377}
1135 1378
1379#if EV_USE_INOTIFY
1136void inline_size infy_fork (EV_P); 1380void inline_size infy_fork (EV_P);
1381#endif
1137 1382
1138void inline_size 1383void inline_size
1139loop_fork (EV_P) 1384loop_fork (EV_P)
1140{ 1385{
1141#if EV_USE_PORT 1386#if EV_USE_PORT
… …
1149#endif 1394#endif
1150#if EV_USE_INOTIFY 1395#if EV_USE_INOTIFY
1151 infy_fork (EV_A); 1396 infy_fork (EV_A);
1152#endif 1397#endif
1153 1398
1154 if (ev_is_active (&sigev)) 1399 if (ev_is_active (&pipeev))
1155 { 1400 {
1156 /* default loop */ 1401 /* this "locks" the handlers against writing to the pipe */
1402 /* while we modify the fd vars */
1403 gotsig = 1;
1404#if EV_ASYNC_ENABLE
1405 gotasync = 1;
1406#endif
1157 1407
1158 ev_ref (EV_A); 1408 ev_ref (EV_A);
1159 ev_io_stop (EV_A_ &sigev); 1409 ev_io_stop (EV_A_ &pipeev);
1410
1411#if EV_USE_EVENTFD
1412 if (evfd >= 0)
1413 close (evfd);
1414#endif
1415
1416 if (evpipe [0] >= 0)
1417 {
1160 close (sigpipe [0]); 1418 close (evpipe [0]);
1161 close (sigpipe [1]); 1419 close (evpipe [1]);
1420 }
1162 1421
1163 while (pipe (sigpipe))
1164 syserr ("(libev) error creating pipe");
1165
1166 siginit (EV_A); 1422 evpipe_init (EV_A);
1423 /* now iterate over everything, in case we missed something */
1424 pipecb (EV_A_ &pipeev, EV_READ);
1167 } 1425 }
1168 1426
1169 postfork = 0; 1427 postfork = 0;
1170} 1428}
1171 1429
… …
1193} 1451}
1194 1452
1195void 1453void
1196ev_loop_fork (EV_P) 1454ev_loop_fork (EV_P)
1197{ 1455{
1198 postfork = 1; 1456 postfork = 1; /* must be in line with ev_default_fork */
1199} 1457}
1200
1201#endif 1458#endif
1202 1459
1203#if EV_MULTIPLICITY 1460#if EV_MULTIPLICITY
1204struct ev_loop * 1461struct ev_loop *
1205ev_default_loop_init (unsigned int flags) 1462ev_default_loop_init (unsigned int flags)
1206#else 1463#else
1207int 1464int
1208ev_default_loop (unsigned int flags) 1465ev_default_loop (unsigned int flags)
1209#endif 1466#endif
1210{ 1467{
1211 if (sigpipe [0] == sigpipe [1])
1212 if (pipe (sigpipe))
1213 return 0;
1214
1215 if (!ev_default_loop_ptr) 1468 if (!ev_default_loop_ptr)
1216 { 1469 {
1217#if EV_MULTIPLICITY 1470#if EV_MULTIPLICITY
1218 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1471 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1219#else 1472#else
… …
1222 1475
1223 loop_init (EV_A_ flags); 1476 loop_init (EV_A_ flags);
1224 1477
1225 if (ev_backend (EV_A)) 1478 if (ev_backend (EV_A))
1226 { 1479 {
1227 siginit (EV_A);
1228
1229#ifndef _WIN32 1480#ifndef _WIN32
1230 ev_signal_init (&childev, childcb, SIGCHLD); 1481 ev_signal_init (&childev, childcb, SIGCHLD);
1231 ev_set_priority (&childev, EV_MAXPRI); 1482 ev_set_priority (&childev, EV_MAXPRI);
1232 ev_signal_start (EV_A_ &childev); 1483 ev_signal_start (EV_A_ &childev);
1233 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1484 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1250#ifndef _WIN32 1501#ifndef _WIN32
1251 ev_ref (EV_A); /* child watcher */ 1502 ev_ref (EV_A); /* child watcher */
1252 ev_signal_stop (EV_A_ &childev); 1503 ev_signal_stop (EV_A_ &childev);
1253#endif 1504#endif
1254 1505
1255 ev_ref (EV_A); /* signal watcher */
1256 ev_io_stop (EV_A_ &sigev);
1257
1258 close (sigpipe [0]); sigpipe [0] = 0;
1259 close (sigpipe [1]); sigpipe [1] = 0;
1260
1261 loop_destroy (EV_A); 1506 loop_destroy (EV_A);
1262} 1507}
1263 1508
1264void 1509void
1265ev_default_fork (void) 1510ev_default_fork (void)
… …
1267#if EV_MULTIPLICITY 1512#if EV_MULTIPLICITY
1268 struct ev_loop *loop = ev_default_loop_ptr; 1513 struct ev_loop *loop = ev_default_loop_ptr;
1269#endif 1514#endif
1270 1515
1271 if (backend) 1516 if (backend)
1272 postfork = 1; 1517 postfork = 1; /* must be in line with ev_loop_fork */
1273} 1518}
1274 1519
1275/*****************************************************************************/ 1520/*****************************************************************************/
1276 1521
1277void 1522void
… …
1297 p->w->pending = 0; 1542 p->w->pending = 0;
1298 EV_CB_INVOKE (p->w, p->events); 1543 EV_CB_INVOKE (p->w, p->events);
1299 } 1544 }
1300 } 1545 }
1301} 1546}
1302
1303void inline_size
1304timers_reify (EV_P)
1305{
1306 while (timercnt && ((WT)timers [0])->at <= mn_now)
1307 {
1308 ev_timer *w = (ev_timer *)timers [0];
1309
1310 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1311
1312 /* first reschedule or stop timer */
1313 if (w->repeat)
1314 {
1315 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1316
1317 ((WT)w)->at += w->repeat;
1318 if (((WT)w)->at < mn_now)
1319 ((WT)w)->at = mn_now;
1320
1321 downheap (timers, timercnt, 0);
1322 }
1323 else
1324 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1325
1326 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1327 }
1328}
1329
1330#if EV_PERIODIC_ENABLE
1331void inline_size
1332periodics_reify (EV_P)
1333{
1334 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1335 {
1336 ev_periodic *w = (ev_periodic *)periodics [0];
1337
1338 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1339
1340 /* first reschedule or stop timer */
1341 if (w->reschedule_cb)
1342 {
1343 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1344 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1345 downheap (periodics, periodiccnt, 0);
1346 }
1347 else if (w->interval)
1348 {
1349 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1350 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1351 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1352 downheap (periodics, periodiccnt, 0);
1353 }
1354 else
1355 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1356
1357 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1358 }
1359}
1360
1361static void noinline
1362periodics_reschedule (EV_P)
1363{
1364 int i;
1365
1366 /* adjust periodics after time jump */
1367 for (i = 0; i < periodiccnt; ++i)
1368 {
1369 ev_periodic *w = (ev_periodic *)periodics [i];
1370
1371 if (w->reschedule_cb)
1372 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1373 else if (w->interval)
1374 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1375 }
1376
1377 /* now rebuild the heap */
1378 for (i = periodiccnt >> 1; i--; )
1379 downheap (periodics, periodiccnt, i);
1380}
1381#endif
1382 1547
1383#if EV_IDLE_ENABLE 1548#if EV_IDLE_ENABLE
1384void inline_size 1549void inline_size
1385idle_reify (EV_P) 1550idle_reify (EV_P)
1386{ 1551{
… …
1398 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1563 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1399 break; 1564 break;
1400 } 1565 }
1401 } 1566 }
1402 } 1567 }
1568}
1569#endif
1570
1571void inline_size
1572timers_reify (EV_P)
1573{
1574 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1575 {
1576 ev_timer *w = (ev_timer *)timers [HEAP0];
1577
1578 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1579
1580 /* first reschedule or stop timer */
1581 if (w->repeat)
1582 {
1583 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1584
1585 ev_at (w) += w->repeat;
1586 if (ev_at (w) < mn_now)
1587 ev_at (w) = mn_now;
1588
1589 downheap (timers, timercnt, HEAP0);
1590 }
1591 else
1592 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1593
1594 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1595 }
1596}
1597
1598#if EV_PERIODIC_ENABLE
1599void inline_size
1600periodics_reify (EV_P)
1601{
1602 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1603 {
1604 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1605
1606 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1607
1608 /* first reschedule or stop timer */
1609 if (w->reschedule_cb)
1610 {
1611 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1612 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1613 downheap (periodics, periodiccnt, 1);
1614 }
1615 else if (w->interval)
1616 {
1617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1618 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1619 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1620 downheap (periodics, periodiccnt, HEAP0);
1621 }
1622 else
1623 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1624
1625 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1626 }
1627}
1628
1629static void noinline
1630periodics_reschedule (EV_P)
1631{
1632 int i;
1633
1634 /* adjust periodics after time jump */
1635 for (i = 1; i <= periodiccnt; ++i)
1636 {
1637 ev_periodic *w = (ev_periodic *)periodics [i];
1638
1639 if (w->reschedule_cb)
1640 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1641 else if (w->interval)
1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1643 }
1644
1645 /* now rebuild the heap */
1646 for (i = periodiccnt >> 1; --i; )
1647 downheap (periodics, periodiccnt, i + HEAP0);
1403} 1648}
1404#endif 1649#endif
1405 1650
1406void inline_speed 1651void inline_speed
1407time_update (EV_P_ ev_tstamp max_block) 1652time_update (EV_P_ ev_tstamp max_block)
… …
1436 */ 1681 */
1437 for (i = 4; --i; ) 1682 for (i = 4; --i; )
1438 { 1683 {
1439 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1440 1685
1441 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1686 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1442 return; /* all is well */ 1687 return; /* all is well */
1443 1688
1444 ev_rt_now = ev_time (); 1689 ev_rt_now = ev_time ();
1445 mn_now = get_clock (); 1690 mn_now = get_clock ();
1446 now_floor = mn_now; 1691 now_floor = mn_now;
… …
1461 { 1706 {
1462#if EV_PERIODIC_ENABLE 1707#if EV_PERIODIC_ENABLE
1463 periodics_reschedule (EV_A); 1708 periodics_reschedule (EV_A);
1464#endif 1709#endif
1465 /* adjust timers. this is easy, as the offset is the same for all of them */ 1710 /* adjust timers. this is easy, as the offset is the same for all of them */
1466 for (i = 0; i < timercnt; ++i) 1711 for (i = 1; i <= timercnt; ++i)
1467 ((WT)timers [i])->at += ev_rt_now - mn_now; 1712 ev_at (timers [i]) += ev_rt_now - mn_now;
1468 } 1713 }
1469 1714
1470 mn_now = ev_rt_now; 1715 mn_now = ev_rt_now;
1471 } 1716 }
1472} 1717}
… …
1486static int loop_done; 1731static int loop_done;
1487 1732
1488void 1733void
1489ev_loop (EV_P_ int flags) 1734ev_loop (EV_P_ int flags)
1490{ 1735{
1491 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1736 loop_done = EVUNLOOP_CANCEL;
1492 ? EVUNLOOP_ONE
1493 : EVUNLOOP_CANCEL;
1494 1737
1495 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1738 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1496 1739
1497 do 1740 do
1498 { 1741 {
… …
1544 1787
1545 waittime = MAX_BLOCKTIME; 1788 waittime = MAX_BLOCKTIME;
1546 1789
1547 if (timercnt) 1790 if (timercnt)
1548 { 1791 {
1549 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1792 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1550 if (waittime > to) waittime = to; 1793 if (waittime > to) waittime = to;
1551 } 1794 }
1552 1795
1553#if EV_PERIODIC_ENABLE 1796#if EV_PERIODIC_ENABLE
1554 if (periodiccnt) 1797 if (periodiccnt)
1555 { 1798 {
1556 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1799 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1557 if (waittime > to) waittime = to; 1800 if (waittime > to) waittime = to;
1558 } 1801 }
1559#endif 1802#endif
1560 1803
1561 if (expect_false (waittime < timeout_blocktime)) 1804 if (expect_false (waittime < timeout_blocktime))
… …
1594 /* queue check watchers, to be executed first */ 1837 /* queue check watchers, to be executed first */
1595 if (expect_false (checkcnt)) 1838 if (expect_false (checkcnt))
1596 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1839 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1597 1840
1598 call_pending (EV_A); 1841 call_pending (EV_A);
1599
1600 } 1842 }
1601 while (expect_true (activecnt && !loop_done)); 1843 while (expect_true (
1844 activecnt
1845 && !loop_done
1846 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1847 ));
1602 1848
1603 if (loop_done == EVUNLOOP_ONE) 1849 if (loop_done == EVUNLOOP_ONE)
1604 loop_done = EVUNLOOP_CANCEL; 1850 loop_done = EVUNLOOP_CANCEL;
1605} 1851}
1606 1852
… …
1724ev_timer_start (EV_P_ ev_timer *w) 1970ev_timer_start (EV_P_ ev_timer *w)
1725{ 1971{
1726 if (expect_false (ev_is_active (w))) 1972 if (expect_false (ev_is_active (w)))
1727 return; 1973 return;
1728 1974
1729 ((WT)w)->at += mn_now; 1975 ev_at (w) += mn_now;
1730 1976
1731 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1977 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1732 1978
1733 ev_start (EV_A_ (W)w, ++timercnt); 1979 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1734 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1980 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1735 timers [timercnt - 1] = (WT)w; 1981 timers [ev_active (w)] = (WT)w;
1736 upheap (timers, timercnt - 1); 1982 upheap (timers, ev_active (w));
1737 1983
1738 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1984 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1739} 1985}
1740 1986
1741void noinline 1987void noinline
1742ev_timer_stop (EV_P_ ev_timer *w) 1988ev_timer_stop (EV_P_ ev_timer *w)
1743{ 1989{
1744 clear_pending (EV_A_ (W)w); 1990 clear_pending (EV_A_ (W)w);
1745 if (expect_false (!ev_is_active (w))) 1991 if (expect_false (!ev_is_active (w)))
1746 return; 1992 return;
1747 1993
1748 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1749
1750 { 1994 {
1751 int active = ((W)w)->active; 1995 int active = ev_active (w);
1752 1996
1997 assert (("internal timer heap corruption", timers [active] == (WT)w));
1998
1753 if (expect_true (--active < --timercnt)) 1999 if (expect_true (active < timercnt + HEAP0 - 1))
1754 { 2000 {
1755 timers [active] = timers [timercnt]; 2001 timers [active] = timers [timercnt + HEAP0 - 1];
1756 adjustheap (timers, timercnt, active); 2002 adjustheap (timers, timercnt, active);
1757 } 2003 }
2004
2005 --timercnt;
1758 } 2006 }
1759 2007
1760 ((WT)w)->at -= mn_now; 2008 ev_at (w) -= mn_now;
1761 2009
1762 ev_stop (EV_A_ (W)w); 2010 ev_stop (EV_A_ (W)w);
1763} 2011}
1764 2012
1765void noinline 2013void noinline
… …
1767{ 2015{
1768 if (ev_is_active (w)) 2016 if (ev_is_active (w))
1769 { 2017 {
1770 if (w->repeat) 2018 if (w->repeat)
1771 { 2019 {
1772 ((WT)w)->at = mn_now + w->repeat; 2020 ev_at (w) = mn_now + w->repeat;
1773 adjustheap (timers, timercnt, ((W)w)->active - 1); 2021 adjustheap (timers, timercnt, ev_active (w));
1774 } 2022 }
1775 else 2023 else
1776 ev_timer_stop (EV_A_ w); 2024 ev_timer_stop (EV_A_ w);
1777 } 2025 }
1778 else if (w->repeat) 2026 else if (w->repeat)
1779 { 2027 {
1780 w->at = w->repeat; 2028 ev_at (w) = w->repeat;
1781 ev_timer_start (EV_A_ w); 2029 ev_timer_start (EV_A_ w);
1782 } 2030 }
1783} 2031}
1784 2032
1785#if EV_PERIODIC_ENABLE 2033#if EV_PERIODIC_ENABLE
… …
1788{ 2036{
1789 if (expect_false (ev_is_active (w))) 2037 if (expect_false (ev_is_active (w)))
1790 return; 2038 return;
1791 2039
1792 if (w->reschedule_cb) 2040 if (w->reschedule_cb)
1793 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2041 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1794 else if (w->interval) 2042 else if (w->interval)
1795 { 2043 {
1796 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2044 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1797 /* this formula differs from the one in periodic_reify because we do not always round up */ 2045 /* this formula differs from the one in periodic_reify because we do not always round up */
1798 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2046 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1799 } 2047 }
1800 else 2048 else
1801 ((WT)w)->at = w->offset; 2049 ev_at (w) = w->offset;
1802 2050
1803 ev_start (EV_A_ (W)w, ++periodiccnt); 2051 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1804 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2052 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1805 periodics [periodiccnt - 1] = (WT)w; 2053 periodics [ev_active (w)] = (WT)w;
1806 upheap (periodics, periodiccnt - 1); 2054 upheap (periodics, ev_active (w));
1807 2055
1808 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2056 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1809} 2057}
1810 2058
1811void noinline 2059void noinline
1812ev_periodic_stop (EV_P_ ev_periodic *w) 2060ev_periodic_stop (EV_P_ ev_periodic *w)
1813{ 2061{
1814 clear_pending (EV_A_ (W)w); 2062 clear_pending (EV_A_ (W)w);
1815 if (expect_false (!ev_is_active (w))) 2063 if (expect_false (!ev_is_active (w)))
1816 return; 2064 return;
1817 2065
1818 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1819
1820 { 2066 {
1821 int active = ((W)w)->active; 2067 int active = ev_active (w);
1822 2068
2069 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2070
1823 if (expect_true (--active < --periodiccnt)) 2071 if (expect_true (active < periodiccnt + HEAP0 - 1))
1824 { 2072 {
1825 periodics [active] = periodics [periodiccnt]; 2073 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1826 adjustheap (periodics, periodiccnt, active); 2074 adjustheap (periodics, periodiccnt, active);
1827 } 2075 }
2076
2077 --periodiccnt;
1828 } 2078 }
1829 2079
1830 ev_stop (EV_A_ (W)w); 2080 ev_stop (EV_A_ (W)w);
1831} 2081}
1832 2082
… …
1851#endif 2101#endif
1852 if (expect_false (ev_is_active (w))) 2102 if (expect_false (ev_is_active (w)))
1853 return; 2103 return;
1854 2104
1855 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2105 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2106
2107 evpipe_init (EV_A);
1856 2108
1857 { 2109 {
1858#ifndef _WIN32 2110#ifndef _WIN32
1859 sigset_t full, prev; 2111 sigset_t full, prev;
1860 sigfillset (&full); 2112 sigfillset (&full);
… …
1872 wlist_add (&signals [w->signum - 1].head, (WL)w); 2124 wlist_add (&signals [w->signum - 1].head, (WL)w);
1873 2125
1874 if (!((WL)w)->next) 2126 if (!((WL)w)->next)
1875 { 2127 {
1876#if _WIN32 2128#if _WIN32
1877 signal (w->signum, sighandler); 2129 signal (w->signum, ev_sighandler);
1878#else 2130#else
1879 struct sigaction sa; 2131 struct sigaction sa;
1880 sa.sa_handler = sighandler; 2132 sa.sa_handler = ev_sighandler;
1881 sigfillset (&sa.sa_mask); 2133 sigfillset (&sa.sa_mask);
1882 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2134 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1883 sigaction (w->signum, &sa, 0); 2135 sigaction (w->signum, &sa, 0);
1884#endif 2136#endif
1885 } 2137 }
… …
1946 if (w->wd < 0) 2198 if (w->wd < 0)
1947 { 2199 {
1948 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2200 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1949 2201
1950 /* monitor some parent directory for speedup hints */ 2202 /* monitor some parent directory for speedup hints */
2203 /* note that exceeding the hardcoded limit is not a correctness issue, */
2204 /* but an efficiency issue only */
1951 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2205 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1952 { 2206 {
1953 char path [4096]; 2207 char path [4096];
1954 strcpy (path, w->path); 2208 strcpy (path, w->path);
1955 2209
… …
2200 clear_pending (EV_A_ (W)w); 2454 clear_pending (EV_A_ (W)w);
2201 if (expect_false (!ev_is_active (w))) 2455 if (expect_false (!ev_is_active (w)))
2202 return; 2456 return;
2203 2457
2204 { 2458 {
2205 int active = ((W)w)->active; 2459 int active = ev_active (w);
2206 2460
2207 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2461 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2208 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2462 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2209 2463
2210 ev_stop (EV_A_ (W)w); 2464 ev_stop (EV_A_ (W)w);
2211 --idleall; 2465 --idleall;
2212 } 2466 }
2213} 2467}
… …
2230 clear_pending (EV_A_ (W)w); 2484 clear_pending (EV_A_ (W)w);
2231 if (expect_false (!ev_is_active (w))) 2485 if (expect_false (!ev_is_active (w)))
2232 return; 2486 return;
2233 2487
2234 { 2488 {
2235 int active = ((W)w)->active; 2489 int active = ev_active (w);
2490
2236 prepares [active - 1] = prepares [--preparecnt]; 2491 prepares [active - 1] = prepares [--preparecnt];
2237 ((W)prepares [active - 1])->active = active; 2492 ev_active (prepares [active - 1]) = active;
2238 } 2493 }
2239 2494
2240 ev_stop (EV_A_ (W)w); 2495 ev_stop (EV_A_ (W)w);
2241} 2496}
2242 2497
… …
2257 clear_pending (EV_A_ (W)w); 2512 clear_pending (EV_A_ (W)w);
2258 if (expect_false (!ev_is_active (w))) 2513 if (expect_false (!ev_is_active (w)))
2259 return; 2514 return;
2260 2515
2261 { 2516 {
2262 int active = ((W)w)->active; 2517 int active = ev_active (w);
2518
2263 checks [active - 1] = checks [--checkcnt]; 2519 checks [active - 1] = checks [--checkcnt];
2264 ((W)checks [active - 1])->active = active; 2520 ev_active (checks [active - 1]) = active;
2265 } 2521 }
2266 2522
2267 ev_stop (EV_A_ (W)w); 2523 ev_stop (EV_A_ (W)w);
2268} 2524}
2269 2525
… …
2365 clear_pending (EV_A_ (W)w); 2621 clear_pending (EV_A_ (W)w);
2366 if (expect_false (!ev_is_active (w))) 2622 if (expect_false (!ev_is_active (w)))
2367 return; 2623 return;
2368 2624
2369 { 2625 {
2370 int active = ((W)w)->active; 2626 int active = ev_active (w);
2627
2371 forks [active - 1] = forks [--forkcnt]; 2628 forks [active - 1] = forks [--forkcnt];
2372 ((W)forks [active - 1])->active = active; 2629 ev_active (forks [active - 1]) = active;
2373 } 2630 }
2374 2631
2375 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633}
2634#endif
2635
2636#if EV_ASYNC_ENABLE
2637void
2638ev_async_start (EV_P_ ev_async *w)
2639{
2640 if (expect_false (ev_is_active (w)))
2641 return;
2642
2643 evpipe_init (EV_A);
2644
2645 ev_start (EV_A_ (W)w, ++asynccnt);
2646 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2647 asyncs [asynccnt - 1] = w;
2648}
2649
2650void
2651ev_async_stop (EV_P_ ev_async *w)
2652{
2653 clear_pending (EV_A_ (W)w);
2654 if (expect_false (!ev_is_active (w)))
2655 return;
2656
2657 {
2658 int active = ev_active (w);
2659
2660 asyncs [active - 1] = asyncs [--asynccnt];
2661 ev_active (asyncs [active - 1]) = active;
2662 }
2663
2664 ev_stop (EV_A_ (W)w);
2665}
2666
2667void
2668ev_async_send (EV_P_ ev_async *w)
2669{
2670 w->sent = 1;
2671 evpipe_write (EV_A_ &gotasync);
2376} 2672}
2377#endif 2673#endif
2378 2674
2379/*****************************************************************************/ 2675/*****************************************************************************/
2380 2676

Diff Legend

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