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

Comparing libev/ev.c (file contents):
Revision 1.156 by root, Wed Nov 28 17:50:13 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;
… …
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}
989 1038
990void inline_size infy_fork (EV_P); 1039void inline_size infy_fork (EV_P);
… …
1126 postfork = 1; 1175 postfork = 1;
1127} 1176}
1128 1177
1129/*****************************************************************************/ 1178/*****************************************************************************/
1130 1179
1131int inline_size 1180void
1132any_pending (EV_P) 1181ev_invoke (EV_P_ void *w, int revents)
1133{ 1182{
1134 int pri; 1183 EV_CB_INVOKE ((W)w, revents);
1135
1136 for (pri = NUMPRI; pri--; )
1137 if (pendingcnt [pri])
1138 return 1;
1139
1140 return 0;
1141} 1184}
1142 1185
1143void inline_speed 1186void inline_speed
1144call_pending (EV_P) 1187call_pending (EV_P)
1145{ 1188{
… …
1198 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1199 1242
1200 /* first reschedule or stop timer */ 1243 /* first reschedule or stop timer */
1201 if (w->reschedule_cb) 1244 if (w->reschedule_cb)
1202 { 1245 {
1203 ((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);
1204 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));
1205 downheap ((WT *)periodics, periodiccnt, 0); 1248 downheap ((WT *)periodics, periodiccnt, 0);
1206 } 1249 }
1207 else if (w->interval) 1250 else if (w->interval)
1208 { 1251 {
1209 ((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;
1210 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));
1211 downheap ((WT *)periodics, periodiccnt, 0); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1212 } 1256 }
1213 else 1257 else
1214 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1228 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1229 1273
1230 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1231 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1232 else if (w->interval) 1276 else if (w->interval)
1233 ((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;
1234 } 1278 }
1235 1279
1236 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1237 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1238 downheap ((WT *)periodics, periodiccnt, i); 1282 downheap ((WT *)periodics, periodiccnt, i);
1239} 1283}
1240#endif 1284#endif
1241 1285
1286#if EV_IDLE_ENABLE
1242int inline_size 1287void inline_size
1243time_update_monotonic (EV_P) 1288idle_reify (EV_P)
1244{ 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
1245 mn_now = get_clock (); 1319 mn_now = get_clock ();
1246 1320
1321 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1322 /* interpolate in the meantime */
1247 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1323 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1248 { 1324 {
1249 ev_rt_now = rtmn_diff + mn_now; 1325 ev_rt_now = rtmn_diff + mn_now;
1250 return 0; 1326 return;
1251 } 1327 }
1252 else 1328
1253 {
1254 now_floor = mn_now; 1329 now_floor = mn_now;
1255 ev_rt_now = ev_time (); 1330 ev_rt_now = ev_time ();
1256 return 1;
1257 }
1258}
1259 1331
1260void inline_size 1332 /* loop a few times, before making important decisions.
1261time_update (EV_P) 1333 * on the choice of "4": one iteration isn't enough,
1262{ 1334 * in case we get preempted during the calls to
1263 int i; 1335 * ev_time and get_clock. a second call is almost guaranteed
1264 1336 * to succeed in that case, though. and looping a few more times
1265#if EV_USE_MONOTONIC 1337 * doesn't hurt either as we only do this on time-jumps or
1266 if (expect_true (have_monotonic)) 1338 * in the unlikely event of having been preempted here.
1267 { 1339 */
1268 if (time_update_monotonic (EV_A)) 1340 for (i = 4; --i; )
1269 { 1341 {
1270 ev_tstamp odiff = rtmn_diff;
1271
1272 /* loop a few times, before making important decisions.
1273 * on the choice of "4": one iteration isn't enough,
1274 * in case we get preempted during the calls to
1275 * ev_time and get_clock. a second call is almost guarenteed
1276 * 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
1278 * in the unlikely event of getting preempted here.
1279 */
1280 for (i = 4; --i; )
1281 {
1282 rtmn_diff = ev_rt_now - mn_now; 1342 rtmn_diff = ev_rt_now - mn_now;
1283 1343
1284 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1344 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1285 return; /* all is well */ 1345 return; /* all is well */
1286 1346
1287 ev_rt_now = ev_time (); 1347 ev_rt_now = ev_time ();
1288 mn_now = get_clock (); 1348 mn_now = get_clock ();
1289 now_floor = mn_now; 1349 now_floor = mn_now;
1290 } 1350 }
1291 1351
1292# if EV_PERIODIC_ENABLE 1352# if EV_PERIODIC_ENABLE
1293 periodics_reschedule (EV_A); 1353 periodics_reschedule (EV_A);
1294# endif 1354# endif
1295 /* no timer adjustment, as the monotonic clock doesn't jump */ 1355 /* no timer adjustment, as the monotonic clock doesn't jump */
1296 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1356 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1297 }
1298 } 1357 }
1299 else 1358 else
1300#endif 1359#endif
1301 { 1360 {
1302 ev_rt_now = ev_time (); 1361 ev_rt_now = ev_time ();
1303 1362
1304 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))
1305 { 1364 {
1306#if EV_PERIODIC_ENABLE 1365#if EV_PERIODIC_ENABLE
1307 periodics_reschedule (EV_A); 1366 periodics_reschedule (EV_A);
1308#endif 1367#endif
1309
1310 /* 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 */
1311 for (i = 0; i < timercnt; ++i) 1369 for (i = 0; i < timercnt; ++i)
1312 ((WT)timers [i])->at += ev_rt_now - mn_now; 1370 ((WT)timers [i])->at += ev_rt_now - mn_now;
1313 } 1371 }
1314 1372
1315 mn_now = ev_rt_now; 1373 mn_now = ev_rt_now;
… …
1335{ 1393{
1336 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1394 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1337 ? EVUNLOOP_ONE 1395 ? EVUNLOOP_ONE
1338 : EVUNLOOP_CANCEL; 1396 : EVUNLOOP_CANCEL;
1339 1397
1340 while (activecnt) 1398 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1399
1400 do
1341 { 1401 {
1342 /* 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
1343 #if EV_FORK_ENABLE 1411#if EV_FORK_ENABLE
1412 /* we might have forked, so queue fork handlers */
1344 if (expect_false (postfork)) 1413 if (expect_false (postfork))
1345 if (forkcnt) 1414 if (forkcnt)
1346 { 1415 {
1347 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1416 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1348 call_pending (EV_A); 1417 call_pending (EV_A);
1349 } 1418 }
1350 #endif 1419#endif
1351 1420
1352 /* queue check watchers (and execute them) */ 1421 /* queue prepare watchers (and execute them) */
1353 if (expect_false (preparecnt)) 1422 if (expect_false (preparecnt))
1354 { 1423 {
1355 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1424 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1356 call_pending (EV_A); 1425 call_pending (EV_A);
1357 } 1426 }
1358 1427
1428 if (expect_false (!activecnt))
1429 break;
1430
1359 /* we might have forked, so reify kernel state if necessary */ 1431 /* we might have forked, so reify kernel state if necessary */
1360 if (expect_false (postfork)) 1432 if (expect_false (postfork))
1361 loop_fork (EV_A); 1433 loop_fork (EV_A);
1362 1434
1363 /* update fd-related kernel structures */ 1435 /* update fd-related kernel structures */
1364 fd_reify (EV_A); 1436 fd_reify (EV_A);
1365 1437
1366 /* calculate blocking time */ 1438 /* calculate blocking time */
1367 { 1439 {
1368 double block; 1440 ev_tstamp block;
1369 1441
1370 if (flags & EVLOOP_NONBLOCK || idlecnt) 1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1371 block = 0.; /* do not block at all */ 1443 block = 0.; /* do not block at all */
1372 else 1444 else
1373 { 1445 {
1374 /* update time to cancel out callback processing overhead */ 1446 /* update time to cancel out callback processing overhead */
1375#if EV_USE_MONOTONIC
1376 if (expect_true (have_monotonic))
1377 time_update_monotonic (EV_A); 1447 time_update (EV_A_ 1e100);
1378 else
1379#endif
1380 {
1381 ev_rt_now = ev_time ();
1382 mn_now = ev_rt_now;
1383 }
1384 1448
1385 block = MAX_BLOCKTIME; 1449 block = MAX_BLOCKTIME;
1386 1450
1387 if (timercnt) 1451 if (timercnt)
1388 { 1452 {
… …
1399#endif 1463#endif
1400 1464
1401 if (expect_false (block < 0.)) block = 0.; 1465 if (expect_false (block < 0.)) block = 0.;
1402 } 1466 }
1403 1467
1468 ++loop_count;
1404 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);
1405 } 1473 }
1406
1407 /* update ev_rt_now, do magic */
1408 time_update (EV_A);
1409 1474
1410 /* queue pending timers and reschedule them */ 1475 /* queue pending timers and reschedule them */
1411 timers_reify (EV_A); /* relative timers called last */ 1476 timers_reify (EV_A); /* relative timers called last */
1412#if EV_PERIODIC_ENABLE 1477#if EV_PERIODIC_ENABLE
1413 periodics_reify (EV_A); /* absolute timers called first */ 1478 periodics_reify (EV_A); /* absolute timers called first */
1414#endif 1479#endif
1415 1480
1481#if EV_IDLE_ENABLE
1416 /* queue idle watchers unless other events are pending */ 1482 /* queue idle watchers unless other events are pending */
1417 if (idlecnt && !any_pending (EV_A)) 1483 idle_reify (EV_A);
1418 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1484#endif
1419 1485
1420 /* queue check watchers, to be executed first */ 1486 /* queue check watchers, to be executed first */
1421 if (expect_false (checkcnt)) 1487 if (expect_false (checkcnt))
1422 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1488 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1423 1489
1424 call_pending (EV_A); 1490 call_pending (EV_A);
1425 1491
1426 if (expect_false (loop_done))
1427 break;
1428 } 1492 }
1493 while (expect_true (activecnt && !loop_done));
1429 1494
1430 if (loop_done == EVUNLOOP_ONE) 1495 if (loop_done == EVUNLOOP_ONE)
1431 loop_done = EVUNLOOP_CANCEL; 1496 loop_done = EVUNLOOP_CANCEL;
1432} 1497}
1433 1498
… …
1460 head = &(*head)->next; 1525 head = &(*head)->next;
1461 } 1526 }
1462} 1527}
1463 1528
1464void inline_speed 1529void inline_speed
1465ev_clear_pending (EV_P_ W w) 1530clear_pending (EV_P_ W w)
1466{ 1531{
1467 if (w->pending) 1532 if (w->pending)
1468 { 1533 {
1469 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1534 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1470 w->pending = 0; 1535 w->pending = 0;
1471 } 1536 }
1472} 1537}
1473 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
1474void inline_speed 1565void inline_speed
1475ev_start (EV_P_ W w, int active) 1566ev_start (EV_P_ W w, int active)
1476{ 1567{
1477 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1568 pri_adjust (EV_A_ w);
1478 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1479
1480 w->active = active; 1569 w->active = active;
1481 ev_ref (EV_A); 1570 ev_ref (EV_A);
1482} 1571}
1483 1572
1484void inline_size 1573void inline_size
… …
1488 w->active = 0; 1577 w->active = 0;
1489} 1578}
1490 1579
1491/*****************************************************************************/ 1580/*****************************************************************************/
1492 1581
1493void 1582void noinline
1494ev_io_start (EV_P_ ev_io *w) 1583ev_io_start (EV_P_ ev_io *w)
1495{ 1584{
1496 int fd = w->fd; 1585 int fd = w->fd;
1497 1586
1498 if (expect_false (ev_is_active (w))) 1587 if (expect_false (ev_is_active (w)))
… …
1505 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1594 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1506 1595
1507 fd_change (EV_A_ fd); 1596 fd_change (EV_A_ fd);
1508} 1597}
1509 1598
1510void 1599void noinline
1511ev_io_stop (EV_P_ ev_io *w) 1600ev_io_stop (EV_P_ ev_io *w)
1512{ 1601{
1513 ev_clear_pending (EV_A_ (W)w); 1602 clear_pending (EV_A_ (W)w);
1514 if (expect_false (!ev_is_active (w))) 1603 if (expect_false (!ev_is_active (w)))
1515 return; 1604 return;
1516 1605
1517 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));
1518 1607
… …
1520 ev_stop (EV_A_ (W)w); 1609 ev_stop (EV_A_ (W)w);
1521 1610
1522 fd_change (EV_A_ w->fd); 1611 fd_change (EV_A_ w->fd);
1523} 1612}
1524 1613
1525void 1614void noinline
1526ev_timer_start (EV_P_ ev_timer *w) 1615ev_timer_start (EV_P_ ev_timer *w)
1527{ 1616{
1528 if (expect_false (ev_is_active (w))) 1617 if (expect_false (ev_is_active (w)))
1529 return; 1618 return;
1530 1619
… …
1538 upheap ((WT *)timers, timercnt - 1); 1627 upheap ((WT *)timers, timercnt - 1);
1539 1628
1540 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1541} 1630}
1542 1631
1543void 1632void noinline
1544ev_timer_stop (EV_P_ ev_timer *w) 1633ev_timer_stop (EV_P_ ev_timer *w)
1545{ 1634{
1546 ev_clear_pending (EV_A_ (W)w); 1635 clear_pending (EV_A_ (W)w);
1547 if (expect_false (!ev_is_active (w))) 1636 if (expect_false (!ev_is_active (w)))
1548 return; 1637 return;
1549 1638
1550 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1551 1640
… …
1562 ((WT)w)->at -= mn_now; 1651 ((WT)w)->at -= mn_now;
1563 1652
1564 ev_stop (EV_A_ (W)w); 1653 ev_stop (EV_A_ (W)w);
1565} 1654}
1566 1655
1567void 1656void noinline
1568ev_timer_again (EV_P_ ev_timer *w) 1657ev_timer_again (EV_P_ ev_timer *w)
1569{ 1658{
1570 if (ev_is_active (w)) 1659 if (ev_is_active (w))
1571 { 1660 {
1572 if (w->repeat) 1661 if (w->repeat)
… …
1583 ev_timer_start (EV_A_ w); 1672 ev_timer_start (EV_A_ w);
1584 } 1673 }
1585} 1674}
1586 1675
1587#if EV_PERIODIC_ENABLE 1676#if EV_PERIODIC_ENABLE
1588void 1677void noinline
1589ev_periodic_start (EV_P_ ev_periodic *w) 1678ev_periodic_start (EV_P_ ev_periodic *w)
1590{ 1679{
1591 if (expect_false (ev_is_active (w))) 1680 if (expect_false (ev_is_active (w)))
1592 return; 1681 return;
1593 1682
… …
1595 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1684 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1596 else if (w->interval) 1685 else if (w->interval)
1597 { 1686 {
1598 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.));
1599 /* 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 */
1600 ((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;
1601 } 1690 }
1691 else
1692 ((WT)w)->at = w->offset;
1602 1693
1603 ev_start (EV_A_ (W)w, ++periodiccnt); 1694 ev_start (EV_A_ (W)w, ++periodiccnt);
1604 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1605 periodics [periodiccnt - 1] = w; 1696 periodics [periodiccnt - 1] = w;
1606 upheap ((WT *)periodics, periodiccnt - 1); 1697 upheap ((WT *)periodics, periodiccnt - 1);
1607 1698
1608 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1609} 1700}
1610 1701
1611void 1702void noinline
1612ev_periodic_stop (EV_P_ ev_periodic *w) 1703ev_periodic_stop (EV_P_ ev_periodic *w)
1613{ 1704{
1614 ev_clear_pending (EV_A_ (W)w); 1705 clear_pending (EV_A_ (W)w);
1615 if (expect_false (!ev_is_active (w))) 1706 if (expect_false (!ev_is_active (w)))
1616 return; 1707 return;
1617 1708
1618 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1619 1710
… …
1628 } 1719 }
1629 1720
1630 ev_stop (EV_A_ (W)w); 1721 ev_stop (EV_A_ (W)w);
1631} 1722}
1632 1723
1633void 1724void noinline
1634ev_periodic_again (EV_P_ ev_periodic *w) 1725ev_periodic_again (EV_P_ ev_periodic *w)
1635{ 1726{
1636 /* TODO: use adjustheap and recalculation */ 1727 /* TODO: use adjustheap and recalculation */
1637 ev_periodic_stop (EV_A_ w); 1728 ev_periodic_stop (EV_A_ w);
1638 ev_periodic_start (EV_A_ w); 1729 ev_periodic_start (EV_A_ w);
… …
1641 1732
1642#ifndef SA_RESTART 1733#ifndef SA_RESTART
1643# define SA_RESTART 0 1734# define SA_RESTART 0
1644#endif 1735#endif
1645 1736
1646void 1737void noinline
1647ev_signal_start (EV_P_ ev_signal *w) 1738ev_signal_start (EV_P_ ev_signal *w)
1648{ 1739{
1649#if EV_MULTIPLICITY 1740#if EV_MULTIPLICITY
1650 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));
1651#endif 1742#endif
… …
1670 sigaction (w->signum, &sa, 0); 1761 sigaction (w->signum, &sa, 0);
1671#endif 1762#endif
1672 } 1763 }
1673} 1764}
1674 1765
1675void 1766void noinline
1676ev_signal_stop (EV_P_ ev_signal *w) 1767ev_signal_stop (EV_P_ ev_signal *w)
1677{ 1768{
1678 ev_clear_pending (EV_A_ (W)w); 1769 clear_pending (EV_A_ (W)w);
1679 if (expect_false (!ev_is_active (w))) 1770 if (expect_false (!ev_is_active (w)))
1680 return; 1771 return;
1681 1772
1682 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1683 ev_stop (EV_A_ (W)w); 1774 ev_stop (EV_A_ (W)w);
… …
1700} 1791}
1701 1792
1702void 1793void
1703ev_child_stop (EV_P_ ev_child *w) 1794ev_child_stop (EV_P_ ev_child *w)
1704{ 1795{
1705 ev_clear_pending (EV_A_ (W)w); 1796 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 1797 if (expect_false (!ev_is_active (w)))
1707 return; 1798 return;
1708 1799
1709 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);
1710 ev_stop (EV_A_ (W)w); 1801 ev_stop (EV_A_ (W)w);
… …
1718# endif 1809# endif
1719 1810
1720#define DEF_STAT_INTERVAL 5.0074891 1811#define DEF_STAT_INTERVAL 5.0074891
1721#define MIN_STAT_INTERVAL 0.1074891 1812#define MIN_STAT_INTERVAL 0.1074891
1722 1813
1723void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 1814static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1724 1815
1725#if EV_USE_INOTIFY 1816#if EV_USE_INOTIFY
1726# define EV_INOTIFY_BUFSIZE 8192 1817# define EV_INOTIFY_BUFSIZE 8192
1727 1818
1728static void noinline 1819static void noinline
… …
1879 w->attr.st_nlink = 0; 1970 w->attr.st_nlink = 0;
1880 else if (!w->attr.st_nlink) 1971 else if (!w->attr.st_nlink)
1881 w->attr.st_nlink = 1; 1972 w->attr.st_nlink = 1;
1882} 1973}
1883 1974
1884void noinline 1975static void noinline
1885stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1976stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1886{ 1977{
1887 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1978 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1888 1979
1889 /* we copy this here each the time so that */ 1980 /* we copy this here each the time so that */
… …
1946} 2037}
1947 2038
1948void 2039void
1949ev_stat_stop (EV_P_ ev_stat *w) 2040ev_stat_stop (EV_P_ ev_stat *w)
1950{ 2041{
1951 ev_clear_pending (EV_A_ (W)w); 2042 clear_pending (EV_A_ (W)w);
1952 if (expect_false (!ev_is_active (w))) 2043 if (expect_false (!ev_is_active (w)))
1953 return; 2044 return;
1954 2045
1955#if EV_USE_INOTIFY 2046#if EV_USE_INOTIFY
1956 infy_del (EV_A_ w); 2047 infy_del (EV_A_ w);
… …
1959 2050
1960 ev_stop (EV_A_ (W)w); 2051 ev_stop (EV_A_ (W)w);
1961} 2052}
1962#endif 2053#endif
1963 2054
2055#if EV_IDLE_ENABLE
1964void 2056void
1965ev_idle_start (EV_P_ ev_idle *w) 2057ev_idle_start (EV_P_ ev_idle *w)
1966{ 2058{
1967 if (expect_false (ev_is_active (w))) 2059 if (expect_false (ev_is_active (w)))
1968 return; 2060 return;
1969 2061
2062 pri_adjust (EV_A_ (W)w);
2063
2064 {
2065 int active = ++idlecnt [ABSPRI (w)];
2066
2067 ++idleall;
1970 ev_start (EV_A_ (W)w, ++idlecnt); 2068 ev_start (EV_A_ (W)w, active);
2069
1971 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2070 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1972 idles [idlecnt - 1] = w; 2071 idles [ABSPRI (w)][active - 1] = w;
2072 }
1973} 2073}
1974 2074
1975void 2075void
1976ev_idle_stop (EV_P_ ev_idle *w) 2076ev_idle_stop (EV_P_ ev_idle *w)
1977{ 2077{
1978 ev_clear_pending (EV_A_ (W)w); 2078 clear_pending (EV_A_ (W)w);
1979 if (expect_false (!ev_is_active (w))) 2079 if (expect_false (!ev_is_active (w)))
1980 return; 2080 return;
1981 2081
1982 { 2082 {
1983 int active = ((W)w)->active; 2083 int active = ((W)w)->active;
1984 idles [active - 1] = idles [--idlecnt]; 2084
2085 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1985 ((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;
1986 } 2090 }
1987
1988 ev_stop (EV_A_ (W)w);
1989} 2091}
2092#endif
1990 2093
1991void 2094void
1992ev_prepare_start (EV_P_ ev_prepare *w) 2095ev_prepare_start (EV_P_ ev_prepare *w)
1993{ 2096{
1994 if (expect_false (ev_is_active (w))) 2097 if (expect_false (ev_is_active (w)))
… …
2000} 2103}
2001 2104
2002void 2105void
2003ev_prepare_stop (EV_P_ ev_prepare *w) 2106ev_prepare_stop (EV_P_ ev_prepare *w)
2004{ 2107{
2005 ev_clear_pending (EV_A_ (W)w); 2108 clear_pending (EV_A_ (W)w);
2006 if (expect_false (!ev_is_active (w))) 2109 if (expect_false (!ev_is_active (w)))
2007 return; 2110 return;
2008 2111
2009 { 2112 {
2010 int active = ((W)w)->active; 2113 int active = ((W)w)->active;
… …
2027} 2130}
2028 2131
2029void 2132void
2030ev_check_stop (EV_P_ ev_check *w) 2133ev_check_stop (EV_P_ ev_check *w)
2031{ 2134{
2032 ev_clear_pending (EV_A_ (W)w); 2135 clear_pending (EV_A_ (W)w);
2033 if (expect_false (!ev_is_active (w))) 2136 if (expect_false (!ev_is_active (w)))
2034 return; 2137 return;
2035 2138
2036 { 2139 {
2037 int active = ((W)w)->active; 2140 int active = ((W)w)->active;
… …
2079} 2182}
2080 2183
2081void 2184void
2082ev_embed_stop (EV_P_ ev_embed *w) 2185ev_embed_stop (EV_P_ ev_embed *w)
2083{ 2186{
2084 ev_clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
2085 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
2086 return; 2189 return;
2087 2190
2088 ev_io_stop (EV_A_ &w->io); 2191 ev_io_stop (EV_A_ &w->io);
2089 2192
… …
2104} 2207}
2105 2208
2106void 2209void
2107ev_fork_stop (EV_P_ ev_fork *w) 2210ev_fork_stop (EV_P_ ev_fork *w)
2108{ 2211{
2109 ev_clear_pending (EV_A_ (W)w); 2212 clear_pending (EV_A_ (W)w);
2110 if (expect_false (!ev_is_active (w))) 2213 if (expect_false (!ev_is_active (w)))
2111 return; 2214 return;
2112 2215
2113 { 2216 {
2114 int active = ((W)w)->active; 2217 int active = ((W)w)->active;

Diff Legend

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