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

Comparing libev/ev.c (file contents):
Revision 1.151 by root, Tue Nov 27 19:59:08 2007 UTC vs.
Revision 1.168 by root, Sat Dec 8 14:12:07 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/*****************************************************************************/
450} 507}
451 508
452void 509void
453ev_feed_fd_event (EV_P_ int fd, int revents) 510ev_feed_fd_event (EV_P_ int fd, int revents)
454{ 511{
512 if (fd >= 0 && fd < anfdmax)
455 fd_event (EV_A_ fd, revents); 513 fd_event (EV_A_ fd, revents);
456} 514}
457 515
458void inline_size 516void inline_size
459fd_reify (EV_P) 517fd_reify (EV_P)
460{ 518{
554static void noinline 612static void noinline
555fd_rearm_all (EV_P) 613fd_rearm_all (EV_P)
556{ 614{
557 int fd; 615 int fd;
558 616
559 /* this should be highly optimised to not do anything but set a flag */
560 for (fd = 0; fd < anfdmax; ++fd) 617 for (fd = 0; fd < anfdmax; ++fd)
561 if (anfds [fd].events) 618 if (anfds [fd].events)
562 { 619 {
563 anfds [fd].events = 0; 620 anfds [fd].events = 0;
564 fd_change (EV_A_ fd); 621 fd_change (EV_A_ fd);
730 ev_child *w; 787 ev_child *w;
731 788
732 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 789 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
733 if (w->pid == pid || !w->pid) 790 if (w->pid == pid || !w->pid)
734 { 791 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 792 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
736 w->rpid = pid; 793 w->rpid = pid;
737 w->rstatus = status; 794 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 795 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 796 }
740} 797}
741 798
742#ifndef WCONTINUED 799#ifndef WCONTINUED
852ev_backend (EV_P) 909ev_backend (EV_P)
853{ 910{
854 return backend; 911 return backend;
855} 912}
856 913
914unsigned int
915ev_loop_count (EV_P)
916{
917 return loop_count;
918}
919
857static void noinline 920static void noinline
858loop_init (EV_P_ unsigned int flags) 921loop_init (EV_P_ unsigned int flags)
859{ 922{
860 if (!backend) 923 if (!backend)
861 { 924 {
870 ev_rt_now = ev_time (); 933 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 934 mn_now = get_clock ();
872 now_floor = mn_now; 935 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 936 rtmn_diff = ev_rt_now - mn_now;
874 937
938 /* pid check not overridable via env */
939#ifndef _WIN32
940 if (flags & EVFLAG_FORKCHECK)
941 curpid = getpid ();
942#endif
943
875 if (!(flags & EVFLAG_NOENV) 944 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 945 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 946 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 947 flags = atoi (getenv ("LIBEV_FLAGS"));
879 948
880 if (!(flags & 0x0000ffffUL)) 949 if (!(flags & 0x0000ffffUL))
881 flags |= ev_recommended_backends (); 950 flags |= ev_recommended_backends ();
882 951
883 backend = 0; 952 backend = 0;
953 backend_fd = -1;
954#if EV_USE_INOTIFY
955 fs_fd = -2;
956#endif
957
884#if EV_USE_PORT 958#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 959 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 960#endif
887#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 962 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
905static void noinline 979static void noinline
906loop_destroy (EV_P) 980loop_destroy (EV_P)
907{ 981{
908 int i; 982 int i;
909 983
984#if EV_USE_INOTIFY
985 if (fs_fd >= 0)
986 close (fs_fd);
987#endif
988
989 if (backend_fd >= 0)
990 close (backend_fd);
991
910#if EV_USE_PORT 992#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 993 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 994#endif
913#if EV_USE_KQUEUE 995#if EV_USE_KQUEUE
914 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 996 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
922#if EV_USE_SELECT 1004#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1005 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1006#endif
925 1007
926 for (i = NUMPRI; i--; ) 1008 for (i = NUMPRI; i--; )
1009 {
927 array_free (pending, [i]); 1010 array_free (pending, [i]);
1011#if EV_IDLE_ENABLE
1012 array_free (idle, [i]);
1013#endif
1014 }
928 1015
929 /* have to use the microsoft-never-gets-it-right macro */ 1016 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1017 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1018 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1019#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1020 array_free (periodic, EMPTY);
934#endif 1021#endif
935 array_free (idle, EMPTY0);
936 array_free (prepare, EMPTY0); 1022 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1023 array_free (check, EMPTY);
938 1024
939 backend = 0; 1025 backend = 0;
940} 1026}
1027
1028void inline_size infy_fork (EV_P);
941 1029
942void inline_size 1030void inline_size
943loop_fork (EV_P) 1031loop_fork (EV_P)
944{ 1032{
945#if EV_USE_PORT 1033#if EV_USE_PORT
948#if EV_USE_KQUEUE 1036#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1037 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1038#endif
951#if EV_USE_EPOLL 1039#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1040 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1041#endif
1042#if EV_USE_INOTIFY
1043 infy_fork (EV_A);
953#endif 1044#endif
954 1045
955 if (ev_is_active (&sigev)) 1046 if (ev_is_active (&sigev))
956 { 1047 {
957 /* default loop */ 1048 /* default loop */
1073 postfork = 1; 1164 postfork = 1;
1074} 1165}
1075 1166
1076/*****************************************************************************/ 1167/*****************************************************************************/
1077 1168
1078int inline_size 1169void
1079any_pending (EV_P) 1170ev_invoke (EV_P_ void *w, int revents)
1080{ 1171{
1081 int pri; 1172 EV_CB_INVOKE ((W)w, revents);
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088} 1173}
1089 1174
1090void inline_speed 1175void inline_speed
1091call_pending (EV_P) 1176call_pending (EV_P)
1092{ 1177{
1184 for (i = periodiccnt >> 1; i--; ) 1269 for (i = periodiccnt >> 1; i--; )
1185 downheap ((WT *)periodics, periodiccnt, i); 1270 downheap ((WT *)periodics, periodiccnt, i);
1186} 1271}
1187#endif 1272#endif
1188 1273
1274#if EV_IDLE_ENABLE
1275void inline_size
1276idle_reify (EV_P)
1277{
1278 if (expect_false (idleall))
1279 {
1280 int pri;
1281
1282 for (pri = NUMPRI; pri--; )
1283 {
1284 if (pendingcnt [pri])
1285 break;
1286
1287 if (idlecnt [pri])
1288 {
1289 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1290 break;
1291 }
1292 }
1293 }
1294}
1295#endif
1296
1189int inline_size 1297int inline_size
1190time_update_monotonic (EV_P) 1298time_update_monotonic (EV_P)
1191{ 1299{
1192 mn_now = get_clock (); 1300 mn_now = get_clock ();
1193 1301
1217 ev_tstamp odiff = rtmn_diff; 1325 ev_tstamp odiff = rtmn_diff;
1218 1326
1219 /* loop a few times, before making important decisions. 1327 /* loop a few times, before making important decisions.
1220 * on the choice of "4": one iteration isn't enough, 1328 * on the choice of "4": one iteration isn't enough,
1221 * in case we get preempted during the calls to 1329 * in case we get preempted during the calls to
1222 * ev_time and get_clock. a second call is almost guarenteed 1330 * ev_time and get_clock. a second call is almost guaranteed
1223 * to succeed in that case, though. and looping a few more times 1331 * 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 1332 * doesn't hurt either as we only do this on time-jumps or
1225 * in the unlikely event of getting preempted here. 1333 * in the unlikely event of having been preempted here.
1226 */ 1334 */
1227 for (i = 4; --i; ) 1335 for (i = 4; --i; )
1228 { 1336 {
1229 rtmn_diff = ev_rt_now - mn_now; 1337 rtmn_diff = ev_rt_now - mn_now;
1230 1338
1252 { 1360 {
1253#if EV_PERIODIC_ENABLE 1361#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1362 periodics_reschedule (EV_A);
1255#endif 1363#endif
1256 1364
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1365 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1366 for (i = 0; i < timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1367 ((WT)timers [i])->at += ev_rt_now - mn_now;
1260 } 1368 }
1261 1369
1262 mn_now = ev_rt_now; 1370 mn_now = ev_rt_now;
1282{ 1390{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1391 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1284 ? EVUNLOOP_ONE 1392 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL; 1393 : EVUNLOOP_CANCEL;
1286 1394
1287 while (activecnt) 1395 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1396
1397 do
1288 { 1398 {
1289 /* we might have forked, so reify kernel state if necessary */ 1399#ifndef _WIN32
1400 if (expect_false (curpid)) /* penalise the forking check even more */
1401 if (expect_false (getpid () != curpid))
1402 {
1403 curpid = getpid ();
1404 postfork = 1;
1405 }
1406#endif
1407
1290 #if EV_FORK_ENABLE 1408#if EV_FORK_ENABLE
1409 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1410 if (expect_false (postfork))
1292 if (forkcnt) 1411 if (forkcnt)
1293 { 1412 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1414 call_pending (EV_A);
1296 } 1415 }
1297 #endif 1416#endif
1298 1417
1299 /* queue check watchers (and execute them) */ 1418 /* queue check watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1419 if (expect_false (preparecnt))
1301 { 1420 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1422 call_pending (EV_A);
1304 } 1423 }
1305 1424
1425 if (expect_false (!activecnt))
1426 break;
1427
1306 /* we might have forked, so reify kernel state if necessary */ 1428 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1429 if (expect_false (postfork))
1308 loop_fork (EV_A); 1430 loop_fork (EV_A);
1309 1431
1310 /* update fd-related kernel structures */ 1432 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1433 fd_reify (EV_A);
1312 1434
1313 /* calculate blocking time */ 1435 /* calculate blocking time */
1314 { 1436 {
1315 double block; 1437 ev_tstamp block;
1316 1438
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1318 block = 0.; /* do not block at all */ 1440 block = 0.; /* do not block at all */
1319 else 1441 else
1320 { 1442 {
1321 /* update time to cancel out callback processing overhead */ 1443 /* update time to cancel out callback processing overhead */
1322#if EV_USE_MONOTONIC 1444#if EV_USE_MONOTONIC
1346#endif 1468#endif
1347 1469
1348 if (expect_false (block < 0.)) block = 0.; 1470 if (expect_false (block < 0.)) block = 0.;
1349 } 1471 }
1350 1472
1473 ++loop_count;
1351 backend_poll (EV_A_ block); 1474 backend_poll (EV_A_ block);
1352 } 1475 }
1353 1476
1354 /* update ev_rt_now, do magic */ 1477 /* update ev_rt_now, do magic */
1355 time_update (EV_A); 1478 time_update (EV_A);
1358 timers_reify (EV_A); /* relative timers called last */ 1481 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1482#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1483 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1484#endif
1362 1485
1486#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1487 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1488 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1489#endif
1366 1490
1367 /* queue check watchers, to be executed first */ 1491 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1492 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1493 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1494
1371 call_pending (EV_A); 1495 call_pending (EV_A);
1372 1496
1373 if (expect_false (loop_done))
1374 break;
1375 } 1497 }
1498 while (expect_true (activecnt && !loop_done));
1376 1499
1377 if (loop_done == EVUNLOOP_ONE) 1500 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1501 loop_done = EVUNLOOP_CANCEL;
1379} 1502}
1380 1503
1407 head = &(*head)->next; 1530 head = &(*head)->next;
1408 } 1531 }
1409} 1532}
1410 1533
1411void inline_speed 1534void inline_speed
1412ev_clear_pending (EV_P_ W w) 1535clear_pending (EV_P_ W w)
1413{ 1536{
1414 if (w->pending) 1537 if (w->pending)
1415 { 1538 {
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1539 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1540 w->pending = 0;
1418 } 1541 }
1419} 1542}
1420 1543
1544int
1545ev_clear_pending (EV_P_ void *w)
1546{
1547 W w_ = (W)w;
1548 int pending = w_->pending;
1549
1550 if (!pending)
1551 return 0;
1552
1553 w_->pending = 0;
1554 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1555 p->w = 0;
1556
1557 return p->events;
1558}
1559
1560void inline_size
1561pri_adjust (EV_P_ W w)
1562{
1563 int pri = w->priority;
1564 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1565 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1566 w->priority = pri;
1567}
1568
1421void inline_speed 1569void inline_speed
1422ev_start (EV_P_ W w, int active) 1570ev_start (EV_P_ W w, int active)
1423{ 1571{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1572 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1573 w->active = active;
1428 ev_ref (EV_A); 1574 ev_ref (EV_A);
1429} 1575}
1430 1576
1431void inline_size 1577void inline_size
1455} 1601}
1456 1602
1457void 1603void
1458ev_io_stop (EV_P_ ev_io *w) 1604ev_io_stop (EV_P_ ev_io *w)
1459{ 1605{
1460 ev_clear_pending (EV_A_ (W)w); 1606 clear_pending (EV_A_ (W)w);
1461 if (expect_false (!ev_is_active (w))) 1607 if (expect_false (!ev_is_active (w)))
1462 return; 1608 return;
1463 1609
1464 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1610 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1465 1611
1488} 1634}
1489 1635
1490void 1636void
1491ev_timer_stop (EV_P_ ev_timer *w) 1637ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1638{
1493 ev_clear_pending (EV_A_ (W)w); 1639 clear_pending (EV_A_ (W)w);
1494 if (expect_false (!ev_is_active (w))) 1640 if (expect_false (!ev_is_active (w)))
1495 return; 1641 return;
1496 1642
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1498 1644
1556} 1702}
1557 1703
1558void 1704void
1559ev_periodic_stop (EV_P_ ev_periodic *w) 1705ev_periodic_stop (EV_P_ ev_periodic *w)
1560{ 1706{
1561 ev_clear_pending (EV_A_ (W)w); 1707 clear_pending (EV_A_ (W)w);
1562 if (expect_false (!ev_is_active (w))) 1708 if (expect_false (!ev_is_active (w)))
1563 return; 1709 return;
1564 1710
1565 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1566 1712
1620} 1766}
1621 1767
1622void 1768void
1623ev_signal_stop (EV_P_ ev_signal *w) 1769ev_signal_stop (EV_P_ ev_signal *w)
1624{ 1770{
1625 ev_clear_pending (EV_A_ (W)w); 1771 clear_pending (EV_A_ (W)w);
1626 if (expect_false (!ev_is_active (w))) 1772 if (expect_false (!ev_is_active (w)))
1627 return; 1773 return;
1628 1774
1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1630 ev_stop (EV_A_ (W)w); 1776 ev_stop (EV_A_ (W)w);
1647} 1793}
1648 1794
1649void 1795void
1650ev_child_stop (EV_P_ ev_child *w) 1796ev_child_stop (EV_P_ ev_child *w)
1651{ 1797{
1652 ev_clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1653 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1654 return; 1800 return;
1655 1801
1656 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1657 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1665# endif 1811# endif
1666 1812
1667#define DEF_STAT_INTERVAL 5.0074891 1813#define DEF_STAT_INTERVAL 5.0074891
1668#define MIN_STAT_INTERVAL 0.1074891 1814#define MIN_STAT_INTERVAL 0.1074891
1669 1815
1816static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1817
1818#if EV_USE_INOTIFY
1819# define EV_INOTIFY_BUFSIZE 8192
1820
1821static void noinline
1822infy_add (EV_P_ ev_stat *w)
1823{
1824 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);
1825
1826 if (w->wd < 0)
1827 {
1828 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1829
1830 /* monitor some parent directory for speedup hints */
1831 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1832 {
1833 char path [4096];
1834 strcpy (path, w->path);
1835
1836 do
1837 {
1838 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1839 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1840
1841 char *pend = strrchr (path, '/');
1842
1843 if (!pend)
1844 break; /* whoops, no '/', complain to your admin */
1845
1846 *pend = 0;
1847 w->wd = inotify_add_watch (fs_fd, path, mask);
1848 }
1849 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1850 }
1851 }
1852 else
1853 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1854
1855 if (w->wd >= 0)
1856 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1857}
1858
1859static void noinline
1860infy_del (EV_P_ ev_stat *w)
1861{
1862 int slot;
1863 int wd = w->wd;
1864
1865 if (wd < 0)
1866 return;
1867
1868 w->wd = -2;
1869 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1870 wlist_del (&fs_hash [slot].head, (WL)w);
1871
1872 /* remove this watcher, if others are watching it, they will rearm */
1873 inotify_rm_watch (fs_fd, wd);
1874}
1875
1876static void noinline
1877infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1878{
1879 if (slot < 0)
1880 /* overflow, need to check for all hahs slots */
1881 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1882 infy_wd (EV_A_ slot, wd, ev);
1883 else
1884 {
1885 WL w_;
1886
1887 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1888 {
1889 ev_stat *w = (ev_stat *)w_;
1890 w_ = w_->next; /* lets us remove this watcher and all before it */
1891
1892 if (w->wd == wd || wd == -1)
1893 {
1894 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1895 {
1896 w->wd = -1;
1897 infy_add (EV_A_ w); /* re-add, no matter what */
1898 }
1899
1900 stat_timer_cb (EV_A_ &w->timer, 0);
1901 }
1902 }
1903 }
1904}
1905
1906static void
1907infy_cb (EV_P_ ev_io *w, int revents)
1908{
1909 char buf [EV_INOTIFY_BUFSIZE];
1910 struct inotify_event *ev = (struct inotify_event *)buf;
1911 int ofs;
1912 int len = read (fs_fd, buf, sizeof (buf));
1913
1914 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1915 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1916}
1917
1918void inline_size
1919infy_init (EV_P)
1920{
1921 if (fs_fd != -2)
1922 return;
1923
1924 fs_fd = inotify_init ();
1925
1926 if (fs_fd >= 0)
1927 {
1928 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1929 ev_set_priority (&fs_w, EV_MAXPRI);
1930 ev_io_start (EV_A_ &fs_w);
1931 }
1932}
1933
1934void inline_size
1935infy_fork (EV_P)
1936{
1937 int slot;
1938
1939 if (fs_fd < 0)
1940 return;
1941
1942 close (fs_fd);
1943 fs_fd = inotify_init ();
1944
1945 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1946 {
1947 WL w_ = fs_hash [slot].head;
1948 fs_hash [slot].head = 0;
1949
1950 while (w_)
1951 {
1952 ev_stat *w = (ev_stat *)w_;
1953 w_ = w_->next; /* lets us add this watcher */
1954
1955 w->wd = -1;
1956
1957 if (fs_fd >= 0)
1958 infy_add (EV_A_ w); /* re-add, no matter what */
1959 else
1960 ev_timer_start (EV_A_ &w->timer);
1961 }
1962
1963 }
1964}
1965
1966#endif
1967
1670void 1968void
1671ev_stat_stat (EV_P_ ev_stat *w) 1969ev_stat_stat (EV_P_ ev_stat *w)
1672{ 1970{
1673 if (lstat (w->path, &w->attr) < 0) 1971 if (lstat (w->path, &w->attr) < 0)
1674 w->attr.st_nlink = 0; 1972 w->attr.st_nlink = 0;
1675 else if (!w->attr.st_nlink) 1973 else if (!w->attr.st_nlink)
1676 w->attr.st_nlink = 1; 1974 w->attr.st_nlink = 1;
1677} 1975}
1678 1976
1679static void 1977static void noinline
1680stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1978stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1681{ 1979{
1682 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1980 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1683 1981
1684 /* we copy this here each the time so that */ 1982 /* we copy this here each the time so that */
1685 /* prev has the old value when the callback gets invoked */ 1983 /* prev has the old value when the callback gets invoked */
1686 w->prev = w->attr; 1984 w->prev = w->attr;
1687 ev_stat_stat (EV_A_ w); 1985 ev_stat_stat (EV_A_ w);
1688 1986
1689 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1987 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1988 if (
1989 w->prev.st_dev != w->attr.st_dev
1990 || w->prev.st_ino != w->attr.st_ino
1991 || w->prev.st_mode != w->attr.st_mode
1992 || w->prev.st_nlink != w->attr.st_nlink
1993 || w->prev.st_uid != w->attr.st_uid
1994 || w->prev.st_gid != w->attr.st_gid
1995 || w->prev.st_rdev != w->attr.st_rdev
1996 || w->prev.st_size != w->attr.st_size
1997 || w->prev.st_atime != w->attr.st_atime
1998 || w->prev.st_mtime != w->attr.st_mtime
1999 || w->prev.st_ctime != w->attr.st_ctime
2000 ) {
2001 #if EV_USE_INOTIFY
2002 infy_del (EV_A_ w);
2003 infy_add (EV_A_ w);
2004 ev_stat_stat (EV_A_ w); /* avoid race... */
2005 #endif
2006
1690 ev_feed_event (EV_A_ w, EV_STAT); 2007 ev_feed_event (EV_A_ w, EV_STAT);
2008 }
1691} 2009}
1692 2010
1693void 2011void
1694ev_stat_start (EV_P_ ev_stat *w) 2012ev_stat_start (EV_P_ ev_stat *w)
1695{ 2013{
1705 if (w->interval < MIN_STAT_INTERVAL) 2023 if (w->interval < MIN_STAT_INTERVAL)
1706 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2024 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1707 2025
1708 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2026 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1709 ev_set_priority (&w->timer, ev_priority (w)); 2027 ev_set_priority (&w->timer, ev_priority (w));
2028
2029#if EV_USE_INOTIFY
2030 infy_init (EV_A);
2031
2032 if (fs_fd >= 0)
2033 infy_add (EV_A_ w);
2034 else
2035#endif
1710 ev_timer_start (EV_A_ &w->timer); 2036 ev_timer_start (EV_A_ &w->timer);
1711 2037
1712 ev_start (EV_A_ (W)w, 1); 2038 ev_start (EV_A_ (W)w, 1);
1713} 2039}
1714 2040
1715void 2041void
1716ev_stat_stop (EV_P_ ev_stat *w) 2042ev_stat_stop (EV_P_ ev_stat *w)
1717{ 2043{
1718 ev_clear_pending (EV_A_ (W)w); 2044 clear_pending (EV_A_ (W)w);
1719 if (expect_false (!ev_is_active (w))) 2045 if (expect_false (!ev_is_active (w)))
1720 return; 2046 return;
1721 2047
2048#if EV_USE_INOTIFY
2049 infy_del (EV_A_ w);
2050#endif
1722 ev_timer_stop (EV_A_ &w->timer); 2051 ev_timer_stop (EV_A_ &w->timer);
1723 2052
1724 ev_stop (EV_A_ (W)w); 2053 ev_stop (EV_A_ (W)w);
1725} 2054}
1726#endif 2055#endif
1727 2056
2057#if EV_IDLE_ENABLE
1728void 2058void
1729ev_idle_start (EV_P_ ev_idle *w) 2059ev_idle_start (EV_P_ ev_idle *w)
1730{ 2060{
1731 if (expect_false (ev_is_active (w))) 2061 if (expect_false (ev_is_active (w)))
1732 return; 2062 return;
1733 2063
2064 pri_adjust (EV_A_ (W)w);
2065
2066 {
2067 int active = ++idlecnt [ABSPRI (w)];
2068
2069 ++idleall;
1734 ev_start (EV_A_ (W)w, ++idlecnt); 2070 ev_start (EV_A_ (W)w, active);
2071
1735 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2072 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1736 idles [idlecnt - 1] = w; 2073 idles [ABSPRI (w)][active - 1] = w;
2074 }
1737} 2075}
1738 2076
1739void 2077void
1740ev_idle_stop (EV_P_ ev_idle *w) 2078ev_idle_stop (EV_P_ ev_idle *w)
1741{ 2079{
1742 ev_clear_pending (EV_A_ (W)w); 2080 clear_pending (EV_A_ (W)w);
1743 if (expect_false (!ev_is_active (w))) 2081 if (expect_false (!ev_is_active (w)))
1744 return; 2082 return;
1745 2083
1746 { 2084 {
1747 int active = ((W)w)->active; 2085 int active = ((W)w)->active;
1748 idles [active - 1] = idles [--idlecnt]; 2086
2087 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1749 ((W)idles [active - 1])->active = active; 2088 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2089
2090 ev_stop (EV_A_ (W)w);
2091 --idleall;
1750 } 2092 }
1751
1752 ev_stop (EV_A_ (W)w);
1753} 2093}
2094#endif
1754 2095
1755void 2096void
1756ev_prepare_start (EV_P_ ev_prepare *w) 2097ev_prepare_start (EV_P_ ev_prepare *w)
1757{ 2098{
1758 if (expect_false (ev_is_active (w))) 2099 if (expect_false (ev_is_active (w)))
1764} 2105}
1765 2106
1766void 2107void
1767ev_prepare_stop (EV_P_ ev_prepare *w) 2108ev_prepare_stop (EV_P_ ev_prepare *w)
1768{ 2109{
1769 ev_clear_pending (EV_A_ (W)w); 2110 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 2111 if (expect_false (!ev_is_active (w)))
1771 return; 2112 return;
1772 2113
1773 { 2114 {
1774 int active = ((W)w)->active; 2115 int active = ((W)w)->active;
1791} 2132}
1792 2133
1793void 2134void
1794ev_check_stop (EV_P_ ev_check *w) 2135ev_check_stop (EV_P_ ev_check *w)
1795{ 2136{
1796 ev_clear_pending (EV_A_ (W)w); 2137 clear_pending (EV_A_ (W)w);
1797 if (expect_false (!ev_is_active (w))) 2138 if (expect_false (!ev_is_active (w)))
1798 return; 2139 return;
1799 2140
1800 { 2141 {
1801 int active = ((W)w)->active; 2142 int active = ((W)w)->active;
1843} 2184}
1844 2185
1845void 2186void
1846ev_embed_stop (EV_P_ ev_embed *w) 2187ev_embed_stop (EV_P_ ev_embed *w)
1847{ 2188{
1848 ev_clear_pending (EV_A_ (W)w); 2189 clear_pending (EV_A_ (W)w);
1849 if (expect_false (!ev_is_active (w))) 2190 if (expect_false (!ev_is_active (w)))
1850 return; 2191 return;
1851 2192
1852 ev_io_stop (EV_A_ &w->io); 2193 ev_io_stop (EV_A_ &w->io);
1853 2194
1868} 2209}
1869 2210
1870void 2211void
1871ev_fork_stop (EV_P_ ev_fork *w) 2212ev_fork_stop (EV_P_ ev_fork *w)
1872{ 2213{
1873 ev_clear_pending (EV_A_ (W)w); 2214 clear_pending (EV_A_ (W)w);
1874 if (expect_false (!ev_is_active (w))) 2215 if (expect_false (!ev_is_active (w)))
1875 return; 2216 return;
1876 2217
1877 { 2218 {
1878 int active = ((W)w)->active; 2219 int active = ((W)w)->active;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines