Update.

	* Makefile (tests): Add tst-cond7.
	* tst-cond7.c: New file.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c7fdb47..38f2ffb 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-03  Ulrich Drepper  <drepper@redhat.com>
 
+       * Makefile (tests): Add tst-cond7.
+       * tst-cond7.c: New file.
+
        * sysdeps/unix/sysv/linux/i386/i486/lowlevelcond.S
        (condvar_cleanup): Get condvar address from the right place.
 

diff --git a/nptl/Makefile b/nptl/Makefile
index ceee787..a2d7abb 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -122,7 +122,7 @@ omit-deps = $(unix-syscalls:%=ptw-%)
 tests = tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \
        tst-mutex7 \
        tst-spin1 tst-spin2 tst-spin3 \
-       tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 \
+       tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
        tst-rwlock1 tst-rwlock2 tst-rwlock3 tst-rwlock4 tst-rwlock5 \
        tst-rwlock6 tst-rwlock7 \
        tst-once1 tst-once2 \

diff --git a/nptl/tst-cond7.c b/nptl/tst-cond7.c
new file mode 100644 (file)
index 0000000..4cc7cfb
--- /dev/null
+++ b/nptl/tst-cond7.c
@@ -0,0 +1,154 @@
+/* Copyright (C) 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/time.h>
+
+
+typedef struct
+  {
+    pthread_cond_t cond;
+    pthread_mutex_t lock;
+    pthread_t h;
+  } T;
+
+
+static volatile bool done;
+
+
+static void *
+tf (void *arg)
+{
+  puts ("child created");
+
+  T *t = (T *) arg;
+
+  if (pthread_mutex_lock (&t->lock) != 0)
+    {
+      puts ("child: lock failed");
+      exit (1);
+    }
+
+  done = true;
+
+  if (pthread_cond_signal (&t->cond) != 0)
+    {
+      puts ("child: cond_signal failed");
+      exit (1);
+    }
+
+  if (pthread_cond_wait (&t->cond, &t->lock) != 0)
+    {
+      puts ("child: cond_wait failed");
+      exit (1);
+    }
+
+  if (pthread_mutex_unlock (&t->lock) != 0)
+    {
+      puts ("child: unlock failed");
+      exit (1);
+    }
+
+  return NULL;
+}
+
+
+static int
+do_test (void)
+{
+  int i;
+#define N 100
+  T *t[N];
+  for (i = 0; i < N; ++i)
+    {
+      printf ("round %d\n", i);
+
+      t[i] = (T *) malloc (sizeof (T));
+      if (t[i] == NULL)
+       {
+         puts ("out of memory");
+         exit (1);
+       }
+
+      if (pthread_mutex_init (&t[i]->lock, NULL) != 0
+         || pthread_cond_init (&t[i]->cond, NULL) != 0)
+       {
+         puts ("an _init function failed");
+         exit (1);
+       }
+
+      if (pthread_mutex_lock (&t[i]->lock) != 0)
+       {
+         puts ("initial mutex_lock failed");
+         exit (1);
+       }
+
+      done = false;
+
+      if (pthread_create (&t[i]->h, NULL, tf, t[i]) != 0)
+       {
+         puts ("pthread_create failed");
+         exit (1);
+       }
+
+      do
+       if (pthread_cond_wait (&t[i]->cond, &t[i]->lock) != 0)
+         {
+           puts ("cond_wait failed");
+           exit (1);
+         }
+      while (! done);
+
+      if (pthread_cancel (t[i]->h) != 0)
+       {
+         puts ("cancel failed");
+         exit (1);
+       }
+
+      puts ("parent: joining now");
+
+      void *result;
+      if (pthread_join (t[i]->h, &result) != 0)
+       {
+         puts ("join failed");
+         exit (1);
+       }
+
+      if (result != PTHREAD_CANCELED)
+       {
+         puts ("result != PTHREAD_CANCELED");
+         exit (1);
+       }
+    }
+
+  for (i = 0; i < N; ++i)
+    free (t[i]);
+
+  return 0;
+}
+
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"