Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / include / simgrid / s4u / Task.hpp

diff --git a/include/simgrid/s4u/Task.hpp b/include/simgrid/s4u/Task.hpp
index d6f41f5..5c8050b 100644 (file)
--- a/include/simgrid/s4u/Task.hpp
+++ b/include/simgrid/s4u/Task.hpp
@@ -29,9 +29,9 @@ class XBT_PUBLIC Token : public xbt::Extendable<Token> {};
 class Task {
   std::string name_;
   double amount_;
-  int queued_execs_ = 0;
-  int count_        = 0;
-  bool working_     = false;
+  int queued_firings_ = 0;
+  int count_          = 0;
+  bool working_       = false;
 
   std::set<Task*> successors_                 = {};
   std::map<Task*, unsigned int> predecessors_ = {};
@@ -47,12 +47,12 @@ class Task {
 
 protected:
   explicit Task(const std::string& name);
-  virtual ~Task()     = default;
+  virtual ~Task() = default;
 
   virtual void fire();
   void complete();
 
-  void set_current_activity (ActivityPtr a) { current_activity_ = a; }
+  void set_current_activity(ActivityPtr a) { current_activity_ = a; }
 
   inline static xbt::signal<void(Task*)> on_start;
   xbt::signal<void(Task*)> on_this_start;
@@ -74,10 +74,10 @@ public:
   void remove_all_successors();
   const std::set<Task*>& get_successors() const { return successors_; }
 
-  void enqueue_execs(int n);
+  void enqueue_firings(int n);
 
   /** Add a callback fired before this task activity starts */
-  void on_this_start_cb(const std::function<void(Task*)>& func){ on_this_start.connect(func); }
+  void on_this_start_cb(const std::function<void(Task*)>& func) { on_this_start.connect(func); }
   /** Add a callback fired before a task activity starts.
    * Triggered after the on_this_start function**/
   static void on_start_cb(const std::function<void(Task*)>& cb) { on_start.connect(cb); }