#pragma once
+#include "os/general_protection_fault.h"
#include "except.h"
-#include "enum_class.h"
#include "log.h"
#include "blocking_bounded_queue_adapter.h"
+#include "blocking_priority_queue.h"
+#include "future.h"
#include <tbb/atomic.h>
#include <tbb/concurrent_priority_queue.h>
#include <boost/optional.hpp>
#include <functional>
+#include <future>
namespace caspar {
-struct task_priority_def
+enum class task_priority
{
- enum type
- {
- lowest_priority = 0,
- lower_priority,
- low_priority,
- normal_priority,
- high_priority,
- higher_priority
- };
+ lowest_priority = 0,
+ lower_priority,
+ low_priority,
+ normal_priority,
+ high_priority,
+ higher_priority
};
-typedef enum_class<task_priority_def> task_priority;
-class executor sealed
+class executor final
{
- struct priority_function
- {
- int priority;
- std::function<void()> func;
-
- priority_function()
- {
- }
-
- template<typename F>
- priority_function(int priority, F&& func)
- : priority(priority)
- , func(std::forward<F>(func))
- {
- }
-
- void operator()()
- {
- func();
- }
-
- bool operator<(const priority_function& other) const
- {
- return priority < other.priority;
- }
- };
-
executor(const executor&);
executor& operator=(const executor&);
- typedef blocking_bounded_queue_adapter<tbb::concurrent_priority_queue<priority_function>> function_queue_t;
+ typedef blocking_priority_queue<std::function<void()>, task_priority> function_queue_t;
const std::wstring name_;
tbb::atomic<bool> is_running_;
public:
executor(const std::wstring& name)
: name_(name)
- , execution_queue_(512)
+ , execution_queue_(512, std::vector<task_priority> {
+ task_priority::lowest_priority,
+ task_priority::lower_priority,
+ task_priority::low_priority,
+ task_priority::normal_priority,
+ task_priority::high_priority,
+ task_priority::higher_priority
+ })
{
is_running_ = true;
thread_ = boost::thread([this]{run();});
internal_begin_invoke([=]
{
is_running_ = false;
- }, false).wait();
+ }).wait();
}
catch(...)
{
thread_.join();
}
-
- template<typename Func>
- auto try_begin_invoke(Func&& func, task_priority priority = task_priority::normal_priority) -> boost::unique_future<decltype(func())>
- {
- if(!is_running_)
- BOOST_THROW_EXCEPTION(invalid_operation() << msg_info("executor not running."));
-
- // Will return uninitialized future if the try failed (get_state() will return future_state::uninitialized).
- return internal_begin_invoke(std::forward<Func>(func), true, priority);
- }
template<typename Func>
- auto begin_invoke(Func&& func, task_priority priority = task_priority::normal_priority) -> boost::unique_future<decltype(func())> // noexcept
+ auto begin_invoke(Func&& func, task_priority priority = task_priority::normal_priority) -> std::future<decltype(func())> // noexcept
{
if(!is_running_)
CASPAR_THROW_EXCEPTION(invalid_operation() << msg_info("executor not running.") << source_info(name_));
- return internal_begin_invoke(std::forward<Func>(func), false, priority);
+ return internal_begin_invoke(std::forward<Func>(func), priority);
}
template<typename Func>
return begin_invoke(std::forward<Func>(func), prioriy).get();
}
- void yield()
+ void yield(task_priority minimum_priority)
{
if(!is_current())
CASPAR_THROW_EXCEPTION(invalid_operation() << msg_info("Executor can only yield inside of thread context.") << source_info(name_));
- priority_function func;
- if(execution_queue_.try_pop(func))
+ std::function<void ()> func;
+
+ while (execution_queue_.try_pop(func, minimum_priority))
func();
}
{
return execution_queue_.capacity();
}
+
+ bool is_full() const
+ {
+ return execution_queue_.space_available() == 0;
+ }
void clear()
{
- priority_function func;
+ std::function<void ()> func;
while(execution_queue_.try_pop(func));
}
template<typename Func>
auto internal_begin_invoke(
Func&& func,
- bool try_begin,
- task_priority priority = task_priority::normal_priority) -> boost::unique_future<decltype(func())> // noexcept
+ task_priority priority = task_priority::normal_priority) -> std::future<decltype(func())> // noexcept
{
typedef typename std::remove_reference<Func>::type function_type;
typedef decltype(func()) result_type;
- typedef boost::packaged_task<result_type> task_type;
+ typedef std::packaged_task<result_type()> task_type;
- std::unique_ptr<task_type> task;
+ std::shared_ptr<task_type> task;
// Use pointers since the boost thread library doesn't fully support move semantics.
delete raw_func2;
throw;
}
-
- task->set_wait_callback(std::function<void(task_type&)>([=](task_type& my_task) // The std::function wrapper is required in order to add ::result_type to functor class.
- {
- try
- {
- if(is_current()) // Avoids potential deadlock.
- my_task();
- }
- catch(boost::task_already_started&){}
- }));
- auto future = task->get_future();
-
- auto raw_task = task.release();
- priority_function prio_func(priority.value(), [raw_task]
+ auto future = task->get_future().share();
+ auto function = [task]
{
- std::unique_ptr<task_type> task(raw_task);
try
{
(*task)();
}
- catch(boost::task_already_started&){}
- });
+ catch(std::future_error&){}
+ };
- if (!execution_queue_.try_push(prio_func))
+ if (!execution_queue_.try_push(priority, function))
{
- if (try_begin)
- {
- delete raw_task;
+ CASPAR_LOG(debug) << print() << L" Overflow. Blocking caller.";
+ execution_queue_.push(priority, function);
+ }
- return boost::unique_future<decltype(func())>();
- }
- else
+ return std::async(std::launch::deferred, [=]() mutable -> result_type
+ {
+ if (!is_ready(future) && is_current()) // Avoids potential deadlock.
{
- CASPAR_LOG(debug) << print() << L" Overflow. Blocking caller.";
- execution_queue_.push(prio_func);
+ function();
}
- }
- return std::move(future);
+ return future.get();
+ });
}
void run() // noexcept
{
- win32_exception::install_handler();
+ ensure_gpf_handler_installed_for_thread(u8(name_).c_str());
while(is_running_)
{
try
{
- priority_function func;
+ std::function<void ()> func;
execution_queue_.pop(func);
func();
}
}
};
-}
\ No newline at end of file
+}
projects / casparcg / blobdiff