#include "portable.h" /* loads context system definitions */
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
+#include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char** argv,
void_f_pvoid_t cleanup_func, void* cleanup_arg);
-static smx_context_t smx_ctx_thread_factory_create_master_context(void);
-
static int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory);
static void smx_ctx_thread_free(smx_context_t context);
(*factory)->create_context = smx_ctx_thread_factory_create_context;
(*factory)->finalize = smx_ctx_thread_factory_finalize;
- (*factory)->create_maestro_context = smx_ctx_thread_factory_create_master_context;
(*factory)->free = smx_ctx_thread_free;
(*factory)->start = smx_ctx_thread_start;
(*factory)->stop = smx_ctx_thread_stop;
(*factory)->name = "ctx_thread_factory";
}
-static smx_context_t smx_ctx_thread_factory_create_master_context(void)
-{
- return (smx_context_t) xbt_new0(s_smx_ctx_thread_t, 1);
-}
-
static int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory)
{
free(*factory);
{
smx_ctx_thread_t context = xbt_new0(s_smx_ctx_thread_t, 1);
- context->code = code;
- context->argc = argc;
- context->argv = argv;
- context->cleanup_func = cleanup_func;
- context->cleanup_arg = cleanup_arg;
- context->begin = xbt_os_sem_init(0);
- context->end = xbt_os_sem_init(0);
-
+ /* If the user provided a function for the process then use it
+ otherwise is the context for maestro */
+ if(code){
+ context->code = code;
+ context->argc = argc;
+ context->argv = argv;
+ context->cleanup_func = cleanup_func;
+ context->cleanup_arg = cleanup_arg;
+ context->begin = xbt_os_sem_init(0);
+ context->end = xbt_os_sem_init(0);
+ }
+
return (smx_context_t)context;
}