[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r24157 - in /fsf/trunk/libc: ChangeLog malloc/Makefile malloc/tst-posix_memalign.c malloc/tst-pvalloc.c malloc/tst-valloc.c
- To: commits@xxxxxxxxxx
- Subject: [Commits] r24157 - in /fsf/trunk/libc: ChangeLog malloc/Makefile malloc/tst-posix_memalign.c malloc/tst-pvalloc.c malloc/tst-valloc.c
- From: eglibc@xxxxxxxxxx
- Date: Thu, 03 Oct 2013 00:02:02 -0000
Author: eglibc
Date: Thu Oct 3 00:02:00 2013
New Revision: 24157
Log:
Import glibc-mainline for 2013-10-03
Added:
fsf/trunk/libc/malloc/tst-posix_memalign.c
fsf/trunk/libc/malloc/tst-pvalloc.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/malloc/Makefile
fsf/trunk/libc/malloc/tst-valloc.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Oct 3 00:02:00 2013
@@ -1,3 +1,23 @@
+2013-10-02 Will Newton <will.newton@xxxxxxxxxx>
+
+ * malloc/Makefile: Add tst-pvalloc.
+ * malloc/tst-pvalloc.c: New file.
+
+2013-10-02 Will Newton <will.newton@xxxxxxxxxx>
+
+ * malloc/tst-valloc.c: Rewrite to use test-skeleton.c and
+ improve test coverage.
+
+2013-10-02 Will Newton <will.newton@xxxxxxxxxx>
+
+ * malloc/Makefile: Add tst-posix_memalign.
+ * malloc/tst-posix_memalign.c: New file.
+
+2013-10-01 Eric Blake <eblake@xxxxxxxxxx>
+
+ * posix/glob.c (next_brace_sub, prefix_array, collated_compare):
+ Use __THROWNL rather than __THROW on static functions.
+
2013-09-30 Petr Machata <pmachata@xxxxxxxxxx>
* elf/elf.h (R_AARCH64_ABS16): New macro.
@@ -431,11 +451,6 @@
on macro parameter name.
[!_SOFT_FLOAT && !__NO_FPRS__] (_FPU_SETCW): Likewise. Use
parentheses around reference to macro parameter.
-
-2013-09-04 Eric Blake <eblake@xxxxxxxxxx>
-
- * posix/glob.c (next_brace_sub, prefix_array, collated_compare):
- Use __THROWNL rather than __THROW on static functions.
2013-09-13 Richard Sandiford <richard@xxxxxxxxxxxxxxxx>
Modified: fsf/trunk/libc/malloc/Makefile
==============================================================================
--- fsf/trunk/libc/malloc/Makefile (original)
+++ fsf/trunk/libc/malloc/Makefile Thu Oct 3 00:02:00 2013
@@ -26,7 +26,8 @@
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 \
+ tst-pvalloc
test-srcs = tst-mtrace
routines = malloc morecore mcheck mtrace obstack
Added: fsf/trunk/libc/malloc/tst-posix_memalign.c
==============================================================================
--- fsf/trunk/libc/malloc/tst-posix_memalign.c (added)
+++ fsf/trunk/libc/malloc/tst-posix_memalign.c Thu Oct 3 00:02:00 2013
@@ -1,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"
Added: fsf/trunk/libc/malloc/tst-pvalloc.c
==============================================================================
--- fsf/trunk/libc/malloc/tst-pvalloc.c (added)
+++ fsf/trunk/libc/malloc/tst-pvalloc.c Thu Oct 3 00:02:00 2013
@@ -1,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"
Modified: fsf/trunk/libc/malloc/tst-valloc.c
==============================================================================
--- fsf/trunk/libc/malloc/tst-valloc.c (original)
+++ fsf/trunk/libc/malloc/tst-valloc.c Thu Oct 3 00:02:00 2013
@@ -1,23 +1,91 @@
-/* Test case by Stephen Tweedie <sct@xxxxxxxxxx>. */
+/* 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>
-#include <stdio.h>
-#include <stdlib.h>
-int
-main (void)
+static int errors = 0;
+
+static void
+merror (const char *msg)
{
- char *p;
- int pagesize = getpagesize ();
- int i;
+ ++errors;
+ printf ("Error: %s\n", msg);
+}
- p = valloc (pagesize);
- i = (long int) p;
+static int
+do_test (void)
+{
+ void *p;
+ unsigned long pagesize = getpagesize();
+ unsigned long ptrval;
+ int save;
- if ((i & (pagesize-1)) != 0)
- {
- fprintf (stderr, "Alignment problem: valloc returns %p\n", p);
- exit (1);
- }
+ errno = 0;
- return 0;
+ p = valloc (-1);
+
+ save = errno;
+
+ if (p != NULL)
+ merror ("valloc (-1) succeeded.");
+
+ if (p == NULL && save != ENOMEM)
+ merror ("valloc (-1) errno is not set correctly");
+
+ errno = 0;
+
+ p = valloc (-pagesize);
+
+ save = errno;
+
+ if (p != NULL)
+ merror ("valloc (-pagesize) succeeded.");
+
+ if (p == NULL && save != ENOMEM)
+ merror ("valloc (-pagesize) errno is not set correctly");
+
+ p = valloc (0);
+
+ if (p == NULL)
+ merror ("valloc (0) failed.");
+
+ free (p);
+
+ p = valloc (32);
+
+ if (p == NULL)
+ merror ("valloc (32) failed.");
+
+ ptrval = (unsigned long)p;
+
+ if (p == NULL)
+ merror ("valloc (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"
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits