git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6589
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
static int smx_ctx_java_factory_finalize(smx_context_factory_t * factory)
{
- /*FIXME: free(maestro_context->exception);*/
free(*factory);
*factory = NULL;
+ /* Restore the default exception setup */
+ __xbt_ex_ctx = &__xbt_ex_ctx_default;
+ __xbt_ex_terminate = &__xbt_ex_terminate_default;
+
return 0;
}
static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory)
{
- /*FIXME free(maestro_context->exception);*/
free(*factory);
*factory = NULL;
+
+ /* Restore the default exception setup */
+ __xbt_ex_ctx = &__xbt_ex_ctx_default;
+ __xbt_ex_terminate = &__xbt_ex_terminate_default;
+
return 0;
}
#ifndef HAVE_SEM_WAIT
xbt_os_mutex_destroy(next_sem_ID_lock);
#endif
+
+ /* Restore the default exception setup */
+ __xbt_ex_ctx = &__xbt_ex_ctx_default;
+ __xbt_ex_terminate = &__xbt_ex_terminate_default;
}
static void *wrapper_start_routine(void *s)