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.229 by root, Fri May 2 08:08:45 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);
… …
600 655
601#if EV_SELECT_IS_WINSOCKET 656#if EV_SELECT_IS_WINSOCKET
602 if (events) 657 if (events)
603 { 658 {
604 unsigned long argp; 659 unsigned long argp;
660 #ifdef EV_FD_TO_WIN32_HANDLE
661 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
662 #else
605 anfd->handle = _get_osfhandle (fd); 663 anfd->handle = _get_osfhandle (fd);
664 #endif
606 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 665 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
607 } 666 }
608#endif 667#endif
609 668
610 { 669 {
… …
698 } 757 }
699} 758}
700 759
701/*****************************************************************************/ 760/*****************************************************************************/
702 761
762/* towards the root */
703void inline_speed 763void inline_speed
704upheap (WT *heap, int k) 764upheap (WT *heap, int k)
705{ 765{
706 WT w = heap [k]; 766 WT w = heap [k];
707 767
708 while (k) 768 for (;;)
709 { 769 {
710 int p = (k - 1) >> 1; 770 int p = k >> 1;
711 771
772 /* maybe we could use a dummy element at heap [0]? */
712 if (heap [p]->at <= w->at) 773 if (!p || heap [p]->at <= w->at)
713 break; 774 break;
714 775
715 heap [k] = heap [p]; 776 heap [k] = heap [p];
716 ((W)heap [k])->active = k + 1; 777 ((W)heap [k])->active = k;
717 k = p; 778 k = p;
718 } 779 }
719 780
720 heap [k] = w; 781 heap [k] = w;
721 ((W)heap [k])->active = k + 1; 782 ((W)heap [k])->active = k;
722} 783}
723 784
785/* away from the root */
724void inline_speed 786void inline_speed
725downheap (WT *heap, int N, int k) 787downheap (WT *heap, int N, int k)
726{ 788{
727 WT w = heap [k]; 789 WT w = heap [k];
728 790
729 for (;;) 791 for (;;)
730 { 792 {
731 int c = (k << 1) + 1; 793 int c = k << 1;
732 794
733 if (c >= N) 795 if (c > N)
734 break; 796 break;
735 797
736 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 798 c += c < N && heap [c]->at > heap [c + 1]->at
737 ? 1 : 0; 799 ? 1 : 0;
738 800
739 if (w->at <= heap [c]->at) 801 if (w->at <= heap [c]->at)
740 break; 802 break;
741 803
742 heap [k] = heap [c]; 804 heap [k] = heap [c];
743 ((W)heap [k])->active = k + 1; 805 ((W)heap [k])->active = k;
744 806
745 k = c; 807 k = c;
746 } 808 }
747 809
748 heap [k] = w; 810 heap [k] = w;
749 ((W)heap [k])->active = k + 1; 811 ((W)heap [k])->active = k;
750} 812}
751 813
752void inline_size 814void inline_size
753adjustheap (WT *heap, int N, int k) 815adjustheap (WT *heap, int N, int k)
754{ 816{
… …
759/*****************************************************************************/ 821/*****************************************************************************/
760 822
761typedef struct 823typedef struct
762{ 824{
763 WL head; 825 WL head;
764 sig_atomic_t volatile gotsig; 826 EV_ATOMIC_T gotsig;
765} ANSIG; 827} ANSIG;
766 828
767static ANSIG *signals; 829static ANSIG *signals;
768static int signalmax; 830static int signalmax;
769 831
770static int sigpipe [2]; 832static EV_ATOMIC_T gotsig;
771static sig_atomic_t volatile gotsig;
772static ev_io sigev;
773 833
774void inline_size 834void inline_size
775signals_init (ANSIG *base, int count) 835signals_init (ANSIG *base, int count)
776{ 836{
777 while (count--) 837 while (count--)
… …
781 841
782 ++base; 842 ++base;
783 } 843 }
784} 844}
785 845
786static void 846/*****************************************************************************/
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 847
837void inline_speed 848void inline_speed
838fd_intern (int fd) 849fd_intern (int fd)
839{ 850{
840#ifdef _WIN32 851#ifdef _WIN32
… …
845 fcntl (fd, F_SETFL, O_NONBLOCK); 856 fcntl (fd, F_SETFL, O_NONBLOCK);
846#endif 857#endif
847} 858}
848 859
849static void noinline 860static void noinline
850siginit (EV_P) 861evpipe_init (EV_P)
851{ 862{
863 if (!ev_is_active (&pipeev))
864 {
865#if EV_USE_EVENTFD
866 if ((evfd = eventfd (0, 0)) >= 0)
867 {
868 evpipe [0] = -1;
869 fd_intern (evfd);
870 ev_io_set (&pipeev, evfd, EV_READ);
871 }
872 else
873#endif
874 {
875 while (pipe (evpipe))
876 syserr ("(libev) error creating signal/async pipe");
877
852 fd_intern (sigpipe [0]); 878 fd_intern (evpipe [0]);
853 fd_intern (sigpipe [1]); 879 fd_intern (evpipe [1]);
880 ev_io_set (&pipeev, evpipe [0], EV_READ);
881 }
854 882
855 ev_io_set (&sigev, sigpipe [0], EV_READ);
856 ev_io_start (EV_A_ &sigev); 883 ev_io_start (EV_A_ &pipeev);
857 ev_unref (EV_A); /* child watcher should not keep loop alive */ 884 ev_unref (EV_A); /* watcher should not keep loop alive */
885 }
886}
887
888void inline_size
889evpipe_write (EV_P_ EV_ATOMIC_T *flag)
890{
891 if (!*flag)
892 {
893 int old_errno = errno; /* save errno because write might clobber it */
894
895 *flag = 1;
896
897#if EV_USE_EVENTFD
898 if (evfd >= 0)
899 {
900 uint64_t counter = 1;
901 write (evfd, &counter, sizeof (uint64_t));
902 }
903 else
904#endif
905 write (evpipe [1], &old_errno, 1);
906
907 errno = old_errno;
908 }
909}
910
911static void
912pipecb (EV_P_ ev_io *iow, int revents)
913{
914#if EV_USE_EVENTFD
915 if (evfd >= 0)
916 {
917 uint64_t counter = 1;
918 read (evfd, &counter, sizeof (uint64_t));
919 }
920 else
921#endif
922 {
923 char dummy;
924 read (evpipe [0], &dummy, 1);
925 }
926
927 if (gotsig && ev_is_default_loop (EV_A))
928 {
929 int signum;
930 gotsig = 0;
931
932 for (signum = signalmax; signum--; )
933 if (signals [signum].gotsig)
934 ev_feed_signal_event (EV_A_ signum + 1);
935 }
936
937#if EV_ASYNC_ENABLE
938 if (gotasync)
939 {
940 int i;
941 gotasync = 0;
942
943 for (i = asynccnt; i--; )
944 if (asyncs [i]->sent)
945 {
946 asyncs [i]->sent = 0;
947 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
948 }
949 }
950#endif
858} 951}
859 952
860/*****************************************************************************/ 953/*****************************************************************************/
861 954
955static void
956ev_sighandler (int signum)
957{
958#if EV_MULTIPLICITY
959 struct ev_loop *loop = &default_loop_struct;
960#endif
961
962#if _WIN32
963 signal (signum, ev_sighandler);
964#endif
965
966 signals [signum - 1].gotsig = 1;
967 evpipe_write (EV_A_ &gotsig);
968}
969
970void noinline
971ev_feed_signal_event (EV_P_ int signum)
972{
973 WL w;
974
975#if EV_MULTIPLICITY
976 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
977#endif
978
979 --signum;
980
981 if (signum < 0 || signum >= signalmax)
982 return;
983
984 signals [signum].gotsig = 0;
985
986 for (w = signals [signum].head; w; w = w->next)
987 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
988}
989
990/*****************************************************************************/
991
862static WL childs [EV_PID_HASHSIZE]; 992static WL childs [EV_PID_HASHSIZE];
863 993
864#ifndef _WIN32 994#ifndef _WIN32
865 995
866static ev_signal childev; 996static ev_signal childev;
867 997
998#ifndef WIFCONTINUED
999# define WIFCONTINUED(status) 0
1000#endif
1001
868void inline_speed 1002void inline_speed
869child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
870{ 1004{
871 ev_child *w; 1005 ev_child *w;
1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
872 1007
873 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1008 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1009 {
874 if (w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
1011 && (!traced || (w->flags & 1)))
875 { 1012 {
876 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1013 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; 1014 w->rpid = pid;
878 w->rstatus = status; 1015 w->rstatus = status;
879 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
880 } 1017 }
1018 }
881} 1019}
882 1020
883#ifndef WCONTINUED 1021#ifndef WCONTINUED
884# define WCONTINUED 0 1022# define WCONTINUED 0
885#endif 1023#endif
… …
894 if (!WCONTINUED 1032 if (!WCONTINUED
895 || errno != EINVAL 1033 || errno != EINVAL
896 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
897 return; 1035 return;
898 1036
899 /* make sure we are called again until all childs have been reaped */ 1037 /* 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 */ 1038 /* 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); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
902 1040
903 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
904 if (EV_PID_HASHSIZE > 1) 1042 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 */ 1043 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
906} 1044}
907 1045
908#endif 1046#endif
909 1047
910/*****************************************************************************/ 1048/*****************************************************************************/
… …
1028 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1166 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1029 have_monotonic = 1; 1167 have_monotonic = 1;
1030 } 1168 }
1031#endif 1169#endif
1032 1170
1033 ev_rt_now = ev_time (); 1171 ev_rt_now = ev_time ();
1034 mn_now = get_clock (); 1172 mn_now = get_clock ();
1035 now_floor = mn_now; 1173 now_floor = mn_now;
1036 rtmn_diff = ev_rt_now - mn_now; 1174 rtmn_diff = ev_rt_now - mn_now;
1037 1175
1038 io_blocktime = 0.; 1176 io_blocktime = 0.;
1039 timeout_blocktime = 0.; 1177 timeout_blocktime = 0.;
1178 backend = 0;
1179 backend_fd = -1;
1180 gotasync = 0;
1181#if EV_USE_INOTIFY
1182 fs_fd = -2;
1183#endif
1040 1184
1041 /* pid check not overridable via env */ 1185 /* pid check not overridable via env */
1042#ifndef _WIN32 1186#ifndef _WIN32
1043 if (flags & EVFLAG_FORKCHECK) 1187 if (flags & EVFLAG_FORKCHECK)
1044 curpid = getpid (); 1188 curpid = getpid ();
… …
1047 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
1048 && !enable_secure () 1192 && !enable_secure ()
1049 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
1050 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
1051 1195
1052 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
1053 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
1054
1055 backend = 0;
1056 backend_fd = -1;
1057#if EV_USE_INOTIFY
1058 fs_fd = -2;
1059#endif
1060 1198
1061#if EV_USE_PORT 1199#if EV_USE_PORT
1062 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1063#endif 1201#endif
1064#if EV_USE_KQUEUE 1202#if EV_USE_KQUEUE
… …
1072#endif 1210#endif
1073#if EV_USE_SELECT 1211#if EV_USE_SELECT
1074 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1212 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1075#endif 1213#endif
1076 1214
1077 ev_init (&sigev, sigcb); 1215 ev_init (&pipeev, pipecb);
1078 ev_set_priority (&sigev, EV_MAXPRI); 1216 ev_set_priority (&pipeev, EV_MAXPRI);
1079 } 1217 }
1080} 1218}
1081 1219
1082static void noinline 1220static void noinline
1083loop_destroy (EV_P) 1221loop_destroy (EV_P)
1084{ 1222{
1085 int i; 1223 int i;
1224
1225 if (ev_is_active (&pipeev))
1226 {
1227 ev_ref (EV_A); /* signal watcher */
1228 ev_io_stop (EV_A_ &pipeev);
1229
1230#if EV_USE_EVENTFD
1231 if (evfd >= 0)
1232 close (evfd);
1233#endif
1234
1235 if (evpipe [0] >= 0)
1236 {
1237 close (evpipe [0]);
1238 close (evpipe [1]);
1239 }
1240 }
1086 1241
1087#if EV_USE_INOTIFY 1242#if EV_USE_INOTIFY
1088 if (fs_fd >= 0) 1243 if (fs_fd >= 0)
1089 close (fs_fd); 1244 close (fs_fd);
1090#endif 1245#endif
… …
1127#if EV_FORK_ENABLE 1282#if EV_FORK_ENABLE
1128 array_free (fork, EMPTY); 1283 array_free (fork, EMPTY);
1129#endif 1284#endif
1130 array_free (prepare, EMPTY); 1285 array_free (prepare, EMPTY);
1131 array_free (check, EMPTY); 1286 array_free (check, EMPTY);
1287#if EV_ASYNC_ENABLE
1288 array_free (async, EMPTY);
1289#endif
1132 1290
1133 backend = 0; 1291 backend = 0;
1134} 1292}
1135 1293
1294#if EV_USE_INOTIFY
1136void inline_size infy_fork (EV_P); 1295void inline_size infy_fork (EV_P);
1296#endif
1137 1297
1138void inline_size 1298void inline_size
1139loop_fork (EV_P) 1299loop_fork (EV_P)
1140{ 1300{
1141#if EV_USE_PORT 1301#if EV_USE_PORT
… …
1149#endif 1309#endif
1150#if EV_USE_INOTIFY 1310#if EV_USE_INOTIFY
1151 infy_fork (EV_A); 1311 infy_fork (EV_A);
1152#endif 1312#endif
1153 1313
1154 if (ev_is_active (&sigev)) 1314 if (ev_is_active (&pipeev))
1155 { 1315 {
1156 /* default loop */ 1316 /* this "locks" the handlers against writing to the pipe */
1317 /* while we modify the fd vars */
1318 gotsig = 1;
1319#if EV_ASYNC_ENABLE
1320 gotasync = 1;
1321#endif
1157 1322
1158 ev_ref (EV_A); 1323 ev_ref (EV_A);
1159 ev_io_stop (EV_A_ &sigev); 1324 ev_io_stop (EV_A_ &pipeev);
1325
1326#if EV_USE_EVENTFD
1327 if (evfd >= 0)
1328 close (evfd);
1329#endif
1330
1331 if (evpipe [0] >= 0)
1332 {
1160 close (sigpipe [0]); 1333 close (evpipe [0]);
1161 close (sigpipe [1]); 1334 close (evpipe [1]);
1335 }
1162 1336
1163 while (pipe (sigpipe))
1164 syserr ("(libev) error creating pipe");
1165
1166 siginit (EV_A); 1337 evpipe_init (EV_A);
1338 /* now iterate over everything, in case we missed something */
1339 pipecb (EV_A_ &pipeev, EV_READ);
1167 } 1340 }
1168 1341
1169 postfork = 0; 1342 postfork = 0;
1170} 1343}
1171 1344
… …
1193} 1366}
1194 1367
1195void 1368void
1196ev_loop_fork (EV_P) 1369ev_loop_fork (EV_P)
1197{ 1370{
1198 postfork = 1; 1371 postfork = 1; /* must be in line with ev_default_fork */
1199} 1372}
1200 1373
1201#endif 1374#endif
1202 1375
1203#if EV_MULTIPLICITY 1376#if EV_MULTIPLICITY
… …
1206#else 1379#else
1207int 1380int
1208ev_default_loop (unsigned int flags) 1381ev_default_loop (unsigned int flags)
1209#endif 1382#endif
1210{ 1383{
1211 if (sigpipe [0] == sigpipe [1])
1212 if (pipe (sigpipe))
1213 return 0;
1214
1215 if (!ev_default_loop_ptr) 1384 if (!ev_default_loop_ptr)
1216 { 1385 {
1217#if EV_MULTIPLICITY 1386#if EV_MULTIPLICITY
1218 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1387 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1219#else 1388#else
… …
1222 1391
1223 loop_init (EV_A_ flags); 1392 loop_init (EV_A_ flags);
1224 1393
1225 if (ev_backend (EV_A)) 1394 if (ev_backend (EV_A))
1226 { 1395 {
1227 siginit (EV_A);
1228
1229#ifndef _WIN32 1396#ifndef _WIN32
1230 ev_signal_init (&childev, childcb, SIGCHLD); 1397 ev_signal_init (&childev, childcb, SIGCHLD);
1231 ev_set_priority (&childev, EV_MAXPRI); 1398 ev_set_priority (&childev, EV_MAXPRI);
1232 ev_signal_start (EV_A_ &childev); 1399 ev_signal_start (EV_A_ &childev);
1233 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1400 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1250#ifndef _WIN32 1417#ifndef _WIN32
1251 ev_ref (EV_A); /* child watcher */ 1418 ev_ref (EV_A); /* child watcher */
1252 ev_signal_stop (EV_A_ &childev); 1419 ev_signal_stop (EV_A_ &childev);
1253#endif 1420#endif
1254 1421
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); 1422 loop_destroy (EV_A);
1262} 1423}
1263 1424
1264void 1425void
1265ev_default_fork (void) 1426ev_default_fork (void)
… …
1267#if EV_MULTIPLICITY 1428#if EV_MULTIPLICITY
1268 struct ev_loop *loop = ev_default_loop_ptr; 1429 struct ev_loop *loop = ev_default_loop_ptr;
1269#endif 1430#endif
1270 1431
1271 if (backend) 1432 if (backend)
1272 postfork = 1; 1433 postfork = 1; /* must be in line with ev_loop_fork */
1273} 1434}
1274 1435
1275/*****************************************************************************/ 1436/*****************************************************************************/
1276 1437
1277void 1438void
… …
1301} 1462}
1302 1463
1303void inline_size 1464void inline_size
1304timers_reify (EV_P) 1465timers_reify (EV_P)
1305{ 1466{
1306 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1307 { 1468 {
1308 ev_timer *w = (ev_timer *)timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1309 1470
1310 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1311 1472
1312 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1313 if (w->repeat) 1474 if (w->repeat)
1314 { 1475 {
1315 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1476 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1316 1477
1317 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1318 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1319 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1320 1481
1321 downheap (timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1322 } 1483 }
1323 else 1484 else
1324 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1325 1486
1326 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1329 1490
1330#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1331void inline_size 1492void inline_size
1332periodics_reify (EV_P) 1493periodics_reify (EV_P)
1333{ 1494{
1334 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1335 { 1496 {
1336 ev_periodic *w = (ev_periodic *)periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1337 1498
1338 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1339 1500
1340 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1341 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1342 { 1503 {
1343 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1504 ev_at (w) = 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)); 1505 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1345 downheap (periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1346 } 1507 }
1347 else if (w->interval) 1508 else if (w->interval)
1348 { 1509 {
1349 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1510 ev_at (w) = 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; 1511 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1351 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1512 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1352 downheap (periodics, periodiccnt, 0); 1513 downheap (periodics, periodiccnt, 1);
1353 } 1514 }
1354 else 1515 else
1355 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1356 1517
1357 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1367 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 0; i < periodiccnt; ++i)
1368 { 1529 {
1369 ev_periodic *w = (ev_periodic *)periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1370 1531
1371 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1372 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1373 else if (w->interval) 1534 else if (w->interval)
1374 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1375 } 1536 }
1376 1537
1377 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1378 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1379 downheap (periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
… …
1461 { 1622 {
1462#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1463 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1464#endif 1625#endif
1465 /* adjust timers. this is easy, as the offset is the same for all of them */ 1626 /* adjust timers. this is easy, as the offset is the same for all of them */
1466 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1467 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1468 } 1629 }
1469 1630
1470 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1471 } 1632 }
1472} 1633}
… …
1486static int loop_done; 1647static int loop_done;
1487 1648
1488void 1649void
1489ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1490{ 1651{
1491 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1492 ? EVUNLOOP_ONE
1493 : EVUNLOOP_CANCEL;
1494 1653
1495 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1654 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1496 1655
1497 do 1656 do
1498 { 1657 {
… …
1544 1703
1545 waittime = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1546 1705
1547 if (timercnt) 1706 if (timercnt)
1548 { 1707 {
1549 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1550 if (waittime > to) waittime = to; 1709 if (waittime > to) waittime = to;
1551 } 1710 }
1552 1711
1553#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1554 if (periodiccnt) 1713 if (periodiccnt)
1555 { 1714 {
1556 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1557 if (waittime > to) waittime = to; 1716 if (waittime > to) waittime = to;
1558 } 1717 }
1559#endif 1718#endif
1560 1719
1561 if (expect_false (waittime < timeout_blocktime)) 1720 if (expect_false (waittime < timeout_blocktime))
… …
1594 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1595 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1596 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1597 1756
1598 call_pending (EV_A); 1757 call_pending (EV_A);
1599
1600 } 1758 }
1601 while (expect_true (activecnt && !loop_done)); 1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1602 1764
1603 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1604 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1605} 1767}
1606 1768
… …
1724ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1725{ 1887{
1726 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1727 return; 1889 return;
1728 1890
1729 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1730 1892
1731 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1893 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1732 1894
1733 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1734 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1735 timers [timercnt - 1] = (WT)w; 1897 timers [timercnt] = (WT)w;
1736 upheap (timers, timercnt - 1); 1898 upheap (timers, timercnt);
1737 1899
1738 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1900 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
1739} 1901}
1740 1902
1741void noinline 1903void noinline
1742ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1743{ 1905{
1744 clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1745 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1746 return; 1908 return;
1747 1909
1748 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 1910 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
1749 1911
1750 { 1912 {
1751 int active = ((W)w)->active; 1913 int active = ((W)w)->active;
1752 1914
1753 if (expect_true (--active < --timercnt)) 1915 if (expect_true (active < timercnt))
1754 { 1916 {
1755 timers [active] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1756 adjustheap (timers, timercnt, active); 1918 adjustheap (timers, timercnt, active);
1757 } 1919 }
1920
1921 --timercnt;
1758 } 1922 }
1759 1923
1760 ((WT)w)->at -= mn_now; 1924 ev_at (w) -= mn_now;
1761 1925
1762 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1763} 1927}
1764 1928
1765void noinline 1929void noinline
… …
1767{ 1931{
1768 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1769 { 1933 {
1770 if (w->repeat) 1934 if (w->repeat)
1771 { 1935 {
1772 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1773 adjustheap (timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ((W)w)->active);
1774 } 1938 }
1775 else 1939 else
1776 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1777 } 1941 }
1778 else if (w->repeat) 1942 else if (w->repeat)
1779 { 1943 {
1780 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1781 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1782 } 1946 }
1783} 1947}
1784 1948
1785#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
… …
1788{ 1952{
1789 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1790 return; 1954 return;
1791 1955
1792 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1793 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1794 else if (w->interval) 1958 else if (w->interval)
1795 { 1959 {
1796 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1960 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 */ 1961 /* 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; 1962 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1799 } 1963 }
1800 else 1964 else
1801 ((WT)w)->at = w->offset; 1965 ev_at (w) = w->offset;
1802 1966
1803 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1804 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1805 periodics [periodiccnt - 1] = (WT)w; 1969 periodics [periodiccnt] = (WT)w;
1806 upheap (periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1807 1971
1808 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1972 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1809} 1973}
1810 1974
1811void noinline 1975void noinline
… …
1813{ 1977{
1814 clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1815 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1816 return; 1980 return;
1817 1981
1818 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 1982 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
1819 1983
1820 { 1984 {
1821 int active = ((W)w)->active; 1985 int active = ((W)w)->active;
1822 1986
1823 if (expect_true (--active < --periodiccnt)) 1987 if (expect_true (active < periodiccnt))
1824 { 1988 {
1825 periodics [active] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1826 adjustheap (periodics, periodiccnt, active); 1990 adjustheap (periodics, periodiccnt, active);
1827 } 1991 }
1992
1993 --periodiccnt;
1828 } 1994 }
1829 1995
1830 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1831} 1997}
1832 1998
… …
1851#endif 2017#endif
1852 if (expect_false (ev_is_active (w))) 2018 if (expect_false (ev_is_active (w)))
1853 return; 2019 return;
1854 2020
1855 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2021 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2022
2023 evpipe_init (EV_A);
1856 2024
1857 { 2025 {
1858#ifndef _WIN32 2026#ifndef _WIN32
1859 sigset_t full, prev; 2027 sigset_t full, prev;
1860 sigfillset (&full); 2028 sigfillset (&full);
… …
1872 wlist_add (&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1873 2041
1874 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1875 { 2043 {
1876#if _WIN32 2044#if _WIN32
1877 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1878#else 2046#else
1879 struct sigaction sa; 2047 struct sigaction sa;
1880 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1881 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1882 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2050 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1883 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1884#endif 2052#endif
1885 } 2053 }
… …
2374 2542
2375 ev_stop (EV_A_ (W)w); 2543 ev_stop (EV_A_ (W)w);
2376} 2544}
2377#endif 2545#endif
2378 2546
2547#if EV_ASYNC_ENABLE
2548void
2549ev_async_start (EV_P_ ev_async *w)
2550{
2551 if (expect_false (ev_is_active (w)))
2552 return;
2553
2554 evpipe_init (EV_A);
2555
2556 ev_start (EV_A_ (W)w, ++asynccnt);
2557 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2558 asyncs [asynccnt - 1] = w;
2559}
2560
2561void
2562ev_async_stop (EV_P_ ev_async *w)
2563{
2564 clear_pending (EV_A_ (W)w);
2565 if (expect_false (!ev_is_active (w)))
2566 return;
2567
2568 {
2569 int active = ((W)w)->active;
2570 asyncs [active - 1] = asyncs [--asynccnt];
2571 ((W)asyncs [active - 1])->active = active;
2572 }
2573
2574 ev_stop (EV_A_ (W)w);
2575}
2576
2577void
2578ev_async_send (EV_P_ ev_async *w)
2579{
2580 w->sent = 1;
2581 evpipe_write (EV_A_ &gotasync);
2582}
2583#endif
2584
2379/*****************************************************************************/ 2585/*****************************************************************************/
2380 2586
2381struct ev_once 2587struct ev_once
2382{ 2588{
2383 ev_io io; 2589 ev_io io;

Diff Legend

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