From 05b18b72f90078408336f54ab2dd1e11c3921a79 Mon Sep 17 00:00:00 2001 From: Bruno Donassolo Date: Mon, 28 Mar 2022 11:33:52 +0200 Subject: [PATCH] Fix java test Be a little less optimistic about double precision, use the same default surf precision --- examples/deprecated/java/cloud/migration/Test.java | 2 +- .../deprecated/java/cloud/migration/cloud-migration.tesh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/deprecated/java/cloud/migration/Test.java b/examples/deprecated/java/cloud/migration/Test.java index e3571da05f..8bc31279c8 100644 --- a/examples/deprecated/java/cloud/migration/Test.java +++ b/examples/deprecated/java/cloud/migration/Test.java @@ -27,7 +27,7 @@ public class Test extends Process{ vm.migrate(dst); double endTime = Msg.getClock(); Msg.info(" - End of Migration from "+ src.getName() +" to " + dst.getName()+ " (duration:" + - (endTime-startTime)+")"); + String.format("%.9f", (endTime-startTime))+")"); } public void main(String[] strings) throws MsgException { diff --git a/examples/deprecated/java/cloud/migration/cloud-migration.tesh b/examples/deprecated/java/cloud/migration/cloud-migration.tesh index abcedae3f2..01feec914c 100644 --- a/examples/deprecated/java/cloud/migration/cloud-migration.tesh +++ b/examples/deprecated/java/cloud/migration/cloud-migration.tesh @@ -10,23 +10,23 @@ $ ${javacmd:=java} -classpath ${classpath:=.} cloud/migration/Main ${srcdir:=.}/ > [PM0:Test:(1) 0.000000] [java/INFO] Start migration of VM vm0 to PM1 > [PM0:Test:(1) 0.000000] [java/INFO] currentLoad:90/ramSize:2048/dpIntensity:70/remaining:8.10E+11 > [PM0:Test:(1) 45.731913] [java/INFO] End of migration of VM vm0 to node PM1 -> [PM0:Test:(1) 45.731913] [java/INFO] - End of Migration from PM0 to PM1 (duration:45.73191265731957) +> [PM0:Test:(1) 45.731913] [java/INFO] - End of Migration from PM0 to PM1 (duration:45.731912657) > [PM0:Test:(1) 45.731913] [java/INFO] - Launch migration from PM1 to PM0 > [PM0:Test:(1) 45.731913] [java/INFO] Start migration of VM vm0 to PM0 > [PM0:Test:(1) 45.731913] [java/INFO] currentLoad:90/ramSize:2048/dpIntensity:70/remaining:5.01E+11 > [PM0:Test:(1) 97.502375] [java/INFO] End of migration of VM vm0 to node PM0 -> [PM0:Test:(1) 97.502375] [java/INFO] - End of Migration from PM1 to PM0 (duration:51.77046280907213) +> [PM0:Test:(1) 97.502375] [java/INFO] - End of Migration from PM1 to PM0 (duration:51.770462809) > [PM0:Test:(1) 97.502375] [java/INFO] . > [PM0:Test:(1) 97.502375] [java/INFO] Round trip of VM1 (load 80%) > [PM0:Test:(1) 97.502375] [java/INFO] - Launch migration from PM0 to PM1 > [PM0:Test:(1) 97.502375] [java/INFO] Start migration of VM vm0 to PM1 > [PM0:Test:(1) 97.502375] [java/INFO] currentLoad:80/ramSize:2048/dpIntensity:70/remaining:1.24E+11 > [PM0:Test:(1) 140.710983] [java/INFO] End of migration of VM vm0 to node PM1 -> [PM0:Test:(1) 140.710983] [java/INFO] - End of Migration from PM0 to PM1 (duration:43.20860711422699) +> [PM0:Test:(1) 140.710983] [java/INFO] - End of Migration from PM0 to PM1 (duration:43.208607114) > [PM0:Test:(1) 140.710983] [java/INFO] - Launch migration from PM1 to PM0 > [PM0:Test:(1) 140.710983] [java/INFO] Start migration of VM vm0 to PM0 > [PM0:Test:(1) 140.710983] [java/INFO] currentLoad:80/ramSize:2048/dpIntensity:70/remaining:6.54E+11 > [PM0:Test:(1) 183.918289] [java/INFO] End of migration of VM vm0 to node PM0 -> [PM0:Test:(1) 183.918289] [java/INFO] - End of Migration from PM1 to PM0 (duration:43.20730611422704) +> [PM0:Test:(1) 183.918289] [java/INFO] - End of Migration from PM1 to PM0 (duration:43.207306114) > [PM0:Test:(1) 183.918289] [java/INFO] Forcefully destroy VMs > [183.918289] [java/INFO] Terminating the simulation... -- 2.20.1