Merge up to gearmand.

[m6w6/libmemcached] / clients / ms_sigsegv.c

diff --git a/clients/ms_sigsegv.c b/clients/ms_sigsegv.c
index 2cdd3017d8ec49c272ca019e59437943cbe1adce..c9a366a0f01b674ec005d82e9fa209a5ee90c191 100644 (file)
--- a/clients/ms_sigsegv.c
+++ b/clients/ms_sigsegv.c
@@ -7,6 +7,9 @@
  * (c) Copyright 2009, Schooner Information Technology, Inc.
  * http://www.schoonerinfotech.com/
  *
+ * Rewrite of stack dump:
+ *  Copyright (C) 2009 Sun Microsystems
+ *  Author Trond Norbye
  */
 
 #include "config.h"
@@ -15,31 +18,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
-#include <ucontext.h>
-#include <dlfcn.h>
-#include <execinfo.h>
 #include <pthread.h>
 
 #include "ms_memslap.h"
 #include "ms_setting.h"
 
-#if defined(__cplusplus) && defined(HAVE_ABI_CXA_DEMANGLE)
-# include <cxxabi.h>
-#endif
-
-#undef REG_RIP
-
-#if defined(REG_RIP)
-# define SIGSEGV_STACK_IA64
-# define REGFORMAT    "%016lx"
-#elif defined(REG_EIP)
-# define SIGSEGV_STACK_X86
-# define REGFORMAT    "%08x"
-#else
-# define SIGSEGV_STACK_GENERIC
-# define REGFORMAT    "%x"
-#endif
-
 /* prototypes */
 int ms_setup_sigsegv(void);
 int ms_setup_sigpipe(void);
@@ -49,100 +32,17 @@ int ms_setup_sigint(void);
 /* signal seg reaches, this function will run */
 static void ms_signal_segv(int signum, siginfo_t *info, void *ptr)
 {
-  int i;
-
   UNUSED_ARGUMENT(signum);
   UNUSED_ARGUMENT(info);
   UNUSED_ARGUMENT(ptr);
 
   pthread_mutex_lock(&ms_global.quit_mutex);
-  fprintf(stderr, "Segmentation fault occurred.\n");
-
-#if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
-  int f= 0;
-  Dl_info dlinfo;
-  void **bp= 0;
-  void *ip= 0;
-#else
-  void *bt[20];
-  char **strings;
-  int  sz;
-#endif
-
-#if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
-# if defined(SIGSEGV_STACK_IA64)
-  ip= (void *)ucontext->uc_mcontext.gregs[REG_RIP];
-  bp= (void **)ucontext->uc_mcontext.gregs[REG_RBP];
-# elif defined(SIGSEGV_STACK_X86)
-  ip= (void *)ucontext->uc_mcontext.gregs[REG_EIP];
-  bp= (void **)ucontext->uc_mcontext.gregs[REG_EBP];
-# endif
-
-  fprintf(stderr, "Stack trace:\n");
-  while (bp && ip)
-  {
-    if (! dladdr(ip, &dlinfo))
-      break;
-
-    const char *symname= dlinfo.dli_sname;
-# if defined(HAVE_ABI_CXA_DEMANGLE) && defined(__cplusplus)
-    int status;
-    char *tmp= __cxa_demangle(symname, NULL, 0, &status);
-
-    if ((status == 0) && tmp)
-      symname= tmp;
-# endif
-
-    fprintf(stderr, "% 2d: %p <%s+%u> (%s)\n",
-            ++f,
-            ip,
-            symname,
-            (unsigned)(ip - dlinfo.dli_saddr),
-            dlinfo.dli_fname);
-
-# if defined(HAVE_ABI_CXA_DEMANGLE) && defined(__cplusplus)
-    if (tmp)
-      free(tmp);
-# endif
-
-    if (dlinfo.dli_sname && ! strcmp(dlinfo.dli_sname, "main"))
-      break;
-
-    ip= bp[1];
-    bp= (void **)bp[0];
-  }
-#else
-  fprintf(stderr, "Stack trace:\n");
-  sz= backtrace(bt, 20);
-  strings= backtrace_symbols(bt, sz);
-
-  for (i= 0; i < sz; ++i)
-  {
-    fprintf(stderr, "%s\n", strings[i]);
-  }
-#endif
+  fprintf(stderr, "Segmentation fault occurred.\nStack trace:\n");
+  pandora_print_callstack(stderr);
   fprintf(stderr, "End of stack trace\n");
   pthread_mutex_unlock(&ms_global.quit_mutex);
-  exit(1);
-} /* ms_signal_segv */
-
-
-/* signal pipe reaches, this function will run */
-static void ms_signal_pipe(int signum, siginfo_t *info, void *ptr)
-{
-  UNUSED_ARGUMENT(signum);
-  UNUSED_ARGUMENT(info);
-  UNUSED_ARGUMENT(ptr);
-
-  pthread_mutex_lock(&ms_global.quit_mutex);
-  fprintf(stderr, "\tMemslap encountered a server error. Quitting...\n");
-  fprintf(stderr, "\tError info: SIGPIPE captured (from write?)\n");
-  fprintf(stderr,
-          "\tProbably a socket I/O error when the server is down.\n");
-  pthread_mutex_unlock(&ms_global.quit_mutex);
-  exit(1);
-} /* ms_signal_pipe */
-
+  abort();
+}
 
 /* signal int reaches, this function will run */
 static void ms_signal_int(int signum, siginfo_t *info, void *ptr)
@@ -161,7 +61,7 @@ static void ms_signal_int(int signum, siginfo_t *info, void *ptr)
 /**
  * redirect signal seg
  *
- * @return if success, return 0, else return -1
+ * @return if success, return EXIT_SUCCESS, else return -1
  */
 int ms_setup_sigsegv(void)
 {
@@ -173,7 +73,7 @@ int ms_setup_sigsegv(void)
   if (sigaction(SIGSEGV, &action, NULL) < 0)
   {
     perror("sigaction");
-    return 0;
+    return EXIT_SUCCESS;
   }
 
   return -1;
@@ -183,20 +83,12 @@ int ms_setup_sigsegv(void)
 /**
  * redirect signal pipe
  *
- * @return if success, return 0, else return -1
+ * @return if success, return EXIT_SUCCESS, else return -1
  */
 int ms_setup_sigpipe(void)
 {
-  struct sigaction action_2;
-
-  memset(&action_2, 0, sizeof(action_2));
-  action_2.sa_sigaction= ms_signal_pipe;
-  action_2.sa_flags= SA_SIGINFO;
-  if (sigaction(SIGPIPE, &action_2, NULL) < 0)
-  {
-    perror("sigaction");
-    return 0;
-  }
+  /* ignore the SIGPIPE signal */
+  signal(SIGPIPE, SIG_IGN);
 
   return -1;
 } /* ms_setup_sigpipe */
@@ -205,7 +97,7 @@ int ms_setup_sigpipe(void)
 /**
  * redirect signal int
  *
- * @return if success, return 0, else return -1
+ * @return if success, return EXIT_SUCCESS, else return -1
  */
 int ms_setup_sigint(void)
 {
@@ -217,7 +109,7 @@ int ms_setup_sigint(void)
   if (sigaction(SIGINT, &action_3, NULL) < 0)
   {
     perror("sigaction");
-    return 0;
+    return EXIT_SUCCESS;
   }
 
   return -1;