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

Comparing libev/ev.pod (file contents):
Revision 1.207 by root, Tue Oct 28 14:13:52 2008 UTC vs.
Revision 1.219 by root, Thu Nov 20 00:43:58 2008 UTC

8 8
9=head2 EXAMPLE PROGRAM 9=head2 EXAMPLE PROGRAM
10 10
11 // a single header file is required 11 // a single header file is required
12 #include <ev.h> 12 #include <ev.h>
13
14 #include <stdio.h> // for puts
13 15
14 // every watcher type has its own typedef'd struct 16 // every watcher type has its own typedef'd struct
15 // with the name ev_TYPE 17 // with the name ev_TYPE
16 ev_io stdin_watcher; 18 ev_io stdin_watcher;
17 ev_timer timeout_watcher; 19 ev_timer timeout_watcher;
298If you don't know what event loop to use, use the one returned from this 300If you don't know what event loop to use, use the one returned from this
299function. 301function.
300 302
301Note that this function is I<not> thread-safe, so if you want to use it 303Note that this function is I<not> thread-safe, so if you want to use it
302from multiple threads, you have to lock (note also that this is unlikely, 304from multiple threads, you have to lock (note also that this is unlikely,
303as loops cannot bes hared easily between threads anyway). 305as loops cannot be shared easily between threads anyway).
304 306
305The default loop is the only loop that can handle C<ev_signal> and 307The default loop is the only loop that can handle C<ev_signal> and
306C<ev_child> watchers, and to do this, it always registers a handler 308C<ev_child> watchers, and to do this, it always registers a handler
307for C<SIGCHLD>. If this is a problem for your application you can either 309for C<SIGCHLD>. If this is a problem for your application you can either
308create a dynamic loop with C<ev_loop_new> that doesn't do that, or you 310create a dynamic loop with C<ev_loop_new> that doesn't do that, or you
386For few fds, this backend is a bit little slower than poll and select, 388For few fds, this backend is a bit little slower than poll and select,
387but it scales phenomenally better. While poll and select usually scale 389but it scales phenomenally better. While poll and select usually scale
388like O(total_fds) where n is the total number of fds (or the highest fd), 390like O(total_fds) where n is the total number of fds (or the highest fd),
389epoll scales either O(1) or O(active_fds). 391epoll scales either O(1) or O(active_fds).
390 392
391The epoll syscalls are the most misdesigned of the more advanced event 393The epoll mechanism deserves honorable mention as the most misdesigned
392mechanisms: problems include silently dropping fds, requiring a system 394of the more advanced event mechanisms: mere annoyances include silently
393call per change per fd (and unnecessary guessing of parameters), problems 395dropping file descriptors, requiring a system call per change per file
396descriptor (and unnecessary guessing of parameters), problems with dup and
394with dup and so on. The biggest issue is fork races, however - if a 397so on. The biggest issue is fork races, however - if a program forks then
395program forks then I<both> parent and child process have to recreate the 398I<both> parent and child process have to recreate the epoll set, which can
396epoll set, which can take considerable time (one syscall per fd) and is of 399take considerable time (one syscall per file descriptor) and is of course
397course hard to detect. 400hard to detect.
398 401
399Epoll is also notoriously buggy - embedding epoll fds should work, but 402Epoll is also notoriously buggy - embedding epoll fds I<should> work, but
400of course doesn't, and epoll just loves to report events for totally 403of course I<doesn't>, and epoll just loves to report events for totally
401I<different> file descriptors (even already closed ones, so one cannot 404I<different> file descriptors (even already closed ones, so one cannot
402even remove them from the set) than registered in the set (especially 405even remove them from the set) than registered in the set (especially
403on SMP systems). Libev tries to counter these spurious notifications by 406on SMP systems). Libev tries to counter these spurious notifications by
404employing an additional generation counter and comparing that against the 407employing an additional generation counter and comparing that against the
405events to filter out spurious ones. 408events to filter out spurious ones, recreating the set when required.
406 409
407While stopping, setting and starting an I/O watcher in the same iteration 410While stopping, setting and starting an I/O watcher in the same iteration
408will result in some caching, there is still a system call per such incident 411will result in some caching, there is still a system call per such
409(because the fd could point to a different file description now), so its 412incident (because the same I<file descriptor> could point to a different
410best to avoid that. Also, C<dup ()>'ed file descriptors might not work 413I<file description> now), so its best to avoid that. Also, C<dup ()>'ed
411very well if you register events for both fds. 414file descriptors might not work very well if you register events for both
415file descriptors.
412 416
413Best performance from this backend is achieved by not unregistering all 417Best performance from this backend is achieved by not unregistering all
414watchers for a file descriptor until it has been closed, if possible, 418watchers for a file descriptor until it has been closed, if possible,
415i.e. keep at least one watcher active per fd at all times. Stopping and 419i.e. keep at least one watcher active per fd at all times. Stopping and
416starting a watcher (without re-setting it) also usually doesn't cause 420starting a watcher (without re-setting it) also usually doesn't cause
417extra overhead. A fork can both result in spurious notifications as well 421extra overhead. A fork can both result in spurious notifications as well
418as in libev having to destroy and recreate the epoll object, which can 422as in libev having to destroy and recreate the epoll object, which can
419take considerable time and thus should be avoided. 423take considerable time and thus should be avoided.
420 424
425All this means that, in practice, C<EVBACKEND_SELECT> can be as fast or
426faster than epoll for maybe up to a hundred file descriptors, depending on
427the usage. So sad.
428
421While nominally embeddable in other event loops, this feature is broken in 429While nominally embeddable in other event loops, this feature is broken in
422all kernel versions tested so far. 430all kernel versions tested so far.
423 431
424This backend maps C<EV_READ> and C<EV_WRITE> in the same way as 432This backend maps C<EV_READ> and C<EV_WRITE> in the same way as
425C<EVBACKEND_POLL>. 433C<EVBACKEND_POLL>.
426 434
427=item C<EVBACKEND_KQUEUE> (value 8, most BSD clones) 435=item C<EVBACKEND_KQUEUE> (value 8, most BSD clones)
428 436
429Kqueue deserves special mention, as at the time of this writing, it was 437Kqueue deserves special mention, as at the time of this writing, it
430broken on all BSDs except NetBSD (usually it doesn't work reliably with 438was broken on all BSDs except NetBSD (usually it doesn't work reliably
431anything but sockets and pipes, except on Darwin, where of course it's 439with anything but sockets and pipes, except on Darwin, where of course
432completely useless). For this reason it's not being "auto-detected" unless 440it's completely useless). Unlike epoll, however, whose brokenness
433you explicitly specify it in the flags (i.e. using C<EVBACKEND_KQUEUE>) or 441is by design, these kqueue bugs can (and eventually will) be fixed
434libev was compiled on a known-to-be-good (-enough) system like NetBSD. 442without API changes to existing programs. For this reason it's not being
443"auto-detected" unless you explicitly specify it in the flags (i.e. using
444C<EVBACKEND_KQUEUE>) or libev was compiled on a known-to-be-good (-enough)
445system like NetBSD.
435 446
436You still can embed kqueue into a normal poll or select backend and use it 447You still can embed kqueue into a normal poll or select backend and use it
437only for sockets (after having made sure that sockets work with kqueue on 448only for sockets (after having made sure that sockets work with kqueue on
438the target platform). See C<ev_embed> watchers for more info. 449the target platform). See C<ev_embed> watchers for more info.
439 450
647the loop. 658the loop.
648 659
649A flags value of C<EVLOOP_ONESHOT> will look for new events (waiting if 660A flags value of C<EVLOOP_ONESHOT> will look for new events (waiting if
650necessary) and will handle those and any already outstanding ones. It 661necessary) and will handle those and any already outstanding ones. It
651will block your process until at least one new event arrives (which could 662will block your process until at least one new event arrives (which could
652be an event internal to libev itself, so there is no guarentee that a 663be an event internal to libev itself, so there is no guarantee that a
653user-registered callback will be called), and will return after one 664user-registered callback will be called), and will return after one
654iteration of the loop. 665iteration of the loop.
655 666
656This is useful if you are waiting for some external event in conjunction 667This is useful if you are waiting for some external event in conjunction
657with something not expressible using other libev watchers (i.e. "roll your 668with something not expressible using other libev watchers (i.e. "roll your
1410 else 1421 else
1411 { 1422 {
1412 // callback was invoked, but there was some activity, re-arm 1423 // callback was invoked, but there was some activity, re-arm
1413 // the watcher to fire in last_activity + 60, which is 1424 // the watcher to fire in last_activity + 60, which is
1414 // guaranteed to be in the future, so "again" is positive: 1425 // guaranteed to be in the future, so "again" is positive:
1415 w->again = timeout - now; 1426 w->repeat = timeout - now;
1416 ev_timer_again (EV_A_ w); 1427 ev_timer_again (EV_A_ w);
1417 } 1428 }
1418 } 1429 }
1419 1430
1420To summarise the callback: first calculate the real timeout (defined 1431To summarise the callback: first calculate the real timeout (defined
1927C<stat> on that path in regular intervals (or when the OS says it changed) 1938C<stat> on that path in regular intervals (or when the OS says it changed)
1928and sees if it changed compared to the last time, invoking the callback if 1939and sees if it changed compared to the last time, invoking the callback if
1929it did. 1940it did.
1930 1941
1931The path does not need to exist: changing from "path exists" to "path does 1942The path does not need to exist: changing from "path exists" to "path does
1932not exist" is a status change like any other. The condition "path does 1943not exist" is a status change like any other. The condition "path does not
1933not exist" is signified by the C<st_nlink> field being zero (which is 1944exist" (or more correctly "path cannot be stat'ed") is signified by the
1934otherwise always forced to be at least one) and all the other fields of 1945C<st_nlink> field being zero (which is otherwise always forced to be at
1935the stat buffer having unspecified contents. 1946least one) and all the other fields of the stat buffer having unspecified
1947contents.
1936 1948
1937The path I<must not> end in a slash or contain special components such as 1949The path I<must not> end in a slash or contain special components such as
1938C<.> or C<..>. The path I<should> be absolute: If it is relative and 1950C<.> or C<..>. The path I<should> be absolute: If it is relative and
1939your working directory changes, then the behaviour is undefined. 1951your working directory changes, then the behaviour is undefined.
1940 1952
1943to see if it changed somehow. You can specify a recommended polling 1955to see if it changed somehow. You can specify a recommended polling
1944interval for this case. If you specify a polling interval of C<0> (highly 1956interval for this case. If you specify a polling interval of C<0> (highly
1945recommended!) then a I<suitable, unspecified default> value will be used 1957recommended!) then a I<suitable, unspecified default> value will be used
1946(which you can expect to be around five seconds, although this might 1958(which you can expect to be around five seconds, although this might
1947change dynamically). Libev will also impose a minimum interval which is 1959change dynamically). Libev will also impose a minimum interval which is
1948currently around C<0.1>, but thats usually overkill. 1960currently around C<0.1>, but that's usually overkill.
1949 1961
1950This watcher type is not meant for massive numbers of stat watchers, 1962This watcher type is not meant for massive numbers of stat watchers,
1951as even with OS-supported change notifications, this can be 1963as even with OS-supported change notifications, this can be
1952resource-intensive. 1964resource-intensive.
1953 1965
1954At the time of this writing, the only OS-specific interface implemented 1966At the time of this writing, the only OS-specific interface implemented
1955is the Linux inotify interface (implementing kqueue support is left as 1967is the Linux inotify interface (implementing kqueue support is left as an
1956an exercise for the reader. Note, however, that the author sees no way 1968exercise for the reader. Note, however, that the author sees no way of
1957of implementing C<ev_stat> semantics with kqueue). 1969implementing C<ev_stat> semantics with kqueue, except as a hint).
1958 1970
1959=head3 ABI Issues (Largefile Support) 1971=head3 ABI Issues (Largefile Support)
1960 1972
1961Libev by default (unless the user overrides this) uses the default 1973Libev by default (unless the user overrides this) uses the default
1962compilation environment, which means that on systems with large file 1974compilation environment, which means that on systems with large file
1973to exchange stat structures with application programs compiled using the 1985to exchange stat structures with application programs compiled using the
1974default compilation environment. 1986default compilation environment.
1975 1987
1976=head3 Inotify and Kqueue 1988=head3 Inotify and Kqueue
1977 1989
1978When C<inotify (7)> support has been compiled into libev (generally 1990When C<inotify (7)> support has been compiled into libev and present at
1979only available with Linux 2.6.25 or above due to bugs in earlier 1991runtime, it will be used to speed up change detection where possible. The
1980implementations) and present at runtime, it will be used to speed up 1992inotify descriptor will be created lazily when the first C<ev_stat>
1981change detection where possible. The inotify descriptor will be created 1993watcher is being started.
1982lazily when the first C<ev_stat> watcher is being started.
1983 1994
1984Inotify presence does not change the semantics of C<ev_stat> watchers 1995Inotify presence does not change the semantics of C<ev_stat> watchers
1985except that changes might be detected earlier, and in some cases, to avoid 1996except that changes might be detected earlier, and in some cases, to avoid
1986making regular C<stat> calls. Even in the presence of inotify support 1997making regular C<stat> calls. Even in the presence of inotify support
1987there are many cases where libev has to resort to regular C<stat> polling, 1998there are many cases where libev has to resort to regular C<stat> polling,
1988but as long as the path exists, libev usually gets away without polling. 1999but as long as kernel 2.6.25 or newer is used (2.6.24 and older have too
2000many bugs), the path exists (i.e. stat succeeds), and the path resides on
2001a local filesystem (libev currently assumes only ext2/3, jfs, reiserfs and
2002xfs are fully working) libev usually gets away without polling.
1989 2003
1990There is no support for kqueue, as apparently it cannot be used to 2004There is no support for kqueue, as apparently it cannot be used to
1991implement this functionality, due to the requirement of having a file 2005implement this functionality, due to the requirement of having a file
1992descriptor open on the object at all times, and detecting renames, unlinks 2006descriptor open on the object at all times, and detecting renames, unlinks
1993etc. is difficult. 2007etc. is difficult.
2008
2009=head3 C<stat ()> is a synchronous operation
2010
2011Libev doesn't normally do any kind of I/O itself, and so is not blocking
2012the process. The exception are C<ev_stat> watchers - those call C<stat
2013()>, which is a synchronous operation.
2014
2015For local paths, this usually doesn't matter: unless the system is very
2016busy or the intervals between stat's are large, a stat call will be fast,
2017as the path data is suually in memory already (except when starting the
2018watcher).
2019
2020For networked file systems, calling C<stat ()> can block an indefinite
2021time due to network issues, and even under good conditions, a stat call
2022often takes multiple milliseconds.
2023
2024Therefore, it is best to avoid using C<ev_stat> watchers on networked
2025paths, although this is fully supported by libev.
1994 2026
1995=head3 The special problem of stat time resolution 2027=head3 The special problem of stat time resolution
1996 2028
1997The C<stat ()> system call only supports full-second resolution portably, 2029The C<stat ()> system call only supports full-second resolution portably,
1998and even on systems where the resolution is higher, most file systems 2030and even on systems where the resolution is higher, most file systems
2643=over 4 2675=over 4
2644 2676
2645=item ev_async_init (ev_async *, callback) 2677=item ev_async_init (ev_async *, callback)
2646 2678
2647Initialises and configures the async watcher - it has no parameters of any 2679Initialises and configures the async watcher - it has no parameters of any
2648kind. There is a C<ev_asynd_set> macro, but using it is utterly pointless, 2680kind. There is a C<ev_async_set> macro, but using it is utterly pointless,
2649trust me. 2681trust me.
2650 2682
2651=item ev_async_send (loop, ev_async *) 2683=item ev_async_send (loop, ev_async *)
2652 2684
2653Sends/signals/activates the given C<ev_async> watcher, that is, feeds 2685Sends/signals/activates the given C<ev_async> watcher, that is, feeds
2967Tony Arcieri has written a ruby extension that offers access to a subset 2999Tony Arcieri has written a ruby extension that offers access to a subset
2968of the libev API and adds file handle abstractions, asynchronous DNS and 3000of the libev API and adds file handle abstractions, asynchronous DNS and
2969more on top of it. It can be found via gem servers. Its homepage is at 3001more on top of it. It can be found via gem servers. Its homepage is at
2970L<http://rev.rubyforge.org/>. 3002L<http://rev.rubyforge.org/>.
2971 3003
3004Roger Pack reports that using the link order C<-lws2_32 -lmsvcrt-ruby-190>
3005makes rev work even on mingw.
3006
2972=item D 3007=item D
2973 3008
2974Leandro Lucarella has written a D language binding (F<ev.d>) for libev, to 3009Leandro Lucarella has written a D language binding (F<ev.d>) for libev, to
2975be found at L<http://proj.llucax.com.ar/wiki/evd>. 3010be found at L<http://proj.llucax.com.ar/wiki/evd>.
2976 3011
3086 3121
3087 #define EV_STANDALONE 1 3122 #define EV_STANDALONE 1
3088 #include "ev.h" 3123 #include "ev.h"
3089 3124
3090Both header files and implementation files can be compiled with a C++ 3125Both header files and implementation files can be compiled with a C++
3091compiler (at least, thats a stated goal, and breakage will be treated 3126compiler (at least, that's a stated goal, and breakage will be treated
3092as a bug). 3127as a bug).
3093 3128
3094You need the following files in your source tree, or in a directory 3129You need the following files in your source tree, or in a directory
3095in your include path (e.g. in libev/ when using -Ilibev): 3130in your include path (e.g. in libev/ when using -Ilibev):
3096 3131
3152keeps libev from including F<config.h>, and it also defines dummy 3187keeps libev from including F<config.h>, and it also defines dummy
3153implementations for some libevent functions (such as logging, which is not 3188implementations for some libevent functions (such as logging, which is not
3154supported). It will also not define any of the structs usually found in 3189supported). It will also not define any of the structs usually found in
3155F<event.h> that are not directly supported by the libev core alone. 3190F<event.h> that are not directly supported by the libev core alone.
3156 3191
3192In stanbdalone mode, libev will still try to automatically deduce the
3193configuration, but has to be more conservative.
3194
3157=item EV_USE_MONOTONIC 3195=item EV_USE_MONOTONIC
3158 3196
3159If defined to be C<1>, libev will try to detect the availability of the 3197If defined to be C<1>, libev will try to detect the availability of the
3160monotonic clock option at both compile time and runtime. Otherwise no use 3198monotonic clock option at both compile time and runtime. Otherwise no
3161of the monotonic clock option will be attempted. If you enable this, you 3199use of the monotonic clock option will be attempted. If you enable this,
3162usually have to link against librt or something similar. Enabling it when 3200you usually have to link against librt or something similar. Enabling it
3163the functionality isn't available is safe, though, although you have 3201when the functionality isn't available is safe, though, although you have
3164to make sure you link against any libraries where the C<clock_gettime> 3202to make sure you link against any libraries where the C<clock_gettime>
3165function is hiding in (often F<-lrt>). 3203function is hiding in (often F<-lrt>). See also C<EV_USE_CLOCK_SYSCALL>.
3166 3204
3167=item EV_USE_REALTIME 3205=item EV_USE_REALTIME
3168 3206
3169If defined to be C<1>, libev will try to detect the availability of the 3207If defined to be C<1>, libev will try to detect the availability of the
3170real-time clock option at compile time (and assume its availability at 3208real-time clock option at compile time (and assume its availability at
3171runtime if successful). Otherwise no use of the real-time clock option will 3209runtime if successful). Otherwise no use of the real-time clock option will
3172be attempted. This effectively replaces C<gettimeofday> by C<clock_get 3210be attempted. This effectively replaces C<gettimeofday> by C<clock_get
3173(CLOCK_REALTIME, ...)> and will not normally affect correctness. See the 3211(CLOCK_REALTIME, ...)> and will not normally affect correctness. See the
3174note about libraries in the description of C<EV_USE_MONOTONIC>, though. 3212note about libraries in the description of C<EV_USE_MONOTONIC>, though.
3175 3213
3214=item EV_USE_CLOCK_SYSCALL
3215
3216If defined to be C<1>, libev will try to use a direct syscall instead
3217of calling the system-provided C<clock_gettime> function. This option
3218exists because on GNU/Linux, C<clock_gettime> is in C<librt>, but C<librt>
3219unconditionally pulls in C<libpthread>, slowing down single-threaded
3220programs needlessly. Using a direct syscall is slightly slower (in
3221theory), because no optimised vdso implementation can be used, but avoids
3222the pthread dependency. Defaults to C<1> on GNU/Linux with glibc 2.x or
3223higher, as it simplifies linking (no need for C<-lrt>).
3224
3176=item EV_USE_NANOSLEEP 3225=item EV_USE_NANOSLEEP
3177 3226
3178If defined to be C<1>, libev will assume that C<nanosleep ()> is available 3227If defined to be C<1>, libev will assume that C<nanosleep ()> is available
3179and will use it for delays. Otherwise it will use C<select ()>. 3228and will use it for delays. Otherwise it will use C<select ()>.
3180 3229
3195 3244
3196=item EV_SELECT_USE_FD_SET 3245=item EV_SELECT_USE_FD_SET
3197 3246
3198If defined to C<1>, then the select backend will use the system C<fd_set> 3247If defined to C<1>, then the select backend will use the system C<fd_set>
3199structure. This is useful if libev doesn't compile due to a missing 3248structure. This is useful if libev doesn't compile due to a missing
3200C<NFDBITS> or C<fd_mask> definition or it mis-guesses the bitset layout on 3249C<NFDBITS> or C<fd_mask> definition or it mis-guesses the bitset layout
3201exotic systems. This usually limits the range of file descriptors to some 3250on exotic systems. This usually limits the range of file descriptors to
3202low limit such as 1024 or might have other limitations (winsocket only 3251some low limit such as 1024 or might have other limitations (winsocket
3203allows 64 sockets). The C<FD_SETSIZE> macro, set before compilation, might 3252only allows 64 sockets). The C<FD_SETSIZE> macro, set before compilation,
3204influence the size of the C<fd_set> used. 3253configures the maximum size of the C<fd_set>.
3205 3254
3206=item EV_SELECT_IS_WINSOCKET 3255=item EV_SELECT_IS_WINSOCKET
3207 3256
3208When defined to C<1>, the select backend will assume that 3257When defined to C<1>, the select backend will assume that
3209select/socket/connect etc. don't understand file descriptors but 3258select/socket/connect etc. don't understand file descriptors but
3568loop, as long as you don't confuse yourself). The only exception is that 3617loop, as long as you don't confuse yourself). The only exception is that
3569you must not do this from C<ev_periodic> reschedule callbacks. 3618you must not do this from C<ev_periodic> reschedule callbacks.
3570 3619
3571Care has been taken to ensure that libev does not keep local state inside 3620Care has been taken to ensure that libev does not keep local state inside
3572C<ev_loop>, and other calls do not usually allow for coroutine switches as 3621C<ev_loop>, and other calls do not usually allow for coroutine switches as
3573they do not clal any callbacks. 3622they do not call any callbacks.
3574 3623
3575=head2 COMPILER WARNINGS 3624=head2 COMPILER WARNINGS
3576 3625
3577Depending on your compiler and compiler settings, you might get no or a 3626Depending on your compiler and compiler settings, you might get no or a
3578lot of warnings when compiling libev code. Some people are apparently 3627lot of warnings when compiling libev code. Some people are apparently
3612 ==2274== definitely lost: 0 bytes in 0 blocks. 3661 ==2274== definitely lost: 0 bytes in 0 blocks.
3613 ==2274== possibly lost: 0 bytes in 0 blocks. 3662 ==2274== possibly lost: 0 bytes in 0 blocks.
3614 ==2274== still reachable: 256 bytes in 1 blocks. 3663 ==2274== still reachable: 256 bytes in 1 blocks.
3615 3664
3616Then there is no memory leak, just as memory accounted to global variables 3665Then there is no memory leak, just as memory accounted to global variables
3617is not a memleak - the memory is still being refernced, and didn't leak. 3666is not a memleak - the memory is still being referenced, and didn't leak.
3618 3667
3619Similarly, under some circumstances, valgrind might report kernel bugs 3668Similarly, under some circumstances, valgrind might report kernel bugs
3620as if it were a bug in libev (e.g. in realloc or in the poll backend, 3669as if it were a bug in libev (e.g. in realloc or in the poll backend,
3621although an acceptable workaround has been found here), or it might be 3670although an acceptable workaround has been found here), or it might be
3622confused. 3671confused.
3860=back 3909=back
3861 3910
3862 3911
3863=head1 AUTHOR 3912=head1 AUTHOR
3864 3913
3865Marc Lehmann <libev@schmorp.de>. 3914Marc Lehmann <libev@schmorp.de>, with repeated corrections by Mikael Magnusson.
3866 3915

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines