Fix clang builds (unused lambda capture)

[simgrid.git] / src / dag / loaders.cpp

diff --git a/src/dag/loaders.cpp b/src/dag/loaders.cpp
index 48d833a19a9df1a72752a6a2126191bb09de57d7..c697e9e4be8e19b3faf4c450cd4fa4eff531c37f 100644 (file)
--- a/src/dag/loaders.cpp
+++ b/src/dag/loaders.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2021. The SimGrid Team.
+/* Copyright (c) 2009-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -19,12 +19,12 @@
 #include "dax_dtd.h"
 #include "dax_dtd.c"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(dag_parsing, "Generation DAGs from files");
-
 #if HAVE_GRAPHVIZ
 #include <graphviz/cgraph.h>
 #endif
 
+XBT_LOG_NEW_DEFAULT_CATEGORY(dag_parsing, "Generation DAGs from files");
+
 /* Ensure that transfer tasks have unique names even though a file is used several times */
 static void uniq_transfer_task_name(simgrid::s4u::Comm* comm)
 {
@@ -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);
     }
@@ -281,6 +281,7 @@ std::vector<ActivityPtr> create_DAG_from_dot(const std::string& filename)
     for (const auto& a : dag)
       a->destroy();
     dag.clear();
+    dag.shrink_to_fit();
   }
 
   return dag;