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.196 by root, Sat Dec 22 12:43:28 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#ifdef __APPLE__
984 /* is there anything thats not broken on darwin? */
985 flags &= ~EVBACKEND_KQUEUE;
986#endif
987
988 return flags;
926} 989}
927 990
928unsigned int 991unsigned int
929ev_backend (EV_P) 992ev_backend (EV_P)
930{ 993{
… …
933 996
934unsigned int 997unsigned int
935ev_loop_count (EV_P) 998ev_loop_count (EV_P)
936{ 999{
937 return loop_count; 1000 return loop_count;
1001}
1002
1003void
1004ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1005{
1006 io_blocktime = interval;
1007}
1008
1009void
1010ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1011{
1012 timeout_blocktime = interval;
938} 1013}
939 1014
940static void noinline 1015static void noinline
941loop_init (EV_P_ unsigned int flags) 1016loop_init (EV_P_ unsigned int flags)
942{ 1017{
… …
953 ev_rt_now = ev_time (); 1028 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1029 mn_now = get_clock ();
955 now_floor = mn_now; 1030 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1031 rtmn_diff = ev_rt_now - mn_now;
957 1032
1033 io_blocktime = 0.;
1034 timeout_blocktime = 0.;
1035
958 /* pid check not overridable via env */ 1036 /* pid check not overridable via env */
959#ifndef _WIN32 1037#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1038 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1039 curpid = getpid ();
962#endif 1040#endif
… …
1030 array_free (pending, [i]); 1108 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1109#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1110 array_free (idle, [i]);
1033#endif 1111#endif
1034 } 1112 }
1113
1114 ev_free (anfds); anfdmax = 0;
1035 1115
1036 /* have to use the microsoft-never-gets-it-right macro */ 1116 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1117 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1118 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1119#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1120 array_free (periodic, EMPTY);
1121#endif
1122#if EV_FORK_ENABLE
1123 array_free (fork, EMPTY);
1041#endif 1124#endif
1042 array_free (prepare, EMPTY); 1125 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1126 array_free (check, EMPTY);
1044 1127
1045 backend = 0; 1128 backend = 0;
… …
1215void inline_size 1298void inline_size
1216timers_reify (EV_P) 1299timers_reify (EV_P)
1217{ 1300{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now) 1301 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 { 1302 {
1220 ev_timer *w = timers [0]; 1303 ev_timer *w = (ev_timer *)timers [0];
1221 1304
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1305 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223 1306
1224 /* first reschedule or stop timer */ 1307 /* first reschedule or stop timer */
1225 if (w->repeat) 1308 if (w->repeat)
… …
1228 1311
1229 ((WT)w)->at += w->repeat; 1312 ((WT)w)->at += w->repeat;
1230 if (((WT)w)->at < mn_now) 1313 if (((WT)w)->at < mn_now)
1231 ((WT)w)->at = mn_now; 1314 ((WT)w)->at = mn_now;
1232 1315
1233 downheap ((WT *)timers, timercnt, 0); 1316 downheap (timers, timercnt, 0);
1234 } 1317 }
1235 else 1318 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1319 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237 1320
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1321 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1243void inline_size 1326void inline_size
1244periodics_reify (EV_P) 1327periodics_reify (EV_P)
1245{ 1328{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1329 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1247 { 1330 {
1248 ev_periodic *w = periodics [0]; 1331 ev_periodic *w = (ev_periodic *)periodics [0];
1249 1332
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1333 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251 1334
1252 /* first reschedule or stop timer */ 1335 /* first reschedule or stop timer */
1253 if (w->reschedule_cb) 1336 if (w->reschedule_cb)
1254 { 1337 {
1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1338 ((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)); 1339 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1257 downheap ((WT *)periodics, periodiccnt, 0); 1340 downheap (periodics, periodiccnt, 0);
1258 } 1341 }
1259 else if (w->interval) 1342 else if (w->interval)
1260 { 1343 {
1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1344 ((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; 1345 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)); 1346 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); 1347 downheap (periodics, periodiccnt, 0);
1265 } 1348 }
1266 else 1349 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1350 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268 1351
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1352 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1276 int i; 1359 int i;
1277 1360
1278 /* adjust periodics after time jump */ 1361 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i) 1362 for (i = 0; i < periodiccnt; ++i)
1280 { 1363 {
1281 ev_periodic *w = periodics [i]; 1364 ev_periodic *w = (ev_periodic *)periodics [i];
1282 1365
1283 if (w->reschedule_cb) 1366 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1367 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval) 1368 else if (w->interval)
1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1369 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1287 } 1370 }
1288 1371
1289 /* now rebuild the heap */ 1372 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; ) 1373 for (i = periodiccnt >> 1; i--; )
1291 downheap ((WT *)periodics, periodiccnt, i); 1374 downheap (periodics, periodiccnt, i);
1292} 1375}
1293#endif 1376#endif
1294 1377
1295#if EV_IDLE_ENABLE 1378#if EV_IDLE_ENABLE
1296void inline_size 1379void inline_size
… …
1444 /* update fd-related kernel structures */ 1527 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1528 fd_reify (EV_A);
1446 1529
1447 /* calculate blocking time */ 1530 /* calculate blocking time */
1448 { 1531 {
1449 ev_tstamp block; 1532 ev_tstamp waittime = 0.;
1533 ev_tstamp sleeptime = 0.;
1450 1534
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1535 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1536 {
1455 /* update time to cancel out callback processing overhead */ 1537 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1538 time_update (EV_A_ 1e100);
1457 1539
1458 block = MAX_BLOCKTIME; 1540 waittime = MAX_BLOCKTIME;
1459 1541
1460 if (timercnt) 1542 if (timercnt)
1461 { 1543 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1544 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1463 if (block > to) block = to; 1545 if (waittime > to) waittime = to;
1464 } 1546 }
1465 1547
1466#if EV_PERIODIC_ENABLE 1548#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1549 if (periodiccnt)
1468 { 1550 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1551 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1552 if (waittime > to) waittime = to;
1471 } 1553 }
1472#endif 1554#endif
1473 1555
1474 if (expect_false (block < 0.)) block = 0.; 1556 if (expect_false (waittime < timeout_blocktime))
1557 waittime = timeout_blocktime;
1558
1559 sleeptime = waittime - backend_fudge;
1560
1561 if (expect_true (sleeptime > io_blocktime))
1562 sleeptime = io_blocktime;
1563
1564 if (sleeptime)
1565 {
1566 ev_sleep (sleeptime);
1567 waittime -= sleeptime;
1568 }
1475 } 1569 }
1476 1570
1477 ++loop_count; 1571 ++loop_count;
1478 backend_poll (EV_A_ block); 1572 backend_poll (EV_A_ waittime);
1479 1573
1480 /* update ev_rt_now, do magic */ 1574 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1575 time_update (EV_A_ waittime + sleeptime);
1482 } 1576 }
1483 1577
1484 /* queue pending timers and reschedule them */ 1578 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1579 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1580#if EV_PERIODIC_ENABLE
… …
1598 1692
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1693 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1694
1601 ev_start (EV_A_ (W)w, 1); 1695 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1696 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1697 wlist_add (&anfds[fd].head, (WL)w);
1604 1698
1605 fd_change (EV_A_ fd); 1699 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1700 w->events &= ~EV_IOFDSET;
1606} 1701}
1607 1702
1608void noinline 1703void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1704ev_io_stop (EV_P_ ev_io *w)
1610{ 1705{
… …
1612 if (expect_false (!ev_is_active (w))) 1707 if (expect_false (!ev_is_active (w)))
1613 return; 1708 return;
1614 1709
1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1710 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1616 1711
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1712 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1713 ev_stop (EV_A_ (W)w);
1619 1714
1620 fd_change (EV_A_ w->fd); 1715 fd_change (EV_A_ w->fd, 1);
1621} 1716}
1622 1717
1623void noinline 1718void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1719ev_timer_start (EV_P_ ev_timer *w)
1625{ 1720{
… …
1629 ((WT)w)->at += mn_now; 1724 ((WT)w)->at += mn_now;
1630 1725
1631 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1726 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1632 1727
1633 ev_start (EV_A_ (W)w, ++timercnt); 1728 ev_start (EV_A_ (W)w, ++timercnt);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1729 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1635 timers [timercnt - 1] = w; 1730 timers [timercnt - 1] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1731 upheap (timers, timercnt - 1);
1637 1732
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1733 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1639} 1734}
1640 1735
1641void noinline 1736void noinline
… …
1643{ 1738{
1644 clear_pending (EV_A_ (W)w); 1739 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1740 if (expect_false (!ev_is_active (w)))
1646 return; 1741 return;
1647 1742
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1743 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1649 1744
1650 { 1745 {
1651 int active = ((W)w)->active; 1746 int active = ((W)w)->active;
1652 1747
1653 if (expect_true (--active < --timercnt)) 1748 if (expect_true (--active < --timercnt))
1654 { 1749 {
1655 timers [active] = timers [timercnt]; 1750 timers [active] = timers [timercnt];
1656 adjustheap ((WT *)timers, timercnt, active); 1751 adjustheap (timers, timercnt, active);
1657 } 1752 }
1658 } 1753 }
1659 1754
1660 ((WT)w)->at -= mn_now; 1755 ((WT)w)->at -= mn_now;
1661 1756
… …
1668 if (ev_is_active (w)) 1763 if (ev_is_active (w))
1669 { 1764 {
1670 if (w->repeat) 1765 if (w->repeat)
1671 { 1766 {
1672 ((WT)w)->at = mn_now + w->repeat; 1767 ((WT)w)->at = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1768 adjustheap (timers, timercnt, ((W)w)->active - 1);
1674 } 1769 }
1675 else 1770 else
1676 ev_timer_stop (EV_A_ w); 1771 ev_timer_stop (EV_A_ w);
1677 } 1772 }
1678 else if (w->repeat) 1773 else if (w->repeat)
… …
1699 } 1794 }
1700 else 1795 else
1701 ((WT)w)->at = w->offset; 1796 ((WT)w)->at = w->offset;
1702 1797
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 1798 ev_start (EV_A_ (W)w, ++periodiccnt);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1799 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 1800 periodics [periodiccnt - 1] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 1801 upheap (periodics, periodiccnt - 1);
1707 1802
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1803 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1709} 1804}
1710 1805
1711void noinline 1806void noinline
… …
1713{ 1808{
1714 clear_pending (EV_A_ (W)w); 1809 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 1810 if (expect_false (!ev_is_active (w)))
1716 return; 1811 return;
1717 1812
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1813 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1719 1814
1720 { 1815 {
1721 int active = ((W)w)->active; 1816 int active = ((W)w)->active;
1722 1817
1723 if (expect_true (--active < --periodiccnt)) 1818 if (expect_true (--active < --periodiccnt))
1724 { 1819 {
1725 periodics [active] = periodics [periodiccnt]; 1820 periodics [active] = periodics [periodiccnt];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 1821 adjustheap (periodics, periodiccnt, active);
1727 } 1822 }
1728 } 1823 }
1729 1824
1730 ev_stop (EV_A_ (W)w); 1825 ev_stop (EV_A_ (W)w);
1731} 1826}
… …
1752 if (expect_false (ev_is_active (w))) 1847 if (expect_false (ev_is_active (w)))
1753 return; 1848 return;
1754 1849
1755 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1850 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1756 1851
1852 {
1853#ifndef _WIN32
1854 sigset_t full, prev;
1855 sigfillset (&full);
1856 sigprocmask (SIG_SETMASK, &full, &prev);
1857#endif
1858
1859 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1860
1861#ifndef _WIN32
1862 sigprocmask (SIG_SETMASK, &prev, 0);
1863#endif
1864 }
1865
1757 ev_start (EV_A_ (W)w, 1); 1866 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); 1867 wlist_add (&signals [w->signum - 1].head, (WL)w);
1760 1868
1761 if (!((WL)w)->next) 1869 if (!((WL)w)->next)
1762 { 1870 {
1763#if _WIN32 1871#if _WIN32
1764 signal (w->signum, sighandler); 1872 signal (w->signum, sighandler);
… …
1777{ 1885{
1778 clear_pending (EV_A_ (W)w); 1886 clear_pending (EV_A_ (W)w);
1779 if (expect_false (!ev_is_active (w))) 1887 if (expect_false (!ev_is_active (w)))
1780 return; 1888 return;
1781 1889
1782 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1890 wlist_del (&signals [w->signum - 1].head, (WL)w);
1783 ev_stop (EV_A_ (W)w); 1891 ev_stop (EV_A_ (W)w);
1784 1892
1785 if (!signals [w->signum - 1].head) 1893 if (!signals [w->signum - 1].head)
1786 signal (w->signum, SIG_DFL); 1894 signal (w->signum, SIG_DFL);
1787} 1895}
… …
1794#endif 1902#endif
1795 if (expect_false (ev_is_active (w))) 1903 if (expect_false (ev_is_active (w)))
1796 return; 1904 return;
1797 1905
1798 ev_start (EV_A_ (W)w, 1); 1906 ev_start (EV_A_ (W)w, 1);
1799 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1907 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1800} 1908}
1801 1909
1802void 1910void
1803ev_child_stop (EV_P_ ev_child *w) 1911ev_child_stop (EV_P_ ev_child *w)
1804{ 1912{
1805 clear_pending (EV_A_ (W)w); 1913 clear_pending (EV_A_ (W)w);
1806 if (expect_false (!ev_is_active (w))) 1914 if (expect_false (!ev_is_active (w)))
1807 return; 1915 return;
1808 1916
1809 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1917 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1810 ev_stop (EV_A_ (W)w); 1918 ev_stop (EV_A_ (W)w);
1811} 1919}
1812 1920
1813#if EV_STAT_ENABLE 1921#if EV_STAT_ENABLE
1814 1922
… …
2156 2264
2157#if EV_EMBED_ENABLE 2265#if EV_EMBED_ENABLE
2158void noinline 2266void noinline
2159ev_embed_sweep (EV_P_ ev_embed *w) 2267ev_embed_sweep (EV_P_ ev_embed *w)
2160{ 2268{
2161 ev_loop (w->loop, EVLOOP_NONBLOCK); 2269 ev_loop (w->other, EVLOOP_NONBLOCK);
2162} 2270}
2163 2271
2164static void 2272static void
2165embed_cb (EV_P_ ev_io *io, int revents) 2273embed_io_cb (EV_P_ ev_io *io, int revents)
2166{ 2274{
2167 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2275 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2168 2276
2169 if (ev_cb (w)) 2277 if (ev_cb (w))
2170 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2278 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2171 else 2279 else
2172 ev_embed_sweep (loop, w); 2280 ev_loop (w->other, EVLOOP_NONBLOCK);
2173} 2281}
2282
2283static void
2284embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2285{
2286 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2287
2288 {
2289 struct ev_loop *loop = w->other;
2290
2291 while (fdchangecnt)
2292 {
2293 fd_reify (EV_A);
2294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2295 }
2296 }
2297}
2298
2299#if 0
2300static void
2301embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2302{
2303 ev_idle_stop (EV_A_ idle);
2304}
2305#endif
2174 2306
2175void 2307void
2176ev_embed_start (EV_P_ ev_embed *w) 2308ev_embed_start (EV_P_ ev_embed *w)
2177{ 2309{
2178 if (expect_false (ev_is_active (w))) 2310 if (expect_false (ev_is_active (w)))
2179 return; 2311 return;
2180 2312
2181 { 2313 {
2182 struct ev_loop *loop = w->loop; 2314 struct ev_loop *loop = w->other;
2183 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2315 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2184 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2316 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2185 } 2317 }
2186 2318
2187 ev_set_priority (&w->io, ev_priority (w)); 2319 ev_set_priority (&w->io, ev_priority (w));
2188 ev_io_start (EV_A_ &w->io); 2320 ev_io_start (EV_A_ &w->io);
2189 2321
2322 ev_prepare_init (&w->prepare, embed_prepare_cb);
2323 ev_set_priority (&w->prepare, EV_MINPRI);
2324 ev_prepare_start (EV_A_ &w->prepare);
2325
2326 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2327
2190 ev_start (EV_A_ (W)w, 1); 2328 ev_start (EV_A_ (W)w, 1);
2191} 2329}
2192 2330
2193void 2331void
2194ev_embed_stop (EV_P_ ev_embed *w) 2332ev_embed_stop (EV_P_ ev_embed *w)
… …
2196 clear_pending (EV_A_ (W)w); 2334 clear_pending (EV_A_ (W)w);
2197 if (expect_false (!ev_is_active (w))) 2335 if (expect_false (!ev_is_active (w)))
2198 return; 2336 return;
2199 2337
2200 ev_io_stop (EV_A_ &w->io); 2338 ev_io_stop (EV_A_ &w->io);
2339 ev_prepare_stop (EV_A_ &w->prepare);
2201 2340
2202 ev_stop (EV_A_ (W)w); 2341 ev_stop (EV_A_ (W)w);
2203} 2342}
2204#endif 2343#endif
2205 2344
… …
2294 ev_timer_set (&once->to, timeout, 0.); 2433 ev_timer_set (&once->to, timeout, 0.);
2295 ev_timer_start (EV_A_ &once->to); 2434 ev_timer_start (EV_A_ &once->to);
2296 } 2435 }
2297} 2436}
2298 2437
2438#if EV_MULTIPLICITY
2439 #include "ev_wrap.h"
2440#endif
2441
2299#ifdef __cplusplus 2442#ifdef __cplusplus
2300} 2443}
2301#endif 2444#endif
2302 2445

Diff Legend

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