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
cosmetics
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
560a909
..
15772ca
100644
(file)
--- a/
src/simix/smx_context.c
+++ b/
src/simix/smx_context.c
@@
-11,41
+11,29
@@
#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;
+typedef void (*SIMIX_ctx_factory_initializer_t)(smx_context_factory_t *);
+SIMIX_ctx_factory_initializer_t factory_initializer_to_use = NULL;
/**
/**
- * This function is call by SIMIX_global_init() to initialize the context module.
+ * This function is call
ed
by SIMIX_global_init() to initialize the context module.
*/
*/
-
void SIMIX_context_mod_init(void)
{
if (!simix_global->context_factory) {
/* select context factory to use to create the context(depends of the macro definitions) */
void SIMIX_context_mod_init(void)
{
if (!simix_global->context_factory) {
/* select context factory to use to create the context(depends of the macro definitions) */
- if (
xbt_ctx_factory
_to_use) {
-
SIMIX_context_select_factory(xbt_ctx_factory_to_use
);
+ if (
factory_initializer
_to_use) {
+
(*factory_initializer_to_use)(&(simix_global->context_factory)
);
} else {
} else {
-#ifdef CONTEXT_THREADS
- /* context switch based os thread */
+#ifdef CONTEXT_THREADS /* Use os threads (either pthreads or windows ones) */
SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
-#elif defined(CONTEXT_UCONTEXT)
- /* context switch based ucontext */
+#elif defined(CONTEXT_UCONTEXT) /* use ucontext */
SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
-#elif defined(_XBT_WIN32)
- /* context switch based windows */
#else
#else
- /* context switch is not allowed on Windows */
-#error ERROR [__FILE__, line __LINE__]: no context based implementation specified.
+#error ERROR [__FILE__, line __LINE__]: no context implementation specified.
#endif
}
}
#endif
}
}
@@
-95,22
+83,7
@@
int SIMIX_context_select_factory(const char *name)
}
/* init the desired factory */
}
/* init the desired factory */
- SIMIX_context_init_factory_by_name(&simix_global->context_factory, name);
-
- SIMIX_create_maestro_process();
-
-
-
- return 0;
-}
-
-/**
- * Initializes a context factory given by its name
- */
-void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
- const char *name)
-{
-
+ smx_context_factory_t * factory = &simix_global->context_factory;
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);
@@
-134,22
+107,15
@@
void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
THROW0(not_found_error, 0,
"Factory 'sysv' does not exist: no System V thread support under Windows");
#endif
THROW0(not_found_error, 0,
"Factory 'sysv' does not exist: no System V thread support under Windows");
#endif
- else if (!strcmp(name, "lua"))
-#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);
else
THROW1(not_found_error, 0, "Factory '%s' does not exist", name);
+
+
+
+
+ SIMIX_create_maestro_process();
+
+ return 0;
}
}
+