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

diff --git a/src/xbt/context_private.h b/src/xbt/context_private.h
index a2a8a9b6d2..269fb1fb28 100644
--- a/src/xbt/context_private.h
+++ b/src/xbt/context_private.h
@@ -10,31 +10,51 @@
 
 
 #include "xbt/sysdep.h"
-#include "xbt/context.h"
-#include "portable.h" /* loads context system definitions */
+#include "xbt/swag.h"
+#include "xbt/dynar.h" /* void_f_pvoid_t */
+#include "portable.h"  /* loads context system definitions */
+#include "ucontext_stack.h"  /* loads context system definitions */
 
-#define STACK_SIZE 524288
-typedef struct s_context {
+#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 524288
+#endif     /* USE_PTHREADS */
+
+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];
-  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_context *save;
-} s_context_t;
-
-
-#if 0 /* FIXME: KILLME */
-//#ifdef HAVE_LIBPTHREAD
-#include <pthread.h>
-typedef struct s_context {
-  pthread_cond_t cond;
-  pthread_mutex_t mutex;
-  pthread_t *thread;            /* the thread that execute the code   */
-  context_function_t code;                /* the scheduler fonction   */
-  int argc;
-  char *argv[];
-} s_context_t;
-#endif /* ENDOFKILLME*/
+  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 */