code: remove job/profile json_description

Author: mpoquet

Diff for: src/job_submitter.cpp

@@ -282,10 +282,6 @@ static string submit_workflow_task_as_job(BatsimContext *context, string workflo
     DelayProfileData * data = new DelayProfileData;
     data->delay = task->execution_time;
     profile->data = data;
-    profile->json_description = std::string() + "{" +
-            "\"type\": \"delay\", "+
-            "\"delay\": " + std::to_string(task->execution_time) +
-            "}";
     string profile_name = workflow_name + "_" + task->id; // Create a profile name
     profile->name = profile_name;
     context->workloads.at(workload_name)->profiles->add_profile(profile_name, profile);

Diff for: src/jobs.cpp

@@ -10,16 +10,13 @@
 #include <fstream>
 #include <streambuf>
 #include <algorithm>
-#include <regex>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
 
 #include <simgrid/s4u.hpp>
 
 #include <rapidjson/document.h>
-#include <rapidjson/writer.h>
-#include <rapidjson/stringbuffer.h>
 
 #include "profiles.hpp"
 
@@ -407,55 +404,6 @@ JobPtr Job::from_json(const rapidjson::Value & json_desc,
                error_prefix.c_str(), profile_name.c_str(), j->id.to_string().c_str());
     j->profile = workload->profiles->at(profile_name);
 
-    // Let's get the JSON string which originally described the job
-    // (to conserve potential fields unused by Batsim)
-    rapidjson::StringBuffer buffer;
-    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-    json_desc.Accept(writer);
-
-    // Let's replace the job ID by its WLOAD!NUMBER counterpart if needed
-    // in the json raw description
-    string json_description_tmp(buffer.GetString(), buffer.GetSize());
-    /// @cond DOXYGEN_FAILS_PARSING_THIS_REGEX
-    std::regex r(R"("id"\s*:\s*(?:"*[^(,|})]*"*)\s*)");
-    /// @endcond
-    string replacement_str = "\"id\":\"" + j->id.to_string() + "\"";
-    // XBT_INFO("Before regexp: %s", json_description_tmp.c_str());
-    j->json_description = std::regex_replace(json_description_tmp, r, replacement_str);
-
-    // Let's check that the new description is a valid JSON string
-    rapidjson::Document check_doc;
-    check_doc.Parse(j->json_description.c_str());
-    xbt_assert(!check_doc.HasParseError(),
-               "A problem occured when replacing the job_id by its WLOAD!job_name counterpart:"
-               "The output string '%s' is not valid JSON.", j->json_description.c_str());
-    xbt_assert(check_doc.IsObject(),
-               "A problem occured when replacing the job_id by its WLOAD!job_name counterpart: "
-               "The output string '%s' is not valid JSON.", j->json_description.c_str());
-    xbt_assert(check_doc.HasMember("id"),
-               "A problem occured when replacing the job_id by its WLOAD!job_name counterpart: "
-               "The output JSON '%s' has no 'id' field.", j->json_description.c_str());
-    xbt_assert(check_doc["id"].IsString(),
-               "A problem occured when replacing the job_id by its WLOAD!job_name counterpart: "
-               "The output JSON '%s' has a non-string 'id' field.", j->json_description.c_str());
-    xbt_assert(check_doc.HasMember("subtime") && check_doc["subtime"].IsNumber(),
-               "A problem occured when replacing the job_id by its WLOAD!job_name counterpart: "
-               "The output JSON '%s' has no 'subtime' field (or it is not a number)",
-               j->json_description.c_str());
-    xbt_assert((check_doc.HasMember("walltime") && check_doc["walltime"].IsNumber())
-               || (!check_doc.HasMember("walltime")),
-               "A problem occured when replacing the job_id by its WLOAD!job_name counterpart: "
-               "The output JSON '%s' has no 'walltime' field (or it is not a number)",
-               j->json_description.c_str());
-    xbt_assert(check_doc.HasMember("res") && check_doc["res"].IsInt(),
-               "A problem occured when replacing the job_id by its WLOAD!job_name counterpart: "
-               "The output JSON '%s' has no 'res' field (or it is not an integer)",
-               j->json_description.c_str());
-    xbt_assert(check_doc.HasMember("profile") && check_doc["profile"].IsString(),
-               "A problem occured when replacing the job_id by its WLOAD!job_name counterpart: "
-               "The output JSON '%s' has no 'profile' field (or it is not a string)",
-               j->json_description.c_str());
-
     XBT_DEBUG("Job '%s' Loaded", j->id.to_string().c_str());
     return j;
 }

Diff for: src/jobs.hpp

@@ -209,7 +209,6 @@ struct Job
     Workload * workload = nullptr; //!< The workload the job belongs to
     JobIdentifier id; //!< The job unique identifier
     BatTask * task = nullptr; //!< The root task be executed by this job (profile instantiation).
-    std::string json_description; //!< The JSON description of the job
     std::set<simgrid::s4u::ActorPtr> execution_actors; //!< The actors involved in running the job
     std::deque<std::string> incoming_message_buffer; //!< The buffer for incoming messages from the scheduler.
 

Diff for: src/jobs_execution.cpp

@@ -116,8 +116,8 @@ int execute_task(
         return execute_trace_replay(btask, alloc_placement, remaining_time, context);
     }
     else
-        xbt_die("Cannot execute job %s: the profile '%s' is of unknown type: %s",
-                job->id.to_cstring(), job->profile->name.c_str(), profile->json_description.c_str());
+        xbt_die("Cannot execute job %s: the profile '%s' is of unknown type (%d)",
+                job->id.to_cstring(), job->profile->name.c_str(), (int)profile->type);
 
     return 1;
 }

Diff for: src/profiles.cpp

@@ -14,8 +14,6 @@
 #include <xbt/asserts.h>
 
 #include <rapidjson/document.h>
-#include <rapidjson/writer.h>
-#include <rapidjson/stringbuffer.h>
 
 using namespace std;
 using namespace rapidjson;
@@ -633,13 +631,6 @@ ProfilePtr Profile::from_json(const std::string & profile_name,
                 profile_name.c_str(), profile_type.c_str());
     }
 
-
-    // Let's get the JSON string which describes the profile (to conserve potential fields unused by Batsim)
-    rapidjson::StringBuffer buffer;
-    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-    json_desc.Accept(writer);
-    profile->json_description = string(buffer.GetString(), buffer.GetSize());
-
     return profile;
 }
 

Diff for: src/profiles.hpp

@@ -47,7 +47,6 @@ struct Profile
 
     ProfileType type; //!< The type of the profile
     void * data; //!< The associated data
-    std::string json_description; //!< The JSON description of the profile
     std::string name; //!< the profile unique name
     int return_code = 0;  //!< The return code of this profile's execution (SUCCESS == 0)