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

diff --git a/src/xbt/context_private.h b/src/xbt/context_private.h
index 89e7d0a5a4..ad27b8de01 100644
--- a/src/xbt/context_private.h
+++ b/src/xbt/context_private.h
@@ -12,23 +12,49 @@
 #include "xbt/sysdep.h"
 #include "xbt/swag.h"
 #include "xbt/dynar.h" /* void_f_pvoid_t */
-#include "portable.h" /* loads context system definitions */
+#include "portable.h"  /* loads context system definitions */
+#include "ucontext_stack.h"  /* loads context system definitions */
 
 #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>
+#else
+#  define STACK_SIZE 128*1024 /* Lower this if you want to reduce the memory consumption */
+#endif     /* USE_PTHREADS */
 
-#define STACK_SIZE 524288
 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];
-  xbt_context_function_t code;        /* the scheduler fonction   */
+  struct s_xbt_context *save;
+#endif     /* USE_PTHREADS */
+  xbt_context_function_t code;	        /* the scheduler fonction   */
   int argc;
   char **argv;
-  struct s_xbt_context *save;
   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_context_t;
+#else
 
 #endif              /* _XBT_CONTEXT_PRIVATE_H */