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

Comparing libev/ev.c (file contents):
Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC vs.
Revision 1.163 by root, Wed Dec 5 13:54:36 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
161#ifndef EV_PID_HASHSIZE 179#ifndef EV_PID_HASHSIZE
162# if EV_MINIMAL 180# if EV_MINIMAL
163# define EV_PID_HASHSIZE 1 181# define EV_PID_HASHSIZE 1
164# else 182# else
165# define EV_PID_HASHSIZE 16 183# define EV_PID_HASHSIZE 16
166# endif 184# endif
167#endif 185#endif
168 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
169/**/ 195/**/
170 196
171#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
172# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
173# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
… …
180 206
181#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
182# include <winsock.h> 208# include <winsock.h>
183#endif 209#endif
184 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
185/**/ 219/**/
186 220
187#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) */
188#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) */
189/*#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 */
190
191#ifdef EV_H
192# include EV_H
193#else
194# include "ev.h"
195#endif
196 224
197#if __GNUC__ >= 3 225#if __GNUC__ >= 3
198# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
199# define inline_size static inline /* inline for codesize */ 227# define inline_size static inline /* inline for codesize */
200# if EV_MINIMAL 228# if EV_MINIMAL
… …
261ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 290{
263 alloc = cb; 291 alloc = cb;
264} 292}
265 293
266static void * 294inline_speed void *
267ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, long size)
268{ 296{
269 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
270 298
271 if (!ptr && size) 299 if (!ptr && size)
… …
295typedef struct 323typedef struct
296{ 324{
297 W w; 325 W w;
298 int events; 326 int events;
299} ANPENDING; 327} ANPENDING;
328
329#if EV_USE_INOTIFY
330typedef struct
331{
332 WL head;
333} ANFS;
334#endif
300 335
301#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
302 337
303 struct ev_loop 338 struct ev_loop
304 { 339 {
… …
361{ 396{
362 return ev_rt_now; 397 return ev_rt_now;
363} 398}
364#endif 399#endif
365 400
366#define array_roundsize(type,n) (((n) | 4) & ~3) 401int inline_size
402array_nextsize (int elem, int cur, int cnt)
403{
404 int ncur = cur + 1;
405
406 do
407 ncur <<= 1;
408 while (cnt > ncur);
409
410 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
411 if (elem * ncur > 4096)
412 {
413 ncur *= elem;
414 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
415 ncur = ncur - sizeof (void *) * 4;
416 ncur /= elem;
417 }
418
419 return ncur;
420}
421
422inline_speed void *
423array_realloc (int elem, void *base, int *cur, int cnt)
424{
425 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur);
427}
367 428
368#define array_needsize(type,base,cur,cnt,init) \ 429#define array_needsize(type,base,cur,cnt,init) \
369 if (expect_false ((cnt) > cur)) \ 430 if (expect_false ((cnt) > (cur))) \
370 { \ 431 { \
371 int newcnt = cur; \ 432 int ocur_ = (cur); \
372 do \ 433 (base) = (type *)array_realloc \
373 { \ 434 (sizeof (type), (base), &(cur), (cnt)); \
374 newcnt = array_roundsize (type, newcnt << 1); \ 435 init ((base) + (ocur_), (cur) - ocur_); \
375 } \
376 while ((cnt) > newcnt); \
377 \
378 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
379 init (base + cur, newcnt - cur); \
380 cur = newcnt; \
381 } 436 }
382 437
438#if 0
383#define array_slim(type,stem) \ 439#define array_slim(type,stem) \
384 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 440 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
385 { \ 441 { \
386 stem ## max = array_roundsize (stem ## cnt >> 1); \ 442 stem ## max = array_roundsize (stem ## cnt >> 1); \
387 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 443 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
388 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 444 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
389 } 445 }
446#endif
390 447
391#define array_free(stem, idx) \ 448#define array_free(stem, idx) \
392 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 449 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
393 450
394/*****************************************************************************/ 451/*****************************************************************************/
… …
554static void noinline 611static void noinline
555fd_rearm_all (EV_P) 612fd_rearm_all (EV_P)
556{ 613{
557 int fd; 614 int fd;
558 615
559 /* this should be highly optimised to not do anything but set a flag */
560 for (fd = 0; fd < anfdmax; ++fd) 616 for (fd = 0; fd < anfdmax; ++fd)
561 if (anfds [fd].events) 617 if (anfds [fd].events)
562 { 618 {
563 anfds [fd].events = 0; 619 anfds [fd].events = 0;
564 fd_change (EV_A_ fd); 620 fd_change (EV_A_ fd);
… …
852ev_backend (EV_P) 908ev_backend (EV_P)
853{ 909{
854 return backend; 910 return backend;
855} 911}
856 912
857static void 913unsigned int
914ev_loop_count (EV_P)
915{
916 return loop_count;
917}
918
919static void noinline
858loop_init (EV_P_ unsigned int flags) 920loop_init (EV_P_ unsigned int flags)
859{ 921{
860 if (!backend) 922 if (!backend)
861 { 923 {
862#if EV_USE_MONOTONIC 924#if EV_USE_MONOTONIC
… …
870 ev_rt_now = ev_time (); 932 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 933 mn_now = get_clock ();
872 now_floor = mn_now; 934 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 935 rtmn_diff = ev_rt_now - mn_now;
874 936
937 /* pid check not overridable via env */
938#ifndef _WIN32
939 if (flags & EVFLAG_FORKCHECK)
940 curpid = getpid ();
941#endif
942
875 if (!(flags & EVFLAG_NOENV) 943 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 944 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 945 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 946 flags = atoi (getenv ("LIBEV_FLAGS"));
879 947
880 if (!(flags & 0x0000ffffUL)) 948 if (!(flags & 0x0000ffffUL))
881 flags |= ev_recommended_backends (); 949 flags |= ev_recommended_backends ();
882 950
883 backend = 0; 951 backend = 0;
952 backend_fd = -1;
953#if EV_USE_INOTIFY
954 fs_fd = -2;
955#endif
956
884#if EV_USE_PORT 957#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 958 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 959#endif
887#if EV_USE_KQUEUE 960#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 961 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
900 ev_init (&sigev, sigcb); 973 ev_init (&sigev, sigcb);
901 ev_set_priority (&sigev, EV_MAXPRI); 974 ev_set_priority (&sigev, EV_MAXPRI);
902 } 975 }
903} 976}
904 977
905static void 978static void noinline
906loop_destroy (EV_P) 979loop_destroy (EV_P)
907{ 980{
908 int i; 981 int i;
982
983#if EV_USE_INOTIFY
984 if (fs_fd >= 0)
985 close (fs_fd);
986#endif
987
988 if (backend_fd >= 0)
989 close (backend_fd);
909 990
910#if EV_USE_PORT 991#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 992 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 993#endif
913#if EV_USE_KQUEUE 994#if EV_USE_KQUEUE
… …
937 array_free (check, EMPTY0); 1018 array_free (check, EMPTY0);
938 1019
939 backend = 0; 1020 backend = 0;
940} 1021}
941 1022
942static void 1023void inline_size infy_fork (EV_P);
1024
1025void inline_size
943loop_fork (EV_P) 1026loop_fork (EV_P)
944{ 1027{
945#if EV_USE_PORT 1028#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1029 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 1030#endif
948#if EV_USE_KQUEUE 1031#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1032 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1033#endif
951#if EV_USE_EPOLL 1034#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1035 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1036#endif
1037#if EV_USE_INOTIFY
1038 infy_fork (EV_A);
953#endif 1039#endif
954 1040
955 if (ev_is_active (&sigev)) 1041 if (ev_is_active (&sigev))
956 { 1042 {
957 /* default loop */ 1043 /* default loop */
… …
1097 { 1183 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1184 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1185
1100 if (expect_true (p->w)) 1186 if (expect_true (p->w))
1101 { 1187 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1188 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1189
1104 p->w->pending = 0; 1190 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1191 EV_CB_INVOKE (p->w, p->events);
1106 } 1192 }
1107 } 1193 }
… …
1112{ 1198{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1199 while (timercnt && ((WT)timers [0])->at <= mn_now)
1114 { 1200 {
1115 ev_timer *w = timers [0]; 1201 ev_timer *w = timers [0];
1116 1202
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1204
1119 /* first reschedule or stop timer */ 1205 /* first reschedule or stop timer */
1120 if (w->repeat) 1206 if (w->repeat)
1121 { 1207 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1208 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1140{ 1226{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1142 { 1228 {
1143 ev_periodic *w = periodics [0]; 1229 ev_periodic *w = periodics [0];
1144 1230
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1232
1147 /* first reschedule or stop timer */ 1233 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1234 if (w->reschedule_cb)
1149 { 1235 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
… …
1217 ev_tstamp odiff = rtmn_diff; 1303 ev_tstamp odiff = rtmn_diff;
1218 1304
1219 /* loop a few times, before making important decisions. 1305 /* loop a few times, before making important decisions.
1220 * on the choice of "4": one iteration isn't enough, 1306 * on the choice of "4": one iteration isn't enough,
1221 * in case we get preempted during the calls to 1307 * in case we get preempted during the calls to
1222 * ev_time and get_clock. a second call is almost guarenteed 1308 * ev_time and get_clock. a second call is almost guaranteed
1223 * to succeed in that case, though. and looping a few more times 1309 * to succeed in that case, though. and looping a few more times
1224 * doesn't hurt either as we only do this on time-jumps or 1310 * doesn't hurt either as we only do this on time-jumps or
1225 * in the unlikely event of getting preempted here. 1311 * in the unlikely event of having been preempted here.
1226 */ 1312 */
1227 for (i = 4; --i; ) 1313 for (i = 4; --i; )
1228 { 1314 {
1229 rtmn_diff = ev_rt_now - mn_now; 1315 rtmn_diff = ev_rt_now - mn_now;
1230 1316
… …
1252 { 1338 {
1253#if EV_PERIODIC_ENABLE 1339#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1340 periodics_reschedule (EV_A);
1255#endif 1341#endif
1256 1342
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1343 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1344 for (i = 0; i < timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1345 ((WT)timers [i])->at += ev_rt_now - mn_now;
1260 } 1346 }
1261 1347
1262 mn_now = ev_rt_now; 1348 mn_now = ev_rt_now;
… …
1282{ 1368{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1369 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1284 ? EVUNLOOP_ONE 1370 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL; 1371 : EVUNLOOP_CANCEL;
1286 1372
1287 while (activecnt) 1373 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1374
1375 do
1288 { 1376 {
1289 /* we might have forked, so reify kernel state if necessary */ 1377#ifndef _WIN32
1378 if (expect_false (curpid)) /* penalise the forking check even more */
1379 if (expect_false (getpid () != curpid))
1380 {
1381 curpid = getpid ();
1382 postfork = 1;
1383 }
1384#endif
1385
1290 #if EV_FORK_ENABLE 1386#if EV_FORK_ENABLE
1387 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1388 if (expect_false (postfork))
1292 if (forkcnt) 1389 if (forkcnt)
1293 { 1390 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1391 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1392 call_pending (EV_A);
1296 } 1393 }
1297 #endif 1394#endif
1298 1395
1299 /* queue check watchers (and execute them) */ 1396 /* queue check watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1397 if (expect_false (preparecnt))
1301 { 1398 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1400 call_pending (EV_A);
1304 } 1401 }
1305 1402
1403 if (expect_false (!activecnt))
1404 break;
1405
1306 /* we might have forked, so reify kernel state if necessary */ 1406 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1407 if (expect_false (postfork))
1308 loop_fork (EV_A); 1408 loop_fork (EV_A);
1309 1409
1310 /* update fd-related kernel structures */ 1410 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1411 fd_reify (EV_A);
1312 1412
1313 /* calculate blocking time */ 1413 /* calculate blocking time */
1314 { 1414 {
1315 double block; 1415 ev_tstamp block;
1316 1416
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1417 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt))
1318 block = 0.; /* do not block at all */ 1418 block = 0.; /* do not block at all */
1319 else 1419 else
1320 { 1420 {
1321 /* update time to cancel out callback processing overhead */ 1421 /* update time to cancel out callback processing overhead */
1322#if EV_USE_MONOTONIC 1422#if EV_USE_MONOTONIC
… …
1346#endif 1446#endif
1347 1447
1348 if (expect_false (block < 0.)) block = 0.; 1448 if (expect_false (block < 0.)) block = 0.;
1349 } 1449 }
1350 1450
1451 ++loop_count;
1351 backend_poll (EV_A_ block); 1452 backend_poll (EV_A_ block);
1352 } 1453 }
1353 1454
1354 /* update ev_rt_now, do magic */ 1455 /* update ev_rt_now, do magic */
1355 time_update (EV_A); 1456 time_update (EV_A);
… …
1368 if (expect_false (checkcnt)) 1469 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1470 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1471
1371 call_pending (EV_A); 1472 call_pending (EV_A);
1372 1473
1373 if (expect_false (loop_done))
1374 break;
1375 } 1474 }
1475 while (expect_true (activecnt && !loop_done));
1376 1476
1377 if (loop_done == EVUNLOOP_ONE) 1477 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1478 loop_done = EVUNLOOP_CANCEL;
1379} 1479}
1380 1480
… …
1482 ev_start (EV_A_ (W)w, ++timercnt); 1582 ev_start (EV_A_ (W)w, ++timercnt);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1583 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1484 timers [timercnt - 1] = w; 1584 timers [timercnt - 1] = w;
1485 upheap ((WT *)timers, timercnt - 1); 1585 upheap ((WT *)timers, timercnt - 1);
1486 1586
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1587 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1488} 1588}
1489 1589
1490void 1590void
1491ev_timer_stop (EV_P_ ev_timer *w) 1591ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1592{
… …
1494 if (expect_false (!ev_is_active (w))) 1594 if (expect_false (!ev_is_active (w)))
1495 return; 1595 return;
1496 1596
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1597 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1498 1598
1599 {
1600 int active = ((W)w)->active;
1601
1499 if (expect_true (((W)w)->active < timercnt--)) 1602 if (expect_true (--active < --timercnt))
1500 { 1603 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 1604 timers [active] = timers [timercnt];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1605 adjustheap ((WT *)timers, timercnt, active);
1503 } 1606 }
1607 }
1504 1608
1505 ((WT)w)->at -= mn_now; 1609 ((WT)w)->at -= mn_now;
1506 1610
1507 ev_stop (EV_A_ (W)w); 1611 ev_stop (EV_A_ (W)w);
1508} 1612}
… …
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 1650 ev_start (EV_A_ (W)w, ++periodiccnt);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1651 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 1652 periodics [periodiccnt - 1] = w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 1653 upheap ((WT *)periodics, periodiccnt - 1);
1550 1654
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1655 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1552} 1656}
1553 1657
1554void 1658void
1555ev_periodic_stop (EV_P_ ev_periodic *w) 1659ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 1660{
… …
1558 if (expect_false (!ev_is_active (w))) 1662 if (expect_false (!ev_is_active (w)))
1559 return; 1663 return;
1560 1664
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1665 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1562 1666
1667 {
1668 int active = ((W)w)->active;
1669
1563 if (expect_true (((W)w)->active < periodiccnt--)) 1670 if (expect_true (--active < --periodiccnt))
1564 { 1671 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1672 periodics [active] = periodics [periodiccnt];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1673 adjustheap ((WT *)periodics, periodiccnt, active);
1567 } 1674 }
1675 }
1568 1676
1569 ev_stop (EV_A_ (W)w); 1677 ev_stop (EV_A_ (W)w);
1570} 1678}
1571 1679
1572void 1680void
… …
1657# endif 1765# endif
1658 1766
1659#define DEF_STAT_INTERVAL 5.0074891 1767#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 1768#define MIN_STAT_INTERVAL 0.1074891
1661 1769
1770static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1771
1772#if EV_USE_INOTIFY
1773# define EV_INOTIFY_BUFSIZE 8192
1774
1775static void noinline
1776infy_add (EV_P_ ev_stat *w)
1777{
1778 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);
1779
1780 if (w->wd < 0)
1781 {
1782 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1783
1784 /* monitor some parent directory for speedup hints */
1785 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1786 {
1787 char path [4096];
1788 strcpy (path, w->path);
1789
1790 do
1791 {
1792 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1793 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1794
1795 char *pend = strrchr (path, '/');
1796
1797 if (!pend)
1798 break; /* whoops, no '/', complain to your admin */
1799
1800 *pend = 0;
1801 w->wd = inotify_add_watch (fs_fd, path, mask);
1802 }
1803 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1804 }
1805 }
1806 else
1807 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1808
1809 if (w->wd >= 0)
1810 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1811}
1812
1813static void noinline
1814infy_del (EV_P_ ev_stat *w)
1815{
1816 int slot;
1817 int wd = w->wd;
1818
1819 if (wd < 0)
1820 return;
1821
1822 w->wd = -2;
1823 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1824 wlist_del (&fs_hash [slot].head, (WL)w);
1825
1826 /* remove this watcher, if others are watching it, they will rearm */
1827 inotify_rm_watch (fs_fd, wd);
1828}
1829
1830static void noinline
1831infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1832{
1833 if (slot < 0)
1834 /* overflow, need to check for all hahs slots */
1835 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1836 infy_wd (EV_A_ slot, wd, ev);
1837 else
1838 {
1839 WL w_;
1840
1841 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1842 {
1843 ev_stat *w = (ev_stat *)w_;
1844 w_ = w_->next; /* lets us remove this watcher and all before it */
1845
1846 if (w->wd == wd || wd == -1)
1847 {
1848 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1849 {
1850 w->wd = -1;
1851 infy_add (EV_A_ w); /* re-add, no matter what */
1852 }
1853
1854 stat_timer_cb (EV_A_ &w->timer, 0);
1855 }
1856 }
1857 }
1858}
1859
1860static void
1861infy_cb (EV_P_ ev_io *w, int revents)
1862{
1863 char buf [EV_INOTIFY_BUFSIZE];
1864 struct inotify_event *ev = (struct inotify_event *)buf;
1865 int ofs;
1866 int len = read (fs_fd, buf, sizeof (buf));
1867
1868 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1869 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1870}
1871
1872void inline_size
1873infy_init (EV_P)
1874{
1875 if (fs_fd != -2)
1876 return;
1877
1878 fs_fd = inotify_init ();
1879
1880 if (fs_fd >= 0)
1881 {
1882 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1883 ev_set_priority (&fs_w, EV_MAXPRI);
1884 ev_io_start (EV_A_ &fs_w);
1885 }
1886}
1887
1888void inline_size
1889infy_fork (EV_P)
1890{
1891 int slot;
1892
1893 if (fs_fd < 0)
1894 return;
1895
1896 close (fs_fd);
1897 fs_fd = inotify_init ();
1898
1899 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1900 {
1901 WL w_ = fs_hash [slot].head;
1902 fs_hash [slot].head = 0;
1903
1904 while (w_)
1905 {
1906 ev_stat *w = (ev_stat *)w_;
1907 w_ = w_->next; /* lets us add this watcher */
1908
1909 w->wd = -1;
1910
1911 if (fs_fd >= 0)
1912 infy_add (EV_A_ w); /* re-add, no matter what */
1913 else
1914 ev_timer_start (EV_A_ &w->timer);
1915 }
1916
1917 }
1918}
1919
1920#endif
1921
1662void 1922void
1663ev_stat_stat (EV_P_ ev_stat *w) 1923ev_stat_stat (EV_P_ ev_stat *w)
1664{ 1924{
1665 if (lstat (w->path, &w->attr) < 0) 1925 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 1926 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 1927 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 1928 w->attr.st_nlink = 1;
1669} 1929}
1670 1930
1671static void 1931static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1932stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 1933{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1934 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 1935
1676 /* we copy this here each the time so that */ 1936 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 1937 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 1938 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 1939 ev_stat_stat (EV_A_ w);
1680 1940
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1941 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1942 if (
1943 w->prev.st_dev != w->attr.st_dev
1944 || w->prev.st_ino != w->attr.st_ino
1945 || w->prev.st_mode != w->attr.st_mode
1946 || w->prev.st_nlink != w->attr.st_nlink
1947 || w->prev.st_uid != w->attr.st_uid
1948 || w->prev.st_gid != w->attr.st_gid
1949 || w->prev.st_rdev != w->attr.st_rdev
1950 || w->prev.st_size != w->attr.st_size
1951 || w->prev.st_atime != w->attr.st_atime
1952 || w->prev.st_mtime != w->attr.st_mtime
1953 || w->prev.st_ctime != w->attr.st_ctime
1954 ) {
1955 #if EV_USE_INOTIFY
1956 infy_del (EV_A_ w);
1957 infy_add (EV_A_ w);
1958 ev_stat_stat (EV_A_ w); /* avoid race... */
1959 #endif
1960
1682 ev_feed_event (EV_A_ w, EV_STAT); 1961 ev_feed_event (EV_A_ w, EV_STAT);
1962 }
1683} 1963}
1684 1964
1685void 1965void
1686ev_stat_start (EV_P_ ev_stat *w) 1966ev_stat_start (EV_P_ ev_stat *w)
1687{ 1967{
… …
1697 if (w->interval < MIN_STAT_INTERVAL) 1977 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 1978 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 1979
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 1980 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 1981 ev_set_priority (&w->timer, ev_priority (w));
1982
1983#if EV_USE_INOTIFY
1984 infy_init (EV_A);
1985
1986 if (fs_fd >= 0)
1987 infy_add (EV_A_ w);
1988 else
1989#endif
1702 ev_timer_start (EV_A_ &w->timer); 1990 ev_timer_start (EV_A_ &w->timer);
1703 1991
1704 ev_start (EV_A_ (W)w, 1); 1992 ev_start (EV_A_ (W)w, 1);
1705} 1993}
1706 1994
1707void 1995void
… …
1709{ 1997{
1710 ev_clear_pending (EV_A_ (W)w); 1998 ev_clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 1999 if (expect_false (!ev_is_active (w)))
1712 return; 2000 return;
1713 2001
2002#if EV_USE_INOTIFY
2003 infy_del (EV_A_ w);
2004#endif
1714 ev_timer_stop (EV_A_ &w->timer); 2005 ev_timer_stop (EV_A_ &w->timer);
1715 2006
1716 ev_stop (EV_A_ (W)w); 2007 ev_stop (EV_A_ (W)w);
1717} 2008}
1718#endif 2009#endif

Diff Legend

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