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.92 by root, Fri Dec 1 03:47:55 2006 UTC vs.
Revision 1.180 by root, Fri Apr 25 04:28:50 2008 UTC

2 2
3Coro - coroutine process abstraction 3Coro - coroutine process abstraction
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use Coro; 7 use Coro;
8 8
9 async { 9 async {
10 # some asynchronous thread of execution 10 # some asynchronous thread of execution
11 print "2\n";
12 cede; # yield back to main
13 print "4\n";
11 }; 14 };
12 15 print "1\n";
13 # alternatively create an async coroutine like this: 16 cede; # yield to coroutine
14 17 print "3\n";
15 sub some_func : Coro { 18 cede; # and again
16 # some more async code 19
17 } 20 # use locking
18 21 my $lock = new Coro::Semaphore;
19 cede; 22 my $locked;
23
24 $lock->down;
25 $locked = 1;
26 $lock->up;
20 27
21=head1 DESCRIPTION 28=head1 DESCRIPTION
22 29
23This module collection manages coroutines. Coroutines are similar to 30This module collection manages coroutines. Coroutines are similar
24threads but don't run in parallel. 31to threads but don't run in parallel at the same time even on SMP
32machines. The specific flavor of coroutine used in this module also
33guarantees you that it will not switch between coroutines unless
34necessary, at easily-identified points in your program, so locking and
35parallel access are rarely an issue, making coroutine programming much
36safer than threads programming.
25 37
38(Perl, however, does not natively support real threads but instead does a
39very slow and memory-intensive emulation of processes using threads. This
40is a performance win on Windows machines, and a loss everywhere else).
41
26In this module, coroutines are defined as "callchain + lexical variables 42In this module, coroutines are defined as "callchain + lexical variables +
27+ @_ + $_ + $@ + $^W + C stack), that is, a coroutine has it's own 43@_ + $_ + $@ + $/ + C stack), that is, a coroutine has its own callchain,
28callchain, it's own set of lexicals and it's own set of perl's most 44its own set of lexicals and its own set of perls most important global
29important global variables. 45variables (see L<Coro::State> for more configuration).
30 46
31=cut 47=cut
32 48
33package Coro; 49package Coro;
34 50
41 57
42our $idle; # idle handler 58our $idle; # idle handler
43our $main; # main coroutine 59our $main; # main coroutine
44our $current; # current coroutine 60our $current; # current coroutine
45 61
46our $VERSION = '3.0'; 62our $VERSION = 4.6;
47 63
48our @EXPORT = qw(async cede schedule terminate current unblock_sub); 64our @EXPORT = qw(async async_pool cede schedule terminate current unblock_sub);
49our %EXPORT_TAGS = ( 65our %EXPORT_TAGS = (
50 prio => [qw(PRIO_MAX PRIO_HIGH PRIO_NORMAL PRIO_LOW PRIO_IDLE PRIO_MIN)], 66 prio => [qw(PRIO_MAX PRIO_HIGH PRIO_NORMAL PRIO_LOW PRIO_IDLE PRIO_MIN)],
51); 67);
52our @EXPORT_OK = @{$EXPORT_TAGS{prio}}; 68our @EXPORT_OK = (@{$EXPORT_TAGS{prio}}, qw(nready));
53
54{
55 my @async;
56 my $init;
57
58 # this way of handling attributes simply is NOT scalable ;()
59 sub import {
60 no strict 'refs';
61
62 Coro->export_to_level(1, @_);
63
64 my $old = *{(caller)[0]."::MODIFY_CODE_ATTRIBUTES"}{CODE};
65 *{(caller)[0]."::MODIFY_CODE_ATTRIBUTES"} = sub {
66 my ($package, $ref) = (shift, shift);
67 my @attrs;
68 for (@_) {
69 if ($_ eq "Coro") {
70 push @async, $ref;
71 unless ($init++) {
72 eval q{
73 sub INIT {
74 &async(pop @async) while @async;
75 }
76 };
77 }
78 } else {
79 push @attrs, $_;
80 }
81 }
82 return $old ? $old->($package, $ref, @attrs) : @attrs;
83 };
84 }
85
86}
87 69
88=over 4 70=over 4
89 71
90=item $main 72=item $main
91 73
99 81
100The current coroutine (the last coroutine switched to). The initial value 82The current coroutine (the last coroutine switched to). The initial value
101is C<$main> (of course). 83is C<$main> (of course).
102 84
103This variable is B<strictly> I<read-only>. It is provided for performance 85This variable is B<strictly> I<read-only>. It is provided for performance
104reasons. If performance is not essentiel you are encouraged to use the 86reasons. If performance is not essential you are encouraged to use the
105C<Coro::current> function instead. 87C<Coro::current> function instead.
106 88
107=cut 89=cut
108 90
91$main->{desc} = "[main::]";
92
109# maybe some other module used Coro::Specific before... 93# maybe some other module used Coro::Specific before...
110if ($current) {
111 $main->{specific} = $current->{specific}; 94$main->{_specific} = $current->{_specific}
112} 95 if $current;
113 96
114$current = $main; 97_set_current $main;
115 98
116sub current() { $current } 99sub current() { $current }
117 100
118=item $idle 101=item $idle
119 102
124This hook is overwritten by modules such as C<Coro::Timer> and 107This hook is overwritten by modules such as C<Coro::Timer> and
125C<Coro::Event> to wait on an external event that hopefully wake up a 108C<Coro::Event> to wait on an external event that hopefully wake up a
126coroutine so the scheduler can run it. 109coroutine so the scheduler can run it.
127 110
128Please note that if your callback recursively invokes perl (e.g. for event 111Please note that if your callback recursively invokes perl (e.g. for event
129handlers), then it must be prepared to be called recursively. 112handlers), then it must be prepared to be called recursively itself.
130 113
131=cut 114=cut
132 115
133$idle = sub { 116$idle = sub {
134 print STDERR "FATAL: deadlock detected\n"; 117 require Carp;
135 exit (51); 118 Carp::croak ("FATAL: deadlock detected");
136}; 119};
120
121sub _cancel {
122 my ($self) = @_;
123
124 # free coroutine data and mark as destructed
125 $self->_destroy
126 or return;
127
128 # call all destruction callbacks
129 $_->(@{$self->{_status}})
130 for @{(delete $self->{_on_destroy}) || []};
131}
137 132
138# this coroutine is necessary because a coroutine 133# this coroutine is necessary because a coroutine
139# cannot destroy itself. 134# cannot destroy itself.
140my @destroy; 135my @destroy;
136my $manager;
137
141my $manager; $manager = new Coro sub { 138$manager = new Coro sub {
142 while () { 139 while () {
143 # by overwriting the state object with the manager we destroy it 140 (shift @destroy)->_cancel
144 # while still being able to schedule this coroutine (in case it has
145 # been readied multiple times. this is harmless since the manager
146 # can be called as many times as neccessary and will always
147 # remove itself from the runqueue
148 while (@destroy) { 141 while @destroy;
149 my $coro = pop @destroy;
150 $coro->{status} ||= [];
151 $_->ready for @{delete $coro->{join} || []};
152 142
153 # the next line destroys the coro state, but keeps the
154 # coroutine itself intact (we basically make it a zombie
155 # coroutine that always runs the manager thread, so it's possible
156 # to transfer() to this coroutine).
157 $coro->_clone_state_from ($manager);
158 }
159 &schedule; 143 &schedule;
160 } 144 }
161}; 145};
162 146$manager->desc ("[coro manager]");
163# static methods. not really. 147$manager->prio (PRIO_MAX);
164 148
165=back 149=back
166 150
167=head2 STATIC METHODS 151=head2 STATIC METHODS
168 152
174 158
175Create a new asynchronous coroutine and return it's coroutine object 159Create a new asynchronous coroutine and return it's coroutine object
176(usually unused). When the sub returns the new coroutine is automatically 160(usually unused). When the sub returns the new coroutine is automatically
177terminated. 161terminated.
178 162
179Calling C<exit> in a coroutine will not work correctly, so do not do that. 163See the C<Coro::State::new> constructor for info about the coroutine
164environment in which coroutines run.
180 165
181When the coroutine dies, the program will exit, just as in the main 166Calling C<exit> in a coroutine will do the same as calling exit outside
182program. 167the coroutine. Likewise, when the coroutine dies, the program will exit,
168just as it would in the main program.
183 169
184 # create a new coroutine that just prints its arguments 170 # create a new coroutine that just prints its arguments
185 async { 171 async {
186 print "@_\n"; 172 print "@_\n";
187 } 1,2,3,4; 173 } 1,2,3,4;
188 174
189=cut 175=cut
190 176
191sub async(&@) { 177sub async(&@) {
192 my $pid = new Coro @_; 178 my $coro = new Coro @_;
193 $pid->ready; 179 $coro->ready;
194 $pid 180 $coro
181}
182
183=item async_pool { ... } [@args...]
184
185Similar to C<async>, but uses a coroutine pool, so you should not call
186terminate or join (although you are allowed to), and you get a coroutine
187that might have executed other code already (which can be good or bad :).
188
189Also, the block is executed in an C<eval> context and a warning will be
190issued in case of an exception instead of terminating the program, as
191C<async> does. As the coroutine is being reused, stuff like C<on_destroy>
192will not work in the expected way, unless you call terminate or cancel,
193which somehow defeats the purpose of pooling.
194
195The priority will be reset to C<0> after each job, tracing will be
196disabled, the description will be reset and the default output filehandle
197gets restored, so you can change alkl these. Otherwise the coroutine will
198be re-used "as-is": most notably if you change other per-coroutine global
199stuff such as C<$/> you need to revert that change, which is most simply
200done by using local as in C< local $/ >.
201
202The pool size is limited to 8 idle coroutines (this can be adjusted by
203changing $Coro::POOL_SIZE), and there can be as many non-idle coros as
204required.
205
206If you are concerned about pooled coroutines growing a lot because a
207single C<async_pool> used a lot of stackspace you can e.g. C<async_pool
208{ terminate }> once per second or so to slowly replenish the pool. In
209addition to that, when the stacks used by a handler grows larger than 16kb
210(adjustable with $Coro::POOL_RSS) it will also exit.
211
212=cut
213
214our $POOL_SIZE = 8;
215our $POOL_RSS = 16 * 1024;
216our @async_pool;
217
218sub pool_handler {
219 my $cb;
220
221 while () {
222 eval {
223 while () {
224 _pool_1 $cb;
225 &$cb;
226 _pool_2 $cb;
227 &schedule;
228 }
229 };
230
231 last if $@ eq "\3async_pool terminate\2\n";
232 warn $@ if $@;
233 }
234}
235
236sub async_pool(&@) {
237 # this is also inlined into the unlock_scheduler
238 my $coro = (pop @async_pool) || new Coro \&pool_handler;
239
240 $coro->{_invoke} = [@_];
241 $coro->ready;
242
243 $coro
195} 244}
196 245
197=item schedule 246=item schedule
198 247
199Calls the scheduler. Please note that the current coroutine will not be put 248Calls the scheduler. Please note that the current coroutine will not be put
212 # wake up sleeping coroutine 261 # wake up sleeping coroutine
213 $current->ready; 262 $current->ready;
214 undef $current; 263 undef $current;
215 }; 264 };
216 265
217 # call schedule until event occured. 266 # call schedule until event occurred.
218 # in case we are woken up for other reasons 267 # in case we are woken up for other reasons
219 # (current still defined), loop. 268 # (current still defined), loop.
220 Coro::schedule while $current; 269 Coro::schedule while $current;
221 } 270 }
222 271
224 273
225"Cede" to other coroutines. This function puts the current coroutine into the 274"Cede" to other coroutines. This function puts the current coroutine into the
226ready queue and calls C<schedule>, which has the effect of giving up the 275ready queue and calls C<schedule>, which has the effect of giving up the
227current "timeslice" to other coroutines of the same or higher priority. 276current "timeslice" to other coroutines of the same or higher priority.
228 277
278=item Coro::cede_notself
279
280Works like cede, but is not exported by default and will cede to any
281coroutine, regardless of priority, once.
282
229=item terminate [arg...] 283=item terminate [arg...]
230 284
231Terminates the current coroutine with the given status values (see L<cancel>). 285Terminates the current coroutine with the given status values (see L<cancel>).
286
287=item killall
288
289Kills/terminates/cancels all coroutines except the currently running
290one. This is useful after a fork, either in the child or the parent, as
291usually only one of them should inherit the running coroutines.
232 292
233=cut 293=cut
234 294
235sub terminate { 295sub terminate {
236 $current->cancel (@_); 296 $current->cancel (@_);
237} 297}
238 298
299sub killall {
300 for (Coro::State::list) {
301 $_->cancel
302 if $_ != $current && UNIVERSAL::isa $_, "Coro";
303 }
304}
305
239=back 306=back
240
241# dynamic methods
242 307
243=head2 COROUTINE METHODS 308=head2 COROUTINE METHODS
244 309
245These are the methods you can call on coroutine objects. 310These are the methods you can call on coroutine objects.
246 311
251Create a new coroutine and return it. When the sub returns the coroutine 316Create a new coroutine and return it. When the sub returns the coroutine
252automatically terminates as if C<terminate> with the returned values were 317automatically terminates as if C<terminate> with the returned values were
253called. To make the coroutine run you must first put it into the ready queue 318called. To make the coroutine run you must first put it into the ready queue
254by calling the ready method. 319by calling the ready method.
255 320
256Calling C<exit> in a coroutine will not work correctly, so do not do that. 321See C<async> and C<Coro::State::new> for additional info about the
322coroutine environment.
257 323
258=cut 324=cut
259 325
260sub _new_coro { 326sub _run_coro {
261 terminate &{+shift}; 327 terminate &{+shift};
262} 328}
263 329
264sub new { 330sub new {
265 my $class = shift; 331 my $class = shift;
266 332
267 $class->SUPER::new (\&_new_coro, @_) 333 $class->SUPER::new (\&_run_coro, @_)
268} 334}
269 335
270=item $success = $coroutine->ready 336=item $success = $coroutine->ready
271 337
272Put the given coroutine into the ready queue (according to it's priority) 338Put the given coroutine into the ready queue (according to it's priority)
278Return wether the coroutine is currently the ready queue or not, 344Return wether the coroutine is currently the ready queue or not,
279 345
280=item $coroutine->cancel (arg...) 346=item $coroutine->cancel (arg...)
281 347
282Terminates the given coroutine and makes it return the given arguments as 348Terminates the given coroutine and makes it return the given arguments as
283status (default: the empty list). 349status (default: the empty list). Never returns if the coroutine is the
350current coroutine.
284 351
285=cut 352=cut
286 353
287sub cancel { 354sub cancel {
288 my $self = shift; 355 my $self = shift;
289 $self->{status} = [@_]; 356 $self->{_status} = [@_];
357
358 if ($current == $self) {
290 push @destroy, $self; 359 push @destroy, $self;
291 $manager->ready; 360 $manager->ready;
292 &schedule if $current == $self; 361 &schedule while 1;
362 } else {
363 $self->_cancel;
364 }
293} 365}
294 366
295=item $coroutine->join 367=item $coroutine->join
296 368
297Wait until the coroutine terminates and return any values given to the 369Wait until the coroutine terminates and return any values given to the
298C<terminate> or C<cancel> functions. C<join> can be called multiple times 370C<terminate> or C<cancel> functions. C<join> can be called concurrently
299from multiple coroutine. 371from multiple coroutines.
300 372
301=cut 373=cut
302 374
303sub join { 375sub join {
304 my $self = shift; 376 my $self = shift;
377
305 unless ($self->{status}) { 378 unless ($self->{_status}) {
306 push @{$self->{join}}, $current; 379 my $current = $current;
307 &schedule; 380
381 push @{$self->{_on_destroy}}, sub {
382 $current->ready;
383 undef $current;
384 };
385
386 &schedule while $current;
308 } 387 }
388
309 wantarray ? @{$self->{status}} : $self->{status}[0]; 389 wantarray ? @{$self->{_status}} : $self->{_status}[0];
390}
391
392=item $coroutine->on_destroy (\&cb)
393
394Registers a callback that is called when this coroutine gets destroyed,
395but before it is joined. The callback gets passed the terminate arguments,
396if any.
397
398=cut
399
400sub on_destroy {
401 my ($self, $cb) = @_;
402
403 push @{ $self->{_on_destroy} }, $cb;
310} 404}
311 405
312=item $oldprio = $coroutine->prio ($newprio) 406=item $oldprio = $coroutine->prio ($newprio)
313 407
314Sets (or gets, if the argument is missing) the priority of the 408Sets (or gets, if the argument is missing) the priority of the
339=item $olddesc = $coroutine->desc ($newdesc) 433=item $olddesc = $coroutine->desc ($newdesc)
340 434
341Sets (or gets in case the argument is missing) the description for this 435Sets (or gets in case the argument is missing) the description for this
342coroutine. This is just a free-form string you can associate with a coroutine. 436coroutine. This is just a free-form string you can associate with a coroutine.
343 437
438This method simply sets the C<< $coroutine->{desc} >> member to the given string. You
439can modify this member directly if you wish.
440
441=item $coroutine->throw ([$scalar])
442
443If C<$throw> is specified and defined, it will be thrown as an exception
444inside the coroutine at the next convinient point in time (usually after
445it gains control at the next schedule/transfer/cede). Otherwise clears the
446exception object.
447
448The exception object will be thrown "as is" with the specified scalar in
449C<$@>, i.e. if it is a string, no line number or newline will be appended
450(unlike with C<die>).
451
452This can be used as a softer means than C<cancel> to ask a coroutine to
453end itself, although there is no guarentee that the exception will lead to
454termination, and if the exception isn't caught it might well end the whole
455program.
456
344=cut 457=cut
345 458
346sub desc { 459sub desc {
347 my $old = $_[0]{desc}; 460 my $old = $_[0]{desc};
348 $_[0]{desc} = $_[1] if @_ > 1; 461 $_[0]{desc} = $_[1] if @_ > 1;
349 $old; 462 $old;
350} 463}
351 464
352=back 465=back
353 466
354=head2 UTILITY FUNCTIONS 467=head2 GLOBAL FUNCTIONS
355 468
356=over 4 469=over 4
470
471=item Coro::nready
472
473Returns the number of coroutines that are currently in the ready state,
474i.e. that can be switched to. The value C<0> means that the only runnable
475coroutine is the currently running one, so C<cede> would have no effect,
476and C<schedule> would cause a deadlock unless there is an idle handler
477that wakes up some coroutines.
478
479=item my $guard = Coro::guard { ... }
480
481This creates and returns a guard object. Nothing happens until the object
482gets destroyed, in which case the codeblock given as argument will be
483executed. This is useful to free locks or other resources in case of a
484runtime error or when the coroutine gets canceled, as in both cases the
485guard block will be executed. The guard object supports only one method,
486C<< ->cancel >>, which will keep the codeblock from being executed.
487
488Example: set some flag and clear it again when the coroutine gets canceled
489or the function returns:
490
491 sub do_something {
492 my $guard = Coro::guard { $busy = 0 };
493 $busy = 1;
494
495 # do something that requires $busy to be true
496 }
497
498=cut
499
500sub guard(&) {
501 bless \(my $cb = $_[0]), "Coro::guard"
502}
503
504sub Coro::guard::cancel {
505 ${$_[0]} = sub { };
506}
507
508sub Coro::guard::DESTROY {
509 ${$_[0]}->();
510}
511
357 512
358=item unblock_sub { ... } 513=item unblock_sub { ... }
359 514
360This utility function takes a BLOCK or code reference and "unblocks" it, 515This utility function takes a BLOCK or code reference and "unblocks" it,
361returning the new coderef. This means that the new coderef will return 516returning the new coderef. This means that the new coderef will return
362immediately without blocking, returning nothing, while the original code 517immediately without blocking, returning nothing, while the original code
363ref will be called (with parameters) from within its own coroutine. 518ref will be called (with parameters) from within its own coroutine.
364 519
365The reason this fucntion exists is that many event libraries (such as the 520The reason this function exists is that many event libraries (such as the
366venerable L<Event|Event> module) are not coroutine-safe (a weaker form 521venerable L<Event|Event> module) are not coroutine-safe (a weaker form
367of thread-safety). This means you must not block within event callbacks, 522of thread-safety). This means you must not block within event callbacks,
368otherwise you might suffer from crashes or worse. 523otherwise you might suffer from crashes or worse.
369 524
370This function allows your callbacks to block by executing them in another 525This function allows your callbacks to block by executing them in another
375In short: simply use C<unblock_sub { ... }> instead of C<sub { ... }> when 530In short: simply use C<unblock_sub { ... }> instead of C<sub { ... }> when
376creating event callbacks that want to block. 531creating event callbacks that want to block.
377 532
378=cut 533=cut
379 534
380our @unblock_pool;
381our @unblock_queue; 535our @unblock_queue;
382our $UNBLOCK_POOL_SIZE = 2;
383 536
384sub unblock_handler_ { 537# we create a special coro because we want to cede,
385 while () { 538# to reduce pressure on the coro pool (because most callbacks
386 my ($cb, @arg) = @{ delete $Coro::current->{arg} }; 539# return immediately and can be reused) and because we cannot cede
387 $cb->(@arg); 540# inside an event callback.
388
389 last if @unblock_pool >= $UNBLOCK_POOL_SIZE;
390 push @unblock_pool, $Coro::current;
391 schedule;
392 }
393}
394
395our $unblock_scheduler = async { 541our $unblock_scheduler = new Coro sub {
396 while () { 542 while () {
397 while (my $cb = pop @unblock_queue) { 543 while (my $cb = pop @unblock_queue) {
398 my $handler = (pop @unblock_pool or new Coro \&unblock_handler_); 544 # this is an inlined copy of async_pool
399 $handler->{arg} = $cb; 545 my $coro = (pop @async_pool) || new Coro \&pool_handler;
546
547 $coro->{_invoke} = $cb;
400 $handler->ready; 548 $coro->ready;
401 cede; 549 cede; # for short-lived callbacks, this reduces pressure on the coro pool
402 } 550 }
403 551 schedule; # sleep well
404 schedule;
405 } 552 }
406}; 553};
554$unblock_scheduler->desc ("[unblock_sub scheduler]");
407 555
408sub unblock_sub(&) { 556sub unblock_sub(&) {
409 my $cb = shift; 557 my $cb = shift;
410 558
411 sub { 559 sub {
412 push @unblock_queue, [$cb, @_]; 560 unshift @unblock_queue, [$cb, @_];
413 $unblock_scheduler->ready; 561 $unblock_scheduler->ready;
414 } 562 }
415} 563}
416 564
417=back 565=back
424 572
425 - you must make very sure that no coro is still active on global 573 - you must make very sure that no coro is still active on global
426 destruction. very bad things might happen otherwise (usually segfaults). 574 destruction. very bad things might happen otherwise (usually segfaults).
427 575
428 - this module is not thread-safe. You should only ever use this module 576 - this module is not thread-safe. You should only ever use this module
429 from the same thread (this requirement might be losened in the future 577 from the same thread (this requirement might be loosened in the future
430 to allow per-thread schedulers, but Coro::State does not yet allow 578 to allow per-thread schedulers, but Coro::State does not yet allow
431 this). 579 this).
432 580
433=head1 SEE ALSO 581=head1 SEE ALSO
434 582
583Lower level Configuration, Coroutine Environment: L<Coro::State>.
584
585Debugging: L<Coro::Debug>.
586
435Support/Utility: L<Coro::Cont>, L<Coro::Specific>, L<Coro::State>, L<Coro::Util>. 587Support/Utility: L<Coro::Specific>, L<Coro::Util>.
436 588
437Locking/IPC: L<Coro::Signal>, L<Coro::Channel>, L<Coro::Semaphore>, L<Coro::SemaphoreSet>, L<Coro::RWLock>. 589Locking/IPC: L<Coro::Signal>, L<Coro::Channel>, L<Coro::Semaphore>, L<Coro::SemaphoreSet>, L<Coro::RWLock>.
438 590
439Event/IO: L<Coro::Timer>, L<Coro::Event>, L<Coro::Handle>, L<Coro::Socket>, L<Coro::Select>. 591Event/IO: L<Coro::Timer>, L<Coro::Event>, L<Coro::Handle>, L<Coro::Socket>.
440 592
593Compatibility: L<Coro::LWP>, L<Coro::Storable>, L<Coro::Select>.
594
441Embedding: L<Coro:MakeMaker> 595Embedding: L<Coro::MakeMaker>.
442 596
443=head1 AUTHOR 597=head1 AUTHOR
444 598
445 Marc Lehmann <schmorp@schmorp.de> 599 Marc Lehmann <schmorp@schmorp.de>
446 http://home.schmorp.de/ 600 http://home.schmorp.de/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines