#ifndef _XBT_CONTEXT_PRIVATE_H
#define _XBT_CONTEXT_PRIVATE_H
-#define HAVE_CONTEXT 1
#include "xbt/sysdep.h"
+#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 */
+
#include "xbt/context.h"
-#ifdef HAVE_LIBPTHREAD
-#include <pthread.h>
-typedef struct s_context {
+#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 */
- context_function_t code; /* the scheduler fonction */
- int argc;
- char *argv[];
-} s_context_t;
-#endif
-
-#if HAVE_CONTEXT==1
-#include <stdlib.h>
-#include <ucontext.h>
-#define STACK_SIZE 524288
-typedef struct s_context {
+ 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;
-#endif
+ void_f_pvoid_t *startup_func;
+ void *startup_arg;
+ void_f_pvoid_t *cleanup_func;
+ void *cleanup_arg;
+} s_xbt_context_t;
+#else
#endif /* _XBT_CONTEXT_PRIVATE_H */
