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.100 by root, Sun Jan 7 21:36:58 2007 UTC vs.
Revision 1.146 by root, Tue Apr 21 20:06:05 2009 UTC

26 $req->cancel; # cancel request if still in queue 26 $req->cancel; # cancel request if still in queue
27 27
28 my $grp = aio_group sub { print "all stats done\n" }; 28 my $grp = aio_group sub { print "all stats done\n" };
29 add $grp aio_stat "..." for ...; 29 add $grp aio_stat "..." for ...;
30 30
31 # AnyEvent integration (EV, Event, Glib, Tk, POE, urxvt, pureperl...)
32 use AnyEvent::AIO;
33
31 # AnyEvent integration 34 # EV integration
32 open my $fh, "<&=" . IO::AIO::poll_fileno or die "$!"; 35 my $w = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
33 my $w = AnyEvent->io (fh => $fh, poll => 'r', cb => sub { IO::AIO::poll_cb });
34 36
35 # Event integration 37 # Event integration
36 Event->io (fd => IO::AIO::poll_fileno, 38 Event->io (fd => IO::AIO::poll_fileno,
37 poll => 'r', 39 poll => 'r',
38 cb => \&IO::AIO::poll_cb); 40 cb => \&IO::AIO::poll_cb);
62etc.), but can also be used to easily do operations in parallel that are 64etc.), but can also be used to easily do operations in parallel that are
63normally done sequentially, e.g. stat'ing many files, which is much faster 65normally done sequentially, e.g. stat'ing many files, which is much faster
64on a RAID volume or over NFS when you do a number of stat operations 66on a RAID volume or over NFS when you do a number of stat operations
65concurrently. 67concurrently.
66 68
67While most of this works on all types of file descriptors (for example 69While most of this works on all types of file descriptors (for
68sockets), using these functions on file descriptors that support 70example sockets), using these functions on file descriptors that
69nonblocking operation (again, sockets, pipes etc.) is very inefficient or 71support nonblocking operation (again, sockets, pipes etc.) is very
70might not work (aio_read fails on sockets/pipes/fifos). Use an event loop 72inefficient. Use an event loop for that (such as the L<Event|Event>
71for that (such as the L<Event|Event> module): IO::AIO will naturally fit 73module): IO::AIO will naturally fit into such an event loop itself.
72into such an event loop itself.
73 74
74In this version, a number of threads are started that execute your 75In this version, a number of threads are started that execute your
75requests and signal their completion. You don't need thread support 76requests and signal their completion. You don't need thread support
76in perl, and the threads created by this module will not be visible 77in perl, and the threads created by this module will not be visible
77to perl. In the future, this module might make use of the native aio 78to perl. In the future, this module might make use of the native aio
79not well-supported or restricted (GNU/Linux doesn't allow them on normal 80not well-supported or restricted (GNU/Linux doesn't allow them on normal
80files currently, for example), and they would only support aio_read and 81files currently, for example), and they would only support aio_read and
81aio_write, so the remaining functionality would have to be implemented 82aio_write, so the remaining functionality would have to be implemented
82using threads anyway. 83using threads anyway.
83 84
84Although the module will work with in the presence of other (Perl-) 85Although the module will work in the presence of other (Perl-) threads,
85threads, it is currently not reentrant in any way, so use appropriate 86it is currently not reentrant in any way, so use appropriate locking
86locking yourself, always call C<poll_cb> from within the same thread, or 87yourself, always call C<poll_cb> from within the same thread, or never
87never call C<poll_cb> (or other C<aio_> functions) recursively. 88call C<poll_cb> (or other C<aio_> functions) recursively.
88 89
89=head2 EXAMPLE 90=head2 EXAMPLE
90 91
91This is a simple example that uses the Event module and loads 92This is a simple example that uses the Event module and loads
92F</etc/passwd> asynchronously: 93F</etc/passwd> asynchronously:
184 185
185=cut 186=cut
186 187
187package IO::AIO; 188package IO::AIO;
188 189
190use Carp ();
191
189no warnings; 192no warnings;
190use strict 'vars'; 193use strict 'vars';
191 194
192use base 'Exporter'; 195use base 'Exporter';
193 196
194BEGIN { 197BEGIN {
195 our $VERSION = '2.32'; 198 our $VERSION = '3.19';
196 199
197 our @AIO_REQ = qw(aio_sendfile aio_read aio_write aio_open aio_close aio_stat 200 our @AIO_REQ = qw(aio_sendfile aio_read aio_write aio_open aio_close
198 aio_lstat aio_unlink aio_rmdir aio_readdir aio_scandir aio_symlink 201 aio_stat aio_lstat aio_unlink aio_rmdir aio_readdir
199 aio_readlink aio_fsync aio_fdatasync aio_readahead aio_rename aio_link 202 aio_scandir aio_symlink aio_readlink aio_sync aio_fsync
200 aio_move aio_copy aio_group aio_nop aio_mknod aio_load aio_rmtree); 203 aio_fdatasync aio_sync_file_range aio_pathsync aio_readahead
204 aio_rename aio_link aio_move aio_copy aio_group
205 aio_nop aio_mknod aio_load aio_rmtree aio_mkdir aio_chown
206 aio_chmod aio_utime aio_truncate);
207
201 our @EXPORT = (@AIO_REQ, qw(aioreq_pri aioreq_nice aio_block)); 208 our @EXPORT = (@AIO_REQ, qw(aioreq_pri aioreq_nice));
202 our @EXPORT_OK = qw(poll_fileno poll_cb poll_wait flush 209 our @EXPORT_OK = qw(poll_fileno poll_cb poll_wait flush
203 min_parallel max_parallel max_idle 210 min_parallel max_parallel max_idle
204 nreqs nready npending nthreads 211 nreqs nready npending nthreads
205 max_poll_time max_poll_reqs); 212 max_poll_time max_poll_reqs);
213
214 push @AIO_REQ, qw(aio_busy); # not exported
206 215
207 @IO::AIO::GRP::ISA = 'IO::AIO::REQ'; 216 @IO::AIO::GRP::ISA = 'IO::AIO::REQ';
208 217
209 require XSLoader; 218 require XSLoader;
210 XSLoader::load ("IO::AIO", $VERSION); 219 XSLoader::load ("IO::AIO", $VERSION);
217All the C<aio_*> calls are more or less thin wrappers around the syscall 226All the C<aio_*> calls are more or less thin wrappers around the syscall
218with the same name (sans C<aio_>). The arguments are similar or identical, 227with the same name (sans C<aio_>). The arguments are similar or identical,
219and they all accept an additional (and optional) C<$callback> argument 228and they all accept an additional (and optional) C<$callback> argument
220which must be a code reference. This code reference will get called with 229which must be a code reference. This code reference will get called with
221the syscall return code (e.g. most syscalls return C<-1> on error, unlike 230the syscall return code (e.g. most syscalls return C<-1> on error, unlike
222perl, which usually delivers "false") as it's sole argument when the given 231perl, which usually delivers "false") as its sole argument after the given
223syscall has been executed asynchronously. 232syscall has been executed asynchronously.
224 233
225All functions expecting a filehandle keep a copy of the filehandle 234All functions expecting a filehandle keep a copy of the filehandle
226internally until the request has finished. 235internally until the request has finished.
227 236
241your pathnames to the locale (or other) encoding in effect in the user 250your pathnames to the locale (or other) encoding in effect in the user
242environment, d) use Glib::filename_from_unicode on unicode filenames or e) 251environment, d) use Glib::filename_from_unicode on unicode filenames or e)
243use something else to ensure your scalar has the correct contents. 252use something else to ensure your scalar has the correct contents.
244 253
245This works, btw. independent of the internal UTF-8 bit, which IO::AIO 254This works, btw. independent of the internal UTF-8 bit, which IO::AIO
246handles correctly wether it is set or not. 255handles correctly whether it is set or not.
247 256
248=over 4 257=over 4
249 258
250=item $prev_pri = aioreq_pri [$pri] 259=item $prev_pri = aioreq_pri [$pri]
251 260
271 aio_read $_[0], ..., sub { 280 aio_read $_[0], ..., sub {
272 ... 281 ...
273 }; 282 };
274 }; 283 };
275 284
285
276=item aioreq_nice $pri_adjust 286=item aioreq_nice $pri_adjust
277 287
278Similar to C<aioreq_pri>, but subtracts the given value from the current 288Similar to C<aioreq_pri>, but subtracts the given value from the current
279priority, so the effect is cumulative. 289priority, so the effect is cumulative.
290
280 291
281=item aio_open $pathname, $flags, $mode, $callback->($fh) 292=item aio_open $pathname, $flags, $mode, $callback->($fh)
282 293
283Asynchronously open or create a file and call the callback with a newly 294Asynchronously open or create a file and call the callback with a newly
284created filehandle for the file. 295created filehandle for the file.
290list. They are the same as used by C<sysopen>. 301list. They are the same as used by C<sysopen>.
291 302
292Likewise, C<$mode> specifies the mode of the newly created file, if it 303Likewise, C<$mode> specifies the mode of the newly created file, if it
293didn't exist and C<O_CREAT> has been given, just like perl's C<sysopen>, 304didn't exist and C<O_CREAT> has been given, just like perl's C<sysopen>,
294except that it is mandatory (i.e. use C<0> if you don't create new files, 305except that it is mandatory (i.e. use C<0> if you don't create new files,
295and C<0666> or C<0777> if you do). 306and C<0666> or C<0777> if you do). Note that the C<$mode> will be modified
307by the umask in effect then the request is being executed, so better never
308change the umask.
296 309
297Example: 310Example:
298 311
299 aio_open "/etc/passwd", O_RDONLY, 0, sub { 312 aio_open "/etc/passwd", O_RDONLY, 0, sub {
300 if ($_[0]) { 313 if ($_[0]) {
303 } else { 316 } else {
304 die "open failed: $!\n"; 317 die "open failed: $!\n";
305 } 318 }
306 }; 319 };
307 320
321
308=item aio_close $fh, $callback->($status) 322=item aio_close $fh, $callback->($status)
309 323
310Asynchronously close a file and call the callback with the result 324Asynchronously close a file and call the callback with the result
311code. I<WARNING:> although accepted, you should not pass in a perl 325code.
312filehandle here, as perl will likely close the file descriptor another
313time when the filehandle is destroyed. Normally, you can safely call perls
314C<close> or just let filehandles go out of scope.
315 326
316This is supposed to be a bug in the API, so that might change. It's 327Unfortunately, you can't do this to perl. Perl I<insists> very strongly on
317therefore best to avoid this function. 328closing the file descriptor associated with the filehandle itself.
329
330Therefore, C<aio_close> will not close the filehandle - instead it will
331use dup2 to overwrite the file descriptor with the write-end of a pipe
332(the pipe fd will be created on demand and will be cached).
333
334Or in other words: the file descriptor will be closed, but it will not be
335free for reuse until the perl filehandle is closed.
336
337=cut
318 338
319=item aio_read $fh,$offset,$length, $data,$dataoffset, $callback->($retval) 339=item aio_read $fh,$offset,$length, $data,$dataoffset, $callback->($retval)
320 340
321=item aio_write $fh,$offset,$length, $data,$dataoffset, $callback->($retval) 341=item aio_write $fh,$offset,$length, $data,$dataoffset, $callback->($retval)
322 342
323Reads or writes C<length> bytes from the specified C<fh> and C<offset> 343Reads or writes C<$length> bytes from or to the specified C<$fh> and
324into the scalar given by C<data> and offset C<dataoffset> and calls the 344C<$offset> into the scalar given by C<$data> and offset C<$dataoffset>
325callback without the actual number of bytes read (or -1 on error, just 345and calls the callback without the actual number of bytes read (or -1 on
326like the syscall). 346error, just like the syscall).
347
348C<aio_read> will, like C<sysread>, shrink or grow the C<$data> scalar to
349offset plus the actual number of bytes read.
350
351If C<$offset> is undefined, then the current file descriptor offset will
352be used (and updated), otherwise the file descriptor offset will not be
353changed by these calls.
354
355If C<$length> is undefined in C<aio_write>, use the remaining length of
356C<$data>.
357
358If C<$dataoffset> is less than zero, it will be counted from the end of
359C<$data>.
327 360
328The C<$data> scalar I<MUST NOT> be modified in any way while the request 361The C<$data> scalar I<MUST NOT> be modified in any way while the request
329is outstanding. Modifying it can result in segfaults or WW3 (if the 362is outstanding. Modifying it can result in segfaults or World War III (if
330necessary/optional hardware is installed). 363the necessary/optional hardware is installed).
331 364
332Example: Read 15 bytes at offset 7 into scalar C<$buffer>, starting at 365Example: Read 15 bytes at offset 7 into scalar C<$buffer>, starting at
333offset C<0> within the scalar: 366offset C<0> within the scalar:
334 367
335 aio_read $fh, 7, 15, $buffer, 0, sub { 368 aio_read $fh, 7, 15, $buffer, 0, sub {
336 $_[0] > 0 or die "read error: $!"; 369 $_[0] > 0 or die "read error: $!";
337 print "read $_[0] bytes: <$buffer>\n"; 370 print "read $_[0] bytes: <$buffer>\n";
338 }; 371 };
372
339 373
340=item aio_sendfile $out_fh, $in_fh, $in_offset, $length, $callback->($retval) 374=item aio_sendfile $out_fh, $in_fh, $in_offset, $length, $callback->($retval)
341 375
342Tries to copy C<$length> bytes from C<$in_fh> to C<$out_fh>. It starts 376Tries to copy C<$length> bytes from C<$in_fh> to C<$out_fh>. It starts
343reading at byte offset C<$in_offset>, and starts writing at the current 377reading at byte offset C<$in_offset>, and starts writing at the current
357C<$in_fh> than are written, and there is no way to find out how many 391C<$in_fh> than are written, and there is no way to find out how many
358bytes have been read from C<aio_sendfile> alone, as C<aio_sendfile> only 392bytes have been read from C<aio_sendfile> alone, as C<aio_sendfile> only
359provides the number of bytes written to C<$out_fh>. Only if the result 393provides the number of bytes written to C<$out_fh>. Only if the result
360value equals C<$length> one can assume that C<$length> bytes have been 394value equals C<$length> one can assume that C<$length> bytes have been
361read. 395read.
396
362 397
363=item aio_readahead $fh,$offset,$length, $callback->($retval) 398=item aio_readahead $fh,$offset,$length, $callback->($retval)
364 399
365C<aio_readahead> populates the page cache with data from a file so that 400C<aio_readahead> populates the page cache with data from a file so that
366subsequent reads from that file will not block on disk I/O. The C<$offset> 401subsequent reads from that file will not block on disk I/O. The C<$offset>
372file. The current file offset of the file is left unchanged. 407file. The current file offset of the file is left unchanged.
373 408
374If that syscall doesn't exist (likely if your OS isn't Linux) it will be 409If that syscall doesn't exist (likely if your OS isn't Linux) it will be
375emulated by simply reading the data, which would have a similar effect. 410emulated by simply reading the data, which would have a similar effect.
376 411
412
377=item aio_stat $fh_or_path, $callback->($status) 413=item aio_stat $fh_or_path, $callback->($status)
378 414
379=item aio_lstat $fh, $callback->($status) 415=item aio_lstat $fh, $callback->($status)
380 416
381Works like perl's C<stat> or C<lstat> in void context. The callback will 417Works like perl's C<stat> or C<lstat> in void context. The callback will
394 aio_stat "/etc/passwd", sub { 430 aio_stat "/etc/passwd", sub {
395 $_[0] and die "stat failed: $!"; 431 $_[0] and die "stat failed: $!";
396 print "size is ", -s _, "\n"; 432 print "size is ", -s _, "\n";
397 }; 433 };
398 434
435
436=item aio_utime $fh_or_path, $atime, $mtime, $callback->($status)
437
438Works like perl's C<utime> function (including the special case of $atime
439and $mtime being undef). Fractional times are supported if the underlying
440syscalls support them.
441
442When called with a pathname, uses utimes(2) if available, otherwise
443utime(2). If called on a file descriptor, uses futimes(2) if available,
444otherwise returns ENOSYS, so this is not portable.
445
446Examples:
447
448 # set atime and mtime to current time (basically touch(1)):
449 aio_utime "path", undef, undef;
450 # set atime to current time and mtime to beginning of the epoch:
451 aio_utime "path", time, undef; # undef==0
452
453
454=item aio_chown $fh_or_path, $uid, $gid, $callback->($status)
455
456Works like perl's C<chown> function, except that C<undef> for either $uid
457or $gid is being interpreted as "do not change" (but -1 can also be used).
458
459Examples:
460
461 # same as "chown root path" in the shell:
462 aio_chown "path", 0, -1;
463 # same as above:
464 aio_chown "path", 0, undef;
465
466
467=item aio_truncate $fh_or_path, $offset, $callback->($status)
468
469Works like truncate(2) or ftruncate(2).
470
471
472=item aio_chmod $fh_or_path, $mode, $callback->($status)
473
474Works like perl's C<chmod> function.
475
476
399=item aio_unlink $pathname, $callback->($status) 477=item aio_unlink $pathname, $callback->($status)
400 478
401Asynchronously unlink (delete) a file and call the callback with the 479Asynchronously unlink (delete) a file and call the callback with the
402result code. 480result code.
403 481
482
404=item aio_mknod $path, $mode, $dev, $callback->($status) 483=item aio_mknod $path, $mode, $dev, $callback->($status)
405 484
406[EXPERIMENTAL] 485[EXPERIMENTAL]
407 486
408Asynchronously create a device node (or fifo). See mknod(2). 487Asynchronously create a device node (or fifo). See mknod(2).
409 488
410The only (POSIX-) portable way of calling this function is: 489The only (POSIX-) portable way of calling this function is:
411 490
412 aio_mknod $path, IO::AIO::S_IFIFO | $mode, 0, sub { ... 491 aio_mknod $path, IO::AIO::S_IFIFO | $mode, 0, sub { ...
492
413 493
414=item aio_link $srcpath, $dstpath, $callback->($status) 494=item aio_link $srcpath, $dstpath, $callback->($status)
415 495
416Asynchronously create a new link to the existing object at C<$srcpath> at 496Asynchronously create a new link to the existing object at C<$srcpath> at
417the path C<$dstpath> and call the callback with the result code. 497the path C<$dstpath> and call the callback with the result code.
418 498
499
419=item aio_symlink $srcpath, $dstpath, $callback->($status) 500=item aio_symlink $srcpath, $dstpath, $callback->($status)
420 501
421Asynchronously create a new symbolic link to the existing object at C<$srcpath> at 502Asynchronously create a new symbolic link to the existing object at C<$srcpath> at
422the path C<$dstpath> and call the callback with the result code. 503the path C<$dstpath> and call the callback with the result code.
504
423 505
424=item aio_readlink $path, $callback->($link) 506=item aio_readlink $path, $callback->($link)
425 507
426Asynchronously read the symlink specified by C<$path> and pass it to 508Asynchronously read the symlink specified by C<$path> and pass it to
427the callback. If an error occurs, nothing or undef gets passed to the 509the callback. If an error occurs, nothing or undef gets passed to the
428callback. 510callback.
429 511
512
430=item aio_rename $srcpath, $dstpath, $callback->($status) 513=item aio_rename $srcpath, $dstpath, $callback->($status)
431 514
432Asynchronously rename the object at C<$srcpath> to C<$dstpath>, just as 515Asynchronously rename the object at C<$srcpath> to C<$dstpath>, just as
433rename(2) and call the callback with the result code. 516rename(2) and call the callback with the result code.
434 517
518
519=item aio_mkdir $pathname, $mode, $callback->($status)
520
521Asynchronously mkdir (create) a directory and call the callback with
522the result code. C<$mode> will be modified by the umask at the time the
523request is executed, so do not change your umask.
524
525
435=item aio_rmdir $pathname, $callback->($status) 526=item aio_rmdir $pathname, $callback->($status)
436 527
437Asynchronously rmdir (delete) a directory and call the callback with the 528Asynchronously rmdir (delete) a directory and call the callback with the
438result code. 529result code.
530
439 531
440=item aio_readdir $pathname, $callback->($entries) 532=item aio_readdir $pathname, $callback->($entries)
441 533
442Unlike the POSIX call of the same name, C<aio_readdir> reads an entire 534Unlike the POSIX call of the same name, C<aio_readdir> reads an entire
443directory (i.e. opendir + readdir + closedir). The entries will not be 535directory (i.e. opendir + readdir + closedir). The entries will not be
444sorted, and will B<NOT> include the C<.> and C<..> entries. 536sorted, and will B<NOT> include the C<.> and C<..> entries.
445 537
446The callback a single argument which is either C<undef> or an array-ref 538The callback a single argument which is either C<undef> or an array-ref
447with the filenames. 539with the filenames.
448 540
541
449=item aio_load $path, $data, $callback->($status) 542=item aio_load $path, $data, $callback->($status)
450 543
451This is a composite request that tries to fully load the given file into 544This is a composite request that tries to fully load the given file into
452memory. Status is the same as with aio_read. 545memory. Status is the same as with aio_read.
453 546
454=cut 547=cut
455 548
456sub aio_load($$;$) { 549sub aio_load($$;$) {
457 aio_block {
458 my ($path, undef, $cb) = @_; 550 my ($path, undef, $cb) = @_;
459 my $data = \$_[1]; 551 my $data = \$_[1];
460 552
461 my $pri = aioreq_pri; 553 my $pri = aioreq_pri;
462 my $grp = aio_group $cb; 554 my $grp = aio_group $cb;
555
556 aioreq_pri $pri;
557 add $grp aio_open $path, O_RDONLY, 0, sub {
558 my $fh = shift
559 or return $grp->result (-1);
463 560
464 aioreq_pri $pri; 561 aioreq_pri $pri;
465 add $grp aio_open $path, O_RDONLY, 0, sub {
466 my ($fh) = @_
467 or return $grp->result (-1);
468
469 aioreq_pri $pri;
470 add $grp aio_read $fh, 0, (-s $fh), $$data, 0, sub { 562 add $grp aio_read $fh, 0, (-s $fh), $$data, 0, sub {
471 $grp->result ($_[0]); 563 $grp->result ($_[0]);
472 };
473 }; 564 };
474
475 $grp
476 } 565 };
566
567 $grp
477} 568}
478 569
479=item aio_copy $srcpath, $dstpath, $callback->($status) 570=item aio_copy $srcpath, $dstpath, $callback->($status)
480 571
481Try to copy the I<file> (directories not supported as either source or 572Try to copy the I<file> (directories not supported as either source or
482destination) from C<$srcpath> to C<$dstpath> and call the callback with 573destination) from C<$srcpath> to C<$dstpath> and call the callback with
483the C<0> (error) or C<-1> ok. 574the C<0> (error) or C<-1> ok.
484 575
485This is a composite request that it creates the destination file with 576This is a composite request that creates the destination file with
486mode 0200 and copies the contents of the source file into it using 577mode 0200 and copies the contents of the source file into it using
487C<aio_sendfile>, followed by restoring atime, mtime, access mode and 578C<aio_sendfile>, followed by restoring atime, mtime, access mode and
488uid/gid, in that order. 579uid/gid, in that order.
489 580
490If an error occurs, the partial destination file will be unlinked, if 581If an error occurs, the partial destination file will be unlinked, if
492errors are being ignored. 583errors are being ignored.
493 584
494=cut 585=cut
495 586
496sub aio_copy($$;$) { 587sub aio_copy($$;$) {
497 aio_block {
498 my ($src, $dst, $cb) = @_; 588 my ($src, $dst, $cb) = @_;
499 589
500 my $pri = aioreq_pri; 590 my $pri = aioreq_pri;
501 my $grp = aio_group $cb; 591 my $grp = aio_group $cb;
502 592
503 aioreq_pri $pri; 593 aioreq_pri $pri;
504 add $grp aio_open $src, O_RDONLY, 0, sub { 594 add $grp aio_open $src, O_RDONLY, 0, sub {
505 if (my $src_fh = $_[0]) { 595 if (my $src_fh = $_[0]) {
506 my @stat = stat $src_fh; 596 my @stat = stat $src_fh;
507 597
508 aioreq_pri $pri; 598 aioreq_pri $pri;
509 add $grp aio_open $dst, O_CREAT | O_WRONLY | O_TRUNC, 0200, sub { 599 add $grp aio_open $dst, O_CREAT | O_WRONLY | O_TRUNC, 0200, sub {
510 if (my $dst_fh = $_[0]) { 600 if (my $dst_fh = $_[0]) {
511 aioreq_pri $pri; 601 aioreq_pri $pri;
512 add $grp aio_sendfile $dst_fh, $src_fh, 0, $stat[7], sub { 602 add $grp aio_sendfile $dst_fh, $src_fh, 0, $stat[7], sub {
513 if ($_[0] == $stat[7]) { 603 if ($_[0] == $stat[7]) {
514 $grp->result (0); 604 $grp->result (0);
515 close $src_fh; 605 close $src_fh;
516 606
517 # those should not normally block. should. should. 607 # those should not normally block. should. should.
518 utime $stat[8], $stat[9], $dst; 608 utime $stat[8], $stat[9], $dst;
519 chmod $stat[2] & 07777, $dst_fh; 609 chmod $stat[2] & 07777, $dst_fh;
520 chown $stat[4], $stat[5], $dst_fh; 610 chown $stat[4], $stat[5], $dst_fh;
611
612 aioreq_pri $pri;
521 close $dst_fh; 613 add $grp aio_close $dst_fh;
522 } else { 614 } else {
523 $grp->result (-1); 615 $grp->result (-1);
524 close $src_fh; 616 close $src_fh;
525 close $dst_fh; 617 close $dst_fh;
526 618
527 aioreq $pri; 619 aioreq $pri;
528 add $grp aio_unlink $dst; 620 add $grp aio_unlink $dst;
529 }
530 }; 621 }
531 } else {
532 $grp->result (-1);
533 } 622 };
623 } else {
624 $grp->result (-1);
534 }, 625 }
535
536 } else {
537 $grp->result (-1);
538 } 626 },
627
628 } else {
629 $grp->result (-1);
539 }; 630 }
540
541 $grp
542 } 631 };
632
633 $grp
543} 634}
544 635
545=item aio_move $srcpath, $dstpath, $callback->($status) 636=item aio_move $srcpath, $dstpath, $callback->($status)
546 637
547Try to move the I<file> (directories not supported as either source or 638Try to move the I<file> (directories not supported as either source or
548destination) from C<$srcpath> to C<$dstpath> and call the callback with 639destination) from C<$srcpath> to C<$dstpath> and call the callback with
549the C<0> (error) or C<-1> ok. 640the C<0> (error) or C<-1> ok.
550 641
551This is a composite request that tries to rename(2) the file first. If 642This is a composite request that tries to rename(2) the file first; if
552rename files with C<EXDEV>, it copies the file with C<aio_copy> and, if 643rename fails with C<EXDEV>, it copies the file with C<aio_copy> and, if
553that is successful, unlinking the C<$srcpath>. 644that is successful, unlinks the C<$srcpath>.
554 645
555=cut 646=cut
556 647
557sub aio_move($$;$) { 648sub aio_move($$;$) {
558 aio_block {
559 my ($src, $dst, $cb) = @_; 649 my ($src, $dst, $cb) = @_;
560 650
561 my $pri = aioreq_pri; 651 my $pri = aioreq_pri;
562 my $grp = aio_group $cb; 652 my $grp = aio_group $cb;
563 653
564 aioreq_pri $pri; 654 aioreq_pri $pri;
565 add $grp aio_rename $src, $dst, sub { 655 add $grp aio_rename $src, $dst, sub {
566 if ($_[0] && $! == EXDEV) { 656 if ($_[0] && $! == EXDEV) {
567 aioreq_pri $pri; 657 aioreq_pri $pri;
568 add $grp aio_copy $src, $dst, sub { 658 add $grp aio_copy $src, $dst, sub {
569 $grp->result ($_[0]);
570
571 if (!$_[0]) {
572 aioreq_pri $pri;
573 add $grp aio_unlink $src;
574 }
575 };
576 } else {
577 $grp->result ($_[0]); 659 $grp->result ($_[0]);
660
661 if (!$_[0]) {
662 aioreq_pri $pri;
663 add $grp aio_unlink $src;
664 }
578 } 665 };
666 } else {
667 $grp->result ($_[0]);
579 }; 668 }
580
581 $grp
582 } 669 };
670
671 $grp
583} 672}
584 673
585=item aio_scandir $path, $maxreq, $callback->($dirs, $nondirs) 674=item aio_scandir $path, $maxreq, $callback->($dirs, $nondirs)
586 675
587Scans a directory (similar to C<aio_readdir>) but additionally tries to 676Scans a directory (similar to C<aio_readdir>) but additionally tries to
635directory counting heuristic. 724directory counting heuristic.
636 725
637=cut 726=cut
638 727
639sub aio_scandir($$;$) { 728sub aio_scandir($$;$) {
640 aio_block {
641 my ($path, $maxreq, $cb) = @_; 729 my ($path, $maxreq, $cb) = @_;
642 730
643 my $pri = aioreq_pri; 731 my $pri = aioreq_pri;
644 732
645 my $grp = aio_group $cb; 733 my $grp = aio_group $cb;
646 734
647 $maxreq = 4 if $maxreq <= 0; 735 $maxreq = 4 if $maxreq <= 0;
648 736
649 # stat once 737 # stat once
738 aioreq_pri $pri;
739 add $grp aio_stat $path, sub {
740 return $grp->result () if $_[0];
741 my $now = time;
742 my $hash1 = join ":", (stat _)[0,1,3,7,9];
743
744 # read the directory entries
650 aioreq_pri $pri; 745 aioreq_pri $pri;
651 add $grp aio_stat $path, sub { 746 add $grp aio_readdir $path, sub {
747 my $entries = shift
652 return $grp->result () if $_[0]; 748 or return $grp->result ();
653 my $now = time;
654 my $hash1 = join ":", (stat _)[0,1,3,7,9];
655 749
656 # read the directory entries 750 # stat the dir another time
657 aioreq_pri $pri; 751 aioreq_pri $pri;
658 add $grp aio_readdir $path, sub {
659 my $entries = shift
660 or return $grp->result ();
661
662 # stat the dir another time
663 aioreq_pri $pri;
664 add $grp aio_stat $path, sub { 752 add $grp aio_stat $path, sub {
665 my $hash2 = join ":", (stat _)[0,1,3,7,9]; 753 my $hash2 = join ":", (stat _)[0,1,3,7,9];
666 754
667 my $ndirs; 755 my $ndirs;
668 756
669 # take the slow route if anything looks fishy 757 # take the slow route if anything looks fishy
670 if ($hash1 ne $hash2 or (stat _)[9] == $now) { 758 if ($hash1 ne $hash2 or (stat _)[9] == $now) {
671 $ndirs = -1; 759 $ndirs = -1;
672 } else { 760 } else {
673 # if nlink == 2, we are finished 761 # if nlink == 2, we are finished
674 # on non-posix-fs's, we rely on nlink < 2 762 # on non-posix-fs's, we rely on nlink < 2
675 $ndirs = (stat _)[3] - 2 763 $ndirs = (stat _)[3] - 2
676 or return $grp->result ([], $entries); 764 or return $grp->result ([], $entries);
677 } 765 }
678 766
679 # sort into likely dirs and likely nondirs 767 # sort into likely dirs and likely nondirs
680 # dirs == files without ".", short entries first 768 # dirs == files without ".", short entries first
681 $entries = [map $_->[0], 769 $entries = [map $_->[0],
682 sort { $b->[1] cmp $a->[1] } 770 sort { $b->[1] cmp $a->[1] }
683 map [$_, sprintf "%s%04d", (/.\./ ? "1" : "0"), length], 771 map [$_, sprintf "%s%04d", (/.\./ ? "1" : "0"), length],
684 @$entries]; 772 @$entries];
685 773
686 my (@dirs, @nondirs); 774 my (@dirs, @nondirs);
687 775
688 my $statgrp = add $grp aio_group sub { 776 my $statgrp = add $grp aio_group sub {
689 $grp->result (\@dirs, \@nondirs); 777 $grp->result (\@dirs, \@nondirs);
690 }; 778 };
691 779
692 limit $statgrp $maxreq; 780 limit $statgrp $maxreq;
693 feed $statgrp sub { 781 feed $statgrp sub {
694 return unless @$entries; 782 return unless @$entries;
695 my $entry = pop @$entries; 783 my $entry = pop @$entries;
696 784
697 aioreq_pri $pri; 785 aioreq_pri $pri;
698 add $statgrp aio_stat "$path/$entry/.", sub { 786 add $statgrp aio_stat "$path/$entry/.", sub {
699 if ($_[0] < 0) { 787 if ($_[0] < 0) {
700 push @nondirs, $entry; 788 push @nondirs, $entry;
701 } else { 789 } else {
702 # need to check for real directory 790 # need to check for real directory
703 aioreq_pri $pri; 791 aioreq_pri $pri;
704 add $statgrp aio_lstat "$path/$entry", sub { 792 add $statgrp aio_lstat "$path/$entry", sub {
705 if (-d _) { 793 if (-d _) {
706 push @dirs, $entry; 794 push @dirs, $entry;
707 795
708 unless (--$ndirs) { 796 unless (--$ndirs) {
709 push @nondirs, @$entries; 797 push @nondirs, @$entries;
710 feed $statgrp; 798 feed $statgrp;
711 }
712 } else {
713 push @nondirs, $entry;
714 } 799 }
800 } else {
801 push @nondirs, $entry;
715 } 802 }
716 } 803 }
717 }; 804 }
718 }; 805 };
719 }; 806 };
720 }; 807 };
721 }; 808 };
722
723 $grp
724 } 809 };
810
811 $grp
725} 812}
726 813
727=item aio_rmtree $path, $callback->($status) 814=item aio_rmtree $path, $callback->($status)
728 815
729Delete a directory tree starting (and including) C<$path>, return the 816Delete a directory tree starting (and including) C<$path>, return the
733 820
734=cut 821=cut
735 822
736sub aio_rmtree; 823sub aio_rmtree;
737sub aio_rmtree($;$) { 824sub aio_rmtree($;$) {
738 aio_block {
739 my ($path, $cb) = @_; 825 my ($path, $cb) = @_;
740 826
741 my $pri = aioreq_pri; 827 my $pri = aioreq_pri;
742 my $grp = aio_group $cb; 828 my $grp = aio_group $cb;
743 829
744 aioreq_pri $pri; 830 aioreq_pri $pri;
745 add $grp aio_scandir $path, 0, sub { 831 add $grp aio_scandir $path, 0, sub {
746 my ($dirs, $nondirs) = @_; 832 my ($dirs, $nondirs) = @_;
747 833
748 my $dirgrp = aio_group sub { 834 my $dirgrp = aio_group sub {
749 add $grp aio_rmdir $path, sub { 835 add $grp aio_rmdir $path, sub {
750 $grp->result ($_[0]); 836 $grp->result ($_[0]);
751 };
752 }; 837 };
753
754 (aioreq_pri $pri), add $dirgrp aio_rmtree "$path/$_" for @$dirs;
755 (aioreq_pri $pri), add $dirgrp aio_unlink "$path/$_" for @$nondirs;
756
757 add $grp $dirgrp;
758 }; 838 };
759 839
760 $grp 840 (aioreq_pri $pri), add $dirgrp aio_rmtree "$path/$_" for @$dirs;
841 (aioreq_pri $pri), add $dirgrp aio_unlink "$path/$_" for @$nondirs;
842
843 add $grp $dirgrp;
761 } 844 };
845
846 $grp
762} 847}
848
849=item aio_sync $callback->($status)
850
851Asynchronously call sync and call the callback when finished.
763 852
764=item aio_fsync $fh, $callback->($status) 853=item aio_fsync $fh, $callback->($status)
765 854
766Asynchronously call fsync on the given filehandle and call the callback 855Asynchronously call fsync on the given filehandle and call the callback
767with the fsync result code. 856with the fsync result code.
771Asynchronously call fdatasync on the given filehandle and call the 860Asynchronously call fdatasync on the given filehandle and call the
772callback with the fdatasync result code. 861callback with the fdatasync result code.
773 862
774If this call isn't available because your OS lacks it or it couldn't be 863If this call isn't available because your OS lacks it or it couldn't be
775detected, it will be emulated by calling C<fsync> instead. 864detected, it will be emulated by calling C<fsync> instead.
865
866=item aio_sync_file_range $fh, $offset, $nbytes, $flags, $callback->($status)
867
868Sync the data portion of the file specified by C<$offset> and C<$length>
869to disk (but NOT the metadata), by calling the Linux-specific
870sync_file_range call. If sync_file_range is not available or it returns
871ENOSYS, then fdatasync or fsync is being substituted.
872
873C<$flags> can be a combination of C<IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE>,
874C<IO::AIO::SYNC_FILE_RANGE_WRITE> and
875C<IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER>: refer to the sync_file_range
876manpage for details.
877
878=item aio_pathsync $path, $callback->($status)
879
880This request tries to open, fsync and close the given path. This is a
881composite request intended to sync directories after directory operations
882(E.g. rename). This might not work on all operating systems or have any
883specific effect, but usually it makes sure that directory changes get
884written to disc. It works for anything that can be opened for read-only,
885not just directories.
886
887Passes C<0> when everything went ok, and C<-1> on error.
888
889=cut
890
891sub aio_pathsync($;$) {
892 my ($path, $cb) = @_;
893
894 my $pri = aioreq_pri;
895 my $grp = aio_group $cb;
896
897 aioreq_pri $pri;
898 add $grp aio_open $path, O_RDONLY, 0, sub {
899 my ($fh) = @_;
900 if ($fh) {
901 aioreq_pri $pri;
902 add $grp aio_fsync $fh, sub {
903 $grp->result ($_[0]);
904
905 aioreq_pri $pri;
906 add $grp aio_close $fh;
907 };
908 } else {
909 $grp->result (-1);
910 }
911 };
912
913 $grp
914}
776 915
777=item aio_group $callback->(...) 916=item aio_group $callback->(...)
778 917
779This is a very special aio request: Instead of doing something, it is a 918This is a very special aio request: Instead of doing something, it is a
780container for other aio requests, which is useful if you want to bundle 919container for other aio requests, which is useful if you want to bundle
892Their lifetime, simplified, looks like this: when they are empty, they 1031Their lifetime, simplified, looks like this: when they are empty, they
893will finish very quickly. If they contain only requests that are in the 1032will finish very quickly. If they contain only requests that are in the
894C<done> state, they will also finish. Otherwise they will continue to 1033C<done> state, they will also finish. Otherwise they will continue to
895exist. 1034exist.
896 1035
897That means after creating a group you have some time to add requests. And 1036That means after creating a group you have some time to add requests
898in the callbacks of those requests, you can add further requests to the 1037(precisely before the callback has been invoked, which is only done within
899group. And only when all those requests have finished will the the group 1038the C<poll_cb>). And in the callbacks of those requests, you can add
900itself finish. 1039further requests to the group. And only when all those requests have
1040finished will the the group itself finish.
901 1041
902=over 4 1042=over 4
903 1043
904=item add $grp ... 1044=item add $grp ...
905 1045
917itself. Useful when you queued a lot of events but got a result early. 1057itself. Useful when you queued a lot of events but got a result early.
918 1058
919=item $grp->result (...) 1059=item $grp->result (...)
920 1060
921Set the result value(s) that will be passed to the group callback when all 1061Set the result value(s) that will be passed to the group callback when all
922subrequests have finished and set thre groups errno to the current value 1062subrequests have finished and set the groups errno to the current value
923of errno (just like calling C<errno> without an error number). By default, 1063of errno (just like calling C<errno> without an error number). By default,
924no argument will be passed and errno is zero. 1064no argument will be passed and errno is zero.
925 1065
926=item $grp->errno ([$errno]) 1066=item $grp->errno ([$errno])
927 1067
938=item feed $grp $callback->($grp) 1078=item feed $grp $callback->($grp)
939 1079
940Sets a feeder/generator on this group: every group can have an attached 1080Sets a feeder/generator on this group: every group can have an attached
941generator that generates requests if idle. The idea behind this is that, 1081generator that generates requests if idle. The idea behind this is that,
942although you could just queue as many requests as you want in a group, 1082although you could just queue as many requests as you want in a group,
943this might starve other requests for a potentially long time. For 1083this might starve other requests for a potentially long time. For example,
944example, C<aio_scandir> might generate hundreds of thousands C<aio_stat> 1084C<aio_scandir> might generate hundreds of thousands C<aio_stat> requests,
945requests, delaying any later requests for a long time. 1085delaying any later requests for a long time.
946 1086
947To avoid this, and allow incremental generation of requests, you can 1087To avoid this, and allow incremental generation of requests, you can
948instead a group and set a feeder on it that generates those requests. The 1088instead a group and set a feeder on it that generates those requests. The
949feed callback will be called whenever there are few enough (see C<limit>, 1089feed callback will be called whenever there are few enough (see C<limit>,
950below) requests active in the group itself and is expected to queue more 1090below) requests active in the group itself and is expected to queue more
954not impose any limits). 1094not impose any limits).
955 1095
956If the feed does not queue more requests when called, it will be 1096If the feed does not queue more requests when called, it will be
957automatically removed from the group. 1097automatically removed from the group.
958 1098
959If the feed limit is C<0>, it will be set to C<2> automatically. 1099If the feed limit is C<0> when this method is called, it will be set to
1100C<2> automatically.
960 1101
961Example: 1102Example:
962 1103
963 # stat all files in @files, but only ever use four aio requests concurrently: 1104 # stat all files in @files, but only ever use four aio requests concurrently:
964 1105
976Sets the feeder limit for the group: The feeder will be called whenever 1117Sets the feeder limit for the group: The feeder will be called whenever
977the group contains less than this many requests. 1118the group contains less than this many requests.
978 1119
979Setting the limit to C<0> will pause the feeding process. 1120Setting the limit to C<0> will pause the feeding process.
980 1121
1122The default value for the limit is C<0>, but note that setting a feeder
1123automatically bumps it up to C<2>.
1124
981=back 1125=back
982 1126
983=head2 SUPPORT FUNCTIONS 1127=head2 SUPPORT FUNCTIONS
984 1128
985=head3 EVENT PROCESSING AND EVENT LOOP INTEGRATION 1129=head3 EVENT PROCESSING AND EVENT LOOP INTEGRATION
996See C<poll_cb> for an example. 1140See C<poll_cb> for an example.
997 1141
998=item IO::AIO::poll_cb 1142=item IO::AIO::poll_cb
999 1143
1000Process some outstanding events on the result pipe. You have to call this 1144Process some outstanding events on the result pipe. You have to call this
1001regularly. Returns the number of events processed. Returns immediately 1145regularly. Returns C<0> if all events could be processed, or C<-1> if it
1146returned earlier for whatever reason. Returns immediately when no events
1002when no events are outstanding. The amount of events processed depends on 1147are outstanding. The amount of events processed depends on the settings of
1003the settings of C<IO::AIO::max_poll_req> and C<IO::AIO::max_poll_time>. 1148C<IO::AIO::max_poll_req> and C<IO::AIO::max_poll_time>.
1004 1149
1005If not all requests were processed for whatever reason, the filehandle 1150If not all requests were processed for whatever reason, the filehandle
1006will still be ready when C<poll_cb> returns. 1151will still be ready when C<poll_cb> returns, so normally you don't have to
1152do anything special to have it called later.
1007 1153
1008Example: Install an Event watcher that automatically calls 1154Example: Install an Event watcher that automatically calls
1009IO::AIO::poll_cb with high priority: 1155IO::AIO::poll_cb with high priority:
1010 1156
1011 Event->io (fd => IO::AIO::poll_fileno, 1157 Event->io (fd => IO::AIO::poll_fileno,
1070Strictly equivalent to: 1216Strictly equivalent to:
1071 1217
1072 IO::AIO::poll_wait, IO::AIO::poll_cb 1218 IO::AIO::poll_wait, IO::AIO::poll_cb
1073 while IO::AIO::nreqs; 1219 while IO::AIO::nreqs;
1074 1220
1221=back
1222
1075=head3 CONTROLLING THE NUMBER OF THREADS 1223=head3 CONTROLLING THE NUMBER OF THREADS
1224
1225=over
1076 1226
1077=item IO::AIO::min_parallel $nthreads 1227=item IO::AIO::min_parallel $nthreads
1078 1228
1079Set the minimum number of AIO threads to C<$nthreads>. The current 1229Set the minimum number of AIO threads to C<$nthreads>. The current
1080default is C<8>, which means eight asynchronous operations can execute 1230default is C<8>, which means eight asynchronous operations can execute
1121 1271
1122The default is probably ok in most situations, especially if thread 1272The default is probably ok in most situations, especially if thread
1123creation is fast. If thread creation is very slow on your system you might 1273creation is fast. If thread creation is very slow on your system you might
1124want to use larger values. 1274want to use larger values.
1125 1275
1126=item $oldmaxreqs = IO::AIO::max_outstanding $maxreqs 1276=item IO::AIO::max_outstanding $maxreqs
1127 1277
1128This is a very bad function to use in interactive programs because it 1278This is a very bad function to use in interactive programs because it
1129blocks, and a bad way to reduce concurrency because it is inexact: Better 1279blocks, and a bad way to reduce concurrency because it is inexact: Better
1130use an C<aio_group> together with a feed callback. 1280use an C<aio_group> together with a feed callback.
1131 1281
1132Sets the maximum number of outstanding requests to C<$nreqs>. If you 1282Sets the maximum number of outstanding requests to C<$nreqs>. If you
1133to queue up more than this number of requests, the next call to the 1283do queue up more than this number of requests, the next call to the
1134C<poll_cb> (and C<poll_some> and other functions calling C<poll_cb>) 1284C<poll_cb> (and C<poll_some> and other functions calling C<poll_cb>)
1135function will block until the limit is no longer exceeded. 1285function will block until the limit is no longer exceeded.
1136 1286
1137The default value is very large, so there is no practical limit on the 1287The default value is very large, so there is no practical limit on the
1138number of outstanding requests. 1288number of outstanding requests.
1139 1289
1140You can still queue as many requests as you want. Therefore, 1290You can still queue as many requests as you want. Therefore,
1141C<max_oustsanding> is mainly useful in simple scripts (with low values) or 1291C<max_outstanding> is mainly useful in simple scripts (with low values) or
1142as a stop gap to shield against fatal memory overflow (with large values). 1292as a stop gap to shield against fatal memory overflow (with large values).
1143 1293
1294=back
1295
1144=head3 STATISTICAL INFORMATION 1296=head3 STATISTICAL INFORMATION
1297
1298=over
1145 1299
1146=item IO::AIO::nreqs 1300=item IO::AIO::nreqs
1147 1301
1148Returns the number of requests currently in the ready, execute or pending 1302Returns the number of requests currently in the ready, execute or pending
1149states (i.e. for which their callback has not been invoked yet). 1303states (i.e. for which their callback has not been invoked yet).
1164but not yet processed by poll_cb). 1318but not yet processed by poll_cb).
1165 1319
1166=back 1320=back
1167 1321
1168=cut 1322=cut
1169
1170# support function to convert a fd into a perl filehandle
1171sub _fd2fh {
1172 return undef if $_[0] < 0;
1173
1174 # try to generate nice filehandles
1175 my $sym = "IO::AIO::fd#$_[0]";
1176 local *$sym;
1177
1178 open *$sym, "+<&=$_[0]" # usually works under any unix
1179 or open *$sym, "<&=$_[0]" # cygwin needs this
1180 or open *$sym, ">&=$_[0]" # or this
1181 or return undef;
1182
1183 *$sym
1184}
1185 1323
1186min_parallel 8; 1324min_parallel 8;
1187 1325
1188END { flush } 1326END { flush }
1189 1327
1213bytes of memory. In addition, stat requests need a stat buffer (possibly 1351bytes of memory. In addition, stat requests need a stat buffer (possibly
1214a few hundred bytes), readdir requires a result buffer and so on. Perl 1352a few hundred bytes), readdir requires a result buffer and so on. Perl
1215scalars and other data passed into aio requests will also be locked and 1353scalars and other data passed into aio requests will also be locked and
1216will consume memory till the request has entered the done state. 1354will consume memory till the request has entered the done state.
1217 1355
1218This is now awfully much, so queuing lots of requests is not usually a 1356This is not awfully much, so queuing lots of requests is not usually a
1219problem. 1357problem.
1220 1358
1221Per-thread usage: 1359Per-thread usage:
1222 1360
1223In the execution phase, some aio requests require more memory for 1361In the execution phase, some aio requests require more memory for
1228 1366
1229Known bugs will be fixed in the next release. 1367Known bugs will be fixed in the next release.
1230 1368
1231=head1 SEE ALSO 1369=head1 SEE ALSO
1232 1370
1233L<Coro::AIO>. 1371L<AnyEvent::AIO> for easy integration into event loops, L<Coro::AIO> for a
1372more natural syntax.
1234 1373
1235=head1 AUTHOR 1374=head1 AUTHOR
1236 1375
1237 Marc Lehmann <schmorp@schmorp.de> 1376 Marc Lehmann <schmorp@schmorp.de>
1238 http://home.schmorp.de/ 1377 http://home.schmorp.de/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines