diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-08-04 23:40:23 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-08-06 13:22:59 +0200 |
commit | e3a74864a02d2ed362f7bfb82c5ce6068b908101 (patch) | |
tree | 14a9837ec23c4391ef84a99e6ff264684143be50 /sal | |
parent | toolkit: don't let ToolkitWorkerFunction join its own thread (diff) | |
download | core-e3a74864a02d2ed362f7bfb82c5ce6068b908101.tar.gz core-e3a74864a02d2ed362f7bfb82c5ce6068b908101.zip |
sal: make osl_joinWithThread() a little more consistent
If the Win32 implementation deadlocks on a self-join, at least assert in
the same situation on UNIX.
Change-Id: I1b9e3da95837d456e6933e8fd9a256869cb4bde9
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/unx/thread.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx index 3327229d8eb4..0b0316697d5c 100644 --- a/sal/osl/unx/thread.cxx +++ b/sal/osl/unx/thread.cxx @@ -438,6 +438,7 @@ void SAL_CALL osl_joinWithThread(oslThread Thread) if (pthread_equal (pthread_self(), pImpl->m_hThread)) { + assert(false); // Win32 implementation would deadlock here! /* self join */ pthread_mutex_unlock (&(pImpl->m_Lock)); return; /* EDEADLK */ |