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

Comparing libev/ev.c (file contents):
Revision 1.178 by root, Tue Dec 11 18:36:11 2007 UTC vs.
Revision 1.194 by root, Sat Dec 22 07:03:31 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
… …
476 pendings [pri][w_->pending - 1].w = w_; 524 pendings [pri][w_->pending - 1].w = w_;
477 pendings [pri][w_->pending - 1].events = revents; 525 pendings [pri][w_->pending - 1].events = revents;
478 } 526 }
479} 527}
480 528
481void inline_size 529void inline_speed
482queue_events (EV_P_ W *events, int eventcnt, int type) 530queue_events (EV_P_ W *events, int eventcnt, int type)
483{ 531{
484 int i; 532 int i;
485 533
486 for (i = 0; i < eventcnt; ++i) 534 for (i = 0; i < eventcnt; ++i)
… …
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
638void inline_speed 693void inline_speed
639upheap (WT *heap, int k) 694upheap (WT *heap, int k)
640{ 695{
641 WT w = heap [k]; 696 WT w = heap [k];
642 697
643 while (k && heap [k >> 1]->at > w->at) 698 while (k)
644 { 699 {
700 int p = (k - 1) >> 1;
701
702 if (heap [p]->at <= w->at)
703 break;
704
645 heap [k] = heap [k >> 1]; 705 heap [k] = heap [p];
646 ((W)heap [k])->active = k + 1; 706 ((W)heap [k])->active = k + 1;
647 k >>= 1; 707 k = p;
648 } 708 }
649 709
650 heap [k] = w; 710 heap [k] = w;
651 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
652
653} 712}
654 713
655void inline_speed 714void inline_speed
656downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
657{ 716{
658 WT w = heap [k]; 717 WT w = heap [k];
659 718
660 while (k < (N >> 1)) 719 for (;;)
661 { 720 {
662 int j = k << 1; 721 int c = (k << 1) + 1;
663 722
664 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 723 if (c >= N)
665 ++j;
666
667 if (w->at <= heap [j]->at)
668 break; 724 break;
669 725
726 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
727 ? 1 : 0;
728
729 if (w->at <= heap [c]->at)
730 break;
731
670 heap [k] = heap [j]; 732 heap [k] = heap [c];
671 ((W)heap [k])->active = k + 1; 733 ((W)heap [k])->active = k + 1;
734
672 k = j; 735 k = c;
673 } 736 }
674 737
675 heap [k] = w; 738 heap [k] = w;
676 ((W)heap [k])->active = k + 1; 739 ((W)heap [k])->active = k + 1;
677} 740}
… …
784 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
785} 848}
786 849
787/*****************************************************************************/ 850/*****************************************************************************/
788 851
789static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
790 853
791#ifndef _WIN32 854#ifndef _WIN32
792 855
793static ev_signal childev; 856static ev_signal childev;
794 857
… …
909} 972}
910 973
911unsigned int 974unsigned int
912ev_embeddable_backends (void) 975ev_embeddable_backends (void)
913{ 976{
977 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
914 return EVBACKEND_EPOLL 978 return EVBACKEND_KQUEUE
915 | EVBACKEND_KQUEUE
916 | EVBACKEND_PORT; 979 | EVBACKEND_PORT;
917} 980}
918 981
919unsigned int 982unsigned int
920ev_backend (EV_P) 983ev_backend (EV_P)
… …
924 987
925unsigned int 988unsigned int
926ev_loop_count (EV_P) 989ev_loop_count (EV_P)
927{ 990{
928 return loop_count; 991 return loop_count;
992}
993
994void
995ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
996{
997 io_blocktime = interval;
998}
999
1000void
1001ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1002{
1003 timeout_blocktime = interval;
929} 1004}
930 1005
931static void noinline 1006static void noinline
932loop_init (EV_P_ unsigned int flags) 1007loop_init (EV_P_ unsigned int flags)
933{ 1008{
… …
944 ev_rt_now = ev_time (); 1019 ev_rt_now = ev_time ();
945 mn_now = get_clock (); 1020 mn_now = get_clock ();
946 now_floor = mn_now; 1021 now_floor = mn_now;
947 rtmn_diff = ev_rt_now - mn_now; 1022 rtmn_diff = ev_rt_now - mn_now;
948 1023
1024 io_blocktime = 0.;
1025 timeout_blocktime = 0.;
1026
949 /* pid check not overridable via env */ 1027 /* pid check not overridable via env */
950#ifndef _WIN32 1028#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK) 1029 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid (); 1030 curpid = getpid ();
953#endif 1031#endif
… …
1021 array_free (pending, [i]); 1099 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE 1100#if EV_IDLE_ENABLE
1023 array_free (idle, [i]); 1101 array_free (idle, [i]);
1024#endif 1102#endif
1025 } 1103 }
1104
1105 ev_free (anfds); anfdmax = 0;
1026 1106
1027 /* have to use the microsoft-never-gets-it-right macro */ 1107 /* have to use the microsoft-never-gets-it-right macro */
1028 array_free (fdchange, EMPTY); 1108 array_free (fdchange, EMPTY);
1029 array_free (timer, EMPTY); 1109 array_free (timer, EMPTY);
1030#if EV_PERIODIC_ENABLE 1110#if EV_PERIODIC_ENABLE
1031 array_free (periodic, EMPTY); 1111 array_free (periodic, EMPTY);
1112#endif
1113#if EV_FORK_ENABLE
1114 array_free (fork, EMPTY);
1032#endif 1115#endif
1033 array_free (prepare, EMPTY); 1116 array_free (prepare, EMPTY);
1034 array_free (check, EMPTY); 1117 array_free (check, EMPTY);
1035 1118
1036 backend = 0; 1119 backend = 0;
… …
1206void inline_size 1289void inline_size
1207timers_reify (EV_P) 1290timers_reify (EV_P)
1208{ 1291{
1209 while (timercnt && ((WT)timers [0])->at <= mn_now) 1292 while (timercnt && ((WT)timers [0])->at <= mn_now)
1210 { 1293 {
1211 ev_timer *w = timers [0]; 1294 ev_timer *w = (ev_timer *)timers [0];
1212 1295
1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1296 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1214 1297
1215 /* first reschedule or stop timer */ 1298 /* first reschedule or stop timer */
1216 if (w->repeat) 1299 if (w->repeat)
… …
1219 1302
1220 ((WT)w)->at += w->repeat; 1303 ((WT)w)->at += w->repeat;
1221 if (((WT)w)->at < mn_now) 1304 if (((WT)w)->at < mn_now)
1222 ((WT)w)->at = mn_now; 1305 ((WT)w)->at = mn_now;
1223 1306
1224 downheap ((WT *)timers, timercnt, 0); 1307 downheap (timers, timercnt, 0);
1225 } 1308 }
1226 else 1309 else
1227 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1310 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1228 1311
1229 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1312 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1234void inline_size 1317void inline_size
1235periodics_reify (EV_P) 1318periodics_reify (EV_P)
1236{ 1319{
1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1320 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1238 { 1321 {
1239 ev_periodic *w = periodics [0]; 1322 ev_periodic *w = (ev_periodic *)periodics [0];
1240 1323
1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1324 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1242 1325
1243 /* first reschedule or stop timer */ 1326 /* first reschedule or stop timer */
1244 if (w->reschedule_cb) 1327 if (w->reschedule_cb)
1245 { 1328 {
1246 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1329 ((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)); 1330 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1248 downheap ((WT *)periodics, periodiccnt, 0); 1331 downheap (periodics, periodiccnt, 0);
1249 } 1332 }
1250 else if (w->interval) 1333 else if (w->interval)
1251 { 1334 {
1252 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1335 ((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; 1336 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)); 1337 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); 1338 downheap (periodics, periodiccnt, 0);
1256 } 1339 }
1257 else 1340 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1341 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1342
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1343 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1350 int i;
1268 1351
1269 /* adjust periodics after time jump */ 1352 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1353 for (i = 0; i < periodiccnt; ++i)
1271 { 1354 {
1272 ev_periodic *w = periodics [i]; 1355 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1356
1274 if (w->reschedule_cb) 1357 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1358 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1359 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1360 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1361 }
1279 1362
1280 /* now rebuild the heap */ 1363 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1364 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1365 downheap (periodics, periodiccnt, i);
1283} 1366}
1284#endif 1367#endif
1285 1368
1286#if EV_IDLE_ENABLE 1369#if EV_IDLE_ENABLE
1287void inline_size 1370void inline_size
… …
1435 /* update fd-related kernel structures */ 1518 /* update fd-related kernel structures */
1436 fd_reify (EV_A); 1519 fd_reify (EV_A);
1437 1520
1438 /* calculate blocking time */ 1521 /* calculate blocking time */
1439 { 1522 {
1440 ev_tstamp block; 1523 ev_tstamp waittime = 0.;
1524 ev_tstamp sleeptime = 0.;
1441 1525
1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1526 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1443 block = 0.; /* do not block at all */
1444 else
1445 { 1527 {
1446 /* update time to cancel out callback processing overhead */ 1528 /* update time to cancel out callback processing overhead */
1447 time_update (EV_A_ 1e100); 1529 time_update (EV_A_ 1e100);
1448 1530
1449 block = MAX_BLOCKTIME; 1531 waittime = MAX_BLOCKTIME;
1450 1532
1451 if (timercnt) 1533 if (timercnt)
1452 { 1534 {
1453 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1535 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1454 if (block > to) block = to; 1536 if (waittime > to) waittime = to;
1455 } 1537 }
1456 1538
1457#if EV_PERIODIC_ENABLE 1539#if EV_PERIODIC_ENABLE
1458 if (periodiccnt) 1540 if (periodiccnt)
1459 { 1541 {
1460 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1542 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1461 if (block > to) block = to; 1543 if (waittime > to) waittime = to;
1462 } 1544 }
1463#endif 1545#endif
1464 1546
1465 if (expect_false (block < 0.)) block = 0.; 1547 if (expect_false (waittime < timeout_blocktime))
1548 waittime = timeout_blocktime;
1549
1550 sleeptime = waittime - backend_fudge;
1551
1552 if (expect_true (sleeptime > io_blocktime))
1553 sleeptime = io_blocktime;
1554
1555 if (sleeptime)
1556 {
1557 ev_sleep (sleeptime);
1558 waittime -= sleeptime;
1559 }
1466 } 1560 }
1467 1561
1468 ++loop_count; 1562 ++loop_count;
1469 backend_poll (EV_A_ block); 1563 backend_poll (EV_A_ waittime);
1470 1564
1471 /* update ev_rt_now, do magic */ 1565 /* update ev_rt_now, do magic */
1472 time_update (EV_A_ block); 1566 time_update (EV_A_ waittime + sleeptime);
1473 } 1567 }
1474 1568
1475 /* queue pending timers and reschedule them */ 1569 /* queue pending timers and reschedule them */
1476 timers_reify (EV_A); /* relative timers called last */ 1570 timers_reify (EV_A); /* relative timers called last */
1477#if EV_PERIODIC_ENABLE 1571#if EV_PERIODIC_ENABLE
… …
1589 1683
1590 assert (("ev_io_start called with negative fd", fd >= 0)); 1684 assert (("ev_io_start called with negative fd", fd >= 0));
1591 1685
1592 ev_start (EV_A_ (W)w, 1); 1686 ev_start (EV_A_ (W)w, 1);
1593 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1687 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1594 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1688 wlist_add (&anfds[fd].head, (WL)w);
1595 1689
1596 fd_change (EV_A_ fd); 1690 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1691 w->events &= ~EV_IOFDSET;
1597} 1692}
1598 1693
1599void noinline 1694void noinline
1600ev_io_stop (EV_P_ ev_io *w) 1695ev_io_stop (EV_P_ ev_io *w)
1601{ 1696{
… …
1603 if (expect_false (!ev_is_active (w))) 1698 if (expect_false (!ev_is_active (w)))
1604 return; 1699 return;
1605 1700
1606 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1701 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1607 1702
1608 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1703 wlist_del (&anfds[w->fd].head, (WL)w);
1609 ev_stop (EV_A_ (W)w); 1704 ev_stop (EV_A_ (W)w);
1610 1705
1611 fd_change (EV_A_ w->fd); 1706 fd_change (EV_A_ w->fd, 1);
1612} 1707}
1613 1708
1614void noinline 1709void noinline
1615ev_timer_start (EV_P_ ev_timer *w) 1710ev_timer_start (EV_P_ ev_timer *w)
1616{ 1711{
… …
1620 ((WT)w)->at += mn_now; 1715 ((WT)w)->at += mn_now;
1621 1716
1622 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1717 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1623 1718
1624 ev_start (EV_A_ (W)w, ++timercnt); 1719 ev_start (EV_A_ (W)w, ++timercnt);
1625 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1720 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1626 timers [timercnt - 1] = w; 1721 timers [timercnt - 1] = (WT)w;
1627 upheap ((WT *)timers, timercnt - 1); 1722 upheap (timers, timercnt - 1);
1628 1723
1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1724 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1630} 1725}
1631 1726
1632void noinline 1727void noinline
… …
1634{ 1729{
1635 clear_pending (EV_A_ (W)w); 1730 clear_pending (EV_A_ (W)w);
1636 if (expect_false (!ev_is_active (w))) 1731 if (expect_false (!ev_is_active (w)))
1637 return; 1732 return;
1638 1733
1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1734 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1640 1735
1641 { 1736 {
1642 int active = ((W)w)->active; 1737 int active = ((W)w)->active;
1643 1738
1644 if (expect_true (--active < --timercnt)) 1739 if (expect_true (--active < --timercnt))
1645 { 1740 {
1646 timers [active] = timers [timercnt]; 1741 timers [active] = timers [timercnt];
1647 adjustheap ((WT *)timers, timercnt, active); 1742 adjustheap (timers, timercnt, active);
1648 } 1743 }
1649 } 1744 }
1650 1745
1651 ((WT)w)->at -= mn_now; 1746 ((WT)w)->at -= mn_now;
1652 1747
… …
1659 if (ev_is_active (w)) 1754 if (ev_is_active (w))
1660 { 1755 {
1661 if (w->repeat) 1756 if (w->repeat)
1662 { 1757 {
1663 ((WT)w)->at = mn_now + w->repeat; 1758 ((WT)w)->at = mn_now + w->repeat;
1664 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1759 adjustheap (timers, timercnt, ((W)w)->active - 1);
1665 } 1760 }
1666 else 1761 else
1667 ev_timer_stop (EV_A_ w); 1762 ev_timer_stop (EV_A_ w);
1668 } 1763 }
1669 else if (w->repeat) 1764 else if (w->repeat)
… …
1690 } 1785 }
1691 else 1786 else
1692 ((WT)w)->at = w->offset; 1787 ((WT)w)->at = w->offset;
1693 1788
1694 ev_start (EV_A_ (W)w, ++periodiccnt); 1789 ev_start (EV_A_ (W)w, ++periodiccnt);
1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1790 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1696 periodics [periodiccnt - 1] = w; 1791 periodics [periodiccnt - 1] = (WT)w;
1697 upheap ((WT *)periodics, periodiccnt - 1); 1792 upheap (periodics, periodiccnt - 1);
1698 1793
1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1794 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1700} 1795}
1701 1796
1702void noinline 1797void noinline
… …
1704{ 1799{
1705 clear_pending (EV_A_ (W)w); 1800 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 1801 if (expect_false (!ev_is_active (w)))
1707 return; 1802 return;
1708 1803
1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1804 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1710 1805
1711 { 1806 {
1712 int active = ((W)w)->active; 1807 int active = ((W)w)->active;
1713 1808
1714 if (expect_true (--active < --periodiccnt)) 1809 if (expect_true (--active < --periodiccnt))
1715 { 1810 {
1716 periodics [active] = periodics [periodiccnt]; 1811 periodics [active] = periodics [periodiccnt];
1717 adjustheap ((WT *)periodics, periodiccnt, active); 1812 adjustheap (periodics, periodiccnt, active);
1718 } 1813 }
1719 } 1814 }
1720 1815
1721 ev_stop (EV_A_ (W)w); 1816 ev_stop (EV_A_ (W)w);
1722} 1817}
… …
1743 if (expect_false (ev_is_active (w))) 1838 if (expect_false (ev_is_active (w)))
1744 return; 1839 return;
1745 1840
1746 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1841 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1747 1842
1843 {
1844#ifndef _WIN32
1845 sigset_t full, prev;
1846 sigfillset (&full);
1847 sigprocmask (SIG_SETMASK, &full, &prev);
1848#endif
1849
1850 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1851
1852#ifndef _WIN32
1853 sigprocmask (SIG_SETMASK, &prev, 0);
1854#endif
1855 }
1856
1748 ev_start (EV_A_ (W)w, 1); 1857 ev_start (EV_A_ (W)w, 1);
1749 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1750 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1858 wlist_add (&signals [w->signum - 1].head, (WL)w);
1751 1859
1752 if (!((WL)w)->next) 1860 if (!((WL)w)->next)
1753 { 1861 {
1754#if _WIN32 1862#if _WIN32
1755 signal (w->signum, sighandler); 1863 signal (w->signum, sighandler);
… …
1768{ 1876{
1769 clear_pending (EV_A_ (W)w); 1877 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 1878 if (expect_false (!ev_is_active (w)))
1771 return; 1879 return;
1772 1880
1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1881 wlist_del (&signals [w->signum - 1].head, (WL)w);
1774 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1775 1883
1776 if (!signals [w->signum - 1].head) 1884 if (!signals [w->signum - 1].head)
1777 signal (w->signum, SIG_DFL); 1885 signal (w->signum, SIG_DFL);
1778} 1886}
… …
1785#endif 1893#endif
1786 if (expect_false (ev_is_active (w))) 1894 if (expect_false (ev_is_active (w)))
1787 return; 1895 return;
1788 1896
1789 ev_start (EV_A_ (W)w, 1); 1897 ev_start (EV_A_ (W)w, 1);
1790 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1898 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1791} 1899}
1792 1900
1793void 1901void
1794ev_child_stop (EV_P_ ev_child *w) 1902ev_child_stop (EV_P_ ev_child *w)
1795{ 1903{
1796 clear_pending (EV_A_ (W)w); 1904 clear_pending (EV_A_ (W)w);
1797 if (expect_false (!ev_is_active (w))) 1905 if (expect_false (!ev_is_active (w)))
1798 return; 1906 return;
1799 1907
1800 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1908 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1801 ev_stop (EV_A_ (W)w); 1909 ev_stop (EV_A_ (W)w);
1802} 1910}
1803 1911
1804#if EV_STAT_ENABLE 1912#if EV_STAT_ENABLE
1805 1913
… …
2147 2255
2148#if EV_EMBED_ENABLE 2256#if EV_EMBED_ENABLE
2149void noinline 2257void noinline
2150ev_embed_sweep (EV_P_ ev_embed *w) 2258ev_embed_sweep (EV_P_ ev_embed *w)
2151{ 2259{
2152 ev_loop (w->loop, EVLOOP_NONBLOCK); 2260 ev_loop (w->other, EVLOOP_NONBLOCK);
2153} 2261}
2154 2262
2155static void 2263static void
2156embed_cb (EV_P_ ev_io *io, int revents) 2264embed_io_cb (EV_P_ ev_io *io, int revents)
2157{ 2265{
2158 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2266 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2159 2267
2160 if (ev_cb (w)) 2268 if (ev_cb (w))
2161 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2269 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2162 else 2270 else
2163 ev_embed_sweep (loop, w); 2271 ev_embed_sweep (loop, w);
2164} 2272}
2165 2273
2274static void
2275embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2276{
2277 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2278
2279 fd_reify (w->other);
2280}
2281
2166void 2282void
2167ev_embed_start (EV_P_ ev_embed *w) 2283ev_embed_start (EV_P_ ev_embed *w)
2168{ 2284{
2169 if (expect_false (ev_is_active (w))) 2285 if (expect_false (ev_is_active (w)))
2170 return; 2286 return;
2171 2287
2172 { 2288 {
2173 struct ev_loop *loop = w->loop; 2289 struct ev_loop *loop = w->other;
2174 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2290 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2175 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2291 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2176 } 2292 }
2177 2293
2178 ev_set_priority (&w->io, ev_priority (w)); 2294 ev_set_priority (&w->io, ev_priority (w));
2179 ev_io_start (EV_A_ &w->io); 2295 ev_io_start (EV_A_ &w->io);
2180 2296
2297 ev_prepare_init (&w->prepare, embed_prepare_cb);
2298 ev_set_priority (&w->prepare, EV_MINPRI);
2299 ev_prepare_start (EV_A_ &w->prepare);
2300
2181 ev_start (EV_A_ (W)w, 1); 2301 ev_start (EV_A_ (W)w, 1);
2182} 2302}
2183 2303
2184void 2304void
2185ev_embed_stop (EV_P_ ev_embed *w) 2305ev_embed_stop (EV_P_ ev_embed *w)
… …
2187 clear_pending (EV_A_ (W)w); 2307 clear_pending (EV_A_ (W)w);
2188 if (expect_false (!ev_is_active (w))) 2308 if (expect_false (!ev_is_active (w)))
2189 return; 2309 return;
2190 2310
2191 ev_io_stop (EV_A_ &w->io); 2311 ev_io_stop (EV_A_ &w->io);
2312 ev_prepare_stop (EV_A_ &w->prepare);
2192 2313
2193 ev_stop (EV_A_ (W)w); 2314 ev_stop (EV_A_ (W)w);
2194} 2315}
2195#endif 2316#endif
2196 2317
… …
2285 ev_timer_set (&once->to, timeout, 0.); 2406 ev_timer_set (&once->to, timeout, 0.);
2286 ev_timer_start (EV_A_ &once->to); 2407 ev_timer_start (EV_A_ &once->to);
2287 } 2408 }
2288} 2409}
2289 2410
2411#if EV_MULTIPLICITY
2412 #include "ev_wrap.h"
2413#endif
2414
2290#ifdef __cplusplus 2415#ifdef __cplusplus
2291} 2416}
2292#endif 2417#endif
2293 2418

Diff Legend

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