#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);
-
-static void smx_ctx_thread_start(smx_context_t context);
-
static void smx_ctx_thread_stop(smx_context_t context);
-
static void smx_ctx_thread_suspend(smx_context_t context);
-
-static void
- smx_ctx_thread_resume(smx_context_t old_context, smx_context_t new_context);
+static void smx_ctx_thread_resume(smx_context_t new_context);
static void *smx_ctx_thread_wrapper(void *param);
(*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)->suspend = smx_ctx_thread_suspend;
(*factory)->resume = smx_ctx_thread_resume;
(*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);
+
+
+ /* create and start the process */
+ /* NOTE: The first argument to xbt_os_thread_create used to be the process *
+ * name, but now the name is stored at SIMIX level, so we pass a null */
+ context->thread =
+ xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, context);
+
+ /* wait the starting of the newly created process */
+ xbt_os_sem_acquire(context->end);
+ }
+
return (smx_context_t)context;
}
free(context);
}
-static void smx_ctx_thread_start(smx_context_t context)
-{
- smx_ctx_thread_t ctx_thread = (smx_ctx_thread_t)context;
-
- /* create and start the process */
- /* NOTE: The first argument to xbt_os_thread_create used to be the process *
- * name, but now the name is stored at SIMIX level, so we pass a null */
- ctx_thread->thread =
- xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, ctx_thread);
-
- /* wait the starting of the newly created process */
- xbt_os_sem_acquire(ctx_thread->end);
-}
-
static void smx_ctx_thread_stop(smx_context_t pcontext)
{
return NULL;
}
-static void smx_ctx_thread_suspend(smx_context_t context)
-{
+static void smx_ctx_thread_suspend(smx_context_t context) {
xbt_os_sem_release(((smx_ctx_thread_t) context)->end);
xbt_os_sem_acquire(((smx_ctx_thread_t) context)->begin);
}
-static void smx_ctx_thread_resume(smx_context_t not_used,
- smx_context_t new_context)
-{
+static void smx_ctx_thread_resume(smx_context_t new_context) {
xbt_os_sem_release(((smx_ctx_thread_t) new_context)->begin);
xbt_os_sem_acquire(((smx_ctx_thread_t) new_context)->end);
-}
\ No newline at end of file
+}