luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some NODISCARD attributes and uncomment scope_exit utility code

Browse Source
This commit is contained in:
Jeremy Rifkin 2025-02-20 21:43:25 -06:00
parent 6877782d96
commit 9a2ae3c96f
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform/dbghelp_utils.hpp
View File

@ -5,6 +5,8 @@
|| defined(CPPTRACE_GET_SYMBOLS_WITH_DBGHELP) \
|| defined(CPPTRACE_DEMANGLE_WITH_WINAPI)
#include "utils/common.hpp"
#include <unordered_map>
#include <mutex>
@ -20,8 +22,8 @@ namespace detail {
~dbghelp_syminit_info();
void release();
static dbghelp_syminit_info make_not_owned(void* handle);
static dbghelp_syminit_info make_owned(void* handle, bool should_close_handle);
NODISCARD static dbghelp_syminit_info make_not_owned(void* handle);
NODISCARD static dbghelp_syminit_info make_owned(void* handle, bool should_close_handle);
dbghelp_syminit_info(const dbghelp_syminit_info&) = delete;
dbghelp_syminit_info(dbghelp_syminit_info&&);
@ -39,7 +41,7 @@ namespace detail {
// - Calls SymInitialize and returns an owning dbghelp_syminit_info which will handle cleanup
dbghelp_syminit_info ensure_syminit();
std::unique_lock<std::recursive_mutex> get_dbghelp_lock();
NODISCARD std::unique_lock<std::recursive_mutex> get_dbghelp_lock();
}
}

48
src/utils/utils.hpp
View File

@ -278,31 +278,31 @@ namespace detail {
}
};
// template<typename F>
// class scope_guard {
// F f;
// bool active;
// public:
// scope_guard(F&& f) : f(std::forward<F>(f)), active(true) {}
// ~scope_guard() {
// if(active) {
// f();
// }
// }
// scope_guard(const scope_guard&) = delete;
// scope_guard(scope_guard&& other) : f(std::move(other.f)), active(exchange(other.active, false)) {}
// scope_guard& operator=(const scope_guard&) = delete;
// scope_guard& operator=(scope_guard&& other) {
// f = std::move(other.f);
// active = exchange(other.active, false);
// return *this;
// }
// };
template<typename F>
class scope_guard {
F f;
bool active;
public:
scope_guard(F&& f) : f(std::forward<F>(f)), active(true) {}
~scope_guard() {
if(active) {
f();
}
}
scope_guard(const scope_guard&) = delete;
scope_guard(scope_guard&& other) : f(std::move(other.f)), active(exchange(other.active, false)) {}
scope_guard& operator=(const scope_guard&) = delete;
scope_guard& operator=(scope_guard&& other) {
f = std::move(other.f);
active = exchange(other.active, false);
return *this;
}
};
// template<typename F>
// auto scope_exit(F&& f) {
// return scope_guard<F>(std::forward<F>(f));
// }
template<typename F>
NODISCARD auto scope_exit(F&& f) {
return scope_guard<F>(std::forward<F>(f));
}
}
}