[PATCH] Add a testcase similar to linuxthreads one to NPTL as well

[PATCH] Add a testcase similar to linuxthreads one to NPTL as well

[Jakub Jelinek]

Hi!

NPTL passes this test already, but adding it to the testsuite certainly
doesn't hurt.

2003-12-17  Jakub Jelinek  <jakub@redhat.com>

	* Makefile (tests): Add tst-stack3.  Depend on $(objpfx)tst-stack3-mem.
	(generated): Add tst-stack3.mtrace and tst-stack3-mem.
	(tst-stack3-ENV): Set.
	($(objpfx)tst-stack3-mem): New.
	* tst-stack3.c: New test.

--- libc/nptl/Makefile.jj	2003-12-12 14:37:29.000000000 +0100
+++ libc/nptl/Makefile	2003-12-17 13:03:10.000000000 +0100
@@ -223,7 +223,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 \
 	tst-exec1 tst-exec2 tst-exec3 tst-exec4 \
 	tst-exit1 \
 	tst-stdio1 tst-stdio2 \
-	tst-stack1 tst-stack2 \
+	tst-stack1 tst-stack2 tst-stack3 \
 	tst-unload \
 	tst-dlsym1 \
 	tst-sysconf \
@@ -406,6 +406,12 @@ LDFLAGS-tst-atfork2 = -rdynamic
 tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace
 $(objpfx)tst-atfork2mod.so: $(shared-thread-library)
 
+tests: $(objpfx)tst-stack3-mem
+tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace
+$(objpfx)tst-stack3-mem: $(objpfx)tst-stack3.out
+	$(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@
+generated += tst-stack3-mem tst-stack3.mtrace
+
 $(objpfx)tst-cleanup4: $(objpfx)tst-cleanup4aux.o $(shared-thread-library)
 $(objpfx)tst-cleanupx4: $(objpfx)tst-cleanup4aux.o $(shared-thread-library)
 
--- libc/nptl/tst-stack3.c.jj	2003-12-17 12:59:56.000000000 +0100
+++ libc/nptl/tst-stack3.c	2003-12-17 12:31:57.000000000 +0100
@@ -0,0 +1,98 @@
+/* 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.  */
+
+/* Test whether pthread_create/pthread_join with user defined stacks
+   doesn't leak memory.  */
+
+#include <limits.h>
+#include <mcheck.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static int seen;
+
+static void *
+tf (void *p)
+{
+  ++seen;
+  return NULL;
+}
+
+static int
+do_test (void)
+{
+  mtrace ();
+
+  void *stack;
+  int res = posix_memalign (&stack, getpagesize (), 4 * PTHREAD_STACK_MIN);
+  if (res)
+    {
+      printf ("malloc failed %s\n", strerror (res));
+      return 1;
+    }
+
+  pthread_attr_t attr;
+  pthread_attr_init (&attr);
+
+  int result = 0;
+  res = pthread_attr_setstack (&attr, stack, 4 * PTHREAD_STACK_MIN);
+  if (res)
+    {
+      printf ("pthread_attr_setstack failed %d\n", res);
+      result = 1;
+    }
+
+  for (int i = 0; i < 16; ++i)
+    {
+      /* Create the thread.  */
+      pthread_t th;
+      res = pthread_create (&th, &attr, tf, NULL);
+      if (res)
+	{
+	  printf ("pthread_create failed %d\n", res);
+	  result = 1;
+	}
+      else
+	{
+	  res = pthread_join (th, NULL);
+	  if (res)
+	    {
+	      printf ("pthread_join failed %d\n", res);
+	      result = 1;
+	    }
+	}
+    }
+
+  pthread_attr_destroy (&attr);
+
+  if (seen != 16)
+    {
+      printf ("seen %d != 16\n", seen);
+      result = 1;
+    }
+
+  free (stack);
+  return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

	Jakub

Re: [PATCH] Add a testcase similar to linuxthreads one to NPTL as well

[Ulrich Drepper]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jakub Jelinek wrote:

> 	* Makefile (tests): Add tst-stack3.  Depend on $(objpfx)tst-stack3-mem.
> 	(generated): Add tst-stack3.mtrace and tst-stack3-mem.
> 	(tst-stack3-ENV): Set.
> 	($(objpfx)tst-stack3-mem): New.
> 	* tst-stack3.c: New test.

Applied.  Thanks,

- -- 
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQE/4Oye2ijCOnn/RHQRAqUzAJ9Fu8rHFf7d1Gp9XQ5dxCiw1FBTTgCgyEca
EhCKsRID+JcmwLhWy9X4glk=
=jlnL
-----END PGP SIGNATURE-----