- request->exp_size = request->exp_size * (min_duration / meas_duration) * 1.1;
- request->msg_size = request->msg_size * (min_duration / meas_duration) * 1.1;
- if (request->msg_size > 64*1024*1024)
- request->msg_size = 64*1024*1024;
-
- VERB5("The experiment was too short (%f sec<%f sec). Redo it with exp_size=%ld msg_size=%ld (got %fkb/s)",
- meas_duration,min_duration,request->exp_size,request->msg_size,((double)exp_size) / *sec/1024);
- gras_msg_rpccall(peer, 60, gras_msgtype_by_name("BW reask"),&request, NULL);
+ double increase;
+ if (*sec != 0.0 ) {
+ increase = (min_duration / meas_duration) * 1.1;
+ } else {
+ increase = 4;
+ }
+ /* Do not increase the exp size too fast since our decision would be based on wrong measurements*/
+ if (increase > 20)
+ increase = 20;
+
+ request->msg_size = request->msg_size * increase;
+
+ /* Do not do too large experiments messages or the sensors
+ will start to swap to store one of them.
+ And then increase the number of messages to compensate (check for overflow there, too) */
+ if (request->msg_size > 64*1024*1024) {
+ unsigned long int new_amount = ( (request->msg_size / ((double)64*1024*1024))
+ * request->msg_amount ) + 1;
+
+ xbt_assert0(new_amount > request->msg_amount,
+ "Overflow on the number of messages! You must have a *really* fat pipe. Please fix your platform");
+ request->msg_amount = new_amount;
+
+ request->msg_size = 64*1024*1024;
+ }
+
+ VERB5("The experiment was too short (%f sec<%f sec). Redo it with msg_size=%lu (nb_messages=%lu) (got %fMb/s)",
+ meas_duration, min_duration,
+ request->msg_size, request->msg_amount,
+ ((double)request->msg_size) * ((double)request->msg_amount / (*sec) /1024.0/1024.0));
+
+ gras_msg_rpccall(peer, 60, "BW reask",&request, NULL);