--- Coro/t/15_semaphore.t	2008/11/15 06:26:52	1.1
+++ Coro/t/15_semaphore.t	2008/11/18 23:20:41	1.4
@@ -1,34 +1,104 @@
 $|=1;
-print "1..1\n";
+print "1..6\n";
 
 use Coro;
 use Coro::Semaphore;
 
-my $sem = new Coro::Semaphore 2;
+{
+   my $sem = new Coro::Semaphore 2;
 
-my $rand = 0;
+   my $rand = 0;
 
-sub xrand {
-   $rand = ($rand * 121 + 2121) % 212121;
-   $rand / 212120
+   sub xrand {
+      $rand = ($rand * 121 + 2121) % 212121;
+      $rand / 212120
+   }
+
+   my $counter;
+
+   $_->join for
+      map {
+         async {
+            my $current = $Coro::current;
+            for (1..100) {
+               cede if 0.2 > xrand;
+               Coro::async_pool { $current->ready } if 0.2 > xrand;
+               $counter += $sem->count;
+               my $guard = $sem->guard;
+               cede; cede; cede; cede;
+            }
+         }
+      } 1..15
+   ;
+
+   print $counter == 998 ? "" : "not ", "ok 1 # $counter\n";
 }
 
-my $counter;
+# check terminate
+{
+   my $sem = new Coro::Semaphore 0;
+
+   $as1 = async {
+      my $g = $sem->guard;
+      print "not ok 2\n";
+   };    
+
+   $as2 = async {
+      my $g = $sem->guard;
+      print "ok 2\n";
+   };    
+
+   cede;
+
+   $sem->up; # wake up as1
+   $as1->cancel; # destroy as1 before it could ->guard
+   $as1->join;
+   $as2->join;
+}
 
-$_->join for
-   map {
-      async {
-         my $current = $Coro::current;
-         for (1..100) {
-            cede if 0.2 > xrand;
-            Coro::async_pool { $current->ready } if 0.2 > xrand;
-            $counter += $sem->count;
-            my $guard = $sem->guard;
-            cede; cede; cede; cede;
-         }
-      }
-   } 1..15
-;
+# check throw
+{
+   my $sem = new Coro::Semaphore 0;
+
+   $as1 = async {
+      my $g = eval {
+         $sem->guard;
+      };
+      print $@ ? "" : "not ", "ok 3\n";
+   };    
+
+   $as2 = async {
+      my $g = $sem->guard;
+      print "ok 4\n";
+   };    
+
+   cede;
+
+   $sem->up; # wake up as1
+   $as1->throw (1); # destroy as1 before it could ->guard
+   $as1->join;
+   $as2->join;
+}
+
+# check wait
+{
+   my $sem = new Coro::Semaphore 0;
+
+   $as1 = async {
+      $sem->wait;
+      print "ok 5\n";
+   };    
+
+   $as2 = async {
+      my $g = $sem->guard;
+      print "ok 6\n";
+   };    
+
+   cede;
+
+   $sem->up; # wake up as1
+   $as1->join;
+   $as2->join;
+}
 
-print $counter == 750 ? "" : "not ", "ok 1 # $counter\n"