Skip to content

Commit 95065ca

Browse files
authored
Merge pull request boostorg#132 from Chocobo1/typo
Fix typos
2 parents 4cf4738 + b9a0a12 commit 95065ca

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

doc/stacktrace.qbk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,11 @@ By default Boost.Stacktrace is a header-only library, but you may change that an
285285

286286
In header only mode library could be tuned by macro. If one of the link macro from above is defined, you have to manually link with one of the libraries:
287287
[table:libconfig Config
288-
[[Macro name or default] [Library] [Effect] [Platforms] [Uses debug information [footnote This will provide more readable backtraces with *source code locations* if the binary is built with debug information.]] [Uses dynamic exports information [footnote This will provide readable function names in backtrace for functions that are exported by the binary. Compiling with `-rdynamic` flag, without `-fisibility=hidden` or marking functions as exported produce a better stacktraces.]] ]
288+
[[Macro name or default] [Library] [Effect] [Platforms] [Uses debug information [footnote This will provide more readable backtraces with *source code locations* if the binary is built with debug information.]] [Uses dynamic exports information [footnote This will provide readable function names in backtrace for functions that are exported by the binary. Compiling with `-rdynamic` flag, without `-fvisibility=hidden` or marking functions as exported produce a better stacktraces.]] ]
289289
[[['default for MSVC, Intel on Windows, MinGW-w64] / *BOOST_STACKTRACE_USE_WINDBG*] [*boost_stacktrace_windbg*] [ Uses `dbgeng.h` to show debug info. May require linking with *ole32* and *dbgeng*. ] [MSVC, MinGW-w64, Intel on Windows] [yes] [no]]
290290
[[['default for other platforms]] [*boost_stacktrace_basic*] [Uses compiler intrinsics to collect stacktrace and if possible `::dladdr` to show information about the symbol. Requires linking with *libdl* library on POSIX platforms.] [Any compiler on POSIX or MinGW] [no] [yes]]
291291
[[*BOOST_STACKTRACE_USE_WINDBG_CACHED*] [*boost_stacktrace_windbg_cached*] [ Uses `dbgeng.h` to show debug info and caches internals in TLS for better performance. Useful only for cases when traces are gathered very often. May require linking with *ole32* and *dbgeng*. ] [MSVC, Intel on Windows] [yes] [no]]
292-
[[*BOOST_STACKTRACE_USE_BACKTRACE*] [*boost_stacktrace_backtrace*] [Requires linking with *libdl* on POSIX and *libbacktrace* libraries[footnote Some *libbacktrace* packages SEGFAULT if there's a concurrent work with the same `backtrace_state` instance. To avoid that issue the Boost.Stacktrace library uses `thread_local` states, unfortuantely this may consume a lot of memory if you often create and destroy execution threads in your application. Define *BOOST_STACKTRACE_BACKTRACE_FORCE_STATIC* to force single instance, but make sure that [@https://github.com/boostorg/stacktrace/blob/develop/test/thread_safety_checking.cpp thread_safety_checking.cpp] works well in your setup. ]. *libbacktrace* is probably already installed in your system[footnote If you are using Clang with libstdc++ you could get into troubles of including `<backtrace.h>`, because on some platforms Clang does not search for headers in the GCC's include paths and any attempt to add GCC's include path leads to linker errors. To explicitly specify a path to the `<backtrace.h>` header you could define the *BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE* to a full path to the header. For example on Ubuntu Xenial use the command line option *-DBOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE=</usr/lib/gcc/x86_64-linux-gnu/5/include/backtrace.h>* while building with Clang. ], or built into your compiler.
292+
[[*BOOST_STACKTRACE_USE_BACKTRACE*] [*boost_stacktrace_backtrace*] [Requires linking with *libdl* on POSIX and *libbacktrace* libraries[footnote Some *libbacktrace* packages SEGFAULT if there's a concurrent work with the same `backtrace_state` instance. To avoid that issue the Boost.Stacktrace library uses `thread_local` states, unfortunately this may consume a lot of memory if you often create and destroy execution threads in your application. Define *BOOST_STACKTRACE_BACKTRACE_FORCE_STATIC* to force single instance, but make sure that [@https://github.com/boostorg/stacktrace/blob/develop/test/thread_safety_checking.cpp thread_safety_checking.cpp] works well in your setup. ]. *libbacktrace* is probably already installed in your system[footnote If you are using Clang with libstdc++ you could get into troubles of including `<backtrace.h>`, because on some platforms Clang does not search for headers in the GCC's include paths and any attempt to add GCC's include path leads to linker errors. To explicitly specify a path to the `<backtrace.h>` header you could define the *BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE* to a full path to the header. For example on Ubuntu Xenial use the command line option *-DBOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE=</usr/lib/gcc/x86_64-linux-gnu/5/include/backtrace.h>* while building with Clang. ], or built into your compiler.
293293

294294
Otherwise (if you are a *MinGW*/*MinGW-w64* user for example) it can be downloaded [@https://github.com/ianlancetaylor/libbacktrace from here] or [@https://github.com/gcc-mirror/gcc/tree/master/libbacktrace from here]. ] [Any compiler on POSIX, or MinGW, or MinGW-w64] [yes] [yes]]
295295
[[*BOOST_STACKTRACE_USE_ADDR2LINE*] [*boost_stacktrace_addr2line*] [Use *addr2line* program to retrieve stacktrace. Requires linking with *libdl* library and `::fork` system call. Macro *BOOST_STACKTRACE_ADDR2LINE_LOCATION* must be defined to the absolute path to the addr2line executable if it is not located in /usr/bin/addr2line. ] [Any compiler on POSIX] [yes] [yes]]

example/terminate_handler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ boost::interprocess::mapped_region g_region; // inited at program start
7777
void my_signal_handler2(int signum) {
7878
::signal(signum, SIG_DFL);
7979
void** f = static_cast<void**>(g_region.get_address());
80-
*f = reinterpret_cast<void*>(1); // Setting flag that shared memory now constains stacktrace.
80+
*f = reinterpret_cast<void*>(1); // Setting flag that shared memory now contains stacktrace.
8181
boost::stacktrace::safe_dump_to(f + 1, g_region.get_size() - sizeof(void*));
8282

8383
::raise(SIGABRT);
@@ -196,8 +196,8 @@ int run_4(const char* argv[]) {
196196

197197
//[getting_started_on_program_restart_shmem
198198
void** f = static_cast<void**>(g_region.get_address());
199-
if (*f) { // Checking if memory constains stacktrace.
200-
boost::stacktrace::stacktrace st
199+
if (*f) { // Checking if memory contains stacktrace.
200+
boost::stacktrace::stacktrace st
201201
= boost::stacktrace::stacktrace::from_dump(f + 1, g_region.get_size() - sizeof(bool));
202202

203203
std::cout << "Previous run crashed and left trace in shared memory:\n" << st << std::endl;

include/boost/stacktrace/detail/frame_msvc.ipp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class debugging_symbols: boost::noncopyable {
129129
return;
130130
}
131131

132-
// No cheking: QueryInterface sets the output parameter to NULL in case of error.
132+
// No checking: QueryInterface sets the output parameter to NULL in case of error.
133133
iclient->QueryInterface(__uuidof(IDebugSymbols), idebug.to_void_ptr_ptr());
134134
}
135135

include/boost/stacktrace/stacktrace.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class basic_stacktrace {
135135
///
136136
/// @b Async-Handler-Safety: Safe if Allocator construction, copying, Allocator::allocate and Allocator::deallocate are async signal safe.
137137
///
138-
/// @param a Allocator that would be passed to underlying storeage.
138+
/// @param a Allocator that would be passed to underlying storage.
139139
BOOST_FORCEINLINE explicit basic_stacktrace(const allocator_type& a) BOOST_NOEXCEPT
140140
: impl_(a)
141141
{
@@ -152,7 +152,7 @@ class basic_stacktrace {
152152
///
153153
/// @param max_depth Max call sequence depth to collect.
154154
///
155-
/// @param a Allocator that would be passed to underlying storeage.
155+
/// @param a Allocator that would be passed to underlying storage.
156156
///
157157
/// @throws Nothing. Note that default construction of allocator may throw, however it is
158158
/// performed outside the constructor and exception in `allocator_type()` would not result in calling `std::terminate`.
@@ -320,7 +320,7 @@ class basic_stacktrace {
320320

321321
/// Constructs stacktrace from raw memory dump. Terminating zero frame is discarded.
322322
///
323-
/// @param begin Begining of the memory where the stacktrace was saved using the boost::stacktrace::safe_dump_to
323+
/// @param begin Beginning of the memory where the stacktrace was saved using the boost::stacktrace::safe_dump_to
324324
///
325325
/// @param buffer_size_in_bytes Size of the memory. Usually the same value that was passed to the boost::stacktrace::safe_dump_to
326326
///

0 commit comments

Comments
 (0)