profile: cosmetics: inline a function and rename a variable

[simgrid.git] / src / kernel / activity / CommImpl.hpp

diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp
index 1143b3a..5582830 100644 (file)
--- a/src/kernel/activity/CommImpl.hpp
+++ b/src/kernel/activity/CommImpl.hpp
@@ -7,6 +7,7 @@
 #define SIMGRID_KERNEL_ACTIVITY_COMM_HPP
 
 #include "src/kernel/activity/ActivityImpl.hpp"
+#include "src/simix/ActorImpl.hpp"
 #include "surf/surf.hpp"
 
 enum e_smx_comm_type_t { SIMIX_COMM_SEND, SIMIX_COMM_RECEIVE, SIMIX_COMM_READY, SIMIX_COMM_DONE };
@@ -45,23 +46,23 @@ expectations of the other side, too. See  */
   void (*copy_data_fun)(smx_activity_t, void*, size_t) = nullptr;
 
   /* Surf action data */
-  simgrid::kernel::resource::Action* surfAction_ = nullptr; /* The Surf communication action encapsulated */
-  simgrid::kernel::resource::Action* src_timeout = nullptr; /* Surf's actions to instrument the timeouts */
-  simgrid::kernel::resource::Action* dst_timeout = nullptr; /* Surf's actions to instrument the timeouts */
-  smx_actor_t src_proc      = nullptr;
-  smx_actor_t dst_proc      = nullptr;
-  double rate               = 0.0;
-  double task_size          = 0.0;
+  resource::Action* surf_action_ = nullptr; /* The Surf communication action encapsulated */
+  resource::Action* src_timeout_ = nullptr; /* Surf's actions to instrument the timeouts */
+  resource::Action* dst_timeout_ = nullptr; /* Surf's actions to instrument the timeouts */
+  actor::ActorImplPtr src_actor_ = nullptr;
+  actor::ActorImplPtr dst_actor_ = nullptr;
+  double rate_                   = 0.0;
+  double task_size_              = 0.0;
 
   /* Data to be transfered */
-  void* src_buff        = nullptr;
-  void* dst_buff        = nullptr;
-  size_t src_buff_size  = 0;
-  size_t* dst_buff_size = nullptr;
+  void* src_buff_        = nullptr;
+  void* dst_buff_        = nullptr;
+  size_t src_buff_size_  = 0;
+  size_t* dst_buff_size_ = nullptr;
   bool copied           = false; /* whether the data were already copied */
 
-  void* src_data = nullptr; /* User data associated to communication */
-  void* dst_data = nullptr;
+  void* src_data_ = nullptr; /* User data associated to the communication */
+  void* dst_data_ = nullptr;
 };
 }
 }