-#if HAVE_CONTEXT==1
-#include <stdlib.h>
-#include <ucontext.h>
-#define STACK_SIZE 524288
-typedef struct s_context {
- ucontext_t uc; /* the thread that execute the code */
- char stack[STACK_SIZE];
- context_function_t code; /* the scheduler fonction */
- int argc;
- char **argv;
- struct s_context *save;
-} s_context_t;
+#include "xbt/context.h"
+#include "xbt/ex.h"
+
+#ifdef CONTEXT_THREADS
+# include "xbt/xbt_os_thread.h"
+#else
+# include <ucontext.h>
+# define STACK_SIZE 128*1024 /* Lower this if you want to reduce the memory consumption */
+#endif /* not CONTEXT_THREADS */
+
+
+typedef struct s_xbt_context {
+ s_xbt_swag_hookup_t hookup;
+
+ /* Declaration of the thread running the process */
+#ifdef JAVA_SIMGRID /* come first because other ones are defined too */
+ jobject jprocess; /* the java process instance */
+ JNIEnv* jenv; /* jni interface pointer for this thread */
+#else
+# ifdef CONTEXT_THREADS
+ xbt_os_thread_t thread; /* a plain dumb thread (portable to posix or windows) */
+# else
+ ucontext_t uc; /* the thread that execute the code */
+ char stack[STACK_SIZE];
+ struct s_xbt_context *save;
+# endif /* CONTEXT_THREADS */
+#endif /* JAVA_SIMGRID */
+
+ /* What we need to synchronize the process */
+#if defined(JAVA_SIMGRID) || defined(CONTEXT_THREADS)
+ xbt_os_cond_t cond; /* the condition used to synchronize the process */
+ xbt_os_mutex_t mutex; /* the mutex used to synchronize the process */