From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 1 Jun 2006 20:11:22 +0000 (+0000)
Subject: And now, do it right. Change the experience total size instead of the individual... 
X-Git-Tag: v3.3~3022
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c72cc8534fe3d0386cd44dbb2aac2af2e463d23d

And now, do it right. Change the experience total size instead of the individual message one; do not tend to the right value, but try to eventually pass it since it's our ending condition. I swear I did test previous version (but poorly, apparently)


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2336 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index 519e5363cd..617b808929 100644
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -174,10 +174,10 @@ void amok_bw_test(gras_socket_t peer,
   do {
     if (*sec>0) {
       double meas_duration=*sec;
-      request->msg_size = request->msg_size * (min_duration / meas_duration);
+      request->exp_size = request->exp_size * (min_duration / meas_duration) * 1.1;
 
-      DEBUG3("The experiment was too short (%f sec<%f sec). Redo it with msg_size=%ld",
-	     meas_duration,min_duration,request->msg_size);
+      DEBUG4("The experiment was too short (%f sec<%f sec). Redo it with exp_size=%ld (got %fkb/s)",
+	     meas_duration,min_duration,request->exp_size,((double)exp_size) / *sec/1024);
       gras_msg_rpccall(peer, 60, gras_msgtype_by_name("BW reask"),&request, NULL);      
     }