cosmetics

diff --git a/examples/msg/app-pingpong/app-pingpong.c b/examples/msg/app-pingpong/app-pingpong.c
index 9687ce7..91a5b0f 100644 (file)
--- a/examples/msg/app-pingpong/app-pingpong.c
+++ b/examples/msg/app-pingpong/app-pingpong.c
@@ -30,7 +30,7 @@ static int pinger(int argc, char *argv[])
   XBT_INFO("Task received : %s", pong_task->name);
   xbt_free(pong_task->data);
   MSG_task_destroy(pong_task);
   XBT_INFO("Task received : %s", pong_task->name);
   xbt_free(pong_task->data);
   MSG_task_destroy(pong_task);

-  XBT_INFO("Pong time (bandwidth bound): %e", communication_time);
+  XBT_INFO("Pong time (bandwidth bound): %.3f", communication_time);

 
   return 0;
 }
 
   return 0;
 }


@@ -51,14 +51,14 @@ static int ponger(int argc, char *argv[])
   XBT_INFO("Task received : %s", ping_task->name);
   xbt_free(ping_task->data);
   MSG_task_destroy(ping_task);
   XBT_INFO("Task received : %s", ping_task->name);
   xbt_free(ping_task->data);
   MSG_task_destroy(ping_task);

-  XBT_INFO(" Ping time (latency bound) %e", communication_time);
+  XBT_INFO(" Ping time (latency bound) %f", communication_time);

 
   /*  - ... Then send a 1GB pong back (bandwidth bound) */
   double now = MSG_get_clock();
   msg_task_t pong_task = MSG_task_create("large communication (bandwidth bound)", 0.0, 1e9, NULL);
   pong_task->data = xbt_new(double, 1);
   *(double *) pong_task->data = now;
 
   /*  - ... Then send a 1GB pong back (bandwidth bound) */
   double now = MSG_get_clock();
   msg_task_t pong_task = MSG_task_create("large communication (bandwidth bound)", 0.0, 1e9, NULL);
   pong_task->data = xbt_new(double, 1);
   *(double *) pong_task->data = now;

-  XBT_INFO("task_bw->data = %e", *((double *) pong_task->data));
+  XBT_INFO("task_bw->data = %.3f", *((double*)pong_task->data));

   MSG_task_send(pong_task, argv[1]);
 
   return 0;
   MSG_task_send(pong_task, argv[1]);
 
   return 0;


@@ -80,6 +80,6 @@ int main(int argc, char *argv[])
 
   msg_error_t res = MSG_main();             /* - Run the simulation */
 
 
   msg_error_t res = MSG_main();             /* - Run the simulation */
 

-  XBT_INFO("Total simulation time: %e", MSG_get_clock());
+  XBT_INFO("Total simulation time: %.3f", MSG_get_clock());

   return res!=MSG_OK;
 }
   return res!=MSG_OK;
 }

diff --git a/examples/msg/app-pingpong/app-pingpong.tesh b/examples/msg/app-pingpong/app-pingpong.tesh
index d7e1a3a..a8108ff 100644 (file)
--- a/examples/msg/app-pingpong/app-pingpong.tesh
+++ b/examples/msg/app-pingpong/app-pingpong.tesh
@@ -6,11 +6,11 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xm
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound)
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound)

-> [  0.019014] (2:ponger@Jupiter)  Ping time (latency bound) 1.901449e-02
-> [  0.019014] (2:ponger@Jupiter) task_bw->data = 1.901449e-02
+> [  0.019014] (2:ponger@Jupiter)  Ping time (latency bound) 0.019014
+> [  0.019014] (2:ponger@Jupiter) task_bw->data = 0.019

 > [150.178356] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
 > [150.178356] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)

-> [150.178356] (1:pinger@Tremblay) Pong time (bandwidth bound): 1.501593e+02
-> [150.178356] (0:maestro@) Total simulation time: 1.501784e+02
+> [150.178356] (1:pinger@Tremblay) Pong time (bandwidth bound): 150.159
+> [150.178356] (0:maestro@) Total simulation time: 150.178

 
 p Testing the deprecated CM02 network model
 
 
 p Testing the deprecated CM02 network model
 


@@ -20,11 +20,11 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xm
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.001462] (2:ponger@Jupiter) Task received : small communication (latency bound)
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.001462] (2:ponger@Jupiter) Task received : small communication (latency bound)

-> [  0.001462] (2:ponger@Jupiter)  Ping time (latency bound) 1.461663e-03
-> [  0.001462] (2:ponger@Jupiter) task_bw->data = 1.461663e-03
+> [  0.001462] (2:ponger@Jupiter)  Ping time (latency bound) 0.001462
+> [  0.001462] (2:ponger@Jupiter) task_bw->data = 0.001

 > [145.639041] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
 > [145.639041] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)

-> [145.639041] (1:pinger@Tremblay) Pong time (bandwidth bound): 1.456376e+02
-> [145.639041] (0:maestro@) Total simulation time: 1.456390e+02
+> [145.639041] (1:pinger@Tremblay) Pong time (bandwidth bound): 145.638
+> [145.639041] (0:maestro@) Total simulation time: 145.639

 
 p Testing the surf network Reno fairness model using lagrangian approach
 
 
 p Testing the surf network Reno fairness model using lagrangian approach
 


@@ -35,11 +35,11 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xm
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.015200] (2:ponger@Jupiter) Task received : small communication (latency bound)
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.015200] (2:ponger@Jupiter) Task received : small communication (latency bound)

-> [  0.015200] (2:ponger@Jupiter)  Ping time (latency bound) 1.519994e-02
-> [  0.015200] (2:ponger@Jupiter) task_bw->data = 1.519994e-02
+> [  0.015200] (2:ponger@Jupiter)  Ping time (latency bound) 0.015200
+> [  0.015200] (2:ponger@Jupiter) task_bw->data = 0.015

 > [158.330528] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
 > [158.330528] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)

-> [158.330528] (1:pinger@Tremblay) Pong time (bandwidth bound): 1.583153e+02
-> [158.330528] (0:maestro@) Total simulation time: 1.583305e+02
+> [158.330528] (1:pinger@Tremblay) Pong time (bandwidth bound): 158.315
+> [158.330528] (0:maestro@) Total simulation time: 158.331

 
 p Testing the surf network Vegas fairness model using lagrangian approach
 
 
 p Testing the surf network Vegas fairness model using lagrangian approach
 


@@ -50,8 +50,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-pingpong$EXEEXT ${srcdir:=.}/small_platform.xm
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.015200] (2:ponger@Jupiter) Task received : small communication (latency bound)
 > [  0.000000] (1:pinger@Tremblay) Ping -> Jupiter
 > [  0.000000] (2:ponger@Jupiter) Pong -> Tremblay
 > [  0.015200] (2:ponger@Jupiter) Task received : small communication (latency bound)

-> [  0.015200] (2:ponger@Jupiter)  Ping time (latency bound) 1.519994e-02
-> [  0.015200] (2:ponger@Jupiter) task_bw->data = 1.519994e-02
+> [  0.015200] (2:ponger@Jupiter)  Ping time (latency bound) 0.015200
+> [  0.015200] (2:ponger@Jupiter) task_bw->data = 0.015

 > [158.330528] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
 > [158.330528] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)

-> [158.330528] (1:pinger@Tremblay) Pong time (bandwidth bound): 1.583153e+02
-> [158.330528] (0:maestro@) Total simulation time: 1.583305e+02
+> [158.330528] (1:pinger@Tremblay) Pong time (bandwidth bound): 158.315
+> [158.330528] (0:maestro@) Total simulation time: 158.331