factor surf_action_ in ActivityImpl

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

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index dba9a7a..8f1267f 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -21,11 +21,14 @@ namespace activity {
 
 class XBT_PUBLIC ActivityImpl {
 public:
-  ActivityImpl();
-  virtual ~ActivityImpl();
-  e_smx_state_t state = SIMIX_WAITING; /* State of the activity */
-  std::string name;                    /* Activity name if any */
-  std::list<smx_simcall_t> simcalls;   /* List of simcalls waiting for this activity */
+  ActivityImpl() = default;
+  explicit ActivityImpl(std::string name) : name_(name) {}
+  explicit ActivityImpl(std::string name, resource::Action* surf_action) : name_(name), surf_action_(surf_action) {}
+  virtual ~ActivityImpl() = default;
+  e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */
+  std::string name_;                    /* Activity name if any */
+  std::list<smx_simcall_t> simcalls_;   /* List of simcalls waiting for this activity */
+  resource::Action* surf_action_ = nullptr;
 
   virtual void suspend() = 0;
   virtual void resume()  = 0;