X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flog.c;h=7d1896c4a82a79a9cf3d94dfa2e6799aac01d262;hb=0c4159770e177475cb222770f03e0d0ff034f136;hp=eb480b40e013612021769fe58c8984b74696de04;hpb=bf6a2883d4d31a013546dc64b31a7f3a109a9659;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/log.c b/src/log.c index eb480b4..7d1896c 100644 --- a/src/log.c +++ b/src/log.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -24,14 +24,20 @@ #endif #define _GNU_SOURCE +#include +#include #include -#include #include +#include +#include #include #include #include "connman.h" +static const char *program_exec; +static const char *program_path; + /** * connman_info: * @format: format string @@ -104,30 +110,115 @@ void connman_debug(const char *format, ...) va_end(ap); } -static void signal_handler(int signo) +static void print_backtrace(unsigned int offset) { - void *frames[64]; - char **symbols; + void *frames[99]; size_t n_ptrs; unsigned int i; + int outfd[2], infd[2]; + int pathlen; + pid_t pid; + + if (program_exec == NULL) + return; + + pathlen = strlen(program_path); n_ptrs = backtrace(frames, G_N_ELEMENTS(frames)); - symbols = backtrace_symbols(frames, n_ptrs); - if (symbols == NULL) { - connman_error("No backtrace symbols"); - exit(1); + if (n_ptrs < offset) + return; + + if (pipe(outfd) < 0) + return; + + if (pipe(infd) < 0) { + close(outfd[0]); + close(outfd[1]); + return; + } + + pid = fork(); + if (pid < 0) { + close(outfd[0]); + close(outfd[1]); + close(infd[0]); + close(infd[1]); + return; + } + + if (pid == 0) { + close(outfd[1]); + close(infd[0]); + + dup2(outfd[0], STDIN_FILENO); + dup2(infd[1], STDOUT_FILENO); + + execlp("addr2line", "-C", "-f", "-e", program_exec, NULL); + + exit(EXIT_FAILURE); } - connman_error("Aborting (signal %d)", signo); + close(outfd[0]); + close(infd[1]); + connman_error("++++++++ backtrace ++++++++"); - for (i = 1; i < n_ptrs; i++) - connman_error("[%d]: %s", i - 1, symbols[i]); + for (i = offset; i < n_ptrs - 1; i++) { + Dl_info info; + char addr[20], buf[PATH_MAX * 2]; + int len, written; + char *ptr, *pos; + + dladdr(frames[i], &info); + + len = snprintf(addr, sizeof(addr), "%p\n", frames[i]); + if (len < 0) + break; + + written = write(outfd[1], addr, len); + if (written < 0) + break; + + len = read(infd[0], buf, sizeof(buf)); + if (len < 0) + break; + + buf[len] = '\0'; + + pos = strchr(buf, '\n'); + *pos++ = '\0'; + + if (strcmp(buf, "??") == 0) { + connman_error("#%-2u %p in %s", i - offset, + frames[i], info.dli_fname); + continue; + } + + ptr = strchr(pos, '\n'); + *ptr++ = '\0'; + + if (strncmp(pos, program_path, pathlen) == 0) + pos += pathlen + 1; + + connman_error("#%-2u %p in %s() at %s", i - offset, + frames[i], buf, pos); + } connman_error("+++++++++++++++++++++++++++"); - g_free(symbols); - exit(1); + kill(pid, SIGTERM); + + close(outfd[1]); + close(infd[0]); +} + +static void signal_handler(int signo) +{ + connman_error("Aborting (signal %d) [%s]", signo, program_exec); + + print_backtrace(2); + + exit(EXIT_FAILURE); } static void signal_setup(sighandler_t handler) @@ -150,32 +241,8 @@ static void signal_setup(sighandler_t handler) extern struct connman_debug_desc __start___debug[]; extern struct connman_debug_desc __stop___debug[]; -void __connman_debug_list_available(DBusMessageIter *iter, void *user_data) -{ - struct connman_debug_desc *desc; - - for (desc = __start___debug; desc < __stop___debug; desc++) { - if ((desc->flags & CONNMAN_DEBUG_FLAG_ALIAS) && - desc->name != NULL) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &desc->name); - } -} - static gchar **enabled = NULL; -void __connman_debug_list_enabled(DBusMessageIter *iter, void *user_data) -{ - int i; - - if (enabled == NULL) - return; - - for (i = 0; enabled[i] != NULL; i++) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &enabled[i]); -} - static connman_bool_t is_enabled(struct connman_debug_desc *desc) { int i; @@ -195,16 +262,16 @@ static connman_bool_t is_enabled(struct connman_debug_desc *desc) return FALSE; } -int __connman_log_init(const char *debug, connman_bool_t detach) +void __connman_log_enable(struct connman_debug_desc *start, + struct connman_debug_desc *stop) { - int option = LOG_NDELAY | LOG_PID; struct connman_debug_desc *desc; const char *name = NULL, *file = NULL; - if (debug != NULL) - enabled = g_strsplit_set(debug, ":, ", 0); + if (start == NULL || stop == NULL) + return; - for (desc = __start___debug; desc < __stop___debug; desc++) { + for (desc = start; desc < stop; desc++) { if (desc->flags & CONNMAN_DEBUG_FLAG_ALIAS) { file = desc->file; name = desc->name; @@ -222,13 +289,28 @@ int __connman_log_init(const char *debug, connman_bool_t detach) if (is_enabled(desc) == TRUE) desc->flags |= CONNMAN_DEBUG_FLAG_PRINT; } +} + +int __connman_log_init(const char *program, const char *debug, + connman_bool_t detach) +{ + static char path[PATH_MAX]; + int option = LOG_NDELAY | LOG_PID; + + program_exec = program; + program_path = getcwd(path, sizeof(path)); + + if (debug != NULL) + enabled = g_strsplit_set(debug, ":, ", 0); + + __connman_log_enable(__start___debug, __stop___debug); if (detach == FALSE) option |= LOG_PERROR; signal_setup(signal_handler); - openlog("connmand", option, LOG_DAEMON); + openlog(basename(program), option, LOG_DAEMON); syslog(LOG_INFO, "Connection Manager version %s", VERSION);