X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3e6ed71424d1f37f8894fae0e1d0b471a1e5b47..dfe761f4bc8d35a74c3da5fabe99630c0788001f:/src/xbt/context_private.h

diff --git a/src/xbt/context_private.h b/src/xbt/context_private.h
index 3add76df69..75d378a0d6 100644
--- a/src/xbt/context_private.h
+++ b/src/xbt/context_private.h
@@ -14,50 +14,52 @@
 #include "xbt/dynar.h" /* void_f_pvoid_t */
 #include "portable.h"  /* loads context system definitions */
 
-#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32) && !defined(__TOS_WIN__)
-#include "ucontext_stack.h"  /* loads context system definitions */
-#endif
-
 #include "xbt/context.h"
 #include "xbt/ex.h"
 
-#ifdef S_SPLINT_S
-/* Dummy definition for splint since it chokes on ucontext.h */
-typedef struct ucontext {
-   struct ucontext *uc_link;
-   sigset_t uc_sigmask;
-   int uc_stack;
-   int uc_mcontext;
-} ucontext_t;
-typedef int CONTEXT;
-#endif 
-
-#ifdef USE_PTHREADS
-#  include <pthread.h>
+#ifdef CONTEXT_THREADS
+#  include "xbt/xbt_os_thread.h"
 #else
+#  include "ucontext_stack.h"  /* loads context system definitions */
+#  include <ucontext.h>
 #  define STACK_SIZE 128*1024 /* Lower this if you want to reduce the memory consumption */
-#endif     /* USE_PTHREADS */
+#endif     /* not CONTEXT_THREADS */
+
 
 typedef struct s_xbt_context {
-  s_xbt_swag_hookup_t hookup;
-#ifdef USE_PTHREADS
-  pthread_cond_t cond;
-  pthread_mutex_t mutex;
-  pthread_t *thread;		/* the thread that execute the code   */
-#else
-  ucontext_t uc;                /* the thread that execute the code   */
-  char stack[STACK_SIZE];
-  struct s_xbt_context *save;
-#endif     /* USE_PTHREADS */
-  xbt_context_function_t code;	        /* the scheduler fonction   */
-  int argc;
-  char **argv;
-  void_f_pvoid_t *startup_func;
-  void *startup_arg;
-  void_f_pvoid_t *cleanup_func;
-  void *cleanup_arg;
-  ex_ctx_t *exception;	        /* exception */
+	s_xbt_swag_hookup_t hookup;
+   	char *name;
+
+	/* 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	*/
+	ex_ctx_t *exception; /* exception container -- only in ucontext&java, os_threads deals with it for us otherwise */
+#else   
+# ifdef CONTEXT_THREADS
+	xbt_os_thread_t thread; /* a plain dumb thread (portable to posix or windows) */
+	xbt_os_sem_t begin;		/* this semaphore is used to schedule/unschedule the process */
+	xbt_os_sem_t end;		/* this semaphore is used to schedule/unschedule the process */
+# else
+	ucontext_t uc;	     /* the thread that execute the code */
+	char stack[STACK_SIZE];
+	struct s_xbt_context *save;
+	ex_ctx_t *exception; /* exception container -- only in ucontext&java, os_threads deals with it for us otherwise */
+# endif /* CONTEXT_THREADS */
+#endif /* JAVA_SIMGRID */
+
+	/* What to run */
+	xbt_main_func_t code;	/* the scheduled fonction	    */
+	int argc;
+	char **argv;
+   
+	/* Init/exit functions */   
+	void_f_pvoid_t startup_func;
+	void *startup_arg;
+	void_f_pvoid_t cleanup_func;
+	void *cleanup_arg;
+   	int iwannadie;                  /* Set to true by the context when it wants to commit suicide */
 } s_xbt_context_t;
-#else
 
-#endif              /* _XBT_CONTEXT_PRIVATE_H */
+
+#endif	/* !_XBT_CONTEXT_PRIVATE_H */