Imported Upstream version 1.35

[platform/upstream/connman.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index a693bd0..9bae4a3 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -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)
-               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) - 1);
-               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);
 }