mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #1364
f025198
Added task_region - a fork/join task implementation (Lee Clagett)
This commit is contained in:
commit
ce8a2315cf
8 changed files with 620 additions and 140 deletions
|
@ -33,6 +33,7 @@ set(common_sources
|
||||||
util.cpp
|
util.cpp
|
||||||
i18n.cpp
|
i18n.cpp
|
||||||
perf_timer.cpp
|
perf_timer.cpp
|
||||||
|
task_region.cpp
|
||||||
thread_group.cpp)
|
thread_group.cpp)
|
||||||
|
|
||||||
if (STACK_TRACE)
|
if (STACK_TRACE)
|
||||||
|
@ -57,6 +58,7 @@ set(common_private_headers
|
||||||
i18n.h
|
i18n.h
|
||||||
perf_timer.h
|
perf_timer.h
|
||||||
stack_trace.h
|
stack_trace.h
|
||||||
|
task_region.h
|
||||||
thread_group.h)
|
thread_group.h)
|
||||||
|
|
||||||
monero_private_headers(common
|
monero_private_headers(common
|
||||||
|
|
94
src/common/task_region.cpp
Normal file
94
src/common/task_region.cpp
Normal file
|
@ -0,0 +1,94 @@
|
||||||
|
// Copyright (c) 2014-2016, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
#include "common/task_region.h"
|
||||||
|
|
||||||
|
#include <boost/thread/locks.hpp>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
|
/* `mark_completed` and `wait` can throw in the lock call, but its difficult to
|
||||||
|
recover from either. An exception in `wait` means the post condition of joining
|
||||||
|
all threads cannot be achieved, and an exception in `mark_completed` means
|
||||||
|
certain deadlock. `noexcept` qualifier will force a call to `std::terminate` if
|
||||||
|
locking throws an exception, which should only happen if a recursive lock
|
||||||
|
attempt is made (which is not possible since no external function is called
|
||||||
|
while holding the lock). */
|
||||||
|
|
||||||
|
namespace tools
|
||||||
|
{
|
||||||
|
void task_region_handle::state::mark_completed(id task_id) noexcept {
|
||||||
|
assert(task_id != 0 && (task_id & (task_id - 1)) == 0); // power of 2 check
|
||||||
|
if (pending.fetch_and(~task_id) == task_id) {
|
||||||
|
// synchronize with wait call, but do not need to hold
|
||||||
|
boost::unique_lock<boost::mutex>{sync_on_complete};
|
||||||
|
all_complete.notify_all();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void task_region_handle::state::abort() noexcept {
|
||||||
|
state* current = this;
|
||||||
|
while (current) {
|
||||||
|
current->ready = 0;
|
||||||
|
current = current->next.get();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void task_region_handle::state::wait() noexcept {
|
||||||
|
state* current = this;
|
||||||
|
while (current) {
|
||||||
|
{
|
||||||
|
boost::unique_lock<boost::mutex> lock{current->sync_on_complete};
|
||||||
|
current->all_complete.wait(lock, [current] { return current->pending == 0; });
|
||||||
|
}
|
||||||
|
current = current->next.get();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void task_region_handle::state::wait(thread_group& threads) noexcept {
|
||||||
|
state* current = this;
|
||||||
|
while (current) {
|
||||||
|
while (current->pending != 0) {
|
||||||
|
if (!threads.try_run_one()) {
|
||||||
|
current->wait();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
current = current->next.get();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void task_region_handle::create_state() {
|
||||||
|
st = std::make_shared<state>(std::move(st));
|
||||||
|
next_id = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void task_region_handle::do_wait() noexcept {
|
||||||
|
assert(st);
|
||||||
|
const std::shared_ptr<state> temp = std::move(st);
|
||||||
|
temp->wait(threads);
|
||||||
|
}
|
||||||
|
}
|
223
src/common/task_region.h
Normal file
223
src/common/task_region.h
Normal file
|
@ -0,0 +1,223 @@
|
||||||
|
// Copyright (c) 2014-2016, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <atomic>
|
||||||
|
#include <boost/thread/condition_variable.hpp>
|
||||||
|
#include <boost/thread/mutex.hpp>
|
||||||
|
#include <memory>
|
||||||
|
#include <type_traits>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
#include "common/thread_group.h"
|
||||||
|
|
||||||
|
namespace tools
|
||||||
|
{
|
||||||
|
|
||||||
|
/*! A model of the fork-join concept. `run(...)` "forks" (i.e. spawns new
|
||||||
|
tasks), and `~task_region_handle()` or `wait()` "joins" the spawned tasks.
|
||||||
|
`wait` will block until all tasks have completed, while `~task_region_handle()`
|
||||||
|
blocks until all tasks have completed or aborted.
|
||||||
|
|
||||||
|
Do _NOT_ give this object to separate thread of execution (which includes
|
||||||
|
`task_region_handle::run(...)`) because joining on a different thread is
|
||||||
|
undesireable (potential deadlock).
|
||||||
|
|
||||||
|
This class cannot be constructed directly, use the function
|
||||||
|
`task_region(...)` instead.
|
||||||
|
*/
|
||||||
|
class task_region_handle
|
||||||
|
{
|
||||||
|
struct state
|
||||||
|
{
|
||||||
|
using id = unsigned;
|
||||||
|
|
||||||
|
explicit state(std::shared_ptr<state> next_src) noexcept
|
||||||
|
: next(std::move(next_src))
|
||||||
|
, ready(0)
|
||||||
|
, pending(0)
|
||||||
|
, sync_on_complete()
|
||||||
|
, all_complete() {
|
||||||
|
}
|
||||||
|
|
||||||
|
state(const state&) = default;
|
||||||
|
state(state&&) = default;
|
||||||
|
~state() = default;
|
||||||
|
state& operator=(const state&) = default;
|
||||||
|
state& operator=(state&&) = default;
|
||||||
|
|
||||||
|
void track_id(id task_id) noexcept {
|
||||||
|
pending |= task_id;
|
||||||
|
ready |= task_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
//! \return True only once whether a given id can execute
|
||||||
|
bool can_run(id task_id) noexcept {
|
||||||
|
return (ready.fetch_and(~task_id) & task_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
//! Mark id as completed, and synchronize with waiting threads
|
||||||
|
void mark_completed(id task_id) noexcept;
|
||||||
|
|
||||||
|
//! Tell all unstarted functions in region to return immediately
|
||||||
|
void abort() noexcept;
|
||||||
|
|
||||||
|
//! Blocks until all functions in region have aborted or completed.
|
||||||
|
void wait() noexcept;
|
||||||
|
|
||||||
|
//! Same as `wait()`, except `this_thread` runs tasks while waiting.
|
||||||
|
void wait(thread_group& threads) noexcept;
|
||||||
|
|
||||||
|
private:
|
||||||
|
/* This implementation is a bit pessimistic, it ensures that all copies
|
||||||
|
of a wrapped task can only be executed once. `thread_group` should never
|
||||||
|
do this, but some variable needs to track whether an abort should be done
|
||||||
|
anyway... */
|
||||||
|
std::shared_ptr<state> next;
|
||||||
|
std::atomic<id> ready; //!< Tracks whether a task has been invoked
|
||||||
|
std::atomic<id> pending; //!< Tracks when a task has completed or aborted
|
||||||
|
boost::mutex sync_on_complete;
|
||||||
|
boost::condition_variable all_complete;
|
||||||
|
};
|
||||||
|
|
||||||
|
template<typename F>
|
||||||
|
struct wrapper
|
||||||
|
{
|
||||||
|
wrapper(state::id id_src, std::shared_ptr<state> st_src, F f_src)
|
||||||
|
: task_id(id_src), st(std::move(st_src)), f(std::move(f_src)) {
|
||||||
|
}
|
||||||
|
|
||||||
|
wrapper(const wrapper&) = default;
|
||||||
|
wrapper(wrapper&&) = default;
|
||||||
|
wrapper& operator=(const wrapper&) = default;
|
||||||
|
wrapper& operator=(wrapper&&) = default;
|
||||||
|
|
||||||
|
void operator()() {
|
||||||
|
if (st) {
|
||||||
|
if (st->can_run(task_id)) {
|
||||||
|
f();
|
||||||
|
}
|
||||||
|
st->mark_completed(task_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
const state::id task_id;
|
||||||
|
std::shared_ptr<state> st;
|
||||||
|
F f;
|
||||||
|
};
|
||||||
|
|
||||||
|
public:
|
||||||
|
friend struct task_region_;
|
||||||
|
|
||||||
|
task_region_handle() = delete;
|
||||||
|
task_region_handle(const task_region_handle&) = delete;
|
||||||
|
task_region_handle(task_region_handle&&) = delete;
|
||||||
|
|
||||||
|
//! Cancels unstarted pending tasks, and waits for them to respond.
|
||||||
|
~task_region_handle() noexcept {
|
||||||
|
if (st) {
|
||||||
|
st->abort();
|
||||||
|
st->wait(threads);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task_region_handle& operator=(const task_region_handle&) = delete;
|
||||||
|
task_region_handle& operator=(task_region_handle&&) = delete;
|
||||||
|
|
||||||
|
/*! If the group has no threads, `f` is immediately run before returning.
|
||||||
|
Otherwise, `f` is dispatched to the thread_group associated with `this`
|
||||||
|
region. If `f` is dispatched to another thread, and it throws, the process
|
||||||
|
will immediately terminate. See std::packaged_task for getting exceptions on
|
||||||
|
functions executed on other threads. */
|
||||||
|
template<typename F>
|
||||||
|
void run(F&& f) {
|
||||||
|
if (threads.count() == 0) {
|
||||||
|
f();
|
||||||
|
} else {
|
||||||
|
if (!st || next_id == 0) {
|
||||||
|
create_state();
|
||||||
|
}
|
||||||
|
const state::id this_id = next_id;
|
||||||
|
next_id <<= 1;
|
||||||
|
|
||||||
|
st->track_id(this_id);
|
||||||
|
threads.dispatch(wrapper<F>{this_id, st, std::move(f)});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//! Wait until all functions provided to `run` have completed.
|
||||||
|
void wait() noexcept {
|
||||||
|
if (st) {
|
||||||
|
do_wait();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
explicit task_region_handle(thread_group& threads_src)
|
||||||
|
: st(nullptr), threads(threads_src), next_id(0) {
|
||||||
|
}
|
||||||
|
|
||||||
|
void create_state();
|
||||||
|
void do_wait() noexcept;
|
||||||
|
|
||||||
|
std::shared_ptr<state> st;
|
||||||
|
thread_group& threads;
|
||||||
|
state::id next_id;
|
||||||
|
};
|
||||||
|
|
||||||
|
/*! Function for creating a `task_region_handle`, which automatically calls
|
||||||
|
`task_region_handle::wait()` before returning. If a `thread_group` is not
|
||||||
|
provided, one is created with an optimal number of threads. The callback `f`
|
||||||
|
must have the signature `void(task_region_handle&)`. */
|
||||||
|
struct task_region_ {
|
||||||
|
template<typename F>
|
||||||
|
void operator()(thread_group& threads, F&& f) const {
|
||||||
|
static_assert(
|
||||||
|
std::is_same<void, typename std::result_of<F(task_region_handle&)>::type>::value,
|
||||||
|
"f cannot have a return value"
|
||||||
|
);
|
||||||
|
task_region_handle region{threads};
|
||||||
|
f(region);
|
||||||
|
region.wait();
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename F>
|
||||||
|
void operator()(thread_group&& threads, F&& f) const {
|
||||||
|
(*this)(threads, std::forward<F>(f));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename F>
|
||||||
|
void operator()(F&& f) const {
|
||||||
|
thread_group threads;
|
||||||
|
(*this)(threads, std::forward<F>(f));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr const task_region_ task_region{};
|
||||||
|
}
|
|
@ -27,6 +27,7 @@
|
||||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include "common/thread_group.h"
|
#include "common/thread_group.h"
|
||||||
|
|
||||||
|
#include <boost/thread/locks.hpp>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
@ -35,14 +36,20 @@
|
||||||
|
|
||||||
namespace tools
|
namespace tools
|
||||||
{
|
{
|
||||||
thread_group::thread_group(std::size_t count) : internal() {
|
std::size_t thread_group::optimal() {
|
||||||
static_assert(
|
static_assert(
|
||||||
std::numeric_limits<unsigned>::max() <= std::numeric_limits<std::size_t>::max(),
|
std::numeric_limits<unsigned>::max() <= std::numeric_limits<std::size_t>::max(),
|
||||||
"unexpected truncation"
|
"unexpected truncation"
|
||||||
);
|
);
|
||||||
count = std::min<std::size_t>(count, get_max_concurrency());
|
const std::size_t hardware = get_max_concurrency();
|
||||||
count = count ? count - 1 : 0;
|
return hardware ? (hardware - 1) : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::size_t thread_group::optimal_with_max(std::size_t count) {
|
||||||
|
return count ? std::min(count - 1, optimal()) : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
thread_group::thread_group(std::size_t count) : internal() {
|
||||||
if (count) {
|
if (count) {
|
||||||
internal.emplace(count);
|
internal.emplace(count);
|
||||||
}
|
}
|
||||||
|
@ -52,24 +59,21 @@ thread_group::data::data(std::size_t count)
|
||||||
: threads()
|
: threads()
|
||||||
, head{nullptr}
|
, head{nullptr}
|
||||||
, last(std::addressof(head))
|
, last(std::addressof(head))
|
||||||
, pending(count)
|
|
||||||
, mutex()
|
, mutex()
|
||||||
, has_work()
|
, has_work()
|
||||||
, finished_work()
|
|
||||||
, stop(false) {
|
, stop(false) {
|
||||||
threads.reserve(count);
|
threads.reserve(count);
|
||||||
while (count--) {
|
while (count--) {
|
||||||
threads.push_back(std::thread(&thread_group::data::run, this));
|
threads.push_back(boost::thread(&thread_group::data::run, this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
thread_group::data::~data() noexcept {
|
thread_group::data::~data() noexcept {
|
||||||
{
|
{
|
||||||
const std::unique_lock<std::mutex> lock(mutex);
|
const boost::unique_lock<boost::mutex> lock(mutex);
|
||||||
stop = true;
|
stop = true;
|
||||||
}
|
}
|
||||||
has_work.notify_all();
|
has_work.notify_all();
|
||||||
finished_work.notify_all();
|
|
||||||
for (auto& worker : threads) {
|
for (auto& worker : threads) {
|
||||||
try {
|
try {
|
||||||
worker.join();
|
worker.join();
|
||||||
|
@ -78,42 +82,6 @@ thread_group::data::~data() noexcept {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void thread_group::data::sync() noexcept {
|
|
||||||
/* This function and `run()` can both throw when acquiring the lock, or in
|
|
||||||
the dispatched function. It is tough to recover from either, particularly the
|
|
||||||
lock case. These functions are marked as noexcept so that if either call
|
|
||||||
throws, the entire process is terminated. Users of the `dispatch` call are
|
|
||||||
expected to make their functions noexcept, or use std::packaged_task to copy
|
|
||||||
exceptions so that the process will continue in all but the most pessimistic
|
|
||||||
cases (std::bad_alloc). This was the existing behavior;
|
|
||||||
`asio::io_service::run` propogates errors from dispatched calls, and uncaught
|
|
||||||
exceptions on threads result in process termination. */
|
|
||||||
assert(!threads.empty());
|
|
||||||
bool not_first = false;
|
|
||||||
while (true) {
|
|
||||||
std::unique_ptr<work> next = nullptr;
|
|
||||||
{
|
|
||||||
std::unique_lock<std::mutex> lock(mutex);
|
|
||||||
pending -= std::size_t(not_first);
|
|
||||||
not_first = true;
|
|
||||||
finished_work.notify_all();
|
|
||||||
|
|
||||||
if (stop) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
next = get_next();
|
|
||||||
if (next == nullptr) {
|
|
||||||
finished_work.wait(lock, [this] { return pending == 0 || stop; });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
assert(next->f);
|
|
||||||
next->f();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::unique_ptr<thread_group::data::work> thread_group::data::get_next() noexcept {
|
std::unique_ptr<thread_group::data::work> thread_group::data::get_next() noexcept {
|
||||||
std::unique_ptr<work> rc = std::move(head.ptr);
|
std::unique_ptr<work> rc = std::move(head.ptr);
|
||||||
if (rc != nullptr) {
|
if (rc != nullptr) {
|
||||||
|
@ -125,14 +93,35 @@ std::unique_ptr<thread_group::data::work> thread_group::data::get_next() noexcep
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool thread_group::data::try_run_one() noexcept {
|
||||||
|
/* This function and `run()` can both throw when acquiring the lock, or in
|
||||||
|
dispatched function. It is tough to recover from either, particularly the
|
||||||
|
lock case. These functions are marked as noexcept so that if either call
|
||||||
|
throws, the entire process is terminated. Users of the `dispatch` call are
|
||||||
|
expected to make their functions noexcept, or use std::packaged_task to copy
|
||||||
|
exceptions so that the process will continue in all but the most pessimistic
|
||||||
|
cases (std::bad_alloc). This was the existing behavior;
|
||||||
|
`asio::io_service::run` propogates errors from dispatched calls, and uncaught
|
||||||
|
exceptions on threads result in process termination. */
|
||||||
|
std::unique_ptr<work> next = nullptr;
|
||||||
|
{
|
||||||
|
const boost::unique_lock<boost::mutex> lock(mutex);
|
||||||
|
next = get_next();
|
||||||
|
}
|
||||||
|
if (next) {
|
||||||
|
assert(next->f);
|
||||||
|
next->f();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void thread_group::data::run() noexcept {
|
void thread_group::data::run() noexcept {
|
||||||
// see `sync()` source for additional information
|
// see `try_run_one()` source for additional information
|
||||||
while (true) {
|
while (true) {
|
||||||
std::unique_ptr<work> next = nullptr;
|
std::unique_ptr<work> next = nullptr;
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> lock(mutex);
|
boost::unique_lock<boost::mutex> lock(mutex);
|
||||||
--pending;
|
|
||||||
finished_work.notify_all();
|
|
||||||
has_work.wait(lock, [this] { return head.ptr != nullptr || stop; });
|
has_work.wait(lock, [this] { return head.ptr != nullptr || stop; });
|
||||||
if (stop) {
|
if (stop) {
|
||||||
return;
|
return;
|
||||||
|
@ -149,15 +138,12 @@ void thread_group::data::dispatch(std::function<void()> f) {
|
||||||
std::unique_ptr<work> latest(new work{std::move(f), node{nullptr}});
|
std::unique_ptr<work> latest(new work{std::move(f), node{nullptr}});
|
||||||
node* const latest_node = std::addressof(latest->next);
|
node* const latest_node = std::addressof(latest->next);
|
||||||
{
|
{
|
||||||
const std::unique_lock<std::mutex> lock(mutex);
|
const boost::unique_lock<boost::mutex> lock(mutex);
|
||||||
assert(last != nullptr);
|
assert(last != nullptr);
|
||||||
assert(last->ptr == nullptr);
|
assert(last->ptr == nullptr);
|
||||||
if (pending == std::numeric_limits<std::size_t>::max()) {
|
|
||||||
throw std::overflow_error("thread_group exceeded max queue depth");
|
|
||||||
}
|
|
||||||
last->ptr = std::move(latest);
|
last->ptr = std::move(latest);
|
||||||
last = latest_node;
|
last = latest_node;
|
||||||
++pending;
|
|
||||||
}
|
}
|
||||||
has_work.notify_one();
|
has_work.notify_one();
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,8 +25,12 @@
|
||||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#include <boost/optional/optional.hpp>
|
#include <boost/optional/optional.hpp>
|
||||||
#include <condition_variable>
|
#include <boost/thread/condition_variable.hpp>
|
||||||
|
#include <boost/thread/mutex.hpp>
|
||||||
|
#include <boost/thread/thread.hpp>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
@ -35,11 +39,21 @@
|
||||||
|
|
||||||
namespace tools
|
namespace tools
|
||||||
{
|
{
|
||||||
//! Manages zero or more threads for work dispatching
|
//! Manages zero or more threads for work dispatching.
|
||||||
class thread_group
|
class thread_group
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
//! Create `min(count, get_max_concurrency()) - 1` threads
|
|
||||||
|
//! \return `get_max_concurrency() ? get_max_concurrency() - 1 : 0`
|
||||||
|
static std::size_t optimal();
|
||||||
|
|
||||||
|
//! \return `count ? min(count - 1, optimal()) : 0`
|
||||||
|
static std::size_t optimal_with_max(std::size_t count);
|
||||||
|
|
||||||
|
//! Create an optimal number of threads.
|
||||||
|
explicit thread_group() : thread_group(optimal()) {}
|
||||||
|
|
||||||
|
//! Create exactly `count` threads.
|
||||||
explicit thread_group(std::size_t count);
|
explicit thread_group(std::size_t count);
|
||||||
|
|
||||||
thread_group(thread_group const&) = delete;
|
thread_group(thread_group const&) = delete;
|
||||||
|
@ -51,30 +65,26 @@ public:
|
||||||
thread_group& operator=(thread_group const&) = delete;
|
thread_group& operator=(thread_group const&) = delete;
|
||||||
thread_group& operator=(thread_group&&) = delete;
|
thread_group& operator=(thread_group&&) = delete;
|
||||||
|
|
||||||
/*! Blocks until all functions provided to `dispatch` complete. Does not
|
//! \return Number of threads owned by `this` group.
|
||||||
destroy threads. If a dispatched function calls `this->dispatch(...)`,
|
std::size_t count() const noexcept {
|
||||||
`this->sync()` will continue to block until that new function completes. */
|
|
||||||
void sync() noexcept {
|
|
||||||
if (internal) {
|
if (internal) {
|
||||||
internal->sync();
|
return internal->count();
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Example usage:
|
//! \return True iff a function was available and executed (on `this_thread`).
|
||||||
std::unique_ptr<thread_group, thread_group::lazy_sync> sync(std::addressof(group));
|
bool try_run_one() noexcept {
|
||||||
which guarantees synchronization before the unique_ptr destructor returns. */
|
if (internal) {
|
||||||
struct lazy_sync {
|
return internal->try_run_one();
|
||||||
void operator()(thread_group* group) const noexcept {
|
|
||||||
if (group != nullptr) {
|
|
||||||
group->sync();
|
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
/*! `f` is invoked immediately if the thread_group is empty, otherwise
|
/*! `f` is invoked immediately if `count() == 0`, otherwise execution of `f`
|
||||||
execution of `f` is queued for next available thread. If `f` is queued, any
|
is queued for next available thread. If `f` is queued, any exception leaving
|
||||||
exception leaving that function will result in process termination. Use
|
that function will result in process termination. Use std::packaged_task if
|
||||||
std::packaged_task if exceptions need to be handled. */
|
exceptions need to be handled. */
|
||||||
template<typename F>
|
template<typename F>
|
||||||
void dispatch(F&& f) {
|
void dispatch(F&& f) {
|
||||||
if (internal) {
|
if (internal) {
|
||||||
|
@ -91,8 +101,11 @@ private:
|
||||||
data(std::size_t count);
|
data(std::size_t count);
|
||||||
~data() noexcept;
|
~data() noexcept;
|
||||||
|
|
||||||
void sync() noexcept;
|
std::size_t count() const noexcept {
|
||||||
|
return threads.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool try_run_one() noexcept;
|
||||||
void dispatch(std::function<void()> f);
|
void dispatch(std::function<void()> f);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -116,13 +129,11 @@ private:
|
||||||
void run() noexcept;
|
void run() noexcept;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::vector<std::thread> threads;
|
std::vector<boost::thread> threads;
|
||||||
node head;
|
node head;
|
||||||
node* last;
|
node* last;
|
||||||
std::size_t pending;
|
boost::condition_variable has_work;
|
||||||
std::condition_variable has_work;
|
boost::mutex mutex;
|
||||||
std::condition_variable finished_work;
|
|
||||||
std::mutex mutex;
|
|
||||||
bool stop;
|
bool stop;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -130,4 +141,5 @@ private:
|
||||||
// optionally construct elements, without separate heap allocation
|
// optionally construct elements, without separate heap allocation
|
||||||
boost::optional<data> internal;
|
boost::optional<data> internal;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
#include "misc_log_ex.h"
|
#include "misc_log_ex.h"
|
||||||
#include "common/perf_timer.h"
|
#include "common/perf_timer.h"
|
||||||
|
#include "common/task_region.h"
|
||||||
#include "common/thread_group.h"
|
#include "common/thread_group.h"
|
||||||
#include "common/util.h"
|
#include "common/util.h"
|
||||||
#include "rctSigs.h"
|
#include "rctSigs.h"
|
||||||
|
@ -39,22 +40,6 @@ using namespace crypto;
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
namespace rct {
|
namespace rct {
|
||||||
namespace {
|
|
||||||
struct verRangeWrapper_ {
|
|
||||||
void operator()(const key & C, const rangeSig & as, bool &result) const {
|
|
||||||
result = verRange(C, as);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
constexpr const verRangeWrapper_ verRangeWrapper{};
|
|
||||||
|
|
||||||
struct verRctMGSimpleWrapper_ {
|
|
||||||
void operator()(const key &message, const mgSig &mg, const ctkeyV & pubs, const key & C, bool &result) const {
|
|
||||||
result = verRctMGSimple(message, mg, pubs, C);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
constexpr const verRctMGSimpleWrapper_ verRctMGSimpleWrapper{};
|
|
||||||
}
|
|
||||||
|
|
||||||
//Schnorr Non-linkable
|
//Schnorr Non-linkable
|
||||||
//Gen Gives a signature (L1, s1, s2) proving that the sender knows "x" such that xG = one of P1 or P2
|
//Gen Gives a signature (L1, s1, s2) proving that the sender knows "x" such that xG = one of P1 or P2
|
||||||
//Ver Verifies that signer knows an "x" such that xG = one of P1 or P2
|
//Ver Verifies that signer knows an "x" such that xG = one of P1 or P2
|
||||||
|
@ -766,15 +751,17 @@ namespace rct {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::deque<bool> results(rv.outPk.size(), false);
|
std::deque<bool> results(rv.outPk.size(), false);
|
||||||
tools::thread_group threadpool(rv.outPk.size()); // this must destruct before results
|
tools::thread_group threadpool(tools::thread_group::optimal_with_max(rv.outPk.size()));
|
||||||
|
|
||||||
|
tools::task_region(threadpool, [&] (tools::task_region_handle& region) {
|
||||||
DP("range proofs verified?");
|
DP("range proofs verified?");
|
||||||
for (size_t i = 0; i < rv.outPk.size(); i++) {
|
for (size_t i = 0; i < rv.outPk.size(); i++) {
|
||||||
threadpool.dispatch(
|
region.run([&, i] {
|
||||||
std::bind(verRangeWrapper, std::cref(rv.outPk[i].mask), std::cref(rv.p.rangeSigs[i]), std::ref(results[i]))
|
results[i] = verRange(rv.outPk[i].mask, rv.p.rangeSigs[i]);
|
||||||
);
|
});
|
||||||
}
|
}
|
||||||
threadpool.sync();
|
});
|
||||||
|
|
||||||
for (size_t i = 0; i < rv.outPk.size(); ++i) {
|
for (size_t i = 0; i < rv.outPk.size(); ++i) {
|
||||||
if (!results[i]) {
|
if (!results[i]) {
|
||||||
LOG_ERROR("Range proof verified failed for input " << i);
|
LOG_ERROR("Range proof verified failed for input " << i);
|
||||||
|
@ -804,7 +791,6 @@ namespace rct {
|
||||||
//assumes only post-rct style inputs (at least for max anonymity)
|
//assumes only post-rct style inputs (at least for max anonymity)
|
||||||
bool verRctSimple(const rctSig & rv) {
|
bool verRctSimple(const rctSig & rv) {
|
||||||
PERF_TIMER(verRctSimple);
|
PERF_TIMER(verRctSimple);
|
||||||
size_t i = 0;
|
|
||||||
|
|
||||||
CHECK_AND_ASSERT_MES(rv.type == RCTTypeSimple, false, "verRctSimple called on non simple rctSig");
|
CHECK_AND_ASSERT_MES(rv.type == RCTTypeSimple, false, "verRctSimple called on non simple rctSig");
|
||||||
CHECK_AND_ASSERT_MES(rv.outPk.size() == rv.p.rangeSigs.size(), false, "Mismatched sizes of outPk and rv.p.rangeSigs");
|
CHECK_AND_ASSERT_MES(rv.outPk.size() == rv.p.rangeSigs.size(), false, "Mismatched sizes of outPk and rv.p.rangeSigs");
|
||||||
|
@ -813,28 +799,29 @@ namespace rct {
|
||||||
CHECK_AND_ASSERT_MES(rv.pseudoOuts.size() == rv.mixRing.size(), false, "Mismatched sizes of rv.pseudoOuts and mixRing");
|
CHECK_AND_ASSERT_MES(rv.pseudoOuts.size() == rv.mixRing.size(), false, "Mismatched sizes of rv.pseudoOuts and mixRing");
|
||||||
|
|
||||||
const size_t threads = std::max(rv.outPk.size(), rv.mixRing.size());
|
const size_t threads = std::max(rv.outPk.size(), rv.mixRing.size());
|
||||||
tools::thread_group threadpool(threads);
|
|
||||||
{
|
std::deque<bool> results(threads);
|
||||||
std::deque<bool> results(rv.outPk.size(), false);
|
tools::thread_group threadpool(tools::thread_group::optimal_with_max(threads));
|
||||||
{
|
|
||||||
const std::unique_ptr<tools::thread_group, tools::thread_group::lazy_sync>
|
results.clear();
|
||||||
sync(std::addressof(threadpool));
|
results.resize(rv.outPk.size());
|
||||||
for (i = 0; i < rv.outPk.size(); i++) {
|
tools::task_region(threadpool, [&] (tools::task_region_handle& region) {
|
||||||
threadpool.dispatch(
|
for (size_t i = 0; i < rv.outPk.size(); i++) {
|
||||||
std::bind(verRangeWrapper, std::cref(rv.outPk[i].mask), std::cref(rv.p.rangeSigs[i]), std::ref(results[i]))
|
region.run([&, i] {
|
||||||
);
|
results[i] = verRange(rv.outPk[i].mask, rv.p.rangeSigs[i]);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
} // threadpool.sync();
|
});
|
||||||
for (size_t i = 0; i < rv.outPk.size(); ++i) {
|
|
||||||
|
for (size_t i = 0; i < results.size(); ++i) {
|
||||||
if (!results[i]) {
|
if (!results[i]) {
|
||||||
LOG_ERROR("Range proof verified failed for input " << i);
|
LOG_ERROR("Range proof verified failed for input " << i);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
key sumOutpks = identity();
|
key sumOutpks = identity();
|
||||||
for (i = 0; i < rv.outPk.size(); i++) {
|
for (size_t i = 0; i < rv.outPk.size(); i++) {
|
||||||
addKeys(sumOutpks, sumOutpks, rv.outPk[i].mask);
|
addKeys(sumOutpks, sumOutpks, rv.outPk[i].mask);
|
||||||
}
|
}
|
||||||
DP(sumOutpks);
|
DP(sumOutpks);
|
||||||
|
@ -843,27 +830,25 @@ namespace rct {
|
||||||
|
|
||||||
key message = get_pre_mlsag_hash(rv);
|
key message = get_pre_mlsag_hash(rv);
|
||||||
|
|
||||||
{
|
results.clear();
|
||||||
std::deque<bool> results(rv.mixRing.size(), false);
|
results.resize(rv.mixRing.size());
|
||||||
{
|
tools::task_region(threadpool, [&] (tools::task_region_handle& region) {
|
||||||
const std::unique_ptr<tools::thread_group, tools::thread_group::lazy_sync>
|
for (size_t i = 0 ; i < rv.mixRing.size() ; i++) {
|
||||||
sync(std::addressof(threadpool));
|
region.run([&, i] {
|
||||||
for (i = 0 ; i < rv.mixRing.size() ; i++) {
|
results[i] = verRctMGSimple(message, rv.p.MGs[i], rv.mixRing[i], rv.pseudoOuts[i]);
|
||||||
threadpool.dispatch(
|
});
|
||||||
std::bind(verRctMGSimpleWrapper, std::cref(message), std::cref(rv.p.MGs[i]), std::cref(rv.mixRing[i]), std::cref(rv.pseudoOuts[i]), std::ref(results[i]))
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
} // threadpool.sync();
|
});
|
||||||
|
|
||||||
for (size_t i = 0; i < results.size(); ++i) {
|
for (size_t i = 0; i < results.size(); ++i) {
|
||||||
if (!results[i]) {
|
if (!results[i]) {
|
||||||
LOG_ERROR("verRctMGSimple failed for input " << i);
|
LOG_ERROR("verRctMGSimple failed for input " << i);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
key sumPseudoOuts = identity();
|
key sumPseudoOuts = identity();
|
||||||
for (i = 0 ; i < rv.mixRing.size() ; i++) {
|
for (size_t i = 0 ; i < rv.mixRing.size() ; i++) {
|
||||||
addKeys(sumPseudoOuts, sumPseudoOuts, rv.pseudoOuts[i]);
|
addKeys(sumPseudoOuts, sumPseudoOuts, rv.pseudoOuts[i]);
|
||||||
}
|
}
|
||||||
DP(sumPseudoOuts);
|
DP(sumPseudoOuts);
|
||||||
|
|
|
@ -50,6 +50,7 @@ set(unit_tests_sources
|
||||||
test_format_utils.cpp
|
test_format_utils.cpp
|
||||||
test_peerlist.cpp
|
test_peerlist.cpp
|
||||||
test_protocol_pack.cpp
|
test_protocol_pack.cpp
|
||||||
|
thread_group.cpp
|
||||||
hardfork.cpp
|
hardfork.cpp
|
||||||
unbound.cpp
|
unbound.cpp
|
||||||
varint.cpp
|
varint.cpp
|
||||||
|
|
177
tests/unit_tests/thread_group.cpp
Normal file
177
tests/unit_tests/thread_group.cpp
Normal file
|
@ -0,0 +1,177 @@
|
||||||
|
// Copyright (c) 2014-2016, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
|
#include <atomic>
|
||||||
|
#include "common/task_region.h"
|
||||||
|
#include "common/thread_group.h"
|
||||||
|
|
||||||
|
TEST(ThreadGroup, NoThreads)
|
||||||
|
{
|
||||||
|
tools::task_region(tools::thread_group(0), [] (tools::task_region_handle& region) {
|
||||||
|
std::atomic<bool> completed{false};
|
||||||
|
region.run([&] { completed = true; });
|
||||||
|
EXPECT_TRUE(completed);
|
||||||
|
});
|
||||||
|
{
|
||||||
|
tools::thread_group group(0);
|
||||||
|
std::atomic<bool> completed{false};
|
||||||
|
group.dispatch([&] { completed = true; });
|
||||||
|
EXPECT_TRUE(completed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(ThreadGroup, OneThread)
|
||||||
|
{
|
||||||
|
tools::thread_group group(1);
|
||||||
|
|
||||||
|
for (unsigned i = 0; i < 3; ++i) {
|
||||||
|
std::atomic<bool> completed{false};
|
||||||
|
tools::task_region(group, [&] (tools::task_region_handle& region) {
|
||||||
|
region.run([&] { completed = true; });
|
||||||
|
});
|
||||||
|
EXPECT_TRUE(completed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
TEST(ThreadGroup, UseActiveThreadOnSync)
|
||||||
|
{
|
||||||
|
tools::thread_group group(1);
|
||||||
|
|
||||||
|
for (unsigned i = 0; i < 3; ++i) {
|
||||||
|
std::atomic<bool> completed{false};
|
||||||
|
tools::task_region(group, [&] (tools::task_region_handle& region) {
|
||||||
|
region.run([&] { while (!completed); });
|
||||||
|
region.run([&] { completed = true; });
|
||||||
|
});
|
||||||
|
EXPECT_TRUE(completed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(ThreadGroup, InOrder)
|
||||||
|
{
|
||||||
|
tools::thread_group group(1);
|
||||||
|
|
||||||
|
for (unsigned i = 0; i < 3; ++i) {
|
||||||
|
std::atomic<unsigned> count{0};
|
||||||
|
std::atomic<bool> completed{false};
|
||||||
|
tools::task_region(group, [&] (tools::task_region_handle& region) {
|
||||||
|
region.run([&] { while (!completed); });
|
||||||
|
region.run([&] { if (count == 0) completed = true; });
|
||||||
|
region.run([&] { ++count; });
|
||||||
|
});
|
||||||
|
EXPECT_TRUE(completed);
|
||||||
|
EXPECT_EQ(1u, count);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(ThreadGroup, TwoThreads)
|
||||||
|
{
|
||||||
|
tools::thread_group group(2);
|
||||||
|
|
||||||
|
for (unsigned i = 0; i < 3; ++i) {
|
||||||
|
std::atomic<bool> completed{false};
|
||||||
|
tools::task_region(group, [&] (tools::task_region_handle& region) {
|
||||||
|
region.run([&] { while (!completed); });
|
||||||
|
region.run([&] { while (!completed); });
|
||||||
|
region.run([&] { completed = true; });
|
||||||
|
});
|
||||||
|
EXPECT_TRUE(completed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(ThreadGroup, Nested) {
|
||||||
|
struct fib {
|
||||||
|
unsigned operator()(tools::thread_group& group, unsigned value) const {
|
||||||
|
if (value == 0 || value == 1) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
unsigned left = 0;
|
||||||
|
unsigned right = 0;
|
||||||
|
tools::task_region(group, [&, value] (tools::task_region_handle& region) {
|
||||||
|
region.run([&, value] { left = fib{}(group, value - 1); });
|
||||||
|
region.run([&, value] { right = fib{}(group, value - 2); } );
|
||||||
|
});
|
||||||
|
return left + right;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned operator()(tools::thread_group&& group, unsigned value) const {
|
||||||
|
return (*this)(group, value);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
// be careful of depth on asynchronous version
|
||||||
|
EXPECT_EQ(6765, fib{}(tools::thread_group(0), 20));
|
||||||
|
EXPECT_EQ(377, fib{}(tools::thread_group(1), 14));
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(ThreadGroup, Many)
|
||||||
|
{
|
||||||
|
tools::thread_group group(1);
|
||||||
|
|
||||||
|
for (unsigned i = 0; i < 3; ++i) {
|
||||||
|
std::atomic<unsigned> count{0};
|
||||||
|
tools::task_region(group, [&] (tools::task_region_handle& region) {
|
||||||
|
for (unsigned tasks = 0; tasks < 1000; ++tasks) {
|
||||||
|
region.run([&] { ++count; });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
EXPECT_EQ(1000u, count);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(ThreadGroup, ThrowInTaskRegion)
|
||||||
|
{
|
||||||
|
class test_exception final : std::exception {
|
||||||
|
public:
|
||||||
|
explicit test_exception() : std::exception() {}
|
||||||
|
|
||||||
|
virtual const char* what() const noexcept override {
|
||||||
|
return "test_exception";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
tools::thread_group group(1);
|
||||||
|
|
||||||
|
for (unsigned i = 0; i < 3; ++i) {
|
||||||
|
std::atomic<unsigned> count{0};
|
||||||
|
EXPECT_THROW(
|
||||||
|
[&] {
|
||||||
|
tools::task_region(group, [&] (tools::task_region_handle& region) {
|
||||||
|
for (unsigned tasks = 0; tasks < 1000; ++tasks) {
|
||||||
|
region.run([&] { ++count; });
|
||||||
|
}
|
||||||
|
throw test_exception();
|
||||||
|
});
|
||||||
|
}(),
|
||||||
|
test_exception
|
||||||
|
);
|
||||||
|
EXPECT_GE(1000u, count);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue