Avoid implicit Handle(pthread_t) -> ThreadId(int) -> InternalId(pthread_t) conversions that does not work properly (it mangles the value on my Linux box, causing deadlocks in exactly the same place that was fixed by PR #8403)

Author: dyemanov

src/common/ThreadStart.cpp

@@ -219,19 +219,15 @@ ThreadId Thread::getId()
 #endif
 }
 
-ThreadId Thread::getIdFromHandle(Handle threadHandle)
+bool Thread::isCurrent(Handle threadHandle)
 {
-	return threadHandle;
-}
-
-bool Thread::isCurrent(InternalId iid)
-{
-	return pthread_equal(iid, pthread_self());
+	static_assert(std::is_same<Handle, InternalId>().value, "type mismatch");
+	return pthread_equal(threadHandle, pthread_self());
 }
 
 bool Thread::isCurrent()
 {
-	return isCurrent(internalId);
+	return pthread_equal(internalId, pthread_self());
 }
 
 void Thread::sleep(unsigned milliseconds)
@@ -373,19 +369,14 @@ ThreadId Thread::getId()
 	return GetCurrentThreadId();
 }
 
-ThreadId Thread::getIdFromHandle(Handle threadHandle)
+bool Thread::isCurrent(Handle threadHandle)
 {
-	return GetThreadId(threadHandle);
-}
-
-bool Thread::isCurrent(InternalId iid)
-{
-	return GetCurrentThreadId() == iid;
+	return GetCurrentThreadId() == GetThreadId(threadHandle);
 }
 
 bool Thread::isCurrent()
 {
-	return isCurrent(internalId);
+	return GetCurrentThreadId() == internalId;
 }
 
 void Thread::sleep(unsigned milliseconds)
@@ -430,10 +421,6 @@ Thread::Handle Thread::getId()
 {
 }
 
-Thread::Handle Thread::getIdFromHandle(Handle)
-{
-}
-
 void Thread::sleep(unsigned milliseconds)
 {
 }

src/common/ThreadStart.h

@@ -83,12 +83,11 @@ class Thread
 	static void kill(Handle& handle);
 
 	static ThreadId getId();
-	static ThreadId getIdFromHandle(Handle threadHandle);
 
 	static void sleep(unsigned milliseconds);
 	static void yield();
 
-	static bool isCurrent(InternalId iid);
+	static bool isCurrent(Handle threadHandle);
 	bool isCurrent();
 
 	Thread()

src/jrd/jrd.cpp

@@ -7830,8 +7830,8 @@ void release_attachment(thread_db* tdbb, Jrd::Attachment* attachment, XThreadEns
 	XThreadEnsureUnlock* activeThreadGuard = dropGuard;
 	if (!activeThreadGuard)
 	{
-		if (dbb->dbb_crypto_manager
-			&& Thread::isCurrent(Thread::getIdFromHandle(dbb->dbb_crypto_manager->getCryptThreadHandle())))
+		if (dbb->dbb_crypto_manager &&
+			Thread::isCurrent(dbb->dbb_crypto_manager->getCryptThreadHandle()))
 		{
 			activeThreadGuard = &dummyGuard;
 		}