X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..c93f29cd7a1453e10d8635f11e48cf0d537a83a2:/src/kernel/context/ContextRaw.cpp diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 1df1de7fdb..5695d19728 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -27,10 +27,11 @@ class RawContextFactory; * preserve the signal mask when switching. This saves a system call (at least on Linux) on each context switch. */ class RawContext : public Context { -protected: +private: void* stack_ = nullptr; /** pointer to top the stack stack */ void* stack_top_ = nullptr; + public: friend class RawContextFactory; RawContext(std::function code, @@ -267,7 +268,7 @@ RawContextFactory::RawContextFactory() xbt_os_thread_key_create(&raw_worker_id_key); // TODO, lazily init raw_parmap = nullptr; - raw_workers_context = xbt_new(RawContext*, nthreads); + raw_workers_context = new RawContext*[nthreads]; raw_maestro_context = nullptr; #endif // TODO: choose dynamically when SIMIX_context_get_parallel_threshold() > 1 @@ -278,7 +279,7 @@ RawContextFactory::~RawContextFactory() { #if HAVE_THREAD_CONTEXTS delete raw_parmap; - xbt_free(raw_workers_context); + delete[] raw_workers_context; #endif } @@ -408,7 +409,7 @@ void RawContext::suspend_parallel() XBT_DEBUG("No more processes to run"); uintptr_t worker_id = (uintptr_t) xbt_os_thread_get_specific(raw_worker_id_key); - next_context = static_cast(raw_workers_context[worker_id]); + next_context = raw_workers_context[worker_id]; XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id, raw_threads_working); }