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

Comparing libev/ev.c (file contents):
Revision 1.174 by root, Tue Dec 11 03:18:33 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 218#endif
210 219
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
219/**/ 220/**/
221
222/*
223 * This is used to avoid floating point rounding problems.
224 * It is added to ev_rt_now when scheduling periodics
225 * to ensure progress, time-wise, even when rounding
226 * errors are against us.
227 * This value is good at least till the year 4000.
228 * Better solutions welcome.
229 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 231
221#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) */
222#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) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 235
225#if __GNUC__ >= 3 236#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 237# define expect(expr,value) __builtin_expect ((expr),(value))
227# define noinline __attribute__ ((noinline)) 238# define noinline __attribute__ ((noinline))
228#else 239#else
229# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
230# define noinline 241# define noinline
… …
466 pendings [pri][w_->pending - 1].w = w_; 477 pendings [pri][w_->pending - 1].w = w_;
467 pendings [pri][w_->pending - 1].events = revents; 478 pendings [pri][w_->pending - 1].events = revents;
468 } 479 }
469} 480}
470 481
471void inline_size 482void inline_speed
472queue_events (EV_P_ W *events, int eventcnt, int type) 483queue_events (EV_P_ W *events, int eventcnt, int type)
473{ 484{
474 int i; 485 int i;
475 486
476 for (i = 0; i < eventcnt; ++i) 487 for (i = 0; i < eventcnt; ++i)
… …
523 { 534 {
524 int fd = fdchanges [i]; 535 int fd = fdchanges [i];
525 ANFD *anfd = anfds + fd; 536 ANFD *anfd = anfds + fd;
526 ev_io *w; 537 ev_io *w;
527 538
528 int events = 0; 539 unsigned char events = 0;
529 540
530 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)
531 events |= w->events; 542 events |= (unsigned char)w->events;
532 543
533#if EV_SELECT_IS_WINSOCKET 544#if EV_SELECT_IS_WINSOCKET
534 if (events) 545 if (events)
535 { 546 {
536 unsigned long argp; 547 unsigned long argp;
537 anfd->handle = _get_osfhandle (fd); 548 anfd->handle = _get_osfhandle (fd);
538 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));
539 } 550 }
540#endif 551#endif
541 552
553 {
554 unsigned char o_events = anfd->events;
555 unsigned char o_reify = anfd->reify;
556
542 anfd->reify = 0; 557 anfd->reify = 0;
543
544 backend_modify (EV_A_ fd, anfd->events, events);
545 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 }
546 } 563 }
547 564
548 fdchangecnt = 0; 565 fdchangecnt = 0;
549} 566}
550 567
551void inline_size 568void inline_size
552fd_change (EV_P_ int fd) 569fd_change (EV_P_ int fd, int flags)
553{ 570{
554 if (expect_false (anfds [fd].reify)) 571 unsigned char reify = anfds [fd].reify;
555 return;
556
557 anfds [fd].reify = 1; 572 anfds [fd].reify |= flags;
558 573
574 if (expect_true (!reify))
575 {
559 ++fdchangecnt; 576 ++fdchangecnt;
560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 577 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
561 fdchanges [fdchangecnt - 1] = fd; 578 fdchanges [fdchangecnt - 1] = fd;
579 }
562} 580}
563 581
564void inline_speed 582void inline_speed
565fd_kill (EV_P_ int fd) 583fd_kill (EV_P_ int fd)
566{ 584{
… …
617 635
618 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
619 if (anfds [fd].events) 637 if (anfds [fd].events)
620 { 638 {
621 anfds [fd].events = 0; 639 anfds [fd].events = 0;
622 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
623 } 641 }
624} 642}
625 643
626/*****************************************************************************/ 644/*****************************************************************************/
627 645
628void inline_speed 646void inline_speed
629upheap (WT *heap, int k) 647upheap (WT *heap, int k)
630{ 648{
631 WT w = heap [k]; 649 WT w = heap [k];
632 650
633 while (k && heap [k >> 1]->at > w->at) 651 while (k)
634 { 652 {
653 int p = (k - 1) >> 1;
654
655 if (heap [p]->at <= w->at)
656 break;
657
635 heap [k] = heap [k >> 1]; 658 heap [k] = heap [p];
636 ((W)heap [k])->active = k + 1; 659 ((W)heap [k])->active = k + 1;
637 k >>= 1; 660 k = p;
638 } 661 }
639 662
640 heap [k] = w; 663 heap [k] = w;
641 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
642
643} 665}
644 666
645void inline_speed 667void inline_speed
646downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
647{ 669{
648 WT w = heap [k]; 670 WT w = heap [k];
649 671
650 while (k < (N >> 1)) 672 for (;;)
651 { 673 {
652 int j = k << 1; 674 int c = (k << 1) + 1;
653 675
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 676 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 677 break;
659 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
660 heap [k] = heap [j]; 685 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 686 ((W)heap [k])->active = k + 1;
687
662 k = j; 688 k = c;
663 } 689 }
664 690
665 heap [k] = w; 691 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 692 ((W)heap [k])->active = k + 1;
667} 693}
… …
774 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
775} 801}
776 802
777/*****************************************************************************/ 803/*****************************************************************************/
778 804
779static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
780 806
781#ifndef _WIN32 807#ifndef _WIN32
782 808
783static ev_signal childev; 809static ev_signal childev;
784 810
… …
1196void inline_size 1222void inline_size
1197timers_reify (EV_P) 1223timers_reify (EV_P)
1198{ 1224{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1225 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1226 {
1201 ev_timer *w = timers [0]; 1227 ev_timer *w = (ev_timer *)timers [0];
1202 1228
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1229 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1230
1205 /* first reschedule or stop timer */ 1231 /* first reschedule or stop timer */
1206 if (w->repeat) 1232 if (w->repeat)
… …
1209 1235
1210 ((WT)w)->at += w->repeat; 1236 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1237 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1238 ((WT)w)->at = mn_now;
1213 1239
1214 downheap ((WT *)timers, timercnt, 0); 1240 downheap (timers, timercnt, 0);
1215 } 1241 }
1216 else 1242 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1243 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1244
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1245 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1250void inline_size
1225periodics_reify (EV_P) 1251periodics_reify (EV_P)
1226{ 1252{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1253 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1254 {
1229 ev_periodic *w = periodics [0]; 1255 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1256
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1257 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1258
1233 /* first reschedule or stop timer */ 1259 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1260 if (w->reschedule_cb)
1235 { 1261 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001220703125 /* 1/8192 */); 1262 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 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));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap (periodics, periodiccnt, 0);
1239 } 1265 }
1240 else if (w->interval) 1266 else if (w->interval)
1241 { 1267 {
1242 ((WT)w)->at = w->offset + floor ((ev_rt_now - 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;
1243 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));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1271 downheap (periodics, periodiccnt, 0);
1245 } 1272 }
1246 else 1273 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1274 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1275
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1276 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1283 int i;
1257 1284
1258 /* adjust periodics after time jump */ 1285 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1286 for (i = 0; i < periodiccnt; ++i)
1260 { 1287 {
1261 ev_periodic *w = periodics [i]; 1288 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1289
1263 if (w->reschedule_cb) 1290 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1291 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1292 else if (w->interval)
1266 ((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;
1267 } 1294 }
1268 1295
1269 /* now rebuild the heap */ 1296 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1297 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1298 downheap (periodics, periodiccnt, i);
1272} 1299}
1273#endif 1300#endif
1274 1301
1275#if EV_IDLE_ENABLE 1302#if EV_IDLE_ENABLE
1276void inline_size 1303void inline_size
… …
1293 } 1320 }
1294 } 1321 }
1295} 1322}
1296#endif 1323#endif
1297 1324
1298int inline_size 1325void inline_speed
1299time_update_monotonic (EV_P) 1326time_update (EV_P_ ev_tstamp max_block)
1300{ 1327{
1328 int i;
1329
1330#if EV_USE_MONOTONIC
1331 if (expect_true (have_monotonic))
1332 {
1333 ev_tstamp odiff = rtmn_diff;
1334
1301 mn_now = get_clock (); 1335 mn_now = get_clock ();
1302 1336
1337 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1338 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1339 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1340 {
1305 ev_rt_now = rtmn_diff + mn_now; 1341 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1342 return;
1307 } 1343 }
1308 else 1344
1309 {
1310 now_floor = mn_now; 1345 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1346 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1347
1316void inline_size 1348 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1349 * on the choice of "4": one iteration isn't enough,
1318{ 1350 * in case we get preempted during the calls to
1319 int i; 1351 * ev_time and get_clock. a second call is almost guaranteed
1320 1352 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1353 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1354 * in the unlikely event of having been preempted here.
1323 { 1355 */
1324 if (time_update_monotonic (EV_A)) 1356 for (i = 4; --i; )
1325 { 1357 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1358 rtmn_diff = ev_rt_now - mn_now;
1339 1359
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1360 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1361 return; /* all is well */
1342 1362
1343 ev_rt_now = ev_time (); 1363 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1364 mn_now = get_clock ();
1345 now_floor = mn_now; 1365 now_floor = mn_now;
1346 } 1366 }
1347 1367
1348# if EV_PERIODIC_ENABLE 1368# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1369 periodics_reschedule (EV_A);
1350# endif 1370# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1371 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1372 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1373 }
1355 else 1374 else
1356#endif 1375#endif
1357 { 1376 {
1358 ev_rt_now = ev_time (); 1377 ev_rt_now = ev_time ();
1359 1378
1360 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))
1361 { 1380 {
1362#if EV_PERIODIC_ENABLE 1381#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1382 periodics_reschedule (EV_A);
1364#endif 1383#endif
1365
1366 /* 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 */
1367 for (i = 0; i < timercnt; ++i) 1385 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1386 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1387 }
1370 1388
… …
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1458 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1441 block = 0.; /* do not block at all */ 1459 block = 0.; /* do not block at all */
1442 else 1460 else
1443 { 1461 {
1444 /* update time to cancel out callback processing overhead */ 1462 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 1463 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1464
1455 block = MAX_BLOCKTIME; 1465 block = MAX_BLOCKTIME;
1456 1466
1457 if (timercnt) 1467 if (timercnt)
1458 { 1468 {
… …
1471 if (expect_false (block < 0.)) block = 0.; 1481 if (expect_false (block < 0.)) block = 0.;
1472 } 1482 }
1473 1483
1474 ++loop_count; 1484 ++loop_count;
1475 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);
1476 } 1489 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1490
1481 /* queue pending timers and reschedule them */ 1491 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1492 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1494 periodics_reify (EV_A); /* absolute timers called first */
… …
1595 1605
1596 assert (("ev_io_start called with negative fd", fd >= 0)); 1606 assert (("ev_io_start called with negative fd", fd >= 0));
1597 1607
1598 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
1599 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1609 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1600 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1610 wlist_add (&anfds[fd].head, (WL)w);
1601 1611
1602 fd_change (EV_A_ fd); 1612 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1613 w->events &= ~EV_IOFDSET;
1603} 1614}
1604 1615
1605void noinline 1616void noinline
1606ev_io_stop (EV_P_ ev_io *w) 1617ev_io_stop (EV_P_ ev_io *w)
1607{ 1618{
… …
1609 if (expect_false (!ev_is_active (w))) 1620 if (expect_false (!ev_is_active (w)))
1610 return; 1621 return;
1611 1622
1612 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));
1613 1624
1614 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1625 wlist_del (&anfds[w->fd].head, (WL)w);
1615 ev_stop (EV_A_ (W)w); 1626 ev_stop (EV_A_ (W)w);
1616 1627
1617 fd_change (EV_A_ w->fd); 1628 fd_change (EV_A_ w->fd, 1);
1618} 1629}
1619 1630
1620void noinline 1631void noinline
1621ev_timer_start (EV_P_ ev_timer *w) 1632ev_timer_start (EV_P_ ev_timer *w)
1622{ 1633{
… …
1626 ((WT)w)->at += mn_now; 1637 ((WT)w)->at += mn_now;
1627 1638
1628 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.));
1629 1640
1630 ev_start (EV_A_ (W)w, ++timercnt); 1641 ev_start (EV_A_ (W)w, ++timercnt);
1631 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1642 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1632 timers [timercnt - 1] = w; 1643 timers [timercnt - 1] = (WT)w;
1633 upheap ((WT *)timers, timercnt - 1); 1644 upheap (timers, timercnt - 1);
1634 1645
1635 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1636} 1647}
1637 1648
1638void noinline 1649void noinline
… …
1640{ 1651{
1641 clear_pending (EV_A_ (W)w); 1652 clear_pending (EV_A_ (W)w);
1642 if (expect_false (!ev_is_active (w))) 1653 if (expect_false (!ev_is_active (w)))
1643 return; 1654 return;
1644 1655
1645 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1646 1657
1647 { 1658 {
1648 int active = ((W)w)->active; 1659 int active = ((W)w)->active;
1649 1660
1650 if (expect_true (--active < --timercnt)) 1661 if (expect_true (--active < --timercnt))
1651 { 1662 {
1652 timers [active] = timers [timercnt]; 1663 timers [active] = timers [timercnt];
1653 adjustheap ((WT *)timers, timercnt, active); 1664 adjustheap (timers, timercnt, active);
1654 } 1665 }
1655 } 1666 }
1656 1667
1657 ((WT)w)->at -= mn_now; 1668 ((WT)w)->at -= mn_now;
1658 1669
… …
1665 if (ev_is_active (w)) 1676 if (ev_is_active (w))
1666 { 1677 {
1667 if (w->repeat) 1678 if (w->repeat)
1668 { 1679 {
1669 ((WT)w)->at = mn_now + w->repeat; 1680 ((WT)w)->at = mn_now + w->repeat;
1670 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1681 adjustheap (timers, timercnt, ((W)w)->active - 1);
1671 } 1682 }
1672 else 1683 else
1673 ev_timer_stop (EV_A_ w); 1684 ev_timer_stop (EV_A_ w);
1674 } 1685 }
1675 else if (w->repeat) 1686 else if (w->repeat)
… …
1696 } 1707 }
1697 else 1708 else
1698 ((WT)w)->at = w->offset; 1709 ((WT)w)->at = w->offset;
1699 1710
1700 ev_start (EV_A_ (W)w, ++periodiccnt); 1711 ev_start (EV_A_ (W)w, ++periodiccnt);
1701 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1712 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1702 periodics [periodiccnt - 1] = w; 1713 periodics [periodiccnt - 1] = (WT)w;
1703 upheap ((WT *)periodics, periodiccnt - 1); 1714 upheap (periodics, periodiccnt - 1);
1704 1715
1705 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1706} 1717}
1707 1718
1708void noinline 1719void noinline
… …
1710{ 1721{
1711 clear_pending (EV_A_ (W)w); 1722 clear_pending (EV_A_ (W)w);
1712 if (expect_false (!ev_is_active (w))) 1723 if (expect_false (!ev_is_active (w)))
1713 return; 1724 return;
1714 1725
1715 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1716 1727
1717 { 1728 {
1718 int active = ((W)w)->active; 1729 int active = ((W)w)->active;
1719 1730
1720 if (expect_true (--active < --periodiccnt)) 1731 if (expect_true (--active < --periodiccnt))
1721 { 1732 {
1722 periodics [active] = periodics [periodiccnt]; 1733 periodics [active] = periodics [periodiccnt];
1723 adjustheap ((WT *)periodics, periodiccnt, active); 1734 adjustheap (periodics, periodiccnt, active);
1724 } 1735 }
1725 } 1736 }
1726 1737
1727 ev_stop (EV_A_ (W)w); 1738 ev_stop (EV_A_ (W)w);
1728} 1739}
… …
1749 if (expect_false (ev_is_active (w))) 1760 if (expect_false (ev_is_active (w)))
1750 return; 1761 return;
1751 1762
1752 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));
1753 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
1754 ev_start (EV_A_ (W)w, 1); 1779 ev_start (EV_A_ (W)w, 1);
1755 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1756 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1780 wlist_add (&signals [w->signum - 1].head, (WL)w);
1757 1781
1758 if (!((WL)w)->next) 1782 if (!((WL)w)->next)
1759 { 1783 {
1760#if _WIN32 1784#if _WIN32
1761 signal (w->signum, sighandler); 1785 signal (w->signum, sighandler);
… …
1774{ 1798{
1775 clear_pending (EV_A_ (W)w); 1799 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1800 if (expect_false (!ev_is_active (w)))
1777 return; 1801 return;
1778 1802
1779 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1803 wlist_del (&signals [w->signum - 1].head, (WL)w);
1780 ev_stop (EV_A_ (W)w); 1804 ev_stop (EV_A_ (W)w);
1781 1805
1782 if (!signals [w->signum - 1].head) 1806 if (!signals [w->signum - 1].head)
1783 signal (w->signum, SIG_DFL); 1807 signal (w->signum, SIG_DFL);
1784} 1808}
… …
1791#endif 1815#endif
1792 if (expect_false (ev_is_active (w))) 1816 if (expect_false (ev_is_active (w)))
1793 return; 1817 return;
1794 1818
1795 ev_start (EV_A_ (W)w, 1); 1819 ev_start (EV_A_ (W)w, 1);
1796 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1820 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1797} 1821}
1798 1822
1799void 1823void
1800ev_child_stop (EV_P_ ev_child *w) 1824ev_child_stop (EV_P_ ev_child *w)
1801{ 1825{
1802 clear_pending (EV_A_ (W)w); 1826 clear_pending (EV_A_ (W)w);
1803 if (expect_false (!ev_is_active (w))) 1827 if (expect_false (!ev_is_active (w)))
1804 return; 1828 return;
1805 1829
1806 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1830 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1807 ev_stop (EV_A_ (W)w); 1831 ev_stop (EV_A_ (W)w);
1808} 1832}
1809 1833
1810#if EV_STAT_ENABLE 1834#if EV_STAT_ENABLE
1811 1835

Diff Legend

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