ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/Coro/Coro.pm
(Generate patch)

Comparing cvsroot/Coro/Coro.pm (file contents):
Revision 1.226 by root, Wed Nov 19 16:01:32 2008 UTC vs.
Revision 1.246 by root, Mon Dec 15 00:30:40 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3Coro - coroutine process abstraction 3Coro - the only real threads in perl
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use Coro; 7 use Coro;
8 8
26 $locked = 1; 26 $locked = 1;
27 $lock->up; 27 $lock->up;
28 28
29=head1 DESCRIPTION 29=head1 DESCRIPTION
30 30
31This module collection manages coroutines. Coroutines are similar to 31For a tutorial-style introduction, please read the L<Coro::Intro>
32threads but don't (in general) run in parallel at the same time even 32manpage. This manpage mainly contains reference information.
33on SMP machines. The specific flavor of coroutine used in this module
34also guarantees you that it will not switch between coroutines unless
35necessary, at easily-identified points in your program, so locking and
36parallel access are rarely an issue, making coroutine programming much
37safer and easier than threads programming.
38 33
39Unlike a normal perl program, however, coroutines allow you to have 34This module collection manages continuations in general, most often
40multiple running interpreters that share data, which is especially useful 35in the form of cooperative threads (also called coroutines in the
41to code pseudo-parallel processes and for event-based programming, such as 36documentation). They are similar to kernel threads but don't (in general)
42multiple HTTP-GET requests running concurrently. See L<Coro::AnyEvent> to 37run in parallel at the same time even on SMP machines. The specific flavor
43learn more. 38of thread offered by this module also guarantees you that it will not
39switch between threads unless necessary, at easily-identified points in
40your program, so locking and parallel access are rarely an issue, making
41thread programming much safer and easier than using other thread models.
44 42
45Coroutines are also useful because Perl has no support for threads (the so 43Unlike the so-called "Perl threads" (which are not actually real threads
46called "threads" that perl offers are nothing more than the (bad) process 44but only the windows process emulation ported to unix), Coro provides a
47emulation coming from the Windows platform: On standard operating systems 45full shared address space, which makes communication between threads
48they serve no purpose whatsoever, except by making your programs slow and 46very easy. And threads are fast, too: disabling the Windows process
49making them use a lot of memory. Best disable them when building perl, or 47emulation code in your perl and using Coro can easily result in a two to
50aks your software vendor/distributor to do it for you). 48four times speed increase for your programs.
51 49
50Coro achieves that by supporting multiple running interpreters that share
51data, which is especially useful to code pseudo-parallel processes and
52for event-based programming, such as multiple HTTP-GET requests running
53concurrently. See L<Coro::AnyEvent> to learn more on how to integrate Coro
54into an event-based environment.
55
52In this module, coroutines are defined as "callchain + lexical variables + 56In this module, a thread is defined as "callchain + lexical variables +
53@_ + $_ + $@ + $/ + C stack), that is, a coroutine has its own callchain, 57@_ + $_ + $@ + $/ + C stack), that is, a thread has its own callchain,
54its own set of lexicals and its own set of perls most important global 58its own set of lexicals and its own set of perls most important global
55variables (see L<Coro::State> for more configuration). 59variables (see L<Coro::State> for more configuration and background info).
60
61See also the C<SEE ALSO> section at the end of this document - the Coro
62module family is quite large.
56 63
57=cut 64=cut
58 65
59package Coro; 66package Coro;
60 67
61use strict qw(vars subs); 68use strict qw(vars subs);
62no warnings "uninitialized"; 69no warnings "uninitialized";
70
71use Guard ();
63 72
64use Coro::State; 73use Coro::State;
65 74
66use base qw(Coro::State Exporter); 75use base qw(Coro::State Exporter);
67 76
68our $idle; # idle handler 77our $idle; # idle handler
69our $main; # main coroutine 78our $main; # main coroutine
70our $current; # current coroutine 79our $current; # current coroutine
71 80
72our $VERSION = 5.0; 81our $VERSION = 5.13;
73 82
74our @EXPORT = qw(async async_pool cede schedule terminate current unblock_sub); 83our @EXPORT = qw(async async_pool cede schedule terminate current unblock_sub);
75our %EXPORT_TAGS = ( 84our %EXPORT_TAGS = (
76 prio => [qw(PRIO_MAX PRIO_HIGH PRIO_NORMAL PRIO_LOW PRIO_IDLE PRIO_MIN)], 85 prio => [qw(PRIO_MAX PRIO_HIGH PRIO_NORMAL PRIO_LOW PRIO_IDLE PRIO_MIN)],
77); 86);
78our @EXPORT_OK = (@{$EXPORT_TAGS{prio}}, qw(nready)); 87our @EXPORT_OK = (@{$EXPORT_TAGS{prio}}, qw(nready));
79 88
89=head1 GLOBAL VARIABLES
90
80=over 4 91=over 4
81 92
82=item $Coro::main 93=item $Coro::main
83 94
84This variable stores the coroutine object that represents the main 95This variable stores the coroutine object that represents the main
105sub current() { $current } # [DEPRECATED] 116sub current() { $current } # [DEPRECATED]
106 117
107=item $Coro::idle 118=item $Coro::idle
108 119
109This variable is mainly useful to integrate Coro into event loops. It is 120This variable is mainly useful to integrate Coro into event loops. It is
110usually better to rely on L<Coro::AnyEvent> or LC<Coro::EV>, as this is 121usually better to rely on L<Coro::AnyEvent> or L<Coro::EV>, as this is
111pretty low-level functionality. 122pretty low-level functionality.
112 123
113This variable stores a callback that is called whenever the scheduler 124This variable stores either a coroutine or a callback.
125
126If it is a callback, the it is called whenever the scheduler finds no
114finds no ready coroutines to run. The default implementation prints 127ready coroutines to run. The default implementation prints "FATAL:
115"FATAL: deadlock detected" and exits, because the program has no other way 128deadlock detected" and exits, because the program has no other way to
116to continue. 129continue.
117 130
131If it is a coroutine object, then this object will be readied (without
132invoking any ready hooks, however) when the scheduler finds no other ready
133coroutines to run.
134
118This hook is overwritten by modules such as C<Coro::Timer> and 135This hook is overwritten by modules such as C<Coro::EV> and
119C<Coro::AnyEvent> to wait on an external event that hopefully wake up a 136C<Coro::AnyEvent> to wait on an external event that hopefully wake up a
120coroutine so the scheduler can run it. 137coroutine so the scheduler can run it.
121 138
122Note that the callback I<must not>, under any circumstances, block 139Note that the callback I<must not>, under any circumstances, block
123the current coroutine. Normally, this is achieved by having an "idle 140the current coroutine. Normally, this is achieved by having an "idle
124coroutine" that calls the event loop and then blocks again, and then 141coroutine" that calls the event loop and then blocks again, and then
125readying that coroutine in the idle handler. 142readying that coroutine in the idle handler, or by simply placing the idle
143coroutine in this variable.
126 144
127See L<Coro::Event> or L<Coro::AnyEvent> for examples of using this 145See L<Coro::Event> or L<Coro::AnyEvent> for examples of using this
128technique. 146technique.
129 147
130Please note that if your callback recursively invokes perl (e.g. for event 148Please note that if your callback recursively invokes perl (e.g. for event
135$idle = sub { 153$idle = sub {
136 require Carp; 154 require Carp;
137 Carp::croak ("FATAL: deadlock detected"); 155 Carp::croak ("FATAL: deadlock detected");
138}; 156};
139 157
140sub _cancel {
141 my ($self) = @_;
142
143 # free coroutine data and mark as destructed
144 $self->_destroy
145 or return;
146
147 # call all destruction callbacks
148 $_->(@{$self->{_status}})
149 for @{ delete $self->{_on_destroy} || [] };
150}
151
152# this coroutine is necessary because a coroutine 158# this coroutine is necessary because a coroutine
153# cannot destroy itself. 159# cannot destroy itself.
154our @destroy; 160our @destroy;
155our $manager; 161our $manager;
156 162
157$manager = new Coro sub { 163$manager = new Coro sub {
158 while () { 164 while () {
159 (shift @destroy)->_cancel 165 Coro::_cancel shift @destroy
160 while @destroy; 166 while @destroy;
161 167
162 &schedule; 168 &schedule;
163 } 169 }
164}; 170};
165$manager->{desc} = "[coro manager]"; 171$manager->{desc} = "[coro manager]";
166$manager->prio (PRIO_MAX); 172$manager->prio (PRIO_MAX);
167 173
168=back 174=back
169 175
170=head2 SIMPLE COROUTINE CREATION 176=head1 SIMPLE COROUTINE CREATION
171 177
172=over 4 178=over 4
173 179
174=item async { ... } [@args...] 180=item async { ... } [@args...]
175 181
176Create a new coroutine and return it's coroutine object (usually 182Create a new coroutine and return its coroutine object (usually
177unused). The coroutine will be put into the ready queue, so 183unused). The coroutine will be put into the ready queue, so
178it will start running automatically on the next scheduler run. 184it will start running automatically on the next scheduler run.
179 185
180The first argument is a codeblock/closure that should be executed in the 186The first argument is a codeblock/closure that should be executed in the
181coroutine. When it returns argument returns the coroutine is automatically 187coroutine. When it returns argument returns the coroutine is automatically
212Similar to C<async>, but uses a coroutine pool, so you should not call 218Similar to C<async>, but uses a coroutine pool, so you should not call
213terminate or join on it (although you are allowed to), and you get a 219terminate or join on it (although you are allowed to), and you get a
214coroutine that might have executed other code already (which can be good 220coroutine that might have executed other code already (which can be good
215or bad :). 221or bad :).
216 222
217On the plus side, this function is faster than creating (and destroying) 223On the plus side, this function is about twice as fast as creating (and
218a completly new coroutine, so if you need a lot of generic coroutines in 224destroying) a completely new coroutine, so if you need a lot of generic
219quick successsion, use C<async_pool>, not C<async>. 225coroutines in quick successsion, use C<async_pool>, not C<async>.
220 226
221The code block is executed in an C<eval> context and a warning will be 227The code block is executed in an C<eval> context and a warning will be
222issued in case of an exception instead of terminating the program, as 228issued in case of an exception instead of terminating the program, as
223C<async> does. As the coroutine is being reused, stuff like C<on_destroy> 229C<async> does. As the coroutine is being reused, stuff like C<on_destroy>
224will not work in the expected way, unless you call terminate or cancel, 230will not work in the expected way, unless you call terminate or cancel,
237coros as required. 243coros as required.
238 244
239If you are concerned about pooled coroutines growing a lot because a 245If you are concerned about pooled coroutines growing a lot because a
240single C<async_pool> used a lot of stackspace you can e.g. C<async_pool 246single C<async_pool> used a lot of stackspace you can e.g. C<async_pool
241{ terminate }> once per second or so to slowly replenish the pool. In 247{ terminate }> once per second or so to slowly replenish the pool. In
242addition to that, when the stacks used by a handler grows larger than 16kb 248addition to that, when the stacks used by a handler grows larger than 32kb
243(adjustable via $Coro::POOL_RSS) it will also be destroyed. 249(adjustable via $Coro::POOL_RSS) it will also be destroyed.
244 250
245=cut 251=cut
246 252
247our $POOL_SIZE = 8; 253our $POOL_SIZE = 8;
248our $POOL_RSS = 16 * 1024; 254our $POOL_RSS = 32 * 1024;
249our @async_pool; 255our @async_pool;
250 256
251sub pool_handler { 257sub pool_handler {
252 my $cb;
253
254 while () { 258 while () {
255 eval { 259 eval {
256 while () { 260 &{&_pool_handler} while 1;
257 _pool_1 $cb;
258 &$cb;
259 _pool_2 $cb;
260 &schedule;
261 }
262 }; 261 };
263 262
264 if ($@) {
265 last if $@ eq "\3async_pool terminate\2\n";
266 warn $@; 263 warn $@ if $@;
267 }
268 } 264 }
269}
270
271sub async_pool(&@) {
272 # this is also inlined into the unblock_scheduler
273 my $coro = (pop @async_pool) || new Coro \&pool_handler;
274
275 $coro->{_invoke} = [@_];
276 $coro->ready;
277
278 $coro
279} 265}
280 266
281=back 267=back
282 268
283=head2 STATIC METHODS 269=head1 STATIC METHODS
284 270
285Static methods are actually functions that operate on the current coroutine. 271Static methods are actually functions that implicitly operate on the
272current coroutine.
286 273
287=over 4 274=over 4
288 275
289=item schedule 276=item schedule
290 277
330Terminates the current coroutine with the given status values (see L<cancel>). 317Terminates the current coroutine with the given status values (see L<cancel>).
331 318
332=item killall 319=item killall
333 320
334Kills/terminates/cancels all coroutines except the currently running 321Kills/terminates/cancels all coroutines except the currently running
335one. This is useful after a fork, either in the child or the parent, as 322one. This can be useful after a fork, either in the child or the parent,
336usually only one of them should inherit the running coroutines. 323as usually only one of them should inherit the running coroutines.
324
325Note that in the implementation, destructors run as normal, making this
326function not so useful after a fork. Future versions of this function
327might try to free resources without running any code.
337 328
338Note that while this will try to free some of the main programs resources, 329Note that while this will try to free some of the main programs resources,
339you cannot free all of them, so if a coroutine that is not the main 330you cannot free all of them, so if a coroutine that is not the main
340program calls this function, there will be some one-time resource leak. 331program calls this function, there will be some one-time resource leak.
341 332
342=cut 333=cut
343
344sub terminate {
345 $current->{_status} = [@_];
346 push @destroy, $current;
347 $manager->ready;
348 do { &schedule } while 1;
349}
350 334
351sub killall { 335sub killall {
352 for (Coro::State::list) { 336 for (Coro::State::list) {
353 $_->cancel 337 $_->cancel
354 if $_ != $current && UNIVERSAL::isa $_, "Coro"; 338 if $_ != $current && UNIVERSAL::isa $_, "Coro";
355 } 339 }
356} 340}
357 341
358=back 342=back
359 343
360=head2 COROUTINE METHODS 344=head1 COROUTINE OBJECT METHODS
361 345
362These are the methods you can call on coroutine objects (or to create 346These are the methods you can call on coroutine objects (or to create
363them). 347them).
364 348
365=over 4 349=over 4
374See C<async> and C<Coro::State::new> for additional info about the 358See C<async> and C<Coro::State::new> for additional info about the
375coroutine environment. 359coroutine environment.
376 360
377=cut 361=cut
378 362
379sub _terminate { 363sub _coro_run {
380 terminate &{+shift}; 364 terminate &{+shift};
381} 365}
382 366
383=item $success = $coroutine->ready 367=item $success = $coroutine->ready
384 368
411 $self->{_status} = [@_]; 395 $self->{_status} = [@_];
412 $self->_cancel; 396 $self->_cancel;
413 } 397 }
414} 398}
415 399
400=item $coroutine->schedule_to
401
402Puts the current coroutine to sleep (like C<Coro::schedule>), but instead
403of continuing with the next coro from the ready queue, always switch to
404the given coroutine object (regardless of priority etc.). The readyness
405state of that coroutine isn't changed.
406
407This is an advanced method for special cases - I'd love to hear about any
408uses for this one.
409
410=item $coroutine->cede_to
411
412Like C<schedule_to>, but puts the current coroutine into the ready
413queue. This has the effect of temporarily switching to the given
414coroutine, and continuing some time later.
415
416This is an advanced method for special cases - I'd love to hear about any
417uses for this one.
418
416=item $coroutine->throw ([$scalar]) 419=item $coroutine->throw ([$scalar])
417 420
418If C<$throw> is specified and defined, it will be thrown as an exception 421If C<$throw> is specified and defined, it will be thrown as an exception
419inside the coroutine at the next convenient point in time. Otherwise 422inside the coroutine at the next convenient point in time. Otherwise
420clears the exception object. 423clears the exception object.
518 my $old = $_[0]{desc}; 521 my $old = $_[0]{desc};
519 $_[0]{desc} = $_[1] if @_ > 1; 522 $_[0]{desc} = $_[1] if @_ > 1;
520 $old; 523 $old;
521} 524}
522 525
526sub transfer {
527 require Carp;
528 Carp::croak ("You must not call ->transfer on Coro objects. Use Coro::State objects or the ->schedule_to method. Caught");
529}
530
523=back 531=back
524 532
525=head2 GLOBAL FUNCTIONS 533=head1 GLOBAL FUNCTIONS
526 534
527=over 4 535=over 4
528 536
529=item Coro::nready 537=item Coro::nready
530 538
535would cause a deadlock unless there is an idle handler that wakes up some 543would cause a deadlock unless there is an idle handler that wakes up some
536coroutines. 544coroutines.
537 545
538=item my $guard = Coro::guard { ... } 546=item my $guard = Coro::guard { ... }
539 547
540This creates and returns a guard object. Nothing happens until the object 548This function still exists, but is deprecated. Please use the
541gets destroyed, in which case the codeblock given as argument will be 549C<Guard::guard> function instead.
542executed. This is useful to free locks or other resources in case of a
543runtime error or when the coroutine gets canceled, as in both cases the
544guard block will be executed. The guard object supports only one method,
545C<< ->cancel >>, which will keep the codeblock from being executed.
546 550
547Example: set some flag and clear it again when the coroutine gets canceled
548or the function returns:
549
550 sub do_something {
551 my $guard = Coro::guard { $busy = 0 };
552 $busy = 1;
553
554 # do something that requires $busy to be true
555 }
556
557=cut 551=cut
558 552
559sub guard(&) { 553BEGIN { *guard = \&Guard::guard }
560 bless \(my $cb = $_[0]), "Coro::guard"
561}
562
563sub Coro::guard::cancel {
564 ${$_[0]} = sub { };
565}
566
567sub Coro::guard::DESTROY {
568 ${$_[0]}->();
569}
570
571 554
572=item unblock_sub { ... } 555=item unblock_sub { ... }
573 556
574This utility function takes a BLOCK or code reference and "unblocks" it, 557This utility function takes a BLOCK or code reference and "unblocks" it,
575returning a new coderef. Unblocking means that calling the new coderef 558returning a new coderef. Unblocking means that calling the new coderef
577original code ref will be called (with parameters) from within another 560original code ref will be called (with parameters) from within another
578coroutine. 561coroutine.
579 562
580The reason this function exists is that many event libraries (such as the 563The reason this function exists is that many event libraries (such as the
581venerable L<Event|Event> module) are not coroutine-safe (a weaker form 564venerable L<Event|Event> module) are not coroutine-safe (a weaker form
582of thread-safety). This means you must not block within event callbacks, 565of reentrancy). This means you must not block within event callbacks,
583otherwise you might suffer from crashes or worse. The only event library 566otherwise you might suffer from crashes or worse. The only event library
584currently known that is safe to use without C<unblock_sub> is L<EV>. 567currently known that is safe to use without C<unblock_sub> is L<EV>.
585 568
586This function allows your callbacks to block by executing them in another 569This function allows your callbacks to block by executing them in another
587coroutine where it is safe to block. One example where blocking is handy 570coroutine where it is safe to block. One example where blocking is handy
610# return immediately and can be reused) and because we cannot cede 593# return immediately and can be reused) and because we cannot cede
611# inside an event callback. 594# inside an event callback.
612our $unblock_scheduler = new Coro sub { 595our $unblock_scheduler = new Coro sub {
613 while () { 596 while () {
614 while (my $cb = pop @unblock_queue) { 597 while (my $cb = pop @unblock_queue) {
615 # this is an inlined copy of async_pool 598 &async_pool (@$cb);
616 my $coro = (pop @async_pool) || new Coro \&pool_handler;
617 599
618 $coro->{_invoke} = $cb;
619 $coro->ready;
620 cede; # for short-lived callbacks, this reduces pressure on the coro pool 600 # for short-lived callbacks, this reduces pressure on the coro pool
601 # as the chance is very high that the async_poll coro will be back
602 # in the idle state when cede returns
603 cede;
621 } 604 }
622 schedule; # sleep well 605 schedule; # sleep well
623 } 606 }
624}; 607};
625$unblock_scheduler->{desc} = "[unblock_sub scheduler]"; 608$unblock_scheduler->{desc} = "[unblock_sub scheduler]";
633 } 616 }
634} 617}
635 618
636=item $cb = Coro::rouse_cb 619=item $cb = Coro::rouse_cb
637 620
638Create and return a "rouse callback". That's a code reference that, when 621Create and return a "rouse callback". That's a code reference that,
639called, will save its arguments and notify the owner coroutine of the 622when called, will remember a copy of its arguments and notify the owner
640callback. 623coroutine of the callback.
641 624
642See the next function. 625See the next function.
643 626
644=item @args = Coro::rouse_wait [$cb] 627=item @args = Coro::rouse_wait [$cb]
645 628
646Wait for the specified rouse callback (or the last one tht was created in 629Wait for the specified rouse callback (or the last one that was created in
647this coroutine). 630this coroutine).
648 631
649As soon as the callback is invoked (or when the calback was invoked before 632As soon as the callback is invoked (or when the callback was invoked
650C<rouse_wait>), it will return a copy of the arguments originally passed 633before C<rouse_wait>), it will return the arguments originally passed to
651to the rouse callback. 634the rouse callback.
652 635
653See the section B<HOW TO WAIT FOR A CALLBACK> for an actual usage example. 636See the section B<HOW TO WAIT FOR A CALLBACK> for an actual usage example.
654 637
655=back 638=back
656 639
679 662
680Coro offers two functions specifically designed to make this easy, 663Coro offers two functions specifically designed to make this easy,
681C<Coro::rouse_cb> and C<Coro::rouse_wait>. 664C<Coro::rouse_cb> and C<Coro::rouse_wait>.
682 665
683The first function, C<rouse_cb>, generates and returns a callback that, 666The first function, C<rouse_cb>, generates and returns a callback that,
684when invoked, will save it's arguments and notify the coroutine that 667when invoked, will save its arguments and notify the coroutine that
685created the callback. 668created the callback.
686 669
687The second function, C<rouse_wait>, waits for the callback to be called 670The second function, C<rouse_wait>, waits for the callback to be called
688(by calling C<schedule> to go to sleep) and returns the arguments 671(by calling C<schedule> to go to sleep) and returns the arguments
689originally passed to the callback. 672originally passed to the callback.
736fix your libc and use a saner backend. 719fix your libc and use a saner backend.
737 720
738=item perl process emulation ("threads") 721=item perl process emulation ("threads")
739 722
740This module is not perl-pseudo-thread-safe. You should only ever use this 723This module is not perl-pseudo-thread-safe. You should only ever use this
741module from the same thread (this requirement might be removed in the 724module from the first thread (this requirement might be removed in the
742future to allow per-thread schedulers, but Coro::State does not yet allow 725future to allow per-thread schedulers, but Coro::State does not yet allow
743this). I recommend disabling thread support and using processes, as having 726this). I recommend disabling thread support and using processes, as having
744the windows process emulation enabled under unix roughly halves perl 727the windows process emulation enabled under unix roughly halves perl
745performance, even when not used. 728performance, even when not used.
746 729
763 746
764Debugging: L<Coro::Debug>. 747Debugging: L<Coro::Debug>.
765 748
766Support/Utility: L<Coro::Specific>, L<Coro::Util>. 749Support/Utility: L<Coro::Specific>, L<Coro::Util>.
767 750
768Locking/IPC: L<Coro::Signal>, L<Coro::Channel>, L<Coro::Semaphore>, L<Coro::SemaphoreSet>, L<Coro::RWLock>. 751Locking and IPC: L<Coro::Signal>, L<Coro::Channel>, L<Coro::Semaphore>,
752L<Coro::SemaphoreSet>, L<Coro::RWLock>.
769 753
770IO/Timers: L<Coro::Timer>, L<Coro::Handle>, L<Coro::Socket>, L<Coro::AIO>. 754I/O and Timers: L<Coro::Timer>, L<Coro::Handle>, L<Coro::Socket>, L<Coro::AIO>.
771 755
772Compatibility: L<Coro::LWP>, L<Coro::BDB>, L<Coro::Storable>, L<Coro::Select>. 756Compatibility with other modules: L<Coro::LWP> (but see also L<AnyEvent::HTTP> for
757a better-working alternative), L<Coro::BDB>, L<Coro::Storable>,
758L<Coro::Select>.
773 759
774XS API: L<Coro::MakeMaker>. 760XS API: L<Coro::MakeMaker>.
775 761
776Low level Configuration, Coroutine Environment: L<Coro::State>. 762Low level Configuration, Thread Environment, Continuations: L<Coro::State>.
777 763
778=head1 AUTHOR 764=head1 AUTHOR
779 765
780 Marc Lehmann <schmorp@schmorp.de> 766 Marc Lehmann <schmorp@schmorp.de>
781 http://home.schmorp.de/ 767 http://home.schmorp.de/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines