--- cvsroot/Coro/Coro.pm	2001/07/23 04:23:32	1.23
+++ cvsroot/Coro/Coro.pm	2001/08/11 19:59:19	1.30
@@ -38,13 +38,14 @@
 
 use base Exporter;
 
-$VERSION = 0.10;
+$VERSION = 0.45;
 
 @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,14 +159,6 @@
 
 =cut
 
-my $prev;
-
-sub schedule {
-   # should be done using priorities :(
-   ($prev, $current) = ($current, shift @ready || $idle);
-   Coro::State::transfer($prev, $current);
-}
-
 =item cede
 
 "Cede" to other processes. This function puts the current process into the
@@ -162,11 +167,6 @@
 
 =cut
 
-sub cede {
-   $current->ready;
-   &schedule;
-}
-
 =item terminate
 
 Terminates the current process.
@@ -175,21 +175,10 @@
 
 =cut
 
-# this coroutine is necessary because a coroutine
-# cannot destroy itself.
-my @destroy;
-my $terminate = new Coro sub {
-   while() {
-      delete ((pop @destroy)->{_coro_state}) while @destroy;
-      &schedule;
-   }
-};
-
 sub terminate {
-   push @destroy, $current;
-   $terminate->ready;
+   $current->cancel;
    &schedule;
-   # NORETURN
+   die; # NORETURN
 }
 
 =back
@@ -230,8 +219,15 @@
 
 =cut
 
-sub ready {
-   push @ready, $_[0];
+=item $process->cancel
+
+Like C<terminate>, but terminates the specified process instead.
+
+=cut
+
+sub cancel {
+   push @destroy, $_[0];
+   $manager->ready;
 }
 
 =back
@@ -257,7 +253,8 @@
 =head1 SEE ALSO
 
 L<Coro::Channel>, L<Coro::Cont>, L<Coro::Specific>, L<Coro::Semaphore>,
-L<Coro::Signal>, L<Coro::State>, L<Coro::Event>.
+L<Coro::Signal>, L<Coro::State>, L<Coro::Event>, L<Coro::RWLock>,
+L<Coro::Handle>, L<Coro::Socket>.
 
 =head1 AUTHOR