Implmented #1021 detection

Author: MaartenHilferink

tic/dll/src/ItemLocks.cpp

@@ -24,6 +24,7 @@
 #include "Unit.h"
 
 #include "OperationContext.h"
+SizeT GetNumberOfActivatedOrRunningOperations();
 
 //----------------------------------------------------------------------
 // impl details
@@ -96,8 +97,19 @@ namespace treeitem_production_task
 			}
 		}
 
+	retry:
+		bool noMoreOperationsRunning = (GetNumberOfActivatedOrRunningOperations() == 0);
+
 		leveled_critical_section::unique_lock lock(cs_lockCounterUpdate);
-		cv_lockrelease.wait(lock.m_BaseLock, [self]() {return self->m_ItemCount >= 0;  });
+		if (self->m_ItemCount < 0)
+		{
+			if (noMoreOperationsRunning)
+				throwErrorD("DeadLock", "lock_shared waiting for ItemCount to be unlocked but no active or running operations");
+
+			cv_lockrelease.wait_for(lock.m_BaseLock, std::chrono::milliseconds(500));
+			if (self->m_ItemCount < 0)
+				goto retry;
+		}
 
 		assert(self->m_Producer.expired()); // was cleaned up by producers task
 		assert(self->m_ItemCount >= 0);

tic/dll/src/OperationContext.cpp

@@ -519,20 +519,34 @@ static UInt32 sd_OcCount;
 static std::set<OperationContext*> sd_OC;
 static std::map<OperationContext*, phase_number> sd_RunningOC;
 
-// Verify that administrative counters agree.
-void CheckNumberOfRunningOCConsistency()
+SizeT getNumberOfActivatedOrRunningOperations()
 {
-	MG_CHECK(!cs_ThreadMessing.try_lock());
-		
 	SizeT numberOfRunningOCs = 0;
 	for (const auto& levelNumberPair : s_NrActivatedOrRunningOperations)
 		numberOfRunningOCs += levelNumberPair.second;
 	MG_CHECK(numberOfRunningOCs == sd_RunningOC.size());
 
+	return numberOfRunningOCs;
+}
+
+SizeT GetNumberOfActivatedOrRunningOperations()
+{
+	leveled_critical_section::scoped_lock lockToAvoidHasMainThreadTasksToBeMissed(cs_ThreadMessing);
+
+	return getNumberOfActivatedOrRunningOperations();
+}
+
+// Verify that administrative counters agree.
+void CheckNumberOfRunningOCConsistency()
+{
+	MG_CHECK(!cs_ThreadMessing.try_lock());
+		
+	SizeT numberOfRunningOCs = getNumberOfActivatedOrRunningOperations();
+
 	std::map<phase_number, RunningOperationsCounter> recount;
 	for (const auto& runningPair : sd_RunningOC)
 	{
-				MG_CHECK(runningPair.first->m_PhaseNumber == runningPair.second);
+		MG_CHECK(runningPair.first->m_PhaseNumber == runningPair.second);
 		++recount[runningPair.second];
 	}
 	for (const auto& recountPair : recount)