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

Comparing libev/ev.c (file contents):
Revision 1.140 by root, Mon Nov 26 19:49:36 2007 UTC vs.
Revision 1.162 by root, Mon Dec 3 13:41:24 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
… …
198# define inline_speed static inline 233# define inline_speed static inline
199# endif 234# endif
200#else 235#else
201# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
202# define inline_speed static 237# define inline_speed static
203# define inline_minimal static 238# define inline_size static
204# define noinline 239# define noinline
205#endif 240#endif
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)
… …
225 260
226/*****************************************************************************/ 261/*****************************************************************************/
227 262
228static void (*syserr_cb)(const char *msg); 263static void (*syserr_cb)(const char *msg);
229 264
265void
230void ev_set_syserr_cb (void (*cb)(const char *msg)) 266ev_set_syserr_cb (void (*cb)(const char *msg))
231{ 267{
232 syserr_cb = cb; 268 syserr_cb = cb;
233} 269}
234 270
235static void 271static void noinline
236syserr (const char *msg) 272syserr (const char *msg)
237{ 273{
238 if (!msg) 274 if (!msg)
239 msg = "(libev) system error"; 275 msg = "(libev) system error";
240 276
… …
247 } 283 }
248} 284}
249 285
250static void *(*alloc)(void *ptr, long size); 286static void *(*alloc)(void *ptr, long size);
251 287
288void
252void ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
253{ 290{
254 alloc = cb; 291 alloc = cb;
255} 292}
256 293
257static void * 294inline_speed void *
258ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, long size)
259{ 296{
260 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
261 298
262 if (!ptr && size) 299 if (!ptr && size)
… …
286typedef struct 323typedef struct
287{ 324{
288 W w; 325 W w;
289 int events; 326 int events;
290} ANPENDING; 327} ANPENDING;
328
329#if EV_USE_INOTIFY
330typedef struct
331{
332 WL head;
333} ANFS;
334#endif
291 335
292#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
293 337
294 struct ev_loop 338 struct ev_loop
295 { 339 {
… …
315 359
316#endif 360#endif
317 361
318/*****************************************************************************/ 362/*****************************************************************************/
319 363
320ev_tstamp noinline 364ev_tstamp
321ev_time (void) 365ev_time (void)
322{ 366{
323#if EV_USE_REALTIME 367#if EV_USE_REALTIME
324 struct timespec ts; 368 struct timespec ts;
325 clock_gettime (CLOCK_REALTIME, &ts); 369 clock_gettime (CLOCK_REALTIME, &ts);
… …
382#define array_free(stem, idx) \ 426#define array_free(stem, idx) \
383 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
384 428
385/*****************************************************************************/ 429/*****************************************************************************/
386 430
387void inline_size
388anfds_init (ANFD *base, int count)
389{
390 while (count--)
391 {
392 base->head = 0;
393 base->events = EV_NONE;
394 base->reify = 0;
395
396 ++base;
397 }
398}
399
400void noinline 431void noinline
401ev_feed_event (EV_P_ void *w, int revents) 432ev_feed_event (EV_P_ void *w, int revents)
402{ 433{
403 W w_ = (W)w; 434 W w_ = (W)w;
404 435
… …
412 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2); 443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
413 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
414 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
415} 446}
416 447
417static void 448void inline_size
418queue_events (EV_P_ W *events, int eventcnt, int type) 449queue_events (EV_P_ W *events, int eventcnt, int type)
419{ 450{
420 int i; 451 int i;
421 452
422 for (i = 0; i < eventcnt; ++i) 453 for (i = 0; i < eventcnt; ++i)
423 ev_feed_event (EV_A_ events [i], type); 454 ev_feed_event (EV_A_ events [i], type);
424} 455}
425 456
457/*****************************************************************************/
458
459void inline_size
460anfds_init (ANFD *base, int count)
461{
462 while (count--)
463 {
464 base->head = 0;
465 base->events = EV_NONE;
466 base->reify = 0;
467
468 ++base;
469 }
470}
471
426void inline_speed 472void inline_speed
427fd_event (EV_P_ int fd, int revents) 473fd_event (EV_P_ int fd, int revents)
428{ 474{
429 ANFD *anfd = anfds + fd; 475 ANFD *anfd = anfds + fd;
430 ev_io *w; 476 ev_io *w;
… …
441void 487void
442ev_feed_fd_event (EV_P_ int fd, int revents) 488ev_feed_fd_event (EV_P_ int fd, int revents)
443{ 489{
444 fd_event (EV_A_ fd, revents); 490 fd_event (EV_A_ fd, revents);
445} 491}
446
447/*****************************************************************************/
448 492
449void inline_size 493void inline_size
450fd_reify (EV_P) 494fd_reify (EV_P)
451{ 495{
452 int i; 496 int i;
… …
545static void noinline 589static void noinline
546fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
547{ 591{
548 int fd; 592 int fd;
549 593
550 /* this should be highly optimised to not do anything but set a flag */
551 for (fd = 0; fd < anfdmax; ++fd) 594 for (fd = 0; fd < anfdmax; ++fd)
552 if (anfds [fd].events) 595 if (anfds [fd].events)
553 { 596 {
554 anfds [fd].events = 0; 597 anfds [fd].events = 0;
555 fd_change (EV_A_ fd); 598 fd_change (EV_A_ fd);
… …
707 ev_unref (EV_A); /* child watcher should not keep loop alive */ 750 ev_unref (EV_A); /* child watcher should not keep loop alive */
708} 751}
709 752
710/*****************************************************************************/ 753/*****************************************************************************/
711 754
712static ev_child *childs [PID_HASHSIZE]; 755static ev_child *childs [EV_PID_HASHSIZE];
713 756
714#ifndef _WIN32 757#ifndef _WIN32
715 758
716static ev_signal childev; 759static ev_signal childev;
717
718#ifndef WCONTINUED
719# define WCONTINUED 0
720#endif
721 760
722void inline_speed 761void inline_speed
723child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 762child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
724{ 763{
725 ev_child *w; 764 ev_child *w;
726 765
727 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
728 if (w->pid == pid || !w->pid) 767 if (w->pid == pid || !w->pid)
729 { 768 {
730 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
731 w->rpid = pid; 770 w->rpid = pid;
732 w->rstatus = status; 771 w->rstatus = status;
733 ev_feed_event (EV_A_ (W)w, EV_CHILD); 772 ev_feed_event (EV_A_ (W)w, EV_CHILD);
734 } 773 }
735} 774}
736 775
776#ifndef WCONTINUED
777# define WCONTINUED 0
778#endif
779
737static void 780static void
738childcb (EV_P_ ev_signal *sw, int revents) 781childcb (EV_P_ ev_signal *sw, int revents)
739{ 782{
740 int pid, status; 783 int pid, status;
741 784
785 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
742 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 786 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
743 { 787 if (!WCONTINUED
788 || errno != EINVAL
789 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
790 return;
791
744 /* make sure we are called again until all childs have been reaped */ 792 /* make sure we are called again until all childs have been reaped */
745 /* we need to do it this way so that the callback gets called before we continue */ 793 /* we need to do it this way so that the callback gets called before we continue */
746 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 794 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
747 795
748 child_reap (EV_A_ sw, pid, pid, status); 796 child_reap (EV_A_ sw, pid, pid, status);
797 if (EV_PID_HASHSIZE > 1)
749 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 798 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
750 }
751} 799}
752 800
753#endif 801#endif
754 802
755/*****************************************************************************/ 803/*****************************************************************************/
… …
838ev_backend (EV_P) 886ev_backend (EV_P)
839{ 887{
840 return backend; 888 return backend;
841} 889}
842 890
843static void 891unsigned int
892ev_loop_count (EV_P)
893{
894 return loop_count;
895}
896
897static void noinline
844loop_init (EV_P_ unsigned int flags) 898loop_init (EV_P_ unsigned int flags)
845{ 899{
846 if (!backend) 900 if (!backend)
847 { 901 {
848#if EV_USE_MONOTONIC 902#if EV_USE_MONOTONIC
… …
856 ev_rt_now = ev_time (); 910 ev_rt_now = ev_time ();
857 mn_now = get_clock (); 911 mn_now = get_clock ();
858 now_floor = mn_now; 912 now_floor = mn_now;
859 rtmn_diff = ev_rt_now - mn_now; 913 rtmn_diff = ev_rt_now - mn_now;
860 914
915 /* pid check not overridable via env */
916#ifndef _WIN32
917 if (flags & EVFLAG_FORKCHECK)
918 curpid = getpid ();
919#endif
920
861 if (!(flags & EVFLAG_NOENV) 921 if (!(flags & EVFLAG_NOENV)
862 && !enable_secure () 922 && !enable_secure ()
863 && getenv ("LIBEV_FLAGS")) 923 && getenv ("LIBEV_FLAGS"))
864 flags = atoi (getenv ("LIBEV_FLAGS")); 924 flags = atoi (getenv ("LIBEV_FLAGS"));
865 925
866 if (!(flags & 0x0000ffffUL)) 926 if (!(flags & 0x0000ffffUL))
867 flags |= ev_recommended_backends (); 927 flags |= ev_recommended_backends ();
868 928
869 backend = 0; 929 backend = 0;
930 backend_fd = -1;
931#if EV_USE_INOTIFY
932 fs_fd = -2;
933#endif
934
870#if EV_USE_PORT 935#if EV_USE_PORT
871 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 936 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
872#endif 937#endif
873#if EV_USE_KQUEUE 938#if EV_USE_KQUEUE
874 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 939 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
886 ev_init (&sigev, sigcb); 951 ev_init (&sigev, sigcb);
887 ev_set_priority (&sigev, EV_MAXPRI); 952 ev_set_priority (&sigev, EV_MAXPRI);
888 } 953 }
889} 954}
890 955
891static void 956static void noinline
892loop_destroy (EV_P) 957loop_destroy (EV_P)
893{ 958{
894 int i; 959 int i;
960
961#if EV_USE_INOTIFY
962 if (fs_fd >= 0)
963 close (fs_fd);
964#endif
965
966 if (backend_fd >= 0)
967 close (backend_fd);
895 968
896#if EV_USE_PORT 969#if EV_USE_PORT
897 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 970 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
898#endif 971#endif
899#if EV_USE_KQUEUE 972#if EV_USE_KQUEUE
… …
923 array_free (check, EMPTY0); 996 array_free (check, EMPTY0);
924 997
925 backend = 0; 998 backend = 0;
926} 999}
927 1000
928static void 1001void inline_size infy_fork (EV_P);
1002
1003void inline_size
929loop_fork (EV_P) 1004loop_fork (EV_P)
930{ 1005{
931#if EV_USE_PORT 1006#if EV_USE_PORT
932 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1007 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
933#endif 1008#endif
934#if EV_USE_KQUEUE 1009#if EV_USE_KQUEUE
935 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1010 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
936#endif 1011#endif
937#if EV_USE_EPOLL 1012#if EV_USE_EPOLL
938 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1013 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1014#endif
1015#if EV_USE_INOTIFY
1016 infy_fork (EV_A);
939#endif 1017#endif
940 1018
941 if (ev_is_active (&sigev)) 1019 if (ev_is_active (&sigev))
942 { 1020 {
943 /* default loop */ 1021 /* default loop */
… …
1083 { 1161 {
1084 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1162 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1085 1163
1086 if (expect_true (p->w)) 1164 if (expect_true (p->w))
1087 { 1165 {
1088 assert (("non-pending watcher on pending list", p->w->pending)); 1166 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1089 1167
1090 p->w->pending = 0; 1168 p->w->pending = 0;
1091 EV_CB_INVOKE (p->w, p->events); 1169 EV_CB_INVOKE (p->w, p->events);
1092 } 1170 }
1093 } 1171 }
… …
1098{ 1176{
1099 while (timercnt && ((WT)timers [0])->at <= mn_now) 1177 while (timercnt && ((WT)timers [0])->at <= mn_now)
1100 { 1178 {
1101 ev_timer *w = timers [0]; 1179 ev_timer *w = timers [0];
1102 1180
1103 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1181 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1104 1182
1105 /* first reschedule or stop timer */ 1183 /* first reschedule or stop timer */
1106 if (w->repeat) 1184 if (w->repeat)
1107 { 1185 {
1108 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1186 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1126{ 1204{
1127 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1205 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1128 { 1206 {
1129 ev_periodic *w = periodics [0]; 1207 ev_periodic *w = periodics [0];
1130 1208
1131 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1209 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1132 1210
1133 /* first reschedule or stop timer */ 1211 /* first reschedule or stop timer */
1134 if (w->reschedule_cb) 1212 if (w->reschedule_cb)
1135 { 1213 {
1136 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1214 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
… …
1203 ev_tstamp odiff = rtmn_diff; 1281 ev_tstamp odiff = rtmn_diff;
1204 1282
1205 /* loop a few times, before making important decisions. 1283 /* loop a few times, before making important decisions.
1206 * on the choice of "4": one iteration isn't enough, 1284 * on the choice of "4": one iteration isn't enough,
1207 * in case we get preempted during the calls to 1285 * in case we get preempted during the calls to
1208 * ev_time and get_clock. a second call is almost guarenteed 1286 * ev_time and get_clock. a second call is almost guaranteed
1209 * to succeed in that case, though. and looping a few more times 1287 * to succeed in that case, though. and looping a few more times
1210 * doesn't hurt either as we only do this on time-jumps or 1288 * doesn't hurt either as we only do this on time-jumps or
1211 * in the unlikely event of getting preempted here. 1289 * in the unlikely event of having been preempted here.
1212 */ 1290 */
1213 for (i = 4; --i; ) 1291 for (i = 4; --i; )
1214 { 1292 {
1215 rtmn_diff = ev_rt_now - mn_now; 1293 rtmn_diff = ev_rt_now - mn_now;
1216 1294
… …
1238 { 1316 {
1239#if EV_PERIODIC_ENABLE 1317#if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1318 periodics_reschedule (EV_A);
1241#endif 1319#endif
1242 1320
1243 /* adjust timers. this is easy, as the offset is the same for all */ 1321 /* adjust timers. this is easy, as the offset is the same for all of them */
1244 for (i = 0; i < timercnt; ++i) 1322 for (i = 0; i < timercnt; ++i)
1245 ((WT)timers [i])->at += ev_rt_now - mn_now; 1323 ((WT)timers [i])->at += ev_rt_now - mn_now;
1246 } 1324 }
1247 1325
1248 mn_now = ev_rt_now; 1326 mn_now = ev_rt_now;
… …
1268{ 1346{
1269 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1347 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1270 ? EVUNLOOP_ONE 1348 ? EVUNLOOP_ONE
1271 : EVUNLOOP_CANCEL; 1349 : EVUNLOOP_CANCEL;
1272 1350
1273 while (activecnt) 1351 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1352
1353 do
1274 { 1354 {
1355#ifndef _WIN32
1356 if (expect_false (curpid)) /* penalise the forking check even more */
1357 if (expect_false (getpid () != curpid))
1358 {
1359 curpid = getpid ();
1360 postfork = 1;
1361 }
1362#endif
1363
1364#if EV_FORK_ENABLE
1365 /* we might have forked, so queue fork handlers */
1366 if (expect_false (postfork))
1367 if (forkcnt)
1368 {
1369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1370 call_pending (EV_A);
1371 }
1372#endif
1373
1275 /* queue check watchers (and execute them) */ 1374 /* queue check watchers (and execute them) */
1276 if (expect_false (preparecnt)) 1375 if (expect_false (preparecnt))
1277 { 1376 {
1278 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1377 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1279 call_pending (EV_A); 1378 call_pending (EV_A);
1280 } 1379 }
1281 1380
1381 if (expect_false (!activecnt))
1382 break;
1383
1282 /* we might have forked, so reify kernel state if necessary */ 1384 /* we might have forked, so reify kernel state if necessary */
1283 if (expect_false (postfork)) 1385 if (expect_false (postfork))
1284 loop_fork (EV_A); 1386 loop_fork (EV_A);
1285 1387
1286 /* update fd-related kernel structures */ 1388 /* update fd-related kernel structures */
1287 fd_reify (EV_A); 1389 fd_reify (EV_A);
1288 1390
1289 /* calculate blocking time */ 1391 /* calculate blocking time */
1290 { 1392 {
1291 double block; 1393 ev_tstamp block;
1292 1394
1293 if (flags & EVLOOP_NONBLOCK || idlecnt) 1395 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt))
1294 block = 0.; /* do not block at all */ 1396 block = 0.; /* do not block at all */
1295 else 1397 else
1296 { 1398 {
1297 /* update time to cancel out callback processing overhead */ 1399 /* update time to cancel out callback processing overhead */
1298#if EV_USE_MONOTONIC 1400#if EV_USE_MONOTONIC
… …
1322#endif 1424#endif
1323 1425
1324 if (expect_false (block < 0.)) block = 0.; 1426 if (expect_false (block < 0.)) block = 0.;
1325 } 1427 }
1326 1428
1429 ++loop_count;
1327 backend_poll (EV_A_ block); 1430 backend_poll (EV_A_ block);
1328 } 1431 }
1329 1432
1330 /* update ev_rt_now, do magic */ 1433 /* update ev_rt_now, do magic */
1331 time_update (EV_A); 1434 time_update (EV_A);
… …
1344 if (expect_false (checkcnt)) 1447 if (expect_false (checkcnt))
1345 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1448 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1346 1449
1347 call_pending (EV_A); 1450 call_pending (EV_A);
1348 1451
1349 if (expect_false (loop_done))
1350 break;
1351 } 1452 }
1453 while (expect_true (activecnt && !loop_done));
1352 1454
1353 if (loop_done == EVUNLOOP_ONE) 1455 if (loop_done == EVUNLOOP_ONE)
1354 loop_done = EVUNLOOP_CANCEL; 1456 loop_done = EVUNLOOP_CANCEL;
1355} 1457}
1356 1458
… …
1458 ev_start (EV_A_ (W)w, ++timercnt); 1560 ev_start (EV_A_ (W)w, ++timercnt);
1459 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1561 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1460 timers [timercnt - 1] = w; 1562 timers [timercnt - 1] = w;
1461 upheap ((WT *)timers, timercnt - 1); 1563 upheap ((WT *)timers, timercnt - 1);
1462 1564
1463 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1565 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1464} 1566}
1465 1567
1466void 1568void
1467ev_timer_stop (EV_P_ ev_timer *w) 1569ev_timer_stop (EV_P_ ev_timer *w)
1468{ 1570{
… …
1470 if (expect_false (!ev_is_active (w))) 1572 if (expect_false (!ev_is_active (w)))
1471 return; 1573 return;
1472 1574
1473 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1575 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1474 1576
1577 {
1578 int active = ((W)w)->active;
1579
1475 if (expect_true (((W)w)->active < timercnt--)) 1580 if (expect_true (--active < --timercnt))
1476 { 1581 {
1477 timers [((W)w)->active - 1] = timers [timercnt]; 1582 timers [active] = timers [timercnt];
1478 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1583 adjustheap ((WT *)timers, timercnt, active);
1479 } 1584 }
1585 }
1480 1586
1481 ((WT)w)->at -= mn_now; 1587 ((WT)w)->at -= mn_now;
1482 1588
1483 ev_stop (EV_A_ (W)w); 1589 ev_stop (EV_A_ (W)w);
1484} 1590}
… …
1522 ev_start (EV_A_ (W)w, ++periodiccnt); 1628 ev_start (EV_A_ (W)w, ++periodiccnt);
1523 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1629 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1524 periodics [periodiccnt - 1] = w; 1630 periodics [periodiccnt - 1] = w;
1525 upheap ((WT *)periodics, periodiccnt - 1); 1631 upheap ((WT *)periodics, periodiccnt - 1);
1526 1632
1527 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1633 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1528} 1634}
1529 1635
1530void 1636void
1531ev_periodic_stop (EV_P_ ev_periodic *w) 1637ev_periodic_stop (EV_P_ ev_periodic *w)
1532{ 1638{
… …
1534 if (expect_false (!ev_is_active (w))) 1640 if (expect_false (!ev_is_active (w)))
1535 return; 1641 return;
1536 1642
1537 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1643 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1538 1644
1645 {
1646 int active = ((W)w)->active;
1647
1539 if (expect_true (((W)w)->active < periodiccnt--)) 1648 if (expect_true (--active < --periodiccnt))
1540 { 1649 {
1541 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1650 periodics [active] = periodics [periodiccnt];
1542 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1651 adjustheap ((WT *)periodics, periodiccnt, active);
1543 } 1652 }
1653 }
1544 1654
1545 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1546} 1656}
1547 1657
1548void 1658void
… …
1551 /* TODO: use adjustheap and recalculation */ 1661 /* TODO: use adjustheap and recalculation */
1552 ev_periodic_stop (EV_A_ w); 1662 ev_periodic_stop (EV_A_ w);
1553 ev_periodic_start (EV_A_ w); 1663 ev_periodic_start (EV_A_ w);
1554} 1664}
1555#endif 1665#endif
1556
1557void
1558ev_idle_start (EV_P_ ev_idle *w)
1559{
1560 if (expect_false (ev_is_active (w)))
1561 return;
1562
1563 ev_start (EV_A_ (W)w, ++idlecnt);
1564 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1565 idles [idlecnt - 1] = w;
1566}
1567
1568void
1569ev_idle_stop (EV_P_ ev_idle *w)
1570{
1571 ev_clear_pending (EV_A_ (W)w);
1572 if (expect_false (!ev_is_active (w)))
1573 return;
1574
1575 {
1576 int active = ((W)w)->active;
1577 idles [active - 1] = idles [--idlecnt];
1578 ((W)idles [active - 1])->active = active;
1579 }
1580
1581 ev_stop (EV_A_ (W)w);
1582}
1583
1584void
1585ev_prepare_start (EV_P_ ev_prepare *w)
1586{
1587 if (expect_false (ev_is_active (w)))
1588 return;
1589
1590 ev_start (EV_A_ (W)w, ++preparecnt);
1591 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1592 prepares [preparecnt - 1] = w;
1593}
1594
1595void
1596ev_prepare_stop (EV_P_ ev_prepare *w)
1597{
1598 ev_clear_pending (EV_A_ (W)w);
1599 if (expect_false (!ev_is_active (w)))
1600 return;
1601
1602 {
1603 int active = ((W)w)->active;
1604 prepares [active - 1] = prepares [--preparecnt];
1605 ((W)prepares [active - 1])->active = active;
1606 }
1607
1608 ev_stop (EV_A_ (W)w);
1609}
1610
1611void
1612ev_check_start (EV_P_ ev_check *w)
1613{
1614 if (expect_false (ev_is_active (w)))
1615 return;
1616
1617 ev_start (EV_A_ (W)w, ++checkcnt);
1618 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1619 checks [checkcnt - 1] = w;
1620}
1621
1622void
1623ev_check_stop (EV_P_ ev_check *w)
1624{
1625 ev_clear_pending (EV_A_ (W)w);
1626 if (expect_false (!ev_is_active (w)))
1627 return;
1628
1629 {
1630 int active = ((W)w)->active;
1631 checks [active - 1] = checks [--checkcnt];
1632 ((W)checks [active - 1])->active = active;
1633 }
1634
1635 ev_stop (EV_A_ (W)w);
1636}
1637 1666
1638#ifndef SA_RESTART 1667#ifndef SA_RESTART
1639# define SA_RESTART 0 1668# define SA_RESTART 0
1640#endif 1669#endif
1641 1670
… …
1690#endif 1719#endif
1691 if (expect_false (ev_is_active (w))) 1720 if (expect_false (ev_is_active (w)))
1692 return; 1721 return;
1693 1722
1694 ev_start (EV_A_ (W)w, 1); 1723 ev_start (EV_A_ (W)w, 1);
1695 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1724 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1696} 1725}
1697 1726
1698void 1727void
1699ev_child_stop (EV_P_ ev_child *w) 1728ev_child_stop (EV_P_ ev_child *w)
1700{ 1729{
1701 ev_clear_pending (EV_A_ (W)w); 1730 ev_clear_pending (EV_A_ (W)w);
1702 if (expect_false (!ev_is_active (w))) 1731 if (expect_false (!ev_is_active (w)))
1703 return; 1732 return;
1704 1733
1705 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1734 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1735 ev_stop (EV_A_ (W)w);
1736}
1737
1738#if EV_STAT_ENABLE
1739
1740# ifdef _WIN32
1741# undef lstat
1742# define lstat(a,b) _stati64 (a,b)
1743# endif
1744
1745#define DEF_STAT_INTERVAL 5.0074891
1746#define MIN_STAT_INTERVAL 0.1074891
1747
1748static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1749
1750#if EV_USE_INOTIFY
1751# define EV_INOTIFY_BUFSIZE 8192
1752
1753static void noinline
1754infy_add (EV_P_ ev_stat *w)
1755{
1756 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);
1757
1758 if (w->wd < 0)
1759 {
1760 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1761
1762 /* monitor some parent directory for speedup hints */
1763 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1764 {
1765 char path [4096];
1766 strcpy (path, w->path);
1767
1768 do
1769 {
1770 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1771 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1772
1773 char *pend = strrchr (path, '/');
1774
1775 if (!pend)
1776 break; /* whoops, no '/', complain to your admin */
1777
1778 *pend = 0;
1779 w->wd = inotify_add_watch (fs_fd, path, mask);
1780 }
1781 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1782 }
1783 }
1784 else
1785 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1786
1787 if (w->wd >= 0)
1788 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1789}
1790
1791static void noinline
1792infy_del (EV_P_ ev_stat *w)
1793{
1794 int slot;
1795 int wd = w->wd;
1796
1797 if (wd < 0)
1798 return;
1799
1800 w->wd = -2;
1801 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1802 wlist_del (&fs_hash [slot].head, (WL)w);
1803
1804 /* remove this watcher, if others are watching it, they will rearm */
1805 inotify_rm_watch (fs_fd, wd);
1806}
1807
1808static void noinline
1809infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1810{
1811 if (slot < 0)
1812 /* overflow, need to check for all hahs slots */
1813 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1814 infy_wd (EV_A_ slot, wd, ev);
1815 else
1816 {
1817 WL w_;
1818
1819 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1820 {
1821 ev_stat *w = (ev_stat *)w_;
1822 w_ = w_->next; /* lets us remove this watcher and all before it */
1823
1824 if (w->wd == wd || wd == -1)
1825 {
1826 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1827 {
1828 w->wd = -1;
1829 infy_add (EV_A_ w); /* re-add, no matter what */
1830 }
1831
1832 stat_timer_cb (EV_A_ &w->timer, 0);
1833 }
1834 }
1835 }
1836}
1837
1838static void
1839infy_cb (EV_P_ ev_io *w, int revents)
1840{
1841 char buf [EV_INOTIFY_BUFSIZE];
1842 struct inotify_event *ev = (struct inotify_event *)buf;
1843 int ofs;
1844 int len = read (fs_fd, buf, sizeof (buf));
1845
1846 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1847 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1848}
1849
1850void inline_size
1851infy_init (EV_P)
1852{
1853 if (fs_fd != -2)
1854 return;
1855
1856 fs_fd = inotify_init ();
1857
1858 if (fs_fd >= 0)
1859 {
1860 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1861 ev_set_priority (&fs_w, EV_MAXPRI);
1862 ev_io_start (EV_A_ &fs_w);
1863 }
1864}
1865
1866void inline_size
1867infy_fork (EV_P)
1868{
1869 int slot;
1870
1871 if (fs_fd < 0)
1872 return;
1873
1874 close (fs_fd);
1875 fs_fd = inotify_init ();
1876
1877 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1878 {
1879 WL w_ = fs_hash [slot].head;
1880 fs_hash [slot].head = 0;
1881
1882 while (w_)
1883 {
1884 ev_stat *w = (ev_stat *)w_;
1885 w_ = w_->next; /* lets us add this watcher */
1886
1887 w->wd = -1;
1888
1889 if (fs_fd >= 0)
1890 infy_add (EV_A_ w); /* re-add, no matter what */
1891 else
1892 ev_timer_start (EV_A_ &w->timer);
1893 }
1894
1895 }
1896}
1897
1898#endif
1899
1900void
1901ev_stat_stat (EV_P_ ev_stat *w)
1902{
1903 if (lstat (w->path, &w->attr) < 0)
1904 w->attr.st_nlink = 0;
1905 else if (!w->attr.st_nlink)
1906 w->attr.st_nlink = 1;
1907}
1908
1909static void noinline
1910stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1911{
1912 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1913
1914 /* we copy this here each the time so that */
1915 /* prev has the old value when the callback gets invoked */
1916 w->prev = w->attr;
1917 ev_stat_stat (EV_A_ w);
1918
1919 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1920 if (
1921 w->prev.st_dev != w->attr.st_dev
1922 || w->prev.st_ino != w->attr.st_ino
1923 || w->prev.st_mode != w->attr.st_mode
1924 || w->prev.st_nlink != w->attr.st_nlink
1925 || w->prev.st_uid != w->attr.st_uid
1926 || w->prev.st_gid != w->attr.st_gid
1927 || w->prev.st_rdev != w->attr.st_rdev
1928 || w->prev.st_size != w->attr.st_size
1929 || w->prev.st_atime != w->attr.st_atime
1930 || w->prev.st_mtime != w->attr.st_mtime
1931 || w->prev.st_ctime != w->attr.st_ctime
1932 ) {
1933 #if EV_USE_INOTIFY
1934 infy_del (EV_A_ w);
1935 infy_add (EV_A_ w);
1936 ev_stat_stat (EV_A_ w); /* avoid race... */
1937 #endif
1938
1939 ev_feed_event (EV_A_ w, EV_STAT);
1940 }
1941}
1942
1943void
1944ev_stat_start (EV_P_ ev_stat *w)
1945{
1946 if (expect_false (ev_is_active (w)))
1947 return;
1948
1949 /* since we use memcmp, we need to clear any padding data etc. */
1950 memset (&w->prev, 0, sizeof (ev_statdata));
1951 memset (&w->attr, 0, sizeof (ev_statdata));
1952
1953 ev_stat_stat (EV_A_ w);
1954
1955 if (w->interval < MIN_STAT_INTERVAL)
1956 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1957
1958 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1959 ev_set_priority (&w->timer, ev_priority (w));
1960
1961#if EV_USE_INOTIFY
1962 infy_init (EV_A);
1963
1964 if (fs_fd >= 0)
1965 infy_add (EV_A_ w);
1966 else
1967#endif
1968 ev_timer_start (EV_A_ &w->timer);
1969
1970 ev_start (EV_A_ (W)w, 1);
1971}
1972
1973void
1974ev_stat_stop (EV_P_ ev_stat *w)
1975{
1976 ev_clear_pending (EV_A_ (W)w);
1977 if (expect_false (!ev_is_active (w)))
1978 return;
1979
1980#if EV_USE_INOTIFY
1981 infy_del (EV_A_ w);
1982#endif
1983 ev_timer_stop (EV_A_ &w->timer);
1984
1985 ev_stop (EV_A_ (W)w);
1986}
1987#endif
1988
1989void
1990ev_idle_start (EV_P_ ev_idle *w)
1991{
1992 if (expect_false (ev_is_active (w)))
1993 return;
1994
1995 ev_start (EV_A_ (W)w, ++idlecnt);
1996 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1997 idles [idlecnt - 1] = w;
1998}
1999
2000void
2001ev_idle_stop (EV_P_ ev_idle *w)
2002{
2003 ev_clear_pending (EV_A_ (W)w);
2004 if (expect_false (!ev_is_active (w)))
2005 return;
2006
2007 {
2008 int active = ((W)w)->active;
2009 idles [active - 1] = idles [--idlecnt];
2010 ((W)idles [active - 1])->active = active;
2011 }
2012
2013 ev_stop (EV_A_ (W)w);
2014}
2015
2016void
2017ev_prepare_start (EV_P_ ev_prepare *w)
2018{
2019 if (expect_false (ev_is_active (w)))
2020 return;
2021
2022 ev_start (EV_A_ (W)w, ++preparecnt);
2023 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2024 prepares [preparecnt - 1] = w;
2025}
2026
2027void
2028ev_prepare_stop (EV_P_ ev_prepare *w)
2029{
2030 ev_clear_pending (EV_A_ (W)w);
2031 if (expect_false (!ev_is_active (w)))
2032 return;
2033
2034 {
2035 int active = ((W)w)->active;
2036 prepares [active - 1] = prepares [--preparecnt];
2037 ((W)prepares [active - 1])->active = active;
2038 }
2039
2040 ev_stop (EV_A_ (W)w);
2041}
2042
2043void
2044ev_check_start (EV_P_ ev_check *w)
2045{
2046 if (expect_false (ev_is_active (w)))
2047 return;
2048
2049 ev_start (EV_A_ (W)w, ++checkcnt);
2050 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2051 checks [checkcnt - 1] = w;
2052}
2053
2054void
2055ev_check_stop (EV_P_ ev_check *w)
2056{
2057 ev_clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w)))
2059 return;
2060
2061 {
2062 int active = ((W)w)->active;
2063 checks [active - 1] = checks [--checkcnt];
2064 ((W)checks [active - 1])->active = active;
2065 }
2066
1706 ev_stop (EV_A_ (W)w); 2067 ev_stop (EV_A_ (W)w);
1707} 2068}
1708 2069
1709#if EV_EMBED_ENABLE 2070#if EV_EMBED_ENABLE
1710void noinline 2071void noinline
… …
1753 2114
1754 ev_stop (EV_A_ (W)w); 2115 ev_stop (EV_A_ (W)w);
1755} 2116}
1756#endif 2117#endif
1757 2118
1758#if EV_STAT_ENABLE 2119#if EV_FORK_ENABLE
1759
1760# ifdef _WIN32
1761# define lstat(a,b) stat(a,b)
1762# endif
1763
1764void 2120void
1765ev_stat_stat (EV_P_ ev_stat *w)
1766{
1767 if (lstat (w->path, &w->attr) < 0)
1768 w->attr.st_nlink = 0;
1769 else if (!w->attr.st_nlink)
1770 w->attr.st_nlink = 1;
1771}
1772
1773static void
1774stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1775{
1776 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1777
1778 /* we copy this here each the time so that */
1779 /* prev has the old value when the callback gets invoked */
1780 w->prev = w->attr;
1781 ev_stat_stat (EV_A_ w);
1782
1783 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1784 ev_feed_event (EV_A_ w, EV_STAT);
1785}
1786
1787void
1788ev_stat_start (EV_P_ ev_stat *w) 2121ev_fork_start (EV_P_ ev_fork *w)
1789{ 2122{
1790 if (expect_false (ev_is_active (w))) 2123 if (expect_false (ev_is_active (w)))
1791 return; 2124 return;
1792 2125
1793 /* since we use memcmp, we need to clear any padding data etc. */
1794 memset (&w->prev, 0, sizeof (ev_statdata));
1795 memset (&w->attr, 0, sizeof (ev_statdata));
1796
1797 ev_stat_stat (EV_A_ w);
1798
1799 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1800 ev_set_priority (&w->timer, ev_priority (w));
1801 ev_timer_start (EV_A_ &w->timer);
1802
1803 ev_start (EV_A_ (W)w, 1); 2126 ev_start (EV_A_ (W)w, ++forkcnt);
2127 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2128 forks [forkcnt - 1] = w;
1804} 2129}
1805 2130
1806void 2131void
1807ev_stat_stop (EV_P_ ev_stat *w) 2132ev_fork_stop (EV_P_ ev_fork *w)
1808{ 2133{
1809 ev_clear_pending (EV_A_ (W)w); 2134 ev_clear_pending (EV_A_ (W)w);
1810 if (expect_false (!ev_is_active (w))) 2135 if (expect_false (!ev_is_active (w)))
1811 return; 2136 return;
1812 2137
1813 ev_timer_stop (EV_A_ &w->timer); 2138 {
2139 int active = ((W)w)->active;
2140 forks [active - 1] = forks [--forkcnt];
2141 ((W)forks [active - 1])->active = active;
2142 }
1814 2143
1815 ev_stop (EV_A_ (W)w); 2144 ev_stop (EV_A_ (W)w);
1816} 2145}
1817#endif 2146#endif
1818 2147

Diff Legend

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