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

Comparing libev/ev.c (file contents):
Revision 1.153 by root, Wed Nov 28 11:41:18 2007 UTC vs.
Revision 1.178 by root, Tue Dec 11 18:36:11 2007 UTC

… …
216# include <sys/inotify.h> 216# include <sys/inotify.h>
217#endif 217#endif
218 218
219/**/ 219/**/
220 220
221/*
222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding
225 * errors are against us.
226 * This value is good at least till the year 4000.
227 * Better solutions welcome.
228 */
229#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
230
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 234
225#if __GNUC__ >= 3 235#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 238#else
236# define expect(expr,value) (expr) 239# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 240# define noinline
241# if __STDC_VERSION__ < 199901L
242# define inline
243# endif
240#endif 244#endif
241 245
242#define expect_false(expr) expect ((expr) != 0, 0) 246#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 247#define expect_true(expr) expect ((expr) != 0, 1)
248#define inline_size static inline
249
250#if EV_MINIMAL
251# define inline_speed static noinline
252#else
253# define inline_speed static inline
254#endif
244 255
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 256#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 257#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 258
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 259#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 260#define EMPTY2(a,b) /* used to suppress some warnings */
250 261
251typedef ev_watcher *W; 262typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 263typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 264typedef ev_watcher_time *WT;
… …
281 perror (msg); 292 perror (msg);
282 abort (); 293 abort ();
283 } 294 }
284} 295}
285 296
286static void *(*alloc)(void *ptr, size_t size) = realloc; 297static void *(*alloc)(void *ptr, long size);
287 298
288void 299void
289ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 300ev_set_allocator (void *(*cb)(void *ptr, long size))
290{ 301{
291 alloc = cb; 302 alloc = cb;
292} 303}
293 304
294inline_speed void * 305inline_speed void *
295ev_realloc (void *ptr, size_t size) 306ev_realloc (void *ptr, long size)
296{ 307{
297 ptr = alloc (ptr, size); 308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
298 309
299 if (!ptr && size) 310 if (!ptr && size)
300 { 311 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size); 312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort (); 313 abort ();
303 } 314 }
304 315
305 return ptr; 316 return ptr;
306} 317}
… …
324{ 335{
325 W w; 336 W w;
326 int events; 337 int events;
327} ANPENDING; 338} ANPENDING;
328 339
340#if EV_USE_INOTIFY
329typedef struct 341typedef struct
330{ 342{
331#if EV_USE_INOTIFY
332 WL head; 343 WL head;
333#endif
334} ANFS; 344} ANFS;
345#endif
335 346
336#if EV_MULTIPLICITY 347#if EV_MULTIPLICITY
337 348
338 struct ev_loop 349 struct ev_loop
339 { 350 {
… …
396{ 407{
397 return ev_rt_now; 408 return ev_rt_now;
398} 409}
399#endif 410#endif
400 411
401#define array_roundsize(type,n) (((n) | 4) & ~3) 412int inline_size
413array_nextsize (int elem, int cur, int cnt)
414{
415 int ncur = cur + 1;
416
417 do
418 ncur <<= 1;
419 while (cnt > ncur);
420
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096)
423 {
424 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
426 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem;
428 }
429
430 return ncur;
431}
432
433static noinline void *
434array_realloc (int elem, void *base, int *cur, int cnt)
435{
436 *cur = array_nextsize (elem, *cur, cnt);
437 return ev_realloc (base, elem * *cur);
438}
402 439
403#define array_needsize(type,base,cur,cnt,init) \ 440#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 441 if (expect_false ((cnt) > (cur))) \
405 { \ 442 { \
406 int newcnt = cur; \ 443 int ocur_ = (cur); \
407 do \ 444 (base) = (type *)array_realloc \
408 { \ 445 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 446 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 447 }
417 448
449#if 0
418#define array_slim(type,stem) \ 450#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 451 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 452 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 453 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 454 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 455 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 456 }
457#endif
425 458
426#define array_free(stem, idx) \ 459#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 460 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 461
429/*****************************************************************************/ 462/*****************************************************************************/
430 463
431void noinline 464void noinline
432ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
433{ 466{
434 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
435 469
436 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
437 { 473 {
474 w_->pending = ++pendingcnt [pri];
475 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
476 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 478 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 479}
447 480
448void inline_size 481void inline_size
449queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 483{
… …
485} 518}
486 519
487void 520void
488ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 522{
523 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
491} 525}
492 526
493void inline_size 527void inline_size
494fd_reify (EV_P) 528fd_reify (EV_P)
495{ 529{
… …
589static void noinline 623static void noinline
590fd_rearm_all (EV_P) 624fd_rearm_all (EV_P)
591{ 625{
592 int fd; 626 int fd;
593 627
594 /* this should be highly optimised to not do anything but set a flag */
595 for (fd = 0; fd < anfdmax; ++fd) 628 for (fd = 0; fd < anfdmax; ++fd)
596 if (anfds [fd].events) 629 if (anfds [fd].events)
597 { 630 {
598 anfds [fd].events = 0; 631 anfds [fd].events = 0;
599 fd_change (EV_A_ fd); 632 fd_change (EV_A_ fd);
… …
726 for (signum = signalmax; signum--; ) 759 for (signum = signalmax; signum--; )
727 if (signals [signum].gotsig) 760 if (signals [signum].gotsig)
728 ev_feed_signal_event (EV_A_ signum + 1); 761 ev_feed_signal_event (EV_A_ signum + 1);
729} 762}
730 763
731void inline_size 764void inline_speed
732fd_intern (int fd) 765fd_intern (int fd)
733{ 766{
734#ifdef _WIN32 767#ifdef _WIN32
735 int arg = 1; 768 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 769 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
765 ev_child *w; 798 ev_child *w;
766 799
767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 800 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
768 if (w->pid == pid || !w->pid) 801 if (w->pid == pid || !w->pid)
769 { 802 {
770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 803 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
771 w->rpid = pid; 804 w->rpid = pid;
772 w->rstatus = status; 805 w->rstatus = status;
773 ev_feed_event (EV_A_ (W)w, EV_CHILD); 806 ev_feed_event (EV_A_ (W)w, EV_CHILD);
774 } 807 }
775} 808}
776 809
777#ifndef WCONTINUED 810#ifndef WCONTINUED
… …
887ev_backend (EV_P) 920ev_backend (EV_P)
888{ 921{
889 return backend; 922 return backend;
890} 923}
891 924
925unsigned int
926ev_loop_count (EV_P)
927{
928 return loop_count;
929}
930
892static void noinline 931static void noinline
893loop_init (EV_P_ unsigned int flags) 932loop_init (EV_P_ unsigned int flags)
894{ 933{
895 if (!backend) 934 if (!backend)
896 { 935 {
… …
905 ev_rt_now = ev_time (); 944 ev_rt_now = ev_time ();
906 mn_now = get_clock (); 945 mn_now = get_clock ();
907 now_floor = mn_now; 946 now_floor = mn_now;
908 rtmn_diff = ev_rt_now - mn_now; 947 rtmn_diff = ev_rt_now - mn_now;
909 948
949 /* pid check not overridable via env */
950#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid ();
953#endif
954
910 if (!(flags & EVFLAG_NOENV) 955 if (!(flags & EVFLAG_NOENV)
911 && !enable_secure () 956 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS")) 957 && getenv ("LIBEV_FLAGS"))
913 flags = atoi (getenv ("LIBEV_FLAGS")); 958 flags = atoi (getenv ("LIBEV_FLAGS"));
914 959
… …
970#if EV_USE_SELECT 1015#if EV_USE_SELECT
971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1016 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
972#endif 1017#endif
973 1018
974 for (i = NUMPRI; i--; ) 1019 for (i = NUMPRI; i--; )
1020 {
975 array_free (pending, [i]); 1021 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE
1023 array_free (idle, [i]);
1024#endif
1025 }
976 1026
977 /* have to use the microsoft-never-gets-it-right macro */ 1027 /* have to use the microsoft-never-gets-it-right macro */
978 array_free (fdchange, EMPTY0); 1028 array_free (fdchange, EMPTY);
979 array_free (timer, EMPTY0); 1029 array_free (timer, EMPTY);
980#if EV_PERIODIC_ENABLE 1030#if EV_PERIODIC_ENABLE
981 array_free (periodic, EMPTY0); 1031 array_free (periodic, EMPTY);
982#endif 1032#endif
983 array_free (idle, EMPTY0);
984 array_free (prepare, EMPTY0); 1033 array_free (prepare, EMPTY);
985 array_free (check, EMPTY0); 1034 array_free (check, EMPTY);
986 1035
987 backend = 0; 1036 backend = 0;
988} 1037}
1038
1039void inline_size infy_fork (EV_P);
989 1040
990void inline_size 1041void inline_size
991loop_fork (EV_P) 1042loop_fork (EV_P)
992{ 1043{
993#if EV_USE_PORT 1044#if EV_USE_PORT
… …
996#if EV_USE_KQUEUE 1047#if EV_USE_KQUEUE
997 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1048 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
998#endif 1049#endif
999#if EV_USE_EPOLL 1050#if EV_USE_EPOLL
1000 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1051 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1052#endif
1053#if EV_USE_INOTIFY
1054 infy_fork (EV_A);
1001#endif 1055#endif
1002 1056
1003 if (ev_is_active (&sigev)) 1057 if (ev_is_active (&sigev))
1004 { 1058 {
1005 /* default loop */ 1059 /* default loop */
… …
1121 postfork = 1; 1175 postfork = 1;
1122} 1176}
1123 1177
1124/*****************************************************************************/ 1178/*****************************************************************************/
1125 1179
1126int inline_size 1180void
1127any_pending (EV_P) 1181ev_invoke (EV_P_ void *w, int revents)
1128{ 1182{
1129 int pri; 1183 EV_CB_INVOKE ((W)w, revents);
1130
1131 for (pri = NUMPRI; pri--; )
1132 if (pendingcnt [pri])
1133 return 1;
1134
1135 return 0;
1136} 1184}
1137 1185
1138void inline_speed 1186void inline_speed
1139call_pending (EV_P) 1187call_pending (EV_P)
1140{ 1188{
… …
1193 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1194 1242
1195 /* first reschedule or stop timer */ 1243 /* first reschedule or stop timer */
1196 if (w->reschedule_cb) 1244 if (w->reschedule_cb)
1197 { 1245 {
1198 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1246 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1199 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1247 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1200 downheap ((WT *)periodics, periodiccnt, 0); 1248 downheap ((WT *)periodics, periodiccnt, 0);
1201 } 1249 }
1202 else if (w->interval) 1250 else if (w->interval)
1203 { 1251 {
1204 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1252 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1253 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1205 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1206 downheap ((WT *)periodics, periodiccnt, 0); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1207 } 1256 }
1208 else 1257 else
1209 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1223 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1224 1273
1225 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1226 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1227 else if (w->interval) 1276 else if (w->interval)
1228 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1229 } 1278 }
1230 1279
1231 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1232 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1233 downheap ((WT *)periodics, periodiccnt, i); 1282 downheap ((WT *)periodics, periodiccnt, i);
1234} 1283}
1235#endif 1284#endif
1236 1285
1286#if EV_IDLE_ENABLE
1237int inline_size 1287void inline_size
1238time_update_monotonic (EV_P) 1288idle_reify (EV_P)
1239{ 1289{
1290 if (expect_false (idleall))
1291 {
1292 int pri;
1293
1294 for (pri = NUMPRI; pri--; )
1295 {
1296 if (pendingcnt [pri])
1297 break;
1298
1299 if (idlecnt [pri])
1300 {
1301 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1302 break;
1303 }
1304 }
1305 }
1306}
1307#endif
1308
1309void inline_speed
1310time_update (EV_P_ ev_tstamp max_block)
1311{
1312 int i;
1313
1314#if EV_USE_MONOTONIC
1315 if (expect_true (have_monotonic))
1316 {
1317 ev_tstamp odiff = rtmn_diff;
1318
1240 mn_now = get_clock (); 1319 mn_now = get_clock ();
1241 1320
1321 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1322 /* interpolate in the meantime */
1242 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1323 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1243 { 1324 {
1244 ev_rt_now = rtmn_diff + mn_now; 1325 ev_rt_now = rtmn_diff + mn_now;
1245 return 0; 1326 return;
1246 } 1327 }
1247 else 1328
1248 {
1249 now_floor = mn_now; 1329 now_floor = mn_now;
1250 ev_rt_now = ev_time (); 1330 ev_rt_now = ev_time ();
1251 return 1;
1252 }
1253}
1254 1331
1255void inline_size 1332 /* loop a few times, before making important decisions.
1256time_update (EV_P) 1333 * on the choice of "4": one iteration isn't enough,
1257{ 1334 * in case we get preempted during the calls to
1258 int i; 1335 * ev_time and get_clock. a second call is almost guaranteed
1259 1336 * to succeed in that case, though. and looping a few more times
1260#if EV_USE_MONOTONIC 1337 * doesn't hurt either as we only do this on time-jumps or
1261 if (expect_true (have_monotonic)) 1338 * in the unlikely event of having been preempted here.
1262 { 1339 */
1263 if (time_update_monotonic (EV_A)) 1340 for (i = 4; --i; )
1264 { 1341 {
1265 ev_tstamp odiff = rtmn_diff;
1266
1267 /* loop a few times, before making important decisions.
1268 * on the choice of "4": one iteration isn't enough,
1269 * in case we get preempted during the calls to
1270 * ev_time and get_clock. a second call is almost guarenteed
1271 * to succeed in that case, though. and looping a few more times
1272 * doesn't hurt either as we only do this on time-jumps or
1273 * in the unlikely event of getting preempted here.
1274 */
1275 for (i = 4; --i; )
1276 {
1277 rtmn_diff = ev_rt_now - mn_now; 1342 rtmn_diff = ev_rt_now - mn_now;
1278 1343
1279 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1344 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1280 return; /* all is well */ 1345 return; /* all is well */
1281 1346
1282 ev_rt_now = ev_time (); 1347 ev_rt_now = ev_time ();
1283 mn_now = get_clock (); 1348 mn_now = get_clock ();
1284 now_floor = mn_now; 1349 now_floor = mn_now;
1285 } 1350 }
1286 1351
1287# if EV_PERIODIC_ENABLE 1352# if EV_PERIODIC_ENABLE
1288 periodics_reschedule (EV_A); 1353 periodics_reschedule (EV_A);
1289# endif 1354# endif
1290 /* no timer adjustment, as the monotonic clock doesn't jump */ 1355 /* no timer adjustment, as the monotonic clock doesn't jump */
1291 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1356 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1292 }
1293 } 1357 }
1294 else 1358 else
1295#endif 1359#endif
1296 { 1360 {
1297 ev_rt_now = ev_time (); 1361 ev_rt_now = ev_time ();
1298 1362
1299 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1363 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1300 { 1364 {
1301#if EV_PERIODIC_ENABLE 1365#if EV_PERIODIC_ENABLE
1302 periodics_reschedule (EV_A); 1366 periodics_reschedule (EV_A);
1303#endif 1367#endif
1304
1305 /* adjust timers. this is easy, as the offset is the same for all */ 1368 /* adjust timers. this is easy, as the offset is the same for all of them */
1306 for (i = 0; i < timercnt; ++i) 1369 for (i = 0; i < timercnt; ++i)
1307 ((WT)timers [i])->at += ev_rt_now - mn_now; 1370 ((WT)timers [i])->at += ev_rt_now - mn_now;
1308 } 1371 }
1309 1372
1310 mn_now = ev_rt_now; 1373 mn_now = ev_rt_now;
… …
1330{ 1393{
1331 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1394 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1332 ? EVUNLOOP_ONE 1395 ? EVUNLOOP_ONE
1333 : EVUNLOOP_CANCEL; 1396 : EVUNLOOP_CANCEL;
1334 1397
1335 while (activecnt) 1398 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1399
1400 do
1336 { 1401 {
1337 /* we might have forked, so reify kernel state if necessary */ 1402#ifndef _WIN32
1403 if (expect_false (curpid)) /* penalise the forking check even more */
1404 if (expect_false (getpid () != curpid))
1405 {
1406 curpid = getpid ();
1407 postfork = 1;
1408 }
1409#endif
1410
1338 #if EV_FORK_ENABLE 1411#if EV_FORK_ENABLE
1412 /* we might have forked, so queue fork handlers */
1339 if (expect_false (postfork)) 1413 if (expect_false (postfork))
1340 if (forkcnt) 1414 if (forkcnt)
1341 { 1415 {
1342 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1416 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1343 call_pending (EV_A); 1417 call_pending (EV_A);
1344 } 1418 }
1345 #endif 1419#endif
1346 1420
1347 /* queue check watchers (and execute them) */ 1421 /* queue prepare watchers (and execute them) */
1348 if (expect_false (preparecnt)) 1422 if (expect_false (preparecnt))
1349 { 1423 {
1350 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1424 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1351 call_pending (EV_A); 1425 call_pending (EV_A);
1352 } 1426 }
1353 1427
1428 if (expect_false (!activecnt))
1429 break;
1430
1354 /* we might have forked, so reify kernel state if necessary */ 1431 /* we might have forked, so reify kernel state if necessary */
1355 if (expect_false (postfork)) 1432 if (expect_false (postfork))
1356 loop_fork (EV_A); 1433 loop_fork (EV_A);
1357 1434
1358 /* update fd-related kernel structures */ 1435 /* update fd-related kernel structures */
1359 fd_reify (EV_A); 1436 fd_reify (EV_A);
1360 1437
1361 /* calculate blocking time */ 1438 /* calculate blocking time */
1362 { 1439 {
1363 double block; 1440 ev_tstamp block;
1364 1441
1365 if (flags & EVLOOP_NONBLOCK || idlecnt) 1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1366 block = 0.; /* do not block at all */ 1443 block = 0.; /* do not block at all */
1367 else 1444 else
1368 { 1445 {
1369 /* update time to cancel out callback processing overhead */ 1446 /* update time to cancel out callback processing overhead */
1370#if EV_USE_MONOTONIC
1371 if (expect_true (have_monotonic))
1372 time_update_monotonic (EV_A); 1447 time_update (EV_A_ 1e100);
1373 else
1374#endif
1375 {
1376 ev_rt_now = ev_time ();
1377 mn_now = ev_rt_now;
1378 }
1379 1448
1380 block = MAX_BLOCKTIME; 1449 block = MAX_BLOCKTIME;
1381 1450
1382 if (timercnt) 1451 if (timercnt)
1383 { 1452 {
… …
1394#endif 1463#endif
1395 1464
1396 if (expect_false (block < 0.)) block = 0.; 1465 if (expect_false (block < 0.)) block = 0.;
1397 } 1466 }
1398 1467
1468 ++loop_count;
1399 backend_poll (EV_A_ block); 1469 backend_poll (EV_A_ block);
1470
1471 /* update ev_rt_now, do magic */
1472 time_update (EV_A_ block);
1400 } 1473 }
1401
1402 /* update ev_rt_now, do magic */
1403 time_update (EV_A);
1404 1474
1405 /* queue pending timers and reschedule them */ 1475 /* queue pending timers and reschedule them */
1406 timers_reify (EV_A); /* relative timers called last */ 1476 timers_reify (EV_A); /* relative timers called last */
1407#if EV_PERIODIC_ENABLE 1477#if EV_PERIODIC_ENABLE
1408 periodics_reify (EV_A); /* absolute timers called first */ 1478 periodics_reify (EV_A); /* absolute timers called first */
1409#endif 1479#endif
1410 1480
1481#if EV_IDLE_ENABLE
1411 /* queue idle watchers unless other events are pending */ 1482 /* queue idle watchers unless other events are pending */
1412 if (idlecnt && !any_pending (EV_A)) 1483 idle_reify (EV_A);
1413 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1484#endif
1414 1485
1415 /* queue check watchers, to be executed first */ 1486 /* queue check watchers, to be executed first */
1416 if (expect_false (checkcnt)) 1487 if (expect_false (checkcnt))
1417 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1488 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1418 1489
1419 call_pending (EV_A); 1490 call_pending (EV_A);
1420 1491
1421 if (expect_false (loop_done))
1422 break;
1423 } 1492 }
1493 while (expect_true (activecnt && !loop_done));
1424 1494
1425 if (loop_done == EVUNLOOP_ONE) 1495 if (loop_done == EVUNLOOP_ONE)
1426 loop_done = EVUNLOOP_CANCEL; 1496 loop_done = EVUNLOOP_CANCEL;
1427} 1497}
1428 1498
… …
1455 head = &(*head)->next; 1525 head = &(*head)->next;
1456 } 1526 }
1457} 1527}
1458 1528
1459void inline_speed 1529void inline_speed
1460ev_clear_pending (EV_P_ W w) 1530clear_pending (EV_P_ W w)
1461{ 1531{
1462 if (w->pending) 1532 if (w->pending)
1463 { 1533 {
1464 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1534 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1465 w->pending = 0; 1535 w->pending = 0;
1466 } 1536 }
1467} 1537}
1468 1538
1539int
1540ev_clear_pending (EV_P_ void *w)
1541{
1542 W w_ = (W)w;
1543 int pending = w_->pending;
1544
1545 if (expect_true (pending))
1546 {
1547 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1548 w_->pending = 0;
1549 p->w = 0;
1550 return p->events;
1551 }
1552 else
1553 return 0;
1554}
1555
1556void inline_size
1557pri_adjust (EV_P_ W w)
1558{
1559 int pri = w->priority;
1560 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1561 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1562 w->priority = pri;
1563}
1564
1469void inline_speed 1565void inline_speed
1470ev_start (EV_P_ W w, int active) 1566ev_start (EV_P_ W w, int active)
1471{ 1567{
1472 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1568 pri_adjust (EV_A_ w);
1473 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1474
1475 w->active = active; 1569 w->active = active;
1476 ev_ref (EV_A); 1570 ev_ref (EV_A);
1477} 1571}
1478 1572
1479void inline_size 1573void inline_size
… …
1483 w->active = 0; 1577 w->active = 0;
1484} 1578}
1485 1579
1486/*****************************************************************************/ 1580/*****************************************************************************/
1487 1581
1488void 1582void noinline
1489ev_io_start (EV_P_ ev_io *w) 1583ev_io_start (EV_P_ ev_io *w)
1490{ 1584{
1491 int fd = w->fd; 1585 int fd = w->fd;
1492 1586
1493 if (expect_false (ev_is_active (w))) 1587 if (expect_false (ev_is_active (w)))
… …
1500 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1594 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1501 1595
1502 fd_change (EV_A_ fd); 1596 fd_change (EV_A_ fd);
1503} 1597}
1504 1598
1505void 1599void noinline
1506ev_io_stop (EV_P_ ev_io *w) 1600ev_io_stop (EV_P_ ev_io *w)
1507{ 1601{
1508 ev_clear_pending (EV_A_ (W)w); 1602 clear_pending (EV_A_ (W)w);
1509 if (expect_false (!ev_is_active (w))) 1603 if (expect_false (!ev_is_active (w)))
1510 return; 1604 return;
1511 1605
1512 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1606 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1513 1607
… …
1515 ev_stop (EV_A_ (W)w); 1609 ev_stop (EV_A_ (W)w);
1516 1610
1517 fd_change (EV_A_ w->fd); 1611 fd_change (EV_A_ w->fd);
1518} 1612}
1519 1613
1520void 1614void noinline
1521ev_timer_start (EV_P_ ev_timer *w) 1615ev_timer_start (EV_P_ ev_timer *w)
1522{ 1616{
1523 if (expect_false (ev_is_active (w))) 1617 if (expect_false (ev_is_active (w)))
1524 return; 1618 return;
1525 1619
… …
1533 upheap ((WT *)timers, timercnt - 1); 1627 upheap ((WT *)timers, timercnt - 1);
1534 1628
1535 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1536} 1630}
1537 1631
1538void 1632void noinline
1539ev_timer_stop (EV_P_ ev_timer *w) 1633ev_timer_stop (EV_P_ ev_timer *w)
1540{ 1634{
1541 ev_clear_pending (EV_A_ (W)w); 1635 clear_pending (EV_A_ (W)w);
1542 if (expect_false (!ev_is_active (w))) 1636 if (expect_false (!ev_is_active (w)))
1543 return; 1637 return;
1544 1638
1545 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1546 1640
… …
1557 ((WT)w)->at -= mn_now; 1651 ((WT)w)->at -= mn_now;
1558 1652
1559 ev_stop (EV_A_ (W)w); 1653 ev_stop (EV_A_ (W)w);
1560} 1654}
1561 1655
1562void 1656void noinline
1563ev_timer_again (EV_P_ ev_timer *w) 1657ev_timer_again (EV_P_ ev_timer *w)
1564{ 1658{
1565 if (ev_is_active (w)) 1659 if (ev_is_active (w))
1566 { 1660 {
1567 if (w->repeat) 1661 if (w->repeat)
… …
1578 ev_timer_start (EV_A_ w); 1672 ev_timer_start (EV_A_ w);
1579 } 1673 }
1580} 1674}
1581 1675
1582#if EV_PERIODIC_ENABLE 1676#if EV_PERIODIC_ENABLE
1583void 1677void noinline
1584ev_periodic_start (EV_P_ ev_periodic *w) 1678ev_periodic_start (EV_P_ ev_periodic *w)
1585{ 1679{
1586 if (expect_false (ev_is_active (w))) 1680 if (expect_false (ev_is_active (w)))
1587 return; 1681 return;
1588 1682
… …
1590 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1684 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1591 else if (w->interval) 1685 else if (w->interval)
1592 { 1686 {
1593 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1687 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1594 /* this formula differs from the one in periodic_reify because we do not always round up */ 1688 /* this formula differs from the one in periodic_reify because we do not always round up */
1595 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1689 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1596 } 1690 }
1691 else
1692 ((WT)w)->at = w->offset;
1597 1693
1598 ev_start (EV_A_ (W)w, ++periodiccnt); 1694 ev_start (EV_A_ (W)w, ++periodiccnt);
1599 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1600 periodics [periodiccnt - 1] = w; 1696 periodics [periodiccnt - 1] = w;
1601 upheap ((WT *)periodics, periodiccnt - 1); 1697 upheap ((WT *)periodics, periodiccnt - 1);
1602 1698
1603 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1604} 1700}
1605 1701
1606void 1702void noinline
1607ev_periodic_stop (EV_P_ ev_periodic *w) 1703ev_periodic_stop (EV_P_ ev_periodic *w)
1608{ 1704{
1609 ev_clear_pending (EV_A_ (W)w); 1705 clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w))) 1706 if (expect_false (!ev_is_active (w)))
1611 return; 1707 return;
1612 1708
1613 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1614 1710
… …
1623 } 1719 }
1624 1720
1625 ev_stop (EV_A_ (W)w); 1721 ev_stop (EV_A_ (W)w);
1626} 1722}
1627 1723
1628void 1724void noinline
1629ev_periodic_again (EV_P_ ev_periodic *w) 1725ev_periodic_again (EV_P_ ev_periodic *w)
1630{ 1726{
1631 /* TODO: use adjustheap and recalculation */ 1727 /* TODO: use adjustheap and recalculation */
1632 ev_periodic_stop (EV_A_ w); 1728 ev_periodic_stop (EV_A_ w);
1633 ev_periodic_start (EV_A_ w); 1729 ev_periodic_start (EV_A_ w);
… …
1636 1732
1637#ifndef SA_RESTART 1733#ifndef SA_RESTART
1638# define SA_RESTART 0 1734# define SA_RESTART 0
1639#endif 1735#endif
1640 1736
1641void 1737void noinline
1642ev_signal_start (EV_P_ ev_signal *w) 1738ev_signal_start (EV_P_ ev_signal *w)
1643{ 1739{
1644#if EV_MULTIPLICITY 1740#if EV_MULTIPLICITY
1645 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1741 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1646#endif 1742#endif
… …
1665 sigaction (w->signum, &sa, 0); 1761 sigaction (w->signum, &sa, 0);
1666#endif 1762#endif
1667 } 1763 }
1668} 1764}
1669 1765
1670void 1766void noinline
1671ev_signal_stop (EV_P_ ev_signal *w) 1767ev_signal_stop (EV_P_ ev_signal *w)
1672{ 1768{
1673 ev_clear_pending (EV_A_ (W)w); 1769 clear_pending (EV_A_ (W)w);
1674 if (expect_false (!ev_is_active (w))) 1770 if (expect_false (!ev_is_active (w)))
1675 return; 1771 return;
1676 1772
1677 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1678 ev_stop (EV_A_ (W)w); 1774 ev_stop (EV_A_ (W)w);
… …
1695} 1791}
1696 1792
1697void 1793void
1698ev_child_stop (EV_P_ ev_child *w) 1794ev_child_stop (EV_P_ ev_child *w)
1699{ 1795{
1700 ev_clear_pending (EV_A_ (W)w); 1796 clear_pending (EV_A_ (W)w);
1701 if (expect_false (!ev_is_active (w))) 1797 if (expect_false (!ev_is_active (w)))
1702 return; 1798 return;
1703 1799
1704 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1800 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1705 ev_stop (EV_A_ (W)w); 1801 ev_stop (EV_A_ (W)w);
… …
1713# endif 1809# endif
1714 1810
1715#define DEF_STAT_INTERVAL 5.0074891 1811#define DEF_STAT_INTERVAL 5.0074891
1716#define MIN_STAT_INTERVAL 0.1074891 1812#define MIN_STAT_INTERVAL 0.1074891
1717 1813
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 1814static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719 1815
1720#if EV_USE_INOTIFY 1816#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE 8192 1817# define EV_INOTIFY_BUFSIZE 8192
1722 1818
1723static void noinline 1819static void noinline
… …
1831 ev_set_priority (&fs_w, EV_MAXPRI); 1927 ev_set_priority (&fs_w, EV_MAXPRI);
1832 ev_io_start (EV_A_ &fs_w); 1928 ev_io_start (EV_A_ &fs_w);
1833 } 1929 }
1834} 1930}
1835 1931
1932void inline_size
1933infy_fork (EV_P)
1934{
1935 int slot;
1936
1937 if (fs_fd < 0)
1938 return;
1939
1940 close (fs_fd);
1941 fs_fd = inotify_init ();
1942
1943 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1944 {
1945 WL w_ = fs_hash [slot].head;
1946 fs_hash [slot].head = 0;
1947
1948 while (w_)
1949 {
1950 ev_stat *w = (ev_stat *)w_;
1951 w_ = w_->next; /* lets us add this watcher */
1952
1953 w->wd = -1;
1954
1955 if (fs_fd >= 0)
1956 infy_add (EV_A_ w); /* re-add, no matter what */
1957 else
1958 ev_timer_start (EV_A_ &w->timer);
1959 }
1960
1961 }
1962}
1963
1836#endif 1964#endif
1837 1965
1838void 1966void
1839ev_stat_stat (EV_P_ ev_stat *w) 1967ev_stat_stat (EV_P_ ev_stat *w)
1840{ 1968{
… …
1842 w->attr.st_nlink = 0; 1970 w->attr.st_nlink = 0;
1843 else if (!w->attr.st_nlink) 1971 else if (!w->attr.st_nlink)
1844 w->attr.st_nlink = 1; 1972 w->attr.st_nlink = 1;
1845} 1973}
1846 1974
1847void noinline 1975static void noinline
1848stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1976stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1849{ 1977{
1850 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1978 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1851 1979
1852 /* we copy this here each the time so that */ 1980 /* we copy this here each the time so that */
1853 /* prev has the old value when the callback gets invoked */ 1981 /* prev has the old value when the callback gets invoked */
1854 w->prev = w->attr; 1982 w->prev = w->attr;
1855 ev_stat_stat (EV_A_ w); 1983 ev_stat_stat (EV_A_ w);
1856 1984
1857 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1985 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1986 if (
1987 w->prev.st_dev != w->attr.st_dev
1988 || w->prev.st_ino != w->attr.st_ino
1989 || w->prev.st_mode != w->attr.st_mode
1990 || w->prev.st_nlink != w->attr.st_nlink
1991 || w->prev.st_uid != w->attr.st_uid
1992 || w->prev.st_gid != w->attr.st_gid
1993 || w->prev.st_rdev != w->attr.st_rdev
1994 || w->prev.st_size != w->attr.st_size
1995 || w->prev.st_atime != w->attr.st_atime
1996 || w->prev.st_mtime != w->attr.st_mtime
1997 || w->prev.st_ctime != w->attr.st_ctime
1858 { 1998 ) {
1859 #if EV_USE_INOTIFY 1999 #if EV_USE_INOTIFY
1860 infy_del (EV_A_ w); 2000 infy_del (EV_A_ w);
1861 infy_add (EV_A_ w); 2001 infy_add (EV_A_ w);
1862 ev_stat_stat (EV_A_ w); /* avoid race... */ 2002 ev_stat_stat (EV_A_ w); /* avoid race... */
1863 #endif 2003 #endif
… …
1897} 2037}
1898 2038
1899void 2039void
1900ev_stat_stop (EV_P_ ev_stat *w) 2040ev_stat_stop (EV_P_ ev_stat *w)
1901{ 2041{
1902 ev_clear_pending (EV_A_ (W)w); 2042 clear_pending (EV_A_ (W)w);
1903 if (expect_false (!ev_is_active (w))) 2043 if (expect_false (!ev_is_active (w)))
1904 return; 2044 return;
1905 2045
1906#if EV_USE_INOTIFY 2046#if EV_USE_INOTIFY
1907 infy_del (EV_A_ w); 2047 infy_del (EV_A_ w);
… …
1910 2050
1911 ev_stop (EV_A_ (W)w); 2051 ev_stop (EV_A_ (W)w);
1912} 2052}
1913#endif 2053#endif
1914 2054
2055#if EV_IDLE_ENABLE
1915void 2056void
1916ev_idle_start (EV_P_ ev_idle *w) 2057ev_idle_start (EV_P_ ev_idle *w)
1917{ 2058{
1918 if (expect_false (ev_is_active (w))) 2059 if (expect_false (ev_is_active (w)))
1919 return; 2060 return;
1920 2061
2062 pri_adjust (EV_A_ (W)w);
2063
2064 {
2065 int active = ++idlecnt [ABSPRI (w)];
2066
2067 ++idleall;
1921 ev_start (EV_A_ (W)w, ++idlecnt); 2068 ev_start (EV_A_ (W)w, active);
2069
1922 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2070 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1923 idles [idlecnt - 1] = w; 2071 idles [ABSPRI (w)][active - 1] = w;
2072 }
1924} 2073}
1925 2074
1926void 2075void
1927ev_idle_stop (EV_P_ ev_idle *w) 2076ev_idle_stop (EV_P_ ev_idle *w)
1928{ 2077{
1929 ev_clear_pending (EV_A_ (W)w); 2078 clear_pending (EV_A_ (W)w);
1930 if (expect_false (!ev_is_active (w))) 2079 if (expect_false (!ev_is_active (w)))
1931 return; 2080 return;
1932 2081
1933 { 2082 {
1934 int active = ((W)w)->active; 2083 int active = ((W)w)->active;
1935 idles [active - 1] = idles [--idlecnt]; 2084
2085 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1936 ((W)idles [active - 1])->active = active; 2086 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2087
2088 ev_stop (EV_A_ (W)w);
2089 --idleall;
1937 } 2090 }
1938
1939 ev_stop (EV_A_ (W)w);
1940} 2091}
2092#endif
1941 2093
1942void 2094void
1943ev_prepare_start (EV_P_ ev_prepare *w) 2095ev_prepare_start (EV_P_ ev_prepare *w)
1944{ 2096{
1945 if (expect_false (ev_is_active (w))) 2097 if (expect_false (ev_is_active (w)))
… …
1951} 2103}
1952 2104
1953void 2105void
1954ev_prepare_stop (EV_P_ ev_prepare *w) 2106ev_prepare_stop (EV_P_ ev_prepare *w)
1955{ 2107{
1956 ev_clear_pending (EV_A_ (W)w); 2108 clear_pending (EV_A_ (W)w);
1957 if (expect_false (!ev_is_active (w))) 2109 if (expect_false (!ev_is_active (w)))
1958 return; 2110 return;
1959 2111
1960 { 2112 {
1961 int active = ((W)w)->active; 2113 int active = ((W)w)->active;
… …
1978} 2130}
1979 2131
1980void 2132void
1981ev_check_stop (EV_P_ ev_check *w) 2133ev_check_stop (EV_P_ ev_check *w)
1982{ 2134{
1983 ev_clear_pending (EV_A_ (W)w); 2135 clear_pending (EV_A_ (W)w);
1984 if (expect_false (!ev_is_active (w))) 2136 if (expect_false (!ev_is_active (w)))
1985 return; 2137 return;
1986 2138
1987 { 2139 {
1988 int active = ((W)w)->active; 2140 int active = ((W)w)->active;
… …
2030} 2182}
2031 2183
2032void 2184void
2033ev_embed_stop (EV_P_ ev_embed *w) 2185ev_embed_stop (EV_P_ ev_embed *w)
2034{ 2186{
2035 ev_clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
2036 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
2037 return; 2189 return;
2038 2190
2039 ev_io_stop (EV_A_ &w->io); 2191 ev_io_stop (EV_A_ &w->io);
2040 2192
… …
2055} 2207}
2056 2208
2057void 2209void
2058ev_fork_stop (EV_P_ ev_fork *w) 2210ev_fork_stop (EV_P_ ev_fork *w)
2059{ 2211{
2060 ev_clear_pending (EV_A_ (W)w); 2212 clear_pending (EV_A_ (W)w);
2061 if (expect_false (!ev_is_active (w))) 2213 if (expect_false (!ev_is_active (w)))
2062 return; 2214 return;
2063 2215
2064 { 2216 {
2065 int active = ((W)w)->active; 2217 int active = ((W)w)->active;

Diff Legend

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