X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a5c439094f924970556f57605c6bab819ab73725..c9a06d0b06fb32926954b78006bfe7f886aa757a:/src/simix/smx_context_thread.c diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c index b3b5ffa08c..95989a807d 100644 --- a/src/simix/smx_context_thread.c +++ b/src/simix/smx_context_thread.c @@ -1,8 +1,7 @@ -/* $Id$ */ - /* context_thread - implementation of context switching with native threads */ -/* Copyright (c) 2004-2008 the SimGrid team. All right reserved */ +/* Copyright (c) 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -13,183 +12,107 @@ #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" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smx_context); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); typedef struct s_smx_ctx_thread { - SMX_CTX_BASE_T; + s_smx_ctx_base_t super; /* Fields of super implementation */ xbt_os_thread_t thread; /* a plain dumb thread (portable to posix or windows) */ xbt_os_sem_t begin; /* this semaphore is used to schedule/yield the process */ xbt_os_sem_t end; /* this semaphore is used to schedule/unschedule the process */ } s_smx_ctx_thread_t, *smx_ctx_thread_t; -static int -smx_ctx_thread_factory_create_context(smx_process_t *smx_process, xbt_main_func_t code); - -static int -smx_ctx_thread_factory_create_master_context(smx_process_t * maestro); - -static int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory); - -static void smx_ctx_thread_free(smx_process_t process); - -static void smx_ctx_thread_kill(smx_process_t process); - -static void smx_ctx_thread_schedule(smx_process_t process); - -static void smx_ctx_thread_yield(void); - -static void smx_ctx_thread_start(smx_process_t process); - -static void smx_ctx_thread_stop(int exit_code); - -static void smx_ctx_thread_swap(smx_process_t process); +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); -static void smx_ctx_thread_schedule(smx_process_t process); - -static void smx_ctx_thread_yield(void); - -static void smx_ctx_thread_suspend(smx_process_t process); - -static void smx_ctx_thread_resume(smx_process_t process); +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_wrapper(void *param); void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) { - *factory = xbt_new0(s_smx_context_factory_t, 1); + + smx_ctx_base_factory_init(factory); (*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; + /* Do not overload that method (*factory)->finalize */ (*factory)->free = smx_ctx_thread_free; - (*factory)->kill = smx_ctx_thread_kill; - (*factory)->schedule = smx_ctx_thread_schedule; - (*factory)->yield = smx_ctx_thread_yield; - (*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 int -smx_ctx_thread_factory_create_master_context(smx_process_t * maestro) -{ - (*maestro)->context = (smx_context_t) xbt_new0(s_smx_ctx_thread_t, 1); - return 0; -} - -static int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory) -{ - free(*factory); - *factory = NULL; - return 0; -} - -static int -smx_ctx_thread_factory_create_context(smx_process_t *smx_process, xbt_main_func_t code) +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) { - smx_ctx_thread_t context = xbt_new0(s_smx_ctx_thread_t, 1); - - VERB1("Create context %s", (*smx_process)->name); - context->code = code; - context->begin = xbt_os_sem_init(0); - context->end = xbt_os_sem_init(0); - - (*smx_process)->context = (smx_context_t)context; - (*smx_process)->iwannadie = 0; + 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); + + /* 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); + + /* wait the starting of the newly created process */ + xbt_os_sem_acquire(context->end); + } - /* FIXME: Check what should return */ - return 1; + return (smx_context_t) context; } -static void smx_ctx_thread_free(smx_process_t process) +static void smx_ctx_thread_free(smx_context_t pcontext) { - smx_ctx_thread_t context = (smx_ctx_thread_t)process->context; + smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext; - /* Check if this is the context of maestro (it doesn't has a real thread) */ + /* 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); - free(context->thread); - + /* destroy the synchronisation objects */ xbt_os_sem_destroy(context->begin); xbt_os_sem_destroy(context->end); } - - /* finally destroy the context */ - free(context); -} - -static void smx_ctx_thread_kill(smx_process_t process) -{ - DEBUG1("Kill process '%s'", process->name); - process->iwannadie = 1; - //smx_ctx_thread_swap(process); -} - -/** - * \param context the winner - * - * Calling this function blocks the current context and schedule \a context. - * When \a context will call smx_context_yield, it will return - * to this function as if nothing had happened. - * - * Only the maestro can call this function to run a given process. - */ -static void smx_ctx_thread_schedule(smx_process_t process) -{ - DEBUG1("Schedule process '%s'", process->name); - /*xbt_assert0((simix_global->current_process == simix_global->maestro_process), - "You are not supposed to run this function here!");*/ - smx_ctx_thread_resume(process); - /*smx_ctx_thread_swap(process);*/ -} -/** - * Calling this function makes the current context yield. The context - * that scheduled it returns from smx_context_schedule as if nothing - * had happened. - * - * Only the processes can call this function, giving back the control - * to the maestro - */ -static void smx_ctx_thread_yield(void) -{ - smx_ctx_thread_suspend(simix_global->current_process); + smx_ctx_base_free(pcontext); } -static void smx_ctx_thread_start(smx_process_t process) +static void smx_ctx_thread_stop(smx_context_t pcontext) { - smx_ctx_thread_t ctx_thread = (smx_ctx_thread_t) process->context; - DEBUG1("Start context '%s'", process->name); - /* create and start the process */ - ctx_thread->thread = - xbt_os_thread_create(process->name, smx_ctx_thread_wrapper, - ctx_thread); + smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext; - /* wait the starting of the newly created process */ - xbt_os_sem_acquire(ctx_thread->end); -} - -static void smx_ctx_thread_stop(int exit_code) -{ /* please no debug here: our procdata was already free'd */ - if (simix_global->current_process->cleanup_func) - ((*simix_global->current_process->cleanup_func)) (simix_global->current_process->cleanup_arg); + smx_ctx_base_stop(pcontext); /* signal to the maestro that it has finished */ - xbt_os_sem_release(((smx_ctx_thread_t) simix_global->current_process->context)->end); + xbt_os_sem_release(((smx_ctx_thread_t) context)->end); /* exit */ - xbt_os_thread_exit(NULL); /* We should provide return value in case other wants it */ -} - -/*FIXME: erase this function*/ -static void smx_ctx_thread_swap(smx_process_t process) -{ - return; + /* We should provide return value in case other wants it */ + xbt_os_thread_exit(NULL); } static void *smx_ctx_thread_wrapper(void *param) @@ -200,21 +123,20 @@ static void *smx_ctx_thread_wrapper(void *param) xbt_os_sem_release(context->end); xbt_os_sem_acquire(context->begin); - smx_ctx_thread_stop((context->code) (simix_global->current_process->argc, - simix_global->current_process->argv)); + (context->super.code) (context->super.argc, context->super.argv); + + smx_ctx_thread_stop((smx_context_t) context); return NULL; } -static void smx_ctx_thread_suspend(smx_process_t process) +static void smx_ctx_thread_suspend(smx_context_t context) { - DEBUG1("Suspend context '%s'", process->name); - xbt_os_sem_release(((smx_ctx_thread_t) process->context)->end); - xbt_os_sem_acquire(((smx_ctx_thread_t) process->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_resume(smx_process_t process) +static void smx_ctx_thread_resume(smx_context_t new_context) { - DEBUG1("Resume context '%s'", process->name); - xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin); - xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end); -} \ No newline at end of file + xbt_os_sem_release(((smx_ctx_thread_t) new_context)->begin); + xbt_os_sem_acquire(((smx_ctx_thread_t) new_context)->end); +}