cleanup on-exit references deletion code

bit more logging & extra assert for safety
megai2 · Aug 11, 2020 · 2e26f8a · 2e26f8a
1 parent b40d7a6
commit 2e26f8a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/d912pxy/d912pxy_gpu_cmd_list.cpp b/d912pxy/d912pxy_gpu_cmd_list.cpp
@@ -61,7 +61,7 @@ d912pxy_gpu_cmd_list::~d912pxy_gpu_cmd_list()
 	Signal();
 	WaitNoCleanup();
 
-	CleanupAllReferenced();
+	FinalReferenceCleanup();
 
 	delete mGpuRefs;
 
@@ -142,16 +142,19 @@ void d912pxy_gpu_cmd_list::EnqueueCleanup(d912pxy_comhandler * obj)
 	mGpuRefs->WriteElement(obj);
 }
 
-void d912pxy_gpu_cmd_list::CleanupAllReferenced()
+void d912pxy_gpu_cmd_list::FinalReferenceCleanup()
 {
+	auto totalRefs = mGpuRefs->TotalElements();
 	while (mGpuRefs->HaveElements())
 	{
 		d912pxy_comhandler* obj = mGpuRefs->GetElement();		
-		if (!obj->FinalRelease())
-		{
-			//for multithread holded objects
-			mGpuRefs->WriteElement(obj);
-		}
+		LOG_ASSERT(obj->FinalRelease(), "obj->FinalRelease() wrong cleanup");
+
+		if (!totalRefs && mGpuRefs->TotalElements())
+			LOG_WARN_DTDM("%u elements still pending in cmd list references", mGpuRefs->TotalElements());
+		else
+			--totalRefs;
+
 		mGpuRefs->Next();
 	}
 }

diff --git a/d912pxy/d912pxy_gpu_cmd_list.h b/d912pxy/d912pxy_gpu_cmd_list.h
@@ -44,7 +44,7 @@ class d912pxy_gpu_cmd_list :
 	void Signal();	
 	void EnqueueCleanup(d912pxy_comhandler* obj);
 
-	void CleanupAllReferenced();
+	void FinalReferenceCleanup();
 	void CleanupReferenced(UINT items);
 
 	void EnableGID(d912pxy_gpu_cmd_list_group id, UINT32 prio);