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

Comparing libev/ev.c (file contents):
Revision 1.141 by root, Mon Nov 26 20:33:58 2007 UTC vs.
Revision 1.161 by root, Sat Dec 1 23:43:45 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 {
… …
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
720#ifndef WCONTINUED
721# define WCONTINUED 0
722#endif
723 760
724void inline_speed 761void inline_speed
725child_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)
726{ 763{
727 ev_child *w; 764 ev_child *w;
728 765
729 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)
730 if (w->pid == pid || !w->pid) 767 if (w->pid == pid || !w->pid)
731 { 768 {
732 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
733 w->rpid = pid; 770 w->rpid = pid;
734 w->rstatus = status; 771 w->rstatus = status;
735 ev_feed_event (EV_A_ (W)w, EV_CHILD); 772 ev_feed_event (EV_A_ (W)w, EV_CHILD);
736 } 773 }
737} 774}
738 775
776#ifndef WCONTINUED
777# define WCONTINUED 0
778#endif
779
739static void 780static void
740childcb (EV_P_ ev_signal *sw, int revents) 781childcb (EV_P_ ev_signal *sw, int revents)
741{ 782{
742 int pid, status; 783 int pid, status;
743 784
785 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
744 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 786 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
745 { 787 if (!WCONTINUED
788 || errno != EINVAL
789 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
790 return;
791
746 /* 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 */
747 /* 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 */
748 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 794 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
749 795
750 child_reap (EV_A_ sw, pid, pid, status); 796 child_reap (EV_A_ sw, pid, pid, status);
797 if (EV_PID_HASHSIZE > 1)
751 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 */
752 }
753} 799}
754 800
755#endif 801#endif
756 802
757/*****************************************************************************/ 803/*****************************************************************************/
… …
840ev_backend (EV_P) 886ev_backend (EV_P)
841{ 887{
842 return backend; 888 return backend;
843} 889}
844 890
845static void 891static void noinline
846loop_init (EV_P_ unsigned int flags) 892loop_init (EV_P_ unsigned int flags)
847{ 893{
848 if (!backend) 894 if (!backend)
849 { 895 {
850#if EV_USE_MONOTONIC 896#if EV_USE_MONOTONIC
… …
858 ev_rt_now = ev_time (); 904 ev_rt_now = ev_time ();
859 mn_now = get_clock (); 905 mn_now = get_clock ();
860 now_floor = mn_now; 906 now_floor = mn_now;
861 rtmn_diff = ev_rt_now - mn_now; 907 rtmn_diff = ev_rt_now - mn_now;
862 908
909 /* pid check not overridable via env */
910#ifndef _WIN32
911 if (flags & EVFLAG_FORKCHECK)
912 curpid = getpid ();
913#endif
914
863 if (!(flags & EVFLAG_NOENV) 915 if (!(flags & EVFLAG_NOENV)
864 && !enable_secure () 916 && !enable_secure ()
865 && getenv ("LIBEV_FLAGS")) 917 && getenv ("LIBEV_FLAGS"))
866 flags = atoi (getenv ("LIBEV_FLAGS")); 918 flags = atoi (getenv ("LIBEV_FLAGS"));
867 919
868 if (!(flags & 0x0000ffffUL)) 920 if (!(flags & 0x0000ffffUL))
869 flags |= ev_recommended_backends (); 921 flags |= ev_recommended_backends ();
870 922
871 backend = 0; 923 backend = 0;
924 backend_fd = -1;
925#if EV_USE_INOTIFY
926 fs_fd = -2;
927#endif
928
872#if EV_USE_PORT 929#if EV_USE_PORT
873 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 930 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
874#endif 931#endif
875#if EV_USE_KQUEUE 932#if EV_USE_KQUEUE
876 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 933 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
888 ev_init (&sigev, sigcb); 945 ev_init (&sigev, sigcb);
889 ev_set_priority (&sigev, EV_MAXPRI); 946 ev_set_priority (&sigev, EV_MAXPRI);
890 } 947 }
891} 948}
892 949
893static void 950static void noinline
894loop_destroy (EV_P) 951loop_destroy (EV_P)
895{ 952{
896 int i; 953 int i;
954
955#if EV_USE_INOTIFY
956 if (fs_fd >= 0)
957 close (fs_fd);
958#endif
959
960 if (backend_fd >= 0)
961 close (backend_fd);
897 962
898#if EV_USE_PORT 963#if EV_USE_PORT
899 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 964 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
900#endif 965#endif
901#if EV_USE_KQUEUE 966#if EV_USE_KQUEUE
… …
925 array_free (check, EMPTY0); 990 array_free (check, EMPTY0);
926 991
927 backend = 0; 992 backend = 0;
928} 993}
929 994
930static void 995void inline_size infy_fork (EV_P);
996
997void inline_size
931loop_fork (EV_P) 998loop_fork (EV_P)
932{ 999{
933#if EV_USE_PORT 1000#if EV_USE_PORT
934 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1001 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
935#endif 1002#endif
936#if EV_USE_KQUEUE 1003#if EV_USE_KQUEUE
937 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1004 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
938#endif 1005#endif
939#if EV_USE_EPOLL 1006#if EV_USE_EPOLL
940 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1007 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1008#endif
1009#if EV_USE_INOTIFY
1010 infy_fork (EV_A);
941#endif 1011#endif
942 1012
943 if (ev_is_active (&sigev)) 1013 if (ev_is_active (&sigev))
944 { 1014 {
945 /* default loop */ 1015 /* default loop */
… …
1085 { 1155 {
1086 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1156 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1087 1157
1088 if (expect_true (p->w)) 1158 if (expect_true (p->w))
1089 { 1159 {
1090 assert (("non-pending watcher on pending list", p->w->pending)); 1160 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1091 1161
1092 p->w->pending = 0; 1162 p->w->pending = 0;
1093 EV_CB_INVOKE (p->w, p->events); 1163 EV_CB_INVOKE (p->w, p->events);
1094 } 1164 }
1095 } 1165 }
… …
1100{ 1170{
1101 while (timercnt && ((WT)timers [0])->at <= mn_now) 1171 while (timercnt && ((WT)timers [0])->at <= mn_now)
1102 { 1172 {
1103 ev_timer *w = timers [0]; 1173 ev_timer *w = timers [0];
1104 1174
1105 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1106 1176
1107 /* first reschedule or stop timer */ 1177 /* first reschedule or stop timer */
1108 if (w->repeat) 1178 if (w->repeat)
1109 { 1179 {
1110 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1180 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1128{ 1198{
1129 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1130 { 1200 {
1131 ev_periodic *w = periodics [0]; 1201 ev_periodic *w = periodics [0];
1132 1202
1133 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1134 1204
1135 /* first reschedule or stop timer */ 1205 /* first reschedule or stop timer */
1136 if (w->reschedule_cb) 1206 if (w->reschedule_cb)
1137 { 1207 {
1138 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1208 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
… …
1205 ev_tstamp odiff = rtmn_diff; 1275 ev_tstamp odiff = rtmn_diff;
1206 1276
1207 /* loop a few times, before making important decisions. 1277 /* loop a few times, before making important decisions.
1208 * on the choice of "4": one iteration isn't enough, 1278 * on the choice of "4": one iteration isn't enough,
1209 * in case we get preempted during the calls to 1279 * in case we get preempted during the calls to
1210 * ev_time and get_clock. a second call is almost guarenteed 1280 * ev_time and get_clock. a second call is almost guaranteed
1211 * to succeed in that case, though. and looping a few more times 1281 * to succeed in that case, though. and looping a few more times
1212 * doesn't hurt either as we only do this on time-jumps or 1282 * doesn't hurt either as we only do this on time-jumps or
1213 * in the unlikely event of getting preempted here. 1283 * in the unlikely event of having been preempted here.
1214 */ 1284 */
1215 for (i = 4; --i; ) 1285 for (i = 4; --i; )
1216 { 1286 {
1217 rtmn_diff = ev_rt_now - mn_now; 1287 rtmn_diff = ev_rt_now - mn_now;
1218 1288
… …
1240 { 1310 {
1241#if EV_PERIODIC_ENABLE 1311#if EV_PERIODIC_ENABLE
1242 periodics_reschedule (EV_A); 1312 periodics_reschedule (EV_A);
1243#endif 1313#endif
1244 1314
1245 /* adjust timers. this is easy, as the offset is the same for all */ 1315 /* adjust timers. this is easy, as the offset is the same for all of them */
1246 for (i = 0; i < timercnt; ++i) 1316 for (i = 0; i < timercnt; ++i)
1247 ((WT)timers [i])->at += ev_rt_now - mn_now; 1317 ((WT)timers [i])->at += ev_rt_now - mn_now;
1248 } 1318 }
1249 1319
1250 mn_now = ev_rt_now; 1320 mn_now = ev_rt_now;
… …
1270{ 1340{
1271 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1341 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1272 ? EVUNLOOP_ONE 1342 ? EVUNLOOP_ONE
1273 : EVUNLOOP_CANCEL; 1343 : EVUNLOOP_CANCEL;
1274 1344
1275 while (activecnt) 1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346
1347 do
1276 { 1348 {
1349#ifndef _WIN32
1350 if (expect_false (curpid)) /* penalise the forking check even more */
1351 if (expect_false (getpid () != curpid))
1352 {
1353 curpid = getpid ();
1354 postfork = 1;
1355 }
1356#endif
1357
1358#if EV_FORK_ENABLE
1359 /* we might have forked, so queue fork handlers */
1360 if (expect_false (postfork))
1361 if (forkcnt)
1362 {
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A);
1365 }
1366#endif
1367
1277 /* queue check watchers (and execute them) */ 1368 /* queue check watchers (and execute them) */
1278 if (expect_false (preparecnt)) 1369 if (expect_false (preparecnt))
1279 { 1370 {
1280 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1281 call_pending (EV_A); 1372 call_pending (EV_A);
1282 } 1373 }
1283 1374
1375 if (expect_false (!activecnt))
1376 break;
1377
1284 /* we might have forked, so reify kernel state if necessary */ 1378 /* we might have forked, so reify kernel state if necessary */
1285 if (expect_false (postfork)) 1379 if (expect_false (postfork))
1286 loop_fork (EV_A); 1380 loop_fork (EV_A);
1287 1381
1288 /* update fd-related kernel structures */ 1382 /* update fd-related kernel structures */
1289 fd_reify (EV_A); 1383 fd_reify (EV_A);
1290 1384
1291 /* calculate blocking time */ 1385 /* calculate blocking time */
1292 { 1386 {
1293 double block; 1387 ev_tstamp block;
1294 1388
1295 if (flags & EVLOOP_NONBLOCK || idlecnt) 1389 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt))
1296 block = 0.; /* do not block at all */ 1390 block = 0.; /* do not block at all */
1297 else 1391 else
1298 { 1392 {
1299 /* update time to cancel out callback processing overhead */ 1393 /* update time to cancel out callback processing overhead */
1300#if EV_USE_MONOTONIC 1394#if EV_USE_MONOTONIC
… …
1346 if (expect_false (checkcnt)) 1440 if (expect_false (checkcnt))
1347 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1441 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1348 1442
1349 call_pending (EV_A); 1443 call_pending (EV_A);
1350 1444
1351 if (expect_false (loop_done))
1352 break;
1353 } 1445 }
1446 while (expect_true (activecnt && !loop_done));
1354 1447
1355 if (loop_done == EVUNLOOP_ONE) 1448 if (loop_done == EVUNLOOP_ONE)
1356 loop_done = EVUNLOOP_CANCEL; 1449 loop_done = EVUNLOOP_CANCEL;
1357} 1450}
1358 1451
… …
1460 ev_start (EV_A_ (W)w, ++timercnt); 1553 ev_start (EV_A_ (W)w, ++timercnt);
1461 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1554 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1462 timers [timercnt - 1] = w; 1555 timers [timercnt - 1] = w;
1463 upheap ((WT *)timers, timercnt - 1); 1556 upheap ((WT *)timers, timercnt - 1);
1464 1557
1465 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1558 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1466} 1559}
1467 1560
1468void 1561void
1469ev_timer_stop (EV_P_ ev_timer *w) 1562ev_timer_stop (EV_P_ ev_timer *w)
1470{ 1563{
… …
1472 if (expect_false (!ev_is_active (w))) 1565 if (expect_false (!ev_is_active (w)))
1473 return; 1566 return;
1474 1567
1475 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1568 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1476 1569
1570 {
1571 int active = ((W)w)->active;
1572
1477 if (expect_true (((W)w)->active < timercnt--)) 1573 if (expect_true (--active < --timercnt))
1478 { 1574 {
1479 timers [((W)w)->active - 1] = timers [timercnt]; 1575 timers [active] = timers [timercnt];
1480 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1576 adjustheap ((WT *)timers, timercnt, active);
1481 } 1577 }
1578 }
1482 1579
1483 ((WT)w)->at -= mn_now; 1580 ((WT)w)->at -= mn_now;
1484 1581
1485 ev_stop (EV_A_ (W)w); 1582 ev_stop (EV_A_ (W)w);
1486} 1583}
… …
1524 ev_start (EV_A_ (W)w, ++periodiccnt); 1621 ev_start (EV_A_ (W)w, ++periodiccnt);
1525 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1622 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1526 periodics [periodiccnt - 1] = w; 1623 periodics [periodiccnt - 1] = w;
1527 upheap ((WT *)periodics, periodiccnt - 1); 1624 upheap ((WT *)periodics, periodiccnt - 1);
1528 1625
1529 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1626 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1530} 1627}
1531 1628
1532void 1629void
1533ev_periodic_stop (EV_P_ ev_periodic *w) 1630ev_periodic_stop (EV_P_ ev_periodic *w)
1534{ 1631{
… …
1536 if (expect_false (!ev_is_active (w))) 1633 if (expect_false (!ev_is_active (w)))
1537 return; 1634 return;
1538 1635
1539 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1636 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1540 1637
1638 {
1639 int active = ((W)w)->active;
1640
1541 if (expect_true (((W)w)->active < periodiccnt--)) 1641 if (expect_true (--active < --periodiccnt))
1542 { 1642 {
1543 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1643 periodics [active] = periodics [periodiccnt];
1544 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1644 adjustheap ((WT *)periodics, periodiccnt, active);
1545 } 1645 }
1646 }
1546 1647
1547 ev_stop (EV_A_ (W)w); 1648 ev_stop (EV_A_ (W)w);
1548} 1649}
1549 1650
1550void 1651void
… …
1553 /* TODO: use adjustheap and recalculation */ 1654 /* TODO: use adjustheap and recalculation */
1554 ev_periodic_stop (EV_A_ w); 1655 ev_periodic_stop (EV_A_ w);
1555 ev_periodic_start (EV_A_ w); 1656 ev_periodic_start (EV_A_ w);
1556} 1657}
1557#endif 1658#endif
1558
1559void
1560ev_idle_start (EV_P_ ev_idle *w)
1561{
1562 if (expect_false (ev_is_active (w)))
1563 return;
1564
1565 ev_start (EV_A_ (W)w, ++idlecnt);
1566 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1567 idles [idlecnt - 1] = w;
1568}
1569
1570void
1571ev_idle_stop (EV_P_ ev_idle *w)
1572{
1573 ev_clear_pending (EV_A_ (W)w);
1574 if (expect_false (!ev_is_active (w)))
1575 return;
1576
1577 {
1578 int active = ((W)w)->active;
1579 idles [active - 1] = idles [--idlecnt];
1580 ((W)idles [active - 1])->active = active;
1581 }
1582
1583 ev_stop (EV_A_ (W)w);
1584}
1585
1586void
1587ev_prepare_start (EV_P_ ev_prepare *w)
1588{
1589 if (expect_false (ev_is_active (w)))
1590 return;
1591
1592 ev_start (EV_A_ (W)w, ++preparecnt);
1593 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1594 prepares [preparecnt - 1] = w;
1595}
1596
1597void
1598ev_prepare_stop (EV_P_ ev_prepare *w)
1599{
1600 ev_clear_pending (EV_A_ (W)w);
1601 if (expect_false (!ev_is_active (w)))
1602 return;
1603
1604 {
1605 int active = ((W)w)->active;
1606 prepares [active - 1] = prepares [--preparecnt];
1607 ((W)prepares [active - 1])->active = active;
1608 }
1609
1610 ev_stop (EV_A_ (W)w);
1611}
1612
1613void
1614ev_check_start (EV_P_ ev_check *w)
1615{
1616 if (expect_false (ev_is_active (w)))
1617 return;
1618
1619 ev_start (EV_A_ (W)w, ++checkcnt);
1620 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1621 checks [checkcnt - 1] = w;
1622}
1623
1624void
1625ev_check_stop (EV_P_ ev_check *w)
1626{
1627 ev_clear_pending (EV_A_ (W)w);
1628 if (expect_false (!ev_is_active (w)))
1629 return;
1630
1631 {
1632 int active = ((W)w)->active;
1633 checks [active - 1] = checks [--checkcnt];
1634 ((W)checks [active - 1])->active = active;
1635 }
1636
1637 ev_stop (EV_A_ (W)w);
1638}
1639 1659
1640#ifndef SA_RESTART 1660#ifndef SA_RESTART
1641# define SA_RESTART 0 1661# define SA_RESTART 0
1642#endif 1662#endif
1643 1663
… …
1692#endif 1712#endif
1693 if (expect_false (ev_is_active (w))) 1713 if (expect_false (ev_is_active (w)))
1694 return; 1714 return;
1695 1715
1696 ev_start (EV_A_ (W)w, 1); 1716 ev_start (EV_A_ (W)w, 1);
1697 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1717 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1698} 1718}
1699 1719
1700void 1720void
1701ev_child_stop (EV_P_ ev_child *w) 1721ev_child_stop (EV_P_ ev_child *w)
1702{ 1722{
1703 ev_clear_pending (EV_A_ (W)w); 1723 ev_clear_pending (EV_A_ (W)w);
1704 if (expect_false (!ev_is_active (w))) 1724 if (expect_false (!ev_is_active (w)))
1705 return; 1725 return;
1706 1726
1707 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1727 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1728 ev_stop (EV_A_ (W)w);
1729}
1730
1731#if EV_STAT_ENABLE
1732
1733# ifdef _WIN32
1734# undef lstat
1735# define lstat(a,b) _stati64 (a,b)
1736# endif
1737
1738#define DEF_STAT_INTERVAL 5.0074891
1739#define MIN_STAT_INTERVAL 0.1074891
1740
1741static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1742
1743#if EV_USE_INOTIFY
1744# define EV_INOTIFY_BUFSIZE 8192
1745
1746static void noinline
1747infy_add (EV_P_ ev_stat *w)
1748{
1749 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);
1750
1751 if (w->wd < 0)
1752 {
1753 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1754
1755 /* monitor some parent directory for speedup hints */
1756 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1757 {
1758 char path [4096];
1759 strcpy (path, w->path);
1760
1761 do
1762 {
1763 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1764 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1765
1766 char *pend = strrchr (path, '/');
1767
1768 if (!pend)
1769 break; /* whoops, no '/', complain to your admin */
1770
1771 *pend = 0;
1772 w->wd = inotify_add_watch (fs_fd, path, mask);
1773 }
1774 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1775 }
1776 }
1777 else
1778 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1779
1780 if (w->wd >= 0)
1781 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1782}
1783
1784static void noinline
1785infy_del (EV_P_ ev_stat *w)
1786{
1787 int slot;
1788 int wd = w->wd;
1789
1790 if (wd < 0)
1791 return;
1792
1793 w->wd = -2;
1794 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1795 wlist_del (&fs_hash [slot].head, (WL)w);
1796
1797 /* remove this watcher, if others are watching it, they will rearm */
1798 inotify_rm_watch (fs_fd, wd);
1799}
1800
1801static void noinline
1802infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1803{
1804 if (slot < 0)
1805 /* overflow, need to check for all hahs slots */
1806 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1807 infy_wd (EV_A_ slot, wd, ev);
1808 else
1809 {
1810 WL w_;
1811
1812 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1813 {
1814 ev_stat *w = (ev_stat *)w_;
1815 w_ = w_->next; /* lets us remove this watcher and all before it */
1816
1817 if (w->wd == wd || wd == -1)
1818 {
1819 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1820 {
1821 w->wd = -1;
1822 infy_add (EV_A_ w); /* re-add, no matter what */
1823 }
1824
1825 stat_timer_cb (EV_A_ &w->timer, 0);
1826 }
1827 }
1828 }
1829}
1830
1831static void
1832infy_cb (EV_P_ ev_io *w, int revents)
1833{
1834 char buf [EV_INOTIFY_BUFSIZE];
1835 struct inotify_event *ev = (struct inotify_event *)buf;
1836 int ofs;
1837 int len = read (fs_fd, buf, sizeof (buf));
1838
1839 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1840 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1841}
1842
1843void inline_size
1844infy_init (EV_P)
1845{
1846 if (fs_fd != -2)
1847 return;
1848
1849 fs_fd = inotify_init ();
1850
1851 if (fs_fd >= 0)
1852 {
1853 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1854 ev_set_priority (&fs_w, EV_MAXPRI);
1855 ev_io_start (EV_A_ &fs_w);
1856 }
1857}
1858
1859void inline_size
1860infy_fork (EV_P)
1861{
1862 int slot;
1863
1864 if (fs_fd < 0)
1865 return;
1866
1867 close (fs_fd);
1868 fs_fd = inotify_init ();
1869
1870 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1871 {
1872 WL w_ = fs_hash [slot].head;
1873 fs_hash [slot].head = 0;
1874
1875 while (w_)
1876 {
1877 ev_stat *w = (ev_stat *)w_;
1878 w_ = w_->next; /* lets us add this watcher */
1879
1880 w->wd = -1;
1881
1882 if (fs_fd >= 0)
1883 infy_add (EV_A_ w); /* re-add, no matter what */
1884 else
1885 ev_timer_start (EV_A_ &w->timer);
1886 }
1887
1888 }
1889}
1890
1891#endif
1892
1893void
1894ev_stat_stat (EV_P_ ev_stat *w)
1895{
1896 if (lstat (w->path, &w->attr) < 0)
1897 w->attr.st_nlink = 0;
1898 else if (!w->attr.st_nlink)
1899 w->attr.st_nlink = 1;
1900}
1901
1902static void noinline
1903stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1904{
1905 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1906
1907 /* we copy this here each the time so that */
1908 /* prev has the old value when the callback gets invoked */
1909 w->prev = w->attr;
1910 ev_stat_stat (EV_A_ w);
1911
1912 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1913 if (
1914 w->prev.st_dev != w->attr.st_dev
1915 || w->prev.st_ino != w->attr.st_ino
1916 || w->prev.st_mode != w->attr.st_mode
1917 || w->prev.st_nlink != w->attr.st_nlink
1918 || w->prev.st_uid != w->attr.st_uid
1919 || w->prev.st_gid != w->attr.st_gid
1920 || w->prev.st_rdev != w->attr.st_rdev
1921 || w->prev.st_size != w->attr.st_size
1922 || w->prev.st_atime != w->attr.st_atime
1923 || w->prev.st_mtime != w->attr.st_mtime
1924 || w->prev.st_ctime != w->attr.st_ctime
1925 ) {
1926 #if EV_USE_INOTIFY
1927 infy_del (EV_A_ w);
1928 infy_add (EV_A_ w);
1929 ev_stat_stat (EV_A_ w); /* avoid race... */
1930 #endif
1931
1932 ev_feed_event (EV_A_ w, EV_STAT);
1933 }
1934}
1935
1936void
1937ev_stat_start (EV_P_ ev_stat *w)
1938{
1939 if (expect_false (ev_is_active (w)))
1940 return;
1941
1942 /* since we use memcmp, we need to clear any padding data etc. */
1943 memset (&w->prev, 0, sizeof (ev_statdata));
1944 memset (&w->attr, 0, sizeof (ev_statdata));
1945
1946 ev_stat_stat (EV_A_ w);
1947
1948 if (w->interval < MIN_STAT_INTERVAL)
1949 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1950
1951 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1952 ev_set_priority (&w->timer, ev_priority (w));
1953
1954#if EV_USE_INOTIFY
1955 infy_init (EV_A);
1956
1957 if (fs_fd >= 0)
1958 infy_add (EV_A_ w);
1959 else
1960#endif
1961 ev_timer_start (EV_A_ &w->timer);
1962
1963 ev_start (EV_A_ (W)w, 1);
1964}
1965
1966void
1967ev_stat_stop (EV_P_ ev_stat *w)
1968{
1969 ev_clear_pending (EV_A_ (W)w);
1970 if (expect_false (!ev_is_active (w)))
1971 return;
1972
1973#if EV_USE_INOTIFY
1974 infy_del (EV_A_ w);
1975#endif
1976 ev_timer_stop (EV_A_ &w->timer);
1977
1978 ev_stop (EV_A_ (W)w);
1979}
1980#endif
1981
1982void
1983ev_idle_start (EV_P_ ev_idle *w)
1984{
1985 if (expect_false (ev_is_active (w)))
1986 return;
1987
1988 ev_start (EV_A_ (W)w, ++idlecnt);
1989 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1990 idles [idlecnt - 1] = w;
1991}
1992
1993void
1994ev_idle_stop (EV_P_ ev_idle *w)
1995{
1996 ev_clear_pending (EV_A_ (W)w);
1997 if (expect_false (!ev_is_active (w)))
1998 return;
1999
2000 {
2001 int active = ((W)w)->active;
2002 idles [active - 1] = idles [--idlecnt];
2003 ((W)idles [active - 1])->active = active;
2004 }
2005
2006 ev_stop (EV_A_ (W)w);
2007}
2008
2009void
2010ev_prepare_start (EV_P_ ev_prepare *w)
2011{
2012 if (expect_false (ev_is_active (w)))
2013 return;
2014
2015 ev_start (EV_A_ (W)w, ++preparecnt);
2016 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2017 prepares [preparecnt - 1] = w;
2018}
2019
2020void
2021ev_prepare_stop (EV_P_ ev_prepare *w)
2022{
2023 ev_clear_pending (EV_A_ (W)w);
2024 if (expect_false (!ev_is_active (w)))
2025 return;
2026
2027 {
2028 int active = ((W)w)->active;
2029 prepares [active - 1] = prepares [--preparecnt];
2030 ((W)prepares [active - 1])->active = active;
2031 }
2032
2033 ev_stop (EV_A_ (W)w);
2034}
2035
2036void
2037ev_check_start (EV_P_ ev_check *w)
2038{
2039 if (expect_false (ev_is_active (w)))
2040 return;
2041
2042 ev_start (EV_A_ (W)w, ++checkcnt);
2043 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2044 checks [checkcnt - 1] = w;
2045}
2046
2047void
2048ev_check_stop (EV_P_ ev_check *w)
2049{
2050 ev_clear_pending (EV_A_ (W)w);
2051 if (expect_false (!ev_is_active (w)))
2052 return;
2053
2054 {
2055 int active = ((W)w)->active;
2056 checks [active - 1] = checks [--checkcnt];
2057 ((W)checks [active - 1])->active = active;
2058 }
2059
1708 ev_stop (EV_A_ (W)w); 2060 ev_stop (EV_A_ (W)w);
1709} 2061}
1710 2062
1711#if EV_EMBED_ENABLE 2063#if EV_EMBED_ENABLE
1712void noinline 2064void noinline
… …
1755 2107
1756 ev_stop (EV_A_ (W)w); 2108 ev_stop (EV_A_ (W)w);
1757} 2109}
1758#endif 2110#endif
1759 2111
1760#if EV_STAT_ENABLE 2112#if EV_FORK_ENABLE
1761
1762# ifdef _WIN32
1763# define lstat(a,b) stat(a,b)
1764# endif
1765
1766void 2113void
1767ev_stat_stat (EV_P_ ev_stat *w)
1768{
1769 if (lstat (w->path, &w->attr) < 0)
1770 w->attr.st_nlink = 0;
1771 else if (!w->attr.st_nlink)
1772 w->attr.st_nlink = 1;
1773}
1774
1775static void
1776stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1777{
1778 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1779
1780 /* we copy this here each the time so that */
1781 /* prev has the old value when the callback gets invoked */
1782 w->prev = w->attr;
1783 ev_stat_stat (EV_A_ w);
1784
1785 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1786 ev_feed_event (EV_A_ w, EV_STAT);
1787}
1788
1789void
1790ev_stat_start (EV_P_ ev_stat *w) 2114ev_fork_start (EV_P_ ev_fork *w)
1791{ 2115{
1792 if (expect_false (ev_is_active (w))) 2116 if (expect_false (ev_is_active (w)))
1793 return; 2117 return;
1794 2118
1795 /* since we use memcmp, we need to clear any padding data etc. */
1796 memset (&w->prev, 0, sizeof (ev_statdata));
1797 memset (&w->attr, 0, sizeof (ev_statdata));
1798
1799 ev_stat_stat (EV_A_ w);
1800
1801 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1802 ev_set_priority (&w->timer, ev_priority (w));
1803 ev_timer_start (EV_A_ &w->timer);
1804
1805 ev_start (EV_A_ (W)w, 1); 2119 ev_start (EV_A_ (W)w, ++forkcnt);
2120 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2121 forks [forkcnt - 1] = w;
1806} 2122}
1807 2123
1808void 2124void
1809ev_stat_stop (EV_P_ ev_stat *w) 2125ev_fork_stop (EV_P_ ev_fork *w)
1810{ 2126{
1811 ev_clear_pending (EV_A_ (W)w); 2127 ev_clear_pending (EV_A_ (W)w);
1812 if (expect_false (!ev_is_active (w))) 2128 if (expect_false (!ev_is_active (w)))
1813 return; 2129 return;
1814 2130
1815 ev_timer_stop (EV_A_ &w->timer); 2131 {
2132 int active = ((W)w)->active;
2133 forks [active - 1] = forks [--forkcnt];
2134 ((W)forks [active - 1])->active = active;
2135 }
1816 2136
1817 ev_stop (EV_A_ (W)w); 2137 ev_stop (EV_A_ (W)w);
1818} 2138}
1819#endif 2139#endif
1820 2140

Diff Legend

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