From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 13 Jul 2018 21:48:30 +0000 (+0200)
Subject: Revert "stringify, snake_case and cleanups in k::ExecImpl"
X-Git-Tag: v3_21~441
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bdaff2753e3c9371e8122ffaf0694581b458d80d

Revert "stringify, snake_case and cleanups in k::ExecImpl"

This reverts commit 38e728f7b3bcd80fc948d911a3eaa0ec2062ab69.
---

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 31b4b4b843..d145e8fb36 100644
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -22,7 +22,6 @@ namespace activity {
 class XBT_PUBLIC ActivityImpl {
 public:
   ActivityImpl();
-  explicit ActivityImpl(std::string name) : name_(name) {}
   virtual ~ActivityImpl();
   e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */
   std::string name_;                    /* Activity name if any */
diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index 17fdf8da28..ebfa43b320 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -15,15 +15,20 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
-simgrid::kernel::activity::ExecImpl::ExecImpl(std::string name, resource::Action* surf_action,
+simgrid::kernel::activity::ExecImpl::ExecImpl(const char* name, resource::Action* surf_action,
                                               resource::Action* timeout_detector, s4u::Host* host)
-    : ActivityImpl(name), host_(host), surf_action_(surf_action), timeout_detector_(timeout_detector)
+    : host_(host)
 {
+  if (name)
+    this->name_ = name;
   this->state_ = SIMIX_RUNNING;
 
+  surf_action_ = surf_action;
   surf_action_->set_data(this);
-  if (timeout_detector != nullptr)
+  if (timeout_detector != nullptr) {
     timeout_detector->set_data(this);
+    timeout_detector_ = timeout_detector;
+  }
 
   XBT_DEBUG("Create exec %p", this);
 }
@@ -111,7 +116,7 @@ void simgrid::kernel::activity::ExecImpl::post()
     timeout_detector_ = nullptr;
   }
 
-  on_completion(this);
+  onCompletion(this);
   /* If there are simcalls associated with the synchro, then answer them */
   if (not simcalls_.empty())
     SIMIX_execution_finish(this);
@@ -137,14 +142,13 @@ simgrid::kernel::activity::ExecImpl::migrate(simgrid::s4u::Host* to)
     this->surf_action_ = new_action;
   }
 
-  on_migration(this, to);
+  onMigration(this, to);
   return this;
 }
 
 /*************
  * Callbacks *
  *************/
-simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_creation;
-simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_completion;
-simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)>
-    simgrid::kernel::activity::ExecImpl::on_migration;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::onCreation;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::onCompletion;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)> simgrid::kernel::activity::ExecImpl::onMigration;
diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 453d4f1bc3..d37b98745b 100644
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -17,7 +17,7 @@ class XBT_PUBLIC ExecImpl : public ActivityImpl {
   ~ExecImpl() override;
 
 public:
-  explicit ExecImpl(std::string name, resource::Action* surf_action, resource::Action* timeout_detector,
+  explicit ExecImpl(const char* name, resource::Action* surf_action, resource::Action* timeout_detector,
                     s4u::Host* host);
   void suspend() override;
   void resume() override;
@@ -36,9 +36,10 @@ private:
   resource::Action* timeout_detector_ = nullptr;
 
 public:
-  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> on_creation;
-  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> on_completion;
-  static simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)> on_migration;
+  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> onCreation;
+  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> onCompletion;
+  static simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)> onMigration;
+
 };
 }
 }
diff --git a/src/plugins/dirty_page_tracking.cpp b/src/plugins/dirty_page_tracking.cpp
index df2cc070d5..4097976bb3 100644
--- a/src/plugins/dirty_page_tracking.cpp
+++ b/src/plugins/dirty_page_tracking.cpp
@@ -107,8 +107,8 @@ void sg_vm_dirty_page_tracking_init()
     simgrid::vm::DirtyPageTrackingExt::EXTENSION_ID =
         simgrid::vm::VirtualMachineImpl::extension_create<simgrid::vm::DirtyPageTrackingExt>();
     simgrid::vm::VirtualMachineImpl::on_creation.connect(&on_virtual_machine_creation);
-    simgrid::kernel::activity::ExecImpl::on_creation.connect(&on_exec_creation);
-    simgrid::kernel::activity::ExecImpl::on_completion.connect(&on_exec_completion);
+    simgrid::kernel::activity::ExecImpl::onCreation.connect(&on_exec_creation);
+    simgrid::kernel::activity::ExecImpl::onCompletion.connect(&on_exec_completion);
   }
 }
 
diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 022a54f9ee..3b1cde9b47 100644
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -76,7 +76,7 @@ SIMIX_execution_start(const char* name, double flops_amount, double priority, do
       new simgrid::kernel::activity::ExecImpl(name, surf_action, /*timeout_detector*/ nullptr, host));
 
   XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name_.c_str());
-  simgrid::kernel::activity::ExecImpl::on_creation(exec);
+  simgrid::kernel::activity::ExecImpl::onCreation(exec);
 
   return exec;
 }