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

Comparing libev/ev.c (file contents):
Revision 1.206 by root, Fri Jan 25 15:45:08 2008 UTC vs.
Revision 1.224 by root, Wed Apr 9 22:07:50 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)
… …
291typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
292 329
293#if EV_USE_MONOTONIC 330#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 331/* 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 */ 332/* giving it a reasonably high chance of working on typical architetcures */
296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 334#endif
298 335
299#ifdef _WIN32 336#ifdef _WIN32
300# include "ev_win32.c" 337# include "ev_win32.c"
301#endif 338#endif
… …
323 perror (msg); 360 perror (msg);
324 abort (); 361 abort ();
325 } 362 }
326} 363}
327 364
365static void *
366ev_realloc_emul (void *ptr, long size)
367{
368 /* some systems, notably openbsd and darwin, fail to properly
369 * implement realloc (x, 0) (as required by both ansi c-98 and
370 * the single unix specification, so work around them here.
371 */
372
373 if (size)
374 return realloc (ptr, size);
375
376 free (ptr);
377 return 0;
378}
379
328static void *(*alloc)(void *ptr, long size); 380static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 381
330void 382void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 383ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 384{
333 alloc = cb; 385 alloc = cb;
334} 386}
335 387
336inline_speed void * 388inline_speed void *
337ev_realloc (void *ptr, long size) 389ev_realloc (void *ptr, long size)
338{ 390{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 391 ptr = alloc (ptr, size);
340 392
341 if (!ptr && size) 393 if (!ptr && size)
342 { 394 {
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 395 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
344 abort (); 396 abort ();
… …
451 ts.tv_sec = (time_t)delay; 503 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 504 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 505
454 nanosleep (&ts, 0); 506 nanosleep (&ts, 0);
455#elif defined(_WIN32) 507#elif defined(_WIN32)
456 Sleep (delay * 1e3); 508 Sleep ((unsigned long)(delay * 1e3));
457#else 509#else
458 struct timeval tv; 510 struct timeval tv;
459 511
460 tv.tv_sec = (time_t)delay; 512 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 513 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
763/*****************************************************************************/ 815/*****************************************************************************/
764 816
765typedef struct 817typedef struct
766{ 818{
767 WL head; 819 WL head;
768 sig_atomic_t volatile gotsig; 820 EV_ATOMIC_T gotsig;
769} ANSIG; 821} ANSIG;
770 822
771static ANSIG *signals; 823static ANSIG *signals;
772static int signalmax; 824static int signalmax;
773 825
774static int sigpipe [2]; 826static EV_ATOMIC_T gotsig;
775static sig_atomic_t volatile gotsig;
776static ev_io sigev;
777 827
778void inline_size 828void inline_size
779signals_init (ANSIG *base, int count) 829signals_init (ANSIG *base, int count)
780{ 830{
781 while (count--) 831 while (count--)
… …
785 835
786 ++base; 836 ++base;
787 } 837 }
788} 838}
789 839
790static void 840/*****************************************************************************/
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 841
841void inline_speed 842void inline_speed
842fd_intern (int fd) 843fd_intern (int fd)
843{ 844{
844#ifdef _WIN32 845#ifdef _WIN32
… …
849 fcntl (fd, F_SETFL, O_NONBLOCK); 850 fcntl (fd, F_SETFL, O_NONBLOCK);
850#endif 851#endif
851} 852}
852 853
853static void noinline 854static void noinline
854siginit (EV_P) 855evpipe_init (EV_P)
855{ 856{
857 if (!ev_is_active (&pipeev))
858 {
859#if EV_USE_EVENTFD
860 if ((evfd = eventfd (0, 0)) >= 0)
861 {
862 evpipe [0] = -1;
863 fd_intern (evfd);
864 ev_io_set (&pipeev, evfd, EV_READ);
865 }
866 else
867#endif
868 {
869 while (pipe (evpipe))
870 syserr ("(libev) error creating signal/async pipe");
871
856 fd_intern (sigpipe [0]); 872 fd_intern (evpipe [0]);
857 fd_intern (sigpipe [1]); 873 fd_intern (evpipe [1]);
874 ev_io_set (&pipeev, evpipe [0], EV_READ);
875 }
858 876
859 ev_io_set (&sigev, sigpipe [0], EV_READ);
860 ev_io_start (EV_A_ &sigev); 877 ev_io_start (EV_A_ &pipeev);
861 ev_unref (EV_A); /* child watcher should not keep loop alive */ 878 ev_unref (EV_A); /* watcher should not keep loop alive */
879 }
880}
881
882void inline_size
883evpipe_write (EV_P_ EV_ATOMIC_T *flag)
884{
885 if (!*flag)
886 {
887 int old_errno = errno; /* save errno because write might clobber it */
888
889 *flag = 1;
890
891#if EV_USE_EVENTFD
892 if (evfd >= 0)
893 {
894 uint64_t counter = 1;
895 write (evfd, &counter, sizeof (uint64_t));
896 }
897 else
898#endif
899 write (evpipe [1], &old_errno, 1);
900
901 errno = old_errno;
902 }
903}
904
905static void
906pipecb (EV_P_ ev_io *iow, int revents)
907{
908#if EV_USE_EVENTFD
909 if (evfd >= 0)
910 {
911 uint64_t counter = 1;
912 read (evfd, &counter, sizeof (uint64_t));
913 }
914 else
915#endif
916 {
917 char dummy;
918 read (evpipe [0], &dummy, 1);
919 }
920
921 if (gotsig && ev_is_default_loop (EV_A))
922 {
923 int signum;
924 gotsig = 0;
925
926 for (signum = signalmax; signum--; )
927 if (signals [signum].gotsig)
928 ev_feed_signal_event (EV_A_ signum + 1);
929 }
930
931#if EV_ASYNC_ENABLE
932 if (gotasync)
933 {
934 int i;
935 gotasync = 0;
936
937 for (i = asynccnt; i--; )
938 if (asyncs [i]->sent)
939 {
940 asyncs [i]->sent = 0;
941 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
942 }
943 }
944#endif
945}
946
947/*****************************************************************************/
948
949static void
950ev_sighandler (int signum)
951{
952#if EV_MULTIPLICITY
953 struct ev_loop *loop = &default_loop_struct;
954#endif
955
956#if _WIN32
957 signal (signum, ev_sighandler);
958#endif
959
960 signals [signum - 1].gotsig = 1;
961 evpipe_write (EV_A_ &gotsig);
962}
963
964void noinline
965ev_feed_signal_event (EV_P_ int signum)
966{
967 WL w;
968
969#if EV_MULTIPLICITY
970 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
971#endif
972
973 --signum;
974
975 if (signum < 0 || signum >= signalmax)
976 return;
977
978 signals [signum].gotsig = 0;
979
980 for (w = signals [signum].head; w; w = w->next)
981 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
862} 982}
863 983
864/*****************************************************************************/ 984/*****************************************************************************/
865 985
866static WL childs [EV_PID_HASHSIZE]; 986static WL childs [EV_PID_HASHSIZE];
… …
872#ifndef WIFCONTINUED 992#ifndef WIFCONTINUED
873# define WIFCONTINUED(status) 0 993# define WIFCONTINUED(status) 0
874#endif 994#endif
875 995
876void inline_speed 996void inline_speed
877child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 997child_reap (EV_P_ int chain, int pid, int status)
878{ 998{
879 ev_child *w; 999 ev_child *w;
880 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1000 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
881 1001
882 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1002 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
883 { 1003 {
884 if ((w->pid == pid || !w->pid) 1004 if ((w->pid == pid || !w->pid)
885 && (!traced || (w->flags & 1))) 1005 && (!traced || (w->flags & 1)))
886 { 1006 {
887 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1007 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
888 w->rpid = pid; 1008 w->rpid = pid;
889 w->rstatus = status; 1009 w->rstatus = status;
890 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1010 ev_feed_event (EV_A_ (W)w, EV_CHILD);
891 } 1011 }
892 } 1012 }
… …
906 if (!WCONTINUED 1026 if (!WCONTINUED
907 || errno != EINVAL 1027 || errno != EINVAL
908 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1028 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
909 return; 1029 return;
910 1030
911 /* make sure we are called again until all childs have been reaped */ 1031 /* make sure we are called again until all children have been reaped */
912 /* we need to do it this way so that the callback gets called before we continue */ 1032 /* we need to do it this way so that the callback gets called before we continue */
913 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1033 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
914 1034
915 child_reap (EV_A_ sw, pid, pid, status); 1035 child_reap (EV_A_ pid, pid, status);
916 if (EV_PID_HASHSIZE > 1) 1036 if (EV_PID_HASHSIZE > 1)
917 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1037 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
918} 1038}
919 1039
920#endif 1040#endif
921 1041
922/*****************************************************************************/ 1042/*****************************************************************************/
… …
1040 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1160 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1041 have_monotonic = 1; 1161 have_monotonic = 1;
1042 } 1162 }
1043#endif 1163#endif
1044 1164
1045 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1166 mn_now = get_clock ();
1047 now_floor = mn_now; 1167 now_floor = mn_now;
1048 rtmn_diff = ev_rt_now - mn_now; 1168 rtmn_diff = ev_rt_now - mn_now;
1049 1169
1050 io_blocktime = 0.; 1170 io_blocktime = 0.;
1051 timeout_blocktime = 0.; 1171 timeout_blocktime = 0.;
1172 backend = 0;
1173 backend_fd = -1;
1174 gotasync = 0;
1175#if EV_USE_INOTIFY
1176 fs_fd = -2;
1177#endif
1052 1178
1053 /* pid check not overridable via env */ 1179 /* pid check not overridable via env */
1054#ifndef _WIN32 1180#ifndef _WIN32
1055 if (flags & EVFLAG_FORKCHECK) 1181 if (flags & EVFLAG_FORKCHECK)
1056 curpid = getpid (); 1182 curpid = getpid ();
… …
1062 flags = atoi (getenv ("LIBEV_FLAGS")); 1188 flags = atoi (getenv ("LIBEV_FLAGS"));
1063 1189
1064 if (!(flags & 0x0000ffffUL)) 1190 if (!(flags & 0x0000ffffUL))
1065 flags |= ev_recommended_backends (); 1191 flags |= ev_recommended_backends ();
1066 1192
1067 backend = 0;
1068 backend_fd = -1;
1069#if EV_USE_INOTIFY
1070 fs_fd = -2;
1071#endif
1072
1073#if EV_USE_PORT 1193#if EV_USE_PORT
1074 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1194 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1075#endif 1195#endif
1076#if EV_USE_KQUEUE 1196#if EV_USE_KQUEUE
1077 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1197 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1084#endif 1204#endif
1085#if EV_USE_SELECT 1205#if EV_USE_SELECT
1086 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1206 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1087#endif 1207#endif
1088 1208
1089 ev_init (&sigev, sigcb); 1209 ev_init (&pipeev, pipecb);
1090 ev_set_priority (&sigev, EV_MAXPRI); 1210 ev_set_priority (&pipeev, EV_MAXPRI);
1091 } 1211 }
1092} 1212}
1093 1213
1094static void noinline 1214static void noinline
1095loop_destroy (EV_P) 1215loop_destroy (EV_P)
1096{ 1216{
1097 int i; 1217 int i;
1218
1219 if (ev_is_active (&pipeev))
1220 {
1221 ev_ref (EV_A); /* signal watcher */
1222 ev_io_stop (EV_A_ &pipeev);
1223
1224#if EV_USE_EVENTFD
1225 if (evfd >= 0)
1226 close (evfd);
1227#endif
1228
1229 if (evpipe [0] >= 0)
1230 {
1231 close (evpipe [0]);
1232 close (evpipe [1]);
1233 }
1234 }
1098 1235
1099#if EV_USE_INOTIFY 1236#if EV_USE_INOTIFY
1100 if (fs_fd >= 0) 1237 if (fs_fd >= 0)
1101 close (fs_fd); 1238 close (fs_fd);
1102#endif 1239#endif
… …
1139#if EV_FORK_ENABLE 1276#if EV_FORK_ENABLE
1140 array_free (fork, EMPTY); 1277 array_free (fork, EMPTY);
1141#endif 1278#endif
1142 array_free (prepare, EMPTY); 1279 array_free (prepare, EMPTY);
1143 array_free (check, EMPTY); 1280 array_free (check, EMPTY);
1281#if EV_ASYNC_ENABLE
1282 array_free (async, EMPTY);
1283#endif
1144 1284
1145 backend = 0; 1285 backend = 0;
1146} 1286}
1147 1287
1148void inline_size infy_fork (EV_P); 1288void inline_size infy_fork (EV_P);
… …
1161#endif 1301#endif
1162#if EV_USE_INOTIFY 1302#if EV_USE_INOTIFY
1163 infy_fork (EV_A); 1303 infy_fork (EV_A);
1164#endif 1304#endif
1165 1305
1166 if (ev_is_active (&sigev)) 1306 if (ev_is_active (&pipeev))
1167 { 1307 {
1168 /* default loop */ 1308 /* this "locks" the handlers against writing to the pipe */
1309 /* while we modify the fd vars */
1310 gotsig = 1;
1311#if EV_ASYNC_ENABLE
1312 gotasync = 1;
1313#endif
1169 1314
1170 ev_ref (EV_A); 1315 ev_ref (EV_A);
1171 ev_io_stop (EV_A_ &sigev); 1316 ev_io_stop (EV_A_ &pipeev);
1317
1318#if EV_USE_EVENTFD
1319 if (evfd >= 0)
1320 close (evfd);
1321#endif
1322
1323 if (evpipe [0] >= 0)
1324 {
1172 close (sigpipe [0]); 1325 close (evpipe [0]);
1173 close (sigpipe [1]); 1326 close (evpipe [1]);
1327 }
1174 1328
1175 while (pipe (sigpipe))
1176 syserr ("(libev) error creating pipe");
1177
1178 siginit (EV_A); 1329 evpipe_init (EV_A);
1330 /* now iterate over everything, in case we missed something */
1179 sigcb (EV_A_ &sigev, EV_READ); 1331 pipecb (EV_A_ &pipeev, EV_READ);
1180 } 1332 }
1181 1333
1182 postfork = 0; 1334 postfork = 0;
1183} 1335}
1184 1336
… …
1219#else 1371#else
1220int 1372int
1221ev_default_loop (unsigned int flags) 1373ev_default_loop (unsigned int flags)
1222#endif 1374#endif
1223{ 1375{
1224 if (sigpipe [0] == sigpipe [1])
1225 if (pipe (sigpipe))
1226 return 0;
1227
1228 if (!ev_default_loop_ptr) 1376 if (!ev_default_loop_ptr)
1229 { 1377 {
1230#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
1231 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1379 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1232#else 1380#else
… …
1235 1383
1236 loop_init (EV_A_ flags); 1384 loop_init (EV_A_ flags);
1237 1385
1238 if (ev_backend (EV_A)) 1386 if (ev_backend (EV_A))
1239 { 1387 {
1240 siginit (EV_A);
1241
1242#ifndef _WIN32 1388#ifndef _WIN32
1243 ev_signal_init (&childev, childcb, SIGCHLD); 1389 ev_signal_init (&childev, childcb, SIGCHLD);
1244 ev_set_priority (&childev, EV_MAXPRI); 1390 ev_set_priority (&childev, EV_MAXPRI);
1245 ev_signal_start (EV_A_ &childev); 1391 ev_signal_start (EV_A_ &childev);
1246 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1392 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1262 1408
1263#ifndef _WIN32 1409#ifndef _WIN32
1264 ev_ref (EV_A); /* child watcher */ 1410 ev_ref (EV_A); /* child watcher */
1265 ev_signal_stop (EV_A_ &childev); 1411 ev_signal_stop (EV_A_ &childev);
1266#endif 1412#endif
1267
1268 ev_ref (EV_A); /* signal watcher */
1269 ev_io_stop (EV_A_ &sigev);
1270
1271 close (sigpipe [0]); sigpipe [0] = 0;
1272 close (sigpipe [1]); sigpipe [1] = 0;
1273 1413
1274 loop_destroy (EV_A); 1414 loop_destroy (EV_A);
1275} 1415}
1276 1416
1277void 1417void
… …
1499static int loop_done; 1639static int loop_done;
1500 1640
1501void 1641void
1502ev_loop (EV_P_ int flags) 1642ev_loop (EV_P_ int flags)
1503{ 1643{
1504 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1644 loop_done = EVUNLOOP_CANCEL;
1505 ? EVUNLOOP_ONE
1506 : EVUNLOOP_CANCEL;
1507 1645
1508 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1646 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1509 1647
1510 do 1648 do
1511 { 1649 {
… …
1607 /* queue check watchers, to be executed first */ 1745 /* queue check watchers, to be executed first */
1608 if (expect_false (checkcnt)) 1746 if (expect_false (checkcnt))
1609 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1747 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1610 1748
1611 call_pending (EV_A); 1749 call_pending (EV_A);
1612
1613 } 1750 }
1614 while (expect_true (activecnt && !loop_done)); 1751 while (expect_true (
1752 activecnt
1753 && !loop_done
1754 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1755 ));
1615 1756
1616 if (loop_done == EVUNLOOP_ONE) 1757 if (loop_done == EVUNLOOP_ONE)
1617 loop_done = EVUNLOOP_CANCEL; 1758 loop_done = EVUNLOOP_CANCEL;
1618} 1759}
1619 1760
… …
1865 if (expect_false (ev_is_active (w))) 2006 if (expect_false (ev_is_active (w)))
1866 return; 2007 return;
1867 2008
1868 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2009 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1869 2010
2011 evpipe_init (EV_A);
2012
1870 { 2013 {
1871#ifndef _WIN32 2014#ifndef _WIN32
1872 sigset_t full, prev; 2015 sigset_t full, prev;
1873 sigfillset (&full); 2016 sigfillset (&full);
1874 sigprocmask (SIG_SETMASK, &full, &prev); 2017 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1885 wlist_add (&signals [w->signum - 1].head, (WL)w); 2028 wlist_add (&signals [w->signum - 1].head, (WL)w);
1886 2029
1887 if (!((WL)w)->next) 2030 if (!((WL)w)->next)
1888 { 2031 {
1889#if _WIN32 2032#if _WIN32
1890 signal (w->signum, sighandler); 2033 signal (w->signum, ev_sighandler);
1891#else 2034#else
1892 struct sigaction sa; 2035 struct sigaction sa;
1893 sa.sa_handler = sighandler; 2036 sa.sa_handler = ev_sighandler;
1894 sigfillset (&sa.sa_mask); 2037 sigfillset (&sa.sa_mask);
1895 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2038 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1896 sigaction (w->signum, &sa, 0); 2039 sigaction (w->signum, &sa, 0);
1897#endif 2040#endif
1898 } 2041 }
… …
2387 2530
2388 ev_stop (EV_A_ (W)w); 2531 ev_stop (EV_A_ (W)w);
2389} 2532}
2390#endif 2533#endif
2391 2534
2535#if EV_ASYNC_ENABLE
2536void
2537ev_async_start (EV_P_ ev_async *w)
2538{
2539 if (expect_false (ev_is_active (w)))
2540 return;
2541
2542 evpipe_init (EV_A);
2543
2544 ev_start (EV_A_ (W)w, ++asynccnt);
2545 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2546 asyncs [asynccnt - 1] = w;
2547}
2548
2549void
2550ev_async_stop (EV_P_ ev_async *w)
2551{
2552 clear_pending (EV_A_ (W)w);
2553 if (expect_false (!ev_is_active (w)))
2554 return;
2555
2556 {
2557 int active = ((W)w)->active;
2558 asyncs [active - 1] = asyncs [--asynccnt];
2559 ((W)asyncs [active - 1])->active = active;
2560 }
2561
2562 ev_stop (EV_A_ (W)w);
2563}
2564
2565void
2566ev_async_send (EV_P_ ev_async *w)
2567{
2568 w->sent = 1;
2569 evpipe_write (EV_A_ &gotasync);
2570}
2571#endif
2572
2392/*****************************************************************************/ 2573/*****************************************************************************/
2393 2574
2394struct ev_once 2575struct ev_once
2395{ 2576{
2396 ev_io io; 2577 ev_io io;

Diff Legend

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