aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--malloc/Makefile2
-rw-r--r--malloc/tst-calloc.c110
3 files changed, 114 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 445f4a0..0a24150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-04-12 Ulrich Drepper <drepper@redhat.com>
+ * malloc/Makefile (tests): Add tst-calloc.
+ * malloc/tst-calloc.c: New file.
+
* sysdeps/arm/libm-test-ulps: New file.
* malloc/malloc.c: Undo all of today's changes.
diff --git a/malloc/Makefile b/malloc/Makefile
index 53094ac..639145c 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -25,7 +25,7 @@ all:
dist-headers := malloc.h
headers := $(dist-headers) obstack.h mcheck.h
-tests := mallocbug tst-malloc tst-valloc
+tests := mallocbug tst-malloc tst-valloc tst-calloc
distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h memprof.h
diff --git a/malloc/tst-calloc.c b/malloc/tst-calloc.c
new file mode 100644
index 0000000..371cfeb
--- /dev/null
+++ b/malloc/tst-calloc.c
@@ -0,0 +1,110 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>.
+
+ 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. */
+
+#include <errno.h>
+#include <error.h>
+#include <malloc.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+
+/* Number of samples per size. */
+#define N 50000
+
+
+static void
+fixed_test (int size)
+{
+ char *ptrs[N];
+ int i;
+
+ for (i = 0; i < N; ++i)
+ {
+ int j;
+
+ ptrs[i] = (char *) calloc (1, size);
+
+ if (ptrs[i] == NULL)
+ break;
+
+ for (j = 0; j < size; ++j)
+ {
+ if (ptrs[i][j] != '\0')
+ error (EXIT_FAILURE, 0,
+ "byte not cleared (size %d, element %d, byte %d)",
+ size, i, j);
+ ptrs[i][j] = '\xff';
+ }
+ }
+
+ while (i-- > 0)
+ free (ptrs[i]);
+}
+
+
+static void
+random_test (void)
+{
+ char *ptrs[N];
+ int i;
+
+ for (i = 0; i < N; ++i)
+ {
+ int j;
+ int n = 1 + random () % 10;
+ int elem = 1 + random () % 100;
+ int size = n * elem;
+
+ ptrs[i] = (char *) calloc (n, elem);
+
+ if (ptrs[i] == NULL)
+ break;
+
+ for (j = 0; j < size; ++j)
+ {
+ if (ptrs[i][j] != '\0')
+ error (EXIT_FAILURE, 0,
+ "byte not cleared (size %d, element %d, byte %d)",
+ size, i, j);
+ ptrs[i][j] = '\xff';
+ }
+ }
+
+ while (i-- > 0)
+ free (ptrs[i]);
+}
+
+
+int
+main (void)
+{
+ /* We are allocating blocks with `calloc' and check whether every
+ block is completely cleared. We first try this for some fixed
+ times and then with random size. */
+ fixed_test (15);
+ fixed_test (5);
+ fixed_test (17);
+ fixed_test (6);
+ fixed_test (31);
+ fixed_test (96);
+
+ random_test ();
+
+ return 0;
+}