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

Comparing libev/ev.c (file contents):
Revision 1.157 by root, Wed Nov 28 20:58:32 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{
… …
725 for (signum = signalmax; signum--; ) 759 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig) 760 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1); 761 ev_feed_signal_event (EV_A_ signum + 1);
728} 762}
729 763
730void inline_size 764void inline_speed
731fd_intern (int fd) 765fd_intern (int fd)
732{ 766{
733#ifdef _WIN32 767#ifdef _WIN32
734 int arg = 1; 768 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 769 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
764 ev_child *w; 798 ev_child *w;
765 799
766 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)
767 if (w->pid == pid || !w->pid) 801 if (w->pid == pid || !w->pid)
768 { 802 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 803 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
770 w->rpid = pid; 804 w->rpid = pid;
771 w->rstatus = status; 805 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 806 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 807 }
774} 808}
775 809
776#ifndef WCONTINUED 810#ifndef WCONTINUED
… …
886ev_backend (EV_P) 920ev_backend (EV_P)
887{ 921{
888 return backend; 922 return backend;
889} 923}
890 924
925unsigned int
926ev_loop_count (EV_P)
927{
928 return loop_count;
929}
930
891static void noinline 931static void noinline
892loop_init (EV_P_ unsigned int flags) 932loop_init (EV_P_ unsigned int flags)
893{ 933{
894 if (!backend) 934 if (!backend)
895 { 935 {
… …
904 ev_rt_now = ev_time (); 944 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 945 mn_now = get_clock ();
906 now_floor = mn_now; 946 now_floor = mn_now;
907 rtmn_diff = ev_rt_now - mn_now; 947 rtmn_diff = ev_rt_now - mn_now;
908 948
949 /* pid check not overridable via env */
950#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid ();
953#endif
954
909 if (!(flags & EVFLAG_NOENV) 955 if (!(flags & EVFLAG_NOENV)
910 && !enable_secure () 956 && !enable_secure ()
911 && getenv ("LIBEV_FLAGS")) 957 && getenv ("LIBEV_FLAGS"))
912 flags = atoi (getenv ("LIBEV_FLAGS")); 958 flags = atoi (getenv ("LIBEV_FLAGS"));
913 959
… …
969#if EV_USE_SELECT 1015#if EV_USE_SELECT
970 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1016 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
971#endif 1017#endif
972 1018
973 for (i = NUMPRI; i--; ) 1019 for (i = NUMPRI; i--; )
1020 {
974 array_free (pending, [i]); 1021 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE
1023 array_free (idle, [i]);
1024#endif
1025 }
975 1026
976 /* have to use the microsoft-never-gets-it-right macro */ 1027 /* have to use the microsoft-never-gets-it-right macro */
977 array_free (fdchange, EMPTY0); 1028 array_free (fdchange, EMPTY);
978 array_free (timer, EMPTY0); 1029 array_free (timer, EMPTY);
979#if EV_PERIODIC_ENABLE 1030#if EV_PERIODIC_ENABLE
980 array_free (periodic, EMPTY0); 1031 array_free (periodic, EMPTY);
981#endif 1032#endif
982 array_free (idle, EMPTY0);
983 array_free (prepare, EMPTY0); 1033 array_free (prepare, EMPTY);
984 array_free (check, EMPTY0); 1034 array_free (check, EMPTY);
985 1035
986 backend = 0; 1036 backend = 0;
987} 1037}
988 1038
989void inline_size infy_fork (EV_P); 1039void inline_size infy_fork (EV_P);
… …
1125 postfork = 1; 1175 postfork = 1;
1126} 1176}
1127 1177
1128/*****************************************************************************/ 1178/*****************************************************************************/
1129 1179
1130int inline_size 1180void
1131any_pending (EV_P) 1181ev_invoke (EV_P_ void *w, int revents)
1132{ 1182{
1133 int pri; 1183 EV_CB_INVOKE ((W)w, revents);
1134
1135 for (pri = NUMPRI; pri--; )
1136 if (pendingcnt [pri])
1137 return 1;
1138
1139 return 0;
1140} 1184}
1141 1185
1142void inline_speed 1186void inline_speed
1143call_pending (EV_P) 1187call_pending (EV_P)
1144{ 1188{
… …
1197 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1198 1242
1199 /* first reschedule or stop timer */ 1243 /* first reschedule or stop timer */
1200 if (w->reschedule_cb) 1244 if (w->reschedule_cb)
1201 { 1245 {
1202 ((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);
1203 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));
1204 downheap ((WT *)periodics, periodiccnt, 0); 1248 downheap ((WT *)periodics, periodiccnt, 0);
1205 } 1249 }
1206 else if (w->interval) 1250 else if (w->interval)
1207 { 1251 {
1208 ((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;
1209 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));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1211 } 1256 }
1212 else 1257 else
1213 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1227 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1228 1273
1229 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1230 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1231 else if (w->interval) 1276 else if (w->interval)
1232 ((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;
1233 } 1278 }
1234 1279
1235 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1236 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1237 downheap ((WT *)periodics, periodiccnt, i); 1282 downheap ((WT *)periodics, periodiccnt, i);
1238} 1283}
1239#endif 1284#endif
1240 1285
1286#if EV_IDLE_ENABLE
1241int inline_size 1287void inline_size
1242time_update_monotonic (EV_P) 1288idle_reify (EV_P)
1243{ 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
1244 mn_now = get_clock (); 1319 mn_now = get_clock ();
1245 1320
1321 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1322 /* interpolate in the meantime */
1246 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1323 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1247 { 1324 {
1248 ev_rt_now = rtmn_diff + mn_now; 1325 ev_rt_now = rtmn_diff + mn_now;
1249 return 0; 1326 return;
1250 } 1327 }
1251 else 1328
1252 {
1253 now_floor = mn_now; 1329 now_floor = mn_now;
1254 ev_rt_now = ev_time (); 1330 ev_rt_now = ev_time ();
1255 return 1;
1256 }
1257}
1258 1331
1259void inline_size 1332 /* loop a few times, before making important decisions.
1260time_update (EV_P) 1333 * on the choice of "4": one iteration isn't enough,
1261{ 1334 * in case we get preempted during the calls to
1262 int i; 1335 * ev_time and get_clock. a second call is almost guaranteed
1263 1336 * to succeed in that case, though. and looping a few more times
1264#if EV_USE_MONOTONIC 1337 * doesn't hurt either as we only do this on time-jumps or
1265 if (expect_true (have_monotonic)) 1338 * in the unlikely event of having been preempted here.
1266 { 1339 */
1267 if (time_update_monotonic (EV_A)) 1340 for (i = 4; --i; )
1268 { 1341 {
1269 ev_tstamp odiff = rtmn_diff;
1270
1271 /* loop a few times, before making important decisions.
1272 * on the choice of "4": one iteration isn't enough,
1273 * in case we get preempted during the calls to
1274 * ev_time and get_clock. a second call is almost guaranteed
1275 * to succeed in that case, though. and looping a few more times
1276 * doesn't hurt either as we only do this on time-jumps or
1277 * in the unlikely event of having been preempted here.
1278 */
1279 for (i = 4; --i; )
1280 {
1281 rtmn_diff = ev_rt_now - mn_now; 1342 rtmn_diff = ev_rt_now - mn_now;
1282 1343
1283 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1344 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1284 return; /* all is well */ 1345 return; /* all is well */
1285 1346
1286 ev_rt_now = ev_time (); 1347 ev_rt_now = ev_time ();
1287 mn_now = get_clock (); 1348 mn_now = get_clock ();
1288 now_floor = mn_now; 1349 now_floor = mn_now;
1289 } 1350 }
1290 1351
1291# if EV_PERIODIC_ENABLE 1352# if EV_PERIODIC_ENABLE
1292 periodics_reschedule (EV_A); 1353 periodics_reschedule (EV_A);
1293# endif 1354# endif
1294 /* no timer adjustment, as the monotonic clock doesn't jump */ 1355 /* no timer adjustment, as the monotonic clock doesn't jump */
1295 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1356 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1296 }
1297 } 1357 }
1298 else 1358 else
1299#endif 1359#endif
1300 { 1360 {
1301 ev_rt_now = ev_time (); 1361 ev_rt_now = ev_time ();
1302 1362
1303 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))
1304 { 1364 {
1305#if EV_PERIODIC_ENABLE 1365#if EV_PERIODIC_ENABLE
1306 periodics_reschedule (EV_A); 1366 periodics_reschedule (EV_A);
1307#endif 1367#endif
1308
1309 /* adjust timers. this is easy, as the offset is the same for all of them */ 1368 /* adjust timers. this is easy, as the offset is the same for all of them */
1310 for (i = 0; i < timercnt; ++i) 1369 for (i = 0; i < timercnt; ++i)
1311 ((WT)timers [i])->at += ev_rt_now - mn_now; 1370 ((WT)timers [i])->at += ev_rt_now - mn_now;
1312 } 1371 }
1313 1372
… …
1334{ 1393{
1335 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1394 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1336 ? EVUNLOOP_ONE 1395 ? EVUNLOOP_ONE
1337 : EVUNLOOP_CANCEL; 1396 : EVUNLOOP_CANCEL;
1338 1397
1339 while (activecnt) 1398 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1399
1400 do
1340 { 1401 {
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
1341#if EV_FORK_ENABLE 1411#if EV_FORK_ENABLE
1342 /* we might have forked, so queue fork handlers */ 1412 /* we might have forked, so queue fork handlers */
1343 if (expect_false (postfork)) 1413 if (expect_false (postfork))
1344 if (forkcnt) 1414 if (forkcnt)
1345 { 1415 {
1346 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1416 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1347 call_pending (EV_A); 1417 call_pending (EV_A);
1348 } 1418 }
1349#endif 1419#endif
1350 1420
1351 /* queue check watchers (and execute them) */ 1421 /* queue prepare watchers (and execute them) */
1352 if (expect_false (preparecnt)) 1422 if (expect_false (preparecnt))
1353 { 1423 {
1354 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1424 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1355 call_pending (EV_A); 1425 call_pending (EV_A);
1356 } 1426 }
1357 1427
1428 if (expect_false (!activecnt))
1429 break;
1430
1358 /* we might have forked, so reify kernel state if necessary */ 1431 /* we might have forked, so reify kernel state if necessary */
1359 if (expect_false (postfork)) 1432 if (expect_false (postfork))
1360 loop_fork (EV_A); 1433 loop_fork (EV_A);
1361 1434
1362 /* update fd-related kernel structures */ 1435 /* update fd-related kernel structures */
… …
1364 1437
1365 /* calculate blocking time */ 1438 /* calculate blocking time */
1366 { 1439 {
1367 ev_tstamp block; 1440 ev_tstamp block;
1368 1441
1369 if (flags & EVLOOP_NONBLOCK || idlecnt) 1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1370 block = 0.; /* do not block at all */ 1443 block = 0.; /* do not block at all */
1371 else 1444 else
1372 { 1445 {
1373 /* update time to cancel out callback processing overhead */ 1446 /* update time to cancel out callback processing overhead */
1374#if EV_USE_MONOTONIC
1375 if (expect_true (have_monotonic))
1376 time_update_monotonic (EV_A); 1447 time_update (EV_A_ 1e100);
1377 else
1378#endif
1379 {
1380 ev_rt_now = ev_time ();
1381 mn_now = ev_rt_now;
1382 }
1383 1448
1384 block = MAX_BLOCKTIME; 1449 block = MAX_BLOCKTIME;
1385 1450
1386 if (timercnt) 1451 if (timercnt)
1387 { 1452 {
… …
1398#endif 1463#endif
1399 1464
1400 if (expect_false (block < 0.)) block = 0.; 1465 if (expect_false (block < 0.)) block = 0.;
1401 } 1466 }
1402 1467
1468 ++loop_count;
1403 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);
1404 } 1473 }
1405
1406 /* update ev_rt_now, do magic */
1407 time_update (EV_A);
1408 1474
1409 /* queue pending timers and reschedule them */ 1475 /* queue pending timers and reschedule them */
1410 timers_reify (EV_A); /* relative timers called last */ 1476 timers_reify (EV_A); /* relative timers called last */
1411#if EV_PERIODIC_ENABLE 1477#if EV_PERIODIC_ENABLE
1412 periodics_reify (EV_A); /* absolute timers called first */ 1478 periodics_reify (EV_A); /* absolute timers called first */
1413#endif 1479#endif
1414 1480
1481#if EV_IDLE_ENABLE
1415 /* queue idle watchers unless other events are pending */ 1482 /* queue idle watchers unless other events are pending */
1416 if (idlecnt && !any_pending (EV_A)) 1483 idle_reify (EV_A);
1417 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1484#endif
1418 1485
1419 /* queue check watchers, to be executed first */ 1486 /* queue check watchers, to be executed first */
1420 if (expect_false (checkcnt)) 1487 if (expect_false (checkcnt))
1421 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1488 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1422 1489
1423 call_pending (EV_A); 1490 call_pending (EV_A);
1424 1491
1425 if (expect_false (loop_done))
1426 break;
1427 } 1492 }
1493 while (expect_true (activecnt && !loop_done));
1428 1494
1429 if (loop_done == EVUNLOOP_ONE) 1495 if (loop_done == EVUNLOOP_ONE)
1430 loop_done = EVUNLOOP_CANCEL; 1496 loop_done = EVUNLOOP_CANCEL;
1431} 1497}
1432 1498
… …
1459 head = &(*head)->next; 1525 head = &(*head)->next;
1460 } 1526 }
1461} 1527}
1462 1528
1463void inline_speed 1529void inline_speed
1464ev_clear_pending (EV_P_ W w) 1530clear_pending (EV_P_ W w)
1465{ 1531{
1466 if (w->pending) 1532 if (w->pending)
1467 { 1533 {
1468 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1534 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1469 w->pending = 0; 1535 w->pending = 0;
1470 } 1536 }
1471} 1537}
1472 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
1473void inline_speed 1565void inline_speed
1474ev_start (EV_P_ W w, int active) 1566ev_start (EV_P_ W w, int active)
1475{ 1567{
1476 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1568 pri_adjust (EV_A_ w);
1477 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1478
1479 w->active = active; 1569 w->active = active;
1480 ev_ref (EV_A); 1570 ev_ref (EV_A);
1481} 1571}
1482 1572
1483void inline_size 1573void inline_size
… …
1487 w->active = 0; 1577 w->active = 0;
1488} 1578}
1489 1579
1490/*****************************************************************************/ 1580/*****************************************************************************/
1491 1581
1492void 1582void noinline
1493ev_io_start (EV_P_ ev_io *w) 1583ev_io_start (EV_P_ ev_io *w)
1494{ 1584{
1495 int fd = w->fd; 1585 int fd = w->fd;
1496 1586
1497 if (expect_false (ev_is_active (w))) 1587 if (expect_false (ev_is_active (w)))
… …
1504 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1594 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1505 1595
1506 fd_change (EV_A_ fd); 1596 fd_change (EV_A_ fd);
1507} 1597}
1508 1598
1509void 1599void noinline
1510ev_io_stop (EV_P_ ev_io *w) 1600ev_io_stop (EV_P_ ev_io *w)
1511{ 1601{
1512 ev_clear_pending (EV_A_ (W)w); 1602 clear_pending (EV_A_ (W)w);
1513 if (expect_false (!ev_is_active (w))) 1603 if (expect_false (!ev_is_active (w)))
1514 return; 1604 return;
1515 1605
1516 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));
1517 1607
… …
1519 ev_stop (EV_A_ (W)w); 1609 ev_stop (EV_A_ (W)w);
1520 1610
1521 fd_change (EV_A_ w->fd); 1611 fd_change (EV_A_ w->fd);
1522} 1612}
1523 1613
1524void 1614void noinline
1525ev_timer_start (EV_P_ ev_timer *w) 1615ev_timer_start (EV_P_ ev_timer *w)
1526{ 1616{
1527 if (expect_false (ev_is_active (w))) 1617 if (expect_false (ev_is_active (w)))
1528 return; 1618 return;
1529 1619
… …
1537 upheap ((WT *)timers, timercnt - 1); 1627 upheap ((WT *)timers, timercnt - 1);
1538 1628
1539 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1540} 1630}
1541 1631
1542void 1632void noinline
1543ev_timer_stop (EV_P_ ev_timer *w) 1633ev_timer_stop (EV_P_ ev_timer *w)
1544{ 1634{
1545 ev_clear_pending (EV_A_ (W)w); 1635 clear_pending (EV_A_ (W)w);
1546 if (expect_false (!ev_is_active (w))) 1636 if (expect_false (!ev_is_active (w)))
1547 return; 1637 return;
1548 1638
1549 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1550 1640
… …
1561 ((WT)w)->at -= mn_now; 1651 ((WT)w)->at -= mn_now;
1562 1652
1563 ev_stop (EV_A_ (W)w); 1653 ev_stop (EV_A_ (W)w);
1564} 1654}
1565 1655
1566void 1656void noinline
1567ev_timer_again (EV_P_ ev_timer *w) 1657ev_timer_again (EV_P_ ev_timer *w)
1568{ 1658{
1569 if (ev_is_active (w)) 1659 if (ev_is_active (w))
1570 { 1660 {
1571 if (w->repeat) 1661 if (w->repeat)
… …
1582 ev_timer_start (EV_A_ w); 1672 ev_timer_start (EV_A_ w);
1583 } 1673 }
1584} 1674}
1585 1675
1586#if EV_PERIODIC_ENABLE 1676#if EV_PERIODIC_ENABLE
1587void 1677void noinline
1588ev_periodic_start (EV_P_ ev_periodic *w) 1678ev_periodic_start (EV_P_ ev_periodic *w)
1589{ 1679{
1590 if (expect_false (ev_is_active (w))) 1680 if (expect_false (ev_is_active (w)))
1591 return; 1681 return;
1592 1682
… …
1594 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1684 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1595 else if (w->interval) 1685 else if (w->interval)
1596 { 1686 {
1597 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.));
1598 /* 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 */
1599 ((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;
1600 } 1690 }
1691 else
1692 ((WT)w)->at = w->offset;
1601 1693
1602 ev_start (EV_A_ (W)w, ++periodiccnt); 1694 ev_start (EV_A_ (W)w, ++periodiccnt);
1603 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1604 periodics [periodiccnt - 1] = w; 1696 periodics [periodiccnt - 1] = w;
1605 upheap ((WT *)periodics, periodiccnt - 1); 1697 upheap ((WT *)periodics, periodiccnt - 1);
1606 1698
1607 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1608} 1700}
1609 1701
1610void 1702void noinline
1611ev_periodic_stop (EV_P_ ev_periodic *w) 1703ev_periodic_stop (EV_P_ ev_periodic *w)
1612{ 1704{
1613 ev_clear_pending (EV_A_ (W)w); 1705 clear_pending (EV_A_ (W)w);
1614 if (expect_false (!ev_is_active (w))) 1706 if (expect_false (!ev_is_active (w)))
1615 return; 1707 return;
1616 1708
1617 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1618 1710
… …
1627 } 1719 }
1628 1720
1629 ev_stop (EV_A_ (W)w); 1721 ev_stop (EV_A_ (W)w);
1630} 1722}
1631 1723
1632void 1724void noinline
1633ev_periodic_again (EV_P_ ev_periodic *w) 1725ev_periodic_again (EV_P_ ev_periodic *w)
1634{ 1726{
1635 /* TODO: use adjustheap and recalculation */ 1727 /* TODO: use adjustheap and recalculation */
1636 ev_periodic_stop (EV_A_ w); 1728 ev_periodic_stop (EV_A_ w);
1637 ev_periodic_start (EV_A_ w); 1729 ev_periodic_start (EV_A_ w);
… …
1640 1732
1641#ifndef SA_RESTART 1733#ifndef SA_RESTART
1642# define SA_RESTART 0 1734# define SA_RESTART 0
1643#endif 1735#endif
1644 1736
1645void 1737void noinline
1646ev_signal_start (EV_P_ ev_signal *w) 1738ev_signal_start (EV_P_ ev_signal *w)
1647{ 1739{
1648#if EV_MULTIPLICITY 1740#if EV_MULTIPLICITY
1649 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));
1650#endif 1742#endif
… …
1669 sigaction (w->signum, &sa, 0); 1761 sigaction (w->signum, &sa, 0);
1670#endif 1762#endif
1671 } 1763 }
1672} 1764}
1673 1765
1674void 1766void noinline
1675ev_signal_stop (EV_P_ ev_signal *w) 1767ev_signal_stop (EV_P_ ev_signal *w)
1676{ 1768{
1677 ev_clear_pending (EV_A_ (W)w); 1769 clear_pending (EV_A_ (W)w);
1678 if (expect_false (!ev_is_active (w))) 1770 if (expect_false (!ev_is_active (w)))
1679 return; 1771 return;
1680 1772
1681 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1682 ev_stop (EV_A_ (W)w); 1774 ev_stop (EV_A_ (W)w);
… …
1699} 1791}
1700 1792
1701void 1793void
1702ev_child_stop (EV_P_ ev_child *w) 1794ev_child_stop (EV_P_ ev_child *w)
1703{ 1795{
1704 ev_clear_pending (EV_A_ (W)w); 1796 clear_pending (EV_A_ (W)w);
1705 if (expect_false (!ev_is_active (w))) 1797 if (expect_false (!ev_is_active (w)))
1706 return; 1798 return;
1707 1799
1708 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);
1709 ev_stop (EV_A_ (W)w); 1801 ev_stop (EV_A_ (W)w);
… …
1945} 2037}
1946 2038
1947void 2039void
1948ev_stat_stop (EV_P_ ev_stat *w) 2040ev_stat_stop (EV_P_ ev_stat *w)
1949{ 2041{
1950 ev_clear_pending (EV_A_ (W)w); 2042 clear_pending (EV_A_ (W)w);
1951 if (expect_false (!ev_is_active (w))) 2043 if (expect_false (!ev_is_active (w)))
1952 return; 2044 return;
1953 2045
1954#if EV_USE_INOTIFY 2046#if EV_USE_INOTIFY
1955 infy_del (EV_A_ w); 2047 infy_del (EV_A_ w);
… …
1958 2050
1959 ev_stop (EV_A_ (W)w); 2051 ev_stop (EV_A_ (W)w);
1960} 2052}
1961#endif 2053#endif
1962 2054
2055#if EV_IDLE_ENABLE
1963void 2056void
1964ev_idle_start (EV_P_ ev_idle *w) 2057ev_idle_start (EV_P_ ev_idle *w)
1965{ 2058{
1966 if (expect_false (ev_is_active (w))) 2059 if (expect_false (ev_is_active (w)))
1967 return; 2060 return;
1968 2061
2062 pri_adjust (EV_A_ (W)w);
2063
2064 {
2065 int active = ++idlecnt [ABSPRI (w)];
2066
2067 ++idleall;
1969 ev_start (EV_A_ (W)w, ++idlecnt); 2068 ev_start (EV_A_ (W)w, active);
2069
1970 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2070 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1971 idles [idlecnt - 1] = w; 2071 idles [ABSPRI (w)][active - 1] = w;
2072 }
1972} 2073}
1973 2074
1974void 2075void
1975ev_idle_stop (EV_P_ ev_idle *w) 2076ev_idle_stop (EV_P_ ev_idle *w)
1976{ 2077{
1977 ev_clear_pending (EV_A_ (W)w); 2078 clear_pending (EV_A_ (W)w);
1978 if (expect_false (!ev_is_active (w))) 2079 if (expect_false (!ev_is_active (w)))
1979 return; 2080 return;
1980 2081
1981 { 2082 {
1982 int active = ((W)w)->active; 2083 int active = ((W)w)->active;
1983 idles [active - 1] = idles [--idlecnt]; 2084
2085 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1984 ((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;
1985 } 2090 }
1986
1987 ev_stop (EV_A_ (W)w);
1988} 2091}
2092#endif
1989 2093
1990void 2094void
1991ev_prepare_start (EV_P_ ev_prepare *w) 2095ev_prepare_start (EV_P_ ev_prepare *w)
1992{ 2096{
1993 if (expect_false (ev_is_active (w))) 2097 if (expect_false (ev_is_active (w)))
… …
1999} 2103}
2000 2104
2001void 2105void
2002ev_prepare_stop (EV_P_ ev_prepare *w) 2106ev_prepare_stop (EV_P_ ev_prepare *w)
2003{ 2107{
2004 ev_clear_pending (EV_A_ (W)w); 2108 clear_pending (EV_A_ (W)w);
2005 if (expect_false (!ev_is_active (w))) 2109 if (expect_false (!ev_is_active (w)))
2006 return; 2110 return;
2007 2111
2008 { 2112 {
2009 int active = ((W)w)->active; 2113 int active = ((W)w)->active;
… …
2026} 2130}
2027 2131
2028void 2132void
2029ev_check_stop (EV_P_ ev_check *w) 2133ev_check_stop (EV_P_ ev_check *w)
2030{ 2134{
2031 ev_clear_pending (EV_A_ (W)w); 2135 clear_pending (EV_A_ (W)w);
2032 if (expect_false (!ev_is_active (w))) 2136 if (expect_false (!ev_is_active (w)))
2033 return; 2137 return;
2034 2138
2035 { 2139 {
2036 int active = ((W)w)->active; 2140 int active = ((W)w)->active;
… …
2078} 2182}
2079 2183
2080void 2184void
2081ev_embed_stop (EV_P_ ev_embed *w) 2185ev_embed_stop (EV_P_ ev_embed *w)
2082{ 2186{
2083 ev_clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
2084 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
2085 return; 2189 return;
2086 2190
2087 ev_io_stop (EV_A_ &w->io); 2191 ev_io_stop (EV_A_ &w->io);
2088 2192
… …
2103} 2207}
2104 2208
2105void 2209void
2106ev_fork_stop (EV_P_ ev_fork *w) 2210ev_fork_stop (EV_P_ ev_fork *w)
2107{ 2211{
2108 ev_clear_pending (EV_A_ (W)w); 2212 clear_pending (EV_A_ (W)w);
2109 if (expect_false (!ev_is_active (w))) 2213 if (expect_false (!ev_is_active (w)))
2110 return; 2214 return;
2111 2215
2112 { 2216 {
2113 int active = ((W)w)->active; 2217 int active = ((W)w)->active;

Diff Legend

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