Change 34245 by [EMAIL PROTECTED] on 2008/09/03 15:16:36
Integrate:
[ 33974]
Subject: [PATCH] Thread::Queue 2.09
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Fri, 30 May 2008 12:41:41 -0400
Message-ID: <[EMAIL PROTECTED]>
Explicitly check for undef in args because some versions of
looks_like_number(undef) return true.
[ 34049]
Subject: [PATCH] Thread::Semaphore 2.09
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Thu, 12 Jun 2008 09:41:24 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34050]
Subject: [PATCH] Thread::Queue 2.11
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Thu, 12 Jun 2008 09:42:42 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34051]
Subject: [PATCH] Thread::Queue 2.11
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Thu, 12 Jun 2008 09:42:42 -0400
Message-ID: <[EMAIL PROTECTED]>
This time, not empty.
Affected files ...
... //depot/maint-5.10/perl/lib/Thread/Queue.pm#4 integrate
... //depot/maint-5.10/perl/lib/Thread/Queue/t/01_basic.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Queue/t/02_refs.t#3 integrate
... //depot/maint-5.10/perl/lib/Thread/Queue/t/03_peek.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Queue/t/04_errs.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Queue/t/05_extract.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Queue/t/06_insert.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Queue/t/07_lock.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Queue/t/08_nothreads.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Semaphore.pm#4 integrate
... //depot/maint-5.10/perl/lib/Thread/Semaphore/t/01_basic.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Semaphore/t/02_errs.t#2 integrate
... //depot/maint-5.10/perl/lib/Thread/Semaphore/t/03_nothreads.t#2 integrate
Differences ...
==== //depot/maint-5.10/perl/lib/Thread/Queue.pm#4 (text) ====
Index: perl/lib/Thread/Queue.pm
--- perl/lib/Thread/Queue.pm#3~33883~ 2008-05-20 07:24:53.000000000 -0700
+++ perl/lib/Thread/Queue.pm 2008-09-03 08:16:36.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = '2.08';
+our $VERSION = '2.11';
use threads::shared 1.21;
use Scalar::Util 1.10 qw(looks_like_number blessed reftype refaddr);
@@ -168,7 +168,10 @@
$validate_index = sub {
my $index = shift;
- if (! looks_like_number($index) || (int($index) != $index)) {
+ if (! defined($index) ||
+ ! looks_like_number($index) ||
+ (int($index) != $index))
+ {
require Carp;
my ($method) = (caller(1))[3];
$method =~ s/Thread::Queue:://;
@@ -183,7 +186,11 @@
$validate_count = sub {
my $count = shift;
- if ((! looks_like_number($count)) || (int($count) != $count) || ($count <
1)) {
+ if (! defined($count) ||
+ ! looks_like_number($count) ||
+ (int($count) != $count) ||
+ ($count < 1))
+ {
require Carp;
my ($method) = (caller(1))[3];
$method =~ s/Thread::Queue:://;
@@ -202,7 +209,7 @@
=head1 VERSION
-This document describes Thread::Queue version 2.08
+This document describes Thread::Queue version 2.11
=head1 SYNOPSIS
@@ -455,7 +462,7 @@
L<http://www.cpanforum.com/dist/Thread-Queue>
Annotated POD for Thread::Queue:
-L<http://annocpan.org/~JDHEDDEN/Thread-Queue-2.08/lib/Thread/Queue.pm>
+L<http://annocpan.org/~JDHEDDEN/Thread-Queue-2.11/lib/Thread/Queue.pm>
Source repository:
L<http://code.google.com/p/thread-queue/>
==== //depot/maint-5.10/perl/lib/Thread/Queue/t/01_basic.t#2 (text) ====
Index: perl/lib/Thread/Queue/t/01_basic.t
--- perl/lib/Thread/Queue/t/01_basic.t#1~33514~ 2008-03-13 11:31:54.000000000
-0700
+++ perl/lib/Thread/Queue/t/01_basic.t 2008-09-03 08:16:36.000000000 -0700
@@ -8,7 +8,7 @@
}
use Config;
if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+ print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
exit(0);
}
}
@@ -129,4 +129,6 @@
is($q->dequeue(), 'done', 'Thread reported done');
is($q->pending(), 0, 'Empty queue');
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Queue/t/02_refs.t#3 (text) ====
Index: perl/lib/Thread/Queue/t/02_refs.t
--- perl/lib/Thread/Queue/t/02_refs.t#2~33883~ 2008-05-20 07:24:53.000000000
-0700
+++ perl/lib/Thread/Queue/t/02_refs.t 2008-09-03 08:16:36.000000000 -0700
@@ -8,7 +8,7 @@
}
use Config;
if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+ print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
exit(0);
}
}
@@ -184,4 +184,6 @@
is($$sref1, 'foo', 'Scalar ref unchanged');
is($$sref2, 'zzz', 'Shared scalar ref changed');
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Queue/t/03_peek.t#2 (text) ====
Index: perl/lib/Thread/Queue/t/03_peek.t
--- perl/lib/Thread/Queue/t/03_peek.t#1~33514~ 2008-03-13 11:31:54.000000000
-0700
+++ perl/lib/Thread/Queue/t/03_peek.t 2008-09-03 08:16:36.000000000 -0700
@@ -8,7 +8,7 @@
}
use Config;
if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+ print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
exit(0);
}
}
@@ -51,4 +51,6 @@
})->join();
q_check();
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Queue/t/04_errs.t#2 (text) ====
Index: perl/lib/Thread/Queue/t/04_errs.t
--- perl/lib/Thread/Queue/t/04_errs.t#1~33514~ 2008-03-13 11:31:54.000000000
-0700
+++ perl/lib/Thread/Queue/t/04_errs.t 2008-09-03 08:16:36.000000000 -0700
@@ -75,4 +75,6 @@
eval { $q->extract(0, 'foo'); };
like($@, qr/Invalid 'count'/, $@);
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Queue/t/05_extract.t#2 (text) ====
Index: perl/lib/Thread/Queue/t/05_extract.t
--- perl/lib/Thread/Queue/t/05_extract.t#1~33514~ 2008-03-13
11:31:54.000000000 -0700
+++ perl/lib/Thread/Queue/t/05_extract.t 2008-09-03 08:16:36.000000000
-0700
@@ -8,7 +8,7 @@
}
use Config;
if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+ print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
exit(0);
}
}
@@ -73,4 +73,6 @@
is_deeply([EMAIL PROTECTED], [4..6], 'Neg big overlap');
})->join();
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Queue/t/06_insert.t#2 (text) ====
Index: perl/lib/Thread/Queue/t/06_insert.t
--- perl/lib/Thread/Queue/t/06_insert.t#1~33514~ 2008-03-13
11:31:54.000000000 -0700
+++ perl/lib/Thread/Queue/t/06_insert.t 2008-09-03 08:16:36.000000000 -0700
@@ -8,7 +8,7 @@
}
use Config;
if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+ print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
exit(0);
}
}
@@ -101,4 +101,6 @@
@x = $q->dequeue_nb(100);
is_deeply([EMAIL PROTECTED], [1,'foo',2,3], 'Empty queue insert');
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Queue/t/07_lock.t#2 (text) ====
Index: perl/lib/Thread/Queue/t/07_lock.t
--- perl/lib/Thread/Queue/t/07_lock.t#1~33514~ 2008-03-13 11:31:54.000000000
-0700
+++ perl/lib/Thread/Queue/t/07_lock.t 2008-09-03 08:16:36.000000000 -0700
@@ -8,7 +8,7 @@
}
use Config;
if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+ print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
exit(0);
}
}
@@ -51,4 +51,6 @@
is_deeply([EMAIL PROTECTED], [1..5,8..10], 'Main dequeues');
threads::yield();
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Queue/t/08_nothreads.t#2 (text) ====
Index: perl/lib/Thread/Queue/t/08_nothreads.t
--- perl/lib/Thread/Queue/t/08_nothreads.t#1~33514~ 2008-03-13
11:31:54.000000000 -0700
+++ perl/lib/Thread/Queue/t/08_nothreads.t 2008-09-03 08:16:36.000000000
-0700
@@ -109,4 +109,6 @@
# Check results of thread's activities
is($q->pending(), 0, 'Empty queue');
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Semaphore.pm#4 (text) ====
Index: perl/lib/Thread/Semaphore.pm
--- perl/lib/Thread/Semaphore.pm#3~33883~ 2008-05-20 07:24:53.000000000
-0700
+++ perl/lib/Thread/Semaphore.pm 2008-09-03 08:16:36.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = '2.08';
+our $VERSION = '2.09';
use threads::shared;
use Scalar::Util 1.10 qw(looks_like_number);
@@ -66,7 +66,7 @@
=head1 VERSION
-This document describes Thread::Semaphore version 2.08
+This document describes Thread::Semaphore version 2.09
=head1 SYNOPSIS
@@ -151,7 +151,7 @@
L<http://www.cpanforum.com/dist/Thread-Semaphore>
Annotated POD for Thread::Semaphore:
-L<http://annocpan.org/~JDHEDDEN/Thread-Semaphore-2.08/lib/Thread/Semaphore.pm>
+L<http://annocpan.org/~JDHEDDEN/Thread-Semaphore-2.09/lib/Thread/Semaphore.pm>
Source repository:
L<http://code.google.com/p/thread-semaphore/>
==== //depot/maint-5.10/perl/lib/Thread/Semaphore/t/01_basic.t#2 (text) ====
Index: perl/lib/Thread/Semaphore/t/01_basic.t
--- perl/lib/Thread/Semaphore/t/01_basic.t#1~33513~ 2008-03-13
10:59:59.000000000 -0700
+++ perl/lib/Thread/Semaphore/t/01_basic.t 2008-09-03 08:16:36.000000000
-0700
@@ -8,7 +8,7 @@
}
use Config;
if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+ print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
exit(0);
}
}
@@ -73,4 +73,6 @@
ok(1, 'Main done');
threads::yield();
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Semaphore/t/02_errs.t#2 (text) ====
Index: perl/lib/Thread/Semaphore/t/02_errs.t
--- perl/lib/Thread/Semaphore/t/02_errs.t#1~33513~ 2008-03-13
10:59:59.000000000 -0700
+++ perl/lib/Thread/Semaphore/t/02_errs.t 2008-09-03 08:16:36.000000000
-0700
@@ -42,4 +42,6 @@
eval { $s->up('foo'); };
like($@, $err, $@);
+exit(0);
+
# EOF
==== //depot/maint-5.10/perl/lib/Thread/Semaphore/t/03_nothreads.t#2 (text) ====
Index: perl/lib/Thread/Semaphore/t/03_nothreads.t
--- perl/lib/Thread/Semaphore/t/03_nothreads.t#1~33513~ 2008-03-13
10:59:59.000000000 -0700
+++ perl/lib/Thread/Semaphore/t/03_nothreads.t 2008-09-03 08:16:36.000000000
-0700
@@ -21,4 +21,6 @@
$s->down();
is($$s, 1, 'Non-threaded semaphore');
+exit(0);
+
# EOF
End of Patch.
