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

Comparing IO-AIO/README (file contents):
Revision 1.23 by root, Mon Jan 22 15:59:52 2007 UTC vs.
Revision 1.35 by root, Tue Apr 21 20:06:05 2009 UTC

24 $req->cancel; # cancel request if still in queue 24 $req->cancel; # cancel request if still in queue
25 25
26 my $grp = aio_group sub { print "all stats done\n" }; 26 my $grp = aio_group sub { print "all stats done\n" };
27 add $grp aio_stat "..." for ...; 27 add $grp aio_stat "..." for ...;
28 28
29 # AnyEvent integration (EV, Event, Glib, Tk, POE, urxvt, pureperl...)
30 use AnyEvent::AIO;
31
29 # AnyEvent integration 32 # EV integration
30 open my $fh, "<&=" . IO::AIO::poll_fileno or die "$!"; 33 my $w = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
31 my $w = AnyEvent->io (fh => $fh, poll => 'r', cb => sub { IO::AIO::poll_cb });
32 34
33 # Event integration 35 # Event integration
34 Event->io (fd => IO::AIO::poll_fileno, 36 Event->io (fd => IO::AIO::poll_fileno,
35 poll => 'r', 37 poll => 'r',
36 cb => \&IO::AIO::poll_cb); 38 cb => \&IO::AIO::poll_cb);
61 faster on a RAID volume or over NFS when you do a number of stat 63 faster on a RAID volume or over NFS when you do a number of stat
62 operations concurrently. 64 operations concurrently.
63 65
64 While most of this works on all types of file descriptors (for example 66 While most of this works on all types of file descriptors (for example
65 sockets), using these functions on file descriptors that support 67 sockets), using these functions on file descriptors that support
66 nonblocking operation (again, sockets, pipes etc.) is very inefficient 68 nonblocking operation (again, sockets, pipes etc.) is very inefficient.
67 or might not work (aio_read fails on sockets/pipes/fifos). Use an event
68 loop for that (such as the Event module): IO::AIO will naturally fit 69 Use an event loop for that (such as the Event module): IO::AIO will
69 into such an event loop itself. 70 naturally fit into such an event loop itself.
70 71
71 In this version, a number of threads are started that execute your 72 In this version, a number of threads are started that execute your
72 requests and signal their completion. You don't need thread support in 73 requests and signal their completion. You don't need thread support in
73 perl, and the threads created by this module will not be visible to 74 perl, and the threads created by this module will not be visible to
74 perl. In the future, this module might make use of the native aio 75 perl. In the future, this module might make use of the native aio
76 not well-supported or restricted (GNU/Linux doesn't allow them on normal 77 not well-supported or restricted (GNU/Linux doesn't allow them on normal
77 files currently, for example), and they would only support aio_read and 78 files currently, for example), and they would only support aio_read and
78 aio_write, so the remaining functionality would have to be implemented 79 aio_write, so the remaining functionality would have to be implemented
79 using threads anyway. 80 using threads anyway.
80 81
81 Although the module will work with in the presence of other (Perl-) 82 Although the module will work in the presence of other (Perl-) threads,
82 threads, it is currently not reentrant in any way, so use appropriate 83 it is currently not reentrant in any way, so use appropriate locking
83 locking yourself, always call "poll_cb" from within the same thread, or 84 yourself, always call "poll_cb" from within the same thread, or never
84 never call "poll_cb" (or other "aio_" functions) recursively. 85 call "poll_cb" (or other "aio_" functions) recursively.
85 86
86 EXAMPLE 87 EXAMPLE
87 This is a simple example that uses the Event module and loads 88 This is a simple example that uses the Event module and loads
88 /etc/passwd asynchronously: 89 /etc/passwd asynchronously:
89 90
174 All the "aio_*" calls are more or less thin wrappers around the syscall 175 All the "aio_*" calls are more or less thin wrappers around the syscall
175 with the same name (sans "aio_"). The arguments are similar or 176 with the same name (sans "aio_"). The arguments are similar or
176 identical, and they all accept an additional (and optional) $callback 177 identical, and they all accept an additional (and optional) $callback
177 argument which must be a code reference. This code reference will get 178 argument which must be a code reference. This code reference will get
178 called with the syscall return code (e.g. most syscalls return -1 on 179 called with the syscall return code (e.g. most syscalls return -1 on
179 error, unlike perl, which usually delivers "false") as it's sole 180 error, unlike perl, which usually delivers "false") as its sole argument
180 argument when the given syscall has been executed asynchronously. 181 after the given syscall has been executed asynchronously.
181 182
182 All functions expecting a filehandle keep a copy of the filehandle 183 All functions expecting a filehandle keep a copy of the filehandle
183 internally until the request has finished. 184 internally until the request has finished.
184 185
185 All functions return request objects of type IO::AIO::REQ that allow 186 All functions return request objects of type IO::AIO::REQ that allow
198 the user environment, d) use Glib::filename_from_unicode on unicode 199 the user environment, d) use Glib::filename_from_unicode on unicode
199 filenames or e) use something else to ensure your scalar has the correct 200 filenames or e) use something else to ensure your scalar has the correct
200 contents. 201 contents.
201 202
202 This works, btw. independent of the internal UTF-8 bit, which IO::AIO 203 This works, btw. independent of the internal UTF-8 bit, which IO::AIO
203 handles correctly wether it is set or not. 204 handles correctly whether it is set or not.
204 205
205 $prev_pri = aioreq_pri [$pri] 206 $prev_pri = aioreq_pri [$pri]
206 Returns the priority value that would be used for the next request 207 Returns the priority value that would be used for the next request
207 and, if $pri is given, sets the priority for the next aio request. 208 and, if $pri is given, sets the priority for the next aio request.
208 209
259 } 260 }
260 }; 261 };
261 262
262 aio_close $fh, $callback->($status) 263 aio_close $fh, $callback->($status)
263 Asynchronously close a file and call the callback with the result 264 Asynchronously close a file and call the callback with the result
264 code. *WARNING:* although accepted, you should not pass in a perl 265 code.
265 filehandle here, as perl will likely close the file descriptor
266 another time when the filehandle is destroyed. Normally, you can
267 safely call perls "close" or just let filehandles go out of scope.
268 266
269 This is supposed to be a bug in the API, so that might change. It's 267 Unfortunately, you can't do this to perl. Perl *insists* very
270 therefore best to avoid this function. 268 strongly on closing the file descriptor associated with the
269 filehandle itself.
270
271 Therefore, "aio_close" will not close the filehandle - instead it
272 will use dup2 to overwrite the file descriptor with the write-end of
273 a pipe (the pipe fd will be created on demand and will be cached).
274
275 Or in other words: the file descriptor will be closed, but it will
276 not be free for reuse until the perl filehandle is closed.
271 277
272 aio_read $fh,$offset,$length, $data,$dataoffset, $callback->($retval) 278 aio_read $fh,$offset,$length, $data,$dataoffset, $callback->($retval)
273 aio_write $fh,$offset,$length, $data,$dataoffset, $callback->($retval) 279 aio_write $fh,$offset,$length, $data,$dataoffset, $callback->($retval)
274 Reads or writes "length" bytes from the specified "fh" and "offset" 280 Reads or writes $length bytes from or to the specified $fh and
275 into the scalar given by "data" and offset "dataoffset" and calls 281 $offset into the scalar given by $data and offset $dataoffset and
276 the callback without the actual number of bytes read (or -1 on 282 calls the callback without the actual number of bytes read (or -1 on
277 error, just like the syscall). 283 error, just like the syscall).
278 284
285 "aio_read" will, like "sysread", shrink or grow the $data scalar to
286 offset plus the actual number of bytes read.
287
288 If $offset is undefined, then the current file descriptor offset
289 will be used (and updated), otherwise the file descriptor offset
290 will not be changed by these calls.
291
292 If $length is undefined in "aio_write", use the remaining length of
293 $data.
294
295 If $dataoffset is less than zero, it will be counted from the end of
296 $data.
297
279 The $data scalar *MUST NOT* be modified in any way while the request 298 The $data scalar *MUST NOT* be modified in any way while the request
280 is outstanding. Modifying it can result in segfaults or WW3 (if the 299 is outstanding. Modifying it can result in segfaults or World War
281 necessary/optional hardware is installed). 300 III (if the necessary/optional hardware is installed).
282 301
283 Example: Read 15 bytes at offset 7 into scalar $buffer, starting at 302 Example: Read 15 bytes at offset 7 into scalar $buffer, starting at
284 offset 0 within the scalar: 303 offset 0 within the scalar:
285 304
286 aio_read $fh, 7, 15, $buffer, 0, sub { 305 aio_read $fh, 7, 15, $buffer, 0, sub {
344 aio_stat "/etc/passwd", sub { 363 aio_stat "/etc/passwd", sub {
345 $_[0] and die "stat failed: $!"; 364 $_[0] and die "stat failed: $!";
346 print "size is ", -s _, "\n"; 365 print "size is ", -s _, "\n";
347 }; 366 };
348 367
368 aio_utime $fh_or_path, $atime, $mtime, $callback->($status)
369 Works like perl's "utime" function (including the special case of
370 $atime and $mtime being undef). Fractional times are supported if
371 the underlying syscalls support them.
372
373 When called with a pathname, uses utimes(2) if available, otherwise
374 utime(2). If called on a file descriptor, uses futimes(2) if
375 available, otherwise returns ENOSYS, so this is not portable.
376
377 Examples:
378
379 # set atime and mtime to current time (basically touch(1)):
380 aio_utime "path", undef, undef;
381 # set atime to current time and mtime to beginning of the epoch:
382 aio_utime "path", time, undef; # undef==0
383
384 aio_chown $fh_or_path, $uid, $gid, $callback->($status)
385 Works like perl's "chown" function, except that "undef" for either
386 $uid or $gid is being interpreted as "do not change" (but -1 can
387 also be used).
388
389 Examples:
390
391 # same as "chown root path" in the shell:
392 aio_chown "path", 0, -1;
393 # same as above:
394 aio_chown "path", 0, undef;
395
396 aio_truncate $fh_or_path, $offset, $callback->($status)
397 Works like truncate(2) or ftruncate(2).
398
399 aio_chmod $fh_or_path, $mode, $callback->($status)
400 Works like perl's "chmod" function.
401
349 aio_unlink $pathname, $callback->($status) 402 aio_unlink $pathname, $callback->($status)
350 Asynchronously unlink (delete) a file and call the callback with the 403 Asynchronously unlink (delete) a file and call the callback with the
351 result code. 404 result code.
352 405
353 aio_mknod $path, $mode, $dev, $callback->($status) 406 aio_mknod $path, $mode, $dev, $callback->($status)
401 aio_copy $srcpath, $dstpath, $callback->($status) 454 aio_copy $srcpath, $dstpath, $callback->($status)
402 Try to copy the *file* (directories not supported as either source 455 Try to copy the *file* (directories not supported as either source
403 or destination) from $srcpath to $dstpath and call the callback with 456 or destination) from $srcpath to $dstpath and call the callback with
404 the 0 (error) or -1 ok. 457 the 0 (error) or -1 ok.
405 458
406 This is a composite request that it creates the destination file 459 This is a composite request that creates the destination file with
407 with mode 0200 and copies the contents of the source file into it 460 mode 0200 and copies the contents of the source file into it using
408 using "aio_sendfile", followed by restoring atime, mtime, access 461 "aio_sendfile", followed by restoring atime, mtime, access mode and
409 mode and uid/gid, in that order. 462 uid/gid, in that order.
410 463
411 If an error occurs, the partial destination file will be unlinked, 464 If an error occurs, the partial destination file will be unlinked,
412 if possible, except when setting atime, mtime, access mode and 465 if possible, except when setting atime, mtime, access mode and
413 uid/gid, where errors are being ignored. 466 uid/gid, where errors are being ignored.
414 467
415 aio_move $srcpath, $dstpath, $callback->($status) 468 aio_move $srcpath, $dstpath, $callback->($status)
416 Try to move the *file* (directories not supported as either source 469 Try to move the *file* (directories not supported as either source
417 or destination) from $srcpath to $dstpath and call the callback with 470 or destination) from $srcpath to $dstpath and call the callback with
418 the 0 (error) or -1 ok. 471 the 0 (error) or -1 ok.
419 472
420 This is a composite request that tries to rename(2) the file first. 473 This is a composite request that tries to rename(2) the file first;
421 If rename files with "EXDEV", it copies the file with "aio_copy" 474 if rename fails with "EXDEV", it copies the file with "aio_copy"
422 and, if that is successful, unlinking the $srcpath. 475 and, if that is successful, unlinks the $srcpath.
423 476
424 aio_scandir $path, $maxreq, $callback->($dirs, $nondirs) 477 aio_scandir $path, $maxreq, $callback->($dirs, $nondirs)
425 Scans a directory (similar to "aio_readdir") but additionally tries 478 Scans a directory (similar to "aio_readdir") but additionally tries
426 to efficiently separate the entries of directory $path into two sets 479 to efficiently separate the entries of directory $path into two sets
427 of names, directories you can recurse into (directories), and ones 480 of names, directories you can recurse into (directories), and ones
478 Delete a directory tree starting (and including) $path, return the 531 Delete a directory tree starting (and including) $path, return the
479 status of the final "rmdir" only. This is a composite request that 532 status of the final "rmdir" only. This is a composite request that
480 uses "aio_scandir" to recurse into and rmdir directories, and unlink 533 uses "aio_scandir" to recurse into and rmdir directories, and unlink
481 everything else. 534 everything else.
482 535
536 aio_sync $callback->($status)
537 Asynchronously call sync and call the callback when finished.
538
483 aio_fsync $fh, $callback->($status) 539 aio_fsync $fh, $callback->($status)
484 Asynchronously call fsync on the given filehandle and call the 540 Asynchronously call fsync on the given filehandle and call the
485 callback with the fsync result code. 541 callback with the fsync result code.
486 542
487 aio_fdatasync $fh, $callback->($status) 543 aio_fdatasync $fh, $callback->($status)
488 Asynchronously call fdatasync on the given filehandle and call the 544 Asynchronously call fdatasync on the given filehandle and call the
489 callback with the fdatasync result code. 545 callback with the fdatasync result code.
490 546
491 If this call isn't available because your OS lacks it or it couldn't 547 If this call isn't available because your OS lacks it or it couldn't
492 be detected, it will be emulated by calling "fsync" instead. 548 be detected, it will be emulated by calling "fsync" instead.
549
550 aio_sync_file_range $fh, $offset, $nbytes, $flags, $callback->($status)
551 Sync the data portion of the file specified by $offset and $length
552 to disk (but NOT the metadata), by calling the Linux-specific
553 sync_file_range call. If sync_file_range is not available or it
554 returns ENOSYS, then fdatasync or fsync is being substituted.
555
556 $flags can be a combination of
557 "IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE",
558 "IO::AIO::SYNC_FILE_RANGE_WRITE" and
559 "IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER": refer to the sync_file_range
560 manpage for details.
561
562 aio_pathsync $path, $callback->($status)
563 This request tries to open, fsync and close the given path. This is
564 a composite request intended to sync directories after directory
565 operations (E.g. rename). This might not work on all operating
566 systems or have any specific effect, but usually it makes sure that
567 directory changes get written to disc. It works for anything that
568 can be opened for read-only, not just directories.
569
570 Passes 0 when everything went ok, and -1 on error.
493 571
494 aio_group $callback->(...) 572 aio_group $callback->(...)
495 This is a very special aio request: Instead of doing something, it 573 This is a very special aio request: Instead of doing something, it
496 is a container for other aio requests, which is useful if you want 574 is a container for other aio requests, which is useful if you want
497 to bundle many requests into a single, composite, request with a 575 to bundle many requests into a single, composite, request with a
579 }; 657 };
580 658
581 This makes it very easy to create composite requests (see the source of 659 This makes it very easy to create composite requests (see the source of
582 "aio_move" for an application) that work and feel like simple requests. 660 "aio_move" for an application) that work and feel like simple requests.
583 661
584 * The IO::AIO::GRP objects will be cleaned up during calls to 662 * The IO::AIO::GRP objects will be cleaned up during calls to
585 "IO::AIO::poll_cb", just like any other request. 663 "IO::AIO::poll_cb", just like any other request.
664
586 * They can be canceled like any other request. Canceling will cancel not 665 * They can be canceled like any other request. Canceling will cancel
587 only the request itself, but also all requests it contains. 666 not only the request itself, but also all requests it contains.
667
588 * They can also can also be added to other IO::AIO::GRP objects. 668 * They can also can also be added to other IO::AIO::GRP objects.
669
589 * You must not add requests to a group from within the group callback 670 * You must not add requests to a group from within the group callback
590 (or any later time). 671 (or any later time).
591 672
592 Their lifetime, simplified, looks like this: when they are empty, they 673 Their lifetime, simplified, looks like this: when they are empty, they
593 will finish very quickly. If they contain only requests that are in the 674 will finish very quickly. If they contain only requests that are in the
594 "done" state, they will also finish. Otherwise they will continue to 675 "done" state, they will also finish. Otherwise they will continue to
595 exist. 676 exist.
596 677
597 That means after creating a group you have some time to add requests. 678 That means after creating a group you have some time to add requests
598 And in the callbacks of those requests, you can add further requests to 679 (precisely before the callback has been invoked, which is only done
599 the group. And only when all those requests have finished will the the 680 within the "poll_cb"). And in the callbacks of those requests, you can
600 group itself finish. 681 add further requests to the group. And only when all those requests have
682 finished will the the group itself finish.
601 683
602 add $grp ... 684 add $grp ...
603 $grp->add (...) 685 $grp->add (...)
604 Add one or more requests to the group. Any type of IO::AIO::REQ can 686 Add one or more requests to the group. Any type of IO::AIO::REQ can
605 be added, including other groups, as long as you do not create 687 be added, including other groups, as long as you do not create
612 request itself. Useful when you queued a lot of events but got a 694 request itself. Useful when you queued a lot of events but got a
613 result early. 695 result early.
614 696
615 $grp->result (...) 697 $grp->result (...)
616 Set the result value(s) that will be passed to the group callback 698 Set the result value(s) that will be passed to the group callback
617 when all subrequests have finished and set thre groups errno to the 699 when all subrequests have finished and set the groups errno to the
618 current value of errno (just like calling "errno" without an error 700 current value of errno (just like calling "errno" without an error
619 number). By default, no argument will be passed and errno is zero. 701 number). By default, no argument will be passed and errno is zero.
620 702
621 $grp->errno ([$errno]) 703 $grp->errno ([$errno])
622 Sets the group errno value to $errno, or the current value of errno 704 Sets the group errno value to $errno, or the current value of errno
648 does not impose any limits). 730 does not impose any limits).
649 731
650 If the feed does not queue more requests when called, it will be 732 If the feed does not queue more requests when called, it will be
651 automatically removed from the group. 733 automatically removed from the group.
652 734
653 If the feed limit is 0, it will be set to 2 automatically. 735 If the feed limit is 0 when this method is called, it will be set to
736 2 automatically.
654 737
655 Example: 738 Example:
656 739
657 # stat all files in @files, but only ever use four aio requests concurrently: 740 # stat all files in @files, but only ever use four aio requests concurrently:
658 741
668 limit $grp $num 751 limit $grp $num
669 Sets the feeder limit for the group: The feeder will be called 752 Sets the feeder limit for the group: The feeder will be called
670 whenever the group contains less than this many requests. 753 whenever the group contains less than this many requests.
671 754
672 Setting the limit to 0 will pause the feeding process. 755 Setting the limit to 0 will pause the feeding process.
756
757 The default value for the limit is 0, but note that setting a feeder
758 automatically bumps it up to 2.
673 759
674 SUPPORT FUNCTIONS 760 SUPPORT FUNCTIONS
675 EVENT PROCESSING AND EVENT LOOP INTEGRATION 761 EVENT PROCESSING AND EVENT LOOP INTEGRATION
676 $fileno = IO::AIO::poll_fileno 762 $fileno = IO::AIO::poll_fileno
677 Return the *request result pipe file descriptor*. This filehandle 763 Return the *request result pipe file descriptor*. This filehandle
681 767
682 See "poll_cb" for an example. 768 See "poll_cb" for an example.
683 769
684 IO::AIO::poll_cb 770 IO::AIO::poll_cb
685 Process some outstanding events on the result pipe. You have to call 771 Process some outstanding events on the result pipe. You have to call
686 this regularly. Returns the number of events processed. Returns 772 this regularly. Returns 0 if all events could be processed, or -1 if
687 immediately when no events are outstanding. The amount of events 773 it returned earlier for whatever reason. Returns immediately when no
774 events are outstanding. The amount of events processed depends on
688 processed depends on the settings of "IO::AIO::max_poll_req" and 775 the settings of "IO::AIO::max_poll_req" and
689 "IO::AIO::max_poll_time". 776 "IO::AIO::max_poll_time".
690 777
691 If not all requests were processed for whatever reason, the 778 If not all requests were processed for whatever reason, the
692 filehandle will still be ready when "poll_cb" returns. 779 filehandle will still be ready when "poll_cb" returns, so normally
780 you don't have to do anything special to have it called later.
693 781
694 Example: Install an Event watcher that automatically calls 782 Example: Install an Event watcher that automatically calls
695 IO::AIO::poll_cb with high priority: 783 IO::AIO::poll_cb with high priority:
696 784
697 Event->io (fd => IO::AIO::poll_fileno, 785 Event->io (fd => IO::AIO::poll_fileno,
803 891
804 The default is probably ok in most situations, especially if thread 892 The default is probably ok in most situations, especially if thread
805 creation is fast. If thread creation is very slow on your system you 893 creation is fast. If thread creation is very slow on your system you
806 might want to use larger values. 894 might want to use larger values.
807 895
808 $oldmaxreqs = IO::AIO::max_outstanding $maxreqs 896 IO::AIO::max_outstanding $maxreqs
809 This is a very bad function to use in interactive programs because 897 This is a very bad function to use in interactive programs because
810 it blocks, and a bad way to reduce concurrency because it is 898 it blocks, and a bad way to reduce concurrency because it is
811 inexact: Better use an "aio_group" together with a feed callback. 899 inexact: Better use an "aio_group" together with a feed callback.
812 900
813 Sets the maximum number of outstanding requests to $nreqs. If you to 901 Sets the maximum number of outstanding requests to $nreqs. If you do
814 queue up more than this number of requests, the next call to the 902 queue up more than this number of requests, the next call to the
815 "poll_cb" (and "poll_some" and other functions calling "poll_cb") 903 "poll_cb" (and "poll_some" and other functions calling "poll_cb")
816 function will block until the limit is no longer exceeded. 904 function will block until the limit is no longer exceeded.
817 905
818 The default value is very large, so there is no practical limit on 906 The default value is very large, so there is no practical limit on
819 the number of outstanding requests. 907 the number of outstanding requests.
820 908
821 You can still queue as many requests as you want. Therefore, 909 You can still queue as many requests as you want. Therefore,
822 "max_oustsanding" is mainly useful in simple scripts (with low 910 "max_outstanding" is mainly useful in simple scripts (with low
823 values) or as a stop gap to shield against fatal memory overflow 911 values) or as a stop gap to shield against fatal memory overflow
824 (with large values). 912 (with large values).
825 913
826 STATISTICAL INFORMATION 914 STATISTICAL INFORMATION
827 IO::AIO::nreqs 915 IO::AIO::nreqs
864 bytes of memory. In addition, stat requests need a stat buffer (possibly 952 bytes of memory. In addition, stat requests need a stat buffer (possibly
865 a few hundred bytes), readdir requires a result buffer and so on. Perl 953 a few hundred bytes), readdir requires a result buffer and so on. Perl
866 scalars and other data passed into aio requests will also be locked and 954 scalars and other data passed into aio requests will also be locked and
867 will consume memory till the request has entered the done state. 955 will consume memory till the request has entered the done state.
868 956
869 This is now awfully much, so queuing lots of requests is not usually a 957 This is not awfully much, so queuing lots of requests is not usually a
870 problem. 958 problem.
871 959
872 Per-thread usage: 960 Per-thread usage:
873 961
874 In the execution phase, some aio requests require more memory for 962 In the execution phase, some aio requests require more memory for
877 965
878KNOWN BUGS 966KNOWN BUGS
879 Known bugs will be fixed in the next release. 967 Known bugs will be fixed in the next release.
880 968
881SEE ALSO 969SEE ALSO
882 Coro::AIO. 970 AnyEvent::AIO for easy integration into event loops, Coro::AIO for a
971 more natural syntax.
883 972
884AUTHOR 973AUTHOR
885 Marc Lehmann <schmorp@schmorp.de> 974 Marc Lehmann <schmorp@schmorp.de>
886 http://home.schmorp.de/ 975 http://home.schmorp.de/
887 976

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines