#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
-#include "simix/smx_context_private.h"
+#include "simix/context.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
char **argv,
void_pfn_smxprocess_t cleanup_func,
- smx_process_t process);
+ void *data);
static void smx_ctx_thread_free(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 new_context);
-static void smx_ctx_thread_runall_serial(xbt_swag_t processes);
-static void smx_ctx_thread_runall_parallel(xbt_swag_t processes);
-static smx_process_t smx_ctx_thread_self(void);
+static void smx_ctx_thread_runall_serial(xbt_dynar_t processes);
+static void smx_ctx_thread_runall_parallel(xbt_dynar_t processes);
+static smx_context_t smx_ctx_thread_self(void);
static void *smx_ctx_thread_wrapper(void *param);
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
char **argv,
void_pfn_smxprocess_t cleanup_func,
- smx_process_t process)
+ void *data)
{
smx_ctx_thread_t context = (smx_ctx_thread_t)
smx_ctx_base_factory_create_context_sized(sizeof(s_smx_ctx_thread_t),
code, argc, argv,
- cleanup_func, process);
+ cleanup_func, data);
/* If the user provided a function for the process then use it
otherwise is the context for maestro */
if (code) {
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, context);
- /* delay the thread creation until first run */
- context->thread = NULL;
+ /* wait the starting of the newly created process */
+ xbt_os_sem_acquire(context->end);
} else {
- xbt_os_thread_set_extra_data(process);
+ xbt_os_thread_set_extra_data(context);
}
return (smx_context_t) context;
{
smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext;
- /* check if the context has a thread or not */
- /* if it doesn't, it is maestro's context or the context never run */
+ /* check if this is the context of maestro (it doesn't has a real thread) */
if (context->thread) {
/* wait about the thread terminason */
xbt_os_thread_join(context->thread, NULL);
- }
- /* destroy the synchronisation objects */
- if (context->begin)
+ /* destroy the synchronisation objects */
xbt_os_sem_destroy(context->begin);
-
- if (context->end)
xbt_os_sem_destroy(context->end);
+ }
smx_ctx_base_free(pcontext);
}
static void smx_ctx_thread_suspend(smx_context_t context)
{
- if (((smx_ctx_thread_t) context)->thread) {
- xbt_os_sem_release(((smx_ctx_thread_t) context)->end);
- xbt_os_sem_acquire(((smx_ctx_thread_t) context)->begin);
- }
+ 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_runall_serial(xbt_swag_t processes)
+static void smx_ctx_thread_runall_serial(xbt_dynar_t processes)
{
smx_process_t process;
- while ((process = xbt_swag_extract(processes))) {
- /* if the context has no thread associated, create one for it (first run) */
- if (!(((smx_ctx_thread_t)process->context)->thread)) {
- ((smx_ctx_thread_t) process->context)->thread =
- xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, process->context, process);
- xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
- }
+ unsigned int cursor;
+
+ xbt_dynar_foreach(processes, cursor, process) {
xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
- }
+ }
+ xbt_dynar_reset(processes);
}
-static void smx_ctx_thread_runall_parallel(xbt_swag_t processes)
+static void smx_ctx_thread_runall_parallel(xbt_dynar_t processes)
{
- smx_process_t process, p_next;
- xbt_swag_foreach_safe(process, p_next, processes) {
- /* if the context has no thread associated, create one for it (first run) */
- if (!(((smx_ctx_thread_t) process->context)->thread)) {
- ((smx_ctx_thread_t)process->context)->thread =
- xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, process->context, process);
- xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
- }
+ unsigned int index;
+ smx_process_t process;
+
+ xbt_dynar_foreach(processes, index, process)
xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
- }
- while ((process = xbt_swag_extract(processes))) {
- xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
+ xbt_dynar_foreach(processes, index, process) {
+ xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
}
+ xbt_dynar_reset(processes);
}
-static smx_process_t smx_ctx_thread_self(void)
+static smx_context_t smx_ctx_thread_self(void)
{
- return (smx_process_t) xbt_os_thread_get_extra_data();
+ return (smx_context_t) xbt_os_thread_get_extra_data();
}
