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.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
… …
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{
914 return EVBACKEND_EPOLL 977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
915 | EVBACKEND_KQUEUE 978
916 | 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;
917} 984}
918 985
919unsigned int 986unsigned int
920ev_backend (EV_P) 987ev_backend (EV_P)
921{ 988{
… …
924 991
925unsigned int 992unsigned int
926ev_loop_count (EV_P) 993ev_loop_count (EV_P)
927{ 994{
928 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;
929} 1008}
930 1009
931static void noinline 1010static void noinline
932loop_init (EV_P_ unsigned int flags) 1011loop_init (EV_P_ unsigned int flags)
933{ 1012{
… …
944 ev_rt_now = ev_time (); 1023 ev_rt_now = ev_time ();
945 mn_now = get_clock (); 1024 mn_now = get_clock ();
946 now_floor = mn_now; 1025 now_floor = mn_now;
947 rtmn_diff = ev_rt_now - mn_now; 1026 rtmn_diff = ev_rt_now - mn_now;
948 1027
1028 io_blocktime = 0.;
1029 timeout_blocktime = 0.;
1030
949 /* pid check not overridable via env */ 1031 /* pid check not overridable via env */
950#ifndef _WIN32 1032#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK) 1033 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid (); 1034 curpid = getpid ();
953#endif 1035#endif
… …
1021 array_free (pending, [i]); 1103 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE 1104#if EV_IDLE_ENABLE
1023 array_free (idle, [i]); 1105 array_free (idle, [i]);
1024#endif 1106#endif
1025 } 1107 }
1108
1109 ev_free (anfds); anfdmax = 0;
1026 1110
1027 /* have to use the microsoft-never-gets-it-right macro */ 1111 /* have to use the microsoft-never-gets-it-right macro */
1028 array_free (fdchange, EMPTY); 1112 array_free (fdchange, EMPTY);
1029 array_free (timer, EMPTY); 1113 array_free (timer, EMPTY);
1030#if EV_PERIODIC_ENABLE 1114#if EV_PERIODIC_ENABLE
1031 array_free (periodic, EMPTY); 1115 array_free (periodic, EMPTY);
1116#endif
1117#if EV_FORK_ENABLE
1118 array_free (fork, EMPTY);
1032#endif 1119#endif
1033 array_free (prepare, EMPTY); 1120 array_free (prepare, EMPTY);
1034 array_free (check, EMPTY); 1121 array_free (check, EMPTY);
1035 1122
1036 backend = 0; 1123 backend = 0;
… …
1206void inline_size 1293void inline_size
1207timers_reify (EV_P) 1294timers_reify (EV_P)
1208{ 1295{
1209 while (timercnt && ((WT)timers [0])->at <= mn_now) 1296 while (timercnt && ((WT)timers [0])->at <= mn_now)
1210 { 1297 {
1211 ev_timer *w = timers [0]; 1298 ev_timer *w = (ev_timer *)timers [0];
1212 1299
1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1300 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1214 1301
1215 /* first reschedule or stop timer */ 1302 /* first reschedule or stop timer */
1216 if (w->repeat) 1303 if (w->repeat)
… …
1219 1306
1220 ((WT)w)->at += w->repeat; 1307 ((WT)w)->at += w->repeat;
1221 if (((WT)w)->at < mn_now) 1308 if (((WT)w)->at < mn_now)
1222 ((WT)w)->at = mn_now; 1309 ((WT)w)->at = mn_now;
1223 1310
1224 downheap ((WT *)timers, timercnt, 0); 1311 downheap (timers, timercnt, 0);
1225 } 1312 }
1226 else 1313 else
1227 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1314 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1228 1315
1229 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1316 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1234void inline_size 1321void inline_size
1235periodics_reify (EV_P) 1322periodics_reify (EV_P)
1236{ 1323{
1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1324 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1238 { 1325 {
1239 ev_periodic *w = periodics [0]; 1326 ev_periodic *w = (ev_periodic *)periodics [0];
1240 1327
1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1328 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1242 1329
1243 /* first reschedule or stop timer */ 1330 /* first reschedule or stop timer */
1244 if (w->reschedule_cb) 1331 if (w->reschedule_cb)
1245 { 1332 {
1246 ((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);
1247 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));
1248 downheap ((WT *)periodics, periodiccnt, 0); 1335 downheap (periodics, periodiccnt, 0);
1249 } 1336 }
1250 else if (w->interval) 1337 else if (w->interval)
1251 { 1338 {
1252 ((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;
1253 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;
1254 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));
1255 downheap ((WT *)periodics, periodiccnt, 0); 1342 downheap (periodics, periodiccnt, 0);
1256 } 1343 }
1257 else 1344 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1345 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1346
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1347 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1354 int i;
1268 1355
1269 /* adjust periodics after time jump */ 1356 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1357 for (i = 0; i < periodiccnt; ++i)
1271 { 1358 {
1272 ev_periodic *w = periodics [i]; 1359 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1360
1274 if (w->reschedule_cb) 1361 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1362 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1363 else if (w->interval)
1277 ((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;
1278 } 1365 }
1279 1366
1280 /* now rebuild the heap */ 1367 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1368 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1369 downheap (periodics, periodiccnt, i);
1283} 1370}
1284#endif 1371#endif
1285 1372
1286#if EV_IDLE_ENABLE 1373#if EV_IDLE_ENABLE
1287void inline_size 1374void inline_size
… …
1435 /* update fd-related kernel structures */ 1522 /* update fd-related kernel structures */
1436 fd_reify (EV_A); 1523 fd_reify (EV_A);
1437 1524
1438 /* calculate blocking time */ 1525 /* calculate blocking time */
1439 { 1526 {
1440 ev_tstamp block; 1527 ev_tstamp waittime = 0.;
1528 ev_tstamp sleeptime = 0.;
1441 1529
1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1530 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1443 block = 0.; /* do not block at all */
1444 else
1445 { 1531 {
1446 /* update time to cancel out callback processing overhead */ 1532 /* update time to cancel out callback processing overhead */
1447 time_update (EV_A_ 1e100); 1533 time_update (EV_A_ 1e100);
1448 1534
1449 block = MAX_BLOCKTIME; 1535 waittime = MAX_BLOCKTIME;
1450 1536
1451 if (timercnt) 1537 if (timercnt)
1452 { 1538 {
1453 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1539 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1454 if (block > to) block = to; 1540 if (waittime > to) waittime = to;
1455 } 1541 }
1456 1542
1457#if EV_PERIODIC_ENABLE 1543#if EV_PERIODIC_ENABLE
1458 if (periodiccnt) 1544 if (periodiccnt)
1459 { 1545 {
1460 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;
1461 if (block > to) block = to; 1547 if (waittime > to) waittime = to;
1462 } 1548 }
1463#endif 1549#endif
1464 1550
1465 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 }
1466 } 1564 }
1467 1565
1468 ++loop_count; 1566 ++loop_count;
1469 backend_poll (EV_A_ block); 1567 backend_poll (EV_A_ waittime);
1470 1568
1471 /* update ev_rt_now, do magic */ 1569 /* update ev_rt_now, do magic */
1472 time_update (EV_A_ block); 1570 time_update (EV_A_ waittime + sleeptime);
1473 } 1571 }
1474 1572
1475 /* queue pending timers and reschedule them */ 1573 /* queue pending timers and reschedule them */
1476 timers_reify (EV_A); /* relative timers called last */ 1574 timers_reify (EV_A); /* relative timers called last */
1477#if EV_PERIODIC_ENABLE 1575#if EV_PERIODIC_ENABLE
… …
1589 1687
1590 assert (("ev_io_start called with negative fd", fd >= 0)); 1688 assert (("ev_io_start called with negative fd", fd >= 0));
1591 1689
1592 ev_start (EV_A_ (W)w, 1); 1690 ev_start (EV_A_ (W)w, 1);
1593 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1691 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1594 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1692 wlist_add (&anfds[fd].head, (WL)w);
1595 1693
1596 fd_change (EV_A_ fd); 1694 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1695 w->events &= ~EV_IOFDSET;
1597} 1696}
1598 1697
1599void noinline 1698void noinline
1600ev_io_stop (EV_P_ ev_io *w) 1699ev_io_stop (EV_P_ ev_io *w)
1601{ 1700{
… …
1603 if (expect_false (!ev_is_active (w))) 1702 if (expect_false (!ev_is_active (w)))
1604 return; 1703 return;
1605 1704
1606 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));
1607 1706
1608 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1707 wlist_del (&anfds[w->fd].head, (WL)w);
1609 ev_stop (EV_A_ (W)w); 1708 ev_stop (EV_A_ (W)w);
1610 1709
1611 fd_change (EV_A_ w->fd); 1710 fd_change (EV_A_ w->fd, 1);
1612} 1711}
1613 1712
1614void noinline 1713void noinline
1615ev_timer_start (EV_P_ ev_timer *w) 1714ev_timer_start (EV_P_ ev_timer *w)
1616{ 1715{
… …
1620 ((WT)w)->at += mn_now; 1719 ((WT)w)->at += mn_now;
1621 1720
1622 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.));
1623 1722
1624 ev_start (EV_A_ (W)w, ++timercnt); 1723 ev_start (EV_A_ (W)w, ++timercnt);
1625 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1724 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1626 timers [timercnt - 1] = w; 1725 timers [timercnt - 1] = (WT)w;
1627 upheap ((WT *)timers, timercnt - 1); 1726 upheap (timers, timercnt - 1);
1628 1727
1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1728 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1630} 1729}
1631 1730
1632void noinline 1731void noinline
… …
1634{ 1733{
1635 clear_pending (EV_A_ (W)w); 1734 clear_pending (EV_A_ (W)w);
1636 if (expect_false (!ev_is_active (w))) 1735 if (expect_false (!ev_is_active (w)))
1637 return; 1736 return;
1638 1737
1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1738 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1640 1739
1641 { 1740 {
1642 int active = ((W)w)->active; 1741 int active = ((W)w)->active;
1643 1742
1644 if (expect_true (--active < --timercnt)) 1743 if (expect_true (--active < --timercnt))
1645 { 1744 {
1646 timers [active] = timers [timercnt]; 1745 timers [active] = timers [timercnt];
1647 adjustheap ((WT *)timers, timercnt, active); 1746 adjustheap (timers, timercnt, active);
1648 } 1747 }
1649 } 1748 }
1650 1749
1651 ((WT)w)->at -= mn_now; 1750 ((WT)w)->at -= mn_now;
1652 1751
… …
1659 if (ev_is_active (w)) 1758 if (ev_is_active (w))
1660 { 1759 {
1661 if (w->repeat) 1760 if (w->repeat)
1662 { 1761 {
1663 ((WT)w)->at = mn_now + w->repeat; 1762 ((WT)w)->at = mn_now + w->repeat;
1664 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1763 adjustheap (timers, timercnt, ((W)w)->active - 1);
1665 } 1764 }
1666 else 1765 else
1667 ev_timer_stop (EV_A_ w); 1766 ev_timer_stop (EV_A_ w);
1668 } 1767 }
1669 else if (w->repeat) 1768 else if (w->repeat)
… …
1690 } 1789 }
1691 else 1790 else
1692 ((WT)w)->at = w->offset; 1791 ((WT)w)->at = w->offset;
1693 1792
1694 ev_start (EV_A_ (W)w, ++periodiccnt); 1793 ev_start (EV_A_ (W)w, ++periodiccnt);
1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1794 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1696 periodics [periodiccnt - 1] = w; 1795 periodics [periodiccnt - 1] = (WT)w;
1697 upheap ((WT *)periodics, periodiccnt - 1); 1796 upheap (periodics, periodiccnt - 1);
1698 1797
1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1798 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1700} 1799}
1701 1800
1702void noinline 1801void noinline
… …
1704{ 1803{
1705 clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1707 return; 1806 return;
1708 1807
1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1808 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1710 1809
1711 { 1810 {
1712 int active = ((W)w)->active; 1811 int active = ((W)w)->active;
1713 1812
1714 if (expect_true (--active < --periodiccnt)) 1813 if (expect_true (--active < --periodiccnt))
1715 { 1814 {
1716 periodics [active] = periodics [periodiccnt]; 1815 periodics [active] = periodics [periodiccnt];
1717 adjustheap ((WT *)periodics, periodiccnt, active); 1816 adjustheap (periodics, periodiccnt, active);
1718 } 1817 }
1719 } 1818 }
1720 1819
1721 ev_stop (EV_A_ (W)w); 1820 ev_stop (EV_A_ (W)w);
1722} 1821}
… …
1743 if (expect_false (ev_is_active (w))) 1842 if (expect_false (ev_is_active (w)))
1744 return; 1843 return;
1745 1844
1746 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));
1747 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
1748 ev_start (EV_A_ (W)w, 1); 1861 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); 1862 wlist_add (&signals [w->signum - 1].head, (WL)w);
1751 1863
1752 if (!((WL)w)->next) 1864 if (!((WL)w)->next)
1753 { 1865 {
1754#if _WIN32 1866#if _WIN32
1755 signal (w->signum, sighandler); 1867 signal (w->signum, sighandler);
… …
1768{ 1880{
1769 clear_pending (EV_A_ (W)w); 1881 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 1882 if (expect_false (!ev_is_active (w)))
1771 return; 1883 return;
1772 1884
1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_del (&signals [w->signum - 1].head, (WL)w);
1774 ev_stop (EV_A_ (W)w); 1886 ev_stop (EV_A_ (W)w);
1775 1887
1776 if (!signals [w->signum - 1].head) 1888 if (!signals [w->signum - 1].head)
1777 signal (w->signum, SIG_DFL); 1889 signal (w->signum, SIG_DFL);
1778} 1890}
… …
1785#endif 1897#endif
1786 if (expect_false (ev_is_active (w))) 1898 if (expect_false (ev_is_active (w)))
1787 return; 1899 return;
1788 1900
1789 ev_start (EV_A_ (W)w, 1); 1901 ev_start (EV_A_ (W)w, 1);
1790 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1902 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1791} 1903}
1792 1904
1793void 1905void
1794ev_child_stop (EV_P_ ev_child *w) 1906ev_child_stop (EV_P_ ev_child *w)
1795{ 1907{
1796 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1797 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1798 return; 1910 return;
1799 1911
1800 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1912 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1801 ev_stop (EV_A_ (W)w); 1913 ev_stop (EV_A_ (W)w);
1802} 1914}
1803 1915
1804#if EV_STAT_ENABLE 1916#if EV_STAT_ENABLE
1805 1917
… …
2147 2259
2148#if EV_EMBED_ENABLE 2260#if EV_EMBED_ENABLE
2149void noinline 2261void noinline
2150ev_embed_sweep (EV_P_ ev_embed *w) 2262ev_embed_sweep (EV_P_ ev_embed *w)
2151{ 2263{
2152 ev_loop (w->loop, EVLOOP_NONBLOCK); 2264 ev_loop (w->other, EVLOOP_NONBLOCK);
2153} 2265}
2154 2266
2155static void 2267static void
2156embed_cb (EV_P_ ev_io *io, int revents) 2268embed_io_cb (EV_P_ ev_io *io, int revents)
2157{ 2269{
2158 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2270 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2159 2271
2160 if (ev_cb (w)) 2272 if (ev_cb (w))
2161 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2273 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2162 else 2274 else
2163 ev_embed_sweep (loop, w); 2275 ev_loop (w->other, EVLOOP_NONBLOCK);
2164} 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
2165 2301
2166void 2302void
2167ev_embed_start (EV_P_ ev_embed *w) 2303ev_embed_start (EV_P_ ev_embed *w)
2168{ 2304{
2169 if (expect_false (ev_is_active (w))) 2305 if (expect_false (ev_is_active (w)))
2170 return; 2306 return;
2171 2307
2172 { 2308 {
2173 struct ev_loop *loop = w->loop; 2309 struct ev_loop *loop = w->other;
2174 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 ()));
2175 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2176 } 2312 }
2177 2313
2178 ev_set_priority (&w->io, ev_priority (w)); 2314 ev_set_priority (&w->io, ev_priority (w));
2179 ev_io_start (EV_A_ &w->io); 2315 ev_io_start (EV_A_ &w->io);
2180 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
2181 ev_start (EV_A_ (W)w, 1); 2323 ev_start (EV_A_ (W)w, 1);
2182} 2324}
2183 2325
2184void 2326void
2185ev_embed_stop (EV_P_ ev_embed *w) 2327ev_embed_stop (EV_P_ ev_embed *w)
… …
2187 clear_pending (EV_A_ (W)w); 2329 clear_pending (EV_A_ (W)w);
2188 if (expect_false (!ev_is_active (w))) 2330 if (expect_false (!ev_is_active (w)))
2189 return; 2331 return;
2190 2332
2191 ev_io_stop (EV_A_ &w->io); 2333 ev_io_stop (EV_A_ &w->io);
2334 ev_prepare_stop (EV_A_ &w->prepare);
2192 2335
2193 ev_stop (EV_A_ (W)w); 2336 ev_stop (EV_A_ (W)w);
2194} 2337}
2195#endif 2338#endif
2196 2339
… …
2285 ev_timer_set (&once->to, timeout, 0.); 2428 ev_timer_set (&once->to, timeout, 0.);
2286 ev_timer_start (EV_A_ &once->to); 2429 ev_timer_start (EV_A_ &once->to);
2287 } 2430 }
2288} 2431}
2289 2432
2433#if EV_MULTIPLICITY
2434 #include "ev_wrap.h"
2435#endif
2436
2290#ifdef __cplusplus 2437#ifdef __cplusplus
2291} 2438}
2292#endif 2439#endif
2293 2440

Diff Legend

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