Imported Upstream version 1.35
[platform/upstream/connman.git] / src / log.c
index 4e305a9..9bae4a3 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2013  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
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <execinfo.h>
 #include <dlfcn.h>
 
 #include "connman.h"
@@ -110,113 +109,11 @@ void connman_debug(const char *format, ...)
        va_end(ap);
 }
 
-static void print_backtrace(unsigned int offset)
-{
-       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));
-       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);
-       }
-
-       close(outfd[0]);
-       close(infd[1]);
-
-       connman_error("++++++++ backtrace ++++++++");
-
-       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("+++++++++++++++++++++++++++");
-
-       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);
+       print_backtrace(program_path, program_exec, 2);
 
        exit(EXIT_FAILURE);
 }
@@ -243,23 +140,23 @@ extern struct connman_debug_desc __stop___debug[];
 
 static gchar **enabled = NULL;
 
-static connman_bool_t is_enabled(struct connman_debug_desc *desc)
+static bool is_enabled(struct connman_debug_desc *desc)
 {
        int i;
 
-       if (enabled == NULL)
-               return FALSE;
+       if (!enabled)
+               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;
+       for (i = 0; enabled[i]; i++) {
+               if (desc->name && g_pattern_match_simple(enabled[i],
+                                                       desc->name))
+                       return true;
+               if (desc->file && g_pattern_match_simple(enabled[i],
+                                                       desc->file))
+                       return true;
        }
 
-       return FALSE;
+       return false;
 }
 
 void __connman_log_enable(struct connman_debug_desc *start,
@@ -268,7 +165,7 @@ void __connman_log_enable(struct connman_debug_desc *start,
        struct connman_debug_desc *desc;
        const char *name = NULL, *file = NULL;
 
-       if (start == NULL || stop == NULL)
+       if (!start || !stop)
                return;
 
        for (desc = start; desc < stop; desc++) {
@@ -278,21 +175,21 @@ void __connman_log_enable(struct connman_debug_desc *start,
                        continue;
                }
 
-               if (file != NULL || name != NULL) {
+               if (file || name) {
                        if (g_strcmp0(desc->file, file) == 0) {
-                               if (desc->name == NULL)
+                               if (!desc->name)
                                        desc->name = name;
                        } else
                                file = NULL;
                }
 
-               if (is_enabled(desc) == TRUE)
+               if (is_enabled(desc))
                        desc->flags |= CONNMAN_DEBUG_FLAG_PRINT;
        }
 }
 
 int __connman_log_init(const char *program, const char *debug,
-               connman_bool_t detach, connman_bool_t backtrace,
+               gboolean detach, gboolean backtrace,
                const char *program_name, const char *program_version)
 {
        static char path[PATH_MAX];
@@ -301,15 +198,15 @@ int __connman_log_init(const char *program, const char *debug,
        program_exec = program;
        program_path = getcwd(path, sizeof(path));
 
-       if (debug != NULL)
+       if (debug)
                enabled = g_strsplit_set(debug, ":, ", 0);
 
        __connman_log_enable(__start___debug, __stop___debug);
 
-       if (detach == FALSE)
+       if (!detach)
                option |= LOG_PERROR;
 
-       if (backtrace == TRUE)
+       if (backtrace)
                signal_setup(signal_handler);
 
        openlog(basename(program), option, LOG_DAEMON);
@@ -319,13 +216,13 @@ int __connman_log_init(const char *program, const char *debug,
        return 0;
 }
 
-void __connman_log_cleanup(connman_bool_t backtrace)
+void __connman_log_cleanup(gboolean backtrace)
 {
        syslog(LOG_INFO, "Exit");
 
        closelog();
 
-       if (backtrace == TRUE)
+       if (backtrace)
                signal_setup(SIG_DFL);
 
        g_strfreev(enabled);