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

Comparing libev/ev.c (file contents):
Revision 1.177 by root, Tue Dec 11 15:06:50 2007 UTC vs.
Revision 1.188 by root, Thu Dec 20 07:12:57 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/*
… …
230 231
231#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) */
232#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) */
233/*#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 */
234 235
235#if __GNUC__ >= 3 236#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 237# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 238# define noinline __attribute__ ((noinline))
238#else 239#else
239# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
240# define noinline 241# define noinline
… …
476 pendings [pri][w_->pending - 1].w = w_; 477 pendings [pri][w_->pending - 1].w = w_;
477 pendings [pri][w_->pending - 1].events = revents; 478 pendings [pri][w_->pending - 1].events = revents;
478 } 479 }
479} 480}
480 481
481void inline_size 482void inline_speed
482queue_events (EV_P_ W *events, int eventcnt, int type) 483queue_events (EV_P_ W *events, int eventcnt, int type)
483{ 484{
484 int i; 485 int i;
485 486
486 for (i = 0; i < eventcnt; ++i) 487 for (i = 0; i < eventcnt; ++i)
… …
533 { 534 {
534 int fd = fdchanges [i]; 535 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 536 ANFD *anfd = anfds + fd;
536 ev_io *w; 537 ev_io *w;
537 538
538 int events = 0; 539 unsigned char events = 0;
539 540
540 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)
541 events |= w->events; 542 events |= (unsigned char)w->events;
542 543
543#if EV_SELECT_IS_WINSOCKET 544#if EV_SELECT_IS_WINSOCKET
544 if (events) 545 if (events)
545 { 546 {
546 unsigned long argp; 547 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 548 anfd->handle = _get_osfhandle (fd);
548 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));
549 } 550 }
550#endif 551#endif
551 552
553 {
554 unsigned char o_events = anfd->events;
555 unsigned char o_reify = anfd->reify;
556
552 anfd->reify = 0; 557 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 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 }
556 } 563 }
557 564
558 fdchangecnt = 0; 565 fdchangecnt = 0;
559} 566}
560 567
561void inline_size 568void inline_size
562fd_change (EV_P_ int fd) 569fd_change (EV_P_ int fd, int flags)
563{ 570{
564 if (expect_false (anfds [fd].reify)) 571 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 572 anfds [fd].reify |= flags;
568 573
574 if (expect_true (!reify))
575 {
569 ++fdchangecnt; 576 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 577 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 578 fdchanges [fdchangecnt - 1] = fd;
579 }
572} 580}
573 581
574void inline_speed 582void inline_speed
575fd_kill (EV_P_ int fd) 583fd_kill (EV_P_ int fd)
576{ 584{
… …
627 635
628 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 637 if (anfds [fd].events)
630 { 638 {
631 anfds [fd].events = 0; 639 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 641 }
634} 642}
635 643
636/*****************************************************************************/ 644/*****************************************************************************/
637 645
638void inline_speed 646void inline_speed
639upheap (WT *heap, int k) 647upheap (WT *heap, int k)
640{ 648{
641 WT w = heap [k]; 649 WT w = heap [k];
642 650
643 while (k && heap [k >> 1]->at > w->at) 651 while (k)
644 { 652 {
653 int p = (k - 1) >> 1;
654
655 if (heap [p]->at <= w->at)
656 break;
657
645 heap [k] = heap [k >> 1]; 658 heap [k] = heap [p];
646 ((W)heap [k])->active = k + 1; 659 ((W)heap [k])->active = k + 1;
647 k >>= 1; 660 k = p;
648 } 661 }
649 662
650 heap [k] = w; 663 heap [k] = w;
651 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
652
653} 665}
654 666
655void inline_speed 667void inline_speed
656downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
657{ 669{
658 WT w = heap [k]; 670 WT w = heap [k];
659 671
660 while (k < (N >> 1)) 672 for (;;)
661 { 673 {
662 int j = k << 1; 674 int c = (k << 1) + 1;
663 675
664 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 676 if (c >= N)
665 ++j;
666
667 if (w->at <= heap [j]->at)
668 break; 677 break;
669 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
670 heap [k] = heap [j]; 685 heap [k] = heap [c];
671 ((W)heap [k])->active = k + 1; 686 ((W)heap [k])->active = k + 1;
687
672 k = j; 688 k = c;
673 } 689 }
674 690
675 heap [k] = w; 691 heap [k] = w;
676 ((W)heap [k])->active = k + 1; 692 ((W)heap [k])->active = k + 1;
677} 693}
… …
784 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
785} 801}
786 802
787/*****************************************************************************/ 803/*****************************************************************************/
788 804
789static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
790 806
791#ifndef _WIN32 807#ifndef _WIN32
792 808
793static ev_signal childev; 809static ev_signal childev;
794 810
… …
1022#if EV_IDLE_ENABLE 1038#if EV_IDLE_ENABLE
1023 array_free (idle, [i]); 1039 array_free (idle, [i]);
1024#endif 1040#endif
1025 } 1041 }
1026 1042
1043 ev_free (anfds); anfdmax = 0;
1044
1027 /* have to use the microsoft-never-gets-it-right macro */ 1045 /* have to use the microsoft-never-gets-it-right macro */
1028 array_free (fdchange, EMPTY); 1046 array_free (fdchange, EMPTY);
1029 array_free (timer, EMPTY); 1047 array_free (timer, EMPTY);
1030#if EV_PERIODIC_ENABLE 1048#if EV_PERIODIC_ENABLE
1031 array_free (periodic, EMPTY); 1049 array_free (periodic, EMPTY);
1050#endif
1051#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY);
1032#endif 1053#endif
1033 array_free (prepare, EMPTY); 1054 array_free (prepare, EMPTY);
1034 array_free (check, EMPTY); 1055 array_free (check, EMPTY);
1035 1056
1036 backend = 0; 1057 backend = 0;
… …
1206void inline_size 1227void inline_size
1207timers_reify (EV_P) 1228timers_reify (EV_P)
1208{ 1229{
1209 while (timercnt && ((WT)timers [0])->at <= mn_now) 1230 while (timercnt && ((WT)timers [0])->at <= mn_now)
1210 { 1231 {
1211 ev_timer *w = timers [0]; 1232 ev_timer *w = (ev_timer *)timers [0];
1212 1233
1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1214 1235
1215 /* first reschedule or stop timer */ 1236 /* first reschedule or stop timer */
1216 if (w->repeat) 1237 if (w->repeat)
… …
1219 1240
1220 ((WT)w)->at += w->repeat; 1241 ((WT)w)->at += w->repeat;
1221 if (((WT)w)->at < mn_now) 1242 if (((WT)w)->at < mn_now)
1222 ((WT)w)->at = mn_now; 1243 ((WT)w)->at = mn_now;
1223 1244
1224 downheap ((WT *)timers, timercnt, 0); 1245 downheap (timers, timercnt, 0);
1225 } 1246 }
1226 else 1247 else
1227 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1228 1249
1229 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1234void inline_size 1255void inline_size
1235periodics_reify (EV_P) 1256periodics_reify (EV_P)
1236{ 1257{
1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1238 { 1259 {
1239 ev_periodic *w = periodics [0]; 1260 ev_periodic *w = (ev_periodic *)periodics [0];
1240 1261
1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1242 1263
1243 /* first reschedule or stop timer */ 1264 /* first reschedule or stop timer */
1244 if (w->reschedule_cb) 1265 if (w->reschedule_cb)
1245 { 1266 {
1246 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1267 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1247 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1268 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1248 downheap ((WT *)periodics, periodiccnt, 0); 1269 downheap (periodics, periodiccnt, 0);
1249 } 1270 }
1250 else if (w->interval) 1271 else if (w->interval)
1251 { 1272 {
1252 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1273 ((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; 1274 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)); 1275 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); 1276 downheap (periodics, periodiccnt, 0);
1256 } 1277 }
1257 else 1278 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1280
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1288 int i;
1268 1289
1269 /* adjust periodics after time jump */ 1290 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1291 for (i = 0; i < periodiccnt; ++i)
1271 { 1292 {
1272 ev_periodic *w = periodics [i]; 1293 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1294
1274 if (w->reschedule_cb) 1295 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1297 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1298 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1299 }
1279 1300
1280 /* now rebuild the heap */ 1301 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1302 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1303 downheap (periodics, periodiccnt, i);
1283} 1304}
1284#endif 1305#endif
1285 1306
1286#if EV_IDLE_ENABLE 1307#if EV_IDLE_ENABLE
1287void inline_size 1308void inline_size
… …
1304 } 1325 }
1305 } 1326 }
1306} 1327}
1307#endif 1328#endif
1308 1329
1309int inline_size 1330void inline_speed
1310time_update_monotonic (EV_P) 1331time_update (EV_P_ ev_tstamp max_block)
1311{ 1332{
1333 int i;
1334
1335#if EV_USE_MONOTONIC
1336 if (expect_true (have_monotonic))
1337 {
1338 ev_tstamp odiff = rtmn_diff;
1339
1312 mn_now = get_clock (); 1340 mn_now = get_clock ();
1313 1341
1342 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1343 /* interpolate in the meantime */
1314 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1344 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1315 { 1345 {
1316 ev_rt_now = rtmn_diff + mn_now; 1346 ev_rt_now = rtmn_diff + mn_now;
1317 return 0; 1347 return;
1318 } 1348 }
1319 else 1349
1320 {
1321 now_floor = mn_now; 1350 now_floor = mn_now;
1322 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1323 return 1;
1324 }
1325}
1326 1352
1327void inline_size 1353 /* loop a few times, before making important decisions.
1328time_update (EV_P) 1354 * on the choice of "4": one iteration isn't enough,
1329{ 1355 * in case we get preempted during the calls to
1330 int i; 1356 * ev_time and get_clock. a second call is almost guaranteed
1331 1357 * to succeed in that case, though. and looping a few more times
1332#if EV_USE_MONOTONIC 1358 * doesn't hurt either as we only do this on time-jumps or
1333 if (expect_true (have_monotonic)) 1359 * in the unlikely event of having been preempted here.
1334 { 1360 */
1335 if (time_update_monotonic (EV_A)) 1361 for (i = 4; --i; )
1336 { 1362 {
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; 1363 rtmn_diff = ev_rt_now - mn_now;
1350 1364
1351 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1365 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1352 return; /* all is well */ 1366 return; /* all is well */
1353 1367
1354 ev_rt_now = ev_time (); 1368 ev_rt_now = ev_time ();
1355 mn_now = get_clock (); 1369 mn_now = get_clock ();
1356 now_floor = mn_now; 1370 now_floor = mn_now;
1357 } 1371 }
1358 1372
1359# if EV_PERIODIC_ENABLE 1373# if EV_PERIODIC_ENABLE
1360 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1361# endif 1375# endif
1362 /* no timer adjustment, as the monotonic clock doesn't jump */ 1376 /* no timer adjustment, as the monotonic clock doesn't jump */
1363 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1377 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1364 }
1365 } 1378 }
1366 else 1379 else
1367#endif 1380#endif
1368 { 1381 {
1369 ev_rt_now = ev_time (); 1382 ev_rt_now = ev_time ();
1370 1383
1371 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1384 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1372 { 1385 {
1373#if EV_PERIODIC_ENABLE 1386#if EV_PERIODIC_ENABLE
1374 periodics_reschedule (EV_A); 1387 periodics_reschedule (EV_A);
1375#endif 1388#endif
1376 /* adjust timers. this is easy, as the offset is the same for all of them */ 1389 /* adjust timers. this is easy, as the offset is the same for all of them */
… …
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1451 block = 0.; /* do not block at all */ 1464 block = 0.; /* do not block at all */
1452 else 1465 else
1453 { 1466 {
1454 /* update time to cancel out callback processing overhead */ 1467 /* update time to cancel out callback processing overhead */
1455#if EV_USE_MONOTONIC
1456 if (expect_true (have_monotonic))
1457 time_update_monotonic (EV_A); 1468 time_update (EV_A_ 1e100);
1458 else
1459#endif
1460 {
1461 ev_rt_now = ev_time ();
1462 mn_now = ev_rt_now;
1463 }
1464 1469
1465 block = MAX_BLOCKTIME; 1470 block = MAX_BLOCKTIME;
1466 1471
1467 if (timercnt) 1472 if (timercnt)
1468 { 1473 {
… …
1481 if (expect_false (block < 0.)) block = 0.; 1486 if (expect_false (block < 0.)) block = 0.;
1482 } 1487 }
1483 1488
1484 ++loop_count; 1489 ++loop_count;
1485 backend_poll (EV_A_ block); 1490 backend_poll (EV_A_ block);
1491
1492 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block);
1486 } 1494 }
1487
1488 /* update ev_rt_now, do magic */
1489 time_update (EV_A);
1490 1495
1491 /* queue pending timers and reschedule them */ 1496 /* queue pending timers and reschedule them */
1492 timers_reify (EV_A); /* relative timers called last */ 1497 timers_reify (EV_A); /* relative timers called last */
1493#if EV_PERIODIC_ENABLE 1498#if EV_PERIODIC_ENABLE
1494 periodics_reify (EV_A); /* absolute timers called first */ 1499 periodics_reify (EV_A); /* absolute timers called first */
… …
1605 1610
1606 assert (("ev_io_start called with negative fd", fd >= 0)); 1611 assert (("ev_io_start called with negative fd", fd >= 0));
1607 1612
1608 ev_start (EV_A_ (W)w, 1); 1613 ev_start (EV_A_ (W)w, 1);
1609 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1614 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1610 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1615 wlist_add (&anfds[fd].head, (WL)w);
1611 1616
1612 fd_change (EV_A_ fd); 1617 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1618 w->events &= ~EV_IOFDSET;
1613} 1619}
1614 1620
1615void noinline 1621void noinline
1616ev_io_stop (EV_P_ ev_io *w) 1622ev_io_stop (EV_P_ ev_io *w)
1617{ 1623{
… …
1619 if (expect_false (!ev_is_active (w))) 1625 if (expect_false (!ev_is_active (w)))
1620 return; 1626 return;
1621 1627
1622 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1628 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1623 1629
1624 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1630 wlist_del (&anfds[w->fd].head, (WL)w);
1625 ev_stop (EV_A_ (W)w); 1631 ev_stop (EV_A_ (W)w);
1626 1632
1627 fd_change (EV_A_ w->fd); 1633 fd_change (EV_A_ w->fd, 1);
1628} 1634}
1629 1635
1630void noinline 1636void noinline
1631ev_timer_start (EV_P_ ev_timer *w) 1637ev_timer_start (EV_P_ ev_timer *w)
1632{ 1638{
… …
1636 ((WT)w)->at += mn_now; 1642 ((WT)w)->at += mn_now;
1637 1643
1638 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1644 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1639 1645
1640 ev_start (EV_A_ (W)w, ++timercnt); 1646 ev_start (EV_A_ (W)w, ++timercnt);
1641 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1642 timers [timercnt - 1] = w; 1648 timers [timercnt - 1] = (WT)w;
1643 upheap ((WT *)timers, timercnt - 1); 1649 upheap (timers, timercnt - 1);
1644 1650
1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1646} 1652}
1647 1653
1648void noinline 1654void noinline
… …
1650{ 1656{
1651 clear_pending (EV_A_ (W)w); 1657 clear_pending (EV_A_ (W)w);
1652 if (expect_false (!ev_is_active (w))) 1658 if (expect_false (!ev_is_active (w)))
1653 return; 1659 return;
1654 1660
1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1656 1662
1657 { 1663 {
1658 int active = ((W)w)->active; 1664 int active = ((W)w)->active;
1659 1665
1660 if (expect_true (--active < --timercnt)) 1666 if (expect_true (--active < --timercnt))
1661 { 1667 {
1662 timers [active] = timers [timercnt]; 1668 timers [active] = timers [timercnt];
1663 adjustheap ((WT *)timers, timercnt, active); 1669 adjustheap (timers, timercnt, active);
1664 } 1670 }
1665 } 1671 }
1666 1672
1667 ((WT)w)->at -= mn_now; 1673 ((WT)w)->at -= mn_now;
1668 1674
… …
1675 if (ev_is_active (w)) 1681 if (ev_is_active (w))
1676 { 1682 {
1677 if (w->repeat) 1683 if (w->repeat)
1678 { 1684 {
1679 ((WT)w)->at = mn_now + w->repeat; 1685 ((WT)w)->at = mn_now + w->repeat;
1680 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1686 adjustheap (timers, timercnt, ((W)w)->active - 1);
1681 } 1687 }
1682 else 1688 else
1683 ev_timer_stop (EV_A_ w); 1689 ev_timer_stop (EV_A_ w);
1684 } 1690 }
1685 else if (w->repeat) 1691 else if (w->repeat)
… …
1706 } 1712 }
1707 else 1713 else
1708 ((WT)w)->at = w->offset; 1714 ((WT)w)->at = w->offset;
1709 1715
1710 ev_start (EV_A_ (W)w, ++periodiccnt); 1716 ev_start (EV_A_ (W)w, ++periodiccnt);
1711 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1712 periodics [periodiccnt - 1] = w; 1718 periodics [periodiccnt - 1] = (WT)w;
1713 upheap ((WT *)periodics, periodiccnt - 1); 1719 upheap (periodics, periodiccnt - 1);
1714 1720
1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1716} 1722}
1717 1723
1718void noinline 1724void noinline
… …
1720{ 1726{
1721 clear_pending (EV_A_ (W)w); 1727 clear_pending (EV_A_ (W)w);
1722 if (expect_false (!ev_is_active (w))) 1728 if (expect_false (!ev_is_active (w)))
1723 return; 1729 return;
1724 1730
1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1726 1732
1727 { 1733 {
1728 int active = ((W)w)->active; 1734 int active = ((W)w)->active;
1729 1735
1730 if (expect_true (--active < --periodiccnt)) 1736 if (expect_true (--active < --periodiccnt))
1731 { 1737 {
1732 periodics [active] = periodics [periodiccnt]; 1738 periodics [active] = periodics [periodiccnt];
1733 adjustheap ((WT *)periodics, periodiccnt, active); 1739 adjustheap (periodics, periodiccnt, active);
1734 } 1740 }
1735 } 1741 }
1736 1742
1737 ev_stop (EV_A_ (W)w); 1743 ev_stop (EV_A_ (W)w);
1738} 1744}
… …
1759 if (expect_false (ev_is_active (w))) 1765 if (expect_false (ev_is_active (w)))
1760 return; 1766 return;
1761 1767
1762 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1763 1769
1770 {
1771#ifndef _WIN32
1772 sigset_t full, prev;
1773 sigfillset (&full);
1774 sigprocmask (SIG_SETMASK, &full, &prev);
1775#endif
1776
1777 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1778
1779#ifndef _WIN32
1780 sigprocmask (SIG_SETMASK, &prev, 0);
1781#endif
1782 }
1783
1764 ev_start (EV_A_ (W)w, 1); 1784 ev_start (EV_A_ (W)w, 1);
1765 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1766 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1785 wlist_add (&signals [w->signum - 1].head, (WL)w);
1767 1786
1768 if (!((WL)w)->next) 1787 if (!((WL)w)->next)
1769 { 1788 {
1770#if _WIN32 1789#if _WIN32
1771 signal (w->signum, sighandler); 1790 signal (w->signum, sighandler);
… …
1784{ 1803{
1785 clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1786 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1787 return; 1806 return;
1788 1807
1789 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1808 wlist_del (&signals [w->signum - 1].head, (WL)w);
1790 ev_stop (EV_A_ (W)w); 1809 ev_stop (EV_A_ (W)w);
1791 1810
1792 if (!signals [w->signum - 1].head) 1811 if (!signals [w->signum - 1].head)
1793 signal (w->signum, SIG_DFL); 1812 signal (w->signum, SIG_DFL);
1794} 1813}
… …
1801#endif 1820#endif
1802 if (expect_false (ev_is_active (w))) 1821 if (expect_false (ev_is_active (w)))
1803 return; 1822 return;
1804 1823
1805 ev_start (EV_A_ (W)w, 1); 1824 ev_start (EV_A_ (W)w, 1);
1806 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1825 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1807} 1826}
1808 1827
1809void 1828void
1810ev_child_stop (EV_P_ ev_child *w) 1829ev_child_stop (EV_P_ ev_child *w)
1811{ 1830{
1812 clear_pending (EV_A_ (W)w); 1831 clear_pending (EV_A_ (W)w);
1813 if (expect_false (!ev_is_active (w))) 1832 if (expect_false (!ev_is_active (w)))
1814 return; 1833 return;
1815 1834
1816 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1835 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1817 ev_stop (EV_A_ (W)w); 1836 ev_stop (EV_A_ (W)w);
1818} 1837}
1819 1838
1820#if EV_STAT_ENABLE 1839#if EV_STAT_ENABLE
1821 1840
… …
2163 2182
2164#if EV_EMBED_ENABLE 2183#if EV_EMBED_ENABLE
2165void noinline 2184void noinline
2166ev_embed_sweep (EV_P_ ev_embed *w) 2185ev_embed_sweep (EV_P_ ev_embed *w)
2167{ 2186{
2168 ev_loop (w->loop, EVLOOP_NONBLOCK); 2187 ev_loop (w->other, EVLOOP_NONBLOCK);
2169} 2188}
2170 2189
2171static void 2190static void
2172embed_cb (EV_P_ ev_io *io, int revents) 2191embed_cb (EV_P_ ev_io *io, int revents)
2173{ 2192{
… …
2184{ 2203{
2185 if (expect_false (ev_is_active (w))) 2204 if (expect_false (ev_is_active (w)))
2186 return; 2205 return;
2187 2206
2188 { 2207 {
2189 struct ev_loop *loop = w->loop; 2208 struct ev_loop *loop = w->other;
2190 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2209 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2191 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2210 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2192 } 2211 }
2193 2212
2194 ev_set_priority (&w->io, ev_priority (w)); 2213 ev_set_priority (&w->io, ev_priority (w));
… …
2301 ev_timer_set (&once->to, timeout, 0.); 2320 ev_timer_set (&once->to, timeout, 0.);
2302 ev_timer_start (EV_A_ &once->to); 2321 ev_timer_start (EV_A_ &once->to);
2303 } 2322 }
2304} 2323}
2305 2324
2325#if EV_MULTIPLICITY
2326 #include "ev_wrap.h"
2327#endif
2328
2306#ifdef __cplusplus 2329#ifdef __cplusplus
2307} 2330}
2308#endif 2331#endif
2309 2332

Diff Legend

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