remove common/linux_stack_trace.[hc]
yuqing
parent
2c5a9eaac6
commit
7cdba63be5
3
HISTORY
3
HISTORY
|
|
@ -1,9 +1,10 @@
|
|||
|
||||
Version 5.08 2016-01-26
|
||||
Version 5.08 2016-02-04
|
||||
* install library to $(TARGET_PREFIX)/lib anyway
|
||||
* php extension compiled in PHP 7
|
||||
* dio thread use blocked_queue, you must upgrade libfastcommon
|
||||
to V1.24 or later
|
||||
* remove common/linux_stack_trace.[hc]
|
||||
|
||||
Version 5.07 2015-09-13
|
||||
* schedule task add the "second" field
|
||||
|
|
|
|||
|
|
@ -1,163 +0,0 @@
|
|||
/**
|
||||
* This source file is used to print out a stack-trace when your program
|
||||
* segfaults. It is relatively reliable and spot-on accurate.
|
||||
*
|
||||
* This code is in the public domain. Use it as you see fit, some credit
|
||||
* would be appreciated, but is not a prerequisite for usage. Feedback
|
||||
* on it's use would encourage further development and maintenance.
|
||||
*
|
||||
* Due to a bug in gcc-4.x.x you currently have to compile as C++ if you want
|
||||
* demangling to work.
|
||||
*
|
||||
* Please note that it's been ported into my ULS library, thus the check for
|
||||
*
|
||||
* Author: Jaco Kroon <jaco@kroon.co.za>
|
||||
*
|
||||
* Copyright (C) 2005 - 2009 Jaco Kroon
|
||||
*/
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
|
||||
/* Bug in gcc prevents from using CPP_DEMANGLE in pure "C" */
|
||||
#if !defined(__cplusplus) && !defined(NO_CPP_DEMANGLE)
|
||||
#define NO_CPP_DEMANGLE
|
||||
#endif
|
||||
|
||||
#include <memory.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
#include <ucontext.h>
|
||||
#include <dlfcn.h>
|
||||
#include "logger.h"
|
||||
#include "shared_func.h"
|
||||
#ifndef NO_CPP_DEMANGLE
|
||||
#include <cxxabi.h>
|
||||
#ifdef __cplusplus
|
||||
using __cxxabiv1::__cxa_demangle;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#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
|
||||
|
||||
extern char g_exe_name[256];
|
||||
|
||||
void signal_stack_trace_print(int signum, siginfo_t *info, void *ptr)
|
||||
{
|
||||
static const char *si_codes[3] = {"", "SEGV_MAPERR", "SEGV_ACCERR"};
|
||||
|
||||
int i, f = 0;
|
||||
ucontext_t *ucontext;
|
||||
Dl_info dlinfo;
|
||||
void **bp = NULL;
|
||||
void *ip = NULL;
|
||||
char cmd[256];
|
||||
char buff[256];
|
||||
char output[8 * 1024];
|
||||
char *pCurrent;
|
||||
|
||||
pCurrent = output;
|
||||
ucontext = (ucontext_t*)ptr;
|
||||
pCurrent += sprintf(pCurrent, "Segmentation Fault!\n");
|
||||
pCurrent += sprintf(pCurrent, "\tinfo.si_signo = %d\n", signum);
|
||||
pCurrent += sprintf(pCurrent, "\tinfo.si_errno = %d\n", info->si_errno);
|
||||
pCurrent += sprintf(pCurrent, "\tinfo.si_code = %d (%s)\n", \
|
||||
info->si_code, si_codes[info->si_code]);
|
||||
pCurrent += sprintf(pCurrent, "\tinfo.si_addr = %p\n", info->si_addr);
|
||||
for(i = 0; i < NGREG; i++)
|
||||
{
|
||||
pCurrent += sprintf(pCurrent, "\treg[%02d] = 0x"REGFORMAT"\n",
|
||||
i, ucontext->uc_mcontext.gregs[i]);
|
||||
}
|
||||
|
||||
#ifndef SIGSEGV_NOSTACK
|
||||
#if defined(SIGSEGV_STACK_IA64) || defined(SIGSEGV_STACK_X86)
|
||||
#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
|
||||
|
||||
pCurrent += sprintf(pCurrent, "\tStack trace:\n");
|
||||
while(bp && ip)
|
||||
{
|
||||
const char *symname;
|
||||
#ifndef NO_CPP_DEMANGLE
|
||||
int status;
|
||||
char * tmp;
|
||||
#endif
|
||||
|
||||
if(!dladdr(ip, &dlinfo))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
symname = dlinfo.dli_sname;
|
||||
|
||||
#ifndef NO_CPP_DEMANGLE
|
||||
tmp = __cxa_demangle(symname, NULL, 0, &status);
|
||||
|
||||
if (status == 0 && tmp)
|
||||
{
|
||||
symname = tmp;
|
||||
}
|
||||
#endif
|
||||
|
||||
sprintf(cmd, "addr2line -e %s %p", g_exe_name, ip);
|
||||
if (getExecResult(cmd, buff, sizeof(buff)) != 0)
|
||||
{
|
||||
*buff = '0';
|
||||
}
|
||||
|
||||
pCurrent += sprintf(pCurrent, "\t\t% 2d: %p <%s+%lu> (%s in %s)\n",
|
||||
++f, ip, symname,
|
||||
(unsigned long)ip-(unsigned long)dlinfo.dli_saddr,
|
||||
trim_right(buff), dlinfo.dli_fname);
|
||||
|
||||
|
||||
#ifndef NO_CPP_DEMANGLE
|
||||
if (tmp)
|
||||
{
|
||||
free(tmp);
|
||||
}
|
||||
#endif
|
||||
|
||||
if(dlinfo.dli_sname && !strcmp(dlinfo.dli_sname, "main"))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
ip = bp[1];
|
||||
bp = (void**)bp[0];
|
||||
}
|
||||
#else
|
||||
pCurrent += sprintf(pCurrent, "\tStack trace (non-dedicated):\n");
|
||||
sz = backtrace(bt, 20);
|
||||
strings = backtrace_symbols(bt, sz);
|
||||
for(i = 0; i < sz; ++i)
|
||||
{
|
||||
pCurrent += sprintf(pCurrent, "\t\t%s\n", strings[i]);
|
||||
}
|
||||
#endif
|
||||
pCurrent += sprintf(pCurrent, "\tEnd of stack trace.\n");
|
||||
#else
|
||||
pCurrent += sprintf(pCurrent, "\tNot printing stack strace.\n");
|
||||
#endif
|
||||
|
||||
log_it_ex(&g_log_context, LOG_CRIT, output, pCurrent - output);
|
||||
}
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
/**
|
||||
* Copyright (C) 2008 Happy Fish / YuQing
|
||||
*
|
||||
* FastDFS may be copied only under the terms of the GNU General
|
||||
* Public License V3, which may be found in the FastDFS source kit.
|
||||
* Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
|
||||
**/
|
||||
|
||||
//linux_stack_trace.h
|
||||
#ifndef LINUX_STACK_TRACE_H
|
||||
#define LINUX_STACK_TRACE_H
|
||||
|
||||
#include "common_define.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void signal_stack_trace_print(int signum, siginfo_t *info, void *ptr);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
10
make.sh
10
make.sh
|
|
@ -141,11 +141,11 @@ if [ "$DEBUG_FLAG" = "1" ]; then
|
|||
TRACKER_EXTRA_OBJS="$TRACKER_EXTRA_OBJS tracker_dump.o"
|
||||
STORAGE_EXTRA_OBJS="$STORAGE_EXTRA_OBJS storage_dump.o"
|
||||
|
||||
if [ "$uname" = "Linux" ]; then
|
||||
LIBS="$LIBS -ldl -rdynamic"
|
||||
TRACKER_EXTRA_OBJS="$TRACKER_EXTRA_OBJS ../common/linux_stack_trace.o"
|
||||
STORAGE_EXTRA_OBJS="$STORAGE_EXTRA_OBJS ../common/linux_stack_trace.o"
|
||||
fi
|
||||
# if [ "$uname" = "Linux" ]; then
|
||||
# LIBS="$LIBS -ldl -rdynamic"
|
||||
# TRACKER_EXTRA_OBJS="$TRACKER_EXTRA_OBJS ../common/linux_stack_trace.o"
|
||||
# STORAGE_EXTRA_OBJS="$STORAGE_EXTRA_OBJS ../common/linux_stack_trace.o"
|
||||
# fi
|
||||
fi
|
||||
|
||||
cd tracker
|
||||
|
|
|
|||
|
|
@ -46,14 +46,6 @@
|
|||
#endif
|
||||
|
||||
#if defined(DEBUG_FLAG)
|
||||
|
||||
/*
|
||||
#if defined(OS_LINUX)
|
||||
#include "linux_stack_trace.h"
|
||||
static bool bSegmentFault = false;
|
||||
#endif
|
||||
*/
|
||||
|
||||
#include "storage_dump.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -541,30 +533,6 @@ static void sigUsrHandler(int sig)
|
|||
}
|
||||
|
||||
#if defined(DEBUG_FLAG)
|
||||
|
||||
/*
|
||||
#if defined(OS_LINUX)
|
||||
static void sigSegvHandler(int signum, siginfo_t *info, void *ptr)
|
||||
{
|
||||
bSegmentFault = true;
|
||||
|
||||
if (!bTerminateFlag)
|
||||
{
|
||||
set_timer(1, 1, sigAlarmHandler);
|
||||
|
||||
bTerminateFlag = true;
|
||||
g_continue_flag = false;
|
||||
|
||||
logCrit("file: "__FILE__", line: %d, " \
|
||||
"catch signal %d, program exiting...", \
|
||||
__LINE__, signum);
|
||||
|
||||
signal_stack_trace_print(signum, info, ptr);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
*/
|
||||
|
||||
static void sigDumpHandler(int sig)
|
||||
{
|
||||
static bool bDumpFlag = false;
|
||||
|
|
|
|||
|
|
@ -43,14 +43,6 @@
|
|||
#endif
|
||||
|
||||
#if defined(DEBUG_FLAG)
|
||||
|
||||
/*
|
||||
#if defined(OS_LINUX)
|
||||
#include "linux_stack_trace.h"
|
||||
static bool bSegmentFault = false;
|
||||
#endif
|
||||
*/
|
||||
|
||||
#include "tracker_dump.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -424,29 +416,6 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
#if defined(DEBUG_FLAG)
|
||||
/*
|
||||
#if defined(OS_LINUX)
|
||||
static void sigSegvHandler(int signum, siginfo_t *info, void *ptr)
|
||||
{
|
||||
bSegmentFault = true;
|
||||
|
||||
if (!bTerminateFlag)
|
||||
{
|
||||
set_timer(1, 1, sigAlarmHandler);
|
||||
|
||||
bTerminateFlag = true;
|
||||
g_continue_flag = false;
|
||||
|
||||
logCrit("file: "__FILE__", line: %d, " \
|
||||
"catch signal %d, program exiting...", \
|
||||
__LINE__, signum);
|
||||
|
||||
signal_stack_trace_print(signum, info, ptr);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
*/
|
||||
|
||||
static void sigDumpHandler(int sig)
|
||||
{
|
||||
static bool bDumpFlag = false;
|
||||
|
|
|
|||
Loading…
Reference in New Issue