fix(Exception): handle exception in worker thread

BotellaA · BotellaA · commit 89d14b61aed5 · 2022-12-05T11:43:39.000+01:00
diff --git a/include/geode/basic/assert.h b/include/geode/basic/assert.h
@@ -51,7 +51,7 @@ namespace geode
     {
     public:
         template < typename... Args >
-        explicit OpenGeodeException( const Args &...message )
+        explicit OpenGeodeException( const Args&... message )
             : std::runtime_error{ absl::StrCat( message... ) }
         {
         }
diff --git a/include/geode/model/representation/builder/detail/copy.h b/include/geode/model/representation/builder/detail/copy.h
@@ -145,7 +145,11 @@ namespace geode
                 } );
                 count++;
             }
-            async::when_all( tasks.begin(), tasks.end() ).wait();
+            for( auto& task :
+                async::when_all( tasks.begin(), tasks.end() ).get() )
+            {
+                task.get();
+            }
             return result;
         }
 
diff --git a/src/geode/basic/assert.cpp b/src/geode/basic/assert.cpp
@@ -46,11 +46,11 @@ namespace geode
         {
             throw;
         }
-        catch( const OpenGeodeException &e )
+        catch( const OpenGeodeException& e )
         {
             Logger::critical( "OpenGeodeException: ", e.what() );
         }
-        catch( const std::exception &e )
+        catch( const std::exception& e )
         {
             Logger::critical( "std::exception: ", e.what() );
         }
diff --git a/src/geode/model/helpers/aabb_model_helpers.cpp b/src/geode/model/helpers/aabb_model_helpers.cpp
@@ -57,7 +57,10 @@ namespace
             } );
             id++;
         }
-        async::when_all( tasks.begin(), tasks.end() ).wait();
+        for( auto& task : async::when_all( tasks.begin(), tasks.end() ).get() )
+        {
+            task.get();
+        }
         return std::make_tuple(
             geode::AABBTree< dimension >{ boxes }, std::move( mapping ) );
     }
diff --git a/src/geode/model/helpers/detail/cut_along_internal_lines.cpp b/src/geode/model/helpers/detail/cut_along_internal_lines.cpp
@@ -89,9 +89,8 @@ namespace geode
                 }
                 CMVmappings mapping;
                 async::when_all( tasks.begin(), tasks.end() )
-                    .then( [this, &mapping](
-                               async::task< std::vector< Task > > all_task ) {
-                        for( auto& task : all_task.get() )
+                    .then( [this, &mapping]( std::vector< Task > all_task ) {
+                        for( auto& task : all_task )
                         {
                             auto cmv_mappings = task.get();
                             update_unique_vertices( cmv_mappings );
@@ -100,7 +99,7 @@ namespace geode
                                 std::make_move_iterator( cmv_mappings.end() ) );
                         }
                     } )
-                    .wait();
+                    .get();
                 return mapping;
             }
 
diff --git a/src/geode/model/helpers/detail/cut_along_internal_surfaces.cpp b/src/geode/model/helpers/detail/cut_along_internal_surfaces.cpp
@@ -86,9 +86,8 @@ namespace geode
                 }
                 CMVmappings mapping;
                 async::when_all( tasks.begin(), tasks.end() )
-                    .then( [this, &mapping](
-                               async::task< std::vector< Task > > all_task ) {
-                        for( auto& task : all_task.get() )
+                    .then( [this, &mapping]( std::vector< Task > all_task ) {
+                        for( auto& task : all_task )
                         {
                             auto cmv_mappings = task.get();
                             update_unique_vertices( cmv_mappings );
@@ -97,7 +96,7 @@ namespace geode
                                 std::make_move_iterator( cmv_mappings.end() ) );
                         }
                     } )
-                    .wait();
+                    .get();
                 return mapping;
             }
 
diff --git a/src/geode/model/mixin/core/blocks.cpp b/src/geode/model/mixin/core/blocks.cpp
@@ -126,11 +126,13 @@ namespace geode
                 }
             } );
         }
-        async::when_all( tasks.begin(), tasks.end() )
-            .then( [level] {
-                Logger::set_level( level );
-            } )
-            .wait();
+        auto all_tasks = async::when_all( tasks.begin(), tasks.end() );
+        all_tasks.wait();
+        Logger::set_level( level );
+        for( auto& task : all_tasks.get() )
+        {
+            task.get();
+        }
     }
 
     template < index_t dimension >
@@ -168,11 +170,13 @@ namespace geode
                 }
             } );
         }
-        async::when_all( tasks.begin(), tasks.end() )
-            .then( [level] {
-                Logger::set_level( level );
-            } )
-            .wait();
+        auto all_tasks = async::when_all( tasks.begin(), tasks.end() );
+        all_tasks.wait();
+        Logger::set_level( level );
+        for( auto& task : all_tasks.get() )
+        {
+            task.get();
+        }
     }
 
     template < index_t dimension >
diff --git a/src/geode/model/mixin/core/corners.cpp b/src/geode/model/mixin/core/corners.cpp
@@ -98,11 +98,13 @@ namespace geode
                 save_point_set( mesh, file );
             } );
         }
-        async::when_all( tasks.begin(), tasks.end() )
-            .then( [level] {
-                Logger::set_level( level );
-            } )
-            .wait();
+        auto all_tasks = async::when_all( tasks.begin(), tasks.end() );
+        all_tasks.wait();
+        Logger::set_level( level );
+        for( auto& task : all_tasks.get() )
+        {
+            task.get();
+        }
     }
 
     template < index_t dimension >
@@ -123,11 +125,13 @@ namespace geode
                     typename Corner< dimension >::CornersKey{} );
             } );
         }
-        async::when_all( tasks.begin(), tasks.end() )
-            .then( [level] {
-                Logger::set_level( level );
-            } )
-            .wait();
+        auto all_tasks = async::when_all( tasks.begin(), tasks.end() );
+        all_tasks.wait();
+        Logger::set_level( level );
+        for( auto& task : all_tasks.get() )
+        {
+            task.get();
+        }
     }
 
     template < index_t dimension >
diff --git a/src/geode/model/mixin/core/lines.cpp b/src/geode/model/mixin/core/lines.cpp
@@ -96,11 +96,13 @@ namespace geode
                 save_edged_curve( mesh, file );
             } );
         }
-        async::when_all( tasks.begin(), tasks.end() )
-            .then( [level] {
-                Logger::set_level( level );
-            } )
-            .wait();
+        auto all_tasks = async::when_all( tasks.begin(), tasks.end() );
+        all_tasks.wait();
+        Logger::set_level( level );
+        for( auto& task : all_tasks.get() )
+        {
+            task.get();
+        }
     }
 
     template < index_t dimension >
@@ -121,11 +123,13 @@ namespace geode
                     typename Line< dimension >::LinesKey{} );
             } );
         }
-        async::when_all( tasks.begin(), tasks.end() )
-            .then( [level] {
-                Logger::set_level( level );
-            } )
-            .wait();
+        auto all_tasks = async::when_all( tasks.begin(), tasks.end() );
+        all_tasks.wait();
+        Logger::set_level( level );
+        for( auto& task : all_tasks.get() )
+        {
+            task.get();
+        }
     }
 
     template < index_t dimension >
diff --git a/src/geode/model/mixin/core/surfaces.cpp b/src/geode/model/mixin/core/surfaces.cpp
@@ -116,17 +116,19 @@ namespace geode
                 }
                 else
                 {
-                    throw OpenGeodeException(
-                        "[Surfaces::save_surfaces] Cannot find the explicit "
-                        "SurfaceMesh type" );
+                    throw OpenGeodeException( "[Surfaces::save_surfaces] "
+                                              "Cannot find the explicit "
+                                              "SurfaceMesh type" );
                 }
             } );
         }
-        async::when_all( tasks.begin(), tasks.end() )
-            .then( [level] {
-                Logger::set_level( level );
-            } )
-            .wait();
+        auto all_tasks = async::when_all( tasks.begin(), tasks.end() );
+        all_tasks.wait();
+        Logger::set_level( level );
+        for( auto& task : all_tasks.get() )
+        {
+            task.get();
+        }
     }
 
     template < index_t dimension >
@@ -157,11 +159,13 @@ namespace geode
                 }
             } );
         }
-        async::when_all( tasks.begin(), tasks.end() )
-            .then( [level] {
-                Logger::set_level( level );
-            } )
-            .wait();
+        auto all_tasks = async::when_all( tasks.begin(), tasks.end() );
+        all_tasks.wait();
+        Logger::set_level( level );
+        for( auto& task : all_tasks.get() )
+        {
+            task.get();
+        }
     }
 
     template < index_t dimension >
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -23,6 +23,7 @@ cmake_minimum_required(VERSION 3.15)
 if(NOT TARGET OpenGeode::basic)
     project(OpenGeode CXX)
     find_package(OpenGeode REQUIRED CONFIG)
+    find_package(Async++ REQUIRED CONFIG)
     enable_testing()
 endif()
 
diff --git a/tests/basic/CMakeLists.txt b/tests/basic/CMakeLists.txt
@@ -26,6 +26,7 @@ add_geode_test(
 add_geode_test(
     SOURCE "test-assert.cpp"
     DEPENDENCIES
+        Async++
         ${PROJECT_NAME}::basic
 )
 add_geode_test(
diff --git a/tests/basic/test-assert.cpp b/tests/basic/test-assert.cpp

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ namespace geode`
`51`	`51`	`{`
`52`	`52`	`public:`
`53`	`53`	`template < typename... Args >`
`54`		`- explicit OpenGeodeException( const Args &...message )`
	`54`	`+ explicit OpenGeodeException( const Args&... message )`
`55`	`55`	`: std::runtime_error{ absl::StrCat( message... ) }`
`56`	`56`	`{`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,11 @@ namespace geode`
`145`	`145`	`} );`
`146`	`146`	`count++;`
`147`	`147`	`}`
`148`		`- async::when_all( tasks.begin(), tasks.end() ).wait();`
	`148`	`+ for( auto& task :`
	`149`	`+ async::when_all( tasks.begin(), tasks.end() ).get() )`
	`150`	`+ {`
	`151`	`+ task.get();`
	`152`	`+ }`
`149`	`153`	`return result;`
`150`	`154`	`}`
`151`	`155`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,11 @@ namespace geode`
`46`	`46`	`{`
`47`	`47`	`throw;`
`48`	`48`	`}`
`49`		`- catch( const OpenGeodeException &e )`
	`49`	`+ catch( const OpenGeodeException& e )`
`50`	`50`	`{`
`51`	`51`	`Logger::critical( "OpenGeodeException: ", e.what() );`
`52`	`52`	`}`
`53`		`- catch( const std::exception &e )`
	`53`	`+ catch( const std::exception& e )`
`54`	`54`	`{`
`55`	`55`	`Logger::critical( "std::exception: ", e.what() );`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,10 @@ namespace`
`57`	`57`	`} );`
`58`	`58`	`id++;`
`59`	`59`	`}`
`60`		`- async::when_all( tasks.begin(), tasks.end() ).wait();`
	`60`	`+ for( auto& task : async::when_all( tasks.begin(), tasks.end() ).get() )`
	`61`	`+ {`
	`62`	`+ task.get();`
	`63`	`+ }`
`61`	`64`	`return std::make_tuple(`
`62`	`65`	`geode::AABBTree< dimension >{ boxes }, std::move( mapping ) );`
`63`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,8 @@ namespace geode`
`89`	`89`	`}`
`90`	`90`	`CMVmappings mapping;`
`91`	`91`	`async::when_all( tasks.begin(), tasks.end() )`
`92`		`- .then( [this, &mapping](`
`93`		`- async::task< std::vector< Task > > all_task ) {`
`94`		`- for( auto& task : all_task.get() )`
	`92`	`+ .then( [this, &mapping]( std::vector< Task > all_task ) {`
	`93`	`+ for( auto& task : all_task )`
`95`	`94`	`{`
`96`	`95`	`auto cmv_mappings = task.get();`
`97`	`96`	`update_unique_vertices( cmv_mappings );`
`@@ -100,7 +99,7 @@ namespace geode`
`100`	`99`	`std::make_move_iterator( cmv_mappings.end() ) );`
`101`	`100`	`}`
`102`	`101`	`} )`
`103`		`- .wait();`
	`102`	`+ .get();`
`104`	`103`	`return mapping;`
`105`	`104`	`}`
`106`	`105`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,8 @@ namespace geode`
`86`	`86`	`}`
`87`	`87`	`CMVmappings mapping;`
`88`	`88`	`async::when_all( tasks.begin(), tasks.end() )`
`89`		`- .then( [this, &mapping](`
`90`		`- async::task< std::vector< Task > > all_task ) {`
`91`		`- for( auto& task : all_task.get() )`
	`89`	`+ .then( [this, &mapping]( std::vector< Task > all_task ) {`
	`90`	`+ for( auto& task : all_task )`
`92`	`91`	`{`
`93`	`92`	`auto cmv_mappings = task.get();`
`94`	`93`	`update_unique_vertices( cmv_mappings );`
`@@ -97,7 +96,7 @@ namespace geode`
`97`	`96`	`std::make_move_iterator( cmv_mappings.end() ) );`
`98`	`97`	`}`
`99`	`98`	`} )`
`100`		`- .wait();`
	`99`	`+ .get();`
`101`	`100`	`return mapping;`
`102`	`101`	`}`
`103`	`102`
Original file line number	Diff line number	Diff line change
`@@ -116,17 +116,19 @@ namespace geode`
`116`	`116`	`}`
`117`	`117`	`else`
`118`	`118`	`{`
`119`		`- throw OpenGeodeException(`
`120`		`- "[Surfaces::save_surfaces] Cannot find the explicit "`
`121`		`- "SurfaceMesh type" );`
	`119`	`+ throw OpenGeodeException( "[Surfaces::save_surfaces] "`
	`120`	`+ "Cannot find the explicit "`
	`121`	`+ "SurfaceMesh type" );`
`122`	`122`	`}`
`123`	`123`	`} );`
`124`	`124`	`}`
`125`		`- async::when_all( tasks.begin(), tasks.end() )`
`126`		`- .then( [level] {`
`127`		`- Logger::set_level( level );`
`128`		`- } )`
`129`		`- .wait();`
	`125`	`+ auto all_tasks = async::when_all( tasks.begin(), tasks.end() );`
	`126`	`+ all_tasks.wait();`
	`127`	`+ Logger::set_level( level );`
	`128`	`+ for( auto& task : all_tasks.get() )`
	`129`	`+ {`
	`130`	`+ task.get();`
	`131`	`+ }`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`template < index_t dimension >`
`@@ -157,11 +159,13 @@ namespace geode`
`157`	`159`	`}`
`158`	`160`	`} );`
`159`	`161`	`}`
`160`		`- async::when_all( tasks.begin(), tasks.end() )`
`161`		`- .then( [level] {`
`162`		`- Logger::set_level( level );`
`163`		`- } )`
`164`		`- .wait();`
	`162`	`+ auto all_tasks = async::when_all( tasks.begin(), tasks.end() );`
	`163`	`+ all_tasks.wait();`
	`164`	`+ Logger::set_level( level );`
	`165`	`+ for( auto& task : all_tasks.get() )`
	`166`	`+ {`
	`167`	`+ task.get();`
	`168`	`+ }`
`165`	`169`	`}`
`166`	`170`
`167`	`171`	`template < index_t dimension >`