Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

uv::Async, uv::AsyncFunction: allow calling from within loop

Browse Source
This commit is contained in:
Peter Johnson
2018-10-06 09:14:55 -07:00
parent 172e438cd6
commit 7c1a7332e1
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wpiutil/src/main/native/include/wpi/uv/AsyncFunction.h
View File

@@ -13,6 +13,7 @@
#include <functional>
#include <memory>
#include <thread>
#include <tuple>
#include <utility>
#include <vector>
@@ -112,7 +113,7 @@ class AsyncFunction<R(T...)> final
* Wakeup the event loop, call the async function, and return a future for
* the result.
*
* It’s safe to call this function from any thread EXCEPT the loop thread.
* It’s safe to call this function from any thread including the loop thread.
* The async function will be called on the loop thread.
*
* The future will return a default-constructed result if this handle is
@@ -123,6 +124,13 @@ class AsyncFunction<R(T...)> final
// create the future
uint64_t req = m_promises.CreateRequest();
auto loop = m_loop.lock();
if (loop && loop->GetThreadId() == std::this_thread::get_id()) {
// called from within the loop, just call the function directly
wakeup(m_promises.CreatePromise(req), std::forward<U>(u)...);
return m_promises.CreateFuture(req);
}
// add the parameters to the input queue
{
std::lock_guard<wpi::mutex> lock(m_mutex);
@@ -132,7 +140,7 @@ class AsyncFunction<R(T...)> final
}
// signal the loop
if (auto loop = m_loop.lock()) this->Invoke(&uv_async_send, this->GetRaw());
if (loop) this->Invoke(&uv_async_send, this->GetRaw());
// return future
return m_promises.CreateFuture(req);