Updated non-ARM archs to reflect logging changes.

Brigid Smith · Brigid Smith · commit e17f267b2a54 · 2014-06-19T11:33:38.000-07:00
Change-Id: I0af865881c19ea4a57ec1aa9455bc32c08a60d75
diff --git a/debuggerd/arm64/machine.cpp b/debuggerd/arm64/machine.cpp
@@ -44,7 +44,7 @@ void dump_memory_and_code(log_t* log, pid_t tid) {
     io.iov_len = sizeof(regs);
 
     if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, &io) == -1) {
-        LOG_ERROR("%s: ptrace failed to get registers: %s\n",
+        _LOG(log, logtype::ERROR, "%s: ptrace failed to get registers: %s\n",
              __func__, strerror(errno));
         return;
     }
@@ -80,7 +80,7 @@ void dump_registers(log_t* log, pid_t tid) {
   io.iov_len = sizeof(r);
 
   if (ptrace(PTRACE_GETREGSET, tid, (void*) NT_PRSTATUS, (void*) &io) == -1) {
-    LOG_ERROR("ptrace error: %s\n", strerror(errno));
+    _LOG(log, logtype::ERROR, "ptrace error: %s\n", strerror(errno));
     return;
   }
 
@@ -105,7 +105,7 @@ void dump_registers(log_t* log, pid_t tid) {
   io.iov_len = sizeof(f);
 
   if (ptrace(PTRACE_GETREGSET, tid, (void*) NT_PRFPREG, (void*) &io) == -1) {
-    LOG_ERROR("ptrace error: %s\n", strerror(errno));
+    _LOG(log, logtype::ERROR, "ptrace error: %s\n", strerror(errno));
     return;
   }
 
diff --git a/debuggerd/mips/machine.cpp b/debuggerd/mips/machine.cpp
@@ -87,7 +87,7 @@ void dump_memory_and_code(log_t* log, pid_t tid) {
 void dump_registers(log_t* log, pid_t tid) {
   pt_regs_mips_t r;
   if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {
-    LOG_ERROR("cannot get registers: %s\n", strerror(errno));
+    _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));
     return;
   }
 
diff --git a/debuggerd/x86/machine.cpp b/debuggerd/x86/machine.cpp
@@ -31,7 +31,7 @@ void dump_memory_and_code(log_t*, pid_t) {
 void dump_registers(log_t* log, pid_t tid) {
   struct pt_regs r;
   if (ptrace(PTRACE_GETREGS, tid, 0, &r) == -1) {
-    LOG_ERROR("cannot get registers: %s\n", strerror(errno));
+    _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));
     return;
   }
   _LOG(log, logtype::REGISTERS, "    eax %08lx  ebx %08lx  ecx %08lx  edx %08lx\n",
diff --git a/debuggerd/x86_64/machine.cpp b/debuggerd/x86_64/machine.cpp
@@ -33,7 +33,7 @@ void dump_memory_and_code(log_t*, pid_t) {
 void dump_registers(log_t* log, pid_t tid) {
     struct user_regs_struct r;
     if (ptrace(PTRACE_GETREGS, tid, 0, &r) == -1) {
-        LOG_ERROR("cannot get registers: %s\n", strerror(errno));
+        _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));
         return;
     }
     _LOG(log, logtype::REGISTERS, "    rax %016lx  rbx %016lx  rcx %016lx  rdx %016lx\n",

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ void dump_memory_and_code(log_t* log, pid_t tid) {`
`87`	`87`	`void dump_registers(log_t* log, pid_t tid) {`
`88`	`88`	`pt_regs_mips_t r;`
`89`	`89`	`if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {`
`90`		`- LOG_ERROR("cannot get registers: %s\n", strerror(errno));`
	`90`	`+ _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));`
`91`	`91`	`return;`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ void dump_memory_and_code(log_t*, pid_t) {`
`31`	`31`	`void dump_registers(log_t* log, pid_t tid) {`
`32`	`32`	`struct pt_regs r;`
`33`	`33`	`if (ptrace(PTRACE_GETREGS, tid, 0, &r) == -1) {`
`34`		`- LOG_ERROR("cannot get registers: %s\n", strerror(errno));`
	`34`	`+ _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`	`37`	`_LOG(log, logtype::REGISTERS, " eax %08lx ebx %08lx ecx %08lx edx %08lx\n",`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ void dump_memory_and_code(log_t*, pid_t) {`
`33`	`33`	`void dump_registers(log_t* log, pid_t tid) {`
`34`	`34`	`struct user_regs_struct r;`
`35`	`35`	`if (ptrace(PTRACE_GETREGS, tid, 0, &r) == -1) {`
`36`		`- LOG_ERROR("cannot get registers: %s\n", strerror(errno));`
	`36`	`+ _LOG(log, logtype::ERROR, "cannot get registers: %s\n", strerror(errno));`
`37`	`37`	`return;`
`38`	`38`	`}`
`39`	`39`	`_LOG(log, logtype::REGISTERS, " rax %016lx rbx %016lx rcx %016lx rdx %016lx\n",`