[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r16056 - in /trunk: libc/ libc/debug/ ports/ ports/sysdeps/arm/eabi/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r16056 - in /trunk: libc/ libc/debug/ ports/ ports/sysdeps/arm/eabi/
- From: joseph@xxxxxxxxxx
- Date: Fri, 02 Dec 2011 03:06:28 -0000
Author: joseph
Date: Fri Dec 2 03:06:27 2011
New Revision: 16056
Log:
libc:
2011-12-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
Tom de Vries <tom@xxxxxxxxxxxxxxxx>
* debug/tst-backtrace3.c, debug/tst-backtrace4.c,
debug/tst-backtrace5.c: New tests.
* debug/Makefile (LDFLAGS-tst-backtrace3, LDFLAGS-tst-backtrace4)
(LDFLAGS-tst-backtrace5): Define.
ports:
* sysdeps/arm/eabi/Makefile (CFLAGS-tst-backtrace3.c)
(CFLAGS-tst-backtrace4.c, CFLAGS-tst-backtrace5.c): Define.
Added:
trunk/libc/debug/tst-backtrace3.c
trunk/libc/debug/tst-backtrace4.c
trunk/libc/debug/tst-backtrace5.c
Modified:
trunk/libc/ChangeLog.eglibc
trunk/libc/debug/Makefile
trunk/ports/ChangeLog.eglibc
trunk/ports/sysdeps/arm/eabi/Makefile
Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Fri Dec 2 03:06:27 2011
@@ -1,3 +1,11 @@
+2011-12-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+ Tom de Vries <tom@xxxxxxxxxxxxxxxx>
+
+ * debug/tst-backtrace3.c, debug/tst-backtrace4.c,
+ debug/tst-backtrace5.c: New tests.
+ * debug/Makefile (LDFLAGS-tst-backtrace3, LDFLAGS-tst-backtrace4)
+ (LDFLAGS-tst-backtrace5): Define.
+
2011-10-26 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* argp/argp-fmtstream.c, argp/argp-help.c: Condition uses of
Modified: trunk/libc/debug/Makefile
==============================================================================
--- trunk/libc/debug/Makefile (original)
+++ trunk/libc/debug/Makefile Fri Dec 2 03:06:27 2011
@@ -131,11 +131,16 @@
# backtrace_symbols only works if we link with -rdynamic.
LDFLAGS-tst-backtrace2 = -rdynamic
+LDFLAGS-tst-backtrace3 = -rdynamic
+LDFLAGS-tst-backtrace4 = -rdynamic
+LDFLAGS-tst-backtrace5 = -rdynamic
tests = tst-longjmp_chk test-strcpy_chk test-stpcpy_chk tst-longjmp_chk2
tests-$(OPTION_EGLIBC_LOCALE_CODE) \
+= tst-chk1 tst-chk2 tst-chk3 tst-lfschk1 tst-lfschk2 tst-lfschk3
-tests-$(OPTION_EGLIBC_BACKTRACE) += backtrace-tst tst-backtrace2
+tests-$(OPTION_EGLIBC_BACKTRACE) \
+ += backtrace-tst tst-backtrace2 tst-backtrace3 tst-backtrace4 \
+ tst-backtrace5
ifeq (yy,$(OPTION_EGLIBC_LOCALE_CODE)$(OPTION_EGLIBC_CXX_TESTS))
tests += tst-chk4 tst-chk5 tst-chk6 tst-lfschk4 tst-lfschk5 tst-lfschk6
endif
Added: trunk/libc/debug/tst-backtrace3.c
==============================================================================
--- trunk/libc/debug/tst-backtrace3.c (added)
+++ trunk/libc/debug/tst-backtrace3.c Fri Dec 2 03:06:27 2011
@@ -1,0 +1,93 @@
+/* Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by CodeSourcery.
+
+ 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. */
+
+#include <execinfo.h>
+#include <search.h>
+#include <string.h>
+
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
+/* Set to a non-zero value if the test fails. */
+int ret;
+
+/* Accesses to X are used to prevent optimization. */
+volatile int x;
+
+/* Called if the test fails. */
+#define FAIL() \
+ do { printf ("Failure on line %d\n", __LINE__); ret = 1; } while (0)
+
+/* The backtrace should include at least 3 * fn, and do_test. */
+#define NUM_FUNCTIONS 4
+
+/* Use this attribute to prevent inlining, so that all expected frames
+ are present. */
+#define NO_INLINE __attribute__((noinline))
+
+NO_INLINE int
+fn (int c)
+{
+ void *addresses[NUM_FUNCTIONS];
+ char **symbols;
+ int n;
+ int i;
+
+ if (c > 0)
+ {
+ fn (c - 1);
+ return x;
+ }
+ /* Get the backtrace addresses. */
+ n = backtrace (addresses, sizeof (addresses) / sizeof (addresses[0]));
+ printf ("Obtained backtrace with %d functions\n", n);
+ /* Check that there are at least four functions. */
+ if (n < NUM_FUNCTIONS)
+ {
+ FAIL ();
+ return 1;
+ }
+ /* Convert them to symbols. */
+ symbols = backtrace_symbols (addresses, n);
+ /* Check that symbols were obtained. */
+ if (symbols == NULL)
+ {
+ FAIL ();
+ return 1;
+ }
+ for (i = 0; i < n; ++i)
+ printf ("Function %d: %s\n", i, symbols[i]);
+ /* Check that the function names obtained are accurate. */
+ for (i = 0; i < n - 1; ++i)
+ if (strstr (symbols[i], "fn") == NULL)
+ {
+ FAIL ();
+ return 1;
+ }
+ /* Symbol names are not available for static functions, so we do not
+ check do_test. */
+}
+
+NO_INLINE static int
+do_test (void)
+{
+ fn (2);
+ return ret;
+}
Added: trunk/libc/debug/tst-backtrace4.c
==============================================================================
--- trunk/libc/debug/tst-backtrace4.c (added)
+++ trunk/libc/debug/tst-backtrace4.c Fri Dec 2 03:06:27 2011
@@ -1,0 +1,135 @@
+/* Copyright (C) 2011 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by CodeSourcery.
+
+ 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. */
+
+#include <execinfo.h>
+#include <search.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <unistd.h>
+
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
+/* Set to a non-zero value if the test fails. */
+volatile int ret;
+
+/* Accesses to X are used to prevent optimization. */
+volatile int x;
+
+/* Called if the test fails. */
+#define FAIL() \
+ do { printf ("Failure on line %d\n", __LINE__); ret = 1; } while (0)
+
+/* The backtrace should include at least handle_signal, a signal
+ trampoline, 3 * fn, and do_test. */
+#define NUM_FUNCTIONS 6
+
+/* Use this attribute to prevent inlining, so that all expected frames
+ are present. */
+#define NO_INLINE __attribute__((noinline))
+
+volatile int sig_handled = 0;
+
+void
+handle_signal (int signum)
+{
+ void *addresses[NUM_FUNCTIONS];
+ char **symbols;
+ int n;
+ int i;
+
+ sig_handled = 1;
+
+ /* Get the backtrace addresses. */
+ n = backtrace (addresses, sizeof (addresses) / sizeof (addresses[0]));
+ printf ("Obtained backtrace with %d functions\n", n);
+ /* Check that there are at least six functions. */
+ if (n < NUM_FUNCTIONS)
+ {
+ FAIL ();
+ return;
+ }
+ /* Convert them to symbols. */
+ symbols = backtrace_symbols (addresses, n);
+ /* Check that symbols were obtained. */
+ if (symbols == NULL)
+ {
+ FAIL ();
+ return;
+ }
+ for (i = 0; i < n; ++i)
+ printf ("Function %d: %s\n", i, symbols[i]);
+ /* Check that the function names obtained are accurate. */
+ if (strstr (symbols[0], "handle_signal") == NULL)
+ {
+ FAIL ();
+ return;
+ }
+ /* Do not check name for signal trampoline. */
+ for (i = 2; i < n - 1; i++)
+ if (strstr (symbols[i], "fn") == NULL)
+ {
+ FAIL ();
+ return;
+ }
+ /* Symbol names are not available for static functions, so we do not
+ check do_test. */
+}
+
+NO_INLINE int
+fn (int c)
+{
+ pid_t parent_pid, child_pid;
+
+ if (c > 0)
+ {
+ fn (c - 1);
+ return x;
+ }
+
+ signal (SIGUSR1, handle_signal);
+ parent_pid = getpid ();
+
+ child_pid = fork ();
+ if (child_pid == (pid_t) -1)
+ abort ();
+ else if (child_pid == 0)
+ {
+ sleep (1);
+ kill (parent_pid, SIGUSR1);
+ _exit (0);
+ }
+
+ /* In the parent. */
+ while (sig_handled == 0)
+ ;
+
+ return 0;
+}
+
+NO_INLINE static int
+do_test (void)
+{
+ fn (2);
+ return ret;
+}
Added: trunk/libc/debug/tst-backtrace5.c
==============================================================================
--- trunk/libc/debug/tst-backtrace5.c (added)
+++ trunk/libc/debug/tst-backtrace5.c Fri Dec 2 03:06:27 2011
@@ -1,0 +1,143 @@
+/* Copyright (C) 2011 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by CodeSourcery.
+
+ 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. */
+
+#include <execinfo.h>
+#include <search.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <unistd.h>
+
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
+/* Set to a non-zero value if the test fails. */
+volatile int ret;
+
+/* Accesses to X are used to prevent optimization. */
+volatile int x;
+
+/* Called if the test fails. */
+#define FAIL() \
+ do { printf ("Failure on line %d\n", __LINE__); ret = 1; } while (0)
+
+/* The backtrace should include at least handle_signal, a signal
+ trampoline, read, 3 * fn, and do_test. */
+#define NUM_FUNCTIONS 7
+
+/* Use this attribute to prevent inlining, so that all expected frames
+ are present. */
+#define NO_INLINE __attribute__((noinline))
+
+void
+handle_signal (int signum)
+{
+ void *addresses[NUM_FUNCTIONS];
+ char **symbols;
+ int n;
+ int i;
+
+ /* Get the backtrace addresses. */
+ n = backtrace (addresses, sizeof (addresses) / sizeof (addresses[0]));
+ printf ("Obtained backtrace with %d functions\n", n);
+ /* Check that there are at least seven functions. */
+ if (n < NUM_FUNCTIONS)
+ {
+ FAIL ();
+ return;
+ }
+ /* Convert them to symbols. */
+ symbols = backtrace_symbols (addresses, n);
+ /* Check that symbols were obtained. */
+ if (symbols == NULL)
+ {
+ FAIL ();
+ return;
+ }
+ for (i = 0; i < n; ++i)
+ printf ("Function %d: %s\n", i, symbols[i]);
+ /* Check that the function names obtained are accurate. */
+ if (strstr (symbols[0], "handle_signal") == NULL)
+ {
+ FAIL ();
+ return;
+ }
+ /* Do not check name for signal trampoline. */
+ if (strstr (symbols[2], "read") == NULL)
+ {
+ FAIL ();
+ return;
+ }
+ for (i = 3; i < n - 1; i++)
+ if (strstr (symbols[i], "fn") == NULL)
+ {
+ FAIL ();
+ return;
+ }
+ /* Symbol names are not available for static functions, so we do not
+ check do_test. */
+}
+
+NO_INLINE int
+fn (int c)
+{
+ pid_t parent_pid, child_pid;
+ int pipefd[2];
+ char r[1];
+ struct sigaction act;
+
+ if (c > 0)
+ {
+ fn (c - 1);
+ return x;
+ }
+
+ memset (&act, 0, sizeof (act));
+ act.sa_handler = handle_signal;
+ sigemptyset (&act.sa_mask);
+ sigaction (SIGUSR1, &act, NULL);
+ parent_pid = getpid ();
+ if (pipe (pipefd) == -1)
+ abort ();
+
+ child_pid = fork ();
+ if (child_pid == (pid_t) -1)
+ abort ();
+ else if (child_pid == 0)
+ {
+ sleep (1);
+ kill (parent_pid, SIGUSR1);
+ _exit (0);
+ }
+
+ /* In the parent. */
+ read (pipefd[0], r, 1);
+
+ return 0;
+}
+
+NO_INLINE static int
+do_test (void)
+{
+ fn (2);
+ return ret;
+}
Modified: trunk/ports/ChangeLog.eglibc
==============================================================================
--- trunk/ports/ChangeLog.eglibc (original)
+++ trunk/ports/ChangeLog.eglibc Fri Dec 2 03:06:27 2011
@@ -1,3 +1,8 @@
+2011-12-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/arm/eabi/Makefile (CFLAGS-tst-backtrace3.c)
+ (CFLAGS-tst-backtrace4.c, CFLAGS-tst-backtrace5.c): Define.
+
2011-07-06 David Kuehling <dvdkhlng@xxxxxx>
* ports/sysdeps/powerpc/powerpc32/e500/fpu/s_fma.c,
Modified: trunk/ports/sysdeps/arm/eabi/Makefile
==============================================================================
--- trunk/ports/sysdeps/arm/eabi/Makefile (original)
+++ trunk/ports/sysdeps/arm/eabi/Makefile Fri Dec 2 03:06:27 2011
@@ -22,6 +22,9 @@
ifeq ($(subdir),debug)
CFLAGS-backtrace.c += -funwind-tables
CFLAGS-tst-backtrace2.c += -funwind-tables
+CFLAGS-tst-backtrace3.c += -funwind-tables
+CFLAGS-tst-backtrace4.c += -funwind-tables
+CFLAGS-tst-backtrace5.c += -funwind-tables
endif
ifeq ($(subdir),elf)
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits