[v2] malloc: Add pvalloc test.

Message ID 523042C2.5010805@linaro.org
State Accepted
Headers show

Commit Message

Will Newton Sept. 11, 2013, 10:15 a.m.
ChangeLog:

2013-08-16  Will Newton  <will.newton@linaro.org>

    * malloc/Makefile: Add tst-pvalloc.
    * malloc/tst-pvalloc.c: New file.
---
 malloc/Makefile      |  3 +-
 malloc/tst-pvalloc.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 malloc/tst-pvalloc.c

Changes in v2:
 - Check errno for -pagesize failure case

Comments

Will Newton Sept. 25, 2013, 1:09 p.m. | #1
On 11 September 2013 11:15, Will Newton <will.newton@linaro.org> wrote:
>
> ChangeLog:
>
> 2013-08-16  Will Newton  <will.newton@linaro.org>
>
>     * malloc/Makefile: Add tst-pvalloc.
>     * malloc/tst-pvalloc.c: New file.
> ---
>  malloc/Makefile      |  3 +-
>  malloc/tst-pvalloc.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 93 insertions(+), 1 deletion(-)
>  create mode 100644 malloc/tst-pvalloc.c
>
> Changes in v2:
>  - Check errno for -pagesize failure case

Ping?
Carlos O'Donell Oct. 2, 2013, 4:34 p.m. | #2
Will,

Thank you very much for test cases. These are much appreciated.

Some nits below and one cut-and-paste issue:

On 09/11/2013 06:15 AM, Will Newton wrote:
> 
> ChangeLog:
> 
> 2013-08-16  Will Newton  <will.newton@linaro.org>
> 
>     * malloc/Makefile: Add tst-pvalloc.
>     * malloc/tst-pvalloc.c: New file.
> ---
>  malloc/Makefile      |  3 +-
>  malloc/tst-pvalloc.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 93 insertions(+), 1 deletion(-)
>  create mode 100644 malloc/tst-pvalloc.c
> 
> Changes in v2:
>  - Check errno for -pagesize failure case
> 
> diff --git a/malloc/Makefile b/malloc/Makefile
> index 4903c13..17d146b 100644
> --- a/malloc/Makefile
> +++ b/malloc/Makefile
> @@ -26,7 +26,8 @@ dist-headers := malloc.h
>  headers := $(dist-headers) obstack.h mcheck.h
>  tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
>  	 tst-mallocstate tst-mcheck tst-mallocfork tst-trim1 \
> -	 tst-malloc-usable tst-realloc tst-posix_memalign
> +	 tst-malloc-usable tst-realloc tst-posix_memalign \
> +	 tst-pvalloc
>  test-srcs = tst-mtrace
> 
>  routines = malloc morecore mcheck mtrace obstack
> diff --git a/malloc/tst-pvalloc.c b/malloc/tst-pvalloc.c
> new file mode 100644
> index 0000000..1126672
> --- /dev/null
> +++ b/malloc/tst-pvalloc.c
> @@ -0,0 +1,91 @@
> +/* Copyright (C) 2013 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   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, see
> +   <http://www.gnu.org/licenses/>.  */
> +
> +#include <errno.h>
> +#include <malloc.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <unistd.h>
> +
> +static int errors = 0;
> +
> +static void
> +merror (const char *msg)
> +{
> +  ++errors;
> +  printf ("Error: %s\n", msg);
> +}
> +
> +static int
> +do_test (void)
> +{
> +  void *p;
> +  unsigned long pagesize = getpagesize();
> +  unsigned long ptrval;
> +  int save;
> +
> +  errno = 0;
> +
> +  p = pvalloc (-1);
> +
> +  save = errno;
> +
> +  if (p != NULL)
> +    merror ("pvalloc (-1) succeeded.");
> +
> +  if (p == NULL && save != ENOMEM)
> +    merror ("pvalloc (-1) errno is not set correctly");
> +
> +  errno = 0;

Needs comment and free (p).

> +
> +  p = pvalloc (-pagesize);
> +

How is this different from pvalloc (-1)?

Are you just checking that a page-aligned massive allocation also fails?

> +  save = errno;
> +
> +  if (p != NULL)
> +    merror ("pvalloc (-pagesize) succeeded.");
> +
> +  if (p == NULL && save != ENOMEM)
> +    merror ("pvalloc (-pagesize) errno is not set correctly");
> +

Needs comment and free (p).

> +  p = pvalloc (0);
> +
> +  if (p == NULL)
> +    merror ("pvalloc (0) failed.");
> +
> +  free (p);
> +
> +  p = pvalloc (32);
> +
> +  if (p == NULL)
> +    merror ("pvalloc (32) failed.");
> +
> +  ptrval = (unsigned long)p;
> +
> +  if (p == NULL)
> +    merror ("pvalloc (32) failed.");

Duplicate check? Cut and paste error?

> +
> +  if ((ptrval & (pagesize - 1)) != 0)
> +    merror ("returned pointer is not page aligned.");
> +
> +  free (p);
> +

OK.

> +  return errors != 0;
> +}
> +
> +#define TEST_FUNCTION do_test ()
> +#include "../test-skeleton.c"
> 

Cheers,
Carlos.

Patch

diff --git a/malloc/Makefile b/malloc/Makefile
index 4903c13..17d146b 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -26,7 +26,8 @@  dist-headers := malloc.h
 headers := $(dist-headers) obstack.h mcheck.h
 tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
 	 tst-mallocstate tst-mcheck tst-mallocfork tst-trim1 \
-	 tst-malloc-usable tst-realloc tst-posix_memalign
+	 tst-malloc-usable tst-realloc tst-posix_memalign \
+	 tst-pvalloc
 test-srcs = tst-mtrace

 routines = malloc morecore mcheck mtrace obstack
diff --git a/malloc/tst-pvalloc.c b/malloc/tst-pvalloc.c
new file mode 100644
index 0000000..1126672
--- /dev/null
+++ b/malloc/tst-pvalloc.c
@@ -0,0 +1,91 @@ 
+/* Copyright (C) 2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <malloc.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static int errors = 0;
+
+static void
+merror (const char *msg)
+{
+  ++errors;
+  printf ("Error: %s\n", msg);
+}
+
+static int
+do_test (void)
+{
+  void *p;
+  unsigned long pagesize = getpagesize();
+  unsigned long ptrval;
+  int save;
+
+  errno = 0;
+
+  p = pvalloc (-1);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("pvalloc (-1) succeeded.");
+
+  if (p == NULL && save != ENOMEM)
+    merror ("pvalloc (-1) errno is not set correctly");
+
+  errno = 0;
+
+  p = pvalloc (-pagesize);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("pvalloc (-pagesize) succeeded.");
+
+  if (p == NULL && save != ENOMEM)
+    merror ("pvalloc (-pagesize) errno is not set correctly");
+
+  p = pvalloc (0);
+
+  if (p == NULL)
+    merror ("pvalloc (0) failed.");
+
+  free (p);
+
+  p = pvalloc (32);
+
+  if (p == NULL)
+    merror ("pvalloc (32) failed.");
+
+  ptrval = (unsigned long)p;
+
+  if (p == NULL)
+    merror ("pvalloc (32) failed.");
+
+  if ((ptrval & (pagesize - 1)) != 0)
+    merror ("returned pointer is not page aligned.");
+
+  free (p);
+
+  return errors != 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"