From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 17 Jan 2022 14:37:06 +0000 (+0100)
Subject: Rename method, and make it return a boolean.
X-Git-Tag: v3.30~85
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d7eafaa8d4c2e62e38309af508b04888fbbd1270?hp=b8a4fae0590e47ddc92b9fdab95bddb6487c8c74

Rename method, and make it return a boolean.
---

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index df676a1e7f..4319dcbb1c 100644
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -46,7 +46,7 @@ public:
 
   virtual bool is_assigned() const = 0;
   bool dependencies_solved() const { return dependencies_.empty(); }
-  unsigned long is_waited_by() const { return successors_.size(); }
+  bool has_no_successor() const { return successors_.empty(); }
   const std::set<ActivityPtr>& get_dependencies() const { return dependencies_; }
   const std::vector<ActivityPtr>& get_successors() const { return successors_; }
 
diff --git a/src/dag/loaders.cpp b/src/dag/loaders.cpp
index 8187942b15..c697e9e4be 100644
--- a/src/dag/loaders.cpp
+++ b/src/dag/loaders.cpp
@@ -41,7 +41,7 @@ static bool check_for_cycle(const std::vector<simgrid::s4u::ActivityPtr>& dag)
   std::vector<simgrid::s4u::ActivityPtr> current;
 
   for (const auto& a : dag)
-    if (dynamic_cast<simgrid::s4u::Exec*>(a.get()) != nullptr && a->is_waited_by() == 0)
+    if (dynamic_cast<simgrid::s4u::Exec*>(a.get()) != nullptr && a->has_no_successor())
       current.push_back(a);
 
   while (not current.empty()) {
@@ -123,7 +123,7 @@ std::vector<ActivityPtr> create_DAG_from_DAX(const std::string& filename)
         result.push_back(newfile);
       }
     }
-    if (file->is_waited_by() == 0) {
+    if (file->has_no_successor()) {
       for (auto const& it : file->get_dependencies()) {
         newfile = Comm::sendto_init()->set_name(file->get_name())->set_payload_size(file->get_remaining());
         it->add_successor(newfile);
@@ -162,7 +162,7 @@ std::vector<ActivityPtr> create_DAG_from_DAX(const std::string& filename)
       if ((a != root_task) && (a != end_task)) {
         if (a->dependencies_solved())
           root_task->add_successor(a);
-        if (a->is_waited_by() == 0)
+        if (a->has_no_successor())
           a->add_successor(end_task);
       }
     }
@@ -267,7 +267,7 @@ std::vector<ActivityPtr> create_DAG_from_dot(const std::string& filename)
       root->add_successor(a);
     }
 
-    if (a->is_waited_by() == 0 && a != end) {
+    if (a->has_no_successor() && a != end) {
       XBT_DEBUG("Activity '%s' has no successors. Add dependency to 'end'", a->get_cname());
       a->add_successor(end);
     }