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

Comparing libev/ev.c (file contents):
Revision 1.153 by root, Wed Nov 28 11:41:18 2007 UTC vs.
Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC

… …
216# include <sys/inotify.h> 216# include <sys/inotify.h>
217#endif 217#endif
218 218
219/**/ 219/**/
220 220
221/*
222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding
225 * errors are against us.
226 * This value is good at least till the year 4000
227 * and intervals up to 20 years.
228 * Better solutions welcome.
229 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
231
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 232#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 233#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 235
225#if __GNUC__ >= 3 236#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 237# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 238# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 239#else
236# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 241# define noinline
242# if __STDC_VERSION__ < 199901L
243# define inline
244# endif
240#endif 245#endif
241 246
242#define expect_false(expr) expect ((expr) != 0, 0) 247#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 248#define expect_true(expr) expect ((expr) != 0, 1)
249#define inline_size static inline
250
251#if EV_MINIMAL
252# define inline_speed static noinline
253#else
254# define inline_speed static inline
255#endif
244 256
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 257#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 258#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 259
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 260#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 261#define EMPTY2(a,b) /* used to suppress some warnings */
250 262
251typedef ev_watcher *W; 263typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 264typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 265typedef ev_watcher_time *WT;
… …
281 perror (msg); 293 perror (msg);
282 abort (); 294 abort ();
283 } 295 }
284} 296}
285 297
286static void *(*alloc)(void *ptr, size_t size) = realloc; 298static void *(*alloc)(void *ptr, long size);
287 299
288void 300void
289ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 301ev_set_allocator (void *(*cb)(void *ptr, long size))
290{ 302{
291 alloc = cb; 303 alloc = cb;
292} 304}
293 305
294inline_speed void * 306inline_speed void *
295ev_realloc (void *ptr, size_t size) 307ev_realloc (void *ptr, long size)
296{ 308{
297 ptr = alloc (ptr, size); 309 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
298 310
299 if (!ptr && size) 311 if (!ptr && size)
300 { 312 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size); 313 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort (); 314 abort ();
303 } 315 }
304 316
305 return ptr; 317 return ptr;
306} 318}
… …
324{ 336{
325 W w; 337 W w;
326 int events; 338 int events;
327} ANPENDING; 339} ANPENDING;
328 340
341#if EV_USE_INOTIFY
329typedef struct 342typedef struct
330{ 343{
331#if EV_USE_INOTIFY
332 WL head; 344 WL head;
333#endif
334} ANFS; 345} ANFS;
346#endif
335 347
336#if EV_MULTIPLICITY 348#if EV_MULTIPLICITY
337 349
338 struct ev_loop 350 struct ev_loop
339 { 351 {
… …
396{ 408{
397 return ev_rt_now; 409 return ev_rt_now;
398} 410}
399#endif 411#endif
400 412
401#define array_roundsize(type,n) (((n) | 4) & ~3) 413int inline_size
414array_nextsize (int elem, int cur, int cnt)
415{
416 int ncur = cur + 1;
417
418 do
419 ncur <<= 1;
420 while (cnt > ncur);
421
422 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
423 if (elem * ncur > 4096)
424 {
425 ncur *= elem;
426 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
427 ncur = ncur - sizeof (void *) * 4;
428 ncur /= elem;
429 }
430
431 return ncur;
432}
433
434static noinline void *
435array_realloc (int elem, void *base, int *cur, int cnt)
436{
437 *cur = array_nextsize (elem, *cur, cnt);
438 return ev_realloc (base, elem * *cur);
439}
402 440
403#define array_needsize(type,base,cur,cnt,init) \ 441#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 442 if (expect_false ((cnt) > (cur))) \
405 { \ 443 { \
406 int newcnt = cur; \ 444 int ocur_ = (cur); \
407 do \ 445 (base) = (type *)array_realloc \
408 { \ 446 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 447 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 448 }
417 449
450#if 0
418#define array_slim(type,stem) \ 451#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 452 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 453 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 454 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 455 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 456 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 457 }
458#endif
425 459
426#define array_free(stem, idx) \ 460#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 461 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 462
429/*****************************************************************************/ 463/*****************************************************************************/
430 464
431void noinline 465void noinline
432ev_feed_event (EV_P_ void *w, int revents) 466ev_feed_event (EV_P_ void *w, int revents)
433{ 467{
434 W w_ = (W)w; 468 W w_ = (W)w;
469 int pri = ABSPRI (w_);
435 470
436 if (expect_false (w_->pending)) 471 if (expect_false (w_->pending))
472 pendings [pri][w_->pending - 1].events |= revents;
473 else
437 { 474 {
475 w_->pending = ++pendingcnt [pri];
476 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
477 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 478 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 479 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 480}
447 481
448void inline_size 482void inline_size
449queue_events (EV_P_ W *events, int eventcnt, int type) 483queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 484{
… …
485} 519}
486 520
487void 521void
488ev_feed_fd_event (EV_P_ int fd, int revents) 522ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 523{
524 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 525 fd_event (EV_A_ fd, revents);
491} 526}
492 527
493void inline_size 528void inline_size
494fd_reify (EV_P) 529fd_reify (EV_P)
495{ 530{
… …
589static void noinline 624static void noinline
590fd_rearm_all (EV_P) 625fd_rearm_all (EV_P)
591{ 626{
592 int fd; 627 int fd;
593 628
594 /* this should be highly optimised to not do anything but set a flag */
595 for (fd = 0; fd < anfdmax; ++fd) 629 for (fd = 0; fd < anfdmax; ++fd)
596 if (anfds [fd].events) 630 if (anfds [fd].events)
597 { 631 {
598 anfds [fd].events = 0; 632 anfds [fd].events = 0;
599 fd_change (EV_A_ fd); 633 fd_change (EV_A_ fd);
… …
726 for (signum = signalmax; signum--; ) 760 for (signum = signalmax; signum--; )
727 if (signals [signum].gotsig) 761 if (signals [signum].gotsig)
728 ev_feed_signal_event (EV_A_ signum + 1); 762 ev_feed_signal_event (EV_A_ signum + 1);
729} 763}
730 764
731void inline_size 765void inline_speed
732fd_intern (int fd) 766fd_intern (int fd)
733{ 767{
734#ifdef _WIN32 768#ifdef _WIN32
735 int arg = 1; 769 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 770 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
765 ev_child *w; 799 ev_child *w;
766 800
767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 801 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
768 if (w->pid == pid || !w->pid) 802 if (w->pid == pid || !w->pid)
769 { 803 {
770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 804 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
771 w->rpid = pid; 805 w->rpid = pid;
772 w->rstatus = status; 806 w->rstatus = status;
773 ev_feed_event (EV_A_ (W)w, EV_CHILD); 807 ev_feed_event (EV_A_ (W)w, EV_CHILD);
774 } 808 }
775} 809}
776 810
777#ifndef WCONTINUED 811#ifndef WCONTINUED
… …
887ev_backend (EV_P) 921ev_backend (EV_P)
888{ 922{
889 return backend; 923 return backend;
890} 924}
891 925
926unsigned int
927ev_loop_count (EV_P)
928{
929 return loop_count;
930}
931
892static void noinline 932static void noinline
893loop_init (EV_P_ unsigned int flags) 933loop_init (EV_P_ unsigned int flags)
894{ 934{
895 if (!backend) 935 if (!backend)
896 { 936 {
… …
905 ev_rt_now = ev_time (); 945 ev_rt_now = ev_time ();
906 mn_now = get_clock (); 946 mn_now = get_clock ();
907 now_floor = mn_now; 947 now_floor = mn_now;
908 rtmn_diff = ev_rt_now - mn_now; 948 rtmn_diff = ev_rt_now - mn_now;
909 949
950 /* pid check not overridable via env */
951#ifndef _WIN32
952 if (flags & EVFLAG_FORKCHECK)
953 curpid = getpid ();
954#endif
955
910 if (!(flags & EVFLAG_NOENV) 956 if (!(flags & EVFLAG_NOENV)
911 && !enable_secure () 957 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS")) 958 && getenv ("LIBEV_FLAGS"))
913 flags = atoi (getenv ("LIBEV_FLAGS")); 959 flags = atoi (getenv ("LIBEV_FLAGS"));
914 960
… …
970#if EV_USE_SELECT 1016#if EV_USE_SELECT
971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1017 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
972#endif 1018#endif
973 1019
974 for (i = NUMPRI; i--; ) 1020 for (i = NUMPRI; i--; )
1021 {
975 array_free (pending, [i]); 1022 array_free (pending, [i]);
1023#if EV_IDLE_ENABLE
1024 array_free (idle, [i]);
1025#endif
1026 }
976 1027
977 /* have to use the microsoft-never-gets-it-right macro */ 1028 /* have to use the microsoft-never-gets-it-right macro */
978 array_free (fdchange, EMPTY0); 1029 array_free (fdchange, EMPTY);
979 array_free (timer, EMPTY0); 1030 array_free (timer, EMPTY);
980#if EV_PERIODIC_ENABLE 1031#if EV_PERIODIC_ENABLE
981 array_free (periodic, EMPTY0); 1032 array_free (periodic, EMPTY);
982#endif 1033#endif
983 array_free (idle, EMPTY0);
984 array_free (prepare, EMPTY0); 1034 array_free (prepare, EMPTY);
985 array_free (check, EMPTY0); 1035 array_free (check, EMPTY);
986 1036
987 backend = 0; 1037 backend = 0;
988} 1038}
1039
1040void inline_size infy_fork (EV_P);
989 1041
990void inline_size 1042void inline_size
991loop_fork (EV_P) 1043loop_fork (EV_P)
992{ 1044{
993#if EV_USE_PORT 1045#if EV_USE_PORT
… …
996#if EV_USE_KQUEUE 1048#if EV_USE_KQUEUE
997 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1049 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
998#endif 1050#endif
999#if EV_USE_EPOLL 1051#if EV_USE_EPOLL
1000 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1052 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1053#endif
1054#if EV_USE_INOTIFY
1055 infy_fork (EV_A);
1001#endif 1056#endif
1002 1057
1003 if (ev_is_active (&sigev)) 1058 if (ev_is_active (&sigev))
1004 { 1059 {
1005 /* default loop */ 1060 /* default loop */
… …
1121 postfork = 1; 1176 postfork = 1;
1122} 1177}
1123 1178
1124/*****************************************************************************/ 1179/*****************************************************************************/
1125 1180
1126int inline_size 1181void
1127any_pending (EV_P) 1182ev_invoke (EV_P_ void *w, int revents)
1128{ 1183{
1129 int pri; 1184 EV_CB_INVOKE ((W)w, revents);
1130
1131 for (pri = NUMPRI; pri--; )
1132 if (pendingcnt [pri])
1133 return 1;
1134
1135 return 0;
1136} 1185}
1137 1186
1138void inline_speed 1187void inline_speed
1139call_pending (EV_P) 1188call_pending (EV_P)
1140{ 1189{
… …
1193 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1242 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1194 1243
1195 /* first reschedule or stop timer */ 1244 /* first reschedule or stop timer */
1196 if (w->reschedule_cb) 1245 if (w->reschedule_cb)
1197 { 1246 {
1198 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1247 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1199 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1248 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1200 downheap ((WT *)periodics, periodiccnt, 0); 1249 downheap ((WT *)periodics, periodiccnt, 0);
1201 } 1250 }
1202 else if (w->interval) 1251 else if (w->interval)
1203 { 1252 {
1204 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1253 ((WT)w)->at = w->offset + floor ((ev_rt_now + TIME_EPSILON - w->offset) / w->interval + 1.) * w->interval;
1205 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1206 downheap ((WT *)periodics, periodiccnt, 0); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1207 } 1256 }
1208 else 1257 else
1209 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1223 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1224 1273
1225 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1226 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1227 else if (w->interval) 1276 else if (w->interval)
1228 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1229 } 1278 }
1230 1279
1231 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1232 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1233 downheap ((WT *)periodics, periodiccnt, i); 1282 downheap ((WT *)periodics, periodiccnt, i);
1234} 1283}
1235#endif 1284#endif
1236 1285
1286#if EV_IDLE_ENABLE
1287void inline_size
1288idle_reify (EV_P)
1289{
1290 if (expect_false (idleall))
1291 {
1292 int pri;
1293
1294 for (pri = NUMPRI; pri--; )
1295 {
1296 if (pendingcnt [pri])
1297 break;
1298
1299 if (idlecnt [pri])
1300 {
1301 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1302 break;
1303 }
1304 }
1305 }
1306}
1307#endif
1308
1237int inline_size 1309int inline_size
1238time_update_monotonic (EV_P) 1310time_update_monotonic (EV_P)
1239{ 1311{
1240 mn_now = get_clock (); 1312 mn_now = get_clock ();
1241 1313
… …
1265 ev_tstamp odiff = rtmn_diff; 1337 ev_tstamp odiff = rtmn_diff;
1266 1338
1267 /* loop a few times, before making important decisions. 1339 /* loop a few times, before making important decisions.
1268 * on the choice of "4": one iteration isn't enough, 1340 * on the choice of "4": one iteration isn't enough,
1269 * in case we get preempted during the calls to 1341 * in case we get preempted during the calls to
1270 * ev_time and get_clock. a second call is almost guarenteed 1342 * ev_time and get_clock. a second call is almost guaranteed
1271 * to succeed in that case, though. and looping a few more times 1343 * to succeed in that case, though. and looping a few more times
1272 * doesn't hurt either as we only do this on time-jumps or 1344 * doesn't hurt either as we only do this on time-jumps or
1273 * in the unlikely event of getting preempted here. 1345 * in the unlikely event of having been preempted here.
1274 */ 1346 */
1275 for (i = 4; --i; ) 1347 for (i = 4; --i; )
1276 { 1348 {
1277 rtmn_diff = ev_rt_now - mn_now; 1349 rtmn_diff = ev_rt_now - mn_now;
1278 1350
… …
1300 { 1372 {
1301#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1302 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1303#endif 1375#endif
1304 1376
1305 /* adjust timers. this is easy, as the offset is the same for all */ 1377 /* adjust timers. this is easy, as the offset is the same for all of them */
1306 for (i = 0; i < timercnt; ++i) 1378 for (i = 0; i < timercnt; ++i)
1307 ((WT)timers [i])->at += ev_rt_now - mn_now; 1379 ((WT)timers [i])->at += ev_rt_now - mn_now;
1308 } 1380 }
1309 1381
1310 mn_now = ev_rt_now; 1382 mn_now = ev_rt_now;
… …
1330{ 1402{
1331 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1403 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1332 ? EVUNLOOP_ONE 1404 ? EVUNLOOP_ONE
1333 : EVUNLOOP_CANCEL; 1405 : EVUNLOOP_CANCEL;
1334 1406
1335 while (activecnt) 1407 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1408
1409 do
1336 { 1410 {
1337 /* we might have forked, so reify kernel state if necessary */ 1411#ifndef _WIN32
1412 if (expect_false (curpid)) /* penalise the forking check even more */
1413 if (expect_false (getpid () != curpid))
1414 {
1415 curpid = getpid ();
1416 postfork = 1;
1417 }
1418#endif
1419
1338 #if EV_FORK_ENABLE 1420#if EV_FORK_ENABLE
1421 /* we might have forked, so queue fork handlers */
1339 if (expect_false (postfork)) 1422 if (expect_false (postfork))
1340 if (forkcnt) 1423 if (forkcnt)
1341 { 1424 {
1342 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1425 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1343 call_pending (EV_A); 1426 call_pending (EV_A);
1344 } 1427 }
1345 #endif 1428#endif
1346 1429
1347 /* queue check watchers (and execute them) */ 1430 /* queue prepare watchers (and execute them) */
1348 if (expect_false (preparecnt)) 1431 if (expect_false (preparecnt))
1349 { 1432 {
1350 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1433 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1351 call_pending (EV_A); 1434 call_pending (EV_A);
1352 } 1435 }
1353 1436
1437 if (expect_false (!activecnt))
1438 break;
1439
1354 /* we might have forked, so reify kernel state if necessary */ 1440 /* we might have forked, so reify kernel state if necessary */
1355 if (expect_false (postfork)) 1441 if (expect_false (postfork))
1356 loop_fork (EV_A); 1442 loop_fork (EV_A);
1357 1443
1358 /* update fd-related kernel structures */ 1444 /* update fd-related kernel structures */
1359 fd_reify (EV_A); 1445 fd_reify (EV_A);
1360 1446
1361 /* calculate blocking time */ 1447 /* calculate blocking time */
1362 { 1448 {
1363 double block; 1449 ev_tstamp block;
1364 1450
1365 if (flags & EVLOOP_NONBLOCK || idlecnt) 1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1366 block = 0.; /* do not block at all */ 1452 block = 0.; /* do not block at all */
1367 else 1453 else
1368 { 1454 {
1369 /* update time to cancel out callback processing overhead */ 1455 /* update time to cancel out callback processing overhead */
1370#if EV_USE_MONOTONIC 1456#if EV_USE_MONOTONIC
… …
1394#endif 1480#endif
1395 1481
1396 if (expect_false (block < 0.)) block = 0.; 1482 if (expect_false (block < 0.)) block = 0.;
1397 } 1483 }
1398 1484
1485 ++loop_count;
1399 backend_poll (EV_A_ block); 1486 backend_poll (EV_A_ block);
1400 } 1487 }
1401 1488
1402 /* update ev_rt_now, do magic */ 1489 /* update ev_rt_now, do magic */
1403 time_update (EV_A); 1490 time_update (EV_A);
… …
1406 timers_reify (EV_A); /* relative timers called last */ 1493 timers_reify (EV_A); /* relative timers called last */
1407#if EV_PERIODIC_ENABLE 1494#if EV_PERIODIC_ENABLE
1408 periodics_reify (EV_A); /* absolute timers called first */ 1495 periodics_reify (EV_A); /* absolute timers called first */
1409#endif 1496#endif
1410 1497
1498#if EV_IDLE_ENABLE
1411 /* queue idle watchers unless other events are pending */ 1499 /* queue idle watchers unless other events are pending */
1412 if (idlecnt && !any_pending (EV_A)) 1500 idle_reify (EV_A);
1413 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1501#endif
1414 1502
1415 /* queue check watchers, to be executed first */ 1503 /* queue check watchers, to be executed first */
1416 if (expect_false (checkcnt)) 1504 if (expect_false (checkcnt))
1417 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1505 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1418 1506
1419 call_pending (EV_A); 1507 call_pending (EV_A);
1420 1508
1421 if (expect_false (loop_done))
1422 break;
1423 } 1509 }
1510 while (expect_true (activecnt && !loop_done));
1424 1511
1425 if (loop_done == EVUNLOOP_ONE) 1512 if (loop_done == EVUNLOOP_ONE)
1426 loop_done = EVUNLOOP_CANCEL; 1513 loop_done = EVUNLOOP_CANCEL;
1427} 1514}
1428 1515
… …
1455 head = &(*head)->next; 1542 head = &(*head)->next;
1456 } 1543 }
1457} 1544}
1458 1545
1459void inline_speed 1546void inline_speed
1460ev_clear_pending (EV_P_ W w) 1547clear_pending (EV_P_ W w)
1461{ 1548{
1462 if (w->pending) 1549 if (w->pending)
1463 { 1550 {
1464 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1551 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1465 w->pending = 0; 1552 w->pending = 0;
1466 } 1553 }
1467} 1554}
1468 1555
1556int
1557ev_clear_pending (EV_P_ void *w)
1558{
1559 W w_ = (W)w;
1560 int pending = w_->pending;
1561
1562 if (expect_true (pending))
1563 {
1564 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1565 w_->pending = 0;
1566 p->w = 0;
1567 return p->events;
1568 }
1569 else
1570 return 0;
1571}
1572
1573void inline_size
1574pri_adjust (EV_P_ W w)
1575{
1576 int pri = w->priority;
1577 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1578 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1579 w->priority = pri;
1580}
1581
1469void inline_speed 1582void inline_speed
1470ev_start (EV_P_ W w, int active) 1583ev_start (EV_P_ W w, int active)
1471{ 1584{
1472 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1585 pri_adjust (EV_A_ w);
1473 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1474
1475 w->active = active; 1586 w->active = active;
1476 ev_ref (EV_A); 1587 ev_ref (EV_A);
1477} 1588}
1478 1589
1479void inline_size 1590void inline_size
… …
1483 w->active = 0; 1594 w->active = 0;
1484} 1595}
1485 1596
1486/*****************************************************************************/ 1597/*****************************************************************************/
1487 1598
1488void 1599void noinline
1489ev_io_start (EV_P_ ev_io *w) 1600ev_io_start (EV_P_ ev_io *w)
1490{ 1601{
1491 int fd = w->fd; 1602 int fd = w->fd;
1492 1603
1493 if (expect_false (ev_is_active (w))) 1604 if (expect_false (ev_is_active (w)))
… …
1500 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1611 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1501 1612
1502 fd_change (EV_A_ fd); 1613 fd_change (EV_A_ fd);
1503} 1614}
1504 1615
1505void 1616void noinline
1506ev_io_stop (EV_P_ ev_io *w) 1617ev_io_stop (EV_P_ ev_io *w)
1507{ 1618{
1508 ev_clear_pending (EV_A_ (W)w); 1619 clear_pending (EV_A_ (W)w);
1509 if (expect_false (!ev_is_active (w))) 1620 if (expect_false (!ev_is_active (w)))
1510 return; 1621 return;
1511 1622
1512 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1513 1624
… …
1515 ev_stop (EV_A_ (W)w); 1626 ev_stop (EV_A_ (W)w);
1516 1627
1517 fd_change (EV_A_ w->fd); 1628 fd_change (EV_A_ w->fd);
1518} 1629}
1519 1630
1520void 1631void noinline
1521ev_timer_start (EV_P_ ev_timer *w) 1632ev_timer_start (EV_P_ ev_timer *w)
1522{ 1633{
1523 if (expect_false (ev_is_active (w))) 1634 if (expect_false (ev_is_active (w)))
1524 return; 1635 return;
1525 1636
… …
1533 upheap ((WT *)timers, timercnt - 1); 1644 upheap ((WT *)timers, timercnt - 1);
1534 1645
1535 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1536} 1647}
1537 1648
1538void 1649void noinline
1539ev_timer_stop (EV_P_ ev_timer *w) 1650ev_timer_stop (EV_P_ ev_timer *w)
1540{ 1651{
1541 ev_clear_pending (EV_A_ (W)w); 1652 clear_pending (EV_A_ (W)w);
1542 if (expect_false (!ev_is_active (w))) 1653 if (expect_false (!ev_is_active (w)))
1543 return; 1654 return;
1544 1655
1545 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1546 1657
… …
1557 ((WT)w)->at -= mn_now; 1668 ((WT)w)->at -= mn_now;
1558 1669
1559 ev_stop (EV_A_ (W)w); 1670 ev_stop (EV_A_ (W)w);
1560} 1671}
1561 1672
1562void 1673void noinline
1563ev_timer_again (EV_P_ ev_timer *w) 1674ev_timer_again (EV_P_ ev_timer *w)
1564{ 1675{
1565 if (ev_is_active (w)) 1676 if (ev_is_active (w))
1566 { 1677 {
1567 if (w->repeat) 1678 if (w->repeat)
… …
1578 ev_timer_start (EV_A_ w); 1689 ev_timer_start (EV_A_ w);
1579 } 1690 }
1580} 1691}
1581 1692
1582#if EV_PERIODIC_ENABLE 1693#if EV_PERIODIC_ENABLE
1583void 1694void noinline
1584ev_periodic_start (EV_P_ ev_periodic *w) 1695ev_periodic_start (EV_P_ ev_periodic *w)
1585{ 1696{
1586 if (expect_false (ev_is_active (w))) 1697 if (expect_false (ev_is_active (w)))
1587 return; 1698 return;
1588 1699
… …
1590 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1701 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1591 else if (w->interval) 1702 else if (w->interval)
1592 { 1703 {
1593 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1704 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1594 /* this formula differs from the one in periodic_reify because we do not always round up */ 1705 /* this formula differs from the one in periodic_reify because we do not always round up */
1595 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1706 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1596 } 1707 }
1708 else
1709 ((WT)w)->at = w->offset;
1597 1710
1598 ev_start (EV_A_ (W)w, ++periodiccnt); 1711 ev_start (EV_A_ (W)w, ++periodiccnt);
1599 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1712 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1600 periodics [periodiccnt - 1] = w; 1713 periodics [periodiccnt - 1] = w;
1601 upheap ((WT *)periodics, periodiccnt - 1); 1714 upheap ((WT *)periodics, periodiccnt - 1);
1602 1715
1603 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1604} 1717}
1605 1718
1606void 1719void noinline
1607ev_periodic_stop (EV_P_ ev_periodic *w) 1720ev_periodic_stop (EV_P_ ev_periodic *w)
1608{ 1721{
1609 ev_clear_pending (EV_A_ (W)w); 1722 clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w))) 1723 if (expect_false (!ev_is_active (w)))
1611 return; 1724 return;
1612 1725
1613 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1614 1727
… …
1623 } 1736 }
1624 1737
1625 ev_stop (EV_A_ (W)w); 1738 ev_stop (EV_A_ (W)w);
1626} 1739}
1627 1740
1628void 1741void noinline
1629ev_periodic_again (EV_P_ ev_periodic *w) 1742ev_periodic_again (EV_P_ ev_periodic *w)
1630{ 1743{
1631 /* TODO: use adjustheap and recalculation */ 1744 /* TODO: use adjustheap and recalculation */
1632 ev_periodic_stop (EV_A_ w); 1745 ev_periodic_stop (EV_A_ w);
1633 ev_periodic_start (EV_A_ w); 1746 ev_periodic_start (EV_A_ w);
… …
1636 1749
1637#ifndef SA_RESTART 1750#ifndef SA_RESTART
1638# define SA_RESTART 0 1751# define SA_RESTART 0
1639#endif 1752#endif
1640 1753
1641void 1754void noinline
1642ev_signal_start (EV_P_ ev_signal *w) 1755ev_signal_start (EV_P_ ev_signal *w)
1643{ 1756{
1644#if EV_MULTIPLICITY 1757#if EV_MULTIPLICITY
1645 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1758 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1646#endif 1759#endif
… …
1665 sigaction (w->signum, &sa, 0); 1778 sigaction (w->signum, &sa, 0);
1666#endif 1779#endif
1667 } 1780 }
1668} 1781}
1669 1782
1670void 1783void noinline
1671ev_signal_stop (EV_P_ ev_signal *w) 1784ev_signal_stop (EV_P_ ev_signal *w)
1672{ 1785{
1673 ev_clear_pending (EV_A_ (W)w); 1786 clear_pending (EV_A_ (W)w);
1674 if (expect_false (!ev_is_active (w))) 1787 if (expect_false (!ev_is_active (w)))
1675 return; 1788 return;
1676 1789
1677 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1790 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1678 ev_stop (EV_A_ (W)w); 1791 ev_stop (EV_A_ (W)w);
… …
1695} 1808}
1696 1809
1697void 1810void
1698ev_child_stop (EV_P_ ev_child *w) 1811ev_child_stop (EV_P_ ev_child *w)
1699{ 1812{
1700 ev_clear_pending (EV_A_ (W)w); 1813 clear_pending (EV_A_ (W)w);
1701 if (expect_false (!ev_is_active (w))) 1814 if (expect_false (!ev_is_active (w)))
1702 return; 1815 return;
1703 1816
1704 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1817 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1705 ev_stop (EV_A_ (W)w); 1818 ev_stop (EV_A_ (W)w);
… …
1713# endif 1826# endif
1714 1827
1715#define DEF_STAT_INTERVAL 5.0074891 1828#define DEF_STAT_INTERVAL 5.0074891
1716#define MIN_STAT_INTERVAL 0.1074891 1829#define MIN_STAT_INTERVAL 0.1074891
1717 1830
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 1831static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719 1832
1720#if EV_USE_INOTIFY 1833#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE 8192 1834# define EV_INOTIFY_BUFSIZE 8192
1722 1835
1723static void noinline 1836static void noinline
… …
1831 ev_set_priority (&fs_w, EV_MAXPRI); 1944 ev_set_priority (&fs_w, EV_MAXPRI);
1832 ev_io_start (EV_A_ &fs_w); 1945 ev_io_start (EV_A_ &fs_w);
1833 } 1946 }
1834} 1947}
1835 1948
1949void inline_size
1950infy_fork (EV_P)
1951{
1952 int slot;
1953
1954 if (fs_fd < 0)
1955 return;
1956
1957 close (fs_fd);
1958 fs_fd = inotify_init ();
1959
1960 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1961 {
1962 WL w_ = fs_hash [slot].head;
1963 fs_hash [slot].head = 0;
1964
1965 while (w_)
1966 {
1967 ev_stat *w = (ev_stat *)w_;
1968 w_ = w_->next; /* lets us add this watcher */
1969
1970 w->wd = -1;
1971
1972 if (fs_fd >= 0)
1973 infy_add (EV_A_ w); /* re-add, no matter what */
1974 else
1975 ev_timer_start (EV_A_ &w->timer);
1976 }
1977
1978 }
1979}
1980
1836#endif 1981#endif
1837 1982
1838void 1983void
1839ev_stat_stat (EV_P_ ev_stat *w) 1984ev_stat_stat (EV_P_ ev_stat *w)
1840{ 1985{
… …
1842 w->attr.st_nlink = 0; 1987 w->attr.st_nlink = 0;
1843 else if (!w->attr.st_nlink) 1988 else if (!w->attr.st_nlink)
1844 w->attr.st_nlink = 1; 1989 w->attr.st_nlink = 1;
1845} 1990}
1846 1991
1847void noinline 1992static void noinline
1848stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1993stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1849{ 1994{
1850 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1995 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1851 1996
1852 /* we copy this here each the time so that */ 1997 /* we copy this here each the time so that */
1853 /* prev has the old value when the callback gets invoked */ 1998 /* prev has the old value when the callback gets invoked */
1854 w->prev = w->attr; 1999 w->prev = w->attr;
1855 ev_stat_stat (EV_A_ w); 2000 ev_stat_stat (EV_A_ w);
1856 2001
1857 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2002 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2003 if (
2004 w->prev.st_dev != w->attr.st_dev
2005 || w->prev.st_ino != w->attr.st_ino
2006 || w->prev.st_mode != w->attr.st_mode
2007 || w->prev.st_nlink != w->attr.st_nlink
2008 || w->prev.st_uid != w->attr.st_uid
2009 || w->prev.st_gid != w->attr.st_gid
2010 || w->prev.st_rdev != w->attr.st_rdev
2011 || w->prev.st_size != w->attr.st_size
2012 || w->prev.st_atime != w->attr.st_atime
2013 || w->prev.st_mtime != w->attr.st_mtime
2014 || w->prev.st_ctime != w->attr.st_ctime
1858 { 2015 ) {
1859 #if EV_USE_INOTIFY 2016 #if EV_USE_INOTIFY
1860 infy_del (EV_A_ w); 2017 infy_del (EV_A_ w);
1861 infy_add (EV_A_ w); 2018 infy_add (EV_A_ w);
1862 ev_stat_stat (EV_A_ w); /* avoid race... */ 2019 ev_stat_stat (EV_A_ w); /* avoid race... */
1863 #endif 2020 #endif
… …
1897} 2054}
1898 2055
1899void 2056void
1900ev_stat_stop (EV_P_ ev_stat *w) 2057ev_stat_stop (EV_P_ ev_stat *w)
1901{ 2058{
1902 ev_clear_pending (EV_A_ (W)w); 2059 clear_pending (EV_A_ (W)w);
1903 if (expect_false (!ev_is_active (w))) 2060 if (expect_false (!ev_is_active (w)))
1904 return; 2061 return;
1905 2062
1906#if EV_USE_INOTIFY 2063#if EV_USE_INOTIFY
1907 infy_del (EV_A_ w); 2064 infy_del (EV_A_ w);
… …
1910 2067
1911 ev_stop (EV_A_ (W)w); 2068 ev_stop (EV_A_ (W)w);
1912} 2069}
1913#endif 2070#endif
1914 2071
2072#if EV_IDLE_ENABLE
1915void 2073void
1916ev_idle_start (EV_P_ ev_idle *w) 2074ev_idle_start (EV_P_ ev_idle *w)
1917{ 2075{
1918 if (expect_false (ev_is_active (w))) 2076 if (expect_false (ev_is_active (w)))
1919 return; 2077 return;
1920 2078
2079 pri_adjust (EV_A_ (W)w);
2080
2081 {
2082 int active = ++idlecnt [ABSPRI (w)];
2083
2084 ++idleall;
1921 ev_start (EV_A_ (W)w, ++idlecnt); 2085 ev_start (EV_A_ (W)w, active);
2086
1922 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2087 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1923 idles [idlecnt - 1] = w; 2088 idles [ABSPRI (w)][active - 1] = w;
2089 }
1924} 2090}
1925 2091
1926void 2092void
1927ev_idle_stop (EV_P_ ev_idle *w) 2093ev_idle_stop (EV_P_ ev_idle *w)
1928{ 2094{
1929 ev_clear_pending (EV_A_ (W)w); 2095 clear_pending (EV_A_ (W)w);
1930 if (expect_false (!ev_is_active (w))) 2096 if (expect_false (!ev_is_active (w)))
1931 return; 2097 return;
1932 2098
1933 { 2099 {
1934 int active = ((W)w)->active; 2100 int active = ((W)w)->active;
1935 idles [active - 1] = idles [--idlecnt]; 2101
2102 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1936 ((W)idles [active - 1])->active = active; 2103 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2104
2105 ev_stop (EV_A_ (W)w);
2106 --idleall;
1937 } 2107 }
1938
1939 ev_stop (EV_A_ (W)w);
1940} 2108}
2109#endif
1941 2110
1942void 2111void
1943ev_prepare_start (EV_P_ ev_prepare *w) 2112ev_prepare_start (EV_P_ ev_prepare *w)
1944{ 2113{
1945 if (expect_false (ev_is_active (w))) 2114 if (expect_false (ev_is_active (w)))
… …
1951} 2120}
1952 2121
1953void 2122void
1954ev_prepare_stop (EV_P_ ev_prepare *w) 2123ev_prepare_stop (EV_P_ ev_prepare *w)
1955{ 2124{
1956 ev_clear_pending (EV_A_ (W)w); 2125 clear_pending (EV_A_ (W)w);
1957 if (expect_false (!ev_is_active (w))) 2126 if (expect_false (!ev_is_active (w)))
1958 return; 2127 return;
1959 2128
1960 { 2129 {
1961 int active = ((W)w)->active; 2130 int active = ((W)w)->active;
… …
1978} 2147}
1979 2148
1980void 2149void
1981ev_check_stop (EV_P_ ev_check *w) 2150ev_check_stop (EV_P_ ev_check *w)
1982{ 2151{
1983 ev_clear_pending (EV_A_ (W)w); 2152 clear_pending (EV_A_ (W)w);
1984 if (expect_false (!ev_is_active (w))) 2153 if (expect_false (!ev_is_active (w)))
1985 return; 2154 return;
1986 2155
1987 { 2156 {
1988 int active = ((W)w)->active; 2157 int active = ((W)w)->active;
… …
2030} 2199}
2031 2200
2032void 2201void
2033ev_embed_stop (EV_P_ ev_embed *w) 2202ev_embed_stop (EV_P_ ev_embed *w)
2034{ 2203{
2035 ev_clear_pending (EV_A_ (W)w); 2204 clear_pending (EV_A_ (W)w);
2036 if (expect_false (!ev_is_active (w))) 2205 if (expect_false (!ev_is_active (w)))
2037 return; 2206 return;
2038 2207
2039 ev_io_stop (EV_A_ &w->io); 2208 ev_io_stop (EV_A_ &w->io);
2040 2209
… …
2055} 2224}
2056 2225
2057void 2226void
2058ev_fork_stop (EV_P_ ev_fork *w) 2227ev_fork_stop (EV_P_ ev_fork *w)
2059{ 2228{
2060 ev_clear_pending (EV_A_ (W)w); 2229 clear_pending (EV_A_ (W)w);
2061 if (expect_false (!ev_is_active (w))) 2230 if (expect_false (!ev_is_active (w)))
2062 return; 2231 return;
2063 2232
2064 { 2233 {
2065 int active = ((W)w)->active; 2234 int active = ((W)w)->active;

Diff Legend

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