* Examples/ex13.c: New test by Kurt Garloff <garloff@suse.de>.

	* Makefile (tests): Add ex13.
2000-08-22  Andreas Jaeger  <aj@suse.de>

	* Examples/ex13.c: New test by Kurt Garloff <garloff@suse.de>.

	* Makefile (tests): Add ex13.

3 files changed, 115 insertions, 1 deletions

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 498cebb415..cbd498db8a 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-22  Andreas Jaeger  <aj@suse.de>
+
+	* Examples/ex13.c: New test by Kurt Garloff <garloff@suse.de>.
+
+	* Makefile (tests): Add ex13.
+
 2000-08-20  Ulrich Drepper  <drepper@redhat.com>
 
 	* semaphore.h: Add restrict where required by AGd4.
diff --git a/linuxthreads/Examples/ex13.c b/linuxthreads/Examples/ex13.c
new file mode 100644
index 0000000000..137ca6e88d
--- /dev/null
+++ b/linuxthreads/Examples/ex13.c
@@ -0,0 +1,107 @@
+/* Test for Pthreads/mutexes.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Kurt Garloff <garloff@suse.de>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#define _GNU_SOURCE 1
+
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+#include <pthread.h>
+
+struct thr_ctrl
+{
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+  int retval;
+};
+
+void
+dump_mut (pthread_mutex_t * mut)
+{
+  int i;
+
+  for (i = 0; i < sizeof (*mut); i++)
+    printf (" %02x", *((unsigned char *) mut + i));
+  printf ("\n");
+};
+
+/* Helper, the opposite of pthread_cond_wait (cond, mut).  */
+void
+pthr_cond_signal_mutex (pthread_cond_t * cond, pthread_mutex_t * mut)
+{
+  int err;
+  if (err = pthread_mutex_lock (mut))
+    printf ("mutex_lock  : %s\n", strerror (err));
+  if (err = pthread_cond_signal (cond))
+    printf ("cond_signal : %s\n", strerror (err));
+  if (err = pthread_mutex_unlock (mut))
+    printf ("mutex_unlock: %s\n", strerror (err));
+}
+
+
+void *
+thread_start (void *ptr)
+{
+  struct thr_ctrl *tc = ptr;
+  int err;
+  /* Do initialization.  */
+  /* ... */
+  /* Signal that we are ready.  */
+  pthr_cond_signal_mutex (&tc->cond, &tc->mutex);
+  sleep (2);
+  pthr_cond_signal_mutex (&tc->cond, &tc->mutex);
+  tc->retval = 0;
+  pthread_exit (&tc->retval);
+}
+
+int
+main (void)
+{
+  struct thr_ctrl threadctrl;
+  pthread_t thread;
+  int err;
+  int *res = &threadctrl.retval;
+  pthread_mutexattr_t mutattr;
+  pthread_mutexattr_init (&mutattr);
+  pthread_mutex_init (&threadctrl.mutex, &mutattr);
+  pthread_cond_init (&threadctrl.cond, NULL);
+  if (err = pthread_mutex_lock (&threadctrl.mutex))
+    printf ("mutex_lock : %s\n", strerror (err));
+  dump_mut (&threadctrl.mutex);
+  pthread_create (&thread, NULL, thread_start, &threadctrl);
+  /* Wait until it's ready.  */
+  if (err = pthread_cond_wait (&threadctrl.cond, &threadctrl.mutex))
+    printf ("cond_wait  : %s\n", strerror (err));
+  /* Now, we should have acquired the mutex again!  */
+  dump_mut (&threadctrl.mutex);
+  sleep (1);
+  dump_mut (&threadctrl.mutex);
+  if (err = pthread_cond_wait (&threadctrl.cond, &threadctrl.mutex))
+    printf ("cond_wait  : %s\n", strerror (err));
+  if (err)
+    {
+      printf ("ERROR\n");
+      abort ();
+    };
+  dump_mut (&threadctrl.mutex);
+  pthread_join (thread, (void **) &res);
+  printf ("OK\n");
+  return 0;
+}
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index e60e2dc253..9ef66f9247 100644
--- a/linuxthreads/Makefile
+++ b/linuxthreads/Makefile
@@ -43,7 +43,8 @@ LDFLAGS-pthread.so = $(nodelete-$(have-z-nodelete))
 vpath %.c Examples
 
 librt-tests = ex10 ex11
-tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 joinrace tststack
+tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \
+	tststack
 
 include ../Rules