code,edc: update w.r.t. batprotocol update

Author: mpoquet

flake.lock

@@ -310,7 +310,7 @@ IPMessage::~IPMessage()
         } break;
         case IPMessageType::SCHED_HELLO:
         {
-            auto * msg = static_cast<ExternalDecisionComponentHelloMessage *>(data);
+            auto * msg = static_cast<EDCHelloMessage *>(data);
             delete msg;
         } break;
         case IPMessageType::SCHED_REJECT_JOB:

src/ipp.cpp

@@ -198,7 +198,7 @@ struct KillJobsMessage
 /**
  * @brief Wrapper struct around batprotocol::fb::EDCRequestedSimulationFeatures
  */
-struct ExternalDecisionComponentRequestedSimulationFeatures
+struct EDCRequestedSimulationFeatures
 {
     bool dynamic_registration = false; //!< cf. batprotocol::fb::EDCRequestedSimulationFeatures
     bool profile_reuse = false; //!< cf. batprotocol::fb::EDCRequestedSimulationFeatures
@@ -210,15 +210,15 @@ struct ExternalDecisionComponentRequestedSimulationFeatures
 };
 
 /**
- * @brief The content of the SCHED_HELLO message
+ * @brief The content of the EDC_HELLO message
  */
-struct ExternalDecisionComponentHelloMessage
+struct EDCHelloMessage
 {
     std::string batprotocol_version; //!< The batprotocol version used by the external decision component
     std::string edc_name; //!< The name of the external decision component
     std::string edc_version; //!< The version of the external decision component
     std::string edc_commit; //!< The commit of the external decision component
-    ExternalDecisionComponentRequestedSimulationFeatures requested_simulation_features; //!< The simulation features requested by this EDC
+    EDCRequestedSimulationFeatures requested_simulation_features; //!< The simulation features requested by this EDC
 };
 
 /**

src/ipp.hpp

@@ -91,7 +91,7 @@ std::shared_ptr<batprotocol::KillProgress> battask_to_kill_progress(const BatTas
 std::shared_ptr<batprotocol::Job> to_job(const Job & job)
 {
     auto proto_job = batprotocol::Job::make();
-    proto_job->set_host_number(job.requested_nb_res); // TODO: handle core/ghost requests
+    proto_job->set_resource_number(job.requested_nb_res);
     proto_job->set_walltime(job.walltime);
     proto_job->set_profile(job.profile->name); // TODO: handle ghost jobs without profile
     // TODO: handle extra data
@@ -290,9 +290,9 @@ KillJobsMessage *from_kill_jobs(const batprotocol::fb::KillJobsEvent * kill_jobs
     return msg;
 }
 
-ExternalDecisionComponentHelloMessage *from_edc_hello(const batprotocol::fb::ExternalDecisionComponentHelloEvent * edc_hello, BatsimContext * context)
+EDCHelloMessage *from_edc_hello(const batprotocol::fb::EDCHelloEvent * edc_hello, BatsimContext * context)
 {
-    auto msg = new ExternalDecisionComponentHelloMessage;
+    auto msg = new EDCHelloMessage;
 
     msg->batprotocol_version = edc_hello->batprotocol_version()->str();
     msg->edc_name = edc_hello->decision_component_name()->str();
@@ -354,9 +354,9 @@ void parse_batprotocol_message(const uint8_t * buffer, uint32_t buffer_size, dou
             ip_message->type = IPMessageType::SCHED_KILL_JOBS;
             ip_message->data = static_cast<void *>(from_kill_jobs(event_timestamp->event_as_KillJobsEvent(), context));
         } break;
-        case Event_ExternalDecisionComponentHelloEvent: {
+        case Event_EDCHelloEvent: {
             ip_message->type = IPMessageType::SCHED_HELLO;
-            ip_message->data = static_cast<void *>(from_edc_hello(event_timestamp->event_as_ExternalDecisionComponentHelloEvent(), context));
+            ip_message->data = static_cast<void *>(from_edc_hello(event_timestamp->event_as_EDCHelloEvent(), context));
         } break;
         default: {
             xbt_assert("Unhandled event type received (%s)", batprotocol::fb::EnumNamesEvent()[event_timestamp->event_type()]);

src/protocol.cpp

@@ -29,7 +29,7 @@ batprotocol::SimulationBegins to_simulation_begins(const BatsimContext * context
 ExecuteJobMessage * from_execute_job(const batprotocol::fb::ExecuteJobEvent * execute_job, BatsimContext * context);
 RejectJobMessage * from_reject_job(const batprotocol::fb::RejectJobEvent * reject_job, BatsimContext * context);
 KillJobsMessage * from_kill_jobs(const batprotocol::fb::KillJobsEvent * kill_jobs, BatsimContext * context);
-ExternalDecisionComponentHelloMessage * from_edc_hello(const batprotocol::fb::ExternalDecisionComponentHelloEvent * edc_hello, BatsimContext * context);
+EDCHelloMessage * from_edc_hello(const batprotocol::fb::EDCHelloEvent * edc_hello, BatsimContext * context);
 
 void parse_batprotocol_message(const uint8_t * buffer, uint32_t buffer_size, double & now, std::shared_ptr<std::vector<IPMessageWithTimestamp> > & messages, BatsimContext * context);
 

src/protocol.hpp

@@ -1013,7 +1013,7 @@ void server_on_edc_hello(ServerData *data, IPMessage *task_data)
 
     (void) task_data;
     xbt_assert(task_data->data != nullptr, "inconsistency: task_data has null data");
-    auto * message = static_cast<ExternalDecisionComponentHelloMessage *>(task_data->data);
+    auto * message = static_cast<EDCHelloMessage *>(task_data->data);
     // TODO: check batprotocol version compatibility, store&log scheduler tracability info...
 
     // TODO: set tunable behavior per EDC, not for all of them

src/server.cpp

@@ -74,7 +74,7 @@ uint8_t batsim_edc_take_decisions(
         switch (event->event_type())
         {
         case fb::Event_BatsimHelloEvent: {
-            mb->add_external_decision_component_hello("exec1by1", "0.1.0");
+            mb->add_edc_hello("exec1by1", "0.1.0");
         } break;
         case fb::Event_SimulationBeginsEvent: {
             auto simu_begins = event->event_as_SimulationBeginsEvent();
@@ -85,14 +85,7 @@ uint8_t batsim_edc_take_decisions(
             auto job = new SchedJob();
             job->job_id = parsed_job->job_id()->str();
 
-            auto host_request = parsed_job->job()->computation_resource_request_as_HostNumber();
-            if (host_request == nullptr)
-            {
-                printf("non-host resource request received for job='%s', aborting\n", job->job_id.c_str());
-                return 1;
-            }
-            job->nb_hosts = host_request->host_number();
-
+            job->nb_hosts = parsed_job->job()->resource_request();
             if (job->nb_hosts > platform_nb_hosts)
             {
                 mb->add_reject_job(job->job_id);

test/edc-lib/exec1by1.cpp

@@ -69,7 +69,7 @@ uint8_t batsim_edc_take_decisions(
         switch (event->event_type())
         {
         case fb::Event_BatsimHelloEvent: {
-            mb->add_external_decision_component_hello("fcfs", "0.1.0");
+            mb->add_edc_hello("fcfs", "0.1.0");
         } break;
         case fb::Event_SimulationBeginsEvent: {
             auto simu_begins = event->event_as_SimulationBeginsEvent();
@@ -80,7 +80,7 @@ uint8_t batsim_edc_take_decisions(
         case fb::Event_JobSubmittedEvent: {
             ::Job job{
                 event->event_as_JobSubmittedEvent()->job_id()->str(),
-                event->event_as_JobSubmittedEvent()->job()->computation_resource_request_as_HostNumber()->host_number()
+                event->event_as_JobSubmittedEvent()->job()->resource_request()
             };
 
             if (job.nb_hosts > platform_nb_hosts)

test/edc-lib/fcfs.cpp

@@ -50,7 +50,7 @@ uint8_t batsim_edc_take_decisions(
         switch (event->event_type())
         {
         case fb::Event_BatsimHelloEvent: {
-            mb->add_external_decision_component_hello("rejecter", "0.1.0");
+            mb->add_edc_hello("rejecter", "0.1.0");
         } break;
         case fb::Event_JobSubmittedEvent: {
             auto job_id = event->event_as_JobSubmittedEvent()->job_id()->str();