--- cvsroot/Coro/Coro.pm	2001/07/21 02:49:09	1.18
+++ cvsroot/Coro/Coro.pm	2001/08/11 19:59:19	1.30
@@ -16,7 +16,7 @@
     # some more async code
  }
 
- yield;
+ cede;
 
 =head1 DESCRIPTION
 
@@ -25,6 +25,11 @@
 
 This module is still experimental, see the BUGS section below.
 
+In this module, coroutines are defined as "callchain + lexical 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
 
 package Coro;
@@ -33,15 +38,14 @@
 
 use base Exporter;
 
-$VERSION = 0.09;
+$VERSION = 0.45;
 
-@EXPORT = qw(async yield schedule terminate);
+@EXPORT = qw(async cede schedule terminate current);
 @EXPORT_OK = qw($current);
 
 {
-   use subs 'async';
-
    my @async;
+   my $init;
 
    # this way of handling attributes simply is NOT scalable ;()
    sub import {
@@ -53,6 +57,13 @@
          for (@_) {
             if ($_ eq "Coro") {
                push @async, $ref;
+               unless ($init++) {
+                  eval q{
+                     sub INIT {
+                        &async(pop @async) while @async;
+                     }
+                  };
+               }
             } else {
                push @attrs, $_;
             }
@@ -61,9 +72,6 @@
       };
    }
 
-   sub INIT {
-      async pop @async while @async;
-   }
 }
 
 =item $main
@@ -74,7 +82,7 @@
 
 our $main = new Coro;
 
-=item $current
+=item $current (or as function: current)
 
 The current coroutine (the last coroutine switched to). The initial value is C<$main> (of course).
 
@@ -87,6 +95,8 @@
 
 our $current = $main;
 
+sub current() { $current }
+
 =item $idle
 
 The coroutine to switch to when no other coroutine is running. The default
@@ -100,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.
 
@@ -129,6 +146,7 @@
 
 sub async(&@) {
    my $pid = new Coro @_;
+   $manager->ready; # this ensures that the stack is cloned from the manager
    $pid->ready;
    $pid;
 }
@@ -141,26 +159,14 @@
 
 =cut
 
-my $prev;
-
-sub schedule {
-   # should be done using priorities :(
-   ($prev, $current) = ($current, shift @ready || $idle);
-   Coro::State::transfer($prev, $current);
-}
-
-=item yield
+=item cede
 
-Yield to other processes. This function puts the current process into the
-ready queue and calls C<schedule>.
+"Cede" to other processes. This function puts the current process into the
+ready queue and calls C<schedule>, 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.
@@ -170,8 +176,9 @@
 =cut
 
 sub terminate {
-   $current->{_results} = [@_];
+   $current->cancel;
    &schedule;
+   die; # NORETURN
 }
 
 =back
@@ -212,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
@@ -234,12 +248,13 @@
    remaining bugs.
  - this module is not thread-safe. You must only ever use this module from
    the same thread (this requirement might be loosened in the future to
-   allow per-thread schedulers, but Coro::Satte does not yet allow this).
+   allow per-thread schedulers, but Coro::State does not yet allow this).
 
 =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