X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flog.c;h=7d1896c4a82a79a9cf3d94dfa2e6799aac01d262;hb=6636320dc4c4b3254631098b4e748f0e38090344;hp=4dee003112b9d66b99b859f0dca0fd153de71b52;hpb=ff4679178975cede4a4173bcf03447f1c0058d73;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/log.c b/src/log.c index 4dee003..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,78 +110,115 @@ void connman_debug(const char *format, ...) va_end(ap); } -extern struct connman_debug_desc __start___debug[]; -extern struct connman_debug_desc __stop___debug[]; - -void __connman_debug_list_available(DBusMessageIter *iter, void *user_data) +static void print_backtrace(unsigned int offset) { - struct connman_debug_desc *desc; + void *frames[99]; + size_t n_ptrs; + unsigned int i; + int outfd[2], infd[2]; + int pathlen; + pid_t pid; - 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); - } -} + if (program_exec == NULL) + return; -static gchar **enabled = NULL; + pathlen = strlen(program_path); -void __connman_debug_list_enabled(DBusMessageIter *iter, void *user_data) -{ - int i; + n_ptrs = backtrace(frames, G_N_ELEMENTS(frames)); + if (n_ptrs < offset) + return; - if (enabled == NULL) + if (pipe(outfd) < 0) return; - for (i = 0; enabled[i] != NULL; i++) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &enabled[i]); -} + if (pipe(infd) < 0) { + close(outfd[0]); + close(outfd[1]); + return; + } -static connman_bool_t is_enabled(struct connman_debug_desc *desc) -{ - int i; + pid = fork(); + if (pid < 0) { + close(outfd[0]); + close(outfd[1]); + close(infd[0]); + close(infd[1]); + return; + } - if (enabled == NULL) - return FALSE; + if (pid == 0) { + close(outfd[1]); + close(infd[0]); - for (i = 0; enabled[i] != NULL; i++) { - if (desc->name != NULL && g_pattern_match_simple(enabled[i], - desc->name) == TRUE) - return TRUE; - if (desc->file != NULL && g_pattern_match_simple(enabled[i], - desc->file) == TRUE) - return TRUE; + dup2(outfd[0], STDIN_FILENO); + dup2(infd[1], STDOUT_FILENO); + + execlp("addr2line", "-C", "-f", "-e", program_exec, NULL); + + exit(EXIT_FAILURE); } - return FALSE; -} + close(outfd[0]); + close(infd[1]); -static void signal_handler(int signo) -{ - void *frames[64]; - char **symbols; - size_t n_ptrs; - unsigned int i; + connman_error("++++++++ backtrace ++++++++"); - n_ptrs = backtrace(frames, G_N_ELEMENTS(frames)); - symbols = backtrace_symbols(frames, n_ptrs); - if (symbols == NULL) { - connman_error("No backtrace symbols"); - exit(1); + 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("Aborting (signal %d)", signo); - connman_error("++++++++ ConnMan backtrace ++++++++"); + connman_error("+++++++++++++++++++++++++++"); - for (i = 1; i < n_ptrs; i++) - connman_error("[%d]: %s", i - 1, symbols[i]); + kill(pid, SIGTERM); - connman_error("++++++++++++++++++++++++++++++++++++"); + close(outfd[1]); + close(infd[0]); +} - g_free(symbols); - exit(1); +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) @@ -195,16 +238,40 @@ static void signal_setup(sighandler_t handler) sigaction(SIGPIPE, &sa, NULL); } -int __connman_log_init(const char *debug, connman_bool_t detach) +extern struct connman_debug_desc __start___debug[]; +extern struct connman_debug_desc __stop___debug[]; + +static gchar **enabled = NULL; + +static connman_bool_t is_enabled(struct connman_debug_desc *desc) +{ + int i; + + if (enabled == NULL) + return FALSE; + + for (i = 0; enabled[i] != NULL; i++) { + if (desc->name != NULL && g_pattern_match_simple(enabled[i], + desc->name) == TRUE) + return TRUE; + if (desc->file != NULL && g_pattern_match_simple(enabled[i], + desc->file) == TRUE) + return TRUE; + } + + return FALSE; +} + +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); @@ -241,7 +323,7 @@ void __connman_log_cleanup(void) closelog(); - g_strfreev(enabled); - signal_setup(SIG_DFL); + + g_strfreev(enabled); }