Integrate perl

[perl5.git] / ext / threads / shared / queue.pm

diff --git a/ext/threads/shared/queue.pm b/ext/threads/shared/queue.pm
index 542c000..30b6ea2 100644 (file)
--- a/ext/threads/shared/queue.pm
+++ b/ext/threads/shared/queue.pm
@@ -1,48 +1,9 @@
-
 package threads::shared::queue;
 
 use threads::shared;
 use strict;
 
-sub new {
-    my $class = shift;
-    my @q : shared = @_;
-    my $q = \@q;
-    return bless $q, $class;
-}
-
-sub dequeue  {
-    my $q = shift;
-    lock(@$q);
-    until(@$q) {
-       cond_wait(@$q);
-    }
-    return shift @$q;
-}
-
-sub dequeue_nb {
-  my $q = shift;
-  lock(@$q);
-  if (@$q) {
-    return shift @$q;
-  } else {
-    return undef;
-  }
-}
-
-sub enqueue {
-    my $q = shift;
-    lock(@$q);
-    push(@$q, @_) and cond_broadcast @$q;
-}
-
-sub pending  {
-  my $q = shift;
-  lock(@$q);
-  return scalar(@$q);
-}
-
-1;
+our $VERSION = '1.00';
 
 =head1 NAME
 
@@ -64,7 +25,7 @@ A queue, as implemented by C<threads::shared::queue> is a thread-safe
 data structure much like a list.  Any number of threads can safely 
 add elements to the end of the list, or remove elements from the head 
 of the list. (Queues don't permit adding or removing elements from 
-the middle of the list)
+the middle of the list).
 
 =head1 FUNCTIONS AND METHODS
 
@@ -77,7 +38,7 @@ The C<new> function creates a new empty queue.
 =item enqueue LIST
 
 The C<enqueue> method adds a list of scalars on to the end of the queue.
-The queue will grow as needed to accomodate the list.
+The queue will grow as needed to accommodate the list.
 
 =item dequeue
 
@@ -100,7 +61,42 @@ The C<pending> method returns the number of items still in the queue.
 
 =head1 SEE ALSO
 
-L<threads> L<threads::shared>
+L<threads>, L<threads::shared>
 
 =cut
 
+sub new {
+    my $class = shift;
+    my @q : shared = @_;
+    return bless \@q, $class;
+}
+
+sub dequeue  {
+    my $q = shift;
+    lock(@$q);
+    cond_wait @$q until @$q;
+    cond_signal @$q if @$q > 1;
+    return shift @$q;
+}
+
+sub dequeue_nb {
+    my $q = shift;
+    lock(@$q);
+    return shift @$q;
+}
+
+sub enqueue {
+    my $q = shift;
+    lock(@$q);
+    push @$q, @_  and cond_signal @$q;
+}
+
+sub pending  {
+    my $q = shift;
+    lock(@$q);
+    return scalar(@$q);
+}
+
+1;
+
+