summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c382a9e)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5338
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
#include "portable.h"\r
#include "xbt/log.h"\r
#include "xbt/swag.h"\r
#include "portable.h"\r
#include "xbt/log.h"\r
#include "xbt/swag.h"\r
-#include "xbt_context_factory.h"\r
+#include "xbt_context_private.h"\r
\r
/* the context associated with the current process */\r
xbt_context_t current_context = NULL;\r
\r
/* the context associated with the current process */\r
xbt_context_t current_context = NULL;\r
\r
#ifdef CONTEXT_THREADS\r
/* context switch based os thread */\r
\r
#ifdef CONTEXT_THREADS\r
/* context switch based os thread */\r
- xbt_thread_context_factory_init(&context_factory);\r
+ xbt_ctx_thread_factory_init(&context_factory);\r
#elif !defined(WIN32)\r
/* context switch based ucontext */\r
#elif !defined(WIN32)\r
/* context switch based ucontext */\r
- xbt_ucontext_factory_init(&context_factory);\r
+ xbt_ctx_sysv_factory_init(&context_factory);\r
#else\r
/* context switch is not allowed on Windows */\r
#error ERROR [__FILE__, line __LINE__]: no context based implementation specified.\r
#else\r
/* context switch is not allowed on Windows */\r
#error ERROR [__FILE__, line __LINE__]: no context based implementation specified.\r
int\r
xbt_context_init_factory_by_name(xbt_context_factory_t* factory, const char* name)\r
{\r
int\r
xbt_context_init_factory_by_name(xbt_context_factory_t* factory, const char* name)\r
{\r
- if(!strcmp(name,"jcontext_factory"))\r
+ if(!strcmp(name,"java"))\r
- return xbt_jcontext_factory_init(factory); \r
+ return xbt_ctx_java_factory_init(factory); \r
}\r
#ifdef CONTEXT_THREADS\r
}\r
#ifdef CONTEXT_THREADS\r
- else if(!strcmp(name,"thread_context_factory")) \r
+ else if(!strcmp(name,"thread")) \r
- return xbt_thread_context_factory_init(factory); \r
+ return xbt_ctx_thread_factory_init(factory); \r
}\r
#elif !defined(WIN32)\r
}\r
#elif !defined(WIN32)\r
- else if(!strcmp(name,"ucontext_context_factory")) \r
+ else if(!strcmp(name,"sysv"))\r
- return xbt_ucontext_factory_init(factory); \r
+ return xbt_ctx_sysv_factory_init(factory); \r