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

Comparing libev/ev.c (file contents):
Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC vs.
Revision 1.185 by root, Fri Dec 14 18:22:30 2007 UTC

… …
202#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
205#endif 205#endif
206 206
207#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0
210#endif
211
212#if EV_USE_INOTIFY
213# include <sys/inotify.h>
214#endif
215
207#if EV_SELECT_IS_WINSOCKET 216#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 217# include <winsock.h>
209#endif
210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif 218#endif
218 219
219/**/ 220/**/
220 221
221/* 222/*
222 * This is used to avoid floating point rounding problems. 223 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics 224 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding 225 * to ensure progress, time-wise, even when rounding
225 * errors are against us. 226 * errors are against us.
226 * This value is good at least till the year 4000 227 * This value is good at least till the year 4000.
227 * and intervals up to 20 years.
228 * Better solutions welcome. 228 * Better solutions welcome.
229 */ 229 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
231 231
232#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 232#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
233#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 233#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
235 235
236#if __GNUC__ >= 3 236#if __GNUC__ >= 4
237# define expect(expr,value) __builtin_expect ((expr),(value)) 237# define expect(expr,value) __builtin_expect ((expr),(value))
238# define noinline __attribute__ ((noinline)) 238# define noinline __attribute__ ((noinline))
239#else 239#else
240# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
241# define noinline 241# define noinline
… …
477 pendings [pri][w_->pending - 1].w = w_; 477 pendings [pri][w_->pending - 1].w = w_;
478 pendings [pri][w_->pending - 1].events = revents; 478 pendings [pri][w_->pending - 1].events = revents;
479 } 479 }
480} 480}
481 481
482void inline_size 482void inline_speed
483queue_events (EV_P_ W *events, int eventcnt, int type) 483queue_events (EV_P_ W *events, int eventcnt, int type)
484{ 484{
485 int i; 485 int i;
486 486
487 for (i = 0; i < eventcnt; ++i) 487 for (i = 0; i < eventcnt; ++i)
… …
534 { 534 {
535 int fd = fdchanges [i]; 535 int fd = fdchanges [i];
536 ANFD *anfd = anfds + fd; 536 ANFD *anfd = anfds + fd;
537 ev_io *w; 537 ev_io *w;
538 538
539 int events = 0; 539 unsigned char events = 0;
540 540
541 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 541 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
542 events |= w->events; 542 events |= (unsigned char)w->events;
543 543
544#if EV_SELECT_IS_WINSOCKET 544#if EV_SELECT_IS_WINSOCKET
545 if (events) 545 if (events)
546 { 546 {
547 unsigned long argp; 547 unsigned long argp;
548 anfd->handle = _get_osfhandle (fd); 548 anfd->handle = _get_osfhandle (fd);
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
550 } 550 }
551#endif 551#endif
552 552
553 {
554 unsigned char o_events = anfd->events;
555 unsigned char o_reify = anfd->reify;
556
553 anfd->reify = 0; 557 anfd->reify = 0;
554
555 backend_modify (EV_A_ fd, anfd->events, events);
556 anfd->events = events; 558 anfd->events = events;
559
560 if (o_events != events || o_reify & EV_IOFDSET)
561 backend_modify (EV_A_ fd, o_events, events);
562 }
557 } 563 }
558 564
559 fdchangecnt = 0; 565 fdchangecnt = 0;
560} 566}
561 567
562void inline_size 568void inline_size
563fd_change (EV_P_ int fd) 569fd_change (EV_P_ int fd, int flags)
564{ 570{
565 if (expect_false (anfds [fd].reify)) 571 unsigned char reify = anfds [fd].reify;
566 return;
567
568 anfds [fd].reify = 1; 572 anfds [fd].reify |= flags;
569 573
574 if (expect_true (!reify))
575 {
570 ++fdchangecnt; 576 ++fdchangecnt;
571 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 577 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
572 fdchanges [fdchangecnt - 1] = fd; 578 fdchanges [fdchangecnt - 1] = fd;
579 }
573} 580}
574 581
575void inline_speed 582void inline_speed
576fd_kill (EV_P_ int fd) 583fd_kill (EV_P_ int fd)
577{ 584{
… …
628 635
629 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
630 if (anfds [fd].events) 637 if (anfds [fd].events)
631 { 638 {
632 anfds [fd].events = 0; 639 anfds [fd].events = 0;
633 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
634 } 641 }
635} 642}
636 643
637/*****************************************************************************/ 644/*****************************************************************************/
638 645
639void inline_speed 646void inline_speed
640upheap (WT *heap, int k) 647upheap (WT *heap, int k)
641{ 648{
642 WT w = heap [k]; 649 WT w = heap [k];
643 650
644 while (k && heap [k >> 1]->at > w->at) 651 while (k)
645 { 652 {
653 int p = (k - 1) >> 1;
654
655 if (heap [p]->at <= w->at)
656 break;
657
646 heap [k] = heap [k >> 1]; 658 heap [k] = heap [p];
647 ((W)heap [k])->active = k + 1; 659 ((W)heap [k])->active = k + 1;
648 k >>= 1; 660 k = p;
649 } 661 }
650 662
651 heap [k] = w; 663 heap [k] = w;
652 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
653
654} 665}
655 666
656void inline_speed 667void inline_speed
657downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
658{ 669{
659 WT w = heap [k]; 670 WT w = heap [k];
660 671
661 while (k < (N >> 1)) 672 for (;;)
662 { 673 {
663 int j = k << 1; 674 int c = (k << 1) + 1;
664 675
665 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 676 if (c >= N)
666 ++j;
667
668 if (w->at <= heap [j]->at)
669 break; 677 break;
670 678
679 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
680 ? 1 : 0;
681
682 if (w->at <= heap [c]->at)
683 break;
684
671 heap [k] = heap [j]; 685 heap [k] = heap [c];
672 ((W)heap [k])->active = k + 1; 686 ((W)heap [k])->active = k + 1;
687
673 k = j; 688 k = c;
674 } 689 }
675 690
676 heap [k] = w; 691 heap [k] = w;
677 ((W)heap [k])->active = k + 1; 692 ((W)heap [k])->active = k + 1;
678} 693}
… …
785 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
786} 801}
787 802
788/*****************************************************************************/ 803/*****************************************************************************/
789 804
790static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
791 806
792#ifndef _WIN32 807#ifndef _WIN32
793 808
794static ev_signal childev; 809static ev_signal childev;
795 810
… …
1207void inline_size 1222void inline_size
1208timers_reify (EV_P) 1223timers_reify (EV_P)
1209{ 1224{
1210 while (timercnt && ((WT)timers [0])->at <= mn_now) 1225 while (timercnt && ((WT)timers [0])->at <= mn_now)
1211 { 1226 {
1212 ev_timer *w = timers [0]; 1227 ev_timer *w = (ev_timer *)timers [0];
1213 1228
1214 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1229 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1215 1230
1216 /* first reschedule or stop timer */ 1231 /* first reschedule or stop timer */
1217 if (w->repeat) 1232 if (w->repeat)
… …
1220 1235
1221 ((WT)w)->at += w->repeat; 1236 ((WT)w)->at += w->repeat;
1222 if (((WT)w)->at < mn_now) 1237 if (((WT)w)->at < mn_now)
1223 ((WT)w)->at = mn_now; 1238 ((WT)w)->at = mn_now;
1224 1239
1225 downheap ((WT *)timers, timercnt, 0); 1240 downheap (timers, timercnt, 0);
1226 } 1241 }
1227 else 1242 else
1228 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1243 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1229 1244
1230 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1245 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1235void inline_size 1250void inline_size
1236periodics_reify (EV_P) 1251periodics_reify (EV_P)
1237{ 1252{
1238 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1253 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1239 { 1254 {
1240 ev_periodic *w = periodics [0]; 1255 ev_periodic *w = (ev_periodic *)periodics [0];
1241 1256
1242 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1257 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1243 1258
1244 /* first reschedule or stop timer */ 1259 /* first reschedule or stop timer */
1245 if (w->reschedule_cb) 1260 if (w->reschedule_cb)
1246 { 1261 {
1247 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1262 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1248 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1263 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1249 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap (periodics, periodiccnt, 0);
1250 } 1265 }
1251 else if (w->interval) 1266 else if (w->interval)
1252 { 1267 {
1253 ((WT)w)->at = w->offset + floor ((ev_rt_now + TIME_EPSILON - w->offset) / w->interval + 1.) * w->interval; 1268 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1269 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1270 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1255 downheap ((WT *)periodics, periodiccnt, 0); 1271 downheap (periodics, periodiccnt, 0);
1256 } 1272 }
1257 else 1273 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1274 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1275
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1276 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1283 int i;
1268 1284
1269 /* adjust periodics after time jump */ 1285 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1286 for (i = 0; i < periodiccnt; ++i)
1271 { 1287 {
1272 ev_periodic *w = periodics [i]; 1288 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1289
1274 if (w->reschedule_cb) 1290 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1291 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1292 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1293 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1294 }
1279 1295
1280 /* now rebuild the heap */ 1296 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1297 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1298 downheap (periodics, periodiccnt, i);
1283} 1299}
1284#endif 1300#endif
1285 1301
1286#if EV_IDLE_ENABLE 1302#if EV_IDLE_ENABLE
1287void inline_size 1303void inline_size
… …
1304 } 1320 }
1305 } 1321 }
1306} 1322}
1307#endif 1323#endif
1308 1324
1309int inline_size 1325void inline_speed
1310time_update_monotonic (EV_P) 1326time_update (EV_P_ ev_tstamp max_block)
1311{ 1327{
1328 int i;
1329
1330#if EV_USE_MONOTONIC
1331 if (expect_true (have_monotonic))
1332 {
1333 ev_tstamp odiff = rtmn_diff;
1334
1312 mn_now = get_clock (); 1335 mn_now = get_clock ();
1313 1336
1337 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1338 /* interpolate in the meantime */
1314 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1339 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1315 { 1340 {
1316 ev_rt_now = rtmn_diff + mn_now; 1341 ev_rt_now = rtmn_diff + mn_now;
1317 return 0; 1342 return;
1318 } 1343 }
1319 else 1344
1320 {
1321 now_floor = mn_now; 1345 now_floor = mn_now;
1322 ev_rt_now = ev_time (); 1346 ev_rt_now = ev_time ();
1323 return 1;
1324 }
1325}
1326 1347
1327void inline_size 1348 /* loop a few times, before making important decisions.
1328time_update (EV_P) 1349 * on the choice of "4": one iteration isn't enough,
1329{ 1350 * in case we get preempted during the calls to
1330 int i; 1351 * ev_time and get_clock. a second call is almost guaranteed
1331 1352 * to succeed in that case, though. and looping a few more times
1332#if EV_USE_MONOTONIC 1353 * doesn't hurt either as we only do this on time-jumps or
1333 if (expect_true (have_monotonic)) 1354 * in the unlikely event of having been preempted here.
1334 { 1355 */
1335 if (time_update_monotonic (EV_A)) 1356 for (i = 4; --i; )
1336 { 1357 {
1337 ev_tstamp odiff = rtmn_diff;
1338
1339 /* loop a few times, before making important decisions.
1340 * on the choice of "4": one iteration isn't enough,
1341 * in case we get preempted during the calls to
1342 * ev_time and get_clock. a second call is almost guaranteed
1343 * to succeed in that case, though. and looping a few more times
1344 * doesn't hurt either as we only do this on time-jumps or
1345 * in the unlikely event of having been preempted here.
1346 */
1347 for (i = 4; --i; )
1348 {
1349 rtmn_diff = ev_rt_now - mn_now; 1358 rtmn_diff = ev_rt_now - mn_now;
1350 1359
1351 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1360 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1352 return; /* all is well */ 1361 return; /* all is well */
1353 1362
1354 ev_rt_now = ev_time (); 1363 ev_rt_now = ev_time ();
1355 mn_now = get_clock (); 1364 mn_now = get_clock ();
1356 now_floor = mn_now; 1365 now_floor = mn_now;
1357 } 1366 }
1358 1367
1359# if EV_PERIODIC_ENABLE 1368# if EV_PERIODIC_ENABLE
1360 periodics_reschedule (EV_A); 1369 periodics_reschedule (EV_A);
1361# endif 1370# endif
1362 /* no timer adjustment, as the monotonic clock doesn't jump */ 1371 /* no timer adjustment, as the monotonic clock doesn't jump */
1363 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1372 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1364 }
1365 } 1373 }
1366 else 1374 else
1367#endif 1375#endif
1368 { 1376 {
1369 ev_rt_now = ev_time (); 1377 ev_rt_now = ev_time ();
1370 1378
1371 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1379 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1372 { 1380 {
1373#if EV_PERIODIC_ENABLE 1381#if EV_PERIODIC_ENABLE
1374 periodics_reschedule (EV_A); 1382 periodics_reschedule (EV_A);
1375#endif 1383#endif
1376
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1384 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1385 for (i = 0; i < timercnt; ++i)
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1386 ((WT)timers [i])->at += ev_rt_now - mn_now;
1380 } 1387 }
1381 1388
… …
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1458 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1452 block = 0.; /* do not block at all */ 1459 block = 0.; /* do not block at all */
1453 else 1460 else
1454 { 1461 {
1455 /* update time to cancel out callback processing overhead */ 1462 /* update time to cancel out callback processing overhead */
1456#if EV_USE_MONOTONIC
1457 if (expect_true (have_monotonic))
1458 time_update_monotonic (EV_A); 1463 time_update (EV_A_ 1e100);
1459 else
1460#endif
1461 {
1462 ev_rt_now = ev_time ();
1463 mn_now = ev_rt_now;
1464 }
1465 1464
1466 block = MAX_BLOCKTIME; 1465 block = MAX_BLOCKTIME;
1467 1466
1468 if (timercnt) 1467 if (timercnt)
1469 { 1468 {
… …
1482 if (expect_false (block < 0.)) block = 0.; 1481 if (expect_false (block < 0.)) block = 0.;
1483 } 1482 }
1484 1483
1485 ++loop_count; 1484 ++loop_count;
1486 backend_poll (EV_A_ block); 1485 backend_poll (EV_A_ block);
1486
1487 /* update ev_rt_now, do magic */
1488 time_update (EV_A_ block);
1487 } 1489 }
1488
1489 /* update ev_rt_now, do magic */
1490 time_update (EV_A);
1491 1490
1492 /* queue pending timers and reschedule them */ 1491 /* queue pending timers and reschedule them */
1493 timers_reify (EV_A); /* relative timers called last */ 1492 timers_reify (EV_A); /* relative timers called last */
1494#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1495 periodics_reify (EV_A); /* absolute timers called first */ 1494 periodics_reify (EV_A); /* absolute timers called first */
… …
1606 1605
1607 assert (("ev_io_start called with negative fd", fd >= 0)); 1606 assert (("ev_io_start called with negative fd", fd >= 0));
1608 1607
1609 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
1610 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1609 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1611 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1610 wlist_add (&anfds[fd].head, (WL)w);
1612 1611
1613 fd_change (EV_A_ fd); 1612 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1613 w->events &= ~EV_IOFDSET;
1614} 1614}
1615 1615
1616void noinline 1616void noinline
1617ev_io_stop (EV_P_ ev_io *w) 1617ev_io_stop (EV_P_ ev_io *w)
1618{ 1618{
… …
1620 if (expect_false (!ev_is_active (w))) 1620 if (expect_false (!ev_is_active (w)))
1621 return; 1621 return;
1622 1622
1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1624 1624
1625 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1625 wlist_del (&anfds[w->fd].head, (WL)w);
1626 ev_stop (EV_A_ (W)w); 1626 ev_stop (EV_A_ (W)w);
1627 1627
1628 fd_change (EV_A_ w->fd); 1628 fd_change (EV_A_ w->fd, 1);
1629} 1629}
1630 1630
1631void noinline 1631void noinline
1632ev_timer_start (EV_P_ ev_timer *w) 1632ev_timer_start (EV_P_ ev_timer *w)
1633{ 1633{
… …
1637 ((WT)w)->at += mn_now; 1637 ((WT)w)->at += mn_now;
1638 1638
1639 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1639 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1640 1640
1641 ev_start (EV_A_ (W)w, ++timercnt); 1641 ev_start (EV_A_ (W)w, ++timercnt);
1642 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1642 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1643 timers [timercnt - 1] = w; 1643 timers [timercnt - 1] = (WT)w;
1644 upheap ((WT *)timers, timercnt - 1); 1644 upheap (timers, timercnt - 1);
1645 1645
1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1647} 1647}
1648 1648
1649void noinline 1649void noinline
… …
1651{ 1651{
1652 clear_pending (EV_A_ (W)w); 1652 clear_pending (EV_A_ (W)w);
1653 if (expect_false (!ev_is_active (w))) 1653 if (expect_false (!ev_is_active (w)))
1654 return; 1654 return;
1655 1655
1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1657 1657
1658 { 1658 {
1659 int active = ((W)w)->active; 1659 int active = ((W)w)->active;
1660 1660
1661 if (expect_true (--active < --timercnt)) 1661 if (expect_true (--active < --timercnt))
1662 { 1662 {
1663 timers [active] = timers [timercnt]; 1663 timers [active] = timers [timercnt];
1664 adjustheap ((WT *)timers, timercnt, active); 1664 adjustheap (timers, timercnt, active);
1665 } 1665 }
1666 } 1666 }
1667 1667
1668 ((WT)w)->at -= mn_now; 1668 ((WT)w)->at -= mn_now;
1669 1669
… …
1676 if (ev_is_active (w)) 1676 if (ev_is_active (w))
1677 { 1677 {
1678 if (w->repeat) 1678 if (w->repeat)
1679 { 1679 {
1680 ((WT)w)->at = mn_now + w->repeat; 1680 ((WT)w)->at = mn_now + w->repeat;
1681 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1681 adjustheap (timers, timercnt, ((W)w)->active - 1);
1682 } 1682 }
1683 else 1683 else
1684 ev_timer_stop (EV_A_ w); 1684 ev_timer_stop (EV_A_ w);
1685 } 1685 }
1686 else if (w->repeat) 1686 else if (w->repeat)
… …
1707 } 1707 }
1708 else 1708 else
1709 ((WT)w)->at = w->offset; 1709 ((WT)w)->at = w->offset;
1710 1710
1711 ev_start (EV_A_ (W)w, ++periodiccnt); 1711 ev_start (EV_A_ (W)w, ++periodiccnt);
1712 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1712 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1713 periodics [periodiccnt - 1] = w; 1713 periodics [periodiccnt - 1] = (WT)w;
1714 upheap ((WT *)periodics, periodiccnt - 1); 1714 upheap (periodics, periodiccnt - 1);
1715 1715
1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1717} 1717}
1718 1718
1719void noinline 1719void noinline
… …
1721{ 1721{
1722 clear_pending (EV_A_ (W)w); 1722 clear_pending (EV_A_ (W)w);
1723 if (expect_false (!ev_is_active (w))) 1723 if (expect_false (!ev_is_active (w)))
1724 return; 1724 return;
1725 1725
1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1727 1727
1728 { 1728 {
1729 int active = ((W)w)->active; 1729 int active = ((W)w)->active;
1730 1730
1731 if (expect_true (--active < --periodiccnt)) 1731 if (expect_true (--active < --periodiccnt))
1732 { 1732 {
1733 periodics [active] = periodics [periodiccnt]; 1733 periodics [active] = periodics [periodiccnt];
1734 adjustheap ((WT *)periodics, periodiccnt, active); 1734 adjustheap (periodics, periodiccnt, active);
1735 } 1735 }
1736 } 1736 }
1737 1737
1738 ev_stop (EV_A_ (W)w); 1738 ev_stop (EV_A_ (W)w);
1739} 1739}
… …
1760 if (expect_false (ev_is_active (w))) 1760 if (expect_false (ev_is_active (w)))
1761 return; 1761 return;
1762 1762
1763 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1763 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1764 1764
1765 {
1766#ifndef _WIN32
1767 sigset_t full, prev;
1768 sigfillset (&full);
1769 sigprocmask (SIG_SETMASK, &full, &prev);
1770#endif
1771
1772 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1773
1774#ifndef _WIN32
1775 sigprocmask (SIG_SETMASK, &prev, 0);
1776#endif
1777 }
1778
1765 ev_start (EV_A_ (W)w, 1); 1779 ev_start (EV_A_ (W)w, 1);
1766 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1767 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1780 wlist_add (&signals [w->signum - 1].head, (WL)w);
1768 1781
1769 if (!((WL)w)->next) 1782 if (!((WL)w)->next)
1770 { 1783 {
1771#if _WIN32 1784#if _WIN32
1772 signal (w->signum, sighandler); 1785 signal (w->signum, sighandler);
… …
1785{ 1798{
1786 clear_pending (EV_A_ (W)w); 1799 clear_pending (EV_A_ (W)w);
1787 if (expect_false (!ev_is_active (w))) 1800 if (expect_false (!ev_is_active (w)))
1788 return; 1801 return;
1789 1802
1790 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1803 wlist_del (&signals [w->signum - 1].head, (WL)w);
1791 ev_stop (EV_A_ (W)w); 1804 ev_stop (EV_A_ (W)w);
1792 1805
1793 if (!signals [w->signum - 1].head) 1806 if (!signals [w->signum - 1].head)
1794 signal (w->signum, SIG_DFL); 1807 signal (w->signum, SIG_DFL);
1795} 1808}
… …
1802#endif 1815#endif
1803 if (expect_false (ev_is_active (w))) 1816 if (expect_false (ev_is_active (w)))
1804 return; 1817 return;
1805 1818
1806 ev_start (EV_A_ (W)w, 1); 1819 ev_start (EV_A_ (W)w, 1);
1807 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1820 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1808} 1821}
1809 1822
1810void 1823void
1811ev_child_stop (EV_P_ ev_child *w) 1824ev_child_stop (EV_P_ ev_child *w)
1812{ 1825{
1813 clear_pending (EV_A_ (W)w); 1826 clear_pending (EV_A_ (W)w);
1814 if (expect_false (!ev_is_active (w))) 1827 if (expect_false (!ev_is_active (w)))
1815 return; 1828 return;
1816 1829
1817 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1830 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1818 ev_stop (EV_A_ (W)w); 1831 ev_stop (EV_A_ (W)w);
1819} 1832}
1820 1833
1821#if EV_STAT_ENABLE 1834#if EV_STAT_ENABLE
1822 1835

Diff Legend

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