boost/interprocess
2
0
Fork 0
mirror of https://github.com/boostorg/interprocess.git synced 2026-01-26 18:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'KhabarlakKonstantin-named_condition_deadlock' into develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2018-12-02 12:27:40 +01:00
parent 4e2c06b242 296d03858c
commit 5ceeb2b370
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/boost/interprocess/sync/spin/mutex.hpp
View File

@@ -64,7 +64,21 @@ inline spin_mutex::~spin_mutex()
}
inline void spin_mutex::lock(void)
{ return ipcdetail::try_based_lock(*this); }
{
#ifdef BOOST_INTERPROCESS_ENABLE_TIMEOUT_WHEN_LOCKING
boost::posix_time::ptime wait_time
= microsec_clock::universal_time()
+ boost::posix_time::milliseconds(BOOST_INTERPROCESS_TIMEOUT_WHEN_LOCKING_DURATION_MS);
if (!timed_lock(wait_time))
{
throw interprocess_exception(timeout_when_locking_error
, "Interprocess mutex timeout when locking. Possible deadlock: "
"owner died without unlocking?");
}
#else
return ipcdetail::try_based_lock(*this);
#endif
}
inline bool spin_mutex::try_lock(void)
{