commit c8c32dbf6444e4b7d27db38f40beb1bf904830b2
author Robert Swiecki <swiecki@google.com> Fri Oct 09 18:06:22 2015 +0200
committer Robert Swiecki <swiecki@google.com> Fri Oct 09 18:06:22 2015 +0200
tree aaf2611b6d76ef46dd2b7324c6ec7f7bc251455e
parent 36da498386a122515b6c205c28e07ca6147218d3

Merge

linux/unwind.c

diff --git a/linux/unwind.c b/linux/unwind.c
index 69ebc89..9418275 100644
--- a/linux/unwind.c
+++ b/linux/unwind.c
@@ -60,20 +60,20 @@
 
     unw_addr_space_t as = unw_create_addr_space(&_UPT_accessors, __BYTE_ORDER);
     if (!as) {
-        LOGMSG(l_ERROR, "[pid='%d'] unw_create_addr_space failed", pid);
+        LOG_E("[pid='%d'] unw_create_addr_space failed", pid);
         goto out;
     }
 
     ui = _UPT_create(pid);
     if (ui == NULL) {
-        LOGMSG(l_ERROR, "[pid='%d'] _UPT_create failed", pid);
+        LOG_E("[pid='%d'] _UPT_create failed", pid);
         goto out;
     }
 
     unw_cursor_t c;
     int ret = unw_init_remote(&c, as, ui);
     if (ret < 0) {
-        LOGMSG(l_ERROR, "[pid='%d'] unw_init_remote failed (%s)", pid, UNW_ER[-ret]);
+        LOG_E("[pid='%d'] unw_init_remote failed (%s)", pid, UNW_ER[-ret]);
         goto out;
     }
 
@@ -81,8 +81,7 @@
         unw_word_t ip;
         ret = unw_get_reg(&c, UNW_REG_IP, &ip);
         if (ret < 0) {
-            LOGMSG(l_ERROR, "[pid='%d'] [%d] failed to read IP (%s)", pid, num_frames,
-                   UNW_ER[-ret]);
+            LOG_E("[pid='%d'] [%zd] failed to read IP (%s)", pid, num_frames, UNW_ER[-ret]);
             funcs[num_frames].pc = 0;
         } else
             funcs[num_frames].pc = (void *)ip;
@@ -103,20 +102,20 @@
 
     as = unw_create_addr_space(&_UPT_accessors, __BYTE_ORDER);
     if (!as) {
-        LOGMSG(l_ERROR, "[pid='%d'] unw_create_addr_space failed", pid);
+        LOG_E("[pid='%d'] unw_create_addr_space failed", pid);
         goto out;
     }
 
     ui = (struct UPT_info *)_UPT_create(pid);
     if (ui == NULL) {
-        LOGMSG(l_ERROR, "[pid='%d'] _UPT_create failed", pid);
+        LOG_E("[pid='%d'] _UPT_create failed", pid);
         goto out;
     }
 
     unw_cursor_t cursor;
     int ret = unw_init_remote(&cursor, as, ui);
     if (ret < 0) {
-        LOGMSG(l_ERROR, "[pid='%d'] unw_init_remote failed (%s)", pid, UNW_ER[-ret]);
+        LOG_E("[pid='%d'] unw_init_remote failed (%s)", pid, UNW_ER[-ret]);
         goto out;
     }
 
@@ -126,8 +125,7 @@
 
         ret = unw_get_reg(&cursor, UNW_REG_IP, &pc);
         if (ret < 0) {
-            LOGMSG(l_ERROR, "[pid='%d'] [%d] failed to read IP (%s)",
-                   pid, num_frames, UNW_ER[-ret]);
+            LOG_E("[pid='%d'] [%d] failed to read IP (%s)", pid, num_frames, UNW_ER[-ret]);
             // We don't want to try to extract info from an arbitrary IP
             // TODO: Maybe abort completely (goto out))
             goto skip_frame_info;
@@ -136,16 +134,14 @@
         unw_proc_info_t frameInfo;
         ret = unw_get_proc_info(&cursor, &frameInfo);
         if (ret < 0) {
-            LOGMSG(l_DEBUG, "[pid='%d'] [%d] unw_get_proc_info (%s)",
-                   pid, num_frames, UNW_ER[-ret]);
+            LOG_D("[pid='%d'] [%d] unw_get_proc_info (%s)", pid, num_frames, UNW_ER[-ret]);
             // Not safe to keep parsing frameInfo
             goto skip_frame_info;
         }
 
         ret = unw_get_proc_name(&cursor, buf, sizeof(buf), &offset);
         if (ret < 0) {
-            LOGMSG(l_DEBUG, "[pid='%d'] [%d] unw_get_proc_name() failed (%s)",
-                   pid, num_frames, UNW_ER[-ret]);
+            LOG_D("[pid='%d'] [%d] unw_get_proc_name() failed (%s)", pid, num_frames, UNW_ER[-ret]);
             buf[0] = '\0';
         }