github/concrete
1
1
Fork 0
mirror of https://github.com/zama-ai/concrete.git synced 2026-02-09 12:15:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(runtime): add initialization guard to avoid double initialization/finalization of the runtime.

Browse Source
This commit is contained in:
Antoniu Pop
2022-03-11 11:14:23 +00:00
committed by Ayoub Benaissa
parent 7cfa0a1212
commit 2f31edef7f
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/include/concretelang/Runtime/runtime_api.h
View File

@@ -35,5 +35,8 @@ void _dfr_deallocate_future_data(void *);
/* Initialisation & termination. */
void _dfr_start();
void _dfr_stop();
void _dfr_pre_main();
void _dfr_post_main();
}
#endif

17
compiler/lib/Runtime/DFRuntime.cpp
View File

@@ -28,6 +28,7 @@ WorkFunctionRegistry *node_level_work_function_registry;
std::list<void *> new_allocated;
std::list<void *> fut_allocated;
std::list<void *> m_allocated;
std::atomic<uint64_t> init_guard = {0};
using namespace hpx;
@@ -324,13 +325,21 @@ int __wrap_main(int argc, char *argv[]) {
}
void _dfr_pre_main() {
_dfr_start_impl(0, nullptr);
hpx::suspend();
uint64_t uninitialised = 0;
uint64_t initialised = 1;
if (init_guard.compare_exchange_strong(uninitialised, initialised)) {
_dfr_start_impl(0, nullptr);
hpx::suspend();
}
}
void _dfr_post_main() {
hpx::resume();
_dfr_stop_impl();
uint64_t initialised = 1;
uint64_t finalised = 2;
if (init_guard.compare_exchange_strong(initialised, finalised)) {
hpx::resume();
_dfr_stop_impl();
}
}
/**********************/