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

Comparing libev/ev.c (file contents):
Revision 1.154 by root, Wed Nov 28 11:53:37 2007 UTC vs.
Revision 1.168 by root, Sat Dec 8 14:12:07 2007 UTC

… …
241 241
242#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
244 244
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 247
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 248#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 249#define EMPTY2(a,b) /* used to suppress some warnings */
250 250
251typedef ev_watcher *W; 251typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
… …
281 perror (msg); 281 perror (msg);
282 abort (); 282 abort ();
283 } 283 }
284} 284}
285 285
286static void *(*alloc)(void *ptr, size_t size) = realloc; 286static void *(*alloc)(void *ptr, long size);
287 287
288void 288void
289ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
290{ 290{
291 alloc = cb; 291 alloc = cb;
292} 292}
293 293
294inline_speed void * 294inline_speed void *
295ev_realloc (void *ptr, size_t size) 295ev_realloc (void *ptr, long size)
296{ 296{
297 ptr = alloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
298 298
299 if (!ptr && size) 299 if (!ptr && size)
300 { 300 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size); 301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort (); 302 abort ();
303 } 303 }
304 304
305 return ptr; 305 return ptr;
306} 306}
… …
324{ 324{
325 W w; 325 W w;
326 int events; 326 int events;
327} ANPENDING; 327} ANPENDING;
328 328
329#if EV_USE_INOTIFY
329typedef struct 330typedef struct
330{ 331{
331#if EV_USE_INOTIFY
332 WL head; 332 WL head;
333#endif
334} ANFS; 333} ANFS;
334#endif
335 335
336#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
337 337
338 struct ev_loop 338 struct ev_loop
339 { 339 {
… …
396{ 396{
397 return ev_rt_now; 397 return ev_rt_now;
398} 398}
399#endif 399#endif
400 400
401#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}
402 428
403#define array_needsize(type,base,cur,cnt,init) \ 429#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 430 if (expect_false ((cnt) > (cur))) \
405 { \ 431 { \
406 int newcnt = cur; \ 432 int ocur_ = (cur); \
407 do \ 433 (base) = (type *)array_realloc \
408 { \ 434 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 435 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 } 436 }
417 437
438#if 0
418#define array_slim(type,stem) \ 439#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 440 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 441 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 442 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 443 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 444 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 445 }
446#endif
425 447
426#define array_free(stem, idx) \ 448#define array_free(stem, idx) \
427 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;
428 450
429/*****************************************************************************/ 451/*****************************************************************************/
… …
485} 507}
486 508
487void 509void
488ev_feed_fd_event (EV_P_ int fd, int revents) 510ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 511{
512 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 513 fd_event (EV_A_ fd, revents);
491} 514}
492 515
493void inline_size 516void inline_size
494fd_reify (EV_P) 517fd_reify (EV_P)
495{ 518{
… …
589static void noinline 612static void noinline
590fd_rearm_all (EV_P) 613fd_rearm_all (EV_P)
591{ 614{
592 int fd; 615 int fd;
593 616
594 /* this should be highly optimised to not do anything but set a flag */
595 for (fd = 0; fd < anfdmax; ++fd) 617 for (fd = 0; fd < anfdmax; ++fd)
596 if (anfds [fd].events) 618 if (anfds [fd].events)
597 { 619 {
598 anfds [fd].events = 0; 620 anfds [fd].events = 0;
599 fd_change (EV_A_ fd); 621 fd_change (EV_A_ fd);
… …
765 ev_child *w; 787 ev_child *w;
766 788
767 for (w = (ev_child *)childs [chain & (EV_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)
768 if (w->pid == pid || !w->pid) 790 if (w->pid == pid || !w->pid)
769 { 791 {
770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 792 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
771 w->rpid = pid; 793 w->rpid = pid;
772 w->rstatus = status; 794 w->rstatus = status;
773 ev_feed_event (EV_A_ (W)w, EV_CHILD); 795 ev_feed_event (EV_A_ (W)w, EV_CHILD);
774 } 796 }
775} 797}
776 798
777#ifndef WCONTINUED 799#ifndef WCONTINUED
… …
887ev_backend (EV_P) 909ev_backend (EV_P)
888{ 910{
889 return backend; 911 return backend;
890} 912}
891 913
914unsigned int
915ev_loop_count (EV_P)
916{
917 return loop_count;
918}
919
892static void noinline 920static void noinline
893loop_init (EV_P_ unsigned int flags) 921loop_init (EV_P_ unsigned int flags)
894{ 922{
895 if (!backend) 923 if (!backend)
896 { 924 {
… …
905 ev_rt_now = ev_time (); 933 ev_rt_now = ev_time ();
906 mn_now = get_clock (); 934 mn_now = get_clock ();
907 now_floor = mn_now; 935 now_floor = mn_now;
908 rtmn_diff = ev_rt_now - mn_now; 936 rtmn_diff = ev_rt_now - mn_now;
909 937
938 /* pid check not overridable via env */
939#ifndef _WIN32
940 if (flags & EVFLAG_FORKCHECK)
941 curpid = getpid ();
942#endif
943
910 if (!(flags & EVFLAG_NOENV) 944 if (!(flags & EVFLAG_NOENV)
911 && !enable_secure () 945 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS")) 946 && getenv ("LIBEV_FLAGS"))
913 flags = atoi (getenv ("LIBEV_FLAGS")); 947 flags = atoi (getenv ("LIBEV_FLAGS"));
914 948
… …
970#if EV_USE_SELECT 1004#if EV_USE_SELECT
971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1005 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
972#endif 1006#endif
973 1007
974 for (i = NUMPRI; i--; ) 1008 for (i = NUMPRI; i--; )
1009 {
975 array_free (pending, [i]); 1010 array_free (pending, [i]);
1011#if EV_IDLE_ENABLE
1012 array_free (idle, [i]);
1013#endif
1014 }
976 1015
977 /* have to use the microsoft-never-gets-it-right macro */ 1016 /* have to use the microsoft-never-gets-it-right macro */
978 array_free (fdchange, EMPTY0); 1017 array_free (fdchange, EMPTY);
979 array_free (timer, EMPTY0); 1018 array_free (timer, EMPTY);
980#if EV_PERIODIC_ENABLE 1019#if EV_PERIODIC_ENABLE
981 array_free (periodic, EMPTY0); 1020 array_free (periodic, EMPTY);
982#endif 1021#endif
983 array_free (idle, EMPTY0);
984 array_free (prepare, EMPTY0); 1022 array_free (prepare, EMPTY);
985 array_free (check, EMPTY0); 1023 array_free (check, EMPTY);
986 1024
987 backend = 0; 1025 backend = 0;
988} 1026}
989 1027
990void inline_size infy_fork (EV_P); 1028void inline_size infy_fork (EV_P);
… …
1126 postfork = 1; 1164 postfork = 1;
1127} 1165}
1128 1166
1129/*****************************************************************************/ 1167/*****************************************************************************/
1130 1168
1131int inline_size 1169void
1132any_pending (EV_P) 1170ev_invoke (EV_P_ void *w, int revents)
1133{ 1171{
1134 int pri; 1172 EV_CB_INVOKE ((W)w, revents);
1135
1136 for (pri = NUMPRI; pri--; )
1137 if (pendingcnt [pri])
1138 return 1;
1139
1140 return 0;
1141} 1173}
1142 1174
1143void inline_speed 1175void inline_speed
1144call_pending (EV_P) 1176call_pending (EV_P)
1145{ 1177{
… …
1237 for (i = periodiccnt >> 1; i--; ) 1269 for (i = periodiccnt >> 1; i--; )
1238 downheap ((WT *)periodics, periodiccnt, i); 1270 downheap ((WT *)periodics, periodiccnt, i);
1239} 1271}
1240#endif 1272#endif
1241 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
1242int inline_size 1297int inline_size
1243time_update_monotonic (EV_P) 1298time_update_monotonic (EV_P)
1244{ 1299{
1245 mn_now = get_clock (); 1300 mn_now = get_clock ();
1246 1301
… …
1270 ev_tstamp odiff = rtmn_diff; 1325 ev_tstamp odiff = rtmn_diff;
1271 1326
1272 /* loop a few times, before making important decisions. 1327 /* loop a few times, before making important decisions.
1273 * on the choice of "4": one iteration isn't enough, 1328 * on the choice of "4": one iteration isn't enough,
1274 * in case we get preempted during the calls to 1329 * in case we get preempted during the calls to
1275 * ev_time and get_clock. a second call is almost guarenteed 1330 * ev_time and get_clock. a second call is almost guaranteed
1276 * 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
1277 * 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
1278 * in the unlikely event of getting preempted here. 1333 * in the unlikely event of having been preempted here.
1279 */ 1334 */
1280 for (i = 4; --i; ) 1335 for (i = 4; --i; )
1281 { 1336 {
1282 rtmn_diff = ev_rt_now - mn_now; 1337 rtmn_diff = ev_rt_now - mn_now;
1283 1338
… …
1305 { 1360 {
1306#if EV_PERIODIC_ENABLE 1361#if EV_PERIODIC_ENABLE
1307 periodics_reschedule (EV_A); 1362 periodics_reschedule (EV_A);
1308#endif 1363#endif
1309 1364
1310 /* 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 */
1311 for (i = 0; i < timercnt; ++i) 1366 for (i = 0; i < timercnt; ++i)
1312 ((WT)timers [i])->at += ev_rt_now - mn_now; 1367 ((WT)timers [i])->at += ev_rt_now - mn_now;
1313 } 1368 }
1314 1369
1315 mn_now = ev_rt_now; 1370 mn_now = ev_rt_now;
… …
1335{ 1390{
1336 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1391 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1337 ? EVUNLOOP_ONE 1392 ? EVUNLOOP_ONE
1338 : EVUNLOOP_CANCEL; 1393 : EVUNLOOP_CANCEL;
1339 1394
1340 while (activecnt) 1395 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1396
1397 do
1341 { 1398 {
1342 /* we might have forked, so reify kernel state if necessary */ 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
1343 #if EV_FORK_ENABLE 1408#if EV_FORK_ENABLE
1409 /* we might have forked, so queue fork handlers */
1344 if (expect_false (postfork)) 1410 if (expect_false (postfork))
1345 if (forkcnt) 1411 if (forkcnt)
1346 { 1412 {
1347 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1348 call_pending (EV_A); 1414 call_pending (EV_A);
1349 } 1415 }
1350 #endif 1416#endif
1351 1417
1352 /* queue check watchers (and execute them) */ 1418 /* queue check watchers (and execute them) */
1353 if (expect_false (preparecnt)) 1419 if (expect_false (preparecnt))
1354 { 1420 {
1355 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1356 call_pending (EV_A); 1422 call_pending (EV_A);
1357 } 1423 }
1358 1424
1425 if (expect_false (!activecnt))
1426 break;
1427
1359 /* we might have forked, so reify kernel state if necessary */ 1428 /* we might have forked, so reify kernel state if necessary */
1360 if (expect_false (postfork)) 1429 if (expect_false (postfork))
1361 loop_fork (EV_A); 1430 loop_fork (EV_A);
1362 1431
1363 /* update fd-related kernel structures */ 1432 /* update fd-related kernel structures */
1364 fd_reify (EV_A); 1433 fd_reify (EV_A);
1365 1434
1366 /* calculate blocking time */ 1435 /* calculate blocking time */
1367 { 1436 {
1368 double block; 1437 ev_tstamp block;
1369 1438
1370 if (flags & EVLOOP_NONBLOCK || idlecnt) 1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1371 block = 0.; /* do not block at all */ 1440 block = 0.; /* do not block at all */
1372 else 1441 else
1373 { 1442 {
1374 /* update time to cancel out callback processing overhead */ 1443 /* update time to cancel out callback processing overhead */
1375#if EV_USE_MONOTONIC 1444#if EV_USE_MONOTONIC
… …
1399#endif 1468#endif
1400 1469
1401 if (expect_false (block < 0.)) block = 0.; 1470 if (expect_false (block < 0.)) block = 0.;
1402 } 1471 }
1403 1472
1473 ++loop_count;
1404 backend_poll (EV_A_ block); 1474 backend_poll (EV_A_ block);
1405 } 1475 }
1406 1476
1407 /* update ev_rt_now, do magic */ 1477 /* update ev_rt_now, do magic */
1408 time_update (EV_A); 1478 time_update (EV_A);
… …
1411 timers_reify (EV_A); /* relative timers called last */ 1481 timers_reify (EV_A); /* relative timers called last */
1412#if EV_PERIODIC_ENABLE 1482#if EV_PERIODIC_ENABLE
1413 periodics_reify (EV_A); /* absolute timers called first */ 1483 periodics_reify (EV_A); /* absolute timers called first */
1414#endif 1484#endif
1415 1485
1486#if EV_IDLE_ENABLE
1416 /* queue idle watchers unless other events are pending */ 1487 /* queue idle watchers unless other events are pending */
1417 if (idlecnt && !any_pending (EV_A)) 1488 idle_reify (EV_A);
1418 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1489#endif
1419 1490
1420 /* queue check watchers, to be executed first */ 1491 /* queue check watchers, to be executed first */
1421 if (expect_false (checkcnt)) 1492 if (expect_false (checkcnt))
1422 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1493 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1423 1494
1424 call_pending (EV_A); 1495 call_pending (EV_A);
1425 1496
1426 if (expect_false (loop_done))
1427 break;
1428 } 1497 }
1498 while (expect_true (activecnt && !loop_done));
1429 1499
1430 if (loop_done == EVUNLOOP_ONE) 1500 if (loop_done == EVUNLOOP_ONE)
1431 loop_done = EVUNLOOP_CANCEL; 1501 loop_done = EVUNLOOP_CANCEL;
1432} 1502}
1433 1503
… …
1460 head = &(*head)->next; 1530 head = &(*head)->next;
1461 } 1531 }
1462} 1532}
1463 1533
1464void inline_speed 1534void inline_speed
1465ev_clear_pending (EV_P_ W w) 1535clear_pending (EV_P_ W w)
1466{ 1536{
1467 if (w->pending) 1537 if (w->pending)
1468 { 1538 {
1469 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1539 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1470 w->pending = 0; 1540 w->pending = 0;
1471 } 1541 }
1472} 1542}
1473 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
1474void inline_speed 1569void inline_speed
1475ev_start (EV_P_ W w, int active) 1570ev_start (EV_P_ W w, int active)
1476{ 1571{
1477 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1572 pri_adjust (EV_A_ w);
1478 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1479
1480 w->active = active; 1573 w->active = active;
1481 ev_ref (EV_A); 1574 ev_ref (EV_A);
1482} 1575}
1483 1576
1484void inline_size 1577void inline_size
… …
1508} 1601}
1509 1602
1510void 1603void
1511ev_io_stop (EV_P_ ev_io *w) 1604ev_io_stop (EV_P_ ev_io *w)
1512{ 1605{
1513 ev_clear_pending (EV_A_ (W)w); 1606 clear_pending (EV_A_ (W)w);
1514 if (expect_false (!ev_is_active (w))) 1607 if (expect_false (!ev_is_active (w)))
1515 return; 1608 return;
1516 1609
1517 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));
1518 1611
… …
1541} 1634}
1542 1635
1543void 1636void
1544ev_timer_stop (EV_P_ ev_timer *w) 1637ev_timer_stop (EV_P_ ev_timer *w)
1545{ 1638{
1546 ev_clear_pending (EV_A_ (W)w); 1639 clear_pending (EV_A_ (W)w);
1547 if (expect_false (!ev_is_active (w))) 1640 if (expect_false (!ev_is_active (w)))
1548 return; 1641 return;
1549 1642
1550 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1551 1644
… …
1609} 1702}
1610 1703
1611void 1704void
1612ev_periodic_stop (EV_P_ ev_periodic *w) 1705ev_periodic_stop (EV_P_ ev_periodic *w)
1613{ 1706{
1614 ev_clear_pending (EV_A_ (W)w); 1707 clear_pending (EV_A_ (W)w);
1615 if (expect_false (!ev_is_active (w))) 1708 if (expect_false (!ev_is_active (w)))
1616 return; 1709 return;
1617 1710
1618 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1619 1712
… …
1673} 1766}
1674 1767
1675void 1768void
1676ev_signal_stop (EV_P_ ev_signal *w) 1769ev_signal_stop (EV_P_ ev_signal *w)
1677{ 1770{
1678 ev_clear_pending (EV_A_ (W)w); 1771 clear_pending (EV_A_ (W)w);
1679 if (expect_false (!ev_is_active (w))) 1772 if (expect_false (!ev_is_active (w)))
1680 return; 1773 return;
1681 1774
1682 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1683 ev_stop (EV_A_ (W)w); 1776 ev_stop (EV_A_ (W)w);
… …
1700} 1793}
1701 1794
1702void 1795void
1703ev_child_stop (EV_P_ ev_child *w) 1796ev_child_stop (EV_P_ ev_child *w)
1704{ 1797{
1705 ev_clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1707 return; 1800 return;
1708 1801
1709 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1710 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
… …
1718# endif 1811# endif
1719 1812
1720#define DEF_STAT_INTERVAL 5.0074891 1813#define DEF_STAT_INTERVAL 5.0074891
1721#define MIN_STAT_INTERVAL 0.1074891 1814#define MIN_STAT_INTERVAL 0.1074891
1722 1815
1723void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 1816static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1724 1817
1725#if EV_USE_INOTIFY 1818#if EV_USE_INOTIFY
1726# define EV_INOTIFY_BUFSIZE 8192 1819# define EV_INOTIFY_BUFSIZE 8192
1727 1820
1728static void noinline 1821static void noinline
… …
1879 w->attr.st_nlink = 0; 1972 w->attr.st_nlink = 0;
1880 else if (!w->attr.st_nlink) 1973 else if (!w->attr.st_nlink)
1881 w->attr.st_nlink = 1; 1974 w->attr.st_nlink = 1;
1882} 1975}
1883 1976
1884void noinline 1977static void noinline
1885stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1978stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1886{ 1979{
1887 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1980 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1888 1981
1889 /* we copy this here each the time so that */ 1982 /* we copy this here each the time so that */
1890 /* prev has the old value when the callback gets invoked */ 1983 /* prev has the old value when the callback gets invoked */
1891 w->prev = w->attr; 1984 w->prev = w->attr;
1892 ev_stat_stat (EV_A_ w); 1985 ev_stat_stat (EV_A_ w);
1893 1986
1894 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
1895 { 2000 ) {
1896 #if EV_USE_INOTIFY 2001 #if EV_USE_INOTIFY
1897 infy_del (EV_A_ w); 2002 infy_del (EV_A_ w);
1898 infy_add (EV_A_ w); 2003 infy_add (EV_A_ w);
1899 ev_stat_stat (EV_A_ w); /* avoid race... */ 2004 ev_stat_stat (EV_A_ w); /* avoid race... */
1900 #endif 2005 #endif
… …
1934} 2039}
1935 2040
1936void 2041void
1937ev_stat_stop (EV_P_ ev_stat *w) 2042ev_stat_stop (EV_P_ ev_stat *w)
1938{ 2043{
1939 ev_clear_pending (EV_A_ (W)w); 2044 clear_pending (EV_A_ (W)w);
1940 if (expect_false (!ev_is_active (w))) 2045 if (expect_false (!ev_is_active (w)))
1941 return; 2046 return;
1942 2047
1943#if EV_USE_INOTIFY 2048#if EV_USE_INOTIFY
1944 infy_del (EV_A_ w); 2049 infy_del (EV_A_ w);
… …
1947 2052
1948 ev_stop (EV_A_ (W)w); 2053 ev_stop (EV_A_ (W)w);
1949} 2054}
1950#endif 2055#endif
1951 2056
2057#if EV_IDLE_ENABLE
1952void 2058void
1953ev_idle_start (EV_P_ ev_idle *w) 2059ev_idle_start (EV_P_ ev_idle *w)
1954{ 2060{
1955 if (expect_false (ev_is_active (w))) 2061 if (expect_false (ev_is_active (w)))
1956 return; 2062 return;
1957 2063
2064 pri_adjust (EV_A_ (W)w);
2065
2066 {
2067 int active = ++idlecnt [ABSPRI (w)];
2068
2069 ++idleall;
1958 ev_start (EV_A_ (W)w, ++idlecnt); 2070 ev_start (EV_A_ (W)w, active);
2071
1959 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2072 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1960 idles [idlecnt - 1] = w; 2073 idles [ABSPRI (w)][active - 1] = w;
2074 }
1961} 2075}
1962 2076
1963void 2077void
1964ev_idle_stop (EV_P_ ev_idle *w) 2078ev_idle_stop (EV_P_ ev_idle *w)
1965{ 2079{
1966 ev_clear_pending (EV_A_ (W)w); 2080 clear_pending (EV_A_ (W)w);
1967 if (expect_false (!ev_is_active (w))) 2081 if (expect_false (!ev_is_active (w)))
1968 return; 2082 return;
1969 2083
1970 { 2084 {
1971 int active = ((W)w)->active; 2085 int active = ((W)w)->active;
1972 idles [active - 1] = idles [--idlecnt]; 2086
2087 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1973 ((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;
1974 } 2092 }
1975
1976 ev_stop (EV_A_ (W)w);
1977} 2093}
2094#endif
1978 2095
1979void 2096void
1980ev_prepare_start (EV_P_ ev_prepare *w) 2097ev_prepare_start (EV_P_ ev_prepare *w)
1981{ 2098{
1982 if (expect_false (ev_is_active (w))) 2099 if (expect_false (ev_is_active (w)))
… …
1988} 2105}
1989 2106
1990void 2107void
1991ev_prepare_stop (EV_P_ ev_prepare *w) 2108ev_prepare_stop (EV_P_ ev_prepare *w)
1992{ 2109{
1993 ev_clear_pending (EV_A_ (W)w); 2110 clear_pending (EV_A_ (W)w);
1994 if (expect_false (!ev_is_active (w))) 2111 if (expect_false (!ev_is_active (w)))
1995 return; 2112 return;
1996 2113
1997 { 2114 {
1998 int active = ((W)w)->active; 2115 int active = ((W)w)->active;
… …
2015} 2132}
2016 2133
2017void 2134void
2018ev_check_stop (EV_P_ ev_check *w) 2135ev_check_stop (EV_P_ ev_check *w)
2019{ 2136{
2020 ev_clear_pending (EV_A_ (W)w); 2137 clear_pending (EV_A_ (W)w);
2021 if (expect_false (!ev_is_active (w))) 2138 if (expect_false (!ev_is_active (w)))
2022 return; 2139 return;
2023 2140
2024 { 2141 {
2025 int active = ((W)w)->active; 2142 int active = ((W)w)->active;
… …
2067} 2184}
2068 2185
2069void 2186void
2070ev_embed_stop (EV_P_ ev_embed *w) 2187ev_embed_stop (EV_P_ ev_embed *w)
2071{ 2188{
2072 ev_clear_pending (EV_A_ (W)w); 2189 clear_pending (EV_A_ (W)w);
2073 if (expect_false (!ev_is_active (w))) 2190 if (expect_false (!ev_is_active (w)))
2074 return; 2191 return;
2075 2192
2076 ev_io_stop (EV_A_ &w->io); 2193 ev_io_stop (EV_A_ &w->io);
2077 2194
… …
2092} 2209}
2093 2210
2094void 2211void
2095ev_fork_stop (EV_P_ ev_fork *w) 2212ev_fork_stop (EV_P_ ev_fork *w)
2096{ 2213{
2097 ev_clear_pending (EV_A_ (W)w); 2214 clear_pending (EV_A_ (W)w);
2098 if (expect_false (!ev_is_active (w))) 2215 if (expect_false (!ev_is_active (w)))
2099 return; 2216 return;
2100 2217
2101 { 2218 {
2102 int active = ((W)w)->active; 2219 int active = ((W)w)->active;

Diff Legend

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