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 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)->stop = smx_ctx_thread_stop;
(*factory)->suspend = smx_ctx_thread_suspend;
- if(_surf_parallel_contexts)
+ if (SIMIX_context_is_parallel())
(*factory)->runall = smx_ctx_thread_runall_parallel;
else
(*factory)->runall = smx_ctx_thread_runall_serial;
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(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->context);
- 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->context);
- 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_context_t smx_ctx_thread_self(void)