fix ugly error message and update git submodules in makefile

refresh-bio · Jan 18, 2024 · a2f3560 · a2f3560
1 parent 14a914b
commit a2f3560
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
 all: kmc kmc_dump kmc_tools py_kmc_api
 
+dummy := $(shell git submodule update --init --recursive)
+
 UNAME_S := $(shell uname -s)
 UNAME_M := $(shell uname -m)
 UNAME_P := $(shell uname -p)

diff --git a/kmc_core/kmc.h b/kmc_core/kmc.h
@@ -1802,14 +1802,26 @@ template <unsigned SIZE> KMC::Stage2Results CKMC<SIZE>::ProcessStage2_impl()
 
 template <unsigned SIZE> KMC::Stage1Results CKMC<SIZE>::ProcessStage1()
 {
-	auto res = ProcessStage1_impl();
+	KMC::Stage1Results res;
+	//run on separate exception aware thread for proper exception handling
+	CExceptionAwareThread th([&res, this] {
+		res = this->ProcessStage1_impl();
+	});
+	th.join();
+
 	CThreadExceptionCollector::Inst().RethrowIfAnyException();
 	return res;
 }
 
 template <unsigned SIZE> KMC::Stage2Results CKMC<SIZE>::ProcessStage2()
 {
-	auto res = ProcessStage2_impl();
+	KMC::Stage2Results res;
+	//run on separate exception aware thread for proper exception handling if exception thrown in main thread
+	CExceptionAwareThread th([&res, this] {
+		res = this->ProcessStage2_impl();
+		});
+	th.join();
+
 	CThreadExceptionCollector::Inst().RethrowIfAnyException();
 	return res;
 }