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

Comparing libev/ev.c (file contents):
Revision 1.179 by root, Tue Dec 11 21:04:40 2007 UTC vs.
Revision 1.197 by root, Sat Dec 22 15:20:13 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/* sig_atomic_t is used to avoid per-thread variables or locking but still */
286/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
267 288
268#ifdef _WIN32 289#ifdef _WIN32
269# include "ev_win32.c" 290# include "ev_win32.c"
270#endif 291#endif
271 292
… …
407{ 428{
408 return ev_rt_now; 429 return ev_rt_now;
409} 430}
410#endif 431#endif
411 432
433void
434ev_sleep (ev_tstamp delay)
435{
436 if (delay > 0.)
437 {
438#if EV_USE_NANOSLEEP
439 struct timespec ts;
440
441 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443
444 nanosleep (&ts, 0);
445#elif defined(_WIN32)
446 Sleep (delay * 1e3);
447#else
448 struct timeval tv;
449
450 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
452
453 select (0, 0, 0, 0, &tv);
454#endif
455 }
456}
457
458/*****************************************************************************/
459
412int inline_size 460int inline_size
413array_nextsize (int elem, int cur, int cnt) 461array_nextsize (int elem, int cur, int cnt)
414{ 462{
415 int ncur = cur + 1; 463 int ncur = cur + 1;
416 464
… …
533 { 581 {
534 int fd = fdchanges [i]; 582 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 583 ANFD *anfd = anfds + fd;
536 ev_io *w; 584 ev_io *w;
537 585
538 int events = 0; 586 unsigned char events = 0;
539 587
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 588 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 589 events |= (unsigned char)w->events;
542 590
543#if EV_SELECT_IS_WINSOCKET 591#if EV_SELECT_IS_WINSOCKET
544 if (events) 592 if (events)
545 { 593 {
546 unsigned long argp; 594 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 595 anfd->handle = _get_osfhandle (fd);
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 596 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 597 }
550#endif 598#endif
551 599
600 {
601 unsigned char o_events = anfd->events;
602 unsigned char o_reify = anfd->reify;
603
552 anfd->reify = 0; 604 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 605 anfd->events = events;
606
607 if (o_events != events || o_reify & EV_IOFDSET)
608 backend_modify (EV_A_ fd, o_events, events);
609 }
556 } 610 }
557 611
558 fdchangecnt = 0; 612 fdchangecnt = 0;
559} 613}
560 614
561void inline_size 615void inline_size
562fd_change (EV_P_ int fd) 616fd_change (EV_P_ int fd, int flags)
563{ 617{
564 if (expect_false (anfds [fd].reify)) 618 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 619 anfds [fd].reify |= flags;
568 620
621 if (expect_true (!reify))
622 {
569 ++fdchangecnt; 623 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 624 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 625 fdchanges [fdchangecnt - 1] = fd;
626 }
572} 627}
573 628
574void inline_speed 629void inline_speed
575fd_kill (EV_P_ int fd) 630fd_kill (EV_P_ int fd)
576{ 631{
… …
627 682
628 for (fd = 0; fd < anfdmax; ++fd) 683 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 684 if (anfds [fd].events)
630 { 685 {
631 anfds [fd].events = 0; 686 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 687 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 688 }
634} 689}
635 690
636/*****************************************************************************/ 691/*****************************************************************************/
637 692
… …
652 k = p; 707 k = p;
653 } 708 }
654 709
655 heap [k] = w; 710 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
657
658} 712}
659 713
660void inline_speed 714void inline_speed
661downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
662{ 716{
… …
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
794} 848}
795 849
796/*****************************************************************************/ 850/*****************************************************************************/
797 851
798static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
799 853
800#ifndef _WIN32 854#ifndef _WIN32
801 855
802static ev_signal childev; 856static ev_signal childev;
803 857
… …
918} 972}
919 973
920unsigned int 974unsigned int
921ev_embeddable_backends (void) 975ev_embeddable_backends (void)
922{ 976{
923 return EVBACKEND_EPOLL 977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
924 | EVBACKEND_KQUEUE 978
925 | EVBACKEND_PORT; 979 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
980 /* please fix it and tell me how to detect the fix */
981 flags &= ~EVBACKEND_EPOLL;
982
983 return flags;
926} 984}
927 985
928unsigned int 986unsigned int
929ev_backend (EV_P) 987ev_backend (EV_P)
930{ 988{
… …
933 991
934unsigned int 992unsigned int
935ev_loop_count (EV_P) 993ev_loop_count (EV_P)
936{ 994{
937 return loop_count; 995 return loop_count;
996}
997
998void
999ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1000{
1001 io_blocktime = interval;
1002}
1003
1004void
1005ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1006{
1007 timeout_blocktime = interval;
938} 1008}
939 1009
940static void noinline 1010static void noinline
941loop_init (EV_P_ unsigned int flags) 1011loop_init (EV_P_ unsigned int flags)
942{ 1012{
… …
953 ev_rt_now = ev_time (); 1023 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1024 mn_now = get_clock ();
955 now_floor = mn_now; 1025 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1026 rtmn_diff = ev_rt_now - mn_now;
957 1027
1028 io_blocktime = 0.;
1029 timeout_blocktime = 0.;
1030
958 /* pid check not overridable via env */ 1031 /* pid check not overridable via env */
959#ifndef _WIN32 1032#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1033 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1034 curpid = getpid ();
962#endif 1035#endif
… …
1030 array_free (pending, [i]); 1103 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1104#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1105 array_free (idle, [i]);
1033#endif 1106#endif
1034 } 1107 }
1108
1109 ev_free (anfds); anfdmax = 0;
1035 1110
1036 /* have to use the microsoft-never-gets-it-right macro */ 1111 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1112 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1113 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1114#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1115 array_free (periodic, EMPTY);
1116#endif
1117#if EV_FORK_ENABLE
1118 array_free (fork, EMPTY);
1041#endif 1119#endif
1042 array_free (prepare, EMPTY); 1120 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1121 array_free (check, EMPTY);
1044 1122
1045 backend = 0; 1123 backend = 0;
… …
1215void inline_size 1293void inline_size
1216timers_reify (EV_P) 1294timers_reify (EV_P)
1217{ 1295{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now) 1296 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 { 1297 {
1220 ev_timer *w = timers [0]; 1298 ev_timer *w = (ev_timer *)timers [0];
1221 1299
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1300 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223 1301
1224 /* first reschedule or stop timer */ 1302 /* first reschedule or stop timer */
1225 if (w->repeat) 1303 if (w->repeat)
… …
1228 1306
1229 ((WT)w)->at += w->repeat; 1307 ((WT)w)->at += w->repeat;
1230 if (((WT)w)->at < mn_now) 1308 if (((WT)w)->at < mn_now)
1231 ((WT)w)->at = mn_now; 1309 ((WT)w)->at = mn_now;
1232 1310
1233 downheap ((WT *)timers, timercnt, 0); 1311 downheap (timers, timercnt, 0);
1234 } 1312 }
1235 else 1313 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1314 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237 1315
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1316 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1243void inline_size 1321void inline_size
1244periodics_reify (EV_P) 1322periodics_reify (EV_P)
1245{ 1323{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1324 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1247 { 1325 {
1248 ev_periodic *w = periodics [0]; 1326 ev_periodic *w = (ev_periodic *)periodics [0];
1249 1327
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1328 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251 1329
1252 /* first reschedule or stop timer */ 1330 /* first reschedule or stop timer */
1253 if (w->reschedule_cb) 1331 if (w->reschedule_cb)
1254 { 1332 {
1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1333 ((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)); 1334 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1257 downheap ((WT *)periodics, periodiccnt, 0); 1335 downheap (periodics, periodiccnt, 0);
1258 } 1336 }
1259 else if (w->interval) 1337 else if (w->interval)
1260 { 1338 {
1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1339 ((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; 1340 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)); 1341 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); 1342 downheap (periodics, periodiccnt, 0);
1265 } 1343 }
1266 else 1344 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1345 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268 1346
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1347 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1276 int i; 1354 int i;
1277 1355
1278 /* adjust periodics after time jump */ 1356 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i) 1357 for (i = 0; i < periodiccnt; ++i)
1280 { 1358 {
1281 ev_periodic *w = periodics [i]; 1359 ev_periodic *w = (ev_periodic *)periodics [i];
1282 1360
1283 if (w->reschedule_cb) 1361 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1362 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval) 1363 else if (w->interval)
1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1364 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1287 } 1365 }
1288 1366
1289 /* now rebuild the heap */ 1367 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; ) 1368 for (i = periodiccnt >> 1; i--; )
1291 downheap ((WT *)periodics, periodiccnt, i); 1369 downheap (periodics, periodiccnt, i);
1292} 1370}
1293#endif 1371#endif
1294 1372
1295#if EV_IDLE_ENABLE 1373#if EV_IDLE_ENABLE
1296void inline_size 1374void inline_size
… …
1444 /* update fd-related kernel structures */ 1522 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1523 fd_reify (EV_A);
1446 1524
1447 /* calculate blocking time */ 1525 /* calculate blocking time */
1448 { 1526 {
1449 ev_tstamp block; 1527 ev_tstamp waittime = 0.;
1528 ev_tstamp sleeptime = 0.;
1450 1529
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1530 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1531 {
1455 /* update time to cancel out callback processing overhead */ 1532 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1533 time_update (EV_A_ 1e100);
1457 1534
1458 block = MAX_BLOCKTIME; 1535 waittime = MAX_BLOCKTIME;
1459 1536
1460 if (timercnt) 1537 if (timercnt)
1461 { 1538 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1539 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1463 if (block > to) block = to; 1540 if (waittime > to) waittime = to;
1464 } 1541 }
1465 1542
1466#if EV_PERIODIC_ENABLE 1543#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1544 if (periodiccnt)
1468 { 1545 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1546 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1547 if (waittime > to) waittime = to;
1471 } 1548 }
1472#endif 1549#endif
1473 1550
1474 if (expect_false (block < 0.)) block = 0.; 1551 if (expect_false (waittime < timeout_blocktime))
1552 waittime = timeout_blocktime;
1553
1554 sleeptime = waittime - backend_fudge;
1555
1556 if (expect_true (sleeptime > io_blocktime))
1557 sleeptime = io_blocktime;
1558
1559 if (sleeptime)
1560 {
1561 ev_sleep (sleeptime);
1562 waittime -= sleeptime;
1563 }
1475 } 1564 }
1476 1565
1477 ++loop_count; 1566 ++loop_count;
1478 backend_poll (EV_A_ block); 1567 backend_poll (EV_A_ waittime);
1479 1568
1480 /* update ev_rt_now, do magic */ 1569 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1570 time_update (EV_A_ waittime + sleeptime);
1482 } 1571 }
1483 1572
1484 /* queue pending timers and reschedule them */ 1573 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1574 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1575#if EV_PERIODIC_ENABLE
… …
1598 1687
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1688 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1689
1601 ev_start (EV_A_ (W)w, 1); 1690 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1691 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1692 wlist_add (&anfds[fd].head, (WL)w);
1604 1693
1605 fd_change (EV_A_ fd); 1694 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1695 w->events &= ~EV_IOFDSET;
1606} 1696}
1607 1697
1608void noinline 1698void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1699ev_io_stop (EV_P_ ev_io *w)
1610{ 1700{
… …
1612 if (expect_false (!ev_is_active (w))) 1702 if (expect_false (!ev_is_active (w)))
1613 return; 1703 return;
1614 1704
1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1705 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1616 1706
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1707 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1708 ev_stop (EV_A_ (W)w);
1619 1709
1620 fd_change (EV_A_ w->fd); 1710 fd_change (EV_A_ w->fd, 1);
1621} 1711}
1622 1712
1623void noinline 1713void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1714ev_timer_start (EV_P_ ev_timer *w)
1625{ 1715{
… …
1629 ((WT)w)->at += mn_now; 1719 ((WT)w)->at += mn_now;
1630 1720
1631 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1721 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1632 1722
1633 ev_start (EV_A_ (W)w, ++timercnt); 1723 ev_start (EV_A_ (W)w, ++timercnt);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1724 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1635 timers [timercnt - 1] = w; 1725 timers [timercnt - 1] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1726 upheap (timers, timercnt - 1);
1637 1727
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1728 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1639} 1729}
1640 1730
1641void noinline 1731void noinline
… …
1643{ 1733{
1644 clear_pending (EV_A_ (W)w); 1734 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1735 if (expect_false (!ev_is_active (w)))
1646 return; 1736 return;
1647 1737
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1738 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1649 1739
1650 { 1740 {
1651 int active = ((W)w)->active; 1741 int active = ((W)w)->active;
1652 1742
1653 if (expect_true (--active < --timercnt)) 1743 if (expect_true (--active < --timercnt))
1654 { 1744 {
1655 timers [active] = timers [timercnt]; 1745 timers [active] = timers [timercnt];
1656 adjustheap ((WT *)timers, timercnt, active); 1746 adjustheap (timers, timercnt, active);
1657 } 1747 }
1658 } 1748 }
1659 1749
1660 ((WT)w)->at -= mn_now; 1750 ((WT)w)->at -= mn_now;
1661 1751
… …
1668 if (ev_is_active (w)) 1758 if (ev_is_active (w))
1669 { 1759 {
1670 if (w->repeat) 1760 if (w->repeat)
1671 { 1761 {
1672 ((WT)w)->at = mn_now + w->repeat; 1762 ((WT)w)->at = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1763 adjustheap (timers, timercnt, ((W)w)->active - 1);
1674 } 1764 }
1675 else 1765 else
1676 ev_timer_stop (EV_A_ w); 1766 ev_timer_stop (EV_A_ w);
1677 } 1767 }
1678 else if (w->repeat) 1768 else if (w->repeat)
… …
1699 } 1789 }
1700 else 1790 else
1701 ((WT)w)->at = w->offset; 1791 ((WT)w)->at = w->offset;
1702 1792
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 1793 ev_start (EV_A_ (W)w, ++periodiccnt);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1794 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 1795 periodics [periodiccnt - 1] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 1796 upheap (periodics, periodiccnt - 1);
1707 1797
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1798 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1709} 1799}
1710 1800
1711void noinline 1801void noinline
… …
1713{ 1803{
1714 clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1716 return; 1806 return;
1717 1807
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1808 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1719 1809
1720 { 1810 {
1721 int active = ((W)w)->active; 1811 int active = ((W)w)->active;
1722 1812
1723 if (expect_true (--active < --periodiccnt)) 1813 if (expect_true (--active < --periodiccnt))
1724 { 1814 {
1725 periodics [active] = periodics [periodiccnt]; 1815 periodics [active] = periodics [periodiccnt];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 1816 adjustheap (periodics, periodiccnt, active);
1727 } 1817 }
1728 } 1818 }
1729 1819
1730 ev_stop (EV_A_ (W)w); 1820 ev_stop (EV_A_ (W)w);
1731} 1821}
… …
1752 if (expect_false (ev_is_active (w))) 1842 if (expect_false (ev_is_active (w)))
1753 return; 1843 return;
1754 1844
1755 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1845 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1756 1846
1847 {
1848#ifndef _WIN32
1849 sigset_t full, prev;
1850 sigfillset (&full);
1851 sigprocmask (SIG_SETMASK, &full, &prev);
1852#endif
1853
1854 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1855
1856#ifndef _WIN32
1857 sigprocmask (SIG_SETMASK, &prev, 0);
1858#endif
1859 }
1860
1757 ev_start (EV_A_ (W)w, 1); 1861 ev_start (EV_A_ (W)w, 1);
1758 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1759 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1862 wlist_add (&signals [w->signum - 1].head, (WL)w);
1760 1863
1761 if (!((WL)w)->next) 1864 if (!((WL)w)->next)
1762 { 1865 {
1763#if _WIN32 1866#if _WIN32
1764 signal (w->signum, sighandler); 1867 signal (w->signum, sighandler);
… …
1777{ 1880{
1778 clear_pending (EV_A_ (W)w); 1881 clear_pending (EV_A_ (W)w);
1779 if (expect_false (!ev_is_active (w))) 1882 if (expect_false (!ev_is_active (w)))
1780 return; 1883 return;
1781 1884
1782 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_del (&signals [w->signum - 1].head, (WL)w);
1783 ev_stop (EV_A_ (W)w); 1886 ev_stop (EV_A_ (W)w);
1784 1887
1785 if (!signals [w->signum - 1].head) 1888 if (!signals [w->signum - 1].head)
1786 signal (w->signum, SIG_DFL); 1889 signal (w->signum, SIG_DFL);
1787} 1890}
… …
1794#endif 1897#endif
1795 if (expect_false (ev_is_active (w))) 1898 if (expect_false (ev_is_active (w)))
1796 return; 1899 return;
1797 1900
1798 ev_start (EV_A_ (W)w, 1); 1901 ev_start (EV_A_ (W)w, 1);
1799 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1902 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1800} 1903}
1801 1904
1802void 1905void
1803ev_child_stop (EV_P_ ev_child *w) 1906ev_child_stop (EV_P_ ev_child *w)
1804{ 1907{
1805 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1806 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1807 return; 1910 return;
1808 1911
1809 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1912 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1810 ev_stop (EV_A_ (W)w); 1913 ev_stop (EV_A_ (W)w);
1811} 1914}
1812 1915
1813#if EV_STAT_ENABLE 1916#if EV_STAT_ENABLE
1814 1917
… …
2156 2259
2157#if EV_EMBED_ENABLE 2260#if EV_EMBED_ENABLE
2158void noinline 2261void noinline
2159ev_embed_sweep (EV_P_ ev_embed *w) 2262ev_embed_sweep (EV_P_ ev_embed *w)
2160{ 2263{
2161 ev_loop (w->loop, EVLOOP_NONBLOCK); 2264 ev_loop (w->other, EVLOOP_NONBLOCK);
2162} 2265}
2163 2266
2164static void 2267static void
2165embed_cb (EV_P_ ev_io *io, int revents) 2268embed_io_cb (EV_P_ ev_io *io, int revents)
2166{ 2269{
2167 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2270 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2168 2271
2169 if (ev_cb (w)) 2272 if (ev_cb (w))
2170 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2273 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2171 else 2274 else
2172 ev_embed_sweep (loop, w); 2275 ev_loop (w->other, EVLOOP_NONBLOCK);
2173} 2276}
2277
2278static void
2279embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2280{
2281 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2282
2283 {
2284 struct ev_loop *loop = w->other;
2285
2286 while (fdchangecnt)
2287 {
2288 fd_reify (EV_A);
2289 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2290 }
2291 }
2292}
2293
2294#if 0
2295static void
2296embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2297{
2298 ev_idle_stop (EV_A_ idle);
2299}
2300#endif
2174 2301
2175void 2302void
2176ev_embed_start (EV_P_ ev_embed *w) 2303ev_embed_start (EV_P_ ev_embed *w)
2177{ 2304{
2178 if (expect_false (ev_is_active (w))) 2305 if (expect_false (ev_is_active (w)))
2179 return; 2306 return;
2180 2307
2181 { 2308 {
2182 struct ev_loop *loop = w->loop; 2309 struct ev_loop *loop = w->other;
2183 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2310 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2184 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2185 } 2312 }
2186 2313
2187 ev_set_priority (&w->io, ev_priority (w)); 2314 ev_set_priority (&w->io, ev_priority (w));
2188 ev_io_start (EV_A_ &w->io); 2315 ev_io_start (EV_A_ &w->io);
2189 2316
2317 ev_prepare_init (&w->prepare, embed_prepare_cb);
2318 ev_set_priority (&w->prepare, EV_MINPRI);
2319 ev_prepare_start (EV_A_ &w->prepare);
2320
2321 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2322
2190 ev_start (EV_A_ (W)w, 1); 2323 ev_start (EV_A_ (W)w, 1);
2191} 2324}
2192 2325
2193void 2326void
2194ev_embed_stop (EV_P_ ev_embed *w) 2327ev_embed_stop (EV_P_ ev_embed *w)
… …
2196 clear_pending (EV_A_ (W)w); 2329 clear_pending (EV_A_ (W)w);
2197 if (expect_false (!ev_is_active (w))) 2330 if (expect_false (!ev_is_active (w)))
2198 return; 2331 return;
2199 2332
2200 ev_io_stop (EV_A_ &w->io); 2333 ev_io_stop (EV_A_ &w->io);
2334 ev_prepare_stop (EV_A_ &w->prepare);
2201 2335
2202 ev_stop (EV_A_ (W)w); 2336 ev_stop (EV_A_ (W)w);
2203} 2337}
2204#endif 2338#endif
2205 2339
… …
2294 ev_timer_set (&once->to, timeout, 0.); 2428 ev_timer_set (&once->to, timeout, 0.);
2295 ev_timer_start (EV_A_ &once->to); 2429 ev_timer_start (EV_A_ &once->to);
2296 } 2430 }
2297} 2431}
2298 2432
2433#if EV_MULTIPLICITY
2434 #include "ev_wrap.h"
2435#endif
2436
2299#ifdef __cplusplus 2437#ifdef __cplusplus
2300} 2438}
2301#endif 2439#endif
2302 2440

Diff Legend

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