[v2] malloc: Add posix_memalign test.

Message ID 523042B4.90602@linaro.org
State Accepted
Headers show

Commit Message

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

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

	* malloc/Makefile: Add tst-posix_memalign.
	* malloc/tst-posix_memalign.c: New file.
---
 malloc/Makefile             |  2 +-
 malloc/tst-posix_memalign.c | 98 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 malloc/tst-posix_memalign.c

Comments

Will Newton Sept. 25, 2013, 1:07 p.m. | #1
On 11 September 2013 11:15, Will Newton <will.newton@linaro.org> wrote:
>
> ChangeLog:
>
> 2013-08-12  Will Newton  <will.newton@linaro.org>
>
>         * malloc/Makefile: Add tst-posix_memalign.
>         * malloc/tst-posix_memalign.c: New file.
> ---
>  malloc/Makefile             |  2 +-
>  malloc/tst-posix_memalign.c | 98 +++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 99 insertions(+), 1 deletion(-)
>  create mode 100644 malloc/tst-posix_memalign.c

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

Thanks for the additional test case.

Some comments below, there are some things that
should get fixed up.

> 2013-08-12  Will Newton  <will.newton@linaro.org>
> 
> 	* malloc/Makefile: Add tst-posix_memalign.
> 	* malloc/tst-posix_memalign.c: New file.
> ---
>  malloc/Makefile             |  2 +-
>  malloc/tst-posix_memalign.c | 98 +++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 99 insertions(+), 1 deletion(-)
>  create mode 100644 malloc/tst-posix_memalign.c
> 
> diff --git a/malloc/Makefile b/malloc/Makefile
> index b16dac8..4903c13 100644
> --- a/malloc/Makefile
> +++ b/malloc/Makefile
> @@ -26,7 +26,7 @@ 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-malloc-usable tst-realloc tst-posix_memalign
>  test-srcs = tst-mtrace
> 
>  routines = malloc morecore mcheck mtrace obstack
> diff --git a/malloc/tst-posix_memalign.c b/malloc/tst-posix_memalign.c
> new file mode 100644
> index 0000000..9d9d1bf
> --- /dev/null
> +++ b/malloc/tst-posix_memalign.c
> @@ -0,0 +1,98 @@
> +/* 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 <stdlib.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;
> +  int ret;
> +  unsigned long pagesize = getpagesize();
> +  unsigned long ptrval;
> +
> +  p = NULL;
> +

Test case needs comment.

> +  ret = posix_memalign (&p, sizeof (void *), -1);
> +
> +  if (ret != ENOMEM)
> +    merror ("posix_memalign (&p, sizeof (void *), -1) succeeded.");
> +

OK.

> +  if (ret == ENOMEM && p != NULL)
> +    merror ("returned an error but pointer was modified");
> +

OK.

Needs free (p).

> +  p = NULL;
> +

Test case needs comment.

> +  ret = posix_memalign (&p, pagesize, -pagesize);
> +
> +  if (ret != ENOMEM)
> +    merror ("posix_memalign (&p, pagesize, -pagesize) succeeded.");

Needs free (p).

> +
> +  p = NULL;
> +

Test case needs comment.

> +  ret = posix_memalign (&p, sizeof (void *), 0);
> +
> +  if (ret != 0 || p == NULL)
> +    merror ("posix_memalign (&p, sizeof (void *), 0) failed.");
> +
> +  free (p);

OK.

> +

Test case needs comment e.g. 
/* Test that a multiple of sizeof(void *) but not a power of two, fails.  */

Should set p to NULL (for later free).

> +  ret = posix_memalign (&p, 0x300, 10);
> +
> +  if (ret != EINVAL)
> +    merror ("posix_memalign (&p, 0x300, 10) succeeded.");

Needs free (p).

> +

Test case needs comment.

Should set p to NULL (for later free).

> +  ret = posix_memalign (&p, 0, 10);
> +
> +  if (ret != EINVAL)
> +    merror ("posix_memalign (&p, 0, 10) succeeded.");
> +

Needs free (p).

> +  p = NULL;
> +

Test case needs comment.

> +  ret = posix_memalign (&p, 0x100, 10);
> +
> +  if (ret != 0)
> +    merror ("posix_memalign (&p, 0x100, 10) failed.");
> +
> +  if (ret == 0 && p == NULL)
> +    merror ("returned success but pointer is NULL");
> +
> +  ptrval = (unsigned long)p;
> +
> +  if (ret == 0 && (ptrval & 0xff))

No boolean coercion please e.g. ((ptrval & 0xff) != 0).

> +    merror ("pointer is not aligned to 0x100");
> +
> +  free (p);
> +
> +  return errors != 0;

OK.

> +}
> +
> +#define TEST_FUNCTION do_test ()
> +#include "../test-skeleton.c"
> 

Cheers,
Carlos.

Patch

diff --git a/malloc/Makefile b/malloc/Makefile
index b16dac8..4903c13 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -26,7 +26,7 @@  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-malloc-usable tst-realloc tst-posix_memalign
 test-srcs = tst-mtrace

 routines = malloc morecore mcheck mtrace obstack
diff --git a/malloc/tst-posix_memalign.c b/malloc/tst-posix_memalign.c
new file mode 100644
index 0000000..9d9d1bf
--- /dev/null
+++ b/malloc/tst-posix_memalign.c
@@ -0,0 +1,98 @@ 
+/* 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 <stdlib.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;
+  int ret;
+  unsigned long pagesize = getpagesize();
+  unsigned long ptrval;
+
+  p = NULL;
+
+  ret = posix_memalign (&p, sizeof (void *), -1);
+
+  if (ret != ENOMEM)
+    merror ("posix_memalign (&p, sizeof (void *), -1) succeeded.");
+
+  if (ret == ENOMEM && p != NULL)
+    merror ("returned an error but pointer was modified");
+
+  p = NULL;
+
+  ret = posix_memalign (&p, pagesize, -pagesize);
+
+  if (ret != ENOMEM)
+    merror ("posix_memalign (&p, pagesize, -pagesize) succeeded.");
+
+  p = NULL;
+
+  ret = posix_memalign (&p, sizeof (void *), 0);
+
+  if (ret != 0 || p == NULL)
+    merror ("posix_memalign (&p, sizeof (void *), 0) failed.");
+
+  free (p);
+
+  ret = posix_memalign (&p, 0x300, 10);
+
+  if (ret != EINVAL)
+    merror ("posix_memalign (&p, 0x300, 10) succeeded.");
+
+  ret = posix_memalign (&p, 0, 10);
+
+  if (ret != EINVAL)
+    merror ("posix_memalign (&p, 0, 10) succeeded.");
+
+  p = NULL;
+
+  ret = posix_memalign (&p, 0x100, 10);
+
+  if (ret != 0)
+    merror ("posix_memalign (&p, 0x100, 10) failed.");
+
+  if (ret == 0 && p == NULL)
+    merror ("returned success but pointer is NULL");
+
+  ptrval = (unsigned long)p;
+
+  if (ret == 0 && (ptrval & 0xff))
+    merror ("pointer is not aligned to 0x100");
+
+  free (p);
+
+  return errors != 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"