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.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
… …
476 pendings [pri][w_->pending - 1].w = w_; 526 pendings [pri][w_->pending - 1].w = w_;
477 pendings [pri][w_->pending - 1].events = revents; 527 pendings [pri][w_->pending - 1].events = revents;
478 } 528 }
479} 529}
480 530
481void inline_size 531void inline_speed
482queue_events (EV_P_ W *events, int eventcnt, int type) 532queue_events (EV_P_ W *events, int eventcnt, int type)
483{ 533{
484 int i; 534 int i;
485 535
486 for (i = 0; i < eventcnt; ++i) 536 for (i = 0; i < eventcnt; ++i)
… …
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
638void inline_speed 695void inline_speed
639upheap (WT *heap, int k) 696upheap (WT *heap, int k)
640{ 697{
641 WT w = heap [k]; 698 WT w = heap [k];
642 699
643 while (k && heap [k >> 1]->at > w->at) 700 while (k)
644 { 701 {
702 int p = (k - 1) >> 1;
703
704 if (heap [p]->at <= w->at)
705 break;
706
645 heap [k] = heap [k >> 1]; 707 heap [k] = heap [p];
646 ((W)heap [k])->active = k + 1; 708 ((W)heap [k])->active = k + 1;
647 k >>= 1; 709 k = p;
648 } 710 }
649 711
650 heap [k] = w; 712 heap [k] = w;
651 ((W)heap [k])->active = k + 1; 713 ((W)heap [k])->active = k + 1;
652
653} 714}
654 715
655void inline_speed 716void inline_speed
656downheap (WT *heap, int N, int k) 717downheap (WT *heap, int N, int k)
657{ 718{
658 WT w = heap [k]; 719 WT w = heap [k];
659 720
660 while (k < (N >> 1)) 721 for (;;)
661 { 722 {
662 int j = k << 1; 723 int c = (k << 1) + 1;
663 724
664 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 725 if (c >= N)
665 ++j;
666
667 if (w->at <= heap [j]->at)
668 break; 726 break;
669 727
728 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
729 ? 1 : 0;
730
731 if (w->at <= heap [c]->at)
732 break;
733
670 heap [k] = heap [j]; 734 heap [k] = heap [c];
671 ((W)heap [k])->active = k + 1; 735 ((W)heap [k])->active = k + 1;
736
672 k = j; 737 k = c;
673 } 738 }
674 739
675 heap [k] = w; 740 heap [k] = w;
676 ((W)heap [k])->active = k + 1; 741 ((W)heap [k])->active = k + 1;
677} 742}
… …
784 ev_unref (EV_A); /* child watcher should not keep loop alive */ 849 ev_unref (EV_A); /* child watcher should not keep loop alive */
785} 850}
786 851
787/*****************************************************************************/ 852/*****************************************************************************/
788 853
789static ev_child *childs [EV_PID_HASHSIZE]; 854static WL childs [EV_PID_HASHSIZE];
790 855
791#ifndef _WIN32 856#ifndef _WIN32
792 857
793static ev_signal childev; 858static ev_signal childev;
794 859
… …
909} 974}
910 975
911unsigned int 976unsigned int
912ev_embeddable_backends (void) 977ev_embeddable_backends (void)
913{ 978{
914 return EVBACKEND_EPOLL 979 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
915 | EVBACKEND_KQUEUE 980
916 | 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;
917} 986}
918 987
919unsigned int 988unsigned int
920ev_backend (EV_P) 989ev_backend (EV_P)
921{ 990{
… …
924 993
925unsigned int 994unsigned int
926ev_loop_count (EV_P) 995ev_loop_count (EV_P)
927{ 996{
928 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;
929} 1010}
930 1011
931static void noinline 1012static void noinline
932loop_init (EV_P_ unsigned int flags) 1013loop_init (EV_P_ unsigned int flags)
933{ 1014{
… …
944 ev_rt_now = ev_time (); 1025 ev_rt_now = ev_time ();
945 mn_now = get_clock (); 1026 mn_now = get_clock ();
946 now_floor = mn_now; 1027 now_floor = mn_now;
947 rtmn_diff = ev_rt_now - mn_now; 1028 rtmn_diff = ev_rt_now - mn_now;
948 1029
1030 io_blocktime = 0.;
1031 timeout_blocktime = 0.;
1032
949 /* pid check not overridable via env */ 1033 /* pid check not overridable via env */
950#ifndef _WIN32 1034#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK) 1035 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid (); 1036 curpid = getpid ();
953#endif 1037#endif
… …
1021 array_free (pending, [i]); 1105 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE 1106#if EV_IDLE_ENABLE
1023 array_free (idle, [i]); 1107 array_free (idle, [i]);
1024#endif 1108#endif
1025 } 1109 }
1110
1111 ev_free (anfds); anfdmax = 0;
1026 1112
1027 /* have to use the microsoft-never-gets-it-right macro */ 1113 /* have to use the microsoft-never-gets-it-right macro */
1028 array_free (fdchange, EMPTY); 1114 array_free (fdchange, EMPTY);
1029 array_free (timer, EMPTY); 1115 array_free (timer, EMPTY);
1030#if EV_PERIODIC_ENABLE 1116#if EV_PERIODIC_ENABLE
1031 array_free (periodic, EMPTY); 1117 array_free (periodic, EMPTY);
1118#endif
1119#if EV_FORK_ENABLE
1120 array_free (fork, EMPTY);
1032#endif 1121#endif
1033 array_free (prepare, EMPTY); 1122 array_free (prepare, EMPTY);
1034 array_free (check, EMPTY); 1123 array_free (check, EMPTY);
1035 1124
1036 backend = 0; 1125 backend = 0;
… …
1206void inline_size 1295void inline_size
1207timers_reify (EV_P) 1296timers_reify (EV_P)
1208{ 1297{
1209 while (timercnt && ((WT)timers [0])->at <= mn_now) 1298 while (timercnt && ((WT)timers [0])->at <= mn_now)
1210 { 1299 {
1211 ev_timer *w = timers [0]; 1300 ev_timer *w = (ev_timer *)timers [0];
1212 1301
1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1302 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1214 1303
1215 /* first reschedule or stop timer */ 1304 /* first reschedule or stop timer */
1216 if (w->repeat) 1305 if (w->repeat)
… …
1219 1308
1220 ((WT)w)->at += w->repeat; 1309 ((WT)w)->at += w->repeat;
1221 if (((WT)w)->at < mn_now) 1310 if (((WT)w)->at < mn_now)
1222 ((WT)w)->at = mn_now; 1311 ((WT)w)->at = mn_now;
1223 1312
1224 downheap ((WT *)timers, timercnt, 0); 1313 downheap (timers, timercnt, 0);
1225 } 1314 }
1226 else 1315 else
1227 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1316 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1228 1317
1229 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1318 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1234void inline_size 1323void inline_size
1235periodics_reify (EV_P) 1324periodics_reify (EV_P)
1236{ 1325{
1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1326 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1238 { 1327 {
1239 ev_periodic *w = periodics [0]; 1328 ev_periodic *w = (ev_periodic *)periodics [0];
1240 1329
1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1330 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1242 1331
1243 /* first reschedule or stop timer */ 1332 /* first reschedule or stop timer */
1244 if (w->reschedule_cb) 1333 if (w->reschedule_cb)
1245 { 1334 {
1246 ((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);
1247 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));
1248 downheap ((WT *)periodics, periodiccnt, 0); 1337 downheap (periodics, periodiccnt, 0);
1249 } 1338 }
1250 else if (w->interval) 1339 else if (w->interval)
1251 { 1340 {
1252 ((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;
1253 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;
1254 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));
1255 downheap ((WT *)periodics, periodiccnt, 0); 1344 downheap (periodics, periodiccnt, 0);
1256 } 1345 }
1257 else 1346 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1347 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1348
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1349 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1356 int i;
1268 1357
1269 /* adjust periodics after time jump */ 1358 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1359 for (i = 0; i < periodiccnt; ++i)
1271 { 1360 {
1272 ev_periodic *w = periodics [i]; 1361 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1362
1274 if (w->reschedule_cb) 1363 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1364 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1365 else if (w->interval)
1277 ((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;
1278 } 1367 }
1279 1368
1280 /* now rebuild the heap */ 1369 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1370 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1371 downheap (periodics, periodiccnt, i);
1283} 1372}
1284#endif 1373#endif
1285 1374
1286#if EV_IDLE_ENABLE 1375#if EV_IDLE_ENABLE
1287void inline_size 1376void inline_size
… …
1435 /* update fd-related kernel structures */ 1524 /* update fd-related kernel structures */
1436 fd_reify (EV_A); 1525 fd_reify (EV_A);
1437 1526
1438 /* calculate blocking time */ 1527 /* calculate blocking time */
1439 { 1528 {
1440 ev_tstamp block; 1529 ev_tstamp waittime = 0.;
1530 ev_tstamp sleeptime = 0.;
1441 1531
1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1532 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1443 block = 0.; /* do not block at all */
1444 else
1445 { 1533 {
1446 /* update time to cancel out callback processing overhead */ 1534 /* update time to cancel out callback processing overhead */
1447 time_update (EV_A_ 1e100); 1535 time_update (EV_A_ 1e100);
1448 1536
1449 block = MAX_BLOCKTIME; 1537 waittime = MAX_BLOCKTIME;
1450 1538
1451 if (timercnt) 1539 if (timercnt)
1452 { 1540 {
1453 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1541 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1454 if (block > to) block = to; 1542 if (waittime > to) waittime = to;
1455 } 1543 }
1456 1544
1457#if EV_PERIODIC_ENABLE 1545#if EV_PERIODIC_ENABLE
1458 if (periodiccnt) 1546 if (periodiccnt)
1459 { 1547 {
1460 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;
1461 if (block > to) block = to; 1549 if (waittime > to) waittime = to;
1462 } 1550 }
1463#endif 1551#endif
1464 1552
1465 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 }
1466 } 1566 }
1467 1567
1468 ++loop_count; 1568 ++loop_count;
1469 backend_poll (EV_A_ block); 1569 backend_poll (EV_A_ waittime);
1470 1570
1471 /* update ev_rt_now, do magic */ 1571 /* update ev_rt_now, do magic */
1472 time_update (EV_A_ block); 1572 time_update (EV_A_ waittime + sleeptime);
1473 } 1573 }
1474 1574
1475 /* queue pending timers and reschedule them */ 1575 /* queue pending timers and reschedule them */
1476 timers_reify (EV_A); /* relative timers called last */ 1576 timers_reify (EV_A); /* relative timers called last */
1477#if EV_PERIODIC_ENABLE 1577#if EV_PERIODIC_ENABLE
… …
1589 1689
1590 assert (("ev_io_start called with negative fd", fd >= 0)); 1690 assert (("ev_io_start called with negative fd", fd >= 0));
1591 1691
1592 ev_start (EV_A_ (W)w, 1); 1692 ev_start (EV_A_ (W)w, 1);
1593 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1693 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1594 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1694 wlist_add (&anfds[fd].head, (WL)w);
1595 1695
1596 fd_change (EV_A_ fd); 1696 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1697 w->events &= ~EV_IOFDSET;
1597} 1698}
1598 1699
1599void noinline 1700void noinline
1600ev_io_stop (EV_P_ ev_io *w) 1701ev_io_stop (EV_P_ ev_io *w)
1601{ 1702{
… …
1603 if (expect_false (!ev_is_active (w))) 1704 if (expect_false (!ev_is_active (w)))
1604 return; 1705 return;
1605 1706
1606 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));
1607 1708
1608 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1709 wlist_del (&anfds[w->fd].head, (WL)w);
1609 ev_stop (EV_A_ (W)w); 1710 ev_stop (EV_A_ (W)w);
1610 1711
1611 fd_change (EV_A_ w->fd); 1712 fd_change (EV_A_ w->fd, 1);
1612} 1713}
1613 1714
1614void noinline 1715void noinline
1615ev_timer_start (EV_P_ ev_timer *w) 1716ev_timer_start (EV_P_ ev_timer *w)
1616{ 1717{
… …
1620 ((WT)w)->at += mn_now; 1721 ((WT)w)->at += mn_now;
1621 1722
1622 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.));
1623 1724
1624 ev_start (EV_A_ (W)w, ++timercnt); 1725 ev_start (EV_A_ (W)w, ++timercnt);
1625 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1726 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1626 timers [timercnt - 1] = w; 1727 timers [timercnt - 1] = (WT)w;
1627 upheap ((WT *)timers, timercnt - 1); 1728 upheap (timers, timercnt - 1);
1628 1729
1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1730 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1630} 1731}
1631 1732
1632void noinline 1733void noinline
… …
1634{ 1735{
1635 clear_pending (EV_A_ (W)w); 1736 clear_pending (EV_A_ (W)w);
1636 if (expect_false (!ev_is_active (w))) 1737 if (expect_false (!ev_is_active (w)))
1637 return; 1738 return;
1638 1739
1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1740 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1640 1741
1641 { 1742 {
1642 int active = ((W)w)->active; 1743 int active = ((W)w)->active;
1643 1744
1644 if (expect_true (--active < --timercnt)) 1745 if (expect_true (--active < --timercnt))
1645 { 1746 {
1646 timers [active] = timers [timercnt]; 1747 timers [active] = timers [timercnt];
1647 adjustheap ((WT *)timers, timercnt, active); 1748 adjustheap (timers, timercnt, active);
1648 } 1749 }
1649 } 1750 }
1650 1751
1651 ((WT)w)->at -= mn_now; 1752 ((WT)w)->at -= mn_now;
1652 1753
… …
1659 if (ev_is_active (w)) 1760 if (ev_is_active (w))
1660 { 1761 {
1661 if (w->repeat) 1762 if (w->repeat)
1662 { 1763 {
1663 ((WT)w)->at = mn_now + w->repeat; 1764 ((WT)w)->at = mn_now + w->repeat;
1664 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1765 adjustheap (timers, timercnt, ((W)w)->active - 1);
1665 } 1766 }
1666 else 1767 else
1667 ev_timer_stop (EV_A_ w); 1768 ev_timer_stop (EV_A_ w);
1668 } 1769 }
1669 else if (w->repeat) 1770 else if (w->repeat)
… …
1690 } 1791 }
1691 else 1792 else
1692 ((WT)w)->at = w->offset; 1793 ((WT)w)->at = w->offset;
1693 1794
1694 ev_start (EV_A_ (W)w, ++periodiccnt); 1795 ev_start (EV_A_ (W)w, ++periodiccnt);
1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1796 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1696 periodics [periodiccnt - 1] = w; 1797 periodics [periodiccnt - 1] = (WT)w;
1697 upheap ((WT *)periodics, periodiccnt - 1); 1798 upheap (periodics, periodiccnt - 1);
1698 1799
1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1800 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1700} 1801}
1701 1802
1702void noinline 1803void noinline
… …
1704{ 1805{
1705 clear_pending (EV_A_ (W)w); 1806 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 1807 if (expect_false (!ev_is_active (w)))
1707 return; 1808 return;
1708 1809
1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1810 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1710 1811
1711 { 1812 {
1712 int active = ((W)w)->active; 1813 int active = ((W)w)->active;
1713 1814
1714 if (expect_true (--active < --periodiccnt)) 1815 if (expect_true (--active < --periodiccnt))
1715 { 1816 {
1716 periodics [active] = periodics [periodiccnt]; 1817 periodics [active] = periodics [periodiccnt];
1717 adjustheap ((WT *)periodics, periodiccnt, active); 1818 adjustheap (periodics, periodiccnt, active);
1718 } 1819 }
1719 } 1820 }
1720 1821
1721 ev_stop (EV_A_ (W)w); 1822 ev_stop (EV_A_ (W)w);
1722} 1823}
… …
1743 if (expect_false (ev_is_active (w))) 1844 if (expect_false (ev_is_active (w)))
1744 return; 1845 return;
1745 1846
1746 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1847 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1747 1848
1849 {
1850#ifndef _WIN32
1851 sigset_t full, prev;
1852 sigfillset (&full);
1853 sigprocmask (SIG_SETMASK, &full, &prev);
1854#endif
1855
1856 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1857
1858#ifndef _WIN32
1859 sigprocmask (SIG_SETMASK, &prev, 0);
1860#endif
1861 }
1862
1748 ev_start (EV_A_ (W)w, 1); 1863 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); 1864 wlist_add (&signals [w->signum - 1].head, (WL)w);
1751 1865
1752 if (!((WL)w)->next) 1866 if (!((WL)w)->next)
1753 { 1867 {
1754#if _WIN32 1868#if _WIN32
1755 signal (w->signum, sighandler); 1869 signal (w->signum, sighandler);
… …
1768{ 1882{
1769 clear_pending (EV_A_ (W)w); 1883 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 1884 if (expect_false (!ev_is_active (w)))
1771 return; 1885 return;
1772 1886
1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1887 wlist_del (&signals [w->signum - 1].head, (WL)w);
1774 ev_stop (EV_A_ (W)w); 1888 ev_stop (EV_A_ (W)w);
1775 1889
1776 if (!signals [w->signum - 1].head) 1890 if (!signals [w->signum - 1].head)
1777 signal (w->signum, SIG_DFL); 1891 signal (w->signum, SIG_DFL);
1778} 1892}
… …
1785#endif 1899#endif
1786 if (expect_false (ev_is_active (w))) 1900 if (expect_false (ev_is_active (w)))
1787 return; 1901 return;
1788 1902
1789 ev_start (EV_A_ (W)w, 1); 1903 ev_start (EV_A_ (W)w, 1);
1790 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1904 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1791} 1905}
1792 1906
1793void 1907void
1794ev_child_stop (EV_P_ ev_child *w) 1908ev_child_stop (EV_P_ ev_child *w)
1795{ 1909{
1796 clear_pending (EV_A_ (W)w); 1910 clear_pending (EV_A_ (W)w);
1797 if (expect_false (!ev_is_active (w))) 1911 if (expect_false (!ev_is_active (w)))
1798 return; 1912 return;
1799 1913
1800 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1914 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1801 ev_stop (EV_A_ (W)w); 1915 ev_stop (EV_A_ (W)w);
1802} 1916}
1803 1917
1804#if EV_STAT_ENABLE 1918#if EV_STAT_ENABLE
1805 1919
… …
2147 2261
2148#if EV_EMBED_ENABLE 2262#if EV_EMBED_ENABLE
2149void noinline 2263void noinline
2150ev_embed_sweep (EV_P_ ev_embed *w) 2264ev_embed_sweep (EV_P_ ev_embed *w)
2151{ 2265{
2152 ev_loop (w->loop, EVLOOP_NONBLOCK); 2266 ev_loop (w->other, EVLOOP_NONBLOCK);
2153} 2267}
2154 2268
2155static void 2269static void
2156embed_cb (EV_P_ ev_io *io, int revents) 2270embed_io_cb (EV_P_ ev_io *io, int revents)
2157{ 2271{
2158 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2272 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2159 2273
2160 if (ev_cb (w)) 2274 if (ev_cb (w))
2161 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2275 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2162 else 2276 else
2163 ev_embed_sweep (loop, w); 2277 ev_loop (w->other, EVLOOP_NONBLOCK);
2164} 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
2165 2303
2166void 2304void
2167ev_embed_start (EV_P_ ev_embed *w) 2305ev_embed_start (EV_P_ ev_embed *w)
2168{ 2306{
2169 if (expect_false (ev_is_active (w))) 2307 if (expect_false (ev_is_active (w)))
2170 return; 2308 return;
2171 2309
2172 { 2310 {
2173 struct ev_loop *loop = w->loop; 2311 struct ev_loop *loop = w->other;
2174 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 ()));
2175 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2313 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2176 } 2314 }
2177 2315
2178 ev_set_priority (&w->io, ev_priority (w)); 2316 ev_set_priority (&w->io, ev_priority (w));
2179 ev_io_start (EV_A_ &w->io); 2317 ev_io_start (EV_A_ &w->io);
2180 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
2181 ev_start (EV_A_ (W)w, 1); 2325 ev_start (EV_A_ (W)w, 1);
2182} 2326}
2183 2327
2184void 2328void
2185ev_embed_stop (EV_P_ ev_embed *w) 2329ev_embed_stop (EV_P_ ev_embed *w)
… …
2187 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2188 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2189 return; 2333 return;
2190 2334
2191 ev_io_stop (EV_A_ &w->io); 2335 ev_io_stop (EV_A_ &w->io);
2336 ev_prepare_stop (EV_A_ &w->prepare);
2192 2337
2193 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2194} 2339}
2195#endif 2340#endif
2196 2341
… …
2285 ev_timer_set (&once->to, timeout, 0.); 2430 ev_timer_set (&once->to, timeout, 0.);
2286 ev_timer_start (EV_A_ &once->to); 2431 ev_timer_start (EV_A_ &once->to);
2287 } 2432 }
2288} 2433}
2289 2434
2435#if EV_MULTIPLICITY
2436 #include "ev_wrap.h"
2437#endif
2438
2290#ifdef __cplusplus 2439#ifdef __cplusplus
2291} 2440}
2292#endif 2441#endif
2293 2442

Diff Legend

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