smells --

[simgrid.git] / src / kernel / context / ContextRaw.cpp

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 600e935..a49ead0 100644 (file)
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -23,7 +23,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 // ***** Class definitions
 
 namespace simgrid {
-namespace simix {
+namespace kernel {
+namespace context {
 
 class RawContext;
 class RawContextFactory;
@@ -42,7 +43,7 @@ public:
   friend class RawContextFactory;
   RawContext(std::function<void()> code,
           void_pfn_smxprocess_t cleanup_func,
-          smx_process_t process);
+          smx_actor_t process);
   ~RawContext() override;
 public:
   static void wrapper(void* arg);
@@ -61,7 +62,7 @@ public:
   RawContextFactory();
   ~RawContextFactory() override;
   RawContext* create_context(std::function<void()> code,
-    void_pfn_smxprocess_t cleanup, smx_process_t process) override;
+    void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
   void run_all() override;
 private:
   void run_all_adaptative();
@@ -75,20 +76,19 @@ ContextFactory* raw_factory()
   return new RawContextFactory();
 }
 
-}
-}
+}}} // namespace
 
 // ***** Loads of static stuff
 
 #if HAVE_THREAD_CONTEXTS
 static xbt_parmap_t raw_parmap;
-static simgrid::simix::RawContext** raw_workers_context;    /* space to save the worker context in each thread */
+static simgrid::kernel::context::RawContext** raw_workers_context;    /* space to save the worker context in each thread */
 static uintptr_t raw_threads_working;     /* number of threads that have started their work */
 static xbt_os_thread_key_t raw_worker_id_key; /* thread-specific storage for the thread id */
 #endif
 static unsigned long raw_process_index = 0;   /* index of the next process to run in the
                                                * list of runnable processes */
-static simgrid::simix::RawContext* raw_maestro_context;
+static simgrid::kernel::context::RawContext* raw_maestro_context;
 
 static bool raw_context_parallel = false;
 
@@ -262,7 +262,8 @@ void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context) {
 // ***** Method definitions
 
 namespace simgrid {
-namespace simix {
+namespace kernel {
+namespace context {
 
 RawContextFactory::RawContextFactory()
   : ContextFactory("RawContextFactory")
@@ -291,21 +292,20 @@ RawContextFactory::~RawContextFactory()
 }
 
 RawContext* RawContextFactory::create_context(std::function<void()> code,
-    void_pfn_smxprocess_t cleanup, smx_process_t process)
+    void_pfn_smxprocess_t cleanup, smx_actor_t process)
 {
-  return this->new_context<RawContext>(std::move(code),
-    cleanup, process);
+  return this->new_context<RawContext>(std::move(code), cleanup, process);
 }
 
 void RawContext::wrapper(void* arg)
 {
-  RawContext* context = (RawContext*) arg;
+  RawContext* context = static_cast<RawContext*>(arg);
   (*context)();
   context->stop();
 }
 
 RawContext::RawContext(std::function<void()> code,
-    void_pfn_smxprocess_t cleanup, smx_process_t process)
+    void_pfn_smxprocess_t cleanup, smx_actor_t process)
   : Context(std::move(code), cleanup, process)
 {
    if (has_code()) {
@@ -345,8 +345,11 @@ void RawContextFactory::run_all()
 
 void RawContextFactory::run_all_serial()
 {
-  smx_process_t first_process =
-      xbt_dynar_get_as(simix_global->process_to_run, 0, smx_process_t);
+  if (xbt_dynar_is_empty(simix_global->process_to_run))
+    return;
+
+  smx_actor_t first_process =
+      xbt_dynar_get_as(simix_global->process_to_run, 0, smx_actor_t);
   raw_process_index = 1;
   static_cast<RawContext*>(first_process->context)->resume_serial();
 }
@@ -360,7 +363,7 @@ void RawContextFactory::run_all_parallel()
       SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
   xbt_parmap_apply(raw_parmap,
       [](void* arg) {
-        smx_process_t process = static_cast<smx_process_t>(arg);
+        smx_actor_t process = static_cast<smx_actor_t>(arg);
         RawContext* context = static_cast<RawContext*>(process->context);
         context->resume_parallel();
       },
@@ -382,18 +385,16 @@ void RawContext::suspend_serial()
 {
   /* determine the next context */
   RawContext* next_context = nullptr;
-  unsigned long int i;
-  i = raw_process_index++;
+  unsigned long int i      = raw_process_index;
+  raw_process_index++;
   if (i < xbt_dynar_length(simix_global->process_to_run)) {
     /* execute the next process */
     XBT_DEBUG("Run next process");
-    next_context = (RawContext*) xbt_dynar_get_as(
-        simix_global->process_to_run, i, smx_process_t)->context;
-  }
-  else {
+    next_context = static_cast<RawContext*>(xbt_dynar_get_as(simix_global->process_to_run, i, smx_actor_t)->context);
+  } else {
     /* all processes were run, return to maestro */
     XBT_DEBUG("No more process to run");
-    next_context = (RawContext*) raw_maestro_context;
+    next_context = static_cast<RawContext*>(raw_maestro_context);
   }
   SIMIX_context_set_current(next_context);
   raw_swapcontext(&this->stack_top_, next_context->stack_top_);
@@ -403,20 +404,19 @@ void RawContext::suspend_parallel()
 {
 #if HAVE_THREAD_CONTEXTS
   /* determine the next context */
-  smx_process_t next_work = (smx_process_t) xbt_parmap_next(raw_parmap);
+  smx_actor_t next_work    = static_cast<smx_actor_t>(xbt_parmap_next(raw_parmap));
   RawContext* next_context = nullptr;
 
   if (next_work != nullptr) {
     /* there is a next process to resume */
     XBT_DEBUG("Run next process");
-    next_context = (RawContext*) next_work->context;
-  }
-  else {
+    next_context = static_cast<RawContext*>(next_work->context);
+  } else {
     /* all processes were run, go to the barrier */
     XBT_DEBUG("No more processes to run");
     uintptr_t worker_id = (uintptr_t)
       xbt_os_thread_get_specific(raw_worker_id_key);
-    next_context = (RawContext*) raw_workers_context[worker_id];
+    next_context = static_cast<RawContext*>(raw_workers_context[worker_id]);
     XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)",
         worker_id, raw_threads_working);
   }
@@ -445,7 +445,7 @@ void RawContext::resume_parallel()
 #if HAVE_THREAD_CONTEXTS
   uintptr_t worker_id = __sync_fetch_and_add(&raw_threads_working, 1);
   xbt_os_thread_set_specific(raw_worker_id_key, (void*) worker_id);
-  RawContext* worker_context = (RawContext*) SIMIX_context_self();
+  RawContext* worker_context     = static_cast<RawContext*>(SIMIX_context_self());
   raw_workers_context[worker_id] = worker_context;
   XBT_DEBUG("Saving worker stack %zu", worker_id);
   SIMIX_context_set_current(this);
@@ -459,17 +459,16 @@ void RawContext::resume_parallel()
 void RawContextFactory::run_all_adaptative()
 {
   unsigned long nb_processes = xbt_dynar_length(simix_global->process_to_run);
-  if (SIMIX_context_is_parallel()
-    && (unsigned long) SIMIX_context_get_parallel_threshold() < nb_processes) {
-        raw_context_parallel = true;
-        XBT_DEBUG("Runall // %lu", nb_processes);
-        this->run_all_parallel();
-    } else {
-        XBT_DEBUG("Runall serial %lu", nb_processes);
-        raw_context_parallel = false;
-        this->run_all_serial();
-    }
+  if (SIMIX_context_is_parallel() &&
+      static_cast<unsigned long>(SIMIX_context_get_parallel_threshold()) < nb_processes) {
+    raw_context_parallel = true;
+    XBT_DEBUG("Runall // %lu", nb_processes);
+    this->run_all_parallel();
+  } else {
+    XBT_DEBUG("Runall serial %lu", nb_processes);
+    raw_context_parallel = false;
+    this->run_all_serial();
+  }
 }
 
-}
-}
+}}}