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.227 by root, Fri May 2 07:20:01 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);
… …
600 652
601#if EV_SELECT_IS_WINSOCKET 653#if EV_SELECT_IS_WINSOCKET
602 if (events) 654 if (events)
603 { 655 {
604 unsigned long argp; 656 unsigned long argp;
657 #ifdef EV_FD_TO_WIN32_HANDLE
658 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
659 #else
605 anfd->handle = _get_osfhandle (fd); 660 anfd->handle = _get_osfhandle (fd);
661 #endif
606 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 662 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
607 } 663 }
608#endif 664#endif
609 665
610 { 666 {
… …
698 } 754 }
699} 755}
700 756
701/*****************************************************************************/ 757/*****************************************************************************/
702 758
759/* towards the root */
703void inline_speed 760void inline_speed
704upheap (WT *heap, int k) 761upheap (WT *heap, int k)
705{ 762{
706 WT w = heap [k]; 763 WT w = heap [k];
707 764
… …
719 776
720 heap [k] = w; 777 heap [k] = w;
721 ((W)heap [k])->active = k + 1; 778 ((W)heap [k])->active = k + 1;
722} 779}
723 780
781/* away from the root */
724void inline_speed 782void inline_speed
725downheap (WT *heap, int N, int k) 783downheap (WT *heap, int N, int k)
726{ 784{
727 WT w = heap [k]; 785 WT w = heap [k];
728 786
… …
759/*****************************************************************************/ 817/*****************************************************************************/
760 818
761typedef struct 819typedef struct
762{ 820{
763 WL head; 821 WL head;
764 sig_atomic_t volatile gotsig; 822 EV_ATOMIC_T gotsig;
765} ANSIG; 823} ANSIG;
766 824
767static ANSIG *signals; 825static ANSIG *signals;
768static int signalmax; 826static int signalmax;
769 827
770static int sigpipe [2]; 828static EV_ATOMIC_T gotsig;
771static sig_atomic_t volatile gotsig;
772static ev_io sigev;
773 829
774void inline_size 830void inline_size
775signals_init (ANSIG *base, int count) 831signals_init (ANSIG *base, int count)
776{ 832{
777 while (count--) 833 while (count--)
… …
781 837
782 ++base; 838 ++base;
783 } 839 }
784} 840}
785 841
786static void 842/*****************************************************************************/
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 843
837void inline_speed 844void inline_speed
838fd_intern (int fd) 845fd_intern (int fd)
839{ 846{
840#ifdef _WIN32 847#ifdef _WIN32
… …
845 fcntl (fd, F_SETFL, O_NONBLOCK); 852 fcntl (fd, F_SETFL, O_NONBLOCK);
846#endif 853#endif
847} 854}
848 855
849static void noinline 856static void noinline
850siginit (EV_P) 857evpipe_init (EV_P)
851{ 858{
859 if (!ev_is_active (&pipeev))
860 {
861#if EV_USE_EVENTFD
862 if ((evfd = eventfd (0, 0)) >= 0)
863 {
864 evpipe [0] = -1;
865 fd_intern (evfd);
866 ev_io_set (&pipeev, evfd, EV_READ);
867 }
868 else
869#endif
870 {
871 while (pipe (evpipe))
872 syserr ("(libev) error creating signal/async pipe");
873
852 fd_intern (sigpipe [0]); 874 fd_intern (evpipe [0]);
853 fd_intern (sigpipe [1]); 875 fd_intern (evpipe [1]);
876 ev_io_set (&pipeev, evpipe [0], EV_READ);
877 }
854 878
855 ev_io_set (&sigev, sigpipe [0], EV_READ);
856 ev_io_start (EV_A_ &sigev); 879 ev_io_start (EV_A_ &pipeev);
857 ev_unref (EV_A); /* child watcher should not keep loop alive */ 880 ev_unref (EV_A); /* watcher should not keep loop alive */
881 }
882}
883
884void inline_size
885evpipe_write (EV_P_ EV_ATOMIC_T *flag)
886{
887 if (!*flag)
888 {
889 int old_errno = errno; /* save errno because write might clobber it */
890
891 *flag = 1;
892
893#if EV_USE_EVENTFD
894 if (evfd >= 0)
895 {
896 uint64_t counter = 1;
897 write (evfd, &counter, sizeof (uint64_t));
898 }
899 else
900#endif
901 write (evpipe [1], &old_errno, 1);
902
903 errno = old_errno;
904 }
905}
906
907static void
908pipecb (EV_P_ ev_io *iow, int revents)
909{
910#if EV_USE_EVENTFD
911 if (evfd >= 0)
912 {
913 uint64_t counter = 1;
914 read (evfd, &counter, sizeof (uint64_t));
915 }
916 else
917#endif
918 {
919 char dummy;
920 read (evpipe [0], &dummy, 1);
921 }
922
923 if (gotsig && ev_is_default_loop (EV_A))
924 {
925 int signum;
926 gotsig = 0;
927
928 for (signum = signalmax; signum--; )
929 if (signals [signum].gotsig)
930 ev_feed_signal_event (EV_A_ signum + 1);
931 }
932
933#if EV_ASYNC_ENABLE
934 if (gotasync)
935 {
936 int i;
937 gotasync = 0;
938
939 for (i = asynccnt; i--; )
940 if (asyncs [i]->sent)
941 {
942 asyncs [i]->sent = 0;
943 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
944 }
945 }
946#endif
858} 947}
859 948
860/*****************************************************************************/ 949/*****************************************************************************/
861 950
951static void
952ev_sighandler (int signum)
953{
954#if EV_MULTIPLICITY
955 struct ev_loop *loop = &default_loop_struct;
956#endif
957
958#if _WIN32
959 signal (signum, ev_sighandler);
960#endif
961
962 signals [signum - 1].gotsig = 1;
963 evpipe_write (EV_A_ &gotsig);
964}
965
966void noinline
967ev_feed_signal_event (EV_P_ int signum)
968{
969 WL w;
970
971#if EV_MULTIPLICITY
972 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
973#endif
974
975 --signum;
976
977 if (signum < 0 || signum >= signalmax)
978 return;
979
980 signals [signum].gotsig = 0;
981
982 for (w = signals [signum].head; w; w = w->next)
983 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
984}
985
986/*****************************************************************************/
987
862static WL childs [EV_PID_HASHSIZE]; 988static WL childs [EV_PID_HASHSIZE];
863 989
864#ifndef _WIN32 990#ifndef _WIN32
865 991
866static ev_signal childev; 992static ev_signal childev;
867 993
994#ifndef WIFCONTINUED
995# define WIFCONTINUED(status) 0
996#endif
997
868void inline_speed 998void inline_speed
869child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 999child_reap (EV_P_ int chain, int pid, int status)
870{ 1000{
871 ev_child *w; 1001 ev_child *w;
1002 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
872 1003
873 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1004 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1005 {
874 if (w->pid == pid || !w->pid) 1006 if ((w->pid == pid || !w->pid)
1007 && (!traced || (w->flags & 1)))
875 { 1008 {
876 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1009 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; 1010 w->rpid = pid;
878 w->rstatus = status; 1011 w->rstatus = status;
879 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1012 ev_feed_event (EV_A_ (W)w, EV_CHILD);
880 } 1013 }
1014 }
881} 1015}
882 1016
883#ifndef WCONTINUED 1017#ifndef WCONTINUED
884# define WCONTINUED 0 1018# define WCONTINUED 0
885#endif 1019#endif
… …
894 if (!WCONTINUED 1028 if (!WCONTINUED
895 || errno != EINVAL 1029 || errno != EINVAL
896 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1030 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
897 return; 1031 return;
898 1032
899 /* make sure we are called again until all childs have been reaped */ 1033 /* 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 */ 1034 /* 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); 1035 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
902 1036
903 child_reap (EV_A_ sw, pid, pid, status); 1037 child_reap (EV_A_ pid, pid, status);
904 if (EV_PID_HASHSIZE > 1) 1038 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 */ 1039 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
906} 1040}
907 1041
908#endif 1042#endif
909 1043
910/*****************************************************************************/ 1044/*****************************************************************************/
… …
1028 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1162 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1029 have_monotonic = 1; 1163 have_monotonic = 1;
1030 } 1164 }
1031#endif 1165#endif
1032 1166
1033 ev_rt_now = ev_time (); 1167 ev_rt_now = ev_time ();
1034 mn_now = get_clock (); 1168 mn_now = get_clock ();
1035 now_floor = mn_now; 1169 now_floor = mn_now;
1036 rtmn_diff = ev_rt_now - mn_now; 1170 rtmn_diff = ev_rt_now - mn_now;
1037 1171
1038 io_blocktime = 0.; 1172 io_blocktime = 0.;
1039 timeout_blocktime = 0.; 1173 timeout_blocktime = 0.;
1174 backend = 0;
1175 backend_fd = -1;
1176 gotasync = 0;
1177#if EV_USE_INOTIFY
1178 fs_fd = -2;
1179#endif
1040 1180
1041 /* pid check not overridable via env */ 1181 /* pid check not overridable via env */
1042#ifndef _WIN32 1182#ifndef _WIN32
1043 if (flags & EVFLAG_FORKCHECK) 1183 if (flags & EVFLAG_FORKCHECK)
1044 curpid = getpid (); 1184 curpid = getpid ();
… …
1047 if (!(flags & EVFLAG_NOENV) 1187 if (!(flags & EVFLAG_NOENV)
1048 && !enable_secure () 1188 && !enable_secure ()
1049 && getenv ("LIBEV_FLAGS")) 1189 && getenv ("LIBEV_FLAGS"))
1050 flags = atoi (getenv ("LIBEV_FLAGS")); 1190 flags = atoi (getenv ("LIBEV_FLAGS"));
1051 1191
1052 if (!(flags & 0x0000ffffUL)) 1192 if (!(flags & 0x0000ffffU))
1053 flags |= ev_recommended_backends (); 1193 flags |= ev_recommended_backends ();
1054
1055 backend = 0;
1056 backend_fd = -1;
1057#if EV_USE_INOTIFY
1058 fs_fd = -2;
1059#endif
1060 1194
1061#if EV_USE_PORT 1195#if EV_USE_PORT
1062 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1196 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1063#endif 1197#endif
1064#if EV_USE_KQUEUE 1198#if EV_USE_KQUEUE
… …
1072#endif 1206#endif
1073#if EV_USE_SELECT 1207#if EV_USE_SELECT
1074 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1208 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1075#endif 1209#endif
1076 1210
1077 ev_init (&sigev, sigcb); 1211 ev_init (&pipeev, pipecb);
1078 ev_set_priority (&sigev, EV_MAXPRI); 1212 ev_set_priority (&pipeev, EV_MAXPRI);
1079 } 1213 }
1080} 1214}
1081 1215
1082static void noinline 1216static void noinline
1083loop_destroy (EV_P) 1217loop_destroy (EV_P)
1084{ 1218{
1085 int i; 1219 int i;
1220
1221 if (ev_is_active (&pipeev))
1222 {
1223 ev_ref (EV_A); /* signal watcher */
1224 ev_io_stop (EV_A_ &pipeev);
1225
1226#if EV_USE_EVENTFD
1227 if (evfd >= 0)
1228 close (evfd);
1229#endif
1230
1231 if (evpipe [0] >= 0)
1232 {
1233 close (evpipe [0]);
1234 close (evpipe [1]);
1235 }
1236 }
1086 1237
1087#if EV_USE_INOTIFY 1238#if EV_USE_INOTIFY
1088 if (fs_fd >= 0) 1239 if (fs_fd >= 0)
1089 close (fs_fd); 1240 close (fs_fd);
1090#endif 1241#endif
… …
1127#if EV_FORK_ENABLE 1278#if EV_FORK_ENABLE
1128 array_free (fork, EMPTY); 1279 array_free (fork, EMPTY);
1129#endif 1280#endif
1130 array_free (prepare, EMPTY); 1281 array_free (prepare, EMPTY);
1131 array_free (check, EMPTY); 1282 array_free (check, EMPTY);
1283#if EV_ASYNC_ENABLE
1284 array_free (async, EMPTY);
1285#endif
1132 1286
1133 backend = 0; 1287 backend = 0;
1134} 1288}
1135 1289
1290#if EV_USE_INOTIFY
1136void inline_size infy_fork (EV_P); 1291void inline_size infy_fork (EV_P);
1292#endif
1137 1293
1138void inline_size 1294void inline_size
1139loop_fork (EV_P) 1295loop_fork (EV_P)
1140{ 1296{
1141#if EV_USE_PORT 1297#if EV_USE_PORT
… …
1149#endif 1305#endif
1150#if EV_USE_INOTIFY 1306#if EV_USE_INOTIFY
1151 infy_fork (EV_A); 1307 infy_fork (EV_A);
1152#endif 1308#endif
1153 1309
1154 if (ev_is_active (&sigev)) 1310 if (ev_is_active (&pipeev))
1155 { 1311 {
1156 /* default loop */ 1312 /* this "locks" the handlers against writing to the pipe */
1313 /* while we modify the fd vars */
1314 gotsig = 1;
1315#if EV_ASYNC_ENABLE
1316 gotasync = 1;
1317#endif
1157 1318
1158 ev_ref (EV_A); 1319 ev_ref (EV_A);
1159 ev_io_stop (EV_A_ &sigev); 1320 ev_io_stop (EV_A_ &pipeev);
1321
1322#if EV_USE_EVENTFD
1323 if (evfd >= 0)
1324 close (evfd);
1325#endif
1326
1327 if (evpipe [0] >= 0)
1328 {
1160 close (sigpipe [0]); 1329 close (evpipe [0]);
1161 close (sigpipe [1]); 1330 close (evpipe [1]);
1331 }
1162 1332
1163 while (pipe (sigpipe))
1164 syserr ("(libev) error creating pipe");
1165
1166 siginit (EV_A); 1333 evpipe_init (EV_A);
1334 /* now iterate over everything, in case we missed something */
1335 pipecb (EV_A_ &pipeev, EV_READ);
1167 } 1336 }
1168 1337
1169 postfork = 0; 1338 postfork = 0;
1170} 1339}
1171 1340
… …
1193} 1362}
1194 1363
1195void 1364void
1196ev_loop_fork (EV_P) 1365ev_loop_fork (EV_P)
1197{ 1366{
1198 postfork = 1; 1367 postfork = 1; /* must be in line with ev_default_fork */
1199} 1368}
1200 1369
1201#endif 1370#endif
1202 1371
1203#if EV_MULTIPLICITY 1372#if EV_MULTIPLICITY
… …
1206#else 1375#else
1207int 1376int
1208ev_default_loop (unsigned int flags) 1377ev_default_loop (unsigned int flags)
1209#endif 1378#endif
1210{ 1379{
1211 if (sigpipe [0] == sigpipe [1])
1212 if (pipe (sigpipe))
1213 return 0;
1214
1215 if (!ev_default_loop_ptr) 1380 if (!ev_default_loop_ptr)
1216 { 1381 {
1217#if EV_MULTIPLICITY 1382#if EV_MULTIPLICITY
1218 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1383 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1219#else 1384#else
… …
1222 1387
1223 loop_init (EV_A_ flags); 1388 loop_init (EV_A_ flags);
1224 1389
1225 if (ev_backend (EV_A)) 1390 if (ev_backend (EV_A))
1226 { 1391 {
1227 siginit (EV_A);
1228
1229#ifndef _WIN32 1392#ifndef _WIN32
1230 ev_signal_init (&childev, childcb, SIGCHLD); 1393 ev_signal_init (&childev, childcb, SIGCHLD);
1231 ev_set_priority (&childev, EV_MAXPRI); 1394 ev_set_priority (&childev, EV_MAXPRI);
1232 ev_signal_start (EV_A_ &childev); 1395 ev_signal_start (EV_A_ &childev);
1233 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1396 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1250#ifndef _WIN32 1413#ifndef _WIN32
1251 ev_ref (EV_A); /* child watcher */ 1414 ev_ref (EV_A); /* child watcher */
1252 ev_signal_stop (EV_A_ &childev); 1415 ev_signal_stop (EV_A_ &childev);
1253#endif 1416#endif
1254 1417
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); 1418 loop_destroy (EV_A);
1262} 1419}
1263 1420
1264void 1421void
1265ev_default_fork (void) 1422ev_default_fork (void)
… …
1267#if EV_MULTIPLICITY 1424#if EV_MULTIPLICITY
1268 struct ev_loop *loop = ev_default_loop_ptr; 1425 struct ev_loop *loop = ev_default_loop_ptr;
1269#endif 1426#endif
1270 1427
1271 if (backend) 1428 if (backend)
1272 postfork = 1; 1429 postfork = 1; /* must be in line with ev_loop_fork */
1273} 1430}
1274 1431
1275/*****************************************************************************/ 1432/*****************************************************************************/
1276 1433
1277void 1434void
… …
1486static int loop_done; 1643static int loop_done;
1487 1644
1488void 1645void
1489ev_loop (EV_P_ int flags) 1646ev_loop (EV_P_ int flags)
1490{ 1647{
1491 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1648 loop_done = EVUNLOOP_CANCEL;
1492 ? EVUNLOOP_ONE
1493 : EVUNLOOP_CANCEL;
1494 1649
1495 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1650 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1496 1651
1497 do 1652 do
1498 { 1653 {
… …
1594 /* queue check watchers, to be executed first */ 1749 /* queue check watchers, to be executed first */
1595 if (expect_false (checkcnt)) 1750 if (expect_false (checkcnt))
1596 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1751 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1597 1752
1598 call_pending (EV_A); 1753 call_pending (EV_A);
1599
1600 } 1754 }
1601 while (expect_true (activecnt && !loop_done)); 1755 while (expect_true (
1756 activecnt
1757 && !loop_done
1758 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1759 ));
1602 1760
1603 if (loop_done == EVUNLOOP_ONE) 1761 if (loop_done == EVUNLOOP_ONE)
1604 loop_done = EVUNLOOP_CANCEL; 1762 loop_done = EVUNLOOP_CANCEL;
1605} 1763}
1606 1764
… …
1852 if (expect_false (ev_is_active (w))) 2010 if (expect_false (ev_is_active (w)))
1853 return; 2011 return;
1854 2012
1855 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2013 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1856 2014
2015 evpipe_init (EV_A);
2016
1857 { 2017 {
1858#ifndef _WIN32 2018#ifndef _WIN32
1859 sigset_t full, prev; 2019 sigset_t full, prev;
1860 sigfillset (&full); 2020 sigfillset (&full);
1861 sigprocmask (SIG_SETMASK, &full, &prev); 2021 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1872 wlist_add (&signals [w->signum - 1].head, (WL)w); 2032 wlist_add (&signals [w->signum - 1].head, (WL)w);
1873 2033
1874 if (!((WL)w)->next) 2034 if (!((WL)w)->next)
1875 { 2035 {
1876#if _WIN32 2036#if _WIN32
1877 signal (w->signum, sighandler); 2037 signal (w->signum, ev_sighandler);
1878#else 2038#else
1879 struct sigaction sa; 2039 struct sigaction sa;
1880 sa.sa_handler = sighandler; 2040 sa.sa_handler = ev_sighandler;
1881 sigfillset (&sa.sa_mask); 2041 sigfillset (&sa.sa_mask);
1882 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2042 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1883 sigaction (w->signum, &sa, 0); 2043 sigaction (w->signum, &sa, 0);
1884#endif 2044#endif
1885 } 2045 }
… …
2374 2534
2375 ev_stop (EV_A_ (W)w); 2535 ev_stop (EV_A_ (W)w);
2376} 2536}
2377#endif 2537#endif
2378 2538
2539#if EV_ASYNC_ENABLE
2540void
2541ev_async_start (EV_P_ ev_async *w)
2542{
2543 if (expect_false (ev_is_active (w)))
2544 return;
2545
2546 evpipe_init (EV_A);
2547
2548 ev_start (EV_A_ (W)w, ++asynccnt);
2549 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2550 asyncs [asynccnt - 1] = w;
2551}
2552
2553void
2554ev_async_stop (EV_P_ ev_async *w)
2555{
2556 clear_pending (EV_A_ (W)w);
2557 if (expect_false (!ev_is_active (w)))
2558 return;
2559
2560 {
2561 int active = ((W)w)->active;
2562 asyncs [active - 1] = asyncs [--asynccnt];
2563 ((W)asyncs [active - 1])->active = active;
2564 }
2565
2566 ev_stop (EV_A_ (W)w);
2567}
2568
2569void
2570ev_async_send (EV_P_ ev_async *w)
2571{
2572 w->sent = 1;
2573 evpipe_write (EV_A_ &gotasync);
2574}
2575#endif
2576
2379/*****************************************************************************/ 2577/*****************************************************************************/
2380 2578
2381struct ev_once 2579struct ev_once
2382{ 2580{
2383 ev_io io; 2581 ev_io io;

Diff Legend

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