ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.pm
(Generate patch)

Comparing IO-AIO/AIO.pm (file contents):
Revision 1.56 by root, Sun Oct 22 00:53:47 2006 UTC vs.
Revision 1.70 by root, Tue Oct 24 03:40:38 2006 UTC

18 }; 18 };
19 19
20 # version 2+ has request and group objects 20 # version 2+ has request and group objects
21 use IO::AIO 2; 21 use IO::AIO 2;
22 22
23 aioreq_pri 4; # give next request a very high priority
23 my $req = aio_unlink "/tmp/file", sub { }; 24 my $req = aio_unlink "/tmp/file", sub { };
24 $req->cancel; # cancel request if still in queue 25 $req->cancel; # cancel request if still in queue
25 26
26 my $grp = aio_group sub { print "all stats done\n" }; 27 my $grp = aio_group sub { print "all stats done\n" };
27 add $grp aio_stat "..." for ...; 28 add $grp aio_stat "..." for ...;
51 52
52This module implements asynchronous I/O using whatever means your 53This module implements asynchronous I/O using whatever means your
53operating system supports. 54operating system supports.
54 55
55Currently, a number of threads are started that execute your read/writes 56Currently, a number of threads are started that execute your read/writes
56and signal their completion. You don't need thread support in your libc or 57and signal their completion. You don't need thread support in perl, and
57perl, and the threads created by this module will not be visible to the 58the threads created by this module will not be visible to perl. In the
58pthreads library. In the future, this module might make use of the native 59future, this module might make use of the native aio functions available
59aio functions available on many operating systems. However, they are often 60on many operating systems. However, they are often not well-supported
60not well-supported (Linux doesn't allow them on normal files currently, 61(Linux doesn't allow them on normal files currently, for example),
61for example), and they would only support aio_read and aio_write, so the 62and they would only support aio_read and aio_write, so the remaining
62remaining functionality would have to be implemented using threads anyway. 63functionality would have to be implemented using threads anyway.
63 64
64Although the module will work with in the presence of other threads, it is 65Although the module will work with in the presence of other threads,
65currently not reentrant, so use appropriate locking yourself, always call 66it is currently not reentrant in any way, so use appropriate locking
66C<poll_cb> from within the same thread, or never call C<poll_cb> (or other 67yourself, always call C<poll_cb> from within the same thread, or never
67C<aio_> functions) recursively. 68call C<poll_cb> (or other C<aio_> functions) recursively.
68 69
69=cut 70=cut
70 71
71package IO::AIO; 72package IO::AIO;
72 73
76use base 'Exporter'; 77use base 'Exporter';
77 78
78BEGIN { 79BEGIN {
79 our $VERSION = '2.0'; 80 our $VERSION = '2.0';
80 81
81 our @EXPORT = qw(aio_sendfile aio_read aio_write aio_open aio_close aio_stat 82 our @AIO_REQ = qw(aio_sendfile aio_read aio_write aio_open aio_close aio_stat
82 aio_lstat aio_unlink aio_rmdir aio_readdir aio_scandir aio_symlink 83 aio_lstat aio_unlink aio_rmdir aio_readdir aio_scandir aio_symlink
83 aio_fsync aio_fdatasync aio_readahead aio_rename aio_link aio_move 84 aio_fsync aio_fdatasync aio_readahead aio_rename aio_link aio_move
84 aio_group); 85 aio_group aio_nop);
85 our @EXPORT_OK = qw(poll_fileno poll_cb min_parallel max_parallel max_outstanding nreqs); 86 our @EXPORT = (@AIO_REQ, qw(aioreq_pri aioreq_nice));
87 our @EXPORT_OK = qw(poll_fileno poll_cb poll_wait flush
88 min_parallel max_parallel max_outstanding nreqs);
86 89
87 @IO::AIO::GRP::ISA = 'IO::AIO::REQ'; 90 @IO::AIO::GRP::ISA = 'IO::AIO::REQ';
88 91
89 require XSLoader; 92 require XSLoader;
90 XSLoader::load ("IO::AIO", $VERSION); 93 XSLoader::load ("IO::AIO", $VERSION);
121environment, d) use Glib::filename_from_unicode on unicode filenames or e) 124environment, d) use Glib::filename_from_unicode on unicode filenames or e)
122use something else. 125use something else.
123 126
124=over 4 127=over 4
125 128
129=item aioreq_pri $pri
130
131Sets the priority for the next aio request. The default priority
132is C<0>, the minimum and maximum priorities are C<-4> and C<4>,
133respectively. Requests with higher priority will be serviced first.
134
135The priority will be reset to C<0> after each call to one of the C<aio_>
136functions.
137
138Example: open a file with low priority, then read something from it with
139higher priority so the read request is serviced before other low priority
140open requests (potentially spamming the cache):
141
142 aioreq_pri -3;
143 aio_open ..., sub {
144 return unless $_[0];
145
146 aioreq_pri -2;
147 aio_read $_[0], ..., sub {
148 ...
149 };
150 };
151
152=item aioreq_nice $pri_adjust
153
154Similar to C<aioreq_pri>, but subtracts the given value from the current
155priority, so effects are cumulative.
156
126=item aio_open $pathname, $flags, $mode, $callback->($fh) 157=item aio_open $pathname, $flags, $mode, $callback->($fh)
127 158
128Asynchronously open or create a file and call the callback with a newly 159Asynchronously open or create a file and call the callback with a newly
129created filehandle for the file. 160created filehandle for the file.
130 161
182 print "read $_[0] bytes: <$buffer>\n"; 213 print "read $_[0] bytes: <$buffer>\n";
183 }; 214 };
184 215
185=item aio_move $srcpath, $dstpath, $callback->($status) 216=item aio_move $srcpath, $dstpath, $callback->($status)
186 217
218[EXPERIMENTAL due to internal aio_group use]
219
187Try to move the I<file> (directories not supported as either source or 220Try to move the I<file> (directories not supported as either source or
188destination) from C<$srcpath> to C<$dstpath> and call the callback with 221destination) from C<$srcpath> to C<$dstpath> and call the callback with
189the C<0> (error) or C<-1> ok. 222the C<0> (error) or C<-1> ok.
190 223
191This is a composite request that tries to rename(2) the file first. If 224This is a composite request that tries to rename(2) the file first. If
201=cut 234=cut
202 235
203sub aio_move($$$) { 236sub aio_move($$$) {
204 my ($src, $dst, $cb) = @_; 237 my ($src, $dst, $cb) = @_;
205 238
206 my $grp = aio_group; 239 my $grp = aio_group $cb;
207 240
208 add $grp aio_rename $src, $dst, sub { 241 add $grp aio_rename $src, $dst, sub {
209 if ($_[0] && $! == EXDEV) { 242 if ($_[0] && $! == EXDEV) {
210 add $grp aio_open $src, O_RDONLY, 0, sub { 243 add $grp aio_open $src, O_RDONLY, 0, sub {
211 if (my $src_fh = $_[0]) { 244 if (my $src_fh = $_[0]) {
221 chmod $stat[2] & 07777, $dst_fh; 254 chmod $stat[2] & 07777, $dst_fh;
222 chown $stat[4], $stat[5], $dst_fh; 255 chown $stat[4], $stat[5], $dst_fh;
223 close $dst_fh; 256 close $dst_fh;
224 257
225 add $grp aio_unlink $src, sub { 258 add $grp aio_unlink $src, sub {
226 $cb->($_[0]); 259 $grp->result ($_[0]);
227 }; 260 };
228 } else { 261 } else {
229 my $errno = $!; 262 my $errno = $!;
230 add $grp aio_unlink $dst, sub { 263 add $grp aio_unlink $dst, sub {
231 $! = $errno; 264 $! = $errno;
232 $cb->(-1); 265 $grp->result (-1);
233 }; 266 };
234 } 267 }
235 }; 268 };
236 } else { 269 } else {
237 $cb->(-1); 270 $grp->result (-1);
238 } 271 }
239 }, 272 },
240 273
241 } else { 274 } else {
242 $cb->(-1); 275 $grp->result (-1);
243 } 276 }
244 }; 277 };
245 } else { 278 } else {
246 $cb->($_[0]); 279 $grp->result ($_[0]);
247 } 280 }
248 }; 281 };
249 282
250 $grp 283 $grp
251} 284}
343The callback a single argument which is either C<undef> or an array-ref 376The callback a single argument which is either C<undef> or an array-ref
344with the filenames. 377with the filenames.
345 378
346=item aio_scandir $path, $maxreq, $callback->($dirs, $nondirs) 379=item aio_scandir $path, $maxreq, $callback->($dirs, $nondirs)
347 380
381[EXPERIMENTAL due to internal aio_group use]
382
348Scans a directory (similar to C<aio_readdir>) but additionally tries to 383Scans a directory (similar to C<aio_readdir>) but additionally tries to
349separate the entries of directory C<$path> into two sets of names, ones 384separate the entries of directory C<$path> into two sets of names, ones
350you can recurse into (directories or links to them), and ones you cannot 385you can recurse into (directories or links to them), and ones you cannot
351recurse into (everything else). 386recurse into (everything else).
352 387
353C<aio_scandir> is a composite request that consists of many sub 388C<aio_scandir> is a composite request that creates of many sub requests_
354requests. C<$maxreq> specifies the maximum number of outstanding aio 389C<$maxreq> specifies the maximum number of outstanding aio requests that
355requests that this function generates. If it is C<< <= 0 >>, then a 390this function generates. If it is C<< <= 0 >>, then a suitable default
356suitable default will be chosen (currently 8). 391will be chosen (currently 6).
357 392
358On error, the callback is called without arguments, otherwise it receives 393On error, the callback is called without arguments, otherwise it receives
359two array-refs with path-relative entry names. 394two array-refs with path-relative entry names.
360 395
361Example: 396Example:
398=cut 433=cut
399 434
400sub aio_scandir($$$) { 435sub aio_scandir($$$) {
401 my ($path, $maxreq, $cb) = @_; 436 my ($path, $maxreq, $cb) = @_;
402 437
403 my $grp = aio_group; 438 my $grp = aio_group $cb;
404 439
405 $maxreq = 8 if $maxreq <= 0; 440 $maxreq = 6 if $maxreq <= 0;
406 441
407 # stat once 442 # stat once
408 add $grp aio_stat $path, sub { 443 add $grp aio_stat $path, sub {
409 return $cb->() if $_[0]; 444 return $grp->result () if $_[0];
410 my $now = time; 445 my $now = time;
411 my $hash1 = join ":", (stat _)[0,1,3,7,9]; 446 my $hash1 = join ":", (stat _)[0,1,3,7,9];
412 447
413 # read the directory entries 448 # read the directory entries
414 add $grp aio_readdir $path, sub { 449 add $grp aio_readdir $path, sub {
415 my $entries = shift 450 my $entries = shift
416 or return $cb->(); 451 or return $grp->result ();
417 452
418 # stat the dir another time 453 # stat the dir another time
419 add $grp aio_stat $path, sub { 454 add $grp aio_stat $path, sub {
420 my $hash2 = join ":", (stat _)[0,1,3,7,9]; 455 my $hash2 = join ":", (stat _)[0,1,3,7,9];
421 456
426 $ndirs = -1; 461 $ndirs = -1;
427 } else { 462 } else {
428 # if nlink == 2, we are finished 463 # if nlink == 2, we are finished
429 # on non-posix-fs's, we rely on nlink < 2 464 # on non-posix-fs's, we rely on nlink < 2
430 $ndirs = (stat _)[3] - 2 465 $ndirs = (stat _)[3] - 2
431 or return $cb->([], $entries); 466 or return $grp->result ([], $entries);
432 } 467 }
433 468
434 # sort into likely dirs and likely nondirs 469 # sort into likely dirs and likely nondirs
435 # dirs == files without ".", short entries first 470 # dirs == files without ".", short entries first
436 $entries = [map $_->[0], 471 $entries = [map $_->[0],
441 my (@dirs, @nondirs); 476 my (@dirs, @nondirs);
442 477
443 my ($statcb, $schedcb); 478 my ($statcb, $schedcb);
444 my $nreq = 0; 479 my $nreq = 0;
445 480
481 my $statgrp = add $grp aio_group;
482
446 $schedcb = sub { 483 $schedcb = sub {
447 if (@$entries) { 484 if (@$entries) {
448 if ($nreq < $maxreq) { 485 if ($nreq < $maxreq) {
449 my $ent = pop @$entries; 486 my $ent = pop @$entries;
450 $nreq++; 487 $nreq++;
451 add $grp aio_stat "$path/$ent/.", sub { $statcb->($_[0], $ent) }; 488 add $statgrp aio_stat "$path/$ent/.", sub { $statcb->($_[0], $ent) };
452 } 489 }
453 } elsif (!$nreq) { 490 } elsif (!$nreq) {
454 # finished 491 # finished
492 $statgrp->cancel;
455 undef $statcb; 493 undef $statcb;
456 undef $schedcb; 494 undef $schedcb;
457 $cb->(\@dirs, \@nondirs) if $cb; 495 $grp->result (\@dirs, \@nondirs);
458 undef $cb;
459 } 496 }
460 }; 497 };
461 $statcb = sub { 498 $statcb = sub {
462 my ($status, $entry) = @_; 499 my ($status, $entry) = @_;
463 500
505callback with the fdatasync result code. 542callback with the fdatasync result code.
506 543
507If this call isn't available because your OS lacks it or it couldn't be 544If this call isn't available because your OS lacks it or it couldn't be
508detected, it will be emulated by calling C<fsync> instead. 545detected, it will be emulated by calling C<fsync> instead.
509 546
510=item aio_group $callback->() 547=item aio_group $callback->(...)
511 548
512[EXPERIMENTAL] 549[EXPERIMENTAL]
513 550
514This is a very special aio request: Instead of doing something, it is a 551This is a very special aio request: Instead of doing something, it is a
515container for other aio requests, which is useful if you want to bundle 552container for other aio requests, which is useful if you want to bundle
526 563
527 add $grp 564 add $grp
528 (aio_stat ...), 565 (aio_stat ...),
529 (aio_stat ...), 566 (aio_stat ...),
530 ...; 567 ...;
568
569=item aio_nop $callback->()
570
571This is a special request - it does nothing in itself and is only used for
572side effects, such as when you want to add a dummy request to a group so
573that finishing the requests in the group depends on executing the given
574code.
575
576While this request does nothing, it still goes through the execution
577phase and still requires a worker thread. Thus, the callback will not
578be executed immediately but only after other requests in the queue have
579entered their execution phase. This can be used to measure request
580latency.
531 581
532=item IO::AIO::aio_sleep $fractional_seconds, $callback->() *NOT EXPORTED* 582=item IO::AIO::aio_sleep $fractional_seconds, $callback->() *NOT EXPORTED*
533 583
534Mainly used for debugging and benchmarking, this aio request puts one of 584Mainly used for debugging and benchmarking, this aio request puts one of
535the request workers to sleep for the given time. 585the request workers to sleep for the given time.
554callback) and B<done> (request has reached the end of its lifetime and 604callback) and B<done> (request has reached the end of its lifetime and
555holds no resources anymore). 605holds no resources anymore).
556 606
557=over 4 607=over 4
558 608
559=item $req->cancel 609=item cancel $req
560 610
561Cancels the request, if possible. Has the effect of skipping execution 611Cancels the request, if possible. Has the effect of skipping execution
562when entering the B<execute> state and skipping calling the callback when 612when entering the B<execute> state and skipping calling the callback when
563entering the the B<result> state, but will leave the request otherwise 613entering the the B<result> state, but will leave the request otherwise
564untouched. That means that requests that currently execute will not be 614untouched. That means that requests that currently execute will not be
565stopped and resources held by the request will not be freed prematurely. 615stopped and resources held by the request will not be freed prematurely.
566 616
617=item cb $req $callback->(...)
618
619Replace (or simply set) the callback registered to the request.
620
567=back 621=back
568 622
569=head2 IO::AIO::GRP CLASS 623=head2 IO::AIO::GRP CLASS
570 624
571This class is a subclass of L<IO::AIO::REQ>, so all its methods apply to 625This class is a subclass of L<IO::AIO::REQ>, so all its methods apply to
585You add requests by calling the C<add> method with one or more 639You add requests by calling the C<add> method with one or more
586C<IO::AIO::REQ> objects: 640C<IO::AIO::REQ> objects:
587 641
588 $grp->add (aio_unlink "..."); 642 $grp->add (aio_unlink "...");
589 643
590 add $grp aio_stat "...", sub { ... }; 644 add $grp aio_stat "...", sub {
645 $_[0] or return $grp->result ("error");
646
647 # add another request dynamically, if first succeeded
648 add $grp aio_open "...", sub {
649 $grp->result ("ok");
650 };
651 };
591 652
592This makes it very easy to create composite requests (see the source of 653This makes it very easy to create composite requests (see the source of
593C<aio_move> for an application) that work and feel like simple requests. 654C<aio_move> for an application) that work and feel like simple requests.
594 655
656=over 4
657
595The IO::AIO::GRP objects will be cleaned up during calls to 658=item * The IO::AIO::GRP objects will be cleaned up during calls to
596C<IO::AIO::poll_cb>, just like any other request. 659C<IO::AIO::poll_cb>, just like any other request.
597 660
598They can be canceled like any other request. Canceling will cancel not 661=item * They can be canceled like any other request. Canceling will cancel not
599just the request itself, but also all requests it contains. 662only the request itself, but also all requests it contains.
600 663
601They can also can also be added to other IO::AIO::GRP objects. 664=item * They can also can also be added to other IO::AIO::GRP objects.
665
666=item * You must not add requests to a group from within the group callback (or
667any later time).
668
669=item * This does not harmonise well with C<max_outstanding>, so best do
670not combine C<aio_group> with it. Groups and feeders are recommended for
671this kind of concurrency-limiting.
672
673=back
602 674
603Their lifetime, simplified, looks like this: when they are empty, they 675Their lifetime, simplified, looks like this: when they are empty, they
604will finish very quickly. If they contain only requests that are in the 676will finish very quickly. If they contain only requests that are in the
605C<done> state, they will also finish. Otherwise they will continue to 677C<done> state, they will also finish. Otherwise they will continue to
606exist. 678exist.
607 679
680That means after creating a group you have some time to add requests. And
681in the callbacks of those requests, you can add further requests to the
682group. And only when all those requests have finished will the the group
683itself finish.
684
608=over 4 685=over 4
609 686
687=item add $grp ...
688
610=item $grp->add (...) 689=item $grp->add (...)
611 690
612=item add $grp ... 691Add one or more requests to the group. Any type of L<IO::AIO::REQ> can
692be added, including other groups, as long as you do not create circular
693dependencies.
613 694
614Add one or more 695Returns all its arguments.
615Cancels the request, if possible. Has the effect of skipping execution 696
616when entering the B<execute> state and skipping calling the callback when 697=item $grp->result (...)
617entering the the B<result> state, but will leave the request otherwise 698
618untouched. That means that requests that currently execute will not be 699Set the result value(s) that will be passed to the group callback when all
619stopped and resources held by the request will not be freed prematurely. 700subrequests have finished. By default, no argument will be passed.
701
702=item feed $grp $callback->($grp)
703
704[VERY EXPERIMENTAL]
705
706Sets a feeder/generator on this group: every group can have an attached
707generator that generates requests if idle. The idea behind this is that,
708although you could just queue as many requests as you want in a group,
709this might starve other requests for a potentially long time. For
710example, C<aio_scandir> might generate hundreds of thousands C<aio_stat>
711requests, delaying any later requests for a long time.
712
713To avoid this, and allow incremental generation of requests, you can
714instead a group and set a feeder on it that generates those requests. The
715feed callback will be called whenever there are few enough (see C<limit>,
716below) requests active in the group itself and is expected to queue more
717requests.
718
719The feed callback can queue as many requests as it likes (i.e. C<add> does
720not impose any limits).
721
722If the feed does not queue more requests when called, it will be
723automatically removed from the group.
724
725If the feed limit is C<0>, it will be set to C<2> automatically.
726
727Example:
728
729 # stat all files in @files, but only ever use four aio requests concurrently:
730
731 my $grp = aio_group sub { print "finished\n" };
732 limit $grp 4;
733 feed $grp sub {
734 my $file = pop @files
735 or return;
736
737 add $grp aio_stat $file, sub { ... };
738 };
739
740=item limit $grp $num
741
742Sets the feeder limit for the group: The feeder will be called whenever
743the group contains less than this many requests.
744
745Setting the limit to C<0> will pause the feeding process.
620 746
621=back 747=back
622 748
623=head2 SUPPORT FUNCTIONS 749=head2 SUPPORT FUNCTIONS
624 750
682 IO::AIO::poll_wait, IO::AIO::poll_cb 808 IO::AIO::poll_wait, IO::AIO::poll_cb
683 if IO::AIO::nreqs; 809 if IO::AIO::nreqs;
684 810
685=item IO::AIO::min_parallel $nthreads 811=item IO::AIO::min_parallel $nthreads
686 812
687Set the minimum number of AIO threads to C<$nthreads>. The current default 813Set the minimum number of AIO threads to C<$nthreads>. The current
688is C<4>, which means four asynchronous operations can be done at one time 814default is C<8>, which means eight asynchronous operations can execute
689(the number of outstanding operations, however, is unlimited). 815concurrently at any one time (the number of outstanding requests,
816however, is unlimited).
690 817
691IO::AIO starts threads only on demand, when an AIO request is queued and 818IO::AIO starts threads only on demand, when an AIO request is queued and
692no free thread exists. 819no free thread exists.
693 820
694It is recommended to keep the number of threads low, as some Linux 821It is recommended to keep the number of threads relatively low, as some
695kernel versions will scale negatively with the number of threads (higher 822Linux kernel versions will scale negatively with the number of threads
696parallelity => MUCH higher latency). With current Linux 2.6 versions, 4-32 823(higher parallelity => MUCH higher latency). With current Linux 2.6
697threads should be fine. 824versions, 4-32 threads should be fine.
698 825
699Under most circumstances you don't need to call this function, as the 826Under most circumstances you don't need to call this function, as the
700module selects a default that is suitable for low to moderate load. 827module selects a default that is suitable for low to moderate load.
701 828
702=item IO::AIO::max_parallel $nthreads 829=item IO::AIO::max_parallel $nthreads
713 840
714Under normal circumstances you don't need to call this function. 841Under normal circumstances you don't need to call this function.
715 842
716=item $oldnreqs = IO::AIO::max_outstanding $nreqs 843=item $oldnreqs = IO::AIO::max_outstanding $nreqs
717 844
845[DEPRECATED]
846
718Sets the maximum number of outstanding requests to C<$nreqs>. If you 847Sets the maximum number of outstanding requests to C<$nreqs>. If you
719try to queue up more than this number of requests, the caller will block until 848try to queue up more than this number of requests, the caller will block until
720some requests have been handled. 849some requests have been handled.
721 850
722The default is very large, so normally there is no practical limit. If you 851The default is very large, so normally there is no practical limit. If you
723queue up many requests in a loop it often improves speed if you set 852queue up many requests in a loop it often improves speed if you set
724this to a relatively low number, such as C<100>. 853this to a relatively low number, such as C<100>.
854
855This function does not work well together with C<aio_group>'s, and their
856feeder interface is better suited to limiting concurrency, so do not use
857this function.
725 858
726Under normal circumstances you don't need to call this function. 859Under normal circumstances you don't need to call this function.
727 860
728=back 861=back
729 862
743 or return undef; 876 or return undef;
744 877
745 *$sym 878 *$sym
746} 879}
747 880
748min_parallel 4; 881min_parallel 8;
749 882
750END { 883END {
751 max_parallel 0; 884 max_parallel 0;
752} 885}
753 886
767 900
768In short: the parent will, after a short pause, continue as if fork had 901In short: the parent will, after a short pause, continue as if fork had
769not been called, while the child will act as if IO::AIO has not been used 902not been called, while the child will act as if IO::AIO has not been used
770yet. 903yet.
771 904
905=head2 MEMORY USAGE
906
907Each aio request uses - depending on your architecture - around 128 bytes
908of memory. In addition, stat requests need a stat buffer (possibly a few
909hundred bytes). Perl scalars and other data passed into aio requests will
910also be locked.
911
912This is now awfully much, so queuing lots of requests is not usually a
913problem.
914
915Each thread needs a stack area which is usually around 16k, sometimes much
916larger, depending on the OS.
917
772=head1 SEE ALSO 918=head1 SEE ALSO
773 919
774L<Coro>, L<Linux::AIO> (obsolete). 920L<Coro::AIO>.
775 921
776=head1 AUTHOR 922=head1 AUTHOR
777 923
778 Marc Lehmann <schmorp@schmorp.de> 924 Marc Lehmann <schmorp@schmorp.de>
779 http://home.schmorp.de/ 925 http://home.schmorp.de/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines