Index: libcfa/src/concurrency/locks.hfa
===================================================================
--- libcfa/src/concurrency/locks.hfa	(revision 2dcd80a064f6154cf7aad118ffd2a53fa127cab5)
+++ libcfa/src/concurrency/locks.hfa	(revision 93e060361b71909eb41dddaff08c17a913a7b99e)
@@ -38,4 +38,7 @@
 #include <unistd.h>
 
+// undef to make a number of the locks not reacquire upon waking from a condlock
+#define REACQ 1
+
 //-----------------------------------------------------------------------------
 // Semaphore
@@ -353,9 +356,4 @@
 	// flag showing if lock is held
 	bool held:1;
-
-	#ifdef __CFA_DEBUG__
-	// for deadlock detection
-	struct thread$ * owner;
-	#endif
 };
 
@@ -372,8 +370,4 @@
 static inline void lock(fast_block_lock & this) with(this) {
 	lock( lock __cfaabi_dbg_ctx2 );
-
-	#ifdef __CFA_DEBUG__
-	assert(!(held && owner == active_thread()));
-	#endif
 	if ( held ) {
 		insert_last( blocked_threads, *active_thread() );
@@ -383,7 +377,4 @@
 	}
 	held = true;
-	#ifdef __CFA_DEBUG__
-	owner = active_thread();
-	#endif
 	unlock( lock );
 }
@@ -394,7 +385,4 @@
 	thread$ * t = &try_pop_front( blocked_threads );
 	held = ( t ? true : false );
-	#ifdef __CFA_DEBUG__
-	owner = ( t ? t : 0p );
-	#endif
 	unpark( t );
 	unlock( lock );
@@ -662,7 +650,4 @@
 	// if internal fast_block_lock is not held
 	held = true;
-	#ifdef __CFA_DEBUG__
-	owner = t;
-	#endif
 	unlock( lock );