@@ -13,3 +13,4 @@ ID
 .vscode
 build
 pi
+tidy
@@ -61,7 +61,7 @@ else()
 endif()
 
 # Make sure to use the local libpstack headers rather than what's installed.
-include_directories("." ${LIBLZMA_INCLUDES} ${ZLIB_INCLUDES} ${PYTHON_INCLUDE_DIRS} )
+include_directories(${CMAKE_SOURCE_DIR} ${LIBLZMA_INCLUDES} ${ZLIB_INCLUDES} ${PYTHON_INCLUDE_DIRS} )
 
 add_library(dwelf ${LIBTYPE} dump.cc dwarf.cc elf.cc reader.cc util.cc
    ${inflatesrc} ${lzmasrc})
@@ -81,6 +81,7 @@ set (CLANG_TIDY "clang-tidy;-checks=*,-*readability-braces-around-statements,-cp
 set_target_properties(canal PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY}")
 set_target_properties(${PSTACK_BIN} PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY}")
 set_target_properties(dwelf PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY}")
+add_definitions("-DNDEBUG")
 set_target_properties(procman PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY}")
 endif()
 
 
@@ -6,11 +6,12 @@
 #include <exception>
 #include <algorithm>
 #include <memory>
-#include <libpstack/proc.h>
-#include <libpstack/elf.h>
-#include <libpstack/dwarf.h>
 #include <sys/types.h>
 
+#include "libpstack/proc.h"
+#include "libpstack/elf.h"
+#include "libpstack/dwarf.h"
+
 using namespace std;
 
 static int
 
@@ -123,8 +123,7 @@ CoreProcess::getRegs(lwpid_t pid, CoreRegisters *reg)
 #ifdef NT_PRSTATUS
    for (auto note : coreImage->notes) {
         if (note.name() == "CORE" && note.type() == NT_PRSTATUS) {
-            prstatus_t prstatus;
-            note.data()->readObj(0, &prstatus);
+            const auto &prstatus = note.data()->readObj<prstatus_t>(0);
             if (prstatus.pr_pid == pid) {
                 memcpy(reg, &prstatus.pr_reg, sizeof(*reg));
                 return true;
@@ -136,13 +135,13 @@ CoreProcess::getRegs(lwpid_t pid, CoreRegisters *reg)
 }
 
 void
-CoreProcess::resume(pid_t)
+CoreProcess::resume(pid_t /* unused */)
 {
     // can't resume post-mortem debugger.
 }
 
 void
-CoreProcess::stop(lwpid_t)
+CoreProcess::stop(lwpid_t /* unused */)
 {
     // can't stop a dead process.
 }
@@ -157,25 +156,18 @@ CoreProcess::stopProcess()
 pid_t
 CoreProcess::getPID() const
 {
-    for (auto note : coreImage->notes) {
-        // Return the PID of the first task in the core.
-        if (note.name() == "CORE" && note.type() == NT_PRSTATUS) {
-            prstatus_t status;
-            note.data()->readObj(0, &status);
-            return status.pr_pid;
-        }
-    }
+    // Return the PID of the first task in the core.
+    for (auto note : coreImage->notes)
+        if (note.name() == "CORE" && note.type() == NT_PRSTATUS)
+            return note.data()->readObj<prstatus_t>(0).pr_pid;
     return -1;
 }
 
 void
 CoreProcess::findLWPs()
 {
     for (auto note : coreImage->notes) {
-        if (note.name() == "CORE" && note.type() == NT_PRSTATUS) {
-            prstatus_t status;
-            note.data()->readObj(0, &status);
-            (void)lwps[status.pr_pid];
-        }
+        if (note.name() == "CORE" && note.type() == NT_PRSTATUS)
+            (void)lwps[note.data()->readObj<prstatus_t>(0).pr_pid];
     }
 }
-Original file line number
+Diff line change
 .vscode
 build
 pi
 +tidy
Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,7 @@ CoreProcess::getRegs(lwpid_t pid, CoreRegisters *reg)`
`123`	`123`	`#ifdef NT_PRSTATUS`
`124`	`124`	`for (auto note : coreImage->notes) {`
`125`	`125`	`if (note.name() == "CORE" && note.type() == NT_PRSTATUS) {`
`126`		`- prstatus_t prstatus;`
`127`		`- note.data()->readObj(0, &prstatus);`
	`126`	`+ const auto &prstatus = note.data()->readObj<prstatus_t>(0);`
`128`	`127`	`if (prstatus.pr_pid == pid) {`
`129`	`128`	`memcpy(reg, &prstatus.pr_reg, sizeof(*reg));`
`130`	`129`	`return true;`
`@@ -136,13 +135,13 @@ CoreProcess::getRegs(lwpid_t pid, CoreRegisters *reg)`
`136`	`135`	`}`
`137`	`136`
`138`	`137`	`void`
`139`		`-CoreProcess::resume(pid_t)`
	`138`	`+CoreProcess::resume(pid_t /* unused */)`
`140`	`139`	`{`
`141`	`140`	`// can't resume post-mortem debugger.`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`void`
`145`		`-CoreProcess::stop(lwpid_t)`
	`144`	`+CoreProcess::stop(lwpid_t /* unused */)`
`146`	`145`	`{`
`147`	`146`	`// can't stop a dead process.`
`148`	`147`	`}`
`@@ -157,25 +156,18 @@ CoreProcess::stopProcess()`
`157`	`156`	`pid_t`
`158`	`157`	`CoreProcess::getPID() const`
`159`	`158`	`{`
`160`		`- for (auto note : coreImage->notes) {`
`161`		`- // Return the PID of the first task in the core.`
`162`		`- if (note.name() == "CORE" && note.type() == NT_PRSTATUS) {`
`163`		`- prstatus_t status;`
`164`		`- note.data()->readObj(0, &status);`
`165`		`- return status.pr_pid;`
`166`		`- }`
`167`		`- }`
	`159`	`+ // Return the PID of the first task in the core.`
	`160`	`+ for (auto note : coreImage->notes)`
	`161`	`+ if (note.name() == "CORE" && note.type() == NT_PRSTATUS)`
	`162`	`+ return note.data()->readObj<prstatus_t>(0).pr_pid;`
`168`	`163`	`return -1;`
`169`	`164`	`}`
`170`	`165`
`171`	`166`	`void`
`172`	`167`	`CoreProcess::findLWPs()`
`173`	`168`	`{`
`174`	`169`	`for (auto note : coreImage->notes) {`
`175`		`- if (note.name() == "CORE" && note.type() == NT_PRSTATUS) {`
`176`		`- prstatus_t status;`
`177`		`- note.data()->readObj(0, &status);`
`178`		`- (void)lwps[status.pr_pid];`
`179`		`- }`
	`170`	`+ if (note.name() == "CORE" && note.type() == NT_PRSTATUS)`
	`171`	`+ (void)lwps[note.data()->readObj<prstatus_t>(0).pr_pid];`
`180`	`172`	`}`
`181`	`173`	`}`