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

wpiutil: SafeThread: Add thread id, support getting shared_ptr (#1722)

Browse Source 
Rename base class function from GetThread to GetThreadSharedPtr.
This commit is contained in:
Peter Johnson
2019-06-20 19:51:09 -07:00
committed by GitHub
parent 61426d08de
commit ee8a33c568
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpiutil/src/main/native/include/wpi/SafeThread.h
View File

@@ -27,6 +27,7 @@ class SafeThread {
mutable wpi::mutex m_mutex;
std::atomic_bool m_active{true};
wpi::condition_variable m_cond;
std::thread::id m_threadId;
};
namespace detail {
@@ -83,7 +84,7 @@ class SafeThreadOwnerBase {
protected:
void Start(std::shared_ptr<SafeThread> thr);
std::shared_ptr<SafeThread> GetThread() const;
std::shared_ptr<SafeThread> GetThreadSharedPtr() const;
private:
mutable wpi::mutex m_mutex;
@@ -107,7 +108,12 @@ class SafeThreadOwner : public detail::SafeThreadOwnerBase {
using Proxy = typename detail::SafeThreadProxy<T>;
Proxy GetThread() const {
return Proxy(detail::SafeThreadOwnerBase::GetThread());
return Proxy(detail::SafeThreadOwnerBase::GetThreadSharedPtr());
}
std::shared_ptr<T> GetThreadSharedPtr() const {
return std::static_pointer_cast<T>(
detail::SafeThreadOwnerBase::GetThreadSharedPtr());
}
};