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

Comparing libev/ev.c (file contents):
Revision 1.251 by root, Thu May 22 03:42:34 2008 UTC vs.
Revision 1.270 by root, Thu Oct 30 13:07:10 2008 UTC

… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
277# include <sys/select.h> 286# include <sys/select.h>
278# endif 287# endif
279#endif 288#endif
280 289
281#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
282# include <sys/inotify.h> 292# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0
297# endif
283#endif 298#endif
284 299
285#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 301# include <winsock.h>
287#endif 302#endif
… …
373{ 388{
374 syserr_cb = cb; 389 syserr_cb = cb;
375} 390}
376 391
377static void noinline 392static void noinline
378syserr (const char *msg) 393ev_syserr (const char *msg)
379{ 394{
380 if (!msg) 395 if (!msg)
381 msg = "(libev) system error"; 396 msg = "(libev) system error";
382 397
383 if (syserr_cb) 398 if (syserr_cb)
… …
434typedef struct 449typedef struct
435{ 450{
436 WL head; 451 WL head;
437 unsigned char events; 452 unsigned char events;
438 unsigned char reify; 453 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused;
456#if EV_USE_EPOLL
457 unsigned int egen; /* generation counter to counter epoll bugs */
458#endif
439#if EV_SELECT_IS_WINSOCKET 459#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 460 SOCKET handle;
441#endif 461#endif
442} ANFD; 462} ANFD;
443 463
… …
556 struct timeval tv; 576 struct timeval tv;
557 577
558 tv.tv_sec = (time_t)delay; 578 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 579 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 580
581 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
582 /* somehting nto guaranteed by newer posix versions, but guaranteed */
583 /* by older ones */
561 select (0, 0, 0, 0, &tv); 584 select (0, 0, 0, 0, &tv);
562#endif 585#endif
563 } 586 }
564} 587}
565 588
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 615array_realloc (int elem, void *base, int *cur, int cnt)
593{ 616{
594 *cur = array_nextsize (elem, *cur, cnt); 617 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 618 return ev_realloc (base, elem * *cur);
596} 619}
620
621#define array_init_zero(base,count) \
622 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 623
598#define array_needsize(type,base,cur,cnt,init) \ 624#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 625 if (expect_false ((cnt) > (cur))) \
600 { \ 626 { \
601 int ocur_ = (cur); \ 627 int ocur_ = (cur); \
… …
645 ev_feed_event (EV_A_ events [i], type); 671 ev_feed_event (EV_A_ events [i], type);
646} 672}
647 673
648/*****************************************************************************/ 674/*****************************************************************************/
649 675
650void inline_size
651anfds_init (ANFD *base, int count)
652{
653 while (count--)
654 {
655 base->head = 0;
656 base->events = EV_NONE;
657 base->reify = 0;
658
659 ++base;
660 }
661}
662
663void inline_speed 676void inline_speed
664fd_event (EV_P_ int fd, int revents) 677fd_event (EV_P_ int fd, int revents)
665{ 678{
666 ANFD *anfd = anfds + fd; 679 ANFD *anfd = anfds + fd;
667 ev_io *w; 680 ev_io *w;
… …
699 events |= (unsigned char)w->events; 712 events |= (unsigned char)w->events;
700 713
701#if EV_SELECT_IS_WINSOCKET 714#if EV_SELECT_IS_WINSOCKET
702 if (events) 715 if (events)
703 { 716 {
704 unsigned long argp; 717 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 718 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 719 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 720 #else
708 anfd->handle = _get_osfhandle (fd); 721 anfd->handle = _get_osfhandle (fd);
709 #endif 722 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 723 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 724 }
712#endif 725#endif
713 726
714 { 727 {
715 unsigned char o_events = anfd->events; 728 unsigned char o_events = anfd->events;
… …
768{ 781{
769 int fd; 782 int fd;
770 783
771 for (fd = 0; fd < anfdmax; ++fd) 784 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 785 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 786 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 787 fd_kill (EV_A_ fd);
775} 788}
776 789
777/* called on ENOMEM in select/poll to kill some fds and retry */ 790/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 791static void noinline
… …
796 809
797 for (fd = 0; fd < anfdmax; ++fd) 810 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 811 if (anfds [fd].events)
799 { 812 {
800 anfds [fd].events = 0; 813 anfds [fd].events = 0;
814 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 815 fd_change (EV_A_ fd, EV_IOFDSET | 1);
802 } 816 }
803} 817}
804 818
805/*****************************************************************************/ 819/*****************************************************************************/
… …
957static ANSIG *signals; 971static ANSIG *signals;
958static int signalmax; 972static int signalmax;
959 973
960static EV_ATOMIC_T gotsig; 974static EV_ATOMIC_T gotsig;
961 975
962void inline_size
963signals_init (ANSIG *base, int count)
964{
965 while (count--)
966 {
967 base->head = 0;
968 base->gotsig = 0;
969
970 ++base;
971 }
972}
973
974/*****************************************************************************/ 976/*****************************************************************************/
975 977
976void inline_speed 978void inline_speed
977fd_intern (int fd) 979fd_intern (int fd)
978{ 980{
979#ifdef _WIN32 981#ifdef _WIN32
980 int arg = 1; 982 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 983 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 984#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 985 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 986 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 987#endif
… …
999 } 1001 }
1000 else 1002 else
1001#endif 1003#endif
1002 { 1004 {
1003 while (pipe (evpipe)) 1005 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1006 ev_syserr ("(libev) error creating signal/async pipe");
1005 1007
1006 fd_intern (evpipe [0]); 1008 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1009 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1010 ev_io_set (&pipeev, evpipe [0], EV_READ);
1009 } 1011 }
… …
1499{ 1501{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1502 postfork = 1; /* must be in line with ev_default_fork */
1501} 1503}
1502 1504
1503#if EV_VERIFY 1505#if EV_VERIFY
1504void noinline 1506static void noinline
1505verify_watcher (EV_P_ W w) 1507verify_watcher (EV_P_ W w)
1506{ 1508{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1509 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1510
1509 if (w->pending) 1511 if (w->pending)
… …
1568 1570
1569 for (i = NUMPRI; i--; ) 1571 for (i = NUMPRI; i--; )
1570 { 1572 {
1571 assert (pendingmax [i] >= pendingcnt [i]); 1573 assert (pendingmax [i] >= pendingcnt [i]);
1572#if EV_IDLE_ENABLE 1574#if EV_IDLE_ENABLE
1575 assert (idleall >= 0);
1573 assert (idlemax [i] >= idlecnt [i]); 1576 assert (idlemax [i] >= idlecnt [i]);
1574 array_verify (EV_A_ (W *)idles [i], idlecnt [i]); 1577 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575#endif 1578#endif
1576 } 1579 }
1577 1580
… …
1639{ 1642{
1640#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1641 struct ev_loop *loop = ev_default_loop_ptr; 1644 struct ev_loop *loop = ev_default_loop_ptr;
1642#endif 1645#endif
1643 1646
1647 ev_default_loop_ptr = 0;
1648
1644#ifndef _WIN32 1649#ifndef _WIN32
1645 ev_ref (EV_A); /* child watcher */ 1650 ev_ref (EV_A); /* child watcher */
1646 ev_signal_stop (EV_A_ &childev); 1651 ev_signal_stop (EV_A_ &childev);
1647#endif 1652#endif
1648 1653
… …
1654{ 1659{
1655#if EV_MULTIPLICITY 1660#if EV_MULTIPLICITY
1656 struct ev_loop *loop = ev_default_loop_ptr; 1661 struct ev_loop *loop = ev_default_loop_ptr;
1657#endif 1662#endif
1658 1663
1659 if (backend)
1660 postfork = 1; /* must be in line with ev_loop_fork */ 1664 postfork = 1; /* must be in line with ev_loop_fork */
1661} 1665}
1662 1666
1663/*****************************************************************************/ 1667/*****************************************************************************/
1664 1668
1665void 1669void
… …
1896ev_unref (EV_P) 1900ev_unref (EV_P)
1897{ 1901{
1898 --activecnt; 1902 --activecnt;
1899} 1903}
1900 1904
1905void
1906ev_now_update (EV_P)
1907{
1908 time_update (EV_A_ 1e100);
1909}
1910
1901static int loop_done; 1911static int loop_done;
1902 1912
1903void 1913void
1904ev_loop (EV_P_ int flags) 1914ev_loop (EV_P_ int flags)
1905{ 1915{
… …
2114 2124
2115 if (expect_false (ev_is_active (w))) 2125 if (expect_false (ev_is_active (w)))
2116 return; 2126 return;
2117 2127
2118 assert (("ev_io_start called with negative fd", fd >= 0)); 2128 assert (("ev_io_start called with negative fd", fd >= 0));
2129 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2119 2130
2120 EV_FREQUENT_CHECK; 2131 EV_FREQUENT_CHECK;
2121 2132
2122 ev_start (EV_A_ (W)w, 1); 2133 ev_start (EV_A_ (W)w, 1);
2123 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2134 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2124 wlist_add (&anfds[fd].head, (WL)w); 2135 wlist_add (&anfds[fd].head, (WL)w);
2125 2136
2126 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2137 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2127 w->events &= ~EV_IOFDSET; 2138 w->events &= ~EV_IOFDSET;
2128 2139
… …
2320 sigset_t full, prev; 2331 sigset_t full, prev;
2321 sigfillset (&full); 2332 sigfillset (&full);
2322 sigprocmask (SIG_SETMASK, &full, &prev); 2333 sigprocmask (SIG_SETMASK, &full, &prev);
2323#endif 2334#endif
2324 2335
2325 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2336 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2326 2337
2327#ifndef _WIN32 2338#ifndef _WIN32
2328 sigprocmask (SIG_SETMASK, &prev, 0); 2339 sigprocmask (SIG_SETMASK, &prev, 0);
2329#endif 2340#endif
2330 } 2341 }
… …
2472 2483
2473static void noinline 2484static void noinline
2474infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2485infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2475{ 2486{
2476 if (slot < 0) 2487 if (slot < 0)
2477 /* overflow, need to check for all hahs slots */ 2488 /* overflow, need to check for all hash slots */
2478 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2489 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2479 infy_wd (EV_A_ slot, wd, ev); 2490 infy_wd (EV_A_ slot, wd, ev);
2480 else 2491 else
2481 { 2492 {
2482 WL w_; 2493 WL w_;
… …
2516infy_init (EV_P) 2527infy_init (EV_P)
2517{ 2528{
2518 if (fs_fd != -2) 2529 if (fs_fd != -2)
2519 return; 2530 return;
2520 2531
2532 /* kernels < 2.6.25 are borked
2533 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2534 */
2535 {
2536 struct utsname buf;
2537 int major, minor, micro;
2538
2539 fs_fd = -1;
2540
2541 if (uname (&buf))
2542 return;
2543
2544 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2545 return;
2546
2547 if (major < 2
2548 || (major == 2 && minor < 6)
2549 || (major == 2 && minor == 6 && micro < 25))
2550 return;
2551 }
2552
2521 fs_fd = inotify_init (); 2553 fs_fd = inotify_init ();
2522 2554
2523 if (fs_fd >= 0) 2555 if (fs_fd >= 0)
2524 { 2556 {
2525 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2557 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2554 if (fs_fd >= 0) 2586 if (fs_fd >= 0)
2555 infy_add (EV_A_ w); /* re-add, no matter what */ 2587 infy_add (EV_A_ w); /* re-add, no matter what */
2556 else 2588 else
2557 ev_timer_start (EV_A_ &w->timer); 2589 ev_timer_start (EV_A_ &w->timer);
2558 } 2590 }
2559
2560 } 2591 }
2561} 2592}
2562 2593
2594#endif
2595
2596#ifdef _WIN32
2597# define EV_LSTAT(p,b) _stati64 (p, b)
2598#else
2599# define EV_LSTAT(p,b) lstat (p, b)
2563#endif 2600#endif
2564 2601
2565void 2602void
2566ev_stat_stat (EV_P_ ev_stat *w) 2603ev_stat_stat (EV_P_ ev_stat *w)
2567{ 2604{
… …
2594 || w->prev.st_atime != w->attr.st_atime 2631 || w->prev.st_atime != w->attr.st_atime
2595 || w->prev.st_mtime != w->attr.st_mtime 2632 || w->prev.st_mtime != w->attr.st_mtime
2596 || w->prev.st_ctime != w->attr.st_ctime 2633 || w->prev.st_ctime != w->attr.st_ctime
2597 ) { 2634 ) {
2598 #if EV_USE_INOTIFY 2635 #if EV_USE_INOTIFY
2636 if (fs_fd >= 0)
2637 {
2599 infy_del (EV_A_ w); 2638 infy_del (EV_A_ w);
2600 infy_add (EV_A_ w); 2639 infy_add (EV_A_ w);
2601 ev_stat_stat (EV_A_ w); /* avoid race... */ 2640 ev_stat_stat (EV_A_ w); /* avoid race... */
2641 }
2602 #endif 2642 #endif
2603 2643
2604 ev_feed_event (EV_A_ w, EV_STAT); 2644 ev_feed_event (EV_A_ w, EV_STAT);
2605 } 2645 }
2606} 2646}
… …
2808 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2848 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2809 } 2849 }
2810 } 2850 }
2811} 2851}
2812 2852
2853static void
2854embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2855{
2856 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2857
2858 {
2859 struct ev_loop *loop = w->other;
2860
2861 ev_loop_fork (EV_A);
2862 }
2863}
2864
2813#if 0 2865#if 0
2814static void 2866static void
2815embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2867embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2816{ 2868{
2817 ev_idle_stop (EV_A_ idle); 2869 ev_idle_stop (EV_A_ idle);
… …
2837 2889
2838 ev_prepare_init (&w->prepare, embed_prepare_cb); 2890 ev_prepare_init (&w->prepare, embed_prepare_cb);
2839 ev_set_priority (&w->prepare, EV_MINPRI); 2891 ev_set_priority (&w->prepare, EV_MINPRI);
2840 ev_prepare_start (EV_A_ &w->prepare); 2892 ev_prepare_start (EV_A_ &w->prepare);
2841 2893
2894 ev_fork_init (&w->fork, embed_fork_cb);
2895 ev_fork_start (EV_A_ &w->fork);
2896
2842 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2897 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2843 2898
2844 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2845 2900
2846 EV_FREQUENT_CHECK; 2901 EV_FREQUENT_CHECK;
… …
2853 if (expect_false (!ev_is_active (w))) 2908 if (expect_false (!ev_is_active (w)))
2854 return; 2909 return;
2855 2910
2856 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2857 2912
2858 ev_io_stop (EV_A_ &w->io); 2913 ev_io_stop (EV_A_ &w->io);
2859 ev_prepare_stop (EV_A_ &w->prepare); 2914 ev_prepare_stop (EV_A_ &w->prepare);
2860 2915 ev_fork_stop (EV_A_ &w->fork);
2861 ev_stop (EV_A_ (W)w);
2862 2916
2863 EV_FREQUENT_CHECK; 2917 EV_FREQUENT_CHECK;
2864} 2918}
2865#endif 2919#endif
2866 2920
… …
2963once_cb (EV_P_ struct ev_once *once, int revents) 3017once_cb (EV_P_ struct ev_once *once, int revents)
2964{ 3018{
2965 void (*cb)(int revents, void *arg) = once->cb; 3019 void (*cb)(int revents, void *arg) = once->cb;
2966 void *arg = once->arg; 3020 void *arg = once->arg;
2967 3021
2968 ev_io_stop (EV_A_ &once->io); 3022 ev_io_stop (EV_A_ &once->io);
2969 ev_timer_stop (EV_A_ &once->to); 3023 ev_timer_stop (EV_A_ &once->to);
2970 ev_free (once); 3024 ev_free (once);
2971 3025
2972 cb (revents, arg); 3026 cb (revents, arg);
2973} 3027}
2974 3028
2975static void 3029static void
2976once_cb_io (EV_P_ ev_io *w, int revents) 3030once_cb_io (EV_P_ ev_io *w, int revents)
2977{ 3031{
2978 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3032 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3033
3034 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2979} 3035}
2980 3036
2981static void 3037static void
2982once_cb_to (EV_P_ ev_timer *w, int revents) 3038once_cb_to (EV_P_ ev_timer *w, int revents)
2983{ 3039{
2984 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3040 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3041
3042 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2985} 3043}
2986 3044
2987void 3045void
2988ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3046ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2989{ 3047{

Diff Legend

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