Windows compatibility.

[simgrid.git] / src / simix / smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index ac7c324..77efb14 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -1,7 +1,7 @@
 /* a fast and simple context switching library                              */
 
-/* Copyright (c) 2004-2008 the SimGrid team.                                */
-/* All rights 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. */
@@ -10,19 +10,23 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "private.h"
-#define HAVE_RUBY /* HACK HACK */
 
-#ifdef HAVE_RUBY
-extern void SIMIX_ctx_ruby_factory_init(smx_context_factory_t *factory);
+#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;
 
-/**
+/** 
  * This function is call by SIMIX_global_init() to initialize the context module.
  */
+
 void SIMIX_context_mod_init(void)
 {
   if (!simix_global->context_factory) {
@@ -33,9 +37,11 @@ void SIMIX_context_mod_init(void)
 #ifdef CONTEXT_THREADS
     /* context switch based os thread */
     SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
-#elif !defined(WIN32)
+#elif defined(CONTEXT_UCONTEXT)
     /* context switch based ucontext */
     SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
+#elif defined(_XBT_WIN32)
+    /* context switch based windows */
 #else
     /* context switch is not allowed on Windows */
 #error ERROR [__FILE__, line __LINE__]: no context based implementation specified.
@@ -69,6 +75,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)){
 
@@ -90,6 +98,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;
 }
@@ -100,6 +110,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);
@@ -115,7 +126,7 @@ void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
 #endif /* CONTEXT_THREADS */
    
     else if (!strcmp(name, "sysv"))
-  #if !defined(WIN32) && !defined(CONTEXT_THREADS)
+  #if !defined(_XBT_WIN32) && !defined(CONTEXT_THREADS)
       SIMIX_ctx_sysv_factory_init(factory);
   #else
       THROW0(not_found_error, 0, "Factory 'sysv' does not exist: no System V thread support under Windows");
@@ -130,7 +141,7 @@ void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
 
     else if (!strcmp(name,"ruby"))
 #ifdef HAVE_RUBY
-      SIMIX_ctx_ruby_factory_init(factory);
+    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