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

Comparing libev/ev.c (file contents):
Revision 1.180 by root, Tue Dec 11 22:04:55 2007 UTC vs.
Revision 1.198 by root, Sun Dec 23 04:45:51 2007 UTC

… …
51# ifndef EV_USE_MONOTONIC 51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 52# define EV_USE_MONOTONIC 0
53# endif 53# endif
54# ifndef EV_USE_REALTIME 54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 55# define EV_USE_REALTIME 0
56# endif
57# endif
58
59# ifndef EV_USE_NANOSLEEP
60# if HAVE_NANOSLEEP
61# define EV_USE_NANOSLEEP 1
62# else
63# define EV_USE_NANOSLEEP 0
56# endif 64# endif
57# endif 65# endif
58 66
59# ifndef EV_USE_SELECT 67# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 68# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
146 154
147#ifndef EV_USE_REALTIME 155#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 156# define EV_USE_REALTIME 0
149#endif 157#endif
150 158
159#ifndef EV_USE_NANOSLEEP
160# define EV_USE_NANOSLEEP 0
161#endif
162
151#ifndef EV_USE_SELECT 163#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 164# define EV_USE_SELECT 1
153#endif 165#endif
154 166
155#ifndef EV_USE_POLL 167#ifndef EV_USE_POLL
… …
202#ifndef CLOCK_REALTIME 214#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 215# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 216# define EV_USE_REALTIME 0
205#endif 217#endif
206 218
219#if !EV_STAT_ENABLE
220# undef EV_USE_INOTIFY
221# define EV_USE_INOTIFY 0
222#endif
223
224#if !EV_USE_NANOSLEEP
225# ifndef _WIN32
226# include <sys/select.h>
227# endif
228#endif
229
230#if EV_USE_INOTIFY
231# include <sys/inotify.h>
232#endif
233
207#if EV_SELECT_IS_WINSOCKET 234#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 235# 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 236#endif
218 237
219/**/ 238/**/
220 239
221/* 240/*
… …
230 249
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 250#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) */ 251#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 */ 252/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 253
235#if __GNUC__ >= 3 254#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 255# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 256# define noinline __attribute__ ((noinline))
238#else 257#else
239# define expect(expr,value) (expr) 258# define expect(expr,value) (expr)
240# define noinline 259# define noinline
… …
261 280
262typedef ev_watcher *W; 281typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
265 284
285#if EV_USE_MONOTONIC
286/* sig_atomic_t is used to avoid per-thread variables or locking but still */
287/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 288static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
289#endif
267 290
268#ifdef _WIN32 291#ifdef _WIN32
269# include "ev_win32.c" 292# include "ev_win32.c"
270#endif 293#endif
271 294
… …
407{ 430{
408 return ev_rt_now; 431 return ev_rt_now;
409} 432}
410#endif 433#endif
411 434
435void
436ev_sleep (ev_tstamp delay)
437{
438 if (delay > 0.)
439 {
440#if EV_USE_NANOSLEEP
441 struct timespec ts;
442
443 ts.tv_sec = (time_t)delay;
444 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
445
446 nanosleep (&ts, 0);
447#elif defined(_WIN32)
448 Sleep (delay * 1e3);
449#else
450 struct timeval tv;
451
452 tv.tv_sec = (time_t)delay;
453 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
454
455 select (0, 0, 0, 0, &tv);
456#endif
457 }
458}
459
460/*****************************************************************************/
461
412int inline_size 462int inline_size
413array_nextsize (int elem, int cur, int cnt) 463array_nextsize (int elem, int cur, int cnt)
414{ 464{
415 int ncur = cur + 1; 465 int ncur = cur + 1;
416 466
… …
533 { 583 {
534 int fd = fdchanges [i]; 584 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 585 ANFD *anfd = anfds + fd;
536 ev_io *w; 586 ev_io *w;
537 587
538 int events = 0; 588 unsigned char events = 0;
539 589
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 590 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 591 events |= (unsigned char)w->events;
542 592
543#if EV_SELECT_IS_WINSOCKET 593#if EV_SELECT_IS_WINSOCKET
544 if (events) 594 if (events)
545 { 595 {
546 unsigned long argp; 596 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 597 anfd->handle = _get_osfhandle (fd);
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 598 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 599 }
550#endif 600#endif
551 601
602 {
603 unsigned char o_events = anfd->events;
604 unsigned char o_reify = anfd->reify;
605
552 anfd->reify = 0; 606 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 607 anfd->events = events;
608
609 if (o_events != events || o_reify & EV_IOFDSET)
610 backend_modify (EV_A_ fd, o_events, events);
611 }
556 } 612 }
557 613
558 fdchangecnt = 0; 614 fdchangecnt = 0;
559} 615}
560 616
561void inline_size 617void inline_size
562fd_change (EV_P_ int fd) 618fd_change (EV_P_ int fd, int flags)
563{ 619{
564 if (expect_false (anfds [fd].reify)) 620 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 621 anfds [fd].reify |= flags;
568 622
623 if (expect_true (!reify))
624 {
569 ++fdchangecnt; 625 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 626 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 627 fdchanges [fdchangecnt - 1] = fd;
628 }
572} 629}
573 630
574void inline_speed 631void inline_speed
575fd_kill (EV_P_ int fd) 632fd_kill (EV_P_ int fd)
576{ 633{
… …
627 684
628 for (fd = 0; fd < anfdmax; ++fd) 685 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 686 if (anfds [fd].events)
630 { 687 {
631 anfds [fd].events = 0; 688 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 689 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 690 }
634} 691}
635 692
636/*****************************************************************************/ 693/*****************************************************************************/
637 694
… …
652 k = p; 709 k = p;
653 } 710 }
654 711
655 heap [k] = w; 712 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 713 ((W)heap [k])->active = k + 1;
657
658} 714}
659 715
660void inline_speed 716void inline_speed
661downheap (WT *heap, int N, int k) 717downheap (WT *heap, int N, int k)
662{ 718{
… …
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 849 ev_unref (EV_A); /* child watcher should not keep loop alive */
794} 850}
795 851
796/*****************************************************************************/ 852/*****************************************************************************/
797 853
798static ev_child *childs [EV_PID_HASHSIZE]; 854static WL childs [EV_PID_HASHSIZE];
799 855
800#ifndef _WIN32 856#ifndef _WIN32
801 857
802static ev_signal childev; 858static ev_signal childev;
803 859
… …
918} 974}
919 975
920unsigned int 976unsigned int
921ev_embeddable_backends (void) 977ev_embeddable_backends (void)
922{ 978{
923 return EVBACKEND_EPOLL 979 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
924 | EVBACKEND_KQUEUE 980
925 | EVBACKEND_PORT; 981 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
982 /* please fix it and tell me how to detect the fix */
983 flags &= ~EVBACKEND_EPOLL;
984
985 return flags;
926} 986}
927 987
928unsigned int 988unsigned int
929ev_backend (EV_P) 989ev_backend (EV_P)
930{ 990{
… …
933 993
934unsigned int 994unsigned int
935ev_loop_count (EV_P) 995ev_loop_count (EV_P)
936{ 996{
937 return loop_count; 997 return loop_count;
998}
999
1000void
1001ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1002{
1003 io_blocktime = interval;
1004}
1005
1006void
1007ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1008{
1009 timeout_blocktime = interval;
938} 1010}
939 1011
940static void noinline 1012static void noinline
941loop_init (EV_P_ unsigned int flags) 1013loop_init (EV_P_ unsigned int flags)
942{ 1014{
… …
953 ev_rt_now = ev_time (); 1025 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1026 mn_now = get_clock ();
955 now_floor = mn_now; 1027 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1028 rtmn_diff = ev_rt_now - mn_now;
957 1029
1030 io_blocktime = 0.;
1031 timeout_blocktime = 0.;
1032
958 /* pid check not overridable via env */ 1033 /* pid check not overridable via env */
959#ifndef _WIN32 1034#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1035 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1036 curpid = getpid ();
962#endif 1037#endif
… …
1030 array_free (pending, [i]); 1105 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1106#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1107 array_free (idle, [i]);
1033#endif 1108#endif
1034 } 1109 }
1110
1111 ev_free (anfds); anfdmax = 0;
1035 1112
1036 /* have to use the microsoft-never-gets-it-right macro */ 1113 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1114 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1115 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1116#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1117 array_free (periodic, EMPTY);
1118#endif
1119#if EV_FORK_ENABLE
1120 array_free (fork, EMPTY);
1041#endif 1121#endif
1042 array_free (prepare, EMPTY); 1122 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1123 array_free (check, EMPTY);
1044 1124
1045 backend = 0; 1125 backend = 0;
… …
1215void inline_size 1295void inline_size
1216timers_reify (EV_P) 1296timers_reify (EV_P)
1217{ 1297{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now) 1298 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 { 1299 {
1220 ev_timer *w = timers [0]; 1300 ev_timer *w = (ev_timer *)timers [0];
1221 1301
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1302 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223 1303
1224 /* first reschedule or stop timer */ 1304 /* first reschedule or stop timer */
1225 if (w->repeat) 1305 if (w->repeat)
… …
1228 1308
1229 ((WT)w)->at += w->repeat; 1309 ((WT)w)->at += w->repeat;
1230 if (((WT)w)->at < mn_now) 1310 if (((WT)w)->at < mn_now)
1231 ((WT)w)->at = mn_now; 1311 ((WT)w)->at = mn_now;
1232 1312
1233 downheap ((WT *)timers, timercnt, 0); 1313 downheap (timers, timercnt, 0);
1234 } 1314 }
1235 else 1315 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1316 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237 1317
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1318 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1243void inline_size 1323void inline_size
1244periodics_reify (EV_P) 1324periodics_reify (EV_P)
1245{ 1325{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1326 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1247 { 1327 {
1248 ev_periodic *w = periodics [0]; 1328 ev_periodic *w = (ev_periodic *)periodics [0];
1249 1329
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1330 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251 1331
1252 /* first reschedule or stop timer */ 1332 /* first reschedule or stop timer */
1253 if (w->reschedule_cb) 1333 if (w->reschedule_cb)
1254 { 1334 {
1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1335 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1256 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1336 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1257 downheap ((WT *)periodics, periodiccnt, 0); 1337 downheap (periodics, periodiccnt, 0);
1258 } 1338 }
1259 else if (w->interval) 1339 else if (w->interval)
1260 { 1340 {
1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1341 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1262 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1342 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1263 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1343 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1264 downheap ((WT *)periodics, periodiccnt, 0); 1344 downheap (periodics, periodiccnt, 0);
1265 } 1345 }
1266 else 1346 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1347 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268 1348
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1349 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1276 int i; 1356 int i;
1277 1357
1278 /* adjust periodics after time jump */ 1358 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i) 1359 for (i = 0; i < periodiccnt; ++i)
1280 { 1360 {
1281 ev_periodic *w = periodics [i]; 1361 ev_periodic *w = (ev_periodic *)periodics [i];
1282 1362
1283 if (w->reschedule_cb) 1363 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1364 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval) 1365 else if (w->interval)
1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1366 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1287 } 1367 }
1288 1368
1289 /* now rebuild the heap */ 1369 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; ) 1370 for (i = periodiccnt >> 1; i--; )
1291 downheap ((WT *)periodics, periodiccnt, i); 1371 downheap (periodics, periodiccnt, i);
1292} 1372}
1293#endif 1373#endif
1294 1374
1295#if EV_IDLE_ENABLE 1375#if EV_IDLE_ENABLE
1296void inline_size 1376void inline_size
… …
1444 /* update fd-related kernel structures */ 1524 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1525 fd_reify (EV_A);
1446 1526
1447 /* calculate blocking time */ 1527 /* calculate blocking time */
1448 { 1528 {
1449 ev_tstamp block; 1529 ev_tstamp waittime = 0.;
1530 ev_tstamp sleeptime = 0.;
1450 1531
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1532 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1533 {
1455 /* update time to cancel out callback processing overhead */ 1534 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1535 time_update (EV_A_ 1e100);
1457 1536
1458 block = MAX_BLOCKTIME; 1537 waittime = MAX_BLOCKTIME;
1459 1538
1460 if (timercnt) 1539 if (timercnt)
1461 { 1540 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1541 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1463 if (block > to) block = to; 1542 if (waittime > to) waittime = to;
1464 } 1543 }
1465 1544
1466#if EV_PERIODIC_ENABLE 1545#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1546 if (periodiccnt)
1468 { 1547 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1548 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1549 if (waittime > to) waittime = to;
1471 } 1550 }
1472#endif 1551#endif
1473 1552
1474 if (expect_false (block < 0.)) block = 0.; 1553 if (expect_false (waittime < timeout_blocktime))
1554 waittime = timeout_blocktime;
1555
1556 sleeptime = waittime - backend_fudge;
1557
1558 if (expect_true (sleeptime > io_blocktime))
1559 sleeptime = io_blocktime;
1560
1561 if (sleeptime)
1562 {
1563 ev_sleep (sleeptime);
1564 waittime -= sleeptime;
1565 }
1475 } 1566 }
1476 1567
1477 ++loop_count; 1568 ++loop_count;
1478 backend_poll (EV_A_ block); 1569 backend_poll (EV_A_ waittime);
1479 1570
1480 /* update ev_rt_now, do magic */ 1571 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1572 time_update (EV_A_ waittime + sleeptime);
1482 } 1573 }
1483 1574
1484 /* queue pending timers and reschedule them */ 1575 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1576 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1577#if EV_PERIODIC_ENABLE
… …
1598 1689
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1690 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1691
1601 ev_start (EV_A_ (W)w, 1); 1692 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1693 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1694 wlist_add (&anfds[fd].head, (WL)w);
1604 1695
1605 fd_change (EV_A_ fd); 1696 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1697 w->events &= ~EV_IOFDSET;
1606} 1698}
1607 1699
1608void noinline 1700void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1701ev_io_stop (EV_P_ ev_io *w)
1610{ 1702{
… …
1612 if (expect_false (!ev_is_active (w))) 1704 if (expect_false (!ev_is_active (w)))
1613 return; 1705 return;
1614 1706
1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1707 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1616 1708
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1709 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1710 ev_stop (EV_A_ (W)w);
1619 1711
1620 fd_change (EV_A_ w->fd); 1712 fd_change (EV_A_ w->fd, 1);
1621} 1713}
1622 1714
1623void noinline 1715void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1716ev_timer_start (EV_P_ ev_timer *w)
1625{ 1717{
… …
1629 ((WT)w)->at += mn_now; 1721 ((WT)w)->at += mn_now;
1630 1722
1631 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1723 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1632 1724
1633 ev_start (EV_A_ (W)w, ++timercnt); 1725 ev_start (EV_A_ (W)w, ++timercnt);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1726 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1635 timers [timercnt - 1] = w; 1727 timers [timercnt - 1] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1728 upheap (timers, timercnt - 1);
1637 1729
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1730 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1639} 1731}
1640 1732
1641void noinline 1733void noinline
… …
1643{ 1735{
1644 clear_pending (EV_A_ (W)w); 1736 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1737 if (expect_false (!ev_is_active (w)))
1646 return; 1738 return;
1647 1739
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1740 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1649 1741
1650 { 1742 {
1651 int active = ((W)w)->active; 1743 int active = ((W)w)->active;
1652 1744
1653 if (expect_true (--active < --timercnt)) 1745 if (expect_true (--active < --timercnt))
1654 { 1746 {
1655 timers [active] = timers [timercnt]; 1747 timers [active] = timers [timercnt];
1656 adjustheap ((WT *)timers, timercnt, active); 1748 adjustheap (timers, timercnt, active);
1657 } 1749 }
1658 } 1750 }
1659 1751
1660 ((WT)w)->at -= mn_now; 1752 ((WT)w)->at -= mn_now;
1661 1753
… …
1668 if (ev_is_active (w)) 1760 if (ev_is_active (w))
1669 { 1761 {
1670 if (w->repeat) 1762 if (w->repeat)
1671 { 1763 {
1672 ((WT)w)->at = mn_now + w->repeat; 1764 ((WT)w)->at = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1765 adjustheap (timers, timercnt, ((W)w)->active - 1);
1674 } 1766 }
1675 else 1767 else
1676 ev_timer_stop (EV_A_ w); 1768 ev_timer_stop (EV_A_ w);
1677 } 1769 }
1678 else if (w->repeat) 1770 else if (w->repeat)
… …
1699 } 1791 }
1700 else 1792 else
1701 ((WT)w)->at = w->offset; 1793 ((WT)w)->at = w->offset;
1702 1794
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 1795 ev_start (EV_A_ (W)w, ++periodiccnt);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1796 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 1797 periodics [periodiccnt - 1] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 1798 upheap (periodics, periodiccnt - 1);
1707 1799
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1800 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1709} 1801}
1710 1802
1711void noinline 1803void noinline
… …
1713{ 1805{
1714 clear_pending (EV_A_ (W)w); 1806 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 1807 if (expect_false (!ev_is_active (w)))
1716 return; 1808 return;
1717 1809
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1810 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1719 1811
1720 { 1812 {
1721 int active = ((W)w)->active; 1813 int active = ((W)w)->active;
1722 1814
1723 if (expect_true (--active < --periodiccnt)) 1815 if (expect_true (--active < --periodiccnt))
1724 { 1816 {
1725 periodics [active] = periodics [periodiccnt]; 1817 periodics [active] = periodics [periodiccnt];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 1818 adjustheap (periodics, periodiccnt, active);
1727 } 1819 }
1728 } 1820 }
1729 1821
1730 ev_stop (EV_A_ (W)w); 1822 ev_stop (EV_A_ (W)w);
1731} 1823}
… …
1767 sigprocmask (SIG_SETMASK, &prev, 0); 1859 sigprocmask (SIG_SETMASK, &prev, 0);
1768#endif 1860#endif
1769 } 1861 }
1770 1862
1771 ev_start (EV_A_ (W)w, 1); 1863 ev_start (EV_A_ (W)w, 1);
1772 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1864 wlist_add (&signals [w->signum - 1].head, (WL)w);
1773 1865
1774 if (!((WL)w)->next) 1866 if (!((WL)w)->next)
1775 { 1867 {
1776#if _WIN32 1868#if _WIN32
1777 signal (w->signum, sighandler); 1869 signal (w->signum, sighandler);
… …
1790{ 1882{
1791 clear_pending (EV_A_ (W)w); 1883 clear_pending (EV_A_ (W)w);
1792 if (expect_false (!ev_is_active (w))) 1884 if (expect_false (!ev_is_active (w)))
1793 return; 1885 return;
1794 1886
1795 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1887 wlist_del (&signals [w->signum - 1].head, (WL)w);
1796 ev_stop (EV_A_ (W)w); 1888 ev_stop (EV_A_ (W)w);
1797 1889
1798 if (!signals [w->signum - 1].head) 1890 if (!signals [w->signum - 1].head)
1799 signal (w->signum, SIG_DFL); 1891 signal (w->signum, SIG_DFL);
1800} 1892}
… …
1807#endif 1899#endif
1808 if (expect_false (ev_is_active (w))) 1900 if (expect_false (ev_is_active (w)))
1809 return; 1901 return;
1810 1902
1811 ev_start (EV_A_ (W)w, 1); 1903 ev_start (EV_A_ (W)w, 1);
1812 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1904 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1813} 1905}
1814 1906
1815void 1907void
1816ev_child_stop (EV_P_ ev_child *w) 1908ev_child_stop (EV_P_ ev_child *w)
1817{ 1909{
1818 clear_pending (EV_A_ (W)w); 1910 clear_pending (EV_A_ (W)w);
1819 if (expect_false (!ev_is_active (w))) 1911 if (expect_false (!ev_is_active (w)))
1820 return; 1912 return;
1821 1913
1822 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1914 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1823 ev_stop (EV_A_ (W)w); 1915 ev_stop (EV_A_ (W)w);
1824} 1916}
1825 1917
1826#if EV_STAT_ENABLE 1918#if EV_STAT_ENABLE
1827 1919
… …
2169 2261
2170#if EV_EMBED_ENABLE 2262#if EV_EMBED_ENABLE
2171void noinline 2263void noinline
2172ev_embed_sweep (EV_P_ ev_embed *w) 2264ev_embed_sweep (EV_P_ ev_embed *w)
2173{ 2265{
2174 ev_loop (w->loop, EVLOOP_NONBLOCK); 2266 ev_loop (w->other, EVLOOP_NONBLOCK);
2175} 2267}
2176 2268
2177static void 2269static void
2178embed_cb (EV_P_ ev_io *io, int revents) 2270embed_io_cb (EV_P_ ev_io *io, int revents)
2179{ 2271{
2180 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2272 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2181 2273
2182 if (ev_cb (w)) 2274 if (ev_cb (w))
2183 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2275 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2184 else 2276 else
2185 ev_embed_sweep (loop, w); 2277 ev_loop (w->other, EVLOOP_NONBLOCK);
2186} 2278}
2279
2280static void
2281embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2282{
2283 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2284
2285 {
2286 struct ev_loop *loop = w->other;
2287
2288 while (fdchangecnt)
2289 {
2290 fd_reify (EV_A);
2291 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2292 }
2293 }
2294}
2295
2296#if 0
2297static void
2298embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2299{
2300 ev_idle_stop (EV_A_ idle);
2301}
2302#endif
2187 2303
2188void 2304void
2189ev_embed_start (EV_P_ ev_embed *w) 2305ev_embed_start (EV_P_ ev_embed *w)
2190{ 2306{
2191 if (expect_false (ev_is_active (w))) 2307 if (expect_false (ev_is_active (w)))
2192 return; 2308 return;
2193 2309
2194 { 2310 {
2195 struct ev_loop *loop = w->loop; 2311 struct ev_loop *loop = w->other;
2196 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2312 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2197 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2313 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2198 } 2314 }
2199 2315
2200 ev_set_priority (&w->io, ev_priority (w)); 2316 ev_set_priority (&w->io, ev_priority (w));
2201 ev_io_start (EV_A_ &w->io); 2317 ev_io_start (EV_A_ &w->io);
2202 2318
2319 ev_prepare_init (&w->prepare, embed_prepare_cb);
2320 ev_set_priority (&w->prepare, EV_MINPRI);
2321 ev_prepare_start (EV_A_ &w->prepare);
2322
2323 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2324
2203 ev_start (EV_A_ (W)w, 1); 2325 ev_start (EV_A_ (W)w, 1);
2204} 2326}
2205 2327
2206void 2328void
2207ev_embed_stop (EV_P_ ev_embed *w) 2329ev_embed_stop (EV_P_ ev_embed *w)
… …
2209 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2210 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2211 return; 2333 return;
2212 2334
2213 ev_io_stop (EV_A_ &w->io); 2335 ev_io_stop (EV_A_ &w->io);
2336 ev_prepare_stop (EV_A_ &w->prepare);
2214 2337
2215 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2216} 2339}
2217#endif 2340#endif
2218 2341
… …
2307 ev_timer_set (&once->to, timeout, 0.); 2430 ev_timer_set (&once->to, timeout, 0.);
2308 ev_timer_start (EV_A_ &once->to); 2431 ev_timer_start (EV_A_ &once->to);
2309 } 2432 }
2310} 2433}
2311 2434
2435#if EV_MULTIPLICITY
2436 #include "ev_wrap.h"
2437#endif
2438
2312#ifdef __cplusplus 2439#ifdef __cplusplus
2313} 2440}
2314#endif 2441#endif
2315 2442

Diff Legend

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