X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..a8c316ac06c17368f52aff8c009e63421103cc24:/examples/java/surfCpuModel/surf_cpu_model.tesh

diff --git a/examples/java/surfCpuModel/surf_cpu_model.tesh b/examples/java/surfCpuModel/surf_cpu_model.tesh
index 00a34eddc6..f3c4726f8d 100644
--- a/examples/java/surfCpuModel/surf_cpu_model.tesh
+++ b/examples/java/surfCpuModel/surf_cpu_model.tesh
@@ -1,33 +1,31 @@
 #! tesh
 
-$ java -classpath ${classpath:=.} surfCpuModel/TestCpuModel ${srcdir:=.}/surfCpuModel/surfCpuModelPlatform.xml ${srcdir:=.}/surfCpuModel/surfCpuModelDeployment.xml --cfg=workstation/model:compound
+$ java -classpath ${classpath:=.} surfCpuModel/TestCpuModel ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/surfCpuModel/surfCpuModelDeployment.xml --cfg=host/model:compound
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound'
+> [0.000000] [jmsg/INFO] Using regular java threads.
 > [0.000000] [jmsg/INFO] Initialize Cpu Constant Model
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
-> [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
-> [0.000000] [jmsg/INFO] New Cpu(Jacquelin, 1.37333E8, 1.0)
-> [0.000000] [jmsg/INFO] New Cpu(Boivin, 9.8095E7, 1.0)
-> [0.000000] [jmsg/INFO] New Cpu(TeX, 6.8667E7, 1.0)
+> [0.000000] [jmsg/INFO] New Cpu(Tremblay, 9.8095E7, 1.0)
+> [0.000000] [jmsg/INFO] New Cpu(Jupiter, 7.6296E7, 1.0)
+> [0.000000] [jmsg/INFO] New Cpu(Fafard, 7.6296E7, 1.0)
+> [0.000000] [jmsg/INFO] New Cpu(Ginette, 4.8492E7, 1.0)
+> [0.000000] [jmsg/INFO] New Cpu(Bourassa, 4.8492E7, 1.0)
 > [0.000000] [jmsg/INFO] UpdateActionState of 0 actions
-> [0.000000] [jmsg/INFO] Cpu Loaded: Cpu Constant
-> [Jacquelin:surfCpuModel.Sender:(1) 0.000000] [jmsg/INFO] helloo!
-> [Boivin:surfCpuModel.Receiver:(2) 0.000000] [jmsg/INFO] helloo!
+> [0.000000] [jmsg/INFO] Cpu Loaded: org.simgrid.surf.CpuModel
+> [Tremblay:surfCpuModel.Sender:(1) 0.000000] [jmsg/INFO] helloo!
+> [Jupiter:surfCpuModel.Receiver:(2) 0.000000] [jmsg/INFO] helloo!
 > [0.000000] [jmsg/INFO] Sleep action of duration -1.0 sleeping true
 > [0.000000] [jmsg/INFO] Sleep action of duration -1.0 sleeping true
 > [0.000000] [jmsg/INFO] ShareResources at time -1.0
-> [0.000000] [jmsg/INFO] ShareResources at time -1.0
-> [0.026020] [jmsg/INFO] UpdateActionState of 2 actions
-> [0.026020] [jmsg/INFO] ShareResources at time -1.0
-> [0.026020] [jmsg/INFO] ShareResources at time -1.0
-> [0.026021] [jmsg/INFO] UpdateActionState of 2 actions
-> [Jacquelin:surfCpuModel.Sender:(1) 0.026021] [jmsg/INFO] Send duration: 0.026021030927835052
-> [Jacquelin:surfCpuModel.Sender:(1) 0.026021] [jmsg/INFO] goodbye!
-> [0.026021] [jmsg/INFO] Execute action of size 1.0E9 sleeping false
-> [0.026021] [jmsg/INFO] Share action with new time 10.194199500484224
-> [0.026021] [jmsg/INFO] ShareResources at time 10.194199500484224
-> [0.026021] [jmsg/INFO] Share action with new time 10.194199500484224
-> [0.026021] [jmsg/INFO] ShareResources at time 10.194199500484224
-> [10.220221] [jmsg/INFO] UpdateActionState of 1 actions
-> [10.220221] [jmsg/INFO] action remains 0.0 after delta of 10.194199500484224
-> [10.220221] [jmsg/INFO] action DONE
-> [Boivin:surfCpuModel.Receiver:(2) 10.220221] [jmsg/INFO] goodbye!
-> [10.220221] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [0.019014] [jmsg/INFO] UpdateActionState of 2 actions
+> [0.019014] [jmsg/INFO] ShareResources at time -1.0
+> [0.019014] [jmsg/INFO] UpdateActionState of 2 actions
+> [Tremblay:surfCpuModel.Sender:(1) 0.019014] [jmsg/INFO] Send duration: 0.019014479160788175
+> [Tremblay:surfCpuModel.Sender:(1) 0.019014] [jmsg/INFO] goodbye!
+> [0.019014] [jmsg/INFO] Execute action of size 1.0E9 sleeping false
+> [0.019014] [jmsg/INFO] Share action with new time 13.10684701688162
+> [0.019014] [jmsg/INFO] ShareResources at time 13.10684701688162
+> [13.125861] [jmsg/INFO] UpdateActionState of 1 actions
+> [13.125861] [jmsg/INFO] action remains 0.0 after delta of 13.10684701688162
+> [13.125861] [jmsg/INFO] action DONE
+> [Jupiter:surfCpuModel.Receiver:(2) 13.125861] [jmsg/INFO] goodbye!
+> [13.125861] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...