Better protocol

doc/proto_description.md

@@ -57,8 +57,8 @@ the job ID of the job which just completed. This part is not mandatory, it depen
 |        3+       |   Z   | Batsim->Sched | No content                      | Batsim tells the scheduler that the simulation is about to end (all jobs have been submitted and completed/rejected)
 |        3+       |   F   | Batsim->Sched | MID1,MID2,MIDn                  | Batsim tells the scheduler that the given machines are in a failure state (crashed, no jobs can be computed on them). Each MIDk part can be a single machine ID or a closed interval MIDa-MIDb where MIDa <= MIDb
 |        3+       |   f   | Batsim->Sched | MID1,MID2,MIDn                  | Batsim tells the scheduler that the given machines are no longer in a failure state (jobs can now be computed on them). Each MIDk part can be a single machine ID or a closed interval MIDa-MIDb where MIDa <= MIDb
-|        4+       |   Q   | Batsim->Sched | REQ1[;...]                      | Batsim queries the scheduler about potential waiting times for requested number of processors.
-|        4+       |   W   | Sched->Batsim | REQ1=WAIT1[;...]                | Scheduler notifies Batsim about potential waiting times for requested number of processors.
+|        4+       |   Q   | Batsim->Sched | REQ1,TIME1[;...]                | Batsim queries the scheduler about potential waiting times for requested number of processors, for a given time.
+|        4+       |   W   | Sched->Batsim | WAIT1[;...]                     | Scheduler notifies Batsim about potential waiting times for requested number of processors.
 
 # Message Examples #
 

src/ipp.hpp

@@ -160,7 +160,8 @@ struct NOPMeLaterMessage
  */
 struct WaitQueryMessage
 {
-    int nb_resources; //!< The number of resources for which we would like to know the waiting time
+    int nb_resources;    //!< The number of resources for which we would like to know the waiting time
+    int processing_time; //!< The duration for which the resources would be used
 };
 
 /**
@@ -168,7 +169,6 @@ struct WaitQueryMessage
  */
 struct SchedWaitAnswerMessage
 {
-    int nb_resources; //!< The number of resources for which we would like to know the waiting time
     double expected_time; //!< The expected waiting time supplied by the scheduler
 };
 

src/network.cpp

@@ -460,8 +460,8 @@ int request_reply_scheduler_process(int argc, char *argv[])
 
             case ANSWER_WAIT:
             {
-                xbt_assert(parts2.size() == 2, "Invalid event received ('%s'): messages to ask the consumed energy must be composed of 2 parts separated by ':'",
-                           event_string.c_str());
+                xbt_assert(parts2.size() == 2, "Invalid event received ('%s'): messages to ask the waiting time must be composed of 2 parts separated by ':'",
+                           event_string.c_str()); // TODO: do something meaningful here !
                 send_message("server", IPMessageType::SCHED_WAIT_ANSWER);
             } break; // End of case received_stamp == ANSWER_WAIT