Fix java cloud

diff --git a/examples/java/cloud/cloud.tesh b/examples/java/cloud/cloud.tesh
index c8c05d1..1f3f49d 100644 (file)
--- a/examples/java/cloud/cloud.tesh
+++ b/examples/java/cloud/cloud.tesh
@@ -3,154 +3,47 @@
 ! output sort
 
 $ java -classpath ${classpath:=.} cloud/Cloud ${srcdir:=.}/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 ! output sort
 
 $ java -classpath ${classpath:=.} cloud/Cloud ${srcdir:=.}/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (10:Slave 8@Jean_Yves) Receiving on slave_8
-> [  0.000000] (11:Slave 9@Fafard) Receiving on slave_9
-> [  0.000000] (1:Master@Jacquelin) Launched 10 VMs
+> [  0.000000] (0:@) Using regular java threads. Coroutines could speed your simulation up.
+> [  0.000000] (0:@) Start2  hosts
+> [  0.000000] (1:Master@Jacquelin) create VM00
+> [  0.000000] (0:@) Create VM(VM00)@PM(Intel) with 0 mounted disks
+> [  0.000000] (1:Master@Jacquelin) Put Worker WRK00 on VM00
+> [  0.000000] (2:WRK00@VM00) WRK00 is listenning on MBOX:WRK00
+> [  0.000000] (1:Master@Jacquelin) create VM01
+> [  0.000000] (0:@) Create VM(VM01)@PM(Provost) with 0 mounted disks
+> [  0.000000] (1:Master@Jacquelin) Put Worker WRK01 on VM01
+> [  0.000000] (3:WRK01@VM01) WRK01 is listenning on MBOX:WRK01
+> [  0.000000] (1:Master@Jacquelin) Launched 2 VMs

 > [  0.000000] (1:Master@Jacquelin) Send a first batch of work to everyone
 > [  0.000000] (1:Master@Jacquelin) Send a first batch of work to everyone

-> [  0.000000] (1:Master@Jacquelin) Sending to 0
-> [  0.000000] (2:Slave 0@Jacquelin) Receiving on slave_0
-> [  0.000000] (3:Slave 1@Intel) Receiving on slave_1
-> [  0.000000] (4:Slave 2@Provost) Receiving on slave_2
-> [  0.000000] (5:Slave 3@Fernand) Receiving on slave_3
-> [  0.000000] (6:Slave 4@Bescherelle) Receiving on slave_4
-> [  0.000000] (7:Slave 5@Ethernet) Receiving on slave_5
-> [  0.000000] (8:Slave 6@Kuenning) Receiving on slave_6
-> [  0.000000] (9:Slave 7@Dodge) Receiving on slave_7
-> [  0.000195] (1:Master@Jacquelin) Sending to 1
-> [  0.000195] (2:Slave 0@Jacquelin) Received "Task_0". Processing it.
-> [  0.000195] (2:Slave 0@Jacquelin) "Task_0" done 
-> [  0.000195] (2:Slave 0@Jacquelin) Receiving on slave_0
-> [  0.918916] (1:Master@Jacquelin) Sending to 2
-> [  0.918916] (3:Slave 1@Intel) Received "Task_1". Processing it.
-> [  0.918916] (3:Slave 1@Intel) "Task_1" done 
-> [  0.918916] (3:Slave 1@Intel) Receiving on slave_1
-> [  2.798593] (1:Master@Jacquelin) Sending to 3
-> [  2.798593] (4:Slave 2@Provost) Received "Task_2". Processing it.
-> [  2.798593] (4:Slave 2@Provost) "Task_2" done 
-> [  2.798593] (4:Slave 2@Provost) Receiving on slave_2
-> [  4.624255] (1:Master@Jacquelin) Sending to 4
-> [  4.624255] (5:Slave 3@Fernand) Received "Task_3". Processing it.
-> [  4.624255] (5:Slave 3@Fernand) "Task_3" done 
-> [  4.624255] (5:Slave 3@Fernand) Receiving on slave_3
-> [  5.487049] (1:Master@Jacquelin) Sending to 5
-> [  5.487049] (6:Slave 4@Bescherelle) Received "Task_4". Processing it.
-> [  5.487049] (6:Slave 4@Bescherelle) "Task_4" done 
-> [  5.487049] (6:Slave 4@Bescherelle) Receiving on slave_4
-> [  6.547253] (1:Master@Jacquelin) Sending to 6
-> [  6.547253] (7:Slave 5@Ethernet) Received "Task_5". Processing it.
-> [  6.547253] (7:Slave 5@Ethernet) "Task_5" done 
-> [  6.547253] (7:Slave 5@Ethernet) Receiving on slave_5
-> [  7.404569] (1:Master@Jacquelin) Sending to 7
-> [  7.404569] (8:Slave 6@Kuenning) Received "Task_6". Processing it.
-> [  7.404569] (8:Slave 6@Kuenning) "Task_6" done 
-> [  7.404569] (8:Slave 6@Kuenning) Receiving on slave_6
-> [  8.804761] (1:Master@Jacquelin) Sending to 8
-> [  8.804761] (9:Slave 7@Dodge) Received "Task_7". Processing it.
-> [  8.804761] (9:Slave 7@Dodge) "Task_7" done 
-> [  8.804761] (9:Slave 7@Dodge) Receiving on slave_7
-> [  9.729891] (10:Slave 8@Jean_Yves) Received "Task_8". Processing it.
-> [  9.729891] (1:Master@Jacquelin) Sending to 9
-> [  9.729892] (10:Slave 8@Jean_Yves) "Task_8" done 
-> [  9.729892] (10:Slave 8@Jean_Yves) Receiving on slave_8
-> [ 11.714553] (11:Slave 9@Fafard) Received "Task_9". Processing it.
-> [ 11.714553] (1:Master@Jacquelin) Now suspend all VMs, just for fun
-> [ 11.714553] (1:Master@Jacquelin) Wait a while
-> [ 13.714553] (11:Slave 9@Fafard) "Task_9" done 
-> [ 13.714553] (11:Slave 9@Fafard) Receiving on slave_9
-> [ 13.714553] (1:Master@Jacquelin) Enough. Let's resume everybody.
-> [ 13.714553] (1:Master@Jacquelin) Sleep long enough for everyone to be done with previous batch of work
-> [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
-> [1000.000000] (12:Slave 10@Jacquelin) Receiving on slave_10
-> [1000.000000] (13:Slave 11@Intel) Receiving on slave_11
-> [1000.000000] (14:Slave 12@Provost) Receiving on slave_12
-> [1000.000000] (15:Slave 13@Fernand) Receiving on slave_13
-> [1000.000000] (16:Slave 14@Bescherelle) Receiving on slave_14
-> [1000.000000] (17:Slave 15@Ethernet) Receiving on slave_15
-> [1000.000000] (18:Slave 16@Kuenning) Receiving on slave_16
-> [1000.000000] (19:Slave 17@Dodge) Receiving on slave_17
-> [1000.000000] (1:Master@Jacquelin) Add one more process per VM.
-> [1000.000000] (1:Master@Jacquelin) Migrate everyone to the second host.
-> [1000.000000] (1:Master@Jacquelin) Suspend everyone, move them to the third host, and resume them.
-> [1000.000000] (1:Master@Jacquelin) Sending to 0
-> [1000.000000] (20:Slave 18@Jean_Yves) Receiving on slave_18
-> [1000.000000] (21:Slave 19@Fafard) Receiving on slave_19
-> [1000.000195] (1:Master@Jacquelin) Sending to 1
-> [1000.000195] (2:Slave 0@Provost) Received "Task_0". Processing it.
-> [1000.000195] (2:Slave 0@Provost) "Task_0" done 
-> [1000.000195] (2:Slave 0@Provost) Receiving on slave_0
-> [1000.918916] (1:Master@Jacquelin) Sending to 2
-> [1000.918916] (3:Slave 1@Provost) Received "Task_1". Processing it.
-> [1000.918916] (3:Slave 1@Provost) "Task_1" done 
-> [1000.918916] (3:Slave 1@Provost) Receiving on slave_1
-> [1002.798593] (1:Master@Jacquelin) Sending to 3
-> [1002.798593] (4:Slave 2@Provost) Received "Task_2". Processing it.
-> [1002.798593] (4:Slave 2@Provost) "Task_2" done 
-> [1002.798593] (4:Slave 2@Provost) Receiving on slave_2
-> [1004.624255] (1:Master@Jacquelin) Sending to 4
-> [1004.624255] (5:Slave 3@Provost) Received "Task_3". Processing it.
-> [1004.624255] (5:Slave 3@Provost) "Task_3" done 
-> [1004.624255] (5:Slave 3@Provost) Receiving on slave_3
-> [1005.487049] (1:Master@Jacquelin) Sending to 5
-> [1005.487049] (6:Slave 4@Provost) Received "Task_4". Processing it.
-> [1005.487049] (6:Slave 4@Provost) "Task_4" done 
-> [1005.487049] (6:Slave 4@Provost) Receiving on slave_4
-> [1006.547253] (1:Master@Jacquelin) Sending to 6
-> [1006.547253] (7:Slave 5@Provost) Received "Task_5". Processing it.
-> [1006.547253] (7:Slave 5@Provost) "Task_5" done 
-> [1006.547253] (7:Slave 5@Provost) Receiving on slave_5
-> [1007.404569] (1:Master@Jacquelin) Sending to 7
-> [1007.404569] (8:Slave 6@Provost) Received "Task_6". Processing it.
-> [1007.404569] (8:Slave 6@Provost) "Task_6" done 
-> [1007.404569] (8:Slave 6@Provost) Receiving on slave_6
-> [1008.804761] (1:Master@Jacquelin) Sending to 8
-> [1008.804761] (9:Slave 7@Provost) Received "Task_7". Processing it.
-> [1008.804761] (9:Slave 7@Provost) "Task_7" done 
-> [1008.804761] (9:Slave 7@Provost) Receiving on slave_7
-> [1009.729891] (10:Slave 8@Provost) Received "Task_8". Processing it.
-> [1009.729891] (1:Master@Jacquelin) Sending to 9
-> [1009.729892] (10:Slave 8@Provost) "Task_8" done 
-> [1009.729892] (10:Slave 8@Provost) Receiving on slave_8
-> [1011.714553] (11:Slave 9@Provost) Received "Task_9". Processing it.
-> [1011.714553] (11:Slave 9@Provost) "Task_9" done 
-> [1011.714553] (11:Slave 9@Provost) Receiving on slave_9
-> [1011.714553] (1:Master@Jacquelin) Sending to 10
-> [1011.714748] (12:Slave 10@Provost) Received "Task_10". Processing it.
-> [1011.714748] (12:Slave 10@Provost) "Task_10" done 
-> [1011.714748] (12:Slave 10@Provost) Receiving on slave_10
-> [1011.714748] (1:Master@Jacquelin) Sending to 11
-> [1012.633469] (13:Slave 11@Provost) Received "Task_11". Processing it.
-> [1012.633469] (13:Slave 11@Provost) "Task_11" done 
-> [1012.633469] (13:Slave 11@Provost) Receiving on slave_11
-> [1012.633469] (1:Master@Jacquelin) Sending to 12
-> [1014.513146] (14:Slave 12@Provost) Received "Task_12". Processing it.
-> [1014.513146] (14:Slave 12@Provost) "Task_12" done 
-> [1014.513146] (14:Slave 12@Provost) Receiving on slave_12
-> [1014.513146] (1:Master@Jacquelin) Sending to 13
-> [1016.338807] (15:Slave 13@Provost) Received "Task_13". Processing it.
-> [1016.338807] (15:Slave 13@Provost) "Task_13" done 
-> [1016.338807] (15:Slave 13@Provost) Receiving on slave_13
-> [1016.338807] (1:Master@Jacquelin) Sending to 14
-> [1017.201602] (16:Slave 14@Provost) Received "Task_14". Processing it.
-> [1017.201602] (16:Slave 14@Provost) "Task_14" done 
-> [1017.201602] (16:Slave 14@Provost) Receiving on slave_14
-> [1017.201602] (1:Master@Jacquelin) Sending to 15
-> [1018.261806] (17:Slave 15@Provost) Received "Task_15". Processing it.
-> [1018.261806] (17:Slave 15@Provost) "Task_15" done 
-> [1018.261806] (17:Slave 15@Provost) Receiving on slave_15
-> [1018.261806] (1:Master@Jacquelin) Sending to 16
-> [1019.119122] (18:Slave 16@Provost) Received "Task_16". Processing it.
-> [1019.119122] (18:Slave 16@Provost) "Task_16" done 
-> [1019.119122] (18:Slave 16@Provost) Receiving on slave_16
-> [1019.119122] (1:Master@Jacquelin) Sending to 17
-> [1020.519313] (19:Slave 17@Provost) Received "Task_17". Processing it.
-> [1020.519313] (19:Slave 17@Provost) "Task_17" done 
-> [1020.519313] (19:Slave 17@Provost) Receiving on slave_17
-> [1020.519313] (1:Master@Jacquelin) Sending to 18
-> [1021.444444] (1:Master@Jacquelin) Sending to 19
-> [1021.444444] (20:Slave 18@Provost) Received "Task_18". Processing it.
-> [1021.444444] (20:Slave 18@Provost) "Task_18" done 
-> [1021.444444] (20:Slave 18@Provost) Receiving on slave_18
-> [1023.429105] (0:@) MSG_main finished; Cleaning up the simulation...
-> [1023.429105] (1:Master@Jacquelin) Let's shut down the simulation and kill everyone.
-> [1023.429105] (1:Master@Jacquelin) Master done.
-> [1023.429105] (21:Slave 19@Provost) Received "Task_19". Processing it.
+> [  0.000000] (1:Master@Jacquelin) Sending to WRK00
+> [  0.918703] (2:WRK00@VM00) Received "Task00". Processing it.
+> [  0.918703] (1:Master@Jacquelin) Sending to WRK01
+> [  0.918703] (2:WRK00@VM00) WRK00 executed task (Task00)
+> [  2.798361] (3:WRK01@VM01) Received "Task01". Processing it.
+> [  2.798361] (1:Master@Jacquelin) Suspend all VMs
+> [  2.798361] (1:Master@Jacquelin) Suspend VM00
+> [  2.798361] (1:Master@Jacquelin) Suspend VM01
+> [  2.798361] (1:Master@Jacquelin) Wait a while
+> [  4.798361] (1:Master@Jacquelin) Resume all VMs.
+> [  4.798361] (1:Master@Jacquelin) Sleep long enough for everyone to be done with previous batch of work
+> [  4.798361] (3:WRK01@VM01) WRK01 executed task (Task01)
+> [1000.000000] (1:Master@Jacquelin) Migrate everyone to Fernand
+> [1000.000000] (1:Master@Jacquelin) Migrate VM00fromIntelto Fernand
+> [1000.000000] (5:__pr_mig_tx:VM00(Intel-Provost)@Intel) mig-stage1: remaining_size 1073741824.000000
+> [1147.021183] (5:__pr_mig_tx:VM00(Intel-Provost)@Intel) actual banwdidth 6.964983 (MB/s), threshold 219099.412193
+> [1147.021183] (5:__pr_mig_tx:VM00(Intel-Provost)@Intel) mig-stage 2:0 updated_size 0.000000 computed_during_stage1 0.000000 dp_rate 0.000000 dp_cap 1193046471.111111
+> [1147.021183] (5:__pr_mig_tx:VM00(Intel-Provost)@Intel) mig-stage2.0: remaining_size 0.000000 (< threshold 219099.412193)
+> [1147.021183] (5:__pr_mig_tx:VM00(Intel-Provost)@Intel) mig-stage3: remaining_size 0.000000
+> [1149.029299] (0:@) migrate VM(VM00): set bound (137333000.000000) at Provost
+> [1149.029299] (4:__pr_mig_rx:VM00(Intel-Provost)@Provost) set affinity(0x0000@Provost) for VM00
+> [1150.908953] (1:Master@Jacquelin) Migrate VM01fromProvostto Fernand
+> [1150.908953] (9:__pr_mig_tx:VM01(Provost-Provost)@Provost) mig-stage1: remaining_size 1073741824.000000
+> [1153.065257] (9:__pr_mig_tx:VM01(Provost-Provost)@Provost) actual banwdidth 474.886827 (MB/s), threshold 14938647.898422
+> [1153.065257] (9:__pr_mig_tx:VM01(Provost-Provost)@Provost) mig-stage 2:0 updated_size 0.000000 computed_during_stage1 0.000000 dp_rate 0.000000 dp_cap 1193046471.111111
+> [1153.065257] (9:__pr_mig_tx:VM01(Provost-Provost)@Provost) mig-stage2.0: remaining_size 0.000000 (< threshold 14938647.898422)
+> [1153.065257] (9:__pr_mig_tx:VM01(Provost-Provost)@Provost) mig-stage3: remaining_size 0.000000
+> [1153.065452] (0:@) migrate VM(VM01): set bound (137333000.000000) at Provost
+> [1153.065452] (8:__pr_mig_rx:VM01(Provost-Provost)@Provost) set affinity(0x0000@Provost) for VM01
+> [1154.945106] (1:Master@Jacquelin) Let's shut down the simulation and kill everyone.
+> [1154.945106] (1:Master@Jacquelin) Master done.
+> [1154.945106] (0:@) MSG_main finished; Cleaning up the simulation...

diff --git a/examples/java/platform.xml b/examples/java/platform.xml
index 84db0e2..495a7b2 100644 (file)
--- a/examples/java/platform.xml
+++ b/examples/java/platform.xml
@@ -202,7 +202,7 @@
    <link id="108" bandwidth="990.5kBps" latency="1.742977ms"/>
    <link id="115" bandwidth="926.625kBps" latency="601.375us"/>
    <link id="92" bandwidth="1.564125MBps" latency="788.956us"/>
    <link id="108" bandwidth="990.5kBps" latency="1.742977ms"/>
    <link id="115" bandwidth="926.625kBps" latency="601.375us"/>
    <link id="92" bandwidth="1.564125MBps" latency="788.956us"/>

-   <link id="103" bandwidth="472.125kBps" latency="5.161451ms"/>
+   <link id="103" bandwidth="472.125MBps" latency="5.161451ms"/>

    <link id="10" bandwidth="34.285625MBps" latency="514.433us"/>
    <link id="113" bandwidth="1.858MBps" latency="820.952us"/>
    <link id="152" bandwidth="7.20975MBps" latency="1.461517ms"/>
    <link id="10" bandwidth="34.285625MBps" latency="514.433us"/>
    <link id="113" bandwidth="1.858MBps" latency="820.952us"/>
    <link id="152" bandwidth="7.20975MBps" latency="1.461517ms"/>


@@ -240,7 +240,7 @@
    <link id="88" bandwidth="10.314625MBps" latency="6.932556ms"/>
    <link id="116" bandwidth="2.368MBps" latency="9.547561ms"/>
    <link id="144" bandwidth="259.125kBps" latency="4.460898ms"/>
    <link id="88" bandwidth="10.314625MBps" latency="6.932556ms"/>
    <link id="116" bandwidth="2.368MBps" latency="9.547561ms"/>
    <link id="144" bandwidth="259.125kBps" latency="4.460898ms"/>

-   <link id="141" bandwidth="472.125kBps" latency="5.161451ms"/>
+   <link id="141" bandwidth="472.125MBps" latency="5.161451ms"/>

    <link id="30" bandwidth="10.099625MBps" latency="479.78us"/>
    <link id="100" bandwidth="721.625kBps" latency="6.406us"/>
    <link id="25" bandwidth="8.015125MBps" latency="35.076518ms"/>
    <link id="30" bandwidth="10.099625MBps" latency="479.78us"/>
    <link id="100" bandwidth="721.625kBps" latency="6.406us"/>
    <link id="25" bandwidth="8.015125MBps" latency="35.076518ms"/>