#include "xbt/sysdep.h"
-#include "xbt/context.h"
-#include "portable.h" /* loads context system definitions */
-
-#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/swag.h"
+#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
-#if 0 /* FIXME: KILLME */
-//#ifdef HAVE_LIBPTHREAD
-#include <pthread.h>
-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 128*1024 /* Lower this if you want to reduce the memory consumption */
+#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 */
- context_function_t code; /* the scheduler fonction */
+ 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[];
-} s_context_t;
-#endif /* ENDOFKILLME*/
+ 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;
+#else
#endif /* _XBT_CONTEXT_PRIVATE_H */
