jeremy-rifkin · jeremy-rifkin · Oct 2, 2024 · Sep 12, 2024 · Sep 12, 2024 · Sep 13, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -234,6 +234,9 @@ target_sources(
     src/unwind/unwind_with_nothing.cpp
     src/unwind/unwind_with_unwind.cpp
     src/unwind/unwind_with_winapi.cpp
+    src/utils/microfmt.cpp
+    src/utils/utils.cpp
+    src/platform/dbghelp_syminit_manager.cpp
 )
 
 target_include_directories(

diff --git a/cmake/has_stackwalk.cpp b/cmake/has_stackwalk.cpp
@@ -1,3 +1,4 @@
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <dbghelp.h>
 

diff --git a/src/binary/module_base.cpp b/src/binary/module_base.cpp
@@ -1,10 +1,9 @@
 #include "binary/module_base.hpp"
 
-#include "utils/common.hpp"
+#include "platform/platform.hpp"
 #include "utils/utils.hpp"
 
 #include <string>
-#include <vector>
 #include <mutex>
 #include <unordered_map>
 
@@ -17,7 +16,6 @@
   #include "binary/elf.hpp"
  #endif
 #elif IS_WINDOWS
- #include <windows.h>
  #include "binary/pe.hpp"
 #endif
 

diff --git a/src/binary/module_base.hpp b/src/binary/module_base.hpp
@@ -1,7 +1,6 @@
 #ifndef IMAGE_MODULE_BASE_HPP
 #define IMAGE_MODULE_BASE_HPP
 
-#include "utils/common.hpp"
 #include "utils/utils.hpp"
 
 #include <cstdint>

diff --git a/src/binary/object.cpp b/src/binary/object.cpp
@@ -1,6 +1,6 @@
 #include "binary/object.hpp"
 
-#include "utils/common.hpp"
+#include "platform/platform.hpp"
 #include "utils/utils.hpp"
 #include "binary/module_base.hpp"
 
@@ -16,6 +16,7 @@
   #include <link.h> // needed for dladdr1's link_map info
  #endif
 #elif IS_WINDOWS
+ #define WIN32_LEAN_AND_MEAN
  #include <windows.h>
 #endif
 

diff --git a/src/binary/object.hpp b/src/binary/object.hpp
@@ -1,14 +1,16 @@
 #ifndef OBJECT_HPP
 #define OBJECT_HPP
 
-#include "utils/common.hpp"
-#include "utils/utils.hpp"
-#include "binary/module_base.hpp"
-
-#include <string>
 #include <vector>
+#include <cstdint>
 
 namespace cpptrace {
+
+struct object_frame;
+struct safe_object_frame;
+
+using frame_ptr = std::uintptr_t;
+
 namespace detail {
     object_frame get_frame_object_info(frame_ptr address);
 

diff --git a/src/binary/pe.cpp b/src/binary/pe.cpp
@@ -1,16 +1,16 @@
 #include "binary/pe.hpp"
 
-#include "utils/common.hpp"
+#include "platform/platform.hpp"
 #include "utils/error.hpp"
 #include "utils/utils.hpp"
 
 #if IS_WINDOWS
 #include <array>
-#include <cstddef>
 #include <cstdio>
 #include <cstring>
 #include <string>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 namespace cpptrace {

diff --git a/src/binary/pe.hpp b/src/binary/pe.hpp
@@ -1,7 +1,7 @@
 #ifndef PE_HPP
 #define PE_HPP
 
-#include "utils/common.hpp"
+#include "platform/platform.hpp"
 #include "utils/utils.hpp"
 
 #if IS_WINDOWS

diff --git a/src/cpptrace.cpp b/src/cpptrace.cpp
@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
-#include <new>
+#include <iostream>
 #include <sstream>
 #include <stdexcept>
 #include <string>
@@ -16,6 +16,7 @@
 #include "demangle/demangle.hpp"
 #include "platform/exception_type.hpp"
 #include "utils/common.hpp"
+#include "utils/microfmt.hpp"
 #include "utils/utils.hpp"
 #include "binary/object.hpp"
 #include "binary/safe_dl.hpp"

diff --git a/src/demangle/demangle_with_winapi.cpp b/src/demangle/demangle_with_winapi.cpp
@@ -4,6 +4,7 @@
 
 #include <string>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <dbghelp.h>
 

diff --git a/src/from_current.cpp b/src/from_current.cpp
@@ -6,14 +6,12 @@
 #include <typeinfo>
 
 #include "platform/platform.hpp"
-#include "utils/common.hpp"
 #include "utils/microfmt.hpp"
-#include "utils/utils.hpp"
 
 #ifndef _MSC_VER
- #include <array>
  #include <string.h>
  #if IS_WINDOWS
+  #define WIN32_LEAN_AND_MEAN
   #include <windows.h>
  #else
   #include <sys/mman.h>
@@ -23,7 +21,7 @@
    #include <mach/mach_vm.h>
   #else
    #include <fstream>
-   #include <iomanip>
+   #include <ios>
   #endif
  #endif
 #endif

diff --git a/src/platform/dbghelp_syminit_manager.cpp b/src/platform/dbghelp_syminit_manager.cpp
@@ -0,0 +1,40 @@
+
+#include "platform/dbghelp_syminit_manager.hpp"
+
+#include "utils/error.hpp"
+#include "utils/microfmt.hpp"
+
+#include <unordered_set>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <dbghelp.h>
+
+namespace cpptrace {
+namespace detail {
+
+    dbghelp_syminit_manager::~dbghelp_syminit_manager() {
+        for(auto handle : set) {
+            if(!SymCleanup(handle)) {
+                ASSERT(false, microfmt::format("Cpptrace SymCleanup failed with code {}\n", GetLastError()).c_str());
+            }
+        }
+    }
+
+    void dbghelp_syminit_manager::init(HANDLE proc) {
+        if(set.count(proc) == 0) {
+            if(!SymInitialize(proc, NULL, TRUE)) {
+                throw internal_error("SymInitialize failed {}", GetLastError());
+            }
+            set.insert(proc);
+        }
+    }
+
+    // Thread-safety: Must only be called from symbols_with_dbghelp while the dbghelp_lock lock is held
+    dbghelp_syminit_manager& get_syminit_manager() {
+        static dbghelp_syminit_manager syminit_manager;
+        return syminit_manager;
+    }
+
+}
+}
diff --git a/src/platform/dbghelp_syminit_manager.hpp b/src/platform/dbghelp_syminit_manager.hpp
@@ -1,42 +1,19 @@
 #ifndef DBGHELP_SYMINIT_MANAGER_HPP
 #define DBGHELP_SYMINIT_MANAGER_HPP
 
-#include "utils/common.hpp"
-#include "utils/utils.hpp"
-
 #include <unordered_set>
 
-#include <windows.h>
-#include <dbghelp.h>
-
 namespace cpptrace {
 namespace detail {
     struct dbghelp_syminit_manager {
-        std::unordered_set<HANDLE> set;
-
-        ~dbghelp_syminit_manager() {
-            for(auto handle : set) {
-                if(!SymCleanup(handle)) {
-                    ASSERT(false, microfmt::format("Cpptrace SymCleanup failed with code {}\n", GetLastError()).c_str());
-                }
-            }
-        }
+        std::unordered_set<void*> set;
 
-        void init(HANDLE proc) {
-            if(set.count(proc) == 0) {
-                if(!SymInitialize(proc, NULL, TRUE)) {
-                    throw internal_error("SymInitialize failed {}", GetLastError());
-                }
-                set.insert(proc);
-            }
-        }
+        ~dbghelp_syminit_manager();
+        void init(void* proc);
     };
 
     // Thread-safety: Must only be called from symbols_with_dbghelp while the dbghelp_lock lock is held
-    inline dbghelp_syminit_manager& get_syminit_manager() {
-        static dbghelp_syminit_manager syminit_manager;
-        return syminit_manager;
-    }
+    dbghelp_syminit_manager& get_syminit_manager();
 }
 }
 

diff --git a/src/platform/path.hpp b/src/platform/path.hpp
@@ -1,10 +1,13 @@
 #ifndef PATH_HPP
 #define PATH_HPP
 
-#include "utils/common.hpp"
 #include "platform/platform.hpp"
 
+#include <string>
+#include <cctype>
+
 #if IS_WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 

diff --git a/src/platform/program_name.hpp b/src/platform/program_name.hpp
@@ -7,6 +7,7 @@
 #include "platform/platform.hpp"
 
 #if IS_WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #define CPPTRACE_MAX_PATH MAX_PATH

diff --git a/src/snippets/snippet.cpp b/src/snippets/snippet.cpp
@@ -9,6 +9,7 @@
 #include <iostream>
 
 #include "utils/common.hpp"
+#include "utils/microfmt.hpp"
 #include "utils/utils.hpp"
 
 namespace cpptrace {

diff --git a/src/symbols/dwarf/dwarf.hpp b/src/symbols/dwarf/dwarf.hpp
@@ -3,10 +3,10 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "utils/error.hpp"
+#include "utils/microfmt.hpp"
 #include "utils/utils.hpp"
 
 #include <functional>
-#include <stdexcept>
 #include <type_traits>
 
 #ifdef CPPTRACE_USE_NESTED_LIBDWARF_HEADER_PATH

diff --git a/src/symbols/dwarf/dwarf_resolver.cpp b/src/symbols/dwarf/dwarf_resolver.cpp
@@ -10,15 +10,16 @@
 #include "utils/utils.hpp"
 #include "platform/path.hpp"
 #include "platform/program_name.hpp" // For CPPTRACE_MAX_PATH
+
+#if IS_APPLE
 #include "binary/mach-o.hpp"
+#endif
 
 #include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <functional>
-#include <iterator>
 #include <memory>
-#include <stdexcept>
 #include <string>
 #include <type_traits>
 #include <unordered_map>

diff --git a/src/symbols/dwarf/resolver.hpp b/src/symbols/dwarf/resolver.hpp
@@ -3,7 +3,7 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "symbols/symbols.hpp"
-#include "utils/common.hpp"
+#include "platform/platform.hpp"
 
 #include <memory>
 

diff --git a/src/symbols/symbols.hpp b/src/symbols/symbols.hpp
@@ -3,12 +3,9 @@
 
 #include <cpptrace/cpptrace.hpp>
 
-#include <memory>
 #include <vector>
 #include <unordered_map>
 
-#include "binary/object.hpp"
-
 namespace cpptrace {
 namespace detail {
     using collated_vec = std::vector<

diff --git a/src/symbols/symbols_core.cpp b/src/symbols/symbols_core.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include <unordered_map>
 
-#include "utils/common.hpp"
+#include "utils/error.hpp"
 #include "binary/object.hpp"
 
 namespace cpptrace {

diff --git a/src/symbols/symbols_with_addr2line.cpp b/src/symbols/symbols_with_addr2line.cpp
@@ -3,6 +3,7 @@
 #include <cpptrace/cpptrace.hpp>
 #include "symbols/symbols.hpp"
 #include "utils/common.hpp"
+#include "utils/microfmt.hpp"
 #include "utils/utils.hpp"
 
 #include <cstdint>

diff --git a/src/symbols/symbols_with_dbghelp.cpp b/src/symbols/symbols_with_dbghelp.cpp
@@ -3,14 +3,16 @@
 #include <cpptrace/cpptrace.hpp>
 #include "symbols/symbols.hpp"
 #include "platform/dbghelp_syminit_manager.hpp"
+#include "binary/object.hpp"
+#include "utils/common.hpp"
+#include "utils/error.hpp"
 
-#include <memory>
 #include <mutex>
 #include <regex>
-#include <stdexcept>
 #include <system_error>
 #include <vector>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <dbghelp.h>
 

diff --git a/src/symbols/symbols_with_libdwarf.cpp b/src/symbols/symbols_with_libdwarf.cpp
@@ -5,7 +5,6 @@
 #include <cpptrace/cpptrace.hpp>
 #include "dwarf/resolver.hpp"
 #include "utils/common.hpp"
-#include "utils/error.hpp"
 #include "utils/utils.hpp"
 
 #include <cstdint>
@@ -15,8 +14,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <iostream>
-#include <iomanip>
 
 namespace cpptrace {
 namespace detail {

diff --git a/src/unwind/unwind.hpp b/src/unwind/unwind.hpp
@@ -1,8 +1,7 @@
 #ifndef UNWIND_HPP
 #define UNWIND_HPP
 
-#include "utils/common.hpp"
-#include "utils/utils.hpp"
+#include "cpptrace/cpptrace.hpp"
 
 #include <cstddef>
 #include <vector>