--- Coro/Coro.pm 2001/07/21 18:21:45 1.20 +++ Coro/Coro.pm 2001/08/11 19:59:19 1.30 @@ -16,7 +16,7 @@ # some more async code } - yield; + cede; =head1 DESCRIPTION @@ -26,9 +26,9 @@ This module is still experimental, see the BUGS section below. In this module, coroutines are defined as "callchain + lexical variables -+ @_ + $_ + $@ + $^W), that is, a coroutine has it's own callchain, it's -own set of lexicals and it's own set of perl's most important global -variables. ++ @_ + $_ + $@ + $^W + C stack), that is, a coroutine has it's own +callchain, it's own set of lexicals and it's own set of perl's most +important global variables. =cut @@ -38,13 +38,14 @@ use base Exporter; -$VERSION = 0.10; +$VERSION = 0.45; -@EXPORT = qw(async yield schedule terminate current); +@EXPORT = qw(async cede schedule terminate current); @EXPORT_OK = qw($current); { my @async; + my $init; # this way of handling attributes simply is NOT scalable ;() sub import { @@ -56,6 +57,13 @@ for (@_) { if ($_ eq "Coro") { push @async, $ref; + unless ($init++) { + eval q{ + sub INIT { + &async(pop @async) while @async; + } + }; + } } else { push @attrs, $_; } @@ -64,9 +72,6 @@ }; } - sub INIT { - &async(pop @async) while @async; - } } =item $main @@ -105,8 +110,15 @@ exit(51); }; -# we really need priorities... -my @ready; # the ready queue. hehe, rather broken ;) +# this coroutine is necessary because a coroutine +# cannot destroy itself. +my @destroy; +my $manager = new Coro sub { + while() { + delete ((pop @destroy)->{_coro_state}) while @destroy; + &schedule; + } +}; # static methods. not really. @@ -134,6 +146,7 @@ sub async(&@) { my $pid = new Coro @_; + $manager->ready; # this ensures that the stack is cloned from the manager $pid->ready; $pid; } @@ -146,26 +159,14 @@ =cut -my $prev; +=item cede -sub schedule { - # should be done using priorities :( - ($prev, $current) = ($current, shift @ready || $idle); - Coro::State::transfer($prev, $current); -} - -=item yield - -Yield to other processes. This function puts the current process into the -ready queue and calls C. +"Cede" to other processes. This function puts the current process into the +ready queue and calls C, which has the effect of giving up the +current "timeslice" to other coroutines of the same or higher priority. =cut -sub yield { - $current->ready; - &schedule; -} - =item terminate Terminates the current process. @@ -175,8 +176,9 @@ =cut sub terminate { - $current->{_results} = [@_]; + $current->cancel; &schedule; + die; # NORETURN } =back @@ -217,8 +219,15 @@ =cut -sub ready { - push @ready, $_[0]; +=item $process->cancel + +Like C, but terminates the specified process instead. + +=cut + +sub cancel { + push @destroy, $_[0]; + $manager->ready; } =back @@ -244,7 +253,8 @@ =head1 SEE ALSO L, L, L, L, -L, L, L. +L, L, L, L, +L, L. =head1 AUTHOR