#include <stdarg.h>
#include <functional>
+#include <ucontext.h> /* context relative declarations */
#include "xbt/parmap.h"
#include "src/simix/smx_private.h"
#include "src/simix/smx_private.hpp"
#include "src/internal_config.h"
-#include "src/context_sysv_config.h" /* loads context system definitions */
#include "mc/mc.h"
-#ifdef _XBT_WIN32
-# include <xbt/win32_ucontext.h> /* context relative declarations */
-#else
-# include <ucontext.h> /* context relative declarations */
-#endif
-
/** Many integers are needed to store a pointer
*
* This is a bit paranoid about sizeof(smx_ctx_sysv_t) not being a multiple
* Makecontext expects integer arguments, we the context
* variable is decomposed into a serie of integers and
* each integer is passed as argument to makecontext. */
-static
-void simgrid_makecontext(ucontext_t* ucp, void (*func)(int first, ...), void* arg)
+static void simgrid_makecontext(ucontext_t* ucp, void (*func)(int first, ...), void* arg)
{
int ctx_addr[CTX_ADDR_LEN];
memcpy(ctx_addr, &arg, sizeof(void*));
makecontext(ucp, (void (*)()) func, 2, ctx_addr[0], ctx_addr[1]);
break;
default:
- xbt_die("Ucontexts are not supported on this arch yet (addr len = %zu/%zu = %zu)",
- sizeof(void*), sizeof(int), CTX_ADDR_LEN);
+ xbt_die("Ucontexts are not supported on this arch yet (addr len = %zu/%zu = %zu)", sizeof(void*), sizeof(int), CTX_ADDR_LEN);
}
}
#ifdef HAVE_THREAD_CONTEXTS
static xbt_parmap_t sysv_parmap;
static simgrid::simix::ParallelUContext** sysv_workers_context; /* space to save the worker's context in each thread */
-static unsigned long sysv_threads_working; /* number of threads that have started their work */
+static uintptr_t sysv_threads_working; /* number of threads that have started their work */
static xbt_os_thread_key_t sysv_worker_id_key; /* thread-specific storage for the thread id */
#endif
static unsigned long sysv_process_index = 0; /* index of the next process to run in the
void_pfn_smxprocess_t cleanup_func, smx_process_t process)
: Context(std::move(code), cleanup_func, process)
{
- /* if the user provided a function for the process then use it,
- otherwise it is the context for maestro */
+ /* if the user provided a function for the process then use it, otherwise it is the context for maestro */
if (has_code()) {
this->stack_ = (char*) SIMIX_context_stack_new();
getcontext(&this->uc_);
this->uc_.uc_link = nullptr;
- this->uc_.uc_stack.ss_sp = pth_skaddr_makecontext(
- this->stack_, smx_context_usable_stack_size);
- this->uc_.uc_stack.ss_size = pth_sksize_makecontext(
- this->stack_, smx_context_usable_stack_size);
+ this->uc_.uc_stack.ss_sp = sg_makecontext_stack_addr(this->stack_);
+ this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_usable_stack_size);
simgrid_makecontext(&this->uc_, smx_ctx_sysv_wrapper, this);
} else {
if (process != NULL && sysv_maestro_context == NULL)
{
#ifdef HAVE_THREAD_CONTEXTS
// What is my containing body?
- unsigned long worker_id = __sync_fetch_and_add(&sysv_threads_working, 1);
+ uintptr_t worker_id = __sync_fetch_and_add(&sysv_threads_working, 1);
// Store the number of my containing body in os-thread-specific area :
xbt_os_thread_set_specific(sysv_worker_id_key, (void*) worker_id);
// Get my current soul:
XBT_DEBUG("No more processes to run");
// Get back the identity of my body that was stored when starting
// the scheduling round
- unsigned long worker_id =
- (unsigned long) xbt_os_thread_get_specific(sysv_worker_id_key);
+ uintptr_t worker_id =
+ (uintptr_t) xbt_os_thread_get_specific(sysv_worker_id_key);
// Deduce the initial soul of that body
next_context = (ParallelUContext*) sysv_workers_context[worker_id];
// When given that soul, the body will wait for the next scheduling round