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

Comparing libev/ev.c (file contents):
Revision 1.146 by root, Tue Nov 27 09:17:51 2007 UTC vs.
Revision 1.168 by root, Sat Dec 8 14:12:07 2007 UTC

94# else 94# else
95# define EV_USE_PORT 0 95# define EV_USE_PORT 0
96# endif 96# endif
97# endif 97# endif
98 98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
105# endif
106
99#endif 107#endif
100 108
101#include <math.h> 109#include <math.h>
102#include <stdlib.h> 110#include <stdlib.h>
103#include <fcntl.h> 111#include <fcntl.h>
109#include <errno.h> 117#include <errno.h>
110#include <sys/types.h> 118#include <sys/types.h>
111#include <time.h> 119#include <time.h>
112 120
113#include <signal.h> 121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
114 128
115#ifndef _WIN32 129#ifndef _WIN32
116# include <sys/time.h> 130# include <sys/time.h>
117# include <sys/wait.h> 131# include <sys/wait.h>
118# include <unistd.h> 132# include <unistd.h>
156 170
157#ifndef EV_USE_PORT 171#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 172# define EV_USE_PORT 0
159#endif 173#endif
160 174
175#ifndef EV_USE_INOTIFY
176# define EV_USE_INOTIFY 0
177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
182# else
183# define EV_PID_HASHSIZE 16
184# endif
185#endif
186
187#ifndef EV_INOTIFY_HASHSIZE
188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
193#endif
194
161/**/ 195/**/
162 196
163#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
172 206
173#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 208# include <winsock.h>
175#endif 209#endif
176 210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
177/**/ 219/**/
178 220
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
183
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189 224
190#if __GNUC__ >= 3 225#if __GNUC__ >= 3
191# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline_size static inline /* inline for codesize */ 227# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL 228# if EV_MINIMAL
206 241
207#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
208#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
209 244
210#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
211#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
212 247
213#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 248#define EMPTY /* required for microsofts broken pseudo-c compiler */
214#define EMPTY2(a,b) /* used to suppress some warnings */ 249#define EMPTY2(a,b) /* used to suppress some warnings */
215 250
216typedef ev_watcher *W; 251typedef ev_watcher *W;
217typedef ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
218typedef ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 290{
256 alloc = cb; 291 alloc = cb;
257} 292}
258 293
259static void * 294inline_speed void *
260ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, long size)
261{ 296{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
263 298
264 if (!ptr && size) 299 if (!ptr && size)
288typedef struct 323typedef struct
289{ 324{
290 W w; 325 W w;
291 int events; 326 int events;
292} ANPENDING; 327} ANPENDING;
328
329#if EV_USE_INOTIFY
330typedef struct
331{
332 WL head;
333} ANFS;
334#endif
293 335
294#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
295 337
296 struct ev_loop 338 struct ev_loop
297 { 339 {
354{ 396{
355 return ev_rt_now; 397 return ev_rt_now;
356} 398}
357#endif 399#endif
358 400
359#define array_roundsize(type,n) (((n) | 4) & ~3) 401int inline_size
402array_nextsize (int elem, int cur, int cnt)
403{
404 int ncur = cur + 1;
405
406 do
407 ncur <<= 1;
408 while (cnt > ncur);
409
410 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
411 if (elem * ncur > 4096)
412 {
413 ncur *= elem;
414 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
415 ncur = ncur - sizeof (void *) * 4;
416 ncur /= elem;
417 }
418
419 return ncur;
420}
421
422inline_speed void *
423array_realloc (int elem, void *base, int *cur, int cnt)
424{
425 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur);
427}
360 428
361#define array_needsize(type,base,cur,cnt,init) \ 429#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 430 if (expect_false ((cnt) > (cur))) \
363 { \ 431 { \
364 int newcnt = cur; \ 432 int ocur_ = (cur); \
365 do \ 433 (base) = (type *)array_realloc \
366 { \ 434 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 435 init ((base) + (ocur_), (cur) - ocur_); \
368 } \
369 while ((cnt) > newcnt); \
370 \
371 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
372 init (base + cur, newcnt - cur); \
373 cur = newcnt; \
374 } 436 }
375 437
438#if 0
376#define array_slim(type,stem) \ 439#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 440 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 441 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 442 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 443 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 444 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 445 }
446#endif
383 447
384#define array_free(stem, idx) \ 448#define array_free(stem, idx) \
385 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 449 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
386 450
387/*****************************************************************************/ 451/*****************************************************************************/
443} 507}
444 508
445void 509void
446ev_feed_fd_event (EV_P_ int fd, int revents) 510ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 511{
512 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 513 fd_event (EV_A_ fd, revents);
449} 514}
450 515
451void inline_size 516void inline_size
452fd_reify (EV_P) 517fd_reify (EV_P)
453{ 518{
547static void noinline 612static void noinline
548fd_rearm_all (EV_P) 613fd_rearm_all (EV_P)
549{ 614{
550 int fd; 615 int fd;
551 616
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 617 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 618 if (anfds [fd].events)
555 { 619 {
556 anfds [fd].events = 0; 620 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 621 fd_change (EV_A_ fd);
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 773 ev_unref (EV_A); /* child watcher should not keep loop alive */
710} 774}
711 775
712/*****************************************************************************/ 776/*****************************************************************************/
713 777
714static ev_child *childs [PID_HASHSIZE]; 778static ev_child *childs [EV_PID_HASHSIZE];
715 779
716#ifndef _WIN32 780#ifndef _WIN32
717 781
718static ev_signal childev; 782static ev_signal childev;
719 783
720void inline_speed 784void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 785child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
722{ 786{
723 ev_child *w; 787 ev_child *w;
724 788
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 789 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
726 if (w->pid == pid || !w->pid) 790 if (w->pid == pid || !w->pid)
727 { 791 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 792 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
729 w->rpid = pid; 793 w->rpid = pid;
730 w->rstatus = status; 794 w->rstatus = status;
731 ev_feed_event (EV_A_ (W)w, EV_CHILD); 795 ev_feed_event (EV_A_ (W)w, EV_CHILD);
732 } 796 }
733} 797}
734 798
735#ifndef WCONTINUED 799#ifndef WCONTINUED
751 /* make sure we are called again until all childs have been reaped */ 815 /* make sure we are called again until all childs have been reaped */
752 /* we need to do it this way so that the callback gets called before we continue */ 816 /* we need to do it this way so that the callback gets called before we continue */
753 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 817 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 818
755 child_reap (EV_A_ sw, pid, pid, status); 819 child_reap (EV_A_ sw, pid, pid, status);
820 if (EV_PID_HASHSIZE > 1)
756 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 821 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 822}
758 823
759#endif 824#endif
760 825
761/*****************************************************************************/ 826/*****************************************************************************/
844ev_backend (EV_P) 909ev_backend (EV_P)
845{ 910{
846 return backend; 911 return backend;
847} 912}
848 913
849static void 914unsigned int
915ev_loop_count (EV_P)
916{
917 return loop_count;
918}
919
920static void noinline
850loop_init (EV_P_ unsigned int flags) 921loop_init (EV_P_ unsigned int flags)
851{ 922{
852 if (!backend) 923 if (!backend)
853 { 924 {
854#if EV_USE_MONOTONIC 925#if EV_USE_MONOTONIC
862 ev_rt_now = ev_time (); 933 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 934 mn_now = get_clock ();
864 now_floor = mn_now; 935 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 936 rtmn_diff = ev_rt_now - mn_now;
866 937
938 /* pid check not overridable via env */
939#ifndef _WIN32
940 if (flags & EVFLAG_FORKCHECK)
941 curpid = getpid ();
942#endif
943
867 if (!(flags & EVFLAG_NOENV) 944 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 945 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 946 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 947 flags = atoi (getenv ("LIBEV_FLAGS"));
871 948
872 if (!(flags & 0x0000ffffUL)) 949 if (!(flags & 0x0000ffffUL))
873 flags |= ev_recommended_backends (); 950 flags |= ev_recommended_backends ();
874 951
875 backend = 0; 952 backend = 0;
953 backend_fd = -1;
954#if EV_USE_INOTIFY
955 fs_fd = -2;
956#endif
957
876#if EV_USE_PORT 958#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 959 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 960#endif
879#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 962 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
892 ev_init (&sigev, sigcb); 974 ev_init (&sigev, sigcb);
893 ev_set_priority (&sigev, EV_MAXPRI); 975 ev_set_priority (&sigev, EV_MAXPRI);
894 } 976 }
895} 977}
896 978
897static void 979static void noinline
898loop_destroy (EV_P) 980loop_destroy (EV_P)
899{ 981{
900 int i; 982 int i;
983
984#if EV_USE_INOTIFY
985 if (fs_fd >= 0)
986 close (fs_fd);
987#endif
988
989 if (backend_fd >= 0)
990 close (backend_fd);
901 991
902#if EV_USE_PORT 992#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 993 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 994#endif
905#if EV_USE_KQUEUE 995#if EV_USE_KQUEUE
914#if EV_USE_SELECT 1004#if EV_USE_SELECT
915 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1005 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
916#endif 1006#endif
917 1007
918 for (i = NUMPRI; i--; ) 1008 for (i = NUMPRI; i--; )
1009 {
919 array_free (pending, [i]); 1010 array_free (pending, [i]);
1011#if EV_IDLE_ENABLE
1012 array_free (idle, [i]);
1013#endif
1014 }
920 1015
921 /* have to use the microsoft-never-gets-it-right macro */ 1016 /* have to use the microsoft-never-gets-it-right macro */
922 array_free (fdchange, EMPTY0); 1017 array_free (fdchange, EMPTY);
923 array_free (timer, EMPTY0); 1018 array_free (timer, EMPTY);
924#if EV_PERIODIC_ENABLE 1019#if EV_PERIODIC_ENABLE
925 array_free (periodic, EMPTY0); 1020 array_free (periodic, EMPTY);
926#endif 1021#endif
927 array_free (idle, EMPTY0);
928 array_free (prepare, EMPTY0); 1022 array_free (prepare, EMPTY);
929 array_free (check, EMPTY0); 1023 array_free (check, EMPTY);
930 1024
931 backend = 0; 1025 backend = 0;
932} 1026}
933 1027
934static void 1028void inline_size infy_fork (EV_P);
1029
1030void inline_size
935loop_fork (EV_P) 1031loop_fork (EV_P)
936{ 1032{
937#if EV_USE_PORT 1033#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1034 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1035#endif
940#if EV_USE_KQUEUE 1036#if EV_USE_KQUEUE
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1037 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1038#endif
943#if EV_USE_EPOLL 1039#if EV_USE_EPOLL
944 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1040 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1041#endif
1042#if EV_USE_INOTIFY
1043 infy_fork (EV_A);
945#endif 1044#endif
946 1045
947 if (ev_is_active (&sigev)) 1046 if (ev_is_active (&sigev))
948 { 1047 {
949 /* default loop */ 1048 /* default loop */
1065 postfork = 1; 1164 postfork = 1;
1066} 1165}
1067 1166
1068/*****************************************************************************/ 1167/*****************************************************************************/
1069 1168
1070int inline_size 1169void
1071any_pending (EV_P) 1170ev_invoke (EV_P_ void *w, int revents)
1072{ 1171{
1073 int pri; 1172 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1173}
1081 1174
1082void inline_speed 1175void inline_speed
1083call_pending (EV_P) 1176call_pending (EV_P)
1084{ 1177{
1089 { 1182 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1183 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1184
1092 if (expect_true (p->w)) 1185 if (expect_true (p->w))
1093 { 1186 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1187 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1188
1096 p->w->pending = 0; 1189 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1190 EV_CB_INVOKE (p->w, p->events);
1098 } 1191 }
1099 } 1192 }
1104{ 1197{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1198 while (timercnt && ((WT)timers [0])->at <= mn_now)
1106 { 1199 {
1107 ev_timer *w = timers [0]; 1200 ev_timer *w = timers [0];
1108 1201
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1202 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1203
1111 /* first reschedule or stop timer */ 1204 /* first reschedule or stop timer */
1112 if (w->repeat) 1205 if (w->repeat)
1113 { 1206 {
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1207 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1132{ 1225{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1226 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1134 { 1227 {
1135 ev_periodic *w = periodics [0]; 1228 ev_periodic *w = periodics [0];
1136 1229
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1230 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1231
1139 /* first reschedule or stop timer */ 1232 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1233 if (w->reschedule_cb)
1141 { 1234 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1235 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1176 for (i = periodiccnt >> 1; i--; ) 1269 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i); 1270 downheap ((WT *)periodics, periodiccnt, i);
1178} 1271}
1179#endif 1272#endif
1180 1273
1274#if EV_IDLE_ENABLE
1275void inline_size
1276idle_reify (EV_P)
1277{
1278 if (expect_false (idleall))
1279 {
1280 int pri;
1281
1282 for (pri = NUMPRI; pri--; )
1283 {
1284 if (pendingcnt [pri])
1285 break;
1286
1287 if (idlecnt [pri])
1288 {
1289 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1290 break;
1291 }
1292 }
1293 }
1294}
1295#endif
1296
1181int inline_size 1297int inline_size
1182time_update_monotonic (EV_P) 1298time_update_monotonic (EV_P)
1183{ 1299{
1184 mn_now = get_clock (); 1300 mn_now = get_clock ();
1185 1301
1209 ev_tstamp odiff = rtmn_diff; 1325 ev_tstamp odiff = rtmn_diff;
1210 1326
1211 /* loop a few times, before making important decisions. 1327 /* loop a few times, before making important decisions.
1212 * on the choice of "4": one iteration isn't enough, 1328 * on the choice of "4": one iteration isn't enough,
1213 * in case we get preempted during the calls to 1329 * in case we get preempted during the calls to
1214 * ev_time and get_clock. a second call is almost guarenteed 1330 * ev_time and get_clock. a second call is almost guaranteed
1215 * to succeed in that case, though. and looping a few more times 1331 * to succeed in that case, though. and looping a few more times
1216 * doesn't hurt either as we only do this on time-jumps or 1332 * doesn't hurt either as we only do this on time-jumps or
1217 * in the unlikely event of getting preempted here. 1333 * in the unlikely event of having been preempted here.
1218 */ 1334 */
1219 for (i = 4; --i; ) 1335 for (i = 4; --i; )
1220 { 1336 {
1221 rtmn_diff = ev_rt_now - mn_now; 1337 rtmn_diff = ev_rt_now - mn_now;
1222 1338
1244 { 1360 {
1245#if EV_PERIODIC_ENABLE 1361#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1362 periodics_reschedule (EV_A);
1247#endif 1363#endif
1248 1364
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1365 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1366 for (i = 0; i < timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1367 ((WT)timers [i])->at += ev_rt_now - mn_now;
1252 } 1368 }
1253 1369
1254 mn_now = ev_rt_now; 1370 mn_now = ev_rt_now;
1274{ 1390{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1391 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1276 ? EVUNLOOP_ONE 1392 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL; 1393 : EVUNLOOP_CANCEL;
1278 1394
1279 while (activecnt) 1395 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1396
1397 do
1280 { 1398 {
1399#ifndef _WIN32
1400 if (expect_false (curpid)) /* penalise the forking check even more */
1401 if (expect_false (getpid () != curpid))
1402 {
1403 curpid = getpid ();
1404 postfork = 1;
1405 }
1406#endif
1407
1408#if EV_FORK_ENABLE
1409 /* we might have forked, so queue fork handlers */
1410 if (expect_false (postfork))
1411 if (forkcnt)
1412 {
1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1414 call_pending (EV_A);
1415 }
1416#endif
1417
1281 /* queue check watchers (and execute them) */ 1418 /* queue check watchers (and execute them) */
1282 if (expect_false (preparecnt)) 1419 if (expect_false (preparecnt))
1283 { 1420 {
1284 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1285 call_pending (EV_A); 1422 call_pending (EV_A);
1286 } 1423 }
1287 1424
1425 if (expect_false (!activecnt))
1426 break;
1427
1288 /* we might have forked, so reify kernel state if necessary */ 1428 /* we might have forked, so reify kernel state if necessary */
1289 if (expect_false (postfork)) 1429 if (expect_false (postfork))
1290 loop_fork (EV_A); 1430 loop_fork (EV_A);
1291 1431
1292 /* update fd-related kernel structures */ 1432 /* update fd-related kernel structures */
1293 fd_reify (EV_A); 1433 fd_reify (EV_A);
1294 1434
1295 /* calculate blocking time */ 1435 /* calculate blocking time */
1296 { 1436 {
1297 double block; 1437 ev_tstamp block;
1298 1438
1299 if (flags & EVLOOP_NONBLOCK || idlecnt) 1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1300 block = 0.; /* do not block at all */ 1440 block = 0.; /* do not block at all */
1301 else 1441 else
1302 { 1442 {
1303 /* update time to cancel out callback processing overhead */ 1443 /* update time to cancel out callback processing overhead */
1304#if EV_USE_MONOTONIC 1444#if EV_USE_MONOTONIC
1328#endif 1468#endif
1329 1469
1330 if (expect_false (block < 0.)) block = 0.; 1470 if (expect_false (block < 0.)) block = 0.;
1331 } 1471 }
1332 1472
1473 ++loop_count;
1333 backend_poll (EV_A_ block); 1474 backend_poll (EV_A_ block);
1334 } 1475 }
1335 1476
1336 /* update ev_rt_now, do magic */ 1477 /* update ev_rt_now, do magic */
1337 time_update (EV_A); 1478 time_update (EV_A);
1340 timers_reify (EV_A); /* relative timers called last */ 1481 timers_reify (EV_A); /* relative timers called last */
1341#if EV_PERIODIC_ENABLE 1482#if EV_PERIODIC_ENABLE
1342 periodics_reify (EV_A); /* absolute timers called first */ 1483 periodics_reify (EV_A); /* absolute timers called first */
1343#endif 1484#endif
1344 1485
1486#if EV_IDLE_ENABLE
1345 /* queue idle watchers unless other events are pending */ 1487 /* queue idle watchers unless other events are pending */
1346 if (idlecnt && !any_pending (EV_A)) 1488 idle_reify (EV_A);
1347 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1489#endif
1348 1490
1349 /* queue check watchers, to be executed first */ 1491 /* queue check watchers, to be executed first */
1350 if (expect_false (checkcnt)) 1492 if (expect_false (checkcnt))
1351 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1493 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1352 1494
1353 call_pending (EV_A); 1495 call_pending (EV_A);
1354 1496
1355 if (expect_false (loop_done))
1356 break;
1357 } 1497 }
1498 while (expect_true (activecnt && !loop_done));
1358 1499
1359 if (loop_done == EVUNLOOP_ONE) 1500 if (loop_done == EVUNLOOP_ONE)
1360 loop_done = EVUNLOOP_CANCEL; 1501 loop_done = EVUNLOOP_CANCEL;
1361} 1502}
1362 1503
1389 head = &(*head)->next; 1530 head = &(*head)->next;
1390 } 1531 }
1391} 1532}
1392 1533
1393void inline_speed 1534void inline_speed
1394ev_clear_pending (EV_P_ W w) 1535clear_pending (EV_P_ W w)
1395{ 1536{
1396 if (w->pending) 1537 if (w->pending)
1397 { 1538 {
1398 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1539 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1399 w->pending = 0; 1540 w->pending = 0;
1400 } 1541 }
1401} 1542}
1402 1543
1544int
1545ev_clear_pending (EV_P_ void *w)
1546{
1547 W w_ = (W)w;
1548 int pending = w_->pending;
1549
1550 if (!pending)
1551 return 0;
1552
1553 w_->pending = 0;
1554 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1555 p->w = 0;
1556
1557 return p->events;
1558}
1559
1560void inline_size
1561pri_adjust (EV_P_ W w)
1562{
1563 int pri = w->priority;
1564 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1565 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1566 w->priority = pri;
1567}
1568
1403void inline_speed 1569void inline_speed
1404ev_start (EV_P_ W w, int active) 1570ev_start (EV_P_ W w, int active)
1405{ 1571{
1406 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1572 pri_adjust (EV_A_ w);
1407 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1408
1409 w->active = active; 1573 w->active = active;
1410 ev_ref (EV_A); 1574 ev_ref (EV_A);
1411} 1575}
1412 1576
1413void inline_size 1577void inline_size
1437} 1601}
1438 1602
1439void 1603void
1440ev_io_stop (EV_P_ ev_io *w) 1604ev_io_stop (EV_P_ ev_io *w)
1441{ 1605{
1442 ev_clear_pending (EV_A_ (W)w); 1606 clear_pending (EV_A_ (W)w);
1443 if (expect_false (!ev_is_active (w))) 1607 if (expect_false (!ev_is_active (w)))
1444 return; 1608 return;
1445 1609
1446 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1610 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1447 1611
1464 ev_start (EV_A_ (W)w, ++timercnt); 1628 ev_start (EV_A_ (W)w, ++timercnt);
1465 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1629 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1466 timers [timercnt - 1] = w; 1630 timers [timercnt - 1] = w;
1467 upheap ((WT *)timers, timercnt - 1); 1631 upheap ((WT *)timers, timercnt - 1);
1468 1632
1633 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1634}
1635
1636void
1637ev_timer_stop (EV_P_ ev_timer *w)
1638{
1639 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w)))
1641 return;
1642
1469 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1470}
1471 1644
1472void 1645 {
1473ev_timer_stop (EV_P_ ev_timer *w) 1646 int active = ((W)w)->active;
1474{
1475 ev_clear_pending (EV_A_ (W)w);
1476 if (expect_false (!ev_is_active (w)))
1477 return;
1478 1647
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1480
1481 if (expect_true (((W)w)->active < timercnt--)) 1648 if (expect_true (--active < --timercnt))
1482 { 1649 {
1483 timers [((W)w)->active - 1] = timers [timercnt]; 1650 timers [active] = timers [timercnt];
1484 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1651 adjustheap ((WT *)timers, timercnt, active);
1485 } 1652 }
1653 }
1486 1654
1487 ((WT)w)->at -= mn_now; 1655 ((WT)w)->at -= mn_now;
1488 1656
1489 ev_stop (EV_A_ (W)w); 1657 ev_stop (EV_A_ (W)w);
1490} 1658}
1528 ev_start (EV_A_ (W)w, ++periodiccnt); 1696 ev_start (EV_A_ (W)w, ++periodiccnt);
1529 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1697 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1530 periodics [periodiccnt - 1] = w; 1698 periodics [periodiccnt - 1] = w;
1531 upheap ((WT *)periodics, periodiccnt - 1); 1699 upheap ((WT *)periodics, periodiccnt - 1);
1532 1700
1701 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1702}
1703
1704void
1705ev_periodic_stop (EV_P_ ev_periodic *w)
1706{
1707 clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w)))
1709 return;
1710
1533 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1534}
1535 1712
1536void 1713 {
1537ev_periodic_stop (EV_P_ ev_periodic *w) 1714 int active = ((W)w)->active;
1538{
1539 ev_clear_pending (EV_A_ (W)w);
1540 if (expect_false (!ev_is_active (w)))
1541 return;
1542 1715
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1544
1545 if (expect_true (((W)w)->active < periodiccnt--)) 1716 if (expect_true (--active < --periodiccnt))
1546 { 1717 {
1547 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1718 periodics [active] = periodics [periodiccnt];
1548 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1719 adjustheap ((WT *)periodics, periodiccnt, active);
1549 } 1720 }
1721 }
1550 1722
1551 ev_stop (EV_A_ (W)w); 1723 ev_stop (EV_A_ (W)w);
1552} 1724}
1553 1725
1554void 1726void
1594} 1766}
1595 1767
1596void 1768void
1597ev_signal_stop (EV_P_ ev_signal *w) 1769ev_signal_stop (EV_P_ ev_signal *w)
1598{ 1770{
1599 ev_clear_pending (EV_A_ (W)w); 1771 clear_pending (EV_A_ (W)w);
1600 if (expect_false (!ev_is_active (w))) 1772 if (expect_false (!ev_is_active (w)))
1601 return; 1773 return;
1602 1774
1603 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1604 ev_stop (EV_A_ (W)w); 1776 ev_stop (EV_A_ (W)w);
1615#endif 1787#endif
1616 if (expect_false (ev_is_active (w))) 1788 if (expect_false (ev_is_active (w)))
1617 return; 1789 return;
1618 1790
1619 ev_start (EV_A_ (W)w, 1); 1791 ev_start (EV_A_ (W)w, 1);
1620 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1792 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1621} 1793}
1622 1794
1623void 1795void
1624ev_child_stop (EV_P_ ev_child *w) 1796ev_child_stop (EV_P_ ev_child *w)
1625{ 1797{
1626 ev_clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1627 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1628 return; 1800 return;
1629 1801
1630 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1632} 1804}
1633 1805
1634#if EV_STAT_ENABLE 1806#if EV_STAT_ENABLE
1635 1807
1639# endif 1811# endif
1640 1812
1641#define DEF_STAT_INTERVAL 5.0074891 1813#define DEF_STAT_INTERVAL 5.0074891
1642#define MIN_STAT_INTERVAL 0.1074891 1814#define MIN_STAT_INTERVAL 0.1074891
1643 1815
1816static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1817
1818#if EV_USE_INOTIFY
1819# define EV_INOTIFY_BUFSIZE 8192
1820
1821static void noinline
1822infy_add (EV_P_ ev_stat *w)
1823{
1824 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1825
1826 if (w->wd < 0)
1827 {
1828 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1829
1830 /* monitor some parent directory for speedup hints */
1831 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1832 {
1833 char path [4096];
1834 strcpy (path, w->path);
1835
1836 do
1837 {
1838 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1839 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1840
1841 char *pend = strrchr (path, '/');
1842
1843 if (!pend)
1844 break; /* whoops, no '/', complain to your admin */
1845
1846 *pend = 0;
1847 w->wd = inotify_add_watch (fs_fd, path, mask);
1848 }
1849 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1850 }
1851 }
1852 else
1853 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1854
1855 if (w->wd >= 0)
1856 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1857}
1858
1859static void noinline
1860infy_del (EV_P_ ev_stat *w)
1861{
1862 int slot;
1863 int wd = w->wd;
1864
1865 if (wd < 0)
1866 return;
1867
1868 w->wd = -2;
1869 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1870 wlist_del (&fs_hash [slot].head, (WL)w);
1871
1872 /* remove this watcher, if others are watching it, they will rearm */
1873 inotify_rm_watch (fs_fd, wd);
1874}
1875
1876static void noinline
1877infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1878{
1879 if (slot < 0)
1880 /* overflow, need to check for all hahs slots */
1881 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1882 infy_wd (EV_A_ slot, wd, ev);
1883 else
1884 {
1885 WL w_;
1886
1887 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1888 {
1889 ev_stat *w = (ev_stat *)w_;
1890 w_ = w_->next; /* lets us remove this watcher and all before it */
1891
1892 if (w->wd == wd || wd == -1)
1893 {
1894 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1895 {
1896 w->wd = -1;
1897 infy_add (EV_A_ w); /* re-add, no matter what */
1898 }
1899
1900 stat_timer_cb (EV_A_ &w->timer, 0);
1901 }
1902 }
1903 }
1904}
1905
1906static void
1907infy_cb (EV_P_ ev_io *w, int revents)
1908{
1909 char buf [EV_INOTIFY_BUFSIZE];
1910 struct inotify_event *ev = (struct inotify_event *)buf;
1911 int ofs;
1912 int len = read (fs_fd, buf, sizeof (buf));
1913
1914 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1915 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1916}
1917
1918void inline_size
1919infy_init (EV_P)
1920{
1921 if (fs_fd != -2)
1922 return;
1923
1924 fs_fd = inotify_init ();
1925
1926 if (fs_fd >= 0)
1927 {
1928 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1929 ev_set_priority (&fs_w, EV_MAXPRI);
1930 ev_io_start (EV_A_ &fs_w);
1931 }
1932}
1933
1934void inline_size
1935infy_fork (EV_P)
1936{
1937 int slot;
1938
1939 if (fs_fd < 0)
1940 return;
1941
1942 close (fs_fd);
1943 fs_fd = inotify_init ();
1944
1945 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1946 {
1947 WL w_ = fs_hash [slot].head;
1948 fs_hash [slot].head = 0;
1949
1950 while (w_)
1951 {
1952 ev_stat *w = (ev_stat *)w_;
1953 w_ = w_->next; /* lets us add this watcher */
1954
1955 w->wd = -1;
1956
1957 if (fs_fd >= 0)
1958 infy_add (EV_A_ w); /* re-add, no matter what */
1959 else
1960 ev_timer_start (EV_A_ &w->timer);
1961 }
1962
1963 }
1964}
1965
1966#endif
1967
1644void 1968void
1645ev_stat_stat (EV_P_ ev_stat *w) 1969ev_stat_stat (EV_P_ ev_stat *w)
1646{ 1970{
1647 if (lstat (w->path, &w->attr) < 0) 1971 if (lstat (w->path, &w->attr) < 0)
1648 w->attr.st_nlink = 0; 1972 w->attr.st_nlink = 0;
1649 else if (!w->attr.st_nlink) 1973 else if (!w->attr.st_nlink)
1650 w->attr.st_nlink = 1; 1974 w->attr.st_nlink = 1;
1651} 1975}
1652 1976
1653static void 1977static void noinline
1654stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1978stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1655{ 1979{
1656 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1980 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1657 1981
1658 /* we copy this here each the time so that */ 1982 /* we copy this here each the time so that */
1659 /* prev has the old value when the callback gets invoked */ 1983 /* prev has the old value when the callback gets invoked */
1660 w->prev = w->attr; 1984 w->prev = w->attr;
1661 ev_stat_stat (EV_A_ w); 1985 ev_stat_stat (EV_A_ w);
1662 1986
1663 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1987 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1988 if (
1989 w->prev.st_dev != w->attr.st_dev
1990 || w->prev.st_ino != w->attr.st_ino
1991 || w->prev.st_mode != w->attr.st_mode
1992 || w->prev.st_nlink != w->attr.st_nlink
1993 || w->prev.st_uid != w->attr.st_uid
1994 || w->prev.st_gid != w->attr.st_gid
1995 || w->prev.st_rdev != w->attr.st_rdev
1996 || w->prev.st_size != w->attr.st_size
1997 || w->prev.st_atime != w->attr.st_atime
1998 || w->prev.st_mtime != w->attr.st_mtime
1999 || w->prev.st_ctime != w->attr.st_ctime
2000 ) {
2001 #if EV_USE_INOTIFY
2002 infy_del (EV_A_ w);
2003 infy_add (EV_A_ w);
2004 ev_stat_stat (EV_A_ w); /* avoid race... */
2005 #endif
2006
1664 ev_feed_event (EV_A_ w, EV_STAT); 2007 ev_feed_event (EV_A_ w, EV_STAT);
2008 }
1665} 2009}
1666 2010
1667void 2011void
1668ev_stat_start (EV_P_ ev_stat *w) 2012ev_stat_start (EV_P_ ev_stat *w)
1669{ 2013{
1679 if (w->interval < MIN_STAT_INTERVAL) 2023 if (w->interval < MIN_STAT_INTERVAL)
1680 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2024 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1681 2025
1682 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2026 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1683 ev_set_priority (&w->timer, ev_priority (w)); 2027 ev_set_priority (&w->timer, ev_priority (w));
2028
2029#if EV_USE_INOTIFY
2030 infy_init (EV_A);
2031
2032 if (fs_fd >= 0)
2033 infy_add (EV_A_ w);
2034 else
2035#endif
1684 ev_timer_start (EV_A_ &w->timer); 2036 ev_timer_start (EV_A_ &w->timer);
1685 2037
1686 ev_start (EV_A_ (W)w, 1); 2038 ev_start (EV_A_ (W)w, 1);
1687} 2039}
1688 2040
1689void 2041void
1690ev_stat_stop (EV_P_ ev_stat *w) 2042ev_stat_stop (EV_P_ ev_stat *w)
1691{ 2043{
1692 ev_clear_pending (EV_A_ (W)w); 2044 clear_pending (EV_A_ (W)w);
1693 if (expect_false (!ev_is_active (w))) 2045 if (expect_false (!ev_is_active (w)))
1694 return; 2046 return;
1695 2047
2048#if EV_USE_INOTIFY
2049 infy_del (EV_A_ w);
2050#endif
1696 ev_timer_stop (EV_A_ &w->timer); 2051 ev_timer_stop (EV_A_ &w->timer);
1697 2052
1698 ev_stop (EV_A_ (W)w); 2053 ev_stop (EV_A_ (W)w);
1699} 2054}
1700#endif 2055#endif
1701 2056
2057#if EV_IDLE_ENABLE
1702void 2058void
1703ev_idle_start (EV_P_ ev_idle *w) 2059ev_idle_start (EV_P_ ev_idle *w)
1704{ 2060{
1705 if (expect_false (ev_is_active (w))) 2061 if (expect_false (ev_is_active (w)))
1706 return; 2062 return;
1707 2063
2064 pri_adjust (EV_A_ (W)w);
2065
2066 {
2067 int active = ++idlecnt [ABSPRI (w)];
2068
2069 ++idleall;
1708 ev_start (EV_A_ (W)w, ++idlecnt); 2070 ev_start (EV_A_ (W)w, active);
2071
1709 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2072 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1710 idles [idlecnt - 1] = w; 2073 idles [ABSPRI (w)][active - 1] = w;
2074 }
1711} 2075}
1712 2076
1713void 2077void
1714ev_idle_stop (EV_P_ ev_idle *w) 2078ev_idle_stop (EV_P_ ev_idle *w)
1715{ 2079{
1716 ev_clear_pending (EV_A_ (W)w); 2080 clear_pending (EV_A_ (W)w);
1717 if (expect_false (!ev_is_active (w))) 2081 if (expect_false (!ev_is_active (w)))
1718 return; 2082 return;
1719 2083
1720 { 2084 {
1721 int active = ((W)w)->active; 2085 int active = ((W)w)->active;
1722 idles [active - 1] = idles [--idlecnt]; 2086
2087 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1723 ((W)idles [active - 1])->active = active; 2088 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2089
2090 ev_stop (EV_A_ (W)w);
2091 --idleall;
1724 } 2092 }
1725
1726 ev_stop (EV_A_ (W)w);
1727} 2093}
2094#endif
1728 2095
1729void 2096void
1730ev_prepare_start (EV_P_ ev_prepare *w) 2097ev_prepare_start (EV_P_ ev_prepare *w)
1731{ 2098{
1732 if (expect_false (ev_is_active (w))) 2099 if (expect_false (ev_is_active (w)))
1738} 2105}
1739 2106
1740void 2107void
1741ev_prepare_stop (EV_P_ ev_prepare *w) 2108ev_prepare_stop (EV_P_ ev_prepare *w)
1742{ 2109{
1743 ev_clear_pending (EV_A_ (W)w); 2110 clear_pending (EV_A_ (W)w);
1744 if (expect_false (!ev_is_active (w))) 2111 if (expect_false (!ev_is_active (w)))
1745 return; 2112 return;
1746 2113
1747 { 2114 {
1748 int active = ((W)w)->active; 2115 int active = ((W)w)->active;
1765} 2132}
1766 2133
1767void 2134void
1768ev_check_stop (EV_P_ ev_check *w) 2135ev_check_stop (EV_P_ ev_check *w)
1769{ 2136{
1770 ev_clear_pending (EV_A_ (W)w); 2137 clear_pending (EV_A_ (W)w);
1771 if (expect_false (!ev_is_active (w))) 2138 if (expect_false (!ev_is_active (w)))
1772 return; 2139 return;
1773 2140
1774 { 2141 {
1775 int active = ((W)w)->active; 2142 int active = ((W)w)->active;
1817} 2184}
1818 2185
1819void 2186void
1820ev_embed_stop (EV_P_ ev_embed *w) 2187ev_embed_stop (EV_P_ ev_embed *w)
1821{ 2188{
1822 ev_clear_pending (EV_A_ (W)w); 2189 clear_pending (EV_A_ (W)w);
1823 if (expect_false (!ev_is_active (w))) 2190 if (expect_false (!ev_is_active (w)))
1824 return; 2191 return;
1825 2192
1826 ev_io_stop (EV_A_ &w->io); 2193 ev_io_stop (EV_A_ &w->io);
2194
2195 ev_stop (EV_A_ (W)w);
2196}
2197#endif
2198
2199#if EV_FORK_ENABLE
2200void
2201ev_fork_start (EV_P_ ev_fork *w)
2202{
2203 if (expect_false (ev_is_active (w)))
2204 return;
2205
2206 ev_start (EV_A_ (W)w, ++forkcnt);
2207 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2208 forks [forkcnt - 1] = w;
2209}
2210
2211void
2212ev_fork_stop (EV_P_ ev_fork *w)
2213{
2214 clear_pending (EV_A_ (W)w);
2215 if (expect_false (!ev_is_active (w)))
2216 return;
2217
2218 {
2219 int active = ((W)w)->active;
2220 forks [active - 1] = forks [--forkcnt];
2221 ((W)forks [active - 1])->active = active;
2222 }
1827 2223
1828 ev_stop (EV_A_ (W)w); 2224 ev_stop (EV_A_ (W)w);
1829} 2225}
1830#endif 2226#endif
1831 2227

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines