general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop interrupt thread before destroying the enclave when error

Browse Source
This commit is contained in:
Hui, Chunyang 2022-06-22 10:45:21 +00:00 committed by volcano
parent f704604e36
commit 5d75584e32
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pal/include/occlum_pal_api.h
View File

@ -161,7 +161,7 @@ int occlum_pal_exec(struct occlum_pal_exec_args *args);
int occlum_pal_kill(int pid, int sig); int occlum_pal_kill(int pid, int sig);
/* /*
* @brief Destroy teh Occlum enclave * @brief Destroy the Occlum enclave
* *
* @retval if 0, then success; otherwise, check errno for the exact error type. * @retval if 0, then success; otherwise, check errno for the exact error type.
*/ */

7
src/pal/src/pal_api.c
View File

@ -148,10 +148,15 @@ int occlum_pal_init(const struct occlum_pal_attr *attr) {
if (pal_run_init_process() < 0) { if (pal_run_init_process() < 0) {
PAL_ERROR("Failed to run the init process: %s", errno2str(errno)); PAL_ERROR("Failed to run the init process: %s", errno2str(errno));
goto on_destroy_enclave; goto stop_interrupt_thread;
} }
return 0; return 0;
stop_interrupt_thread:
if (pal_interrupt_thread_stop() < 0) {
PAL_WARN("Cannot stop the interrupt thread: %s", errno2str(errno));
}
on_destroy_enclave: on_destroy_enclave:
if (pal_destroy_enclave() < 0) { if (pal_destroy_enclave() < 0) {
PAL_WARN("Cannot destroy the enclave"); PAL_WARN("Cannot destroy the enclave");