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

Comparing libev/ev.c (file contents):
Revision 1.143 by root, Tue Nov 27 07:27:10 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
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
… …
198# define inline_speed static inline 233# define inline_speed static inline
199# endif 234# endif
200#else 235#else
201# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
202# define inline_speed static 237# define inline_speed static
203# define inline_minimal static 238# define inline_size static
204# define noinline 239# define noinline
205#endif 240#endif
206 241
207#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
208#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
… …
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 {
… …
354{ 396{
355 return ev_rt_now; 397 return ev_rt_now;
356} 398}
357#endif 399#endif
358 400
359#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}
360 428
361#define array_needsize(type,base,cur,cnt,init) \ 429#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 430 if (expect_false ((cnt) > (cur))) \
363 { \ 431 { \
364 int newcnt = cur; \ 432 int ocur_ = (cur); \
365 do \ 433 (base) = (type *)array_realloc \
366 { \ 434 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 435 init ((base) + (ocur_), (cur) - ocur_); \
368 } \
369 while ((cnt) > newcnt); \
370 \
371 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
372 init (base + cur, newcnt - cur); \
373 cur = newcnt; \
374 } 436 }
375 437
438#if 0
376#define array_slim(type,stem) \ 439#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 440 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 441 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 442 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 443 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 444 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 445 }
446#endif
383 447
384#define array_free(stem, idx) \ 448#define array_free(stem, idx) \
385 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;
386 450
387/*****************************************************************************/ 451/*****************************************************************************/
… …
547static void noinline 611static void noinline
548fd_rearm_all (EV_P) 612fd_rearm_all (EV_P)
549{ 613{
550 int fd; 614 int fd;
551 615
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 616 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 617 if (anfds [fd].events)
555 { 618 {
556 anfds [fd].events = 0; 619 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 620 fd_change (EV_A_ fd);
… …
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 772 ev_unref (EV_A); /* child watcher should not keep loop alive */
710} 773}
711 774
712/*****************************************************************************/ 775/*****************************************************************************/
713 776
714static ev_child *childs [PID_HASHSIZE]; 777static ev_child *childs [EV_PID_HASHSIZE];
715 778
716#ifndef _WIN32 779#ifndef _WIN32
717 780
718static ev_signal childev; 781static ev_signal childev;
719 782
720void inline_speed 783void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 784child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
722{ 785{
723 ev_child *w; 786 ev_child *w;
724 787
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 788 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
726 if (w->pid == pid || !w->pid) 789 if (w->pid == pid || !w->pid)
727 { 790 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 791 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
729 w->rpid = pid; 792 w->rpid = pid;
730 w->rstatus = status; 793 w->rstatus = status;
… …
751 /* make sure we are called again until all childs have been reaped */ 814 /* 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 */ 815 /* 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); 816 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 817
755 child_reap (EV_A_ sw, pid, pid, status); 818 child_reap (EV_A_ sw, pid, pid, status);
819 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 */ 820 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 821}
758 822
759#endif 823#endif
760 824
761/*****************************************************************************/ 825/*****************************************************************************/
… …
844ev_backend (EV_P) 908ev_backend (EV_P)
845{ 909{
846 return backend; 910 return backend;
847} 911}
848 912
849static void 913unsigned int
914ev_loop_count (EV_P)
915{
916 return loop_count;
917}
918
919static void noinline
850loop_init (EV_P_ unsigned int flags) 920loop_init (EV_P_ unsigned int flags)
851{ 921{
852 if (!backend) 922 if (!backend)
853 { 923 {
854#if EV_USE_MONOTONIC 924#if EV_USE_MONOTONIC
… …
862 ev_rt_now = ev_time (); 932 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 933 mn_now = get_clock ();
864 now_floor = mn_now; 934 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 935 rtmn_diff = ev_rt_now - mn_now;
866 936
937 /* pid check not overridable via env */
938#ifndef _WIN32
939 if (flags & EVFLAG_FORKCHECK)
940 curpid = getpid ();
941#endif
942
867 if (!(flags & EVFLAG_NOENV) 943 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 944 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 945 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 946 flags = atoi (getenv ("LIBEV_FLAGS"));
871 947
872 if (!(flags & 0x0000ffffUL)) 948 if (!(flags & 0x0000ffffUL))
873 flags |= ev_recommended_backends (); 949 flags |= ev_recommended_backends ();
874 950
875 backend = 0; 951 backend = 0;
952 backend_fd = -1;
953#if EV_USE_INOTIFY
954 fs_fd = -2;
955#endif
956
876#if EV_USE_PORT 957#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 958 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 959#endif
879#if EV_USE_KQUEUE 960#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 961 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
892 ev_init (&sigev, sigcb); 973 ev_init (&sigev, sigcb);
893 ev_set_priority (&sigev, EV_MAXPRI); 974 ev_set_priority (&sigev, EV_MAXPRI);
894 } 975 }
895} 976}
896 977
897static void 978static void noinline
898loop_destroy (EV_P) 979loop_destroy (EV_P)
899{ 980{
900 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);
901 990
902#if EV_USE_PORT 991#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 992 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 993#endif
905#if EV_USE_KQUEUE 994#if EV_USE_KQUEUE
… …
929 array_free (check, EMPTY0); 1018 array_free (check, EMPTY0);
930 1019
931 backend = 0; 1020 backend = 0;
932} 1021}
933 1022
934static void 1023void inline_size infy_fork (EV_P);
1024
1025void inline_size
935loop_fork (EV_P) 1026loop_fork (EV_P)
936{ 1027{
937#if EV_USE_PORT 1028#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1029 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1030#endif
940#if EV_USE_KQUEUE 1031#if EV_USE_KQUEUE
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1032 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1033#endif
943#if EV_USE_EPOLL 1034#if EV_USE_EPOLL
944 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);
945#endif 1039#endif
946 1040
947 if (ev_is_active (&sigev)) 1041 if (ev_is_active (&sigev))
948 { 1042 {
949 /* default loop */ 1043 /* default loop */
… …
1089 { 1183 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1184 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1185
1092 if (expect_true (p->w)) 1186 if (expect_true (p->w))
1093 { 1187 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1188 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1189
1096 p->w->pending = 0; 1190 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1191 EV_CB_INVOKE (p->w, p->events);
1098 } 1192 }
1099 } 1193 }
… …
1104{ 1198{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1199 while (timercnt && ((WT)timers [0])->at <= mn_now)
1106 { 1200 {
1107 ev_timer *w = timers [0]; 1201 ev_timer *w = timers [0];
1108 1202
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1204
1111 /* first reschedule or stop timer */ 1205 /* first reschedule or stop timer */
1112 if (w->repeat) 1206 if (w->repeat)
1113 { 1207 {
1114 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.));
… …
1132{ 1226{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1134 { 1228 {
1135 ev_periodic *w = periodics [0]; 1229 ev_periodic *w = periodics [0];
1136 1230
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1232
1139 /* first reschedule or stop timer */ 1233 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1234 if (w->reschedule_cb)
1141 { 1235 {
1142 ((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);
… …
1209 ev_tstamp odiff = rtmn_diff; 1303 ev_tstamp odiff = rtmn_diff;
1210 1304
1211 /* loop a few times, before making important decisions. 1305 /* loop a few times, before making important decisions.
1212 * on the choice of "4": one iteration isn't enough, 1306 * on the choice of "4": one iteration isn't enough,
1213 * in case we get preempted during the calls to 1307 * in case we get preempted during the calls to
1214 * ev_time and get_clock. a second call is almost guarenteed 1308 * ev_time and get_clock. a second call is almost guaranteed
1215 * 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
1216 * 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
1217 * in the unlikely event of getting preempted here. 1311 * in the unlikely event of having been preempted here.
1218 */ 1312 */
1219 for (i = 4; --i; ) 1313 for (i = 4; --i; )
1220 { 1314 {
1221 rtmn_diff = ev_rt_now - mn_now; 1315 rtmn_diff = ev_rt_now - mn_now;
1222 1316
… …
1244 { 1338 {
1245#if EV_PERIODIC_ENABLE 1339#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1340 periodics_reschedule (EV_A);
1247#endif 1341#endif
1248 1342
1249 /* 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 */
1250 for (i = 0; i < timercnt; ++i) 1344 for (i = 0; i < timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1345 ((WT)timers [i])->at += ev_rt_now - mn_now;
1252 } 1346 }
1253 1347
1254 mn_now = ev_rt_now; 1348 mn_now = ev_rt_now;
… …
1274{ 1368{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1369 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1276 ? EVUNLOOP_ONE 1370 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL; 1371 : EVUNLOOP_CANCEL;
1278 1372
1279 while (activecnt) 1373 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1374
1375 do
1280 { 1376 {
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
1386#if EV_FORK_ENABLE
1387 /* we might have forked, so queue fork handlers */
1388 if (expect_false (postfork))
1389 if (forkcnt)
1390 {
1391 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1392 call_pending (EV_A);
1393 }
1394#endif
1395
1281 /* queue check watchers (and execute them) */ 1396 /* queue check watchers (and execute them) */
1282 if (expect_false (preparecnt)) 1397 if (expect_false (preparecnt))
1283 { 1398 {
1284 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1285 call_pending (EV_A); 1400 call_pending (EV_A);
1286 } 1401 }
1287 1402
1403 if (expect_false (!activecnt))
1404 break;
1405
1288 /* we might have forked, so reify kernel state if necessary */ 1406 /* we might have forked, so reify kernel state if necessary */
1289 if (expect_false (postfork)) 1407 if (expect_false (postfork))
1290 loop_fork (EV_A); 1408 loop_fork (EV_A);
1291 1409
1292 /* update fd-related kernel structures */ 1410 /* update fd-related kernel structures */
1293 fd_reify (EV_A); 1411 fd_reify (EV_A);
1294 1412
1295 /* calculate blocking time */ 1413 /* calculate blocking time */
1296 { 1414 {
1297 double block; 1415 ev_tstamp block;
1298 1416
1299 if (flags & EVLOOP_NONBLOCK || idlecnt) 1417 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt))
1300 block = 0.; /* do not block at all */ 1418 block = 0.; /* do not block at all */
1301 else 1419 else
1302 { 1420 {
1303 /* update time to cancel out callback processing overhead */ 1421 /* update time to cancel out callback processing overhead */
1304#if EV_USE_MONOTONIC 1422#if EV_USE_MONOTONIC
… …
1328#endif 1446#endif
1329 1447
1330 if (expect_false (block < 0.)) block = 0.; 1448 if (expect_false (block < 0.)) block = 0.;
1331 } 1449 }
1332 1450
1451 ++loop_count;
1333 backend_poll (EV_A_ block); 1452 backend_poll (EV_A_ block);
1334 } 1453 }
1335 1454
1336 /* update ev_rt_now, do magic */ 1455 /* update ev_rt_now, do magic */
1337 time_update (EV_A); 1456 time_update (EV_A);
… …
1350 if (expect_false (checkcnt)) 1469 if (expect_false (checkcnt))
1351 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1470 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1352 1471
1353 call_pending (EV_A); 1472 call_pending (EV_A);
1354 1473
1355 if (expect_false (loop_done))
1356 break;
1357 } 1474 }
1475 while (expect_true (activecnt && !loop_done));
1358 1476
1359 if (loop_done == EVUNLOOP_ONE) 1477 if (loop_done == EVUNLOOP_ONE)
1360 loop_done = EVUNLOOP_CANCEL; 1478 loop_done = EVUNLOOP_CANCEL;
1361} 1479}
1362 1480
… …
1464 ev_start (EV_A_ (W)w, ++timercnt); 1582 ev_start (EV_A_ (W)w, ++timercnt);
1465 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1583 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1466 timers [timercnt - 1] = w; 1584 timers [timercnt - 1] = w;
1467 upheap ((WT *)timers, timercnt - 1); 1585 upheap ((WT *)timers, timercnt - 1);
1468 1586
1469 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1587 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1470} 1588}
1471 1589
1472void 1590void
1473ev_timer_stop (EV_P_ ev_timer *w) 1591ev_timer_stop (EV_P_ ev_timer *w)
1474{ 1592{
… …
1476 if (expect_false (!ev_is_active (w))) 1594 if (expect_false (!ev_is_active (w)))
1477 return; 1595 return;
1478 1596
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1597 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1480 1598
1599 {
1600 int active = ((W)w)->active;
1601
1481 if (expect_true (((W)w)->active < timercnt--)) 1602 if (expect_true (--active < --timercnt))
1482 { 1603 {
1483 timers [((W)w)->active - 1] = timers [timercnt]; 1604 timers [active] = timers [timercnt];
1484 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1605 adjustheap ((WT *)timers, timercnt, active);
1485 } 1606 }
1607 }
1486 1608
1487 ((WT)w)->at -= mn_now; 1609 ((WT)w)->at -= mn_now;
1488 1610
1489 ev_stop (EV_A_ (W)w); 1611 ev_stop (EV_A_ (W)w);
1490} 1612}
… …
1528 ev_start (EV_A_ (W)w, ++periodiccnt); 1650 ev_start (EV_A_ (W)w, ++periodiccnt);
1529 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1651 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1530 periodics [periodiccnt - 1] = w; 1652 periodics [periodiccnt - 1] = w;
1531 upheap ((WT *)periodics, periodiccnt - 1); 1653 upheap ((WT *)periodics, periodiccnt - 1);
1532 1654
1533 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1655 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1534} 1656}
1535 1657
1536void 1658void
1537ev_periodic_stop (EV_P_ ev_periodic *w) 1659ev_periodic_stop (EV_P_ ev_periodic *w)
1538{ 1660{
… …
1540 if (expect_false (!ev_is_active (w))) 1662 if (expect_false (!ev_is_active (w)))
1541 return; 1663 return;
1542 1664
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1665 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1544 1666
1667 {
1668 int active = ((W)w)->active;
1669
1545 if (expect_true (((W)w)->active < periodiccnt--)) 1670 if (expect_true (--active < --periodiccnt))
1546 { 1671 {
1547 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1672 periodics [active] = periodics [periodiccnt];
1548 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1673 adjustheap ((WT *)periodics, periodiccnt, active);
1549 } 1674 }
1675 }
1550 1676
1551 ev_stop (EV_A_ (W)w); 1677 ev_stop (EV_A_ (W)w);
1552} 1678}
1553 1679
1554void 1680void
… …
1557 /* TODO: use adjustheap and recalculation */ 1683 /* TODO: use adjustheap and recalculation */
1558 ev_periodic_stop (EV_A_ w); 1684 ev_periodic_stop (EV_A_ w);
1559 ev_periodic_start (EV_A_ w); 1685 ev_periodic_start (EV_A_ w);
1560} 1686}
1561#endif 1687#endif
1562
1563void
1564ev_idle_start (EV_P_ ev_idle *w)
1565{
1566 if (expect_false (ev_is_active (w)))
1567 return;
1568
1569 ev_start (EV_A_ (W)w, ++idlecnt);
1570 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1571 idles [idlecnt - 1] = w;
1572}
1573
1574void
1575ev_idle_stop (EV_P_ ev_idle *w)
1576{
1577 ev_clear_pending (EV_A_ (W)w);
1578 if (expect_false (!ev_is_active (w)))
1579 return;
1580
1581 {
1582 int active = ((W)w)->active;
1583 idles [active - 1] = idles [--idlecnt];
1584 ((W)idles [active - 1])->active = active;
1585 }
1586
1587 ev_stop (EV_A_ (W)w);
1588}
1589
1590void
1591ev_prepare_start (EV_P_ ev_prepare *w)
1592{
1593 if (expect_false (ev_is_active (w)))
1594 return;
1595
1596 ev_start (EV_A_ (W)w, ++preparecnt);
1597 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1598 prepares [preparecnt - 1] = w;
1599}
1600
1601void
1602ev_prepare_stop (EV_P_ ev_prepare *w)
1603{
1604 ev_clear_pending (EV_A_ (W)w);
1605 if (expect_false (!ev_is_active (w)))
1606 return;
1607
1608 {
1609 int active = ((W)w)->active;
1610 prepares [active - 1] = prepares [--preparecnt];
1611 ((W)prepares [active - 1])->active = active;
1612 }
1613
1614 ev_stop (EV_A_ (W)w);
1615}
1616
1617void
1618ev_check_start (EV_P_ ev_check *w)
1619{
1620 if (expect_false (ev_is_active (w)))
1621 return;
1622
1623 ev_start (EV_A_ (W)w, ++checkcnt);
1624 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1625 checks [checkcnt - 1] = w;
1626}
1627
1628void
1629ev_check_stop (EV_P_ ev_check *w)
1630{
1631 ev_clear_pending (EV_A_ (W)w);
1632 if (expect_false (!ev_is_active (w)))
1633 return;
1634
1635 {
1636 int active = ((W)w)->active;
1637 checks [active - 1] = checks [--checkcnt];
1638 ((W)checks [active - 1])->active = active;
1639 }
1640
1641 ev_stop (EV_A_ (W)w);
1642}
1643 1688
1644#ifndef SA_RESTART 1689#ifndef SA_RESTART
1645# define SA_RESTART 0 1690# define SA_RESTART 0
1646#endif 1691#endif
1647 1692
… …
1696#endif 1741#endif
1697 if (expect_false (ev_is_active (w))) 1742 if (expect_false (ev_is_active (w)))
1698 return; 1743 return;
1699 1744
1700 ev_start (EV_A_ (W)w, 1); 1745 ev_start (EV_A_ (W)w, 1);
1701 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1746 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1702} 1747}
1703 1748
1704void 1749void
1705ev_child_stop (EV_P_ ev_child *w) 1750ev_child_stop (EV_P_ ev_child *w)
1706{ 1751{
1707 ev_clear_pending (EV_A_ (W)w); 1752 ev_clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w))) 1753 if (expect_false (!ev_is_active (w)))
1709 return; 1754 return;
1710 1755
1711 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1756 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1757 ev_stop (EV_A_ (W)w);
1758}
1759
1760#if EV_STAT_ENABLE
1761
1762# ifdef _WIN32
1763# undef lstat
1764# define lstat(a,b) _stati64 (a,b)
1765# endif
1766
1767#define DEF_STAT_INTERVAL 5.0074891
1768#define MIN_STAT_INTERVAL 0.1074891
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
1922void
1923ev_stat_stat (EV_P_ ev_stat *w)
1924{
1925 if (lstat (w->path, &w->attr) < 0)
1926 w->attr.st_nlink = 0;
1927 else if (!w->attr.st_nlink)
1928 w->attr.st_nlink = 1;
1929}
1930
1931static void noinline
1932stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1933{
1934 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1935
1936 /* we copy this here each the time so that */
1937 /* prev has the old value when the callback gets invoked */
1938 w->prev = w->attr;
1939 ev_stat_stat (EV_A_ w);
1940
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
1961 ev_feed_event (EV_A_ w, EV_STAT);
1962 }
1963}
1964
1965void
1966ev_stat_start (EV_P_ ev_stat *w)
1967{
1968 if (expect_false (ev_is_active (w)))
1969 return;
1970
1971 /* since we use memcmp, we need to clear any padding data etc. */
1972 memset (&w->prev, 0, sizeof (ev_statdata));
1973 memset (&w->attr, 0, sizeof (ev_statdata));
1974
1975 ev_stat_stat (EV_A_ w);
1976
1977 if (w->interval < MIN_STAT_INTERVAL)
1978 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1979
1980 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
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
1990 ev_timer_start (EV_A_ &w->timer);
1991
1992 ev_start (EV_A_ (W)w, 1);
1993}
1994
1995void
1996ev_stat_stop (EV_P_ ev_stat *w)
1997{
1998 ev_clear_pending (EV_A_ (W)w);
1999 if (expect_false (!ev_is_active (w)))
2000 return;
2001
2002#if EV_USE_INOTIFY
2003 infy_del (EV_A_ w);
2004#endif
2005 ev_timer_stop (EV_A_ &w->timer);
2006
2007 ev_stop (EV_A_ (W)w);
2008}
2009#endif
2010
2011void
2012ev_idle_start (EV_P_ ev_idle *w)
2013{
2014 if (expect_false (ev_is_active (w)))
2015 return;
2016
2017 ev_start (EV_A_ (W)w, ++idlecnt);
2018 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
2019 idles [idlecnt - 1] = w;
2020}
2021
2022void
2023ev_idle_stop (EV_P_ ev_idle *w)
2024{
2025 ev_clear_pending (EV_A_ (W)w);
2026 if (expect_false (!ev_is_active (w)))
2027 return;
2028
2029 {
2030 int active = ((W)w)->active;
2031 idles [active - 1] = idles [--idlecnt];
2032 ((W)idles [active - 1])->active = active;
2033 }
2034
2035 ev_stop (EV_A_ (W)w);
2036}
2037
2038void
2039ev_prepare_start (EV_P_ ev_prepare *w)
2040{
2041 if (expect_false (ev_is_active (w)))
2042 return;
2043
2044 ev_start (EV_A_ (W)w, ++preparecnt);
2045 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2046 prepares [preparecnt - 1] = w;
2047}
2048
2049void
2050ev_prepare_stop (EV_P_ ev_prepare *w)
2051{
2052 ev_clear_pending (EV_A_ (W)w);
2053 if (expect_false (!ev_is_active (w)))
2054 return;
2055
2056 {
2057 int active = ((W)w)->active;
2058 prepares [active - 1] = prepares [--preparecnt];
2059 ((W)prepares [active - 1])->active = active;
2060 }
2061
2062 ev_stop (EV_A_ (W)w);
2063}
2064
2065void
2066ev_check_start (EV_P_ ev_check *w)
2067{
2068 if (expect_false (ev_is_active (w)))
2069 return;
2070
2071 ev_start (EV_A_ (W)w, ++checkcnt);
2072 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2073 checks [checkcnt - 1] = w;
2074}
2075
2076void
2077ev_check_stop (EV_P_ ev_check *w)
2078{
2079 ev_clear_pending (EV_A_ (W)w);
2080 if (expect_false (!ev_is_active (w)))
2081 return;
2082
2083 {
2084 int active = ((W)w)->active;
2085 checks [active - 1] = checks [--checkcnt];
2086 ((W)checks [active - 1])->active = active;
2087 }
2088
1712 ev_stop (EV_A_ (W)w); 2089 ev_stop (EV_A_ (W)w);
1713} 2090}
1714 2091
1715#if EV_EMBED_ENABLE 2092#if EV_EMBED_ENABLE
1716void noinline 2093void noinline
… …
1759 2136
1760 ev_stop (EV_A_ (W)w); 2137 ev_stop (EV_A_ (W)w);
1761} 2138}
1762#endif 2139#endif
1763 2140
1764#if EV_STAT_ENABLE 2141#if EV_FORK_ENABLE
1765
1766# ifdef _WIN32
1767# define lstat(a,b) stat(a,b)
1768# endif
1769
1770#define DEF_STAT_INTERVAL 5.0074891
1771#define MIN_STAT_INTERVAL 0.1074891
1772
1773void 2142void
1774ev_stat_stat (EV_P_ ev_stat *w)
1775{
1776 if (lstat (w->path, &w->attr) < 0)
1777 w->attr.st_nlink = 0;
1778 else if (!w->attr.st_nlink)
1779 w->attr.st_nlink = 1;
1780}
1781
1782static void
1783stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1784{
1785 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1786
1787 /* we copy this here each the time so that */
1788 /* prev has the old value when the callback gets invoked */
1789 w->prev = w->attr;
1790 ev_stat_stat (EV_A_ w);
1791
1792 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1793 ev_feed_event (EV_A_ w, EV_STAT);
1794}
1795
1796void
1797ev_stat_start (EV_P_ ev_stat *w) 2143ev_fork_start (EV_P_ ev_fork *w)
1798{ 2144{
1799 if (expect_false (ev_is_active (w))) 2145 if (expect_false (ev_is_active (w)))
1800 return; 2146 return;
1801 2147
1802 /* since we use memcmp, we need to clear any padding data etc. */
1803 memset (&w->prev, 0, sizeof (ev_statdata));
1804 memset (&w->attr, 0, sizeof (ev_statdata));
1805
1806 ev_stat_stat (EV_A_ w);
1807
1808 if (w->interval < MIN_STAT_INTERVAL)
1809 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1810
1811 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1812 ev_set_priority (&w->timer, ev_priority (w));
1813 ev_timer_start (EV_A_ &w->timer);
1814
1815 ev_start (EV_A_ (W)w, 1); 2148 ev_start (EV_A_ (W)w, ++forkcnt);
2149 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2150 forks [forkcnt - 1] = w;
1816} 2151}
1817 2152
1818void 2153void
1819ev_stat_stop (EV_P_ ev_stat *w) 2154ev_fork_stop (EV_P_ ev_fork *w)
1820{ 2155{
1821 ev_clear_pending (EV_A_ (W)w); 2156 ev_clear_pending (EV_A_ (W)w);
1822 if (expect_false (!ev_is_active (w))) 2157 if (expect_false (!ev_is_active (w)))
1823 return; 2158 return;
1824 2159
1825 ev_timer_stop (EV_A_ &w->timer); 2160 {
2161 int active = ((W)w)->active;
2162 forks [active - 1] = forks [--forkcnt];
2163 ((W)forks [active - 1])->active = active;
2164 }
1826 2165
1827 ev_stop (EV_A_ (W)w); 2166 ev_stop (EV_A_ (W)w);
1828} 2167}
1829#endif 2168#endif
1830 2169

Diff Legend

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