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

Comparing libev/ev.c (file contents):
Revision 1.204 by root, Fri Jan 18 13:45:55 2008 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);
… …
702 } 757 }
703} 758}
704 759
705/*****************************************************************************/ 760/*****************************************************************************/
706 761
762/* towards the root */
707void inline_speed 763void inline_speed
708upheap (WT *heap, int k) 764upheap (WT *heap, int k)
709{ 765{
710 WT w = heap [k]; 766 WT w = heap [k];
711 767
712 while (k) 768 for (;;)
713 { 769 {
714 int p = (k - 1) >> 1; 770 int p = k >> 1;
715 771
772 /* maybe we could use a dummy element at heap [0]? */
716 if (heap [p]->at <= w->at) 773 if (!p || heap [p]->at <= w->at)
717 break; 774 break;
718 775
719 heap [k] = heap [p]; 776 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 777 ((W)heap [k])->active = k;
721 k = p; 778 k = p;
722 } 779 }
723 780
724 heap [k] = w; 781 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 782 ((W)heap [k])->active = k;
726} 783}
727 784
785/* away from the root */
728void inline_speed 786void inline_speed
729downheap (WT *heap, int N, int k) 787downheap (WT *heap, int N, int k)
730{ 788{
731 WT w = heap [k]; 789 WT w = heap [k];
732 790
733 for (;;) 791 for (;;)
734 { 792 {
735 int c = (k << 1) + 1; 793 int c = k << 1;
736 794
737 if (c >= N) 795 if (c > N)
738 break; 796 break;
739 797
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 798 c += c < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0; 799 ? 1 : 0;
742 800
743 if (w->at <= heap [c]->at) 801 if (w->at <= heap [c]->at)
744 break; 802 break;
745 803
746 heap [k] = heap [c]; 804 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 805 ((W)heap [k])->active = k;
748 806
749 k = c; 807 k = c;
750 } 808 }
751 809
752 heap [k] = w; 810 heap [k] = w;
753 ((W)heap [k])->active = k + 1; 811 ((W)heap [k])->active = k;
754} 812}
755 813
756void inline_size 814void inline_size
757adjustheap (WT *heap, int N, int k) 815adjustheap (WT *heap, int N, int k)
758{ 816{
… …
763/*****************************************************************************/ 821/*****************************************************************************/
764 822
765typedef struct 823typedef struct
766{ 824{
767 WL head; 825 WL head;
768 sig_atomic_t volatile gotsig; 826 EV_ATOMIC_T gotsig;
769} ANSIG; 827} ANSIG;
770 828
771static ANSIG *signals; 829static ANSIG *signals;
772static int signalmax; 830static int signalmax;
773 831
774static int sigpipe [2]; 832static EV_ATOMIC_T gotsig;
775static sig_atomic_t volatile gotsig;
776static ev_io sigev;
777 833
778void inline_size 834void inline_size
779signals_init (ANSIG *base, int count) 835signals_init (ANSIG *base, int count)
780{ 836{
781 while (count--) 837 while (count--)
… …
785 841
786 ++base; 842 ++base;
787 } 843 }
788} 844}
789 845
790static void 846/*****************************************************************************/
791sighandler (int signum)
792{
793#if _WIN32
794 signal (signum, sighandler);
795#endif
796
797 signals [signum - 1].gotsig = 1;
798
799 if (!gotsig)
800 {
801 int old_errno = errno;
802 gotsig = 1;
803 write (sigpipe [1], &signum, 1);
804 errno = old_errno;
805 }
806}
807
808void noinline
809ev_feed_signal_event (EV_P_ int signum)
810{
811 WL w;
812
813#if EV_MULTIPLICITY
814 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
815#endif
816
817 --signum;
818
819 if (signum < 0 || signum >= signalmax)
820 return;
821
822 signals [signum].gotsig = 0;
823
824 for (w = signals [signum].head; w; w = w->next)
825 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
826}
827
828static void
829sigcb (EV_P_ ev_io *iow, int revents)
830{
831 int signum;
832
833 read (sigpipe [0], &revents, 1);
834 gotsig = 0;
835
836 for (signum = signalmax; signum--; )
837 if (signals [signum].gotsig)
838 ev_feed_signal_event (EV_A_ signum + 1);
839}
840 847
841void inline_speed 848void inline_speed
842fd_intern (int fd) 849fd_intern (int fd)
843{ 850{
844#ifdef _WIN32 851#ifdef _WIN32
… …
849 fcntl (fd, F_SETFL, O_NONBLOCK); 856 fcntl (fd, F_SETFL, O_NONBLOCK);
850#endif 857#endif
851} 858}
852 859
853static void noinline 860static void noinline
854siginit (EV_P) 861evpipe_init (EV_P)
855{ 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
856 fd_intern (sigpipe [0]); 878 fd_intern (evpipe [0]);
857 fd_intern (sigpipe [1]); 879 fd_intern (evpipe [1]);
880 ev_io_set (&pipeev, evpipe [0], EV_READ);
881 }
858 882
859 ev_io_set (&sigev, sigpipe [0], EV_READ);
860 ev_io_start (EV_A_ &sigev); 883 ev_io_start (EV_A_ &pipeev);
861 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
862} 951}
863 952
864/*****************************************************************************/ 953/*****************************************************************************/
865 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
866static WL childs [EV_PID_HASHSIZE]; 992static WL childs [EV_PID_HASHSIZE];
867 993
868#ifndef _WIN32 994#ifndef _WIN32
869 995
870static ev_signal childev; 996static ev_signal childev;
871 997
998#ifndef WIFCONTINUED
999# define WIFCONTINUED(status) 0
1000#endif
1001
872void inline_speed 1002void inline_speed
873child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
874{ 1004{
875 ev_child *w; 1005 ev_child *w;
1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
876 1007
877 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 {
878 if (w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
1011 && (!traced || (w->flags & 1)))
879 { 1012 {
880 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 */
881 w->rpid = pid; 1014 w->rpid = pid;
882 w->rstatus = status; 1015 w->rstatus = status;
883 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
884 } 1017 }
1018 }
885} 1019}
886 1020
887#ifndef WCONTINUED 1021#ifndef WCONTINUED
888# define WCONTINUED 0 1022# define WCONTINUED 0
889#endif 1023#endif
… …
898 if (!WCONTINUED 1032 if (!WCONTINUED
899 || errno != EINVAL 1033 || errno != EINVAL
900 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
901 return; 1035 return;
902 1036
903 /* 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 */
904 /* 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 */
905 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
906 1040
907 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
908 if (EV_PID_HASHSIZE > 1) 1042 if (EV_PID_HASHSIZE > 1)
909 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 */
910} 1044}
911 1045
912#endif 1046#endif
913 1047
914/*****************************************************************************/ 1048/*****************************************************************************/
… …
1032 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1166 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1033 have_monotonic = 1; 1167 have_monotonic = 1;
1034 } 1168 }
1035#endif 1169#endif
1036 1170
1037 ev_rt_now = ev_time (); 1171 ev_rt_now = ev_time ();
1038 mn_now = get_clock (); 1172 mn_now = get_clock ();
1039 now_floor = mn_now; 1173 now_floor = mn_now;
1040 rtmn_diff = ev_rt_now - mn_now; 1174 rtmn_diff = ev_rt_now - mn_now;
1041 1175
1042 io_blocktime = 0.; 1176 io_blocktime = 0.;
1043 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
1044 1184
1045 /* pid check not overridable via env */ 1185 /* pid check not overridable via env */
1046#ifndef _WIN32 1186#ifndef _WIN32
1047 if (flags & EVFLAG_FORKCHECK) 1187 if (flags & EVFLAG_FORKCHECK)
1048 curpid = getpid (); 1188 curpid = getpid ();
… …
1051 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
1052 && !enable_secure () 1192 && !enable_secure ()
1053 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
1054 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
1055 1195
1056 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
1057 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
1058
1059 backend = 0;
1060 backend_fd = -1;
1061#if EV_USE_INOTIFY
1062 fs_fd = -2;
1063#endif
1064 1198
1065#if EV_USE_PORT 1199#if EV_USE_PORT
1066 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1067#endif 1201#endif
1068#if EV_USE_KQUEUE 1202#if EV_USE_KQUEUE
… …
1076#endif 1210#endif
1077#if EV_USE_SELECT 1211#if EV_USE_SELECT
1078 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1212 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1079#endif 1213#endif
1080 1214
1081 ev_init (&sigev, sigcb); 1215 ev_init (&pipeev, pipecb);
1082 ev_set_priority (&sigev, EV_MAXPRI); 1216 ev_set_priority (&pipeev, EV_MAXPRI);
1083 } 1217 }
1084} 1218}
1085 1219
1086static void noinline 1220static void noinline
1087loop_destroy (EV_P) 1221loop_destroy (EV_P)
1088{ 1222{
1089 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 }
1090 1241
1091#if EV_USE_INOTIFY 1242#if EV_USE_INOTIFY
1092 if (fs_fd >= 0) 1243 if (fs_fd >= 0)
1093 close (fs_fd); 1244 close (fs_fd);
1094#endif 1245#endif
… …
1131#if EV_FORK_ENABLE 1282#if EV_FORK_ENABLE
1132 array_free (fork, EMPTY); 1283 array_free (fork, EMPTY);
1133#endif 1284#endif
1134 array_free (prepare, EMPTY); 1285 array_free (prepare, EMPTY);
1135 array_free (check, EMPTY); 1286 array_free (check, EMPTY);
1287#if EV_ASYNC_ENABLE
1288 array_free (async, EMPTY);
1289#endif
1136 1290
1137 backend = 0; 1291 backend = 0;
1138} 1292}
1139 1293
1294#if EV_USE_INOTIFY
1140void inline_size infy_fork (EV_P); 1295void inline_size infy_fork (EV_P);
1296#endif
1141 1297
1142void inline_size 1298void inline_size
1143loop_fork (EV_P) 1299loop_fork (EV_P)
1144{ 1300{
1145#if EV_USE_PORT 1301#if EV_USE_PORT
… …
1153#endif 1309#endif
1154#if EV_USE_INOTIFY 1310#if EV_USE_INOTIFY
1155 infy_fork (EV_A); 1311 infy_fork (EV_A);
1156#endif 1312#endif
1157 1313
1158 if (ev_is_active (&sigev)) 1314 if (ev_is_active (&pipeev))
1159 { 1315 {
1160 /* 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
1161 1322
1162 ev_ref (EV_A); 1323 ev_ref (EV_A);
1163 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 {
1164 close (sigpipe [0]); 1333 close (evpipe [0]);
1165 close (sigpipe [1]); 1334 close (evpipe [1]);
1335 }
1166 1336
1167 while (pipe (sigpipe))
1168 syserr ("(libev) error creating pipe");
1169
1170 siginit (EV_A); 1337 evpipe_init (EV_A);
1338 /* now iterate over everything, in case we missed something */
1171 sigcb (EV_A_ &sigev, EV_READ); 1339 pipecb (EV_A_ &pipeev, EV_READ);
1172 } 1340 }
1173 1341
1174 postfork = 0; 1342 postfork = 0;
1175} 1343}
1176 1344
… …
1198} 1366}
1199 1367
1200void 1368void
1201ev_loop_fork (EV_P) 1369ev_loop_fork (EV_P)
1202{ 1370{
1203 postfork = 1; // must be in line with ev_default_fork 1371 postfork = 1; /* must be in line with ev_default_fork */
1204} 1372}
1205 1373
1206#endif 1374#endif
1207 1375
1208#if EV_MULTIPLICITY 1376#if EV_MULTIPLICITY
… …
1211#else 1379#else
1212int 1380int
1213ev_default_loop (unsigned int flags) 1381ev_default_loop (unsigned int flags)
1214#endif 1382#endif
1215{ 1383{
1216 if (sigpipe [0] == sigpipe [1])
1217 if (pipe (sigpipe))
1218 return 0;
1219
1220 if (!ev_default_loop_ptr) 1384 if (!ev_default_loop_ptr)
1221 { 1385 {
1222#if EV_MULTIPLICITY 1386#if EV_MULTIPLICITY
1223 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1387 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1224#else 1388#else
… …
1227 1391
1228 loop_init (EV_A_ flags); 1392 loop_init (EV_A_ flags);
1229 1393
1230 if (ev_backend (EV_A)) 1394 if (ev_backend (EV_A))
1231 { 1395 {
1232 siginit (EV_A);
1233
1234#ifndef _WIN32 1396#ifndef _WIN32
1235 ev_signal_init (&childev, childcb, SIGCHLD); 1397 ev_signal_init (&childev, childcb, SIGCHLD);
1236 ev_set_priority (&childev, EV_MAXPRI); 1398 ev_set_priority (&childev, EV_MAXPRI);
1237 ev_signal_start (EV_A_ &childev); 1399 ev_signal_start (EV_A_ &childev);
1238 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1400 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1255#ifndef _WIN32 1417#ifndef _WIN32
1256 ev_ref (EV_A); /* child watcher */ 1418 ev_ref (EV_A); /* child watcher */
1257 ev_signal_stop (EV_A_ &childev); 1419 ev_signal_stop (EV_A_ &childev);
1258#endif 1420#endif
1259 1421
1260 ev_ref (EV_A); /* signal watcher */
1261 ev_io_stop (EV_A_ &sigev);
1262
1263 close (sigpipe [0]); sigpipe [0] = 0;
1264 close (sigpipe [1]); sigpipe [1] = 0;
1265
1266 loop_destroy (EV_A); 1422 loop_destroy (EV_A);
1267} 1423}
1268 1424
1269void 1425void
1270ev_default_fork (void) 1426ev_default_fork (void)
… …
1272#if EV_MULTIPLICITY 1428#if EV_MULTIPLICITY
1273 struct ev_loop *loop = ev_default_loop_ptr; 1429 struct ev_loop *loop = ev_default_loop_ptr;
1274#endif 1430#endif
1275 1431
1276 if (backend) 1432 if (backend)
1277 postfork = 1; // must be in line with ev_loop_fork 1433 postfork = 1; /* must be in line with ev_loop_fork */
1278} 1434}
1279 1435
1280/*****************************************************************************/ 1436/*****************************************************************************/
1281 1437
1282void 1438void
… …
1306} 1462}
1307 1463
1308void inline_size 1464void inline_size
1309timers_reify (EV_P) 1465timers_reify (EV_P)
1310{ 1466{
1311 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1312 { 1468 {
1313 ev_timer *w = (ev_timer *)timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1314 1470
1315 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1316 1472
1317 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1318 if (w->repeat) 1474 if (w->repeat)
1319 { 1475 {
1320 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.));
1321 1477
1322 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1323 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1324 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1325 1481
1326 downheap (timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1327 } 1483 }
1328 else 1484 else
1329 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1330 1486
1331 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1334 1490
1335#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1336void inline_size 1492void inline_size
1337periodics_reify (EV_P) 1493periodics_reify (EV_P)
1338{ 1494{
1339 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1340 { 1496 {
1341 ev_periodic *w = (ev_periodic *)periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1342 1498
1343 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1344 1500
1345 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1346 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1347 { 1503 {
1348 ((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);
1349 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));
1350 downheap (periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1351 } 1507 }
1352 else if (w->interval) 1508 else if (w->interval)
1353 { 1509 {
1354 ((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;
1355 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;
1356 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));
1357 downheap (periodics, periodiccnt, 0); 1513 downheap (periodics, periodiccnt, 1);
1358 } 1514 }
1359 else 1515 else
1360 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1361 1517
1362 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1372 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 0; i < periodiccnt; ++i)
1373 { 1529 {
1374 ev_periodic *w = (ev_periodic *)periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1375 1531
1376 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1377 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1378 else if (w->interval) 1534 else if (w->interval)
1379 ((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;
1380 } 1536 }
1381 1537
1382 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1383 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1384 downheap (periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
… …
1466 { 1622 {
1467#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1468 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1469#endif 1625#endif
1470 /* 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 */
1471 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1472 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1473 } 1629 }
1474 1630
1475 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1476 } 1632 }
1477} 1633}
… …
1491static int loop_done; 1647static int loop_done;
1492 1648
1493void 1649void
1494ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1495{ 1651{
1496 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1497 ? EVUNLOOP_ONE
1498 : EVUNLOOP_CANCEL;
1499 1653
1500 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 */
1501 1655
1502 do 1656 do
1503 { 1657 {
… …
1549 1703
1550 waittime = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1551 1705
1552 if (timercnt) 1706 if (timercnt)
1553 { 1707 {
1554 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1555 if (waittime > to) waittime = to; 1709 if (waittime > to) waittime = to;
1556 } 1710 }
1557 1711
1558#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1559 if (periodiccnt) 1713 if (periodiccnt)
1560 { 1714 {
1561 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;
1562 if (waittime > to) waittime = to; 1716 if (waittime > to) waittime = to;
1563 } 1717 }
1564#endif 1718#endif
1565 1719
1566 if (expect_false (waittime < timeout_blocktime)) 1720 if (expect_false (waittime < timeout_blocktime))
… …
1599 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1600 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1601 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1602 1756
1603 call_pending (EV_A); 1757 call_pending (EV_A);
1604
1605 } 1758 }
1606 while (expect_true (activecnt && !loop_done)); 1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1607 1764
1608 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1609 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1610} 1767}
1611 1768
… …
1729ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1730{ 1887{
1731 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1732 return; 1889 return;
1733 1890
1734 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1735 1892
1736 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.));
1737 1894
1738 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1739 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1740 timers [timercnt - 1] = (WT)w; 1897 timers [timercnt] = (WT)w;
1741 upheap (timers, timercnt - 1); 1898 upheap (timers, timercnt);
1742 1899
1743 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1900 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
1744} 1901}
1745 1902
1746void noinline 1903void noinline
1747ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1748{ 1905{
1749 clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1750 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1751 return; 1908 return;
1752 1909
1753 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 1910 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
1754 1911
1755 { 1912 {
1756 int active = ((W)w)->active; 1913 int active = ((W)w)->active;
1757 1914
1758 if (expect_true (--active < --timercnt)) 1915 if (expect_true (active < timercnt))
1759 { 1916 {
1760 timers [active] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1761 adjustheap (timers, timercnt, active); 1918 adjustheap (timers, timercnt, active);
1762 } 1919 }
1920
1921 --timercnt;
1763 } 1922 }
1764 1923
1765 ((WT)w)->at -= mn_now; 1924 ev_at (w) -= mn_now;
1766 1925
1767 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1768} 1927}
1769 1928
1770void noinline 1929void noinline
… …
1772{ 1931{
1773 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1774 { 1933 {
1775 if (w->repeat) 1934 if (w->repeat)
1776 { 1935 {
1777 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1778 adjustheap (timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ((W)w)->active);
1779 } 1938 }
1780 else 1939 else
1781 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1782 } 1941 }
1783 else if (w->repeat) 1942 else if (w->repeat)
1784 { 1943 {
1785 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1786 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1787 } 1946 }
1788} 1947}
1789 1948
1790#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
… …
1793{ 1952{
1794 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1795 return; 1954 return;
1796 1955
1797 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1798 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1799 else if (w->interval) 1958 else if (w->interval)
1800 { 1959 {
1801 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.));
1802 /* 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 */
1803 ((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;
1804 } 1963 }
1805 else 1964 else
1806 ((WT)w)->at = w->offset; 1965 ev_at (w) = w->offset;
1807 1966
1808 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1809 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1810 periodics [periodiccnt - 1] = (WT)w; 1969 periodics [periodiccnt] = (WT)w;
1811 upheap (periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1812 1971
1813 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1972 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1814} 1973}
1815 1974
1816void noinline 1975void noinline
… …
1818{ 1977{
1819 clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1820 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1821 return; 1980 return;
1822 1981
1823 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 1982 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
1824 1983
1825 { 1984 {
1826 int active = ((W)w)->active; 1985 int active = ((W)w)->active;
1827 1986
1828 if (expect_true (--active < --periodiccnt)) 1987 if (expect_true (active < periodiccnt))
1829 { 1988 {
1830 periodics [active] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1831 adjustheap (periodics, periodiccnt, active); 1990 adjustheap (periodics, periodiccnt, active);
1832 } 1991 }
1992
1993 --periodiccnt;
1833 } 1994 }
1834 1995
1835 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1836} 1997}
1837 1998
… …
1856#endif 2017#endif
1857 if (expect_false (ev_is_active (w))) 2018 if (expect_false (ev_is_active (w)))
1858 return; 2019 return;
1859 2020
1860 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);
1861 2024
1862 { 2025 {
1863#ifndef _WIN32 2026#ifndef _WIN32
1864 sigset_t full, prev; 2027 sigset_t full, prev;
1865 sigfillset (&full); 2028 sigfillset (&full);
… …
1877 wlist_add (&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1878 2041
1879 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1880 { 2043 {
1881#if _WIN32 2044#if _WIN32
1882 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1883#else 2046#else
1884 struct sigaction sa; 2047 struct sigaction sa;
1885 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1886 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1887 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 */
1888 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1889#endif 2052#endif
1890 } 2053 }
… …
2379 2542
2380 ev_stop (EV_A_ (W)w); 2543 ev_stop (EV_A_ (W)w);
2381} 2544}
2382#endif 2545#endif
2383 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
2384/*****************************************************************************/ 2585/*****************************************************************************/
2385 2586
2386struct ev_once 2587struct ev_once
2387{ 2588{
2388 ev_io io; 2589 ev_io io;

Diff Legend

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