diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-02-01 13:26:42 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-02-01 13:27:28 +0100 |
commit | d0d256536cdfb1443067fb7cc0a19d647f636a5c (patch) | |
tree | 4403ffeb2968159b1e665738ecaaa63dcb21d14c /src/util/system.h | |
parent | 44f4bcd302d6061d77f4ddb86030cc888bff855c (diff) | |
parent | dc8be12510c2fd5a809d9a82d2c14b464b5e5a3f (diff) | |
download | bitcoin-d0d256536cdfb1443067fb7cc0a19d647f636a5c.tar.xz |
Merge #21016: refactor: remove boost::thread_group usage
dc8be12510c2fd5a809d9a82d2c14b464b5e5a3f refactor: remove boost::thread_group usage (fanquake)
Pull request description:
Post #18710, there isn't much left using `boost::thread_group`, so should just be able to replace it with the standard library. This also removes the last use of `boost::thread_interrupted`.
After this change, last piece of Boost Thread we'd be using is `boost::shared_mutex`. See the commentary [here](https://github.com/bitcoin/bitcoin/issues/16684#issuecomment-726214696) as to why it may be non-trivial to swap that for `std::shared_mutex` in the near future.
Closes #17307
ACKs for top commit:
laanwj:
Code review re-ACK dc8be12510c2fd5a809d9a82d2c14b464b5e5a3f
MarcoFalke:
review ACK dc8be12510c2fd5a809d9a82d2c14b464b5e5a3f 🔁
jonatack:
Non-expert code review ACK dc8be12510c2fd5a809d9a82d2c14b464b5e5a3f, also checked range-diff since last review and that local debug build is clean with gcc 10.2.1-6 on Debian
Tree-SHA512: 5510e2d760cce824234207dc86b1551ca8f21cbf3a2ce753c0254a0d03ffd83c94e449aec202fb7bd76e6fc64df783a6b70a736b0add9ece3734bb9c8ce8fc2f
Diffstat (limited to 'src/util/system.h')
-rw-r--r-- | src/util/system.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/util/system.h b/src/util/system.h index 010fc5b49f..d06c30bfa7 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -35,8 +35,6 @@ #include <utility> #include <vector> -#include <boost/thread/condition_variable.hpp> // for boost::thread_interrupted - class UniValue; // Application startup time (used for uptime calculation) @@ -450,11 +448,6 @@ template <typename Callable> void TraceThread(const char* name, Callable func) func(); LogPrintf("%s thread exit\n", name); } - catch (const boost::thread_interrupted&) - { - LogPrintf("%s thread interrupt\n", name); - throw; - } catch (const std::exception& e) { PrintExceptionContinue(&e, name); throw; |