Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
don't use either pthread or winthread to implement xbt_context, but use our compatibi...
[simgrid.git] / src / xbt / context_private.h
index 52540ad..3864978 100644 (file)
@@ -8,35 +8,48 @@
 #ifndef _XBT_CONTEXT_PRIVATE_H
 #define _XBT_CONTEXT_PRIVATE_H
 
-#define HAVE_CONTEXT 1
 
 #include "xbt/sysdep.h"
-#include "xbt/context.h"
-
-#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
+#include "xbt/swag.h"
+#include "xbt/dynar.h" /* void_f_pvoid_t */
+#include "portable.h"  /* loads context system definitions */
 
-#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;
+#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32) && !defined(__TOS_WIN__)
+#include "ucontext_stack.h"  /* loads context system definitions */
 #endif
 
-#endif              /* _XBT_CONTEXT_PRIVATE_H */
+#include "xbt/context.h"
+#include "xbt/ex.h"
+
+#ifdef CONTEXT_THREADS
+#  include "xbt/xbt_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;
+#ifdef CONTEXT_THREADS
+       xbt_thcond_t cond;
+       xbt_mutex_t mutex;
+       xbt_thread_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 /* CONTEXT_THREADS */
+       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_context_t;
+
+
+#endif /* !_XBT_CONTEXT_PRIVATE_H */