Fix memory leak of variable job on throw (cppcheck).

[simgrid.git] / examples / smpi / replay_multiple_manual_deploy / replay_multiple_manual.cpp

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
index 59550d3..c218cbe 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
@@ -21,12 +21,11 @@
 
 #include <algorithm>
 #include <fstream>
-#include <iostream>
+#include <sstream>
 #include <stdexcept>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/regex.hpp>
 
 #include <simgrid/msg.h>
 #include <simgrid/s4u.hpp>
@@ -177,54 +176,55 @@ static std::vector<Job*> all_jobs(const std::string& workload_file)
   simgrid::xbt::Path path(workload_file);
   std::string dir = path.get_dir_name();
 
-  boost::regex r(R"(^\s*(\S+)\s+(\S+\.txt)\s+(\d+)\s+(\d+)\s+(\d+(?:,\d+)*).*$)");
   std::string line;
   while (std::getline(f, line)) {
-    boost::smatch m;
-
-    if (boost::regex_match(line, m, r)) {
+    std::string app_name;
+    std::string filename_unprefixed;
+    int app_size;
+    int starting_time;
+    std::string alloc;
+
+    std::istringstream is(line);
+    if (is >> app_name >> filename_unprefixed >> app_size >> starting_time >> alloc) {
       try {
-        Job* job           = new Job;
-        job->smpi_app_name = m[1];
-        job->filename      = dir + "/" + std::string(m[2]);
-        job->app_size      = stoi(m[3]);
-        job->starting_time = stoi(m[4]);
-        std::string alloc  = m[5];
-
-        std::string filename_unprefixed = m[2];
+        Job job;
+        job.smpi_app_name = app_name;
+        job.filename      = dir + "/" + filename_unprefixed;
+        job.app_size      = app_size;
+        job.starting_time = starting_time;
 
         std::vector<std::string> subparts;
         boost::split(subparts, alloc, boost::is_any_of(","), boost::token_compress_on);
 
-        if ((int)subparts.size() != job->app_size)
-          throw std::runtime_error("size/alloc inconsistency");
+        if ((int)subparts.size() != job.app_size)
+          throw std::invalid_argument("size/alloc inconsistency");
 
-        job->allocation.resize(subparts.size());
+        job.allocation.resize(subparts.size());
         for (unsigned int i = 0; i < subparts.size(); ++i)
-          job->allocation[i] = stoi(subparts[i]);
+          job.allocation[i] = stoi(subparts[i]);
 
         // Let's read the filename
-        std::ifstream traces_file(job->filename);
+        std::ifstream traces_file(job.filename);
         if (!traces_file.is_open())
-          throw std::runtime_error("Cannot open file " + job->filename);
+          throw std::invalid_argument("Cannot open file " + job.filename);
 
         std::string traces_line;
         while (std::getline(traces_file, traces_line)) {
           boost::trim_right(traces_line);
-          job->traces_filenames.push_back(dir + "/" + traces_line);
+          job.traces_filenames.push_back(dir + "/" + traces_line);
         }
 
-        if (static_cast<int>(job->traces_filenames.size()) < job->app_size)
-          throw std::runtime_error("size/tracefiles inconsistency");
-        job->traces_filenames.resize(job->app_size);
+        if (static_cast<int>(job.traces_filenames.size()) < job.app_size)
+          throw std::invalid_argument("size/tracefiles inconsistency");
+        job.traces_filenames.resize(job.app_size);
 
         XBT_INFO("Job read: app='%s', file='%s', size=%d, start=%d, "
                  "alloc='%s'",
-                 job->smpi_app_name.c_str(), filename_unprefixed.c_str(), job->app_size, job->starting_time,
+                 job.smpi_app_name.c_str(), filename_unprefixed.c_str(), job.app_size, job.starting_time,
                  alloc.c_str());
-        jobs.push_back(job);
-      } catch (const std::exception& e) {
-        printf("Bad line '%s' of file '%s': %s.\n", line.c_str(), workload_file.c_str(), e.what());
+        jobs.push_back(new Job(std::move(job)));
+      } catch (const std::invalid_argument& e) {
+        xbt_die("Bad line '%s' of file '%s': %s.\n", line.c_str(), workload_file.c_str(), e.what());
       }
     }
   }