boost/stacktrace
2
0
Fork 0
mirror of https://github.com/boostorg/stacktrace.git synced 2026-01-22 05:42:25 +00:00
Code Issues Projects Releases Wiki Activity

Drop version info in dump

Browse Source
This commit is contained in:
Antony Polukhin
2017-02-06 22:55:27 +03:00
parent 9c08e254f1
commit 441d38af76
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/stacktrace/safe_dump_to.hpp
View File

@@ -32,18 +32,17 @@ namespace boost { namespace stacktrace {
/// @param size Size of the preallocated buffer.
BOOST_FORCEINLINE std::size_t safe_dump_to(void* memory, std::size_t size) BOOST_NOEXCEPT {
void** mem = static_cast<void**>(memory);
*mem = reinterpret_cast<void*>(0x1); // format version
return boost::stacktrace::detail::this_thread_frames::collect(mem + 1, size / sizeof(void*) - 1);
return boost::stacktrace::detail::this_thread_frames::collect(mem, size / sizeof(void*));
}
/// @cond
namespace detail {
template <class T>
BOOST_FORCEINLINE std::size_t safe_dump_to_impl(T file) BOOST_NOEXCEPT {
void* buffer[boost::stacktrace::detail::max_frames_dump + 2] = { reinterpret_cast<void*>(0x1) }; // format version
const std::size_t frames_count = boost::stacktrace::detail::this_thread_frames::collect(buffer + 1, boost::stacktrace::detail::max_frames_dump);
buffer[frames_count + 1] = 0;
return boost::stacktrace::detail::dump(file, buffer, frames_count + 2);
void* buffer[boost::stacktrace::detail::max_frames_dump + 1];
const std::size_t frames_count = boost::stacktrace::detail::this_thread_frames::collect(buffer, boost::stacktrace::detail::max_frames_dump);
buffer[frames_count] = 0;
return boost::stacktrace::detail::dump(file, buffer, frames_count + 1);
}
}
/// @endcond

17
include/boost/stacktrace/stacktrace.hpp
View File

@@ -51,13 +51,9 @@ class basic_stacktrace {
);
}
}
static bool is_dump_version_supported(const void* version) BOOST_NOEXCEPT {
return reinterpret_cast<void*>(0x1) == version;
}
static std::size_t frames_count_from_buffer_size(std::size_t buffer_size) BOOST_NOEXCEPT {
const std::size_t ret = (buffer_size > sizeof(void*) ? buffer_size / sizeof(void*) - 1 /*first void* holds the version*/ : 0);
const std::size_t ret = (buffer_size > sizeof(void*) ? buffer_size / sizeof(void*) : 0);
return (ret > 1024 ? 1024 : ret); // Dealing with suspiciously big sizes
}
/// @endcond
@@ -254,12 +250,12 @@ public:
in.seekg(0, in.end);
const std::size_t frames_count = frames_count_from_buffer_size(static_cast<std::size_t>(in.tellg()));
in.seekg(pos);
void* ptr = 0;
if (!in.read(reinterpret_cast<Char*>(&ptr), sizeof(ptr)) || !frames_count || !is_dump_version_supported(ptr)) {
if (!frames_count) {
return ret;
}
void* ptr = 0;
ret.impl_.reserve(frames_count);
while (in.read(reinterpret_cast<Char*>(&ptr), sizeof(ptr))) {
if (!ptr) {
@@ -278,12 +274,11 @@ public:
static basic_stacktrace from_dump(const void* begin, std::size_t size, const allocator_type& a = allocator_type()) {
basic_stacktrace ret(0, a);
const void* const* first = static_cast<const void* const*>(begin);
if (size < sizeof(void*) || !is_dump_version_supported(*first)) {
const std::size_t frames_count = frames_count_from_buffer_size(size);
if (!frames_count) {
return ret;
}
++ first;
const std::size_t frames_count = frames_count_from_buffer_size(size);
const void* const* const last = first + frames_count;
ret.impl_.reserve(frames_count);
for (; first != last; ++first) {