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

Comparing libev/ev.c (file contents):
Revision 1.150 by root, Tue Nov 27 19:41:52 2007 UTC vs.
Revision 1.164 by root, Fri Dec 7 16:44:10 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
213 241
214#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
215#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
216 244
217#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
218#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
219 247
220#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 248#define EMPTY /* required for microsofts broken pseudo-c compiler */
221#define EMPTY2(a,b) /* used to suppress some warnings */ 249#define EMPTY2(a,b) /* used to suppress some warnings */
222 250
223typedef ev_watcher *W; 251typedef ev_watcher *W;
224typedef ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
225typedef ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
253 perror (msg); 281 perror (msg);
254 abort (); 282 abort ();
255 } 283 }
256} 284}
257 285
258static void *(*alloc)(void *ptr, size_t size) = realloc; 286static void *(*alloc)(void *ptr, long size);
259 287
260void 288void
261ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 290{
263 alloc = cb; 291 alloc = cb;
264} 292}
265 293
266inline_speed void * 294inline_speed void *
267ev_realloc (void *ptr, size_t size) 295ev_realloc (void *ptr, long size)
268{ 296{
269 ptr = alloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
270 298
271 if (!ptr && size) 299 if (!ptr && size)
272 { 300 {
273 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size); 301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
274 abort (); 302 abort ();
275 } 303 }
276 304
277 return ptr; 305 return ptr;
278} 306}
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);
730 ev_child *w; 786 ev_child *w;
731 787
732 for (w = (ev_child *)childs [chain & (EV_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)
733 if (w->pid == pid || !w->pid) 789 if (w->pid == pid || !w->pid)
734 { 790 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 791 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
736 w->rpid = pid; 792 w->rpid = pid;
737 w->rstatus = status; 793 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 794 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 795 }
740} 796}
741 797
742#ifndef WCONTINUED 798#ifndef WCONTINUED
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
922#if EV_USE_SELECT 1003#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1004 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1005#endif
925 1006
926 for (i = NUMPRI; i--; ) 1007 for (i = NUMPRI; i--; )
1008 {
927 array_free (pending, [i]); 1009 array_free (pending, [i]);
1010#if EV_IDLE_ENABLE
1011 array_free (idle, [i]);
1012#endif
1013 }
928 1014
929 /* have to use the microsoft-never-gets-it-right macro */ 1015 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1016 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1017 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1018#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1019 array_free (periodic, EMPTY);
934#endif 1020#endif
935 array_free (idle, EMPTY0);
936 array_free (prepare, EMPTY0); 1021 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1022 array_free (check, EMPTY);
938 1023
939 backend = 0; 1024 backend = 0;
940} 1025}
941 1026
942static void 1027void inline_size infy_fork (EV_P);
1028
1029void inline_size
943loop_fork (EV_P) 1030loop_fork (EV_P)
944{ 1031{
945#if EV_USE_PORT 1032#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1033 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 1034#endif
948#if EV_USE_KQUEUE 1035#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1036 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1037#endif
951#if EV_USE_EPOLL 1038#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1039 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1040#endif
1041#if EV_USE_INOTIFY
1042 infy_fork (EV_A);
953#endif 1043#endif
954 1044
955 if (ev_is_active (&sigev)) 1045 if (ev_is_active (&sigev))
956 { 1046 {
957 /* default loop */ 1047 /* default loop */
1073 postfork = 1; 1163 postfork = 1;
1074} 1164}
1075 1165
1076/*****************************************************************************/ 1166/*****************************************************************************/
1077 1167
1078int inline_size
1079any_pending (EV_P)
1080{
1081 int pri;
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088}
1089
1090void inline_speed 1168void inline_speed
1091call_pending (EV_P) 1169call_pending (EV_P)
1092{ 1170{
1093 int pri; 1171 int pri;
1094 1172
1097 { 1175 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1176 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1177
1100 if (expect_true (p->w)) 1178 if (expect_true (p->w))
1101 { 1179 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1180 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1181
1104 p->w->pending = 0; 1182 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1183 EV_CB_INVOKE (p->w, p->events);
1106 } 1184 }
1107 } 1185 }
1112{ 1190{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1191 while (timercnt && ((WT)timers [0])->at <= mn_now)
1114 { 1192 {
1115 ev_timer *w = timers [0]; 1193 ev_timer *w = timers [0];
1116 1194
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1195 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1196
1119 /* first reschedule or stop timer */ 1197 /* first reschedule or stop timer */
1120 if (w->repeat) 1198 if (w->repeat)
1121 { 1199 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1200 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1140{ 1218{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1219 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1142 { 1220 {
1143 ev_periodic *w = periodics [0]; 1221 ev_periodic *w = periodics [0];
1144 1222
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1223 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1224
1147 /* first reschedule or stop timer */ 1225 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1226 if (w->reschedule_cb)
1149 { 1227 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1228 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1184 for (i = periodiccnt >> 1; i--; ) 1262 for (i = periodiccnt >> 1; i--; )
1185 downheap ((WT *)periodics, periodiccnt, i); 1263 downheap ((WT *)periodics, periodiccnt, i);
1186} 1264}
1187#endif 1265#endif
1188 1266
1267#if EV_IDLE_ENABLE
1268void inline_size
1269idle_reify (EV_P)
1270{
1271 if (expect_false (!idleall))
1272 {
1273 int pri;
1274
1275 for (pri = NUMPRI; pri--; )
1276 {
1277 if (pendingcnt [pri])
1278 break;
1279
1280 if (idlecnt [pri])
1281 {
1282 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1283 break;
1284 }
1285 }
1286 }
1287}
1288#endif
1289
1189int inline_size 1290int inline_size
1190time_update_monotonic (EV_P) 1291time_update_monotonic (EV_P)
1191{ 1292{
1192 mn_now = get_clock (); 1293 mn_now = get_clock ();
1193 1294
1217 ev_tstamp odiff = rtmn_diff; 1318 ev_tstamp odiff = rtmn_diff;
1218 1319
1219 /* loop a few times, before making important decisions. 1320 /* loop a few times, before making important decisions.
1220 * on the choice of "4": one iteration isn't enough, 1321 * on the choice of "4": one iteration isn't enough,
1221 * in case we get preempted during the calls to 1322 * in case we get preempted during the calls to
1222 * ev_time and get_clock. a second call is almost guarenteed 1323 * ev_time and get_clock. a second call is almost guaranteed
1223 * to succeed in that case, though. and looping a few more times 1324 * 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 1325 * doesn't hurt either as we only do this on time-jumps or
1225 * in the unlikely event of getting preempted here. 1326 * in the unlikely event of having been preempted here.
1226 */ 1327 */
1227 for (i = 4; --i; ) 1328 for (i = 4; --i; )
1228 { 1329 {
1229 rtmn_diff = ev_rt_now - mn_now; 1330 rtmn_diff = ev_rt_now - mn_now;
1230 1331
1252 { 1353 {
1253#if EV_PERIODIC_ENABLE 1354#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1355 periodics_reschedule (EV_A);
1255#endif 1356#endif
1256 1357
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1358 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1359 for (i = 0; i < timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1360 ((WT)timers [i])->at += ev_rt_now - mn_now;
1260 } 1361 }
1261 1362
1262 mn_now = ev_rt_now; 1363 mn_now = ev_rt_now;
1282{ 1383{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1384 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1284 ? EVUNLOOP_ONE 1385 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL; 1386 : EVUNLOOP_CANCEL;
1286 1387
1287 while (activecnt) 1388 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1389
1390 do
1288 { 1391 {
1289 /* we might have forked, so reify kernel state if necessary */ 1392#ifndef _WIN32
1393 if (expect_false (curpid)) /* penalise the forking check even more */
1394 if (expect_false (getpid () != curpid))
1395 {
1396 curpid = getpid ();
1397 postfork = 1;
1398 }
1399#endif
1400
1290 #if EV_FORK_ENABLE 1401#if EV_FORK_ENABLE
1402 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1403 if (expect_false (postfork))
1292 if (forkcnt) 1404 if (forkcnt)
1293 { 1405 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1407 call_pending (EV_A);
1296 } 1408 }
1297 #endif 1409#endif
1298 1410
1299 /* queue check watchers (and execute them) */ 1411 /* queue check watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1412 if (expect_false (preparecnt))
1301 { 1413 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1415 call_pending (EV_A);
1304 } 1416 }
1305 1417
1418 if (expect_false (!activecnt))
1419 break;
1420
1306 /* we might have forked, so reify kernel state if necessary */ 1421 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1422 if (expect_false (postfork))
1308 loop_fork (EV_A); 1423 loop_fork (EV_A);
1309 1424
1310 /* update fd-related kernel structures */ 1425 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1426 fd_reify (EV_A);
1312 1427
1313 /* calculate blocking time */ 1428 /* calculate blocking time */
1314 { 1429 {
1315 double block; 1430 ev_tstamp block;
1316 1431
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1432 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1318 block = 0.; /* do not block at all */ 1433 block = 0.; /* do not block at all */
1319 else 1434 else
1320 { 1435 {
1321 /* update time to cancel out callback processing overhead */ 1436 /* update time to cancel out callback processing overhead */
1322#if EV_USE_MONOTONIC 1437#if EV_USE_MONOTONIC
1346#endif 1461#endif
1347 1462
1348 if (expect_false (block < 0.)) block = 0.; 1463 if (expect_false (block < 0.)) block = 0.;
1349 } 1464 }
1350 1465
1466 ++loop_count;
1351 backend_poll (EV_A_ block); 1467 backend_poll (EV_A_ block);
1352 } 1468 }
1353 1469
1354 /* update ev_rt_now, do magic */ 1470 /* update ev_rt_now, do magic */
1355 time_update (EV_A); 1471 time_update (EV_A);
1358 timers_reify (EV_A); /* relative timers called last */ 1474 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1475#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1476 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1477#endif
1362 1478
1479#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1480 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1481 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1482#endif
1366 1483
1367 /* queue check watchers, to be executed first */ 1484 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1485 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1486 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1487
1371 call_pending (EV_A); 1488 call_pending (EV_A);
1372 1489
1373 if (expect_false (loop_done))
1374 break;
1375 } 1490 }
1491 while (expect_true (activecnt && !loop_done));
1376 1492
1377 if (loop_done == EVUNLOOP_ONE) 1493 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1494 loop_done = EVUNLOOP_CANCEL;
1379} 1495}
1380 1496
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1532 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1533 w->pending = 0;
1418 } 1534 }
1419} 1535}
1420 1536
1537void inline_size
1538pri_adjust (EV_P_ W w)
1539{
1540 int pri = w->priority;
1541 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1542 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1543 w->priority = pri;
1544}
1545
1421void inline_speed 1546void inline_speed
1422ev_start (EV_P_ W w, int active) 1547ev_start (EV_P_ W w, int active)
1423{ 1548{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1549 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1550 w->active = active;
1428 ev_ref (EV_A); 1551 ev_ref (EV_A);
1429} 1552}
1430 1553
1431void inline_size 1554void inline_size
1482 ev_start (EV_A_ (W)w, ++timercnt); 1605 ev_start (EV_A_ (W)w, ++timercnt);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1606 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1484 timers [timercnt - 1] = w; 1607 timers [timercnt - 1] = w;
1485 upheap ((WT *)timers, timercnt - 1); 1608 upheap ((WT *)timers, timercnt - 1);
1486 1609
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1610 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1488} 1611}
1489 1612
1490void 1613void
1491ev_timer_stop (EV_P_ ev_timer *w) 1614ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1615{
1494 if (expect_false (!ev_is_active (w))) 1617 if (expect_false (!ev_is_active (w)))
1495 return; 1618 return;
1496 1619
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1620 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1498 1621
1622 {
1623 int active = ((W)w)->active;
1624
1499 if (expect_true (((W)w)->active < timercnt--)) 1625 if (expect_true (--active < --timercnt))
1500 { 1626 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 1627 timers [active] = timers [timercnt];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1628 adjustheap ((WT *)timers, timercnt, active);
1503 } 1629 }
1630 }
1504 1631
1505 ((WT)w)->at -= mn_now; 1632 ((WT)w)->at -= mn_now;
1506 1633
1507 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1508} 1635}
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 1673 ev_start (EV_A_ (W)w, ++periodiccnt);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1674 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 1675 periodics [periodiccnt - 1] = w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 1676 upheap ((WT *)periodics, periodiccnt - 1);
1550 1677
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1678 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1552} 1679}
1553 1680
1554void 1681void
1555ev_periodic_stop (EV_P_ ev_periodic *w) 1682ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 1683{
1558 if (expect_false (!ev_is_active (w))) 1685 if (expect_false (!ev_is_active (w)))
1559 return; 1686 return;
1560 1687
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1688 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1562 1689
1690 {
1691 int active = ((W)w)->active;
1692
1563 if (expect_true (((W)w)->active < periodiccnt--)) 1693 if (expect_true (--active < --periodiccnt))
1564 { 1694 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1695 periodics [active] = periodics [periodiccnt];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1696 adjustheap ((WT *)periodics, periodiccnt, active);
1567 } 1697 }
1698 }
1568 1699
1569 ev_stop (EV_A_ (W)w); 1700 ev_stop (EV_A_ (W)w);
1570} 1701}
1571 1702
1572void 1703void
1657# endif 1788# endif
1658 1789
1659#define DEF_STAT_INTERVAL 5.0074891 1790#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 1791#define MIN_STAT_INTERVAL 0.1074891
1661 1792
1793static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1794
1795#if EV_USE_INOTIFY
1796# define EV_INOTIFY_BUFSIZE 8192
1797
1798static void noinline
1799infy_add (EV_P_ ev_stat *w)
1800{
1801 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);
1802
1803 if (w->wd < 0)
1804 {
1805 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1806
1807 /* monitor some parent directory for speedup hints */
1808 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1809 {
1810 char path [4096];
1811 strcpy (path, w->path);
1812
1813 do
1814 {
1815 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1816 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1817
1818 char *pend = strrchr (path, '/');
1819
1820 if (!pend)
1821 break; /* whoops, no '/', complain to your admin */
1822
1823 *pend = 0;
1824 w->wd = inotify_add_watch (fs_fd, path, mask);
1825 }
1826 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1827 }
1828 }
1829 else
1830 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1831
1832 if (w->wd >= 0)
1833 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1834}
1835
1836static void noinline
1837infy_del (EV_P_ ev_stat *w)
1838{
1839 int slot;
1840 int wd = w->wd;
1841
1842 if (wd < 0)
1843 return;
1844
1845 w->wd = -2;
1846 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1847 wlist_del (&fs_hash [slot].head, (WL)w);
1848
1849 /* remove this watcher, if others are watching it, they will rearm */
1850 inotify_rm_watch (fs_fd, wd);
1851}
1852
1853static void noinline
1854infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1855{
1856 if (slot < 0)
1857 /* overflow, need to check for all hahs slots */
1858 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1859 infy_wd (EV_A_ slot, wd, ev);
1860 else
1861 {
1862 WL w_;
1863
1864 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1865 {
1866 ev_stat *w = (ev_stat *)w_;
1867 w_ = w_->next; /* lets us remove this watcher and all before it */
1868
1869 if (w->wd == wd || wd == -1)
1870 {
1871 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1872 {
1873 w->wd = -1;
1874 infy_add (EV_A_ w); /* re-add, no matter what */
1875 }
1876
1877 stat_timer_cb (EV_A_ &w->timer, 0);
1878 }
1879 }
1880 }
1881}
1882
1883static void
1884infy_cb (EV_P_ ev_io *w, int revents)
1885{
1886 char buf [EV_INOTIFY_BUFSIZE];
1887 struct inotify_event *ev = (struct inotify_event *)buf;
1888 int ofs;
1889 int len = read (fs_fd, buf, sizeof (buf));
1890
1891 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1892 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1893}
1894
1895void inline_size
1896infy_init (EV_P)
1897{
1898 if (fs_fd != -2)
1899 return;
1900
1901 fs_fd = inotify_init ();
1902
1903 if (fs_fd >= 0)
1904 {
1905 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1906 ev_set_priority (&fs_w, EV_MAXPRI);
1907 ev_io_start (EV_A_ &fs_w);
1908 }
1909}
1910
1911void inline_size
1912infy_fork (EV_P)
1913{
1914 int slot;
1915
1916 if (fs_fd < 0)
1917 return;
1918
1919 close (fs_fd);
1920 fs_fd = inotify_init ();
1921
1922 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1923 {
1924 WL w_ = fs_hash [slot].head;
1925 fs_hash [slot].head = 0;
1926
1927 while (w_)
1928 {
1929 ev_stat *w = (ev_stat *)w_;
1930 w_ = w_->next; /* lets us add this watcher */
1931
1932 w->wd = -1;
1933
1934 if (fs_fd >= 0)
1935 infy_add (EV_A_ w); /* re-add, no matter what */
1936 else
1937 ev_timer_start (EV_A_ &w->timer);
1938 }
1939
1940 }
1941}
1942
1943#endif
1944
1662void 1945void
1663ev_stat_stat (EV_P_ ev_stat *w) 1946ev_stat_stat (EV_P_ ev_stat *w)
1664{ 1947{
1665 if (lstat (w->path, &w->attr) < 0) 1948 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 1949 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 1950 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 1951 w->attr.st_nlink = 1;
1669} 1952}
1670 1953
1671static void 1954static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1955stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 1956{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1957 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 1958
1676 /* we copy this here each the time so that */ 1959 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 1960 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 1961 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 1962 ev_stat_stat (EV_A_ w);
1680 1963
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1964 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1965 if (
1966 w->prev.st_dev != w->attr.st_dev
1967 || w->prev.st_ino != w->attr.st_ino
1968 || w->prev.st_mode != w->attr.st_mode
1969 || w->prev.st_nlink != w->attr.st_nlink
1970 || w->prev.st_uid != w->attr.st_uid
1971 || w->prev.st_gid != w->attr.st_gid
1972 || w->prev.st_rdev != w->attr.st_rdev
1973 || w->prev.st_size != w->attr.st_size
1974 || w->prev.st_atime != w->attr.st_atime
1975 || w->prev.st_mtime != w->attr.st_mtime
1976 || w->prev.st_ctime != w->attr.st_ctime
1977 ) {
1978 #if EV_USE_INOTIFY
1979 infy_del (EV_A_ w);
1980 infy_add (EV_A_ w);
1981 ev_stat_stat (EV_A_ w); /* avoid race... */
1982 #endif
1983
1682 ev_feed_event (EV_A_ w, EV_STAT); 1984 ev_feed_event (EV_A_ w, EV_STAT);
1985 }
1683} 1986}
1684 1987
1685void 1988void
1686ev_stat_start (EV_P_ ev_stat *w) 1989ev_stat_start (EV_P_ ev_stat *w)
1687{ 1990{
1697 if (w->interval < MIN_STAT_INTERVAL) 2000 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2001 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 2002
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2003 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 2004 ev_set_priority (&w->timer, ev_priority (w));
2005
2006#if EV_USE_INOTIFY
2007 infy_init (EV_A);
2008
2009 if (fs_fd >= 0)
2010 infy_add (EV_A_ w);
2011 else
2012#endif
1702 ev_timer_start (EV_A_ &w->timer); 2013 ev_timer_start (EV_A_ &w->timer);
1703 2014
1704 ev_start (EV_A_ (W)w, 1); 2015 ev_start (EV_A_ (W)w, 1);
1705} 2016}
1706 2017
1707void 2018void
1709{ 2020{
1710 ev_clear_pending (EV_A_ (W)w); 2021 ev_clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 2022 if (expect_false (!ev_is_active (w)))
1712 return; 2023 return;
1713 2024
2025#if EV_USE_INOTIFY
2026 infy_del (EV_A_ w);
2027#endif
1714 ev_timer_stop (EV_A_ &w->timer); 2028 ev_timer_stop (EV_A_ &w->timer);
1715 2029
1716 ev_stop (EV_A_ (W)w); 2030 ev_stop (EV_A_ (W)w);
1717} 2031}
1718#endif 2032#endif
1719 2033
2034#if EV_IDLE_ENABLE
1720void 2035void
1721ev_idle_start (EV_P_ ev_idle *w) 2036ev_idle_start (EV_P_ ev_idle *w)
1722{ 2037{
1723 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1724 return; 2039 return;
1725 2040
2041 pri_adjust (EV_A_ (W)w);
2042
2043 {
2044 int active = ++idlecnt [ABSPRI (w)];
2045
2046 ++idleall;
1726 ev_start (EV_A_ (W)w, ++idlecnt); 2047 ev_start (EV_A_ (W)w, active);
2048
1727 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2049 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1728 idles [idlecnt - 1] = w; 2050 idles [ABSPRI (w)][active - 1] = w;
2051 }
1729} 2052}
1730 2053
1731void 2054void
1732ev_idle_stop (EV_P_ ev_idle *w) 2055ev_idle_stop (EV_P_ ev_idle *w)
1733{ 2056{
1735 if (expect_false (!ev_is_active (w))) 2058 if (expect_false (!ev_is_active (w)))
1736 return; 2059 return;
1737 2060
1738 { 2061 {
1739 int active = ((W)w)->active; 2062 int active = ((W)w)->active;
1740 idles [active - 1] = idles [--idlecnt]; 2063
2064 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1741 ((W)idles [active - 1])->active = active; 2065 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2066
2067 ev_stop (EV_A_ (W)w);
2068 --idleall;
1742 } 2069 }
1743
1744 ev_stop (EV_A_ (W)w);
1745} 2070}
2071#endif
1746 2072
1747void 2073void
1748ev_prepare_start (EV_P_ ev_prepare *w) 2074ev_prepare_start (EV_P_ ev_prepare *w)
1749{ 2075{
1750 if (expect_false (ev_is_active (w))) 2076 if (expect_false (ev_is_active (w)))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines