Update.

1998-07-16 20:01  Ulrich Drepper  <drepper@cygnus.com>

	* debug/Makefile (routines): Add backtracesymsfd.
	Add rules to generate libSegFault.
	* debug/Versions: Add __backtrace_symbols_fd and backtrace_symbols_fd.
	* debug/execinfo.h: Declare backtrace_symbols_fd.
	* sysdeps/generic/backtracesymsfd.c: New file.
	* sysdeps/generic/elf/backtracesymsfd.c: New file.
	* sysdeps/generic/segfault.c: New file.
	* sysdeps/generic/sigcontextinfo.h: New file.
	* sysdeps/unix/sysv/linux/i386/sigcontextinfo.h: New file.

	* sysdeps/generic/elf/backtracesyms.c: Remove unneeded +.

6 files changed, 386 insertions, 4 deletions

diff --git a/sysdeps/generic/backtracesymsfd.c b/sysdeps/generic/backtracesymsfd.c
new file mode 100644
index 0000000000..dc4f083ff4
--- /dev/null
+++ b/sysdeps/generic/backtracesymsfd.c
@@ -0,0 +1,61 @@
+/* Write formatted list with names for addresses in backtrace to a file.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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 <execinfo.h>
+#include <string.h>
+#include <sys/uio.h>
+
+#include <stdio-common/_itoa.h>
+
+#if __ELF_NATIVE_CLASS == 32
+# define WORD_WIDTH 8
+#else
+/* We assyme 64bits.  */
+# define WORD_WIDTH 16
+#endif
+
+
+void
+__backtrace_symbols_fd (array, size, fd)
+     void *const *array;
+     int size;
+     int fd;
+{
+  struct iovec iov[3];
+  int cnt;
+
+  for (cnt = 0; cnt < size; ++cnt)
+    {
+      char buf[WORD_WIDTH];
+
+      iov[0].iov_base = (void *) "[0x";
+      iov[0].iov_len = 3;
+
+      iov[1].iov_base = _itoa_word ((unsigned long int) array[cnt],
+				    &buf[WORD_WIDTH], 16, 0);
+      iov[1].iov_len = &buf[WORD_WIDTH] - (char *) iov[1].iov_base;
+
+      iov[2].iov_base = (void *) "]\n";
+      iov[2].iov_len = 2;
+
+      __writev (fd, iov, 3);
+    }
+}
+weak_alias (__backtrace_symbols_fd, backtrace_symbols_fd)
diff --git a/sysdeps/generic/elf/backtracesyms.c b/sysdeps/generic/elf/backtracesyms.c
index 7de0bfc9ee..a14ac596b4 100644
--- a/sysdeps/generic/elf/backtracesyms.c
+++ b/sysdeps/generic/elf/backtracesyms.c
@@ -55,9 +55,9 @@ __backtrace_symbols (array, size)
 		  + (info[cnt].dli_sname
 		     ? strlen (info[cnt].dli_sname) + 3 + WORD_WIDTH + 3
 		     : 1)
-		  + WORD_WIDTH + 6);
+		  + WORD_WIDTH + 5);
       else
-	total += 6 + WORD_WIDTH;
+	total += 5 + WORD_WIDTH;
     }
 
   /* Allocate memory for the result.  */
@@ -80,7 +80,7 @@ __backtrace_symbols (array, size)
 	      else
 		sprintf (buf, "-0x%x", info[cnt].dli_saddr - array[cnt]);
 
-	      last += 1 + sprintf (last, "%s%s%s%s%s[+%p]",
+	      last += 1 + sprintf (last, "%s%s%s%s%s[%p]",
 				   info[cnt].dli_fname ?: "",
 				   info[cnt].dli_sname ? "(" : "",
 				   info[cnt].dli_sname ?: "",
@@ -89,7 +89,7 @@ __backtrace_symbols (array, size)
 				   array[cnt]);
 	    }
 	  else
-	    last += 1 + sprintf (last, "[+%p]", array[cnt]);
+	    last += 1 + sprintf (last, "[%p]", array[cnt]);
 	}
     }
 
diff --git a/sysdeps/generic/elf/backtracesymsfd.c b/sysdeps/generic/elf/backtracesymsfd.c
new file mode 100644
index 0000000000..b67b64529e
--- /dev/null
+++ b/sysdeps/generic/elf/backtracesymsfd.c
@@ -0,0 +1,109 @@
+/* Write formatted list with names for addresses in backtrace to a file.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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 <execinfo.h>
+#include <string.h>
+#include <sys/uio.h>
+
+#include <stdio-common/_itoa.h>
+#include <elf/ldsodefs.h>
+
+#if __ELF_NATIVE_CLASS == 32
+# define WORD_WIDTH 8
+#else
+/* We assyme 64bits.  */
+# define WORD_WIDTH 16
+#endif
+
+
+void
+__backtrace_symbols_fd (array, size, fd)
+     void *const *array;
+     int size;
+     int fd;
+{
+  struct iovec iov[9];
+  int cnt;
+
+  for (cnt = 0; cnt < size; ++cnt)
+    {
+      char buf[WORD_WIDTH];
+      Dl_info info;
+      size_t last = 0;
+
+      if (_dl_addr (array[cnt], &info)
+	  && info.dli_fname && info.dli_fname[0] != '\0')
+	{
+	  /* Name of the file.  */
+	  iov[0].iov_base = (void *) info.dli_fname;
+	  iov[0].iov_len = strlen (info.dli_fname);
+	  last = 1;
+
+	  /* Symbol name.  */
+	  if (info.dli_sname != NULL)
+	    {
+	      char buf2[WORD_WIDTH];
+	      size_t diff;
+
+	      iov[1].iov_base = (void *) "(";
+	      iov[1].iov_len = 1;
+	      iov[2].iov_base = (void *) info.dli_sname;
+	      iov[2].iov_len = strlen (info.dli_sname);
+
+	      if (array[cnt] >= (void *) info.dli_saddr)
+		{
+		  iov[3].iov_base = (void *) "+0x";
+		  diff = array[cnt] - info.dli_saddr;
+		}
+	      else
+		{
+		  iov[3].iov_base = (void *) "-0x";
+		  diff = info.dli_saddr - array[cnt];
+		}
+	      iov[3].iov_len = 3;
+
+	      iov[4].iov_base = _itoa_word ((unsigned long int) diff,
+					    &buf2[WORD_WIDTH], 16, 0);
+	      iov[4].iov_len = &buf2[WORD_WIDTH] - (char *) iov[4].iov_base;
+
+	      iov[5].iov_base = (void *) ")";
+	      iov[5].iov_len = 1;
+
+	      last = 6;
+	    }
+	}
+
+      iov[last].iov_base = (void *) "[0x";
+      iov[last].iov_len = 3;
+      ++last;
+
+      iov[last].iov_base = _itoa_word ((unsigned long int) array[cnt],
+				       &buf[WORD_WIDTH], 16, 0);
+      iov[last].iov_len = &buf[WORD_WIDTH] - (char *) iov[last].iov_base;
+      ++last;
+
+      iov[last].iov_base = (void *) "]\n";
+      iov[last].iov_len = 2;
+      ++last;
+
+      __writev (fd, iov, last);
+    }
+}
+weak_alias (__backtrace_symbols_fd, backtrace_symbols_fd)
diff --git a/sysdeps/generic/segfault.c b/sysdeps/generic/segfault.c
new file mode 100644
index 0000000000..868ff1dfd7
--- /dev/null
+++ b/sysdeps/generic/segfault.c
@@ -0,0 +1,165 @@
+/* Catch segmentation faults and print backtrace.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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 <execinfo.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+/* This file defines macros to access the content of the sigcontext element
+   passed up by the signal handler.  */
+#include <sigcontextinfo.h>
+
+/* This is a global variable set at program start time.  It marks the
+   highest used stack address.  */
+extern void *__libc_stack_end;
+
+
+/* This implementation assumes a stack layout that matches the defaults
+   used by gcc's `__builtin_frame_address' and `__builtin_return_address'
+   (FP is the frame pointer register):
+
+	  +-----------------+     +-----------------+
+    FP -> | previous FP --------> | previous FP ------>...
+	  |                 |     |                 |
+	  | return address  |     | return address  |
+	  +-----------------+     +-----------------+
+
+  */
+
+/* Get some notion of the current stack.  Need not be exactly the top
+   of the stack, just something somewhere in the current frame.  */
+#ifndef CURRENT_STACK_FRAME
+# define CURRENT_STACK_FRAME  ({ char __csf; &__csf; })
+#endif
+
+/* By default we assume that the stack grows downward.  */
+#ifndef INNER_THAN
+# define INNER_THAN <
+#endif
+
+struct layout
+{
+  struct layout *next;
+  void *return_address;
+};
+
+
+static void
+handle (int fd, void *addr)
+{
+}
+
+
+/* This function is called when a segmentation fault is caught.  The system
+   is in an instable state now.  This means especially that malloc() might
+   not work anymore.  */
+static void
+catch_segfault (int signal, SIGCONTEXT ctx)
+{
+  struct layout *current;
+  void *top_frame;
+  void *top_stack;
+  const char *fname;
+  int fd;
+  void **arr;
+  size_t cnt;
+
+  /* This is the name of the file we are writing to.  If none is given
+     or we cannot write to this file write to stderr.  */
+  fd = 2;
+  fname = getenv ("SEGFAULT_OUTPUT_NAME");
+  if (fname != NULL && fname[0] != '\0')
+    {
+      fd = open (fname, O_TRUNC | O_WRONLY | O_CREAT);
+      if (fd == -1)
+	fd = 2;
+    }
+
+#define WRITE_STRING(s) write (fd, s, sizeof (s) - 1)
+  WRITE_STRING ("*** Segmentation Fault\n");
+  WRITE_STRING ("Backtrace:\n");
+
+  top_frame = GET_FRAME (ctx);
+  top_stack = GET_STACK (ctx);
+
+  /* First count how many entries we'll have.  */
+  cnt = 1;
+  current = (struct layout *) top_frame;
+  while (!((void *) current INNER_THAN top_stack
+	   || !((void *) current INNER_THAN __libc_stack_end)))
+    {
+      ++cnt;
+
+      current = current->next;
+    }
+
+  arr = alloca (cnt * sizeof (void *));
+
+  /* First handle the program counter from the structure.  */
+  arr[0] = GET_EIP (ctx);
+
+  current = (struct layout *) top_frame;
+  cnt = 1;
+  while (!((void *) current INNER_THAN top_stack
+	   || !((void *) current INNER_THAN __libc_stack_end)))
+    {
+      arr[cnt++] = current->return_address;
+
+      current = current->next;
+    }
+
+  /* Now generate nicely formatted output.  */
+  __backtrace_symbols_fd (arr, cnt, fd);
+
+  /* Nothing else to do.  */
+  _exit (128 + SIGSEGV);
+}
+
+
+static void
+__attribute__ ((constructor))
+install_handler (void)
+{
+  struct sigaction sa;
+
+  sa.sa_handler = (void *) catch_segfault;
+  sigemptyset (&sa.sa_mask);
+  sa.sa_flags = SA_RESTART;
+
+  sigaction (SIGSEGV, &sa, NULL);
+
+  /* Maybe we are expected to use an alternative stack.  */
+  if (getenv ("SEGFAULT_USE_ALTSTACK") != 0)
+    {
+      void *stack_mem = malloc (2 * SIGSTKSZ);
+      struct sigaltstack ss;
+
+      if (stack_mem != NULL)
+	{
+	  ss.ss_sp = stack_mem;
+	  ss.ss_flags = SS_ONSTACK;
+	  ss.ss_size = 2 * SIGSTKSZ;
+
+	  sigaltstack (&ss, NULL);
+	}
+    }
+}
diff --git a/sysdeps/generic/sigcontextinfo.h b/sysdeps/generic/sigcontextinfo.h
new file mode 100644
index 0000000000..014db6624c
--- /dev/null
+++ b/sysdeps/generic/sigcontextinfo.h
@@ -0,0 +1,24 @@
+/* Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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.  */
+
+/* In general we cannot provide any information.  */
+#define SIGCONTEXT struct sigcontext *
+#define GET_EIP(ctx)	((void *) 0)
+#define GET_FRAME(ctx)	((void *) 0)
+#define GET_STACK(ctx)	((void *) 0)
diff --git a/sysdeps/unix/sysv/linux/i386/sigcontextinfo.h b/sysdeps/unix/sysv/linux/i386/sigcontextinfo.h
new file mode 100644
index 0000000000..b9913a4f4c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/sigcontextinfo.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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.  */
+
+#define SIGCONTEXT struct sigcontext
+#define GET_EIP(ctx)	((void *) ctx.eip)
+#define GET_FRAME(ctx)	((void *) ctx.ebp)
+#define GET_STACK(ctx)	((void *) ctx.esp_at_signal)