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

Comparing libev/ev.c (file contents):
Revision 1.148 by root, Tue Nov 27 11:11:13 2007 UTC vs.
Revision 1.162 by root, Mon Dec 3 13:41:24 2007 UTC

… …
94# else 94# else
95# define EV_USE_PORT 0 95# define EV_USE_PORT 0
96# endif 96# endif
97# endif 97# endif
98 98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
105# endif
106
99#endif 107#endif
100 108
101#include <math.h> 109#include <math.h>
102#include <stdlib.h> 110#include <stdlib.h>
103#include <fcntl.h> 111#include <fcntl.h>
… …
109#include <errno.h> 117#include <errno.h>
110#include <sys/types.h> 118#include <sys/types.h>
111#include <time.h> 119#include <time.h>
112 120
113#include <signal.h> 121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
114 128
115#ifndef _WIN32 129#ifndef _WIN32
116# include <sys/time.h> 130# include <sys/time.h>
117# include <sys/wait.h> 131# include <sys/wait.h>
118# include <unistd.h> 132# include <unistd.h>
… …
156 170
157#ifndef EV_USE_PORT 171#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 172# define EV_USE_PORT 0
159#endif 173#endif
160 174
175#ifndef EV_USE_INOTIFY
176# define EV_USE_INOTIFY 0
177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
182# else
183# define EV_PID_HASHSIZE 16
184# endif
185#endif
186
187#ifndef EV_INOTIFY_HASHSIZE
188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
193#endif
194
161/**/ 195/**/
162 196
163#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
… …
172 206
173#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 208# include <winsock.h>
175#endif 209#endif
176 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
218
177/**/ 219/**/
178 220
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
183
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189 224
190#if __GNUC__ >= 3 225#if __GNUC__ >= 3
191# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline_size static inline /* inline for codesize */ 227# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL 228# if EV_MINIMAL
… …
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 290{
256 alloc = cb; 291 alloc = cb;
257} 292}
258 293
259static void * 294inline_speed void *
260ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, long size)
261{ 296{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
263 298
264 if (!ptr && size) 299 if (!ptr && size)
… …
288typedef struct 323typedef struct
289{ 324{
290 W w; 325 W w;
291 int events; 326 int events;
292} ANPENDING; 327} ANPENDING;
328
329#if EV_USE_INOTIFY
330typedef struct
331{
332 WL head;
333} ANFS;
334#endif
293 335
294#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
295 337
296 struct ev_loop 338 struct ev_loop
297 { 339 {
… …
547static void noinline 589static void noinline
548fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
549{ 591{
550 int fd; 592 int fd;
551 593
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 594 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 595 if (anfds [fd].events)
555 { 596 {
556 anfds [fd].events = 0; 597 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 598 fd_change (EV_A_ fd);
… …
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 750 ev_unref (EV_A); /* child watcher should not keep loop alive */
710} 751}
711 752
712/*****************************************************************************/ 753/*****************************************************************************/
713 754
714static ev_child *childs [PID_HASHSIZE]; 755static ev_child *childs [EV_PID_HASHSIZE];
715 756
716#ifndef _WIN32 757#ifndef _WIN32
717 758
718static ev_signal childev; 759static ev_signal childev;
719 760
720void inline_speed 761void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 762child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
722{ 763{
723 ev_child *w; 764 ev_child *w;
724 765
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
726 if (w->pid == pid || !w->pid) 767 if (w->pid == pid || !w->pid)
727 { 768 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
729 w->rpid = pid; 770 w->rpid = pid;
730 w->rstatus = status; 771 w->rstatus = status;
… …
751 /* make sure we are called again until all childs have been reaped */ 792 /* make sure we are called again until all childs have been reaped */
752 /* we need to do it this way so that the callback gets called before we continue */ 793 /* we need to do it this way so that the callback gets called before we continue */
753 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 794 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 795
755 child_reap (EV_A_ sw, pid, pid, status); 796 child_reap (EV_A_ sw, pid, pid, status);
797 if (EV_PID_HASHSIZE > 1)
756 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 798 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 799}
758 800
759#endif 801#endif
760 802
761/*****************************************************************************/ 803/*****************************************************************************/
… …
844ev_backend (EV_P) 886ev_backend (EV_P)
845{ 887{
846 return backend; 888 return backend;
847} 889}
848 890
849static void 891unsigned int
892ev_loop_count (EV_P)
893{
894 return loop_count;
895}
896
897static void noinline
850loop_init (EV_P_ unsigned int flags) 898loop_init (EV_P_ unsigned int flags)
851{ 899{
852 if (!backend) 900 if (!backend)
853 { 901 {
854#if EV_USE_MONOTONIC 902#if EV_USE_MONOTONIC
… …
862 ev_rt_now = ev_time (); 910 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 911 mn_now = get_clock ();
864 now_floor = mn_now; 912 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 913 rtmn_diff = ev_rt_now - mn_now;
866 914
915 /* pid check not overridable via env */
916#ifndef _WIN32
917 if (flags & EVFLAG_FORKCHECK)
918 curpid = getpid ();
919#endif
920
867 if (!(flags & EVFLAG_NOENV) 921 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 922 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 923 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 924 flags = atoi (getenv ("LIBEV_FLAGS"));
871 925
872 if (!(flags & 0x0000ffffUL)) 926 if (!(flags & 0x0000ffffUL))
873 flags |= ev_recommended_backends (); 927 flags |= ev_recommended_backends ();
874 928
875 backend = 0; 929 backend = 0;
930 backend_fd = -1;
931#if EV_USE_INOTIFY
932 fs_fd = -2;
933#endif
934
876#if EV_USE_PORT 935#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 936 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 937#endif
879#if EV_USE_KQUEUE 938#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 939 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
892 ev_init (&sigev, sigcb); 951 ev_init (&sigev, sigcb);
893 ev_set_priority (&sigev, EV_MAXPRI); 952 ev_set_priority (&sigev, EV_MAXPRI);
894 } 953 }
895} 954}
896 955
897static void 956static void noinline
898loop_destroy (EV_P) 957loop_destroy (EV_P)
899{ 958{
900 int i; 959 int i;
960
961#if EV_USE_INOTIFY
962 if (fs_fd >= 0)
963 close (fs_fd);
964#endif
965
966 if (backend_fd >= 0)
967 close (backend_fd);
901 968
902#if EV_USE_PORT 969#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 970 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 971#endif
905#if EV_USE_KQUEUE 972#if EV_USE_KQUEUE
… …
929 array_free (check, EMPTY0); 996 array_free (check, EMPTY0);
930 997
931 backend = 0; 998 backend = 0;
932} 999}
933 1000
934static void 1001void inline_size infy_fork (EV_P);
1002
1003void inline_size
935loop_fork (EV_P) 1004loop_fork (EV_P)
936{ 1005{
937#if EV_USE_PORT 1006#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1007 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1008#endif
940#if EV_USE_KQUEUE 1009#if EV_USE_KQUEUE
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1010 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1011#endif
943#if EV_USE_EPOLL 1012#if EV_USE_EPOLL
944 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1013 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1014#endif
1015#if EV_USE_INOTIFY
1016 infy_fork (EV_A);
945#endif 1017#endif
946 1018
947 if (ev_is_active (&sigev)) 1019 if (ev_is_active (&sigev))
948 { 1020 {
949 /* default loop */ 1021 /* default loop */
… …
1089 { 1161 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1162 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1163
1092 if (expect_true (p->w)) 1164 if (expect_true (p->w))
1093 { 1165 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1166 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1167
1096 p->w->pending = 0; 1168 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1169 EV_CB_INVOKE (p->w, p->events);
1098 } 1170 }
1099 } 1171 }
… …
1104{ 1176{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1177 while (timercnt && ((WT)timers [0])->at <= mn_now)
1106 { 1178 {
1107 ev_timer *w = timers [0]; 1179 ev_timer *w = timers [0];
1108 1180
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1181 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1182
1111 /* first reschedule or stop timer */ 1183 /* first reschedule or stop timer */
1112 if (w->repeat) 1184 if (w->repeat)
1113 { 1185 {
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1186 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1132{ 1204{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1205 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1134 { 1206 {
1135 ev_periodic *w = periodics [0]; 1207 ev_periodic *w = periodics [0];
1136 1208
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1209 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1210
1139 /* first reschedule or stop timer */ 1211 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1212 if (w->reschedule_cb)
1141 { 1213 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1214 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
… …
1209 ev_tstamp odiff = rtmn_diff; 1281 ev_tstamp odiff = rtmn_diff;
1210 1282
1211 /* loop a few times, before making important decisions. 1283 /* loop a few times, before making important decisions.
1212 * on the choice of "4": one iteration isn't enough, 1284 * on the choice of "4": one iteration isn't enough,
1213 * in case we get preempted during the calls to 1285 * in case we get preempted during the calls to
1214 * ev_time and get_clock. a second call is almost guarenteed 1286 * ev_time and get_clock. a second call is almost guaranteed
1215 * to succeed in that case, though. and looping a few more times 1287 * to succeed in that case, though. and looping a few more times
1216 * doesn't hurt either as we only do this on time-jumps or 1288 * doesn't hurt either as we only do this on time-jumps or
1217 * in the unlikely event of getting preempted here. 1289 * in the unlikely event of having been preempted here.
1218 */ 1290 */
1219 for (i = 4; --i; ) 1291 for (i = 4; --i; )
1220 { 1292 {
1221 rtmn_diff = ev_rt_now - mn_now; 1293 rtmn_diff = ev_rt_now - mn_now;
1222 1294
… …
1244 { 1316 {
1245#if EV_PERIODIC_ENABLE 1317#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1318 periodics_reschedule (EV_A);
1247#endif 1319#endif
1248 1320
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1321 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1322 for (i = 0; i < timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1323 ((WT)timers [i])->at += ev_rt_now - mn_now;
1252 } 1324 }
1253 1325
1254 mn_now = ev_rt_now; 1326 mn_now = ev_rt_now;
… …
1274{ 1346{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1347 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1276 ? EVUNLOOP_ONE 1348 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL; 1349 : EVUNLOOP_CANCEL;
1278 1350
1279 while (activecnt) 1351 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1352
1353 do
1280 { 1354 {
1281 /* we might have forked, so reify kernel state if necessary */ 1355#ifndef _WIN32
1356 if (expect_false (curpid)) /* penalise the forking check even more */
1357 if (expect_false (getpid () != curpid))
1358 {
1359 curpid = getpid ();
1360 postfork = 1;
1361 }
1362#endif
1363
1282 #if EV_FORK_ENABLE 1364#if EV_FORK_ENABLE
1365 /* we might have forked, so queue fork handlers */
1283 if (expect_false (postfork)) 1366 if (expect_false (postfork))
1284 if (forkcnt) 1367 if (forkcnt)
1285 { 1368 {
1286 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1287 call_pending (EV_A); 1370 call_pending (EV_A);
1288 } 1371 }
1289 #endif 1372#endif
1290 1373
1291 /* queue check watchers (and execute them) */ 1374 /* queue check watchers (and execute them) */
1292 if (expect_false (preparecnt)) 1375 if (expect_false (preparecnt))
1293 { 1376 {
1294 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1377 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1295 call_pending (EV_A); 1378 call_pending (EV_A);
1296 } 1379 }
1297 1380
1381 if (expect_false (!activecnt))
1382 break;
1383
1298 /* we might have forked, so reify kernel state if necessary */ 1384 /* we might have forked, so reify kernel state if necessary */
1299 if (expect_false (postfork)) 1385 if (expect_false (postfork))
1300 loop_fork (EV_A); 1386 loop_fork (EV_A);
1301 1387
1302 /* update fd-related kernel structures */ 1388 /* update fd-related kernel structures */
1303 fd_reify (EV_A); 1389 fd_reify (EV_A);
1304 1390
1305 /* calculate blocking time */ 1391 /* calculate blocking time */
1306 { 1392 {
1307 double block; 1393 ev_tstamp block;
1308 1394
1309 if (flags & EVLOOP_NONBLOCK || idlecnt) 1395 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt))
1310 block = 0.; /* do not block at all */ 1396 block = 0.; /* do not block at all */
1311 else 1397 else
1312 { 1398 {
1313 /* update time to cancel out callback processing overhead */ 1399 /* update time to cancel out callback processing overhead */
1314#if EV_USE_MONOTONIC 1400#if EV_USE_MONOTONIC
… …
1338#endif 1424#endif
1339 1425
1340 if (expect_false (block < 0.)) block = 0.; 1426 if (expect_false (block < 0.)) block = 0.;
1341 } 1427 }
1342 1428
1429 ++loop_count;
1343 backend_poll (EV_A_ block); 1430 backend_poll (EV_A_ block);
1344 } 1431 }
1345 1432
1346 /* update ev_rt_now, do magic */ 1433 /* update ev_rt_now, do magic */
1347 time_update (EV_A); 1434 time_update (EV_A);
… …
1360 if (expect_false (checkcnt)) 1447 if (expect_false (checkcnt))
1361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1448 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1362 1449
1363 call_pending (EV_A); 1450 call_pending (EV_A);
1364 1451
1365 if (expect_false (loop_done))
1366 break;
1367 } 1452 }
1453 while (expect_true (activecnt && !loop_done));
1368 1454
1369 if (loop_done == EVUNLOOP_ONE) 1455 if (loop_done == EVUNLOOP_ONE)
1370 loop_done = EVUNLOOP_CANCEL; 1456 loop_done = EVUNLOOP_CANCEL;
1371} 1457}
1372 1458
… …
1474 ev_start (EV_A_ (W)w, ++timercnt); 1560 ev_start (EV_A_ (W)w, ++timercnt);
1475 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1561 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1476 timers [timercnt - 1] = w; 1562 timers [timercnt - 1] = w;
1477 upheap ((WT *)timers, timercnt - 1); 1563 upheap ((WT *)timers, timercnt - 1);
1478 1564
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1565 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1480} 1566}
1481 1567
1482void 1568void
1483ev_timer_stop (EV_P_ ev_timer *w) 1569ev_timer_stop (EV_P_ ev_timer *w)
1484{ 1570{
… …
1486 if (expect_false (!ev_is_active (w))) 1572 if (expect_false (!ev_is_active (w)))
1487 return; 1573 return;
1488 1574
1489 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1575 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1490 1576
1577 {
1578 int active = ((W)w)->active;
1579
1491 if (expect_true (((W)w)->active < timercnt--)) 1580 if (expect_true (--active < --timercnt))
1492 { 1581 {
1493 timers [((W)w)->active - 1] = timers [timercnt]; 1582 timers [active] = timers [timercnt];
1494 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1583 adjustheap ((WT *)timers, timercnt, active);
1495 } 1584 }
1585 }
1496 1586
1497 ((WT)w)->at -= mn_now; 1587 ((WT)w)->at -= mn_now;
1498 1588
1499 ev_stop (EV_A_ (W)w); 1589 ev_stop (EV_A_ (W)w);
1500} 1590}
… …
1538 ev_start (EV_A_ (W)w, ++periodiccnt); 1628 ev_start (EV_A_ (W)w, ++periodiccnt);
1539 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1629 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1540 periodics [periodiccnt - 1] = w; 1630 periodics [periodiccnt - 1] = w;
1541 upheap ((WT *)periodics, periodiccnt - 1); 1631 upheap ((WT *)periodics, periodiccnt - 1);
1542 1632
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1633 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1544} 1634}
1545 1635
1546void 1636void
1547ev_periodic_stop (EV_P_ ev_periodic *w) 1637ev_periodic_stop (EV_P_ ev_periodic *w)
1548{ 1638{
… …
1550 if (expect_false (!ev_is_active (w))) 1640 if (expect_false (!ev_is_active (w)))
1551 return; 1641 return;
1552 1642
1553 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1643 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1554 1644
1645 {
1646 int active = ((W)w)->active;
1647
1555 if (expect_true (((W)w)->active < periodiccnt--)) 1648 if (expect_true (--active < --periodiccnt))
1556 { 1649 {
1557 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1650 periodics [active] = periodics [periodiccnt];
1558 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1651 adjustheap ((WT *)periodics, periodiccnt, active);
1559 } 1652 }
1653 }
1560 1654
1561 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1562} 1656}
1563 1657
1564void 1658void
… …
1625#endif 1719#endif
1626 if (expect_false (ev_is_active (w))) 1720 if (expect_false (ev_is_active (w)))
1627 return; 1721 return;
1628 1722
1629 ev_start (EV_A_ (W)w, 1); 1723 ev_start (EV_A_ (W)w, 1);
1630 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1724 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631} 1725}
1632 1726
1633void 1727void
1634ev_child_stop (EV_P_ ev_child *w) 1728ev_child_stop (EV_P_ ev_child *w)
1635{ 1729{
1636 ev_clear_pending (EV_A_ (W)w); 1730 ev_clear_pending (EV_A_ (W)w);
1637 if (expect_false (!ev_is_active (w))) 1731 if (expect_false (!ev_is_active (w)))
1638 return; 1732 return;
1639 1733
1640 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1734 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1641 ev_stop (EV_A_ (W)w); 1735 ev_stop (EV_A_ (W)w);
1642} 1736}
1643 1737
1644#if EV_STAT_ENABLE 1738#if EV_STAT_ENABLE
1645 1739
… …
1649# endif 1743# endif
1650 1744
1651#define DEF_STAT_INTERVAL 5.0074891 1745#define DEF_STAT_INTERVAL 5.0074891
1652#define MIN_STAT_INTERVAL 0.1074891 1746#define MIN_STAT_INTERVAL 0.1074891
1653 1747
1748static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1749
1750#if EV_USE_INOTIFY
1751# define EV_INOTIFY_BUFSIZE 8192
1752
1753static void noinline
1754infy_add (EV_P_ ev_stat *w)
1755{
1756 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1757
1758 if (w->wd < 0)
1759 {
1760 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1761
1762 /* monitor some parent directory for speedup hints */
1763 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1764 {
1765 char path [4096];
1766 strcpy (path, w->path);
1767
1768 do
1769 {
1770 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1771 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1772
1773 char *pend = strrchr (path, '/');
1774
1775 if (!pend)
1776 break; /* whoops, no '/', complain to your admin */
1777
1778 *pend = 0;
1779 w->wd = inotify_add_watch (fs_fd, path, mask);
1780 }
1781 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1782 }
1783 }
1784 else
1785 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1786
1787 if (w->wd >= 0)
1788 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1789}
1790
1791static void noinline
1792infy_del (EV_P_ ev_stat *w)
1793{
1794 int slot;
1795 int wd = w->wd;
1796
1797 if (wd < 0)
1798 return;
1799
1800 w->wd = -2;
1801 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1802 wlist_del (&fs_hash [slot].head, (WL)w);
1803
1804 /* remove this watcher, if others are watching it, they will rearm */
1805 inotify_rm_watch (fs_fd, wd);
1806}
1807
1808static void noinline
1809infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1810{
1811 if (slot < 0)
1812 /* overflow, need to check for all hahs slots */
1813 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1814 infy_wd (EV_A_ slot, wd, ev);
1815 else
1816 {
1817 WL w_;
1818
1819 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1820 {
1821 ev_stat *w = (ev_stat *)w_;
1822 w_ = w_->next; /* lets us remove this watcher and all before it */
1823
1824 if (w->wd == wd || wd == -1)
1825 {
1826 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1827 {
1828 w->wd = -1;
1829 infy_add (EV_A_ w); /* re-add, no matter what */
1830 }
1831
1832 stat_timer_cb (EV_A_ &w->timer, 0);
1833 }
1834 }
1835 }
1836}
1837
1838static void
1839infy_cb (EV_P_ ev_io *w, int revents)
1840{
1841 char buf [EV_INOTIFY_BUFSIZE];
1842 struct inotify_event *ev = (struct inotify_event *)buf;
1843 int ofs;
1844 int len = read (fs_fd, buf, sizeof (buf));
1845
1846 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1847 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1848}
1849
1850void inline_size
1851infy_init (EV_P)
1852{
1853 if (fs_fd != -2)
1854 return;
1855
1856 fs_fd = inotify_init ();
1857
1858 if (fs_fd >= 0)
1859 {
1860 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1861 ev_set_priority (&fs_w, EV_MAXPRI);
1862 ev_io_start (EV_A_ &fs_w);
1863 }
1864}
1865
1866void inline_size
1867infy_fork (EV_P)
1868{
1869 int slot;
1870
1871 if (fs_fd < 0)
1872 return;
1873
1874 close (fs_fd);
1875 fs_fd = inotify_init ();
1876
1877 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1878 {
1879 WL w_ = fs_hash [slot].head;
1880 fs_hash [slot].head = 0;
1881
1882 while (w_)
1883 {
1884 ev_stat *w = (ev_stat *)w_;
1885 w_ = w_->next; /* lets us add this watcher */
1886
1887 w->wd = -1;
1888
1889 if (fs_fd >= 0)
1890 infy_add (EV_A_ w); /* re-add, no matter what */
1891 else
1892 ev_timer_start (EV_A_ &w->timer);
1893 }
1894
1895 }
1896}
1897
1898#endif
1899
1654void 1900void
1655ev_stat_stat (EV_P_ ev_stat *w) 1901ev_stat_stat (EV_P_ ev_stat *w)
1656{ 1902{
1657 if (lstat (w->path, &w->attr) < 0) 1903 if (lstat (w->path, &w->attr) < 0)
1658 w->attr.st_nlink = 0; 1904 w->attr.st_nlink = 0;
1659 else if (!w->attr.st_nlink) 1905 else if (!w->attr.st_nlink)
1660 w->attr.st_nlink = 1; 1906 w->attr.st_nlink = 1;
1661} 1907}
1662 1908
1663static void 1909static void noinline
1664stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1910stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1665{ 1911{
1666 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1912 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1667 1913
1668 /* we copy this here each the time so that */ 1914 /* we copy this here each the time so that */
1669 /* prev has the old value when the callback gets invoked */ 1915 /* prev has the old value when the callback gets invoked */
1670 w->prev = w->attr; 1916 w->prev = w->attr;
1671 ev_stat_stat (EV_A_ w); 1917 ev_stat_stat (EV_A_ w);
1672 1918
1673 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1919 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1920 if (
1921 w->prev.st_dev != w->attr.st_dev
1922 || w->prev.st_ino != w->attr.st_ino
1923 || w->prev.st_mode != w->attr.st_mode
1924 || w->prev.st_nlink != w->attr.st_nlink
1925 || w->prev.st_uid != w->attr.st_uid
1926 || w->prev.st_gid != w->attr.st_gid
1927 || w->prev.st_rdev != w->attr.st_rdev
1928 || w->prev.st_size != w->attr.st_size
1929 || w->prev.st_atime != w->attr.st_atime
1930 || w->prev.st_mtime != w->attr.st_mtime
1931 || w->prev.st_ctime != w->attr.st_ctime
1932 ) {
1933 #if EV_USE_INOTIFY
1934 infy_del (EV_A_ w);
1935 infy_add (EV_A_ w);
1936 ev_stat_stat (EV_A_ w); /* avoid race... */
1937 #endif
1938
1674 ev_feed_event (EV_A_ w, EV_STAT); 1939 ev_feed_event (EV_A_ w, EV_STAT);
1940 }
1675} 1941}
1676 1942
1677void 1943void
1678ev_stat_start (EV_P_ ev_stat *w) 1944ev_stat_start (EV_P_ ev_stat *w)
1679{ 1945{
… …
1689 if (w->interval < MIN_STAT_INTERVAL) 1955 if (w->interval < MIN_STAT_INTERVAL)
1690 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 1956 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1691 1957
1692 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 1958 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1693 ev_set_priority (&w->timer, ev_priority (w)); 1959 ev_set_priority (&w->timer, ev_priority (w));
1960
1961#if EV_USE_INOTIFY
1962 infy_init (EV_A);
1963
1964 if (fs_fd >= 0)
1965 infy_add (EV_A_ w);
1966 else
1967#endif
1694 ev_timer_start (EV_A_ &w->timer); 1968 ev_timer_start (EV_A_ &w->timer);
1695 1969
1696 ev_start (EV_A_ (W)w, 1); 1970 ev_start (EV_A_ (W)w, 1);
1697} 1971}
1698 1972
1699void 1973void
… …
1701{ 1975{
1702 ev_clear_pending (EV_A_ (W)w); 1976 ev_clear_pending (EV_A_ (W)w);
1703 if (expect_false (!ev_is_active (w))) 1977 if (expect_false (!ev_is_active (w)))
1704 return; 1978 return;
1705 1979
1980#if EV_USE_INOTIFY
1981 infy_del (EV_A_ w);
1982#endif
1706 ev_timer_stop (EV_A_ &w->timer); 1983 ev_timer_stop (EV_A_ &w->timer);
1707 1984
1708 ev_stop (EV_A_ (W)w); 1985 ev_stop (EV_A_ (W)w);
1709} 1986}
1710#endif 1987#endif

Diff Legend

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