Commit b625fdb7 by Loren J. Rittle Committed by Loren J. Rittle

* testsuite/thread/pthread4.cc: Tweak test.

From-SVN: r66817
parent 3b3acc81
2003-05-14 Loren J. Rittle <ljrittle@acm.org>
* testsuite/thread/pthread4.cc: Tweak test.
2003-05-13 Benjamin Kosnik <bkoz@redhat.com> 2003-05-13 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/27_io/ios_base/cons/copy_neg.cc: Remove * testsuite/27_io/ios_base/cons/copy_neg.cc: Remove
......
...@@ -35,6 +35,8 @@ using namespace std; ...@@ -35,6 +35,8 @@ using namespace std;
static list<string> foo; static list<string> foo;
static pthread_mutex_t fooLock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t fooLock = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t fooCondOverflow = PTHREAD_COND_INITIALIZER;
static pthread_cond_t fooCondUnderflow = PTHREAD_COND_INITIALIZER;
static unsigned max_size = 10; static unsigned max_size = 10;
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
static int iters = 10000; static int iters = 10000;
...@@ -50,11 +52,12 @@ produce (void*) ...@@ -50,11 +52,12 @@ produce (void*)
string str ("test string"); string str ("test string");
pthread_mutex_lock (&fooLock); pthread_mutex_lock (&fooLock);
if (foo.size () < max_size) while (foo.size () >= max_size)
{ pthread_cond_wait (&fooCondOverflow, &fooLock);
foo.push_back (str); foo.push_back (str);
num++; num++;
} if (foo.size () >= (max_size / 2))
pthread_cond_signal (&fooCondUnderflow);
pthread_mutex_unlock (&fooLock); pthread_mutex_unlock (&fooLock);
} }
...@@ -67,12 +70,15 @@ consume (void*) ...@@ -67,12 +70,15 @@ consume (void*)
for (int num = 0; num < iters; ) for (int num = 0; num < iters; )
{ {
pthread_mutex_lock (&fooLock); pthread_mutex_lock (&fooLock);
while (foo.size () == 0)
pthread_cond_wait (&fooCondUnderflow, &fooLock);
while (foo.size () > 0) while (foo.size () > 0)
{ {
string str = foo.back (); string str = foo.back ();
foo.pop_back (); foo.pop_back ();
num++; num++;
} }
pthread_cond_signal (&fooCondOverflow);
pthread_mutex_unlock (&fooLock); pthread_mutex_unlock (&fooLock);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment