#include "xbt/function_types.h"
#include "private.h"
-
#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 */
-#include "simix/smx_context_private.h"
+#include "simix/context.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+int smx_parallel_contexts = 0;
+
typedef struct s_smx_ctx_thread {
s_smx_ctx_base_t super; /* Fields of super implementation */
xbt_os_thread_t thread; /* a plain dumb thread (portable to posix or windows) */
static smx_context_t
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
char **argv,
- void_f_pvoid_t cleanup_func,
- void *cleanup_arg);
+ void_pfn_smxprocess_t cleanup_func,
+ 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_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);
void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory)
{
-
smx_ctx_base_factory_init(factory);
+ VERB0("Activating thread context factory");
(*factory)->create_context = smx_ctx_thread_factory_create_context;
/* Do not overload that method (*factory)->finalize */
(*factory)->free = smx_ctx_thread_free;
(*factory)->stop = smx_ctx_thread_stop;
(*factory)->suspend = smx_ctx_thread_suspend;
- (*factory)->resume = smx_ctx_thread_resume;
+
+ if (smx_parallel_contexts)
+ (*factory)->runall = smx_ctx_thread_runall_parallel;
+ else
+ (*factory)->runall = smx_ctx_thread_runall_serial;
+
+ (*factory)->self = smx_ctx_thread_self;
(*factory)->name = "ctx_thread_factory";
}
static smx_context_t
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
char **argv,
- void_f_pvoid_t cleanup_func,
- void *cleanup_arg)
+ void_pfn_smxprocess_t cleanup_func,
+ 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, cleanup_arg);
+ 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 */
+ * 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);
+ xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, context, context);
/* wait the starting of the newly created process */
xbt_os_sem_acquire(context->end);
+
+ } else {
+ xbt_os_thread_set_extra_data(context);
}
return (smx_context_t) context;
static void smx_ctx_thread_stop(smx_context_t pcontext)
{
-
smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext;
/* please no debug here: our procdata was already free'd */
xbt_os_sem_acquire(((smx_ctx_thread_t) context)->begin);
}
-static void smx_ctx_thread_resume(smx_context_t new_context)
+static void smx_ctx_thread_runall_serial(xbt_dynar_t processes)
+{
+ smx_process_t process;
+ 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_dynar_t processes)
+{
+ unsigned int index;
+ smx_process_t process;
+
+ xbt_dynar_foreach(processes, index, process)
+ xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
+
+ xbt_dynar_foreach(processes, index, process) {
+ xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
+ }
+ xbt_dynar_reset(processes);
+}
+
+static smx_context_t smx_ctx_thread_self(void)
{
- xbt_os_sem_release(((smx_ctx_thread_t) new_context)->begin);
- xbt_os_sem_acquire(((smx_ctx_thread_t) new_context)->end);
+ return (smx_context_t) xbt_os_thread_get_extra_data();
}
