A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renaming value of presence state to "presence" (to get a good time-slice value later on)
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
be29ac5
..
601736e
100644
(file)
--- a/
src/simix/smx_context.c
+++ b/
src/simix/smx_context.c
@@
-11,13
+11,22
@@
#include "xbt/swag.h"
#include "private.h"
#include "xbt/swag.h"
#include "private.h"
+#ifdef HAVE_LUA
+#include <lauxlib.h>
+#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;
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.
*/
* This function is call by SIMIX_global_init() to initialize the context module.
*/
+
void SIMIX_context_mod_init(void)
{
if (!simix_global->context_factory) {
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.
*/
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)){
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 ();
SIMIX_context_init_factory_by_name(&simix_global->context_factory, name);
SIMIX_create_maestro_process ();
+
+
return 0;
}
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)
{
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);
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
#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 */
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);
}
else
THROW1(not_found_error, 0, "Factory '%s' does not exist", name);
}