X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8caf511fa693be7104bc3ecfa8be1e47bfefa1df..ba58c8b937ee08fc2b46be62a50b0b3ff0b0104f:/src/simix/smx_context.c diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c index be29ac5144..71c2b0edeb 100644 --- a/src/simix/smx_context.c +++ b/src/simix/smx_context.c @@ -11,13 +11,22 @@ #include "xbt/swag.h" #include "private.h" +#ifdef HAVE_LUA +#include +#endif + +#ifdef HAVE_RUBY + void SIMIX_ctx_ruby_factory_init(smx_context_factory_t *factory); +#endif + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mecanism"); const char *xbt_ctx_factory_to_use = NULL; -/** +/** * This function is call by SIMIX_global_init() to initialize the context module. */ + void SIMIX_context_mod_init(void) { if (!simix_global->context_factory) { @@ -64,6 +73,8 @@ int SIMIX_context_select_factory(const char *name) newly selected one, then kill all the processes, exit the context module and initialize the new factory. */ + + if (simix_global->context_factory != NULL) { if (strcmp(simix_global->context_factory->name, name)){ @@ -85,6 +96,8 @@ int SIMIX_context_select_factory(const char *name) SIMIX_context_init_factory_by_name(&simix_global->context_factory, name); SIMIX_create_maestro_process (); + + return 0; } @@ -95,6 +108,7 @@ int SIMIX_context_select_factory(const char *name) void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory, const char *name) { + if (!strcmp(name, "java")) #ifdef HAVE_JAVA SIMIX_ctx_java_factory_init(factory); @@ -119,8 +133,16 @@ void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory, #ifdef HAVE_LUA SIMIX_ctx_lua_factory_init(factory); #else + THROW0(not_found_error, 0, "Factory 'lua' does not exist: Lua support was not compiled in the SimGrid library"); #endif /* HAVE_LUA */ + + else if (!strcmp(name,"ruby")) +#ifdef HAVE_RUBY + SIMIX_ctx_ruby_factory_init(factory); +#else + THROW0(not_found_error, 0, "Factory 'ruby' does not exist: Ruby support was not compiled in the SimGrid library"); +#endif else THROW1(not_found_error, 0, "Factory '%s' does not exist", name); }