rename the logging channel of java from 'jmsg' to 'java'

diff --git a/examples/java/app/bittorrent/app_bittorrent.tesh b/examples/java/app/bittorrent/app_bittorrent.tesh
index b6662d0..0f86b8c 100644 (file)
--- a/examples/java/app/bittorrent/app_bittorrent.tesh
+++ b/examples/java/app/bittorrent/app_bittorrent.tesh
@@ -4,21 +4,21 @@
 ! timeout 15
 
 $ java -classpath ${classpath:=.} app/bittorrent/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/app/bittorrent/bittorrent.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [5000.046836] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
-> [node-0.acme.org:app.bittorrent.Tracker:(1) 0.000000] [jmsg/INFO] Tracker launched.
-> [node-0.acme.org:app.bittorrent.Tracker:(1) 3000.000000] [jmsg/INFO] Tracker is leaving
-> [node-1.acme.org:app.bittorrent.Peer:(2) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 2
-> [node-1.acme.org:app.bittorrent.Peer:(2) 5000.007806] [jmsg/INFO] Here is my current status: 1111111111
-> [node-2.acme.org:app.bittorrent.Peer:(3) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 3
-> [node-2.acme.org:app.bittorrent.Peer:(3) 5000.023418] [jmsg/INFO] Here is my current status: 1111111111
-> [node-3.acme.org:app.bittorrent.Peer:(4) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 4
-> [node-3.acme.org:app.bittorrent.Peer:(4) 5000.023418] [jmsg/INFO] Here is my current status: 1111111111
-> [node-4.acme.org:app.bittorrent.Peer:(5) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 5
-> [node-4.acme.org:app.bittorrent.Peer:(5) 5000.007806] [jmsg/INFO] Here is my current status: 1111111111
-> [node-5.acme.org:app.bittorrent.Peer:(6) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 6
-> [node-5.acme.org:app.bittorrent.Peer:(6) 5000.023418] [jmsg/INFO] Here is my current status: 1111111111
-> [node-6.acme.org:app.bittorrent.Peer:(7) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 7
-> [node-6.acme.org:app.bittorrent.Peer:(7) 5000.046836] [jmsg/INFO] Here is my current status: 1111111111
-> [node-7.acme.org:app.bittorrent.Peer:(8) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 8
-> [node-7.acme.org:app.bittorrent.Peer:(8) 5000.031224] [jmsg/INFO] Here is my current status: 1111111111
+> [0.000000] [java/INFO] Using regular java threads.
+> [5000.046836] [java/INFO] MSG_main finished; Cleaning up the simulation...
+> [node-0.acme.org:app.bittorrent.Tracker:(1) 0.000000] [java/INFO] Tracker launched.
+> [node-0.acme.org:app.bittorrent.Tracker:(1) 3000.000000] [java/INFO] Tracker is leaving
+> [node-1.acme.org:app.bittorrent.Peer:(2) 0.000000] [java/INFO] Hi, I'm joining the network with id 2
+> [node-1.acme.org:app.bittorrent.Peer:(2) 5000.007806] [java/INFO] Here is my current status: 1111111111
+> [node-2.acme.org:app.bittorrent.Peer:(3) 0.000000] [java/INFO] Hi, I'm joining the network with id 3
+> [node-2.acme.org:app.bittorrent.Peer:(3) 5000.023418] [java/INFO] Here is my current status: 1111111111
+> [node-3.acme.org:app.bittorrent.Peer:(4) 0.000000] [java/INFO] Hi, I'm joining the network with id 4
+> [node-3.acme.org:app.bittorrent.Peer:(4) 5000.023418] [java/INFO] Here is my current status: 1111111111
+> [node-4.acme.org:app.bittorrent.Peer:(5) 0.000000] [java/INFO] Hi, I'm joining the network with id 5
+> [node-4.acme.org:app.bittorrent.Peer:(5) 5000.007806] [java/INFO] Here is my current status: 1111111111
+> [node-5.acme.org:app.bittorrent.Peer:(6) 0.000000] [java/INFO] Hi, I'm joining the network with id 6
+> [node-5.acme.org:app.bittorrent.Peer:(6) 5000.023418] [java/INFO] Here is my current status: 1111111111
+> [node-6.acme.org:app.bittorrent.Peer:(7) 0.000000] [java/INFO] Hi, I'm joining the network with id 7
+> [node-6.acme.org:app.bittorrent.Peer:(7) 5000.046836] [java/INFO] Here is my current status: 1111111111
+> [node-7.acme.org:app.bittorrent.Peer:(8) 0.000000] [java/INFO] Hi, I'm joining the network with id 8
+> [node-7.acme.org:app.bittorrent.Peer:(8) 5000.031224] [java/INFO] Here is my current status: 1111111111

diff --git a/examples/java/app/centralizedmutex/app_centralizedmutex.tesh b/examples/java/app/centralizedmutex/app_centralizedmutex.tesh
index feaf851..a90defd 100644 (file)
--- a/examples/java/app/centralizedmutex/app_centralizedmutex.tesh
+++ b/examples/java/app/centralizedmutex/app_centralizedmutex.tesh
@@ -3,12 +3,12 @@
 ! output sort 19
 
 $ java -classpath ${classpath:=.} app/centralizedmutex/Main ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/app/centralizedmutex/centralizedmutex.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [Jupiter:app.centralizedmutex.Node:(2) 0.000000] [jmsg/INFO] Send a request to the coordinator
-> [Fafard:app.centralizedmutex.Node:(3) 0.000000] [jmsg/INFO] Send a request to the coordinator
-> [Tremblay:app.centralizedmutex.Coordinator:(1) 0.019014] [jmsg/INFO] Got a request from app.centralizedmutex.Node. Queue empty: grant it
-> [Jupiter:app.centralizedmutex.Node:(2) 0.019014] [jmsg/INFO] Wait for a grant from the coordinator
-> [Fafard:app.centralizedmutex.Node:(3) 0.063737] [jmsg/INFO] Wait for a grant from the coordinator
-> [Tremblay:app.centralizedmutex.Coordinator:(1) 0.063737] [jmsg/INFO] Got a request from app.centralizedmutex.Node. Queue empty: grant it
-> [Tremblay:app.centralizedmutex.Coordinator:(1) 0.134167] [jmsg/INFO] we should shutdown the simulation now
-> [0.134167] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [0.000000] [java/INFO] Using regular java threads.
+> [Jupiter:app.centralizedmutex.Node:(2) 0.000000] [java/INFO] Send a request to the coordinator
+> [Fafard:app.centralizedmutex.Node:(3) 0.000000] [java/INFO] Send a request to the coordinator
+> [Tremblay:app.centralizedmutex.Coordinator:(1) 0.019014] [java/INFO] Got a request from app.centralizedmutex.Node. Queue empty: grant it
+> [Jupiter:app.centralizedmutex.Node:(2) 0.019014] [java/INFO] Wait for a grant from the coordinator
+> [Fafard:app.centralizedmutex.Node:(3) 0.063737] [java/INFO] Wait for a grant from the coordinator
+> [Tremblay:app.centralizedmutex.Coordinator:(1) 0.063737] [java/INFO] Got a request from app.centralizedmutex.Node. Queue empty: grant it
+> [Tremblay:app.centralizedmutex.Coordinator:(1) 0.134167] [java/INFO] we should shutdown the simulation now
+> [0.134167] [java/INFO] MSG_main finished; Cleaning up the simulation...

diff --git a/examples/java/app/pingpong/app_pingpong.tesh b/examples/java/app/pingpong/app_pingpong.tesh
index f910881..b7f02aa 100644 (file)
--- a/examples/java/app/pingpong/app_pingpong.tesh
+++ b/examples/java/app/pingpong/app_pingpong.tesh
@@ -3,16 +3,16 @@
 ! output sort 19
 
 $ java -classpath ${classpath:=.} app/pingpong/Main ${srcdir:=.}/../platforms/small_platform.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [1.048882] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
-> [Boivin:Receiver:(2) 0.000000] [jmsg/INFO] hello!
-> [Boivin:Receiver:(2) 0.000000] [jmsg/INFO] try to get a task
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO] Got at time 1.0488818628325232
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO] Was sent at time 0.0
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO] Communication time : 1.0488818628325232
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO]  --- bw 9.533962169004269E7 ----
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO] goodbye!
-> [Jacquelin:Sender:(1) 0.000000] [jmsg/INFO] hello!
-> [Jacquelin:Sender:(1) 0.000000] [jmsg/INFO] host count: 1
-> [Jacquelin:Sender:(1) 0.000000] [jmsg/INFO] sender time: 0.0
-> [Jacquelin:Sender:(1) 1.048882] [jmsg/INFO] goodbye!
+> [0.000000] [java/INFO] Using regular java threads.
+> [1.048882] [java/INFO] MSG_main finished; Cleaning up the simulation...
+> [Boivin:Receiver:(2) 0.000000] [java/INFO] hello!
+> [Boivin:Receiver:(2) 0.000000] [java/INFO] try to get a task
+> [Boivin:Receiver:(2) 1.048882] [java/INFO] Got at time 1.0488818628325232
+> [Boivin:Receiver:(2) 1.048882] [java/INFO] Was sent at time 0.0
+> [Boivin:Receiver:(2) 1.048882] [java/INFO] Communication time : 1.0488818628325232
+> [Boivin:Receiver:(2) 1.048882] [java/INFO]  --- bw 9.533962169004269E7 ----
+> [Boivin:Receiver:(2) 1.048882] [java/INFO] goodbye!
+> [Jacquelin:Sender:(1) 0.000000] [java/INFO] hello!
+> [Jacquelin:Sender:(1) 0.000000] [java/INFO] host count: 1
+> [Jacquelin:Sender:(1) 0.000000] [java/INFO] sender time: 0.0
+> [Jacquelin:Sender:(1) 1.048882] [java/INFO] goodbye!

diff --git a/examples/java/cloud/masterworker/Master.java b/examples/java/cloud/masterworker/Master.java
index 4983d71..630992b 100644 (file)
--- a/examples/java/cloud/masterworker/Master.java
+++ b/examples/java/cloud/masterworker/Master.java
@@ -28,7 +28,7 @@ public class Master extends Process {
        public void main(String[] args) throws MsgException {
                int workersCount = Main.NHOSTS;
 
-               for (int step = 0; step < 100000 ; step++) {
+               for (int step = 1; step <= 1/*00000*/ ; step++) {
                        //Plumbr.startTransaction("Migration");
                        ArrayList<VM> vms = new ArrayList<>();
                        // Create one VM per host and bind a process inside each one. 
@@ -62,7 +62,7 @@ public class Master extends Process {
                        }
 
                        Msg.verb("Sleep long enough for everyone to be done with previous batch of work");
-                       waitFor(1000*(step+1) - Msg.getClock());
+                       waitFor(1000*step - Msg.getClock());
 
                        /*    Msg.info("Add one more process per VM.");
     for (int i = 0; i < vms.size(); i++) {

diff --git a/examples/java/cloud/masterworker/cloud_masterworker.tesh b/examples/java/cloud/masterworker/cloud_masterworker.tesh
index f1fcd35..eece85f 100644 (file)
--- a/examples/java/cloud/masterworker/cloud_masterworker.tesh
+++ b/examples/java/cloud/masterworker/cloud_masterworker.tesh
@@ -2,32 +2,32 @@
 
 ! output sort 19
 
-$ java -classpath ${classpath:=.} cloud/masterworker/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ java -classpath ${classpath:=.} cloud/masterworker/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=java.thres:verbose
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (0:maestro@) Start 2 hosts
-> [  0.000000] (1:Master@Boivin) create VM00
-> [  0.000000] (1:Master@Boivin) Put Worker WRK00 on VM00
-> [  0.000000] (1:Master@Boivin) create VM01
-> [  0.000000] (1:Master@Boivin) Put Worker WRK01 on VM01
+> [  0.000000] (1:Master@Boivin) create VM0-s1-0
+> [  0.000000] (1:Master@Boivin) Put Worker WK:1:0 on VM0-s1-0
+> [  0.000000] (2:WK:1:0@VM0-s1-0) WK:1:0 is listening on WK:1:0
+> [  0.000000] (1:Master@Boivin) create VM0-s1-1
+> [  0.000000] (1:Master@Boivin) Put Worker WK:1:1 on VM0-s1-1
+> [  0.000000] (3:WK:1:1@VM0-s1-1) WK:1:1 is listening on WK:1:1
 > [  0.000000] (1:Master@Boivin) Launched 2 VMs
 > [  0.000000] (1:Master@Boivin) Send a first batch of work to everyone
-> [  0.000000] (1:Master@Boivin) Sending to WRK00
-> [  0.000000] (2:WRK00@VM00) WRK00 is listening on MBOX:WRK00
-> [  0.000000] (3:WRK01@VM01) WRK01 is listening on MBOX:WRK01
-> [  0.090194] (1:Master@Boivin) Sending to WRK01
-> [  0.090194] (2:WRK00@VM00) Received "Task00". Processing it.
-> [  0.090194] (2:WRK00@VM00) WRK00 executed task (Task00)
-> [  0.754233] (1:Master@Boivin) Suspend all VMs
-> [  0.754233] (1:Master@Boivin) Suspend VM00
-> [  0.754233] (1:Master@Boivin) Suspend VM01
+> [  0.000000] (1:Master@Boivin) Sending to WK:1:0
+> [  0.090194] (2:WK:1:0@VM0-s1-0) Received "Task WK:1:0". Processing it.
+> [  0.090194] (1:Master@Boivin) Sending to WK:1:1
+> [  0.090194] (2:WK:1:0@VM0-s1-0) WK:1:0 executed task (Task WK:1:0)
+> [  0.754233] (3:WK:1:1@VM0-s1-1) Received "Task WK:1:1". Processing it.
+> [  0.754233] (1:Master@Boivin) Suspend all VMs, wait a while, resume them, migrate them and shut them down.
+> [  0.754233] (1:Master@Boivin) Suspend VM0-s1-0
+> [  0.754233] (1:Master@Boivin) Suspend VM0-s1-1
 > [  0.754233] (1:Master@Boivin) Wait a while
-> [  0.754233] (3:WRK01@VM01) Received "Task01". Processing it.
 > [  2.754233] (1:Master@Boivin) Resume all VMs.
 > [  2.754233] (1:Master@Boivin) Sleep long enough for everyone to be done with previous batch of work
-> [  2.754234] (3:WRK01@VM01) WRK01 executed task (Task01)
+> [  2.754234] (3:WK:1:1@VM0-s1-1) WK:1:1 executed task (Task WK:1:1)
 > [1000.000000] (1:Master@Boivin) Migrate everyone to Ginette
-> [1000.000000] (1:Master@Boivin) Migrate VM00fromBourassato Ginette
-> [1100.157755] (1:Master@Boivin) Migrate VM01fromFafardto Ginette
-> [1242.754111] (0:maestro@) MSG_main finished; Cleaning up the simulation...
+> [1000.000000] (1:Master@Boivin) Migrate VM0-s1-0 from Bourassato Ginette
+> [1100.157755] (1:Master@Boivin) Migrate VM0-s1-1 from Fafardto Ginette
 > [1242.754111] (1:Master@Boivin) Let's shut down the simulation and kill everyone.
-> [1242.754111] (1:Master@Boivin) Master done.
+> [1242.754111] (1:Master@Boivin) XXXXXXXXXXXXXXX Step 1 done.
+> [1242.754111] (0:maestro@) MSG_main finished; Cleaning up the simulation...

diff --git a/examples/java/cloud/migration/cloud_migration.tesh b/examples/java/cloud/migration/cloud_migration.tesh
index 2796b59..4c73eb1 100644 (file)
--- a/examples/java/cloud/migration/cloud_migration.tesh
+++ b/examples/java/cloud/migration/cloud_migration.tesh
@@ -1,33 +1,33 @@
 #! tesh
 
 $ java -classpath ${classpath:=.} cloud/migration/Main ${srcdir:=.}/../platforms/three_multicore_hosts.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [PM0:Test:(1) 0.000000] [jmsg/INFO] This example evaluates the migration time of a VM in presence of collocated VMs on the source and the dest nodes
-> [PM0:Test:(1) 0.000000] [jmsg/INFO] The migrated VM has a memory intensity rate of 70% of the network BW and a cpu load of 90% " (see cloudcom 2013 paper "Adding a Live Migration Model Into SimGrid" for further information) 
-> [PM0:Test:(1) 0.000000] [jmsg/INFO] Load of collocated VMs fluctuate between 0 and 90% in order to create a starvation issue and see whether it impacts or not the migration time
-> [PM0:Test:(1) 0.000000] [jmsg/INFO] Round trip of VM1 (load 90%)
-> [PM0:Test:(1) 0.000000] [jmsg/INFO]      - Launch migration from PM0 to PM1
-> [PM0:Test:(1) 0.000000] [jmsg/INFO] Start migration of VM vm0 to PM1
-> [PM0:Test:(1) 0.000000] [jmsg/INFO]     currentLoad:90/ramSize:2048/dpIntensity:70/remaining:8.10E+11
-> [PM0:Test:(1) 35.084170] [jmsg/INFO] End of migration of VM vm0 to node PM1
-> [PM0:Test:(1) 35.084170] [jmsg/INFO]      - End of Migration from PM0 to PM1 (duration:35.0841702956701)
-> [PM0:Test:(1) 35.084170] [jmsg/INFO]      - Launch migration from PM1 to PM0
-> [PM0:Test:(1) 35.084170] [jmsg/INFO] Start migration of VM vm0 to PM0
-> [PM0:Test:(1) 35.084170] [jmsg/INFO]     currentLoad:90/ramSize:2048/dpIntensity:70/remaining:6.22E+11
-> [PM0:Test:(1) 67.551019] [jmsg/INFO] End of migration of VM vm0 to node PM0
-> [PM0:Test:(1) 67.551019] [jmsg/INFO]      - End of Migration from PM1 to PM0 (duration:32.46684874546391)
-> [PM0:Test:(1) 67.551019] [jmsg/INFO] 
-> [PM0:Test:(1) 67.551019] [jmsg/INFO] 
-> [PM0:Test:(1) 67.551019] [jmsg/INFO] Round trip of VM1 (load 80%)
-> [PM0:Test:(1) 67.551019] [jmsg/INFO]      - Launch migration from PM0 to PM1
-> [PM0:Test:(1) 67.551019] [jmsg/INFO] Start migration of VM vm0 to PM1
-> [PM0:Test:(1) 67.551019] [jmsg/INFO]     currentLoad:80/ramSize:2048/dpIntensity:70/remaining:4.65E+11
-> [PM0:Test:(1) 102.635189] [jmsg/INFO] End of migration of VM vm0 to node PM1
-> [PM0:Test:(1) 102.635189] [jmsg/INFO]      - End of Migration from PM0 to PM1 (duration:35.08417029567006)
-> [PM0:Test:(1) 102.635189] [jmsg/INFO]      - Launch migration from PM1 to PM0
-> [PM0:Test:(1) 102.635189] [jmsg/INFO] Start migration of VM vm0 to PM0
-> [PM0:Test:(1) 102.635189] [jmsg/INFO]     currentLoad:80/ramSize:2048/dpIntensity:70/remaining:2.77E+11
-> [PM0:Test:(1) 135.102038] [jmsg/INFO] End of migration of VM vm0 to node PM0
-> [PM0:Test:(1) 135.102038] [jmsg/INFO]      - End of Migration from PM1 to PM0 (duration:32.46684874546395)
-> [PM0:Test:(1) 135.102038] [jmsg/INFO] Forcefully destroy VMs
-> [135.102038] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [0.000000] [java/INFO] Using regular java threads.
+> [PM0:Test:(1) 0.000000] [java/INFO] This example evaluates the migration time of a VM in presence of collocated VMs on the source and the dest nodes
+> [PM0:Test:(1) 0.000000] [java/INFO] The migrated VM has a memory intensity rate of 70% of the network BW and a cpu load of 90% " (see cloudcom 2013 paper "Adding a Live Migration Model Into SimGrid" for further information) 
+> [PM0:Test:(1) 0.000000] [java/INFO] Load of collocated VMs fluctuate between 0 and 90% in order to create a starvation issue and see whether it impacts or not the migration time
+> [PM0:Test:(1) 0.000000] [java/INFO] Round trip of VM1 (load 90%)
+> [PM0:Test:(1) 0.000000] [java/INFO]      - Launch migration from PM0 to PM1
+> [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) 35.084170] [java/INFO] End of migration of VM vm0 to node PM1
+> [PM0:Test:(1) 35.084170] [java/INFO]      - End of Migration from PM0 to PM1 (duration:35.0841702956701)
+> [PM0:Test:(1) 35.084170] [java/INFO]      - Launch migration from PM1 to PM0
+> [PM0:Test:(1) 35.084170] [java/INFO] Start migration of VM vm0 to PM0
+> [PM0:Test:(1) 35.084170] [java/INFO]     currentLoad:90/ramSize:2048/dpIntensity:70/remaining:6.22E+11
+> [PM0:Test:(1) 67.551019] [java/INFO] End of migration of VM vm0 to node PM0
+> [PM0:Test:(1) 67.551019] [java/INFO]      - End of Migration from PM1 to PM0 (duration:32.46684874546391)
+> [PM0:Test:(1) 67.551019] [java/INFO] 
+> [PM0:Test:(1) 67.551019] [java/INFO] 
+> [PM0:Test:(1) 67.551019] [java/INFO] Round trip of VM1 (load 80%)
+> [PM0:Test:(1) 67.551019] [java/INFO]      - Launch migration from PM0 to PM1
+> [PM0:Test:(1) 67.551019] [java/INFO] Start migration of VM vm0 to PM1
+> [PM0:Test:(1) 67.551019] [java/INFO]     currentLoad:80/ramSize:2048/dpIntensity:70/remaining:4.65E+11
+> [PM0:Test:(1) 102.635189] [java/INFO] End of migration of VM vm0 to node PM1
+> [PM0:Test:(1) 102.635189] [java/INFO]      - End of Migration from PM0 to PM1 (duration:35.08417029567006)
+> [PM0:Test:(1) 102.635189] [java/INFO]      - Launch migration from PM1 to PM0
+> [PM0:Test:(1) 102.635189] [java/INFO] Start migration of VM vm0 to PM0
+> [PM0:Test:(1) 102.635189] [java/INFO]     currentLoad:80/ramSize:2048/dpIntensity:70/remaining:2.77E+11
+> [PM0:Test:(1) 135.102038] [java/INFO] End of migration of VM vm0 to node PM0
+> [PM0:Test:(1) 135.102038] [java/INFO]      - End of Migration from PM1 to PM0 (duration:32.46684874546395)
+> [PM0:Test:(1) 135.102038] [java/INFO] Forcefully destroy VMs
+> [135.102038] [java/INFO] MSG_main finished; Cleaning up the simulation...

diff --git a/examples/java/dht/chord/dht_chord.tesh b/examples/java/dht/chord/dht_chord.tesh
index 73fafbc..85328dc 100644 (file)
--- a/examples/java/dht/chord/dht_chord.tesh
+++ b/examples/java/dht/chord/dht_chord.tesh
@@ -3,14 +3,14 @@
 ! output sort 19
 
 $ java -classpath ${classpath:=.} dht/chord/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/dht/chord/chord.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [1046.787586] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
-> [node-1.acme.org:dht.chord.Node:(2) 0.000000] [jmsg/INFO] Joining the ring with id 366680 knowing node 42
-> [node-2.acme.org:dht.chord.Node:(3) 0.000000] [jmsg/INFO] Joining the ring with id 533744 knowing node 366680
-> [node-3.acme.org:dht.chord.Node:(4) 0.000000] [jmsg/INFO] Joining the ring with id 1319738 knowing node 42
-> [node-4.acme.org:dht.chord.Node:(5) 0.000000] [jmsg/INFO] Joining the ring with id 16509405 knowing node 366680
-> [node-5.acme.org:dht.chord.Node:(6) 0.000000] [jmsg/INFO] Joining the ring with id 10874876 knowing node 533744
-> [node-6.acme.org:dht.chord.Node:(7) 0.000000] [jmsg/INFO] Joining the ring with id 16728096 knowing node 1319738
-> [node-7.acme.org:dht.chord.Node:(8) 0.000000] [jmsg/INFO] Joining the ring with id 10004760 knowing node 16509405
-> [node-8.acme.org:dht.chord.Node:(9) 0.000000] [jmsg/INFO] Joining the ring with id 6518808 knowing node 42
-> [node-9.acme.org:dht.chord.Node:(10) 0.000000] [jmsg/INFO] Joining the ring with id 2015253 knowing node 1319738
+> [0.000000] [java/INFO] Using regular java threads.
+> [1046.787586] [java/INFO] MSG_main finished; Cleaning up the simulation...
+> [node-1.acme.org:dht.chord.Node:(2) 0.000000] [java/INFO] Joining the ring with id 366680 knowing node 42
+> [node-2.acme.org:dht.chord.Node:(3) 0.000000] [java/INFO] Joining the ring with id 533744 knowing node 366680
+> [node-3.acme.org:dht.chord.Node:(4) 0.000000] [java/INFO] Joining the ring with id 1319738 knowing node 42
+> [node-4.acme.org:dht.chord.Node:(5) 0.000000] [java/INFO] Joining the ring with id 16509405 knowing node 366680
+> [node-5.acme.org:dht.chord.Node:(6) 0.000000] [java/INFO] Joining the ring with id 10874876 knowing node 533744
+> [node-6.acme.org:dht.chord.Node:(7) 0.000000] [java/INFO] Joining the ring with id 16728096 knowing node 1319738
+> [node-7.acme.org:dht.chord.Node:(8) 0.000000] [java/INFO] Joining the ring with id 10004760 knowing node 16509405
+> [node-8.acme.org:dht.chord.Node:(9) 0.000000] [java/INFO] Joining the ring with id 6518808 knowing node 42
+> [node-9.acme.org:dht.chord.Node:(10) 0.000000] [java/INFO] Joining the ring with id 2015253 knowing node 1319738

diff --git a/examples/java/dht/kademlia/dht_kademlia.tesh b/examples/java/dht/kademlia/dht_kademlia.tesh
index fbe70e8..c377548 100644 (file)
--- a/examples/java/dht/kademlia/dht_kademlia.tesh
+++ b/examples/java/dht/kademlia/dht_kademlia.tesh
@@ -3,13 +3,13 @@
 ! output sort 19
 
 $ java -classpath ${classpath:=.} dht/kademlia/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/dht/kademlia/kademlia.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [900.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
-> [node-0.acme.org:dht.kademlia.Node:(1) 0.000000] [jmsg/INFO] Hi, I'm going to create the network with the id 0!
-> [node-0.acme.org:dht.kademlia.Node:(1) 900.000000] [jmsg/INFO] 8/8 FIND_NODE have succedded.
-> [node-1.acme.org:dht.kademlia.Node:(2) 0.000000] [jmsg/INFO] Hi, I'm going to join the network with the id 1!
-> [node-1.acme.org:dht.kademlia.Node:(2) 900.000000] [jmsg/INFO] 8/8 FIND_NODE have succedded.
-> [node-2.acme.org:dht.kademlia.Node:(3) 0.000000] [jmsg/INFO] Hi, I'm going to join the network with the id 2!
-> [node-2.acme.org:dht.kademlia.Node:(3) 900.000000] [jmsg/INFO] 8/8 FIND_NODE have succedded.
-> [node-3.acme.org:dht.kademlia.Node:(4) 0.000000] [jmsg/INFO] Hi, I'm going to join the network with the id 4!
-> [node-3.acme.org:dht.kademlia.Node:(4) 900.000000] [jmsg/INFO] 8/8 FIND_NODE have succedded.
+> [0.000000] [java/INFO] Using regular java threads.
+> [900.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...
+> [node-0.acme.org:dht.kademlia.Node:(1) 0.000000] [java/INFO] Hi, I'm going to create the network with the id 0!
+> [node-0.acme.org:dht.kademlia.Node:(1) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded.
+> [node-1.acme.org:dht.kademlia.Node:(2) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 1!
+> [node-1.acme.org:dht.kademlia.Node:(2) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded.
+> [node-2.acme.org:dht.kademlia.Node:(3) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 2!
+> [node-2.acme.org:dht.kademlia.Node:(3) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded.
+> [node-3.acme.org:dht.kademlia.Node:(4) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 4!
+> [node-3.acme.org:dht.kademlia.Node:(4) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded.

diff --git a/examples/java/energy/consumption/energy_consumption.tesh b/examples/java/energy/consumption/energy_consumption.tesh
index ef29636..211b2b1 100644 (file)
--- a/examples/java/energy/consumption/energy_consumption.tesh
+++ b/examples/java/energy/consumption/energy_consumption.tesh
@@ -3,14 +3,14 @@
 ! timeout 15
 
 $ java -classpath ${classpath:=.} energy/consumption/Main ${srcdir:=.}/../platforms/energy_platform.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [MyHost1:energyConsumer:(1) 0.000000] [jmsg/INFO] Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0
-> [MyHost1:energyConsumer:(1) 0.000000] [jmsg/INFO] Initial peak speed= 1.0E8 flop/s; Energy dissipated = 0.0 J
-> [MyHost1:energyConsumer:(1) 10.000000] [jmsg/INFO] Currently consumed energy after sleeping 10 sec: 1000.0
-> [MyHost1:energyConsumer:(1) 20.000000] [jmsg/INFO] Currently consumed energy after executing 1E9 flops: 2200.0
+> [0.000000] [java/INFO] Using regular java threads.
+> [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0
+> [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Initial peak speed= 1.0E8 flop/s; Energy dissipated = 0.0 J
+> [MyHost1:energyConsumer:(1) 10.000000] [java/INFO] Currently consumed energy after sleeping 10 sec: 1000.0
+> [MyHost1:energyConsumer:(1) 20.000000] [java/INFO] Currently consumed energy after executing 1E9 flops: 2200.0
 > [20.000000] [surf_energy/INFO] Total energy consumption: 6200.000000 Joules (used hosts: 2200.000000 Joules; unused/idle hosts: 4000.000000)
-> [20.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
-> [20.000000] [jmsg/INFO] Total simulation time: 20.0
+> [20.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...
+> [20.000000] [java/INFO] Total simulation time: 20.0
 > [20.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 2200.000000 Joules
 > [20.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 2000.000000 Joules
 > [20.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 2000.000000 Joules

diff --git a/examples/java/energy/pstate/energy_pstate.tesh b/examples/java/energy/pstate/energy_pstate.tesh
index f2c91c8..036c4ee 100644 (file)
--- a/examples/java/energy/pstate/energy_pstate.tesh
+++ b/examples/java/energy/pstate/energy_pstate.tesh
@@ -1,25 +1,25 @@
 #! tesh
 
 $ java -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/../platforms/energy_platform.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [MyHost1:dvfs_test:(2) 0.000000] [jmsg/INFO] Count of Processor states=3
-> [MyHost1:dvfs_test:(2) 0.000000] [jmsg/INFO] Current power peak=1.0E8
-> [MyHost2:dvfs_test:(3) 0.000000] [jmsg/INFO] Count of Processor states=3
-> [MyHost2:dvfs_test:(3) 0.000000] [jmsg/INFO] Current power peak=1.0E8
-> [MyHost1:dvfs_test:(2) 1.000000] [jmsg/INFO] Task1 simulation time: 1.0
-> [MyHost2:dvfs_test:(3) 1.000000] [jmsg/INFO] Task1 simulation time: 1.0
-> [MyHost1:dvfs_test:(2) 1.000000] [jmsg/INFO] Changing power peak value to 2.0E7 (at index 2)
-> [MyHost2:dvfs_test:(3) 1.000000] [jmsg/INFO] Changing power peak value to 2.0E7 (at index 2)
-> [MyHost1:dvfs_test:(2) 1.000000] [jmsg/INFO] Current power peak=2.0E7
-> [MyHost2:dvfs_test:(3) 1.000000] [jmsg/INFO] Current power peak=2.0E7
-> [MyHost1:dvfs_test:(2) 6.000000] [jmsg/INFO] Task2 simulation time: 5.0
-> [MyHost1:dvfs_test:(2) 6.000000] [jmsg/INFO] Count of Processor states=3
-> [MyHost2:dvfs_test:(3) 6.000000] [jmsg/INFO] Task2 simulation time: 5.0
-> [MyHost2:dvfs_test:(3) 6.000000] [jmsg/INFO] Count of Processor states=3
-> [MyHost1:dvfs_test:(2) 6.000000] [jmsg/INFO] Current power peak=2.0E7
-> [MyHost2:dvfs_test:(3) 6.000000] [jmsg/INFO] Current power peak=2.0E7
+> [0.000000] [java/INFO] Using regular java threads.
+> [MyHost1:dvfs_test:(2) 0.000000] [java/INFO] Count of Processor states=3
+> [MyHost1:dvfs_test:(2) 0.000000] [java/INFO] Current power peak=1.0E8
+> [MyHost2:dvfs_test:(3) 0.000000] [java/INFO] Count of Processor states=3
+> [MyHost2:dvfs_test:(3) 0.000000] [java/INFO] Current power peak=1.0E8
+> [MyHost1:dvfs_test:(2) 1.000000] [java/INFO] Task1 simulation time: 1.0
+> [MyHost2:dvfs_test:(3) 1.000000] [java/INFO] Task1 simulation time: 1.0
+> [MyHost1:dvfs_test:(2) 1.000000] [java/INFO] Changing power peak value to 2.0E7 (at index 2)
+> [MyHost2:dvfs_test:(3) 1.000000] [java/INFO] Changing power peak value to 2.0E7 (at index 2)
+> [MyHost1:dvfs_test:(2) 1.000000] [java/INFO] Current power peak=2.0E7
+> [MyHost2:dvfs_test:(3) 1.000000] [java/INFO] Current power peak=2.0E7
+> [MyHost1:dvfs_test:(2) 6.000000] [java/INFO] Task2 simulation time: 5.0
+> [MyHost1:dvfs_test:(2) 6.000000] [java/INFO] Count of Processor states=3
+> [MyHost2:dvfs_test:(3) 6.000000] [java/INFO] Task2 simulation time: 5.0
+> [MyHost2:dvfs_test:(3) 6.000000] [java/INFO] Count of Processor states=3
+> [MyHost1:dvfs_test:(2) 6.000000] [java/INFO] Current power peak=2.0E7
+> [MyHost2:dvfs_test:(3) 6.000000] [java/INFO] Current power peak=2.0E7
 > [6.000000] [surf_energy/INFO] Total energy consumption: 1890.000000 Joules (used hosts: 1290.000000 Joules; unused/idle hosts: 600.000000)
-> [6.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [6.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...
 > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 645.000000 Joules
 > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 645.000000 Joules
 > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 600.000000 Joules

diff --git a/examples/java/energy/vm/energy_vm.tesh b/examples/java/energy/vm/energy_vm.tesh
index 8ad0d48..025e3f7 100644 (file)
--- a/examples/java/energy/vm/energy_vm.tesh
+++ b/examples/java/energy/vm/energy_vm.tesh
@@ -1,21 +1,21 @@
 #! tesh
 
 $ java -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../platforms/energy_platform.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [MyHost1:energy VM runner:(1) 0.000000] [jmsg/INFO] Creating and starting two VMs
-> [MyHost1:energy VM runner:(1) 0.000000] [jmsg/INFO] Create two tasks on Host1: one inside a VM, the other directly on the host
-> [MyHost1:energy VM runner:(1) 0.000000] [jmsg/INFO] Create two tasks on Host2: both directly on the host
-> [MyHost1:energy VM runner:(1) 0.000000] [jmsg/INFO] Create two tasks on Host3: both inside a VM
-> [MyHost1:energy VM runner:(1) 0.000000] [jmsg/INFO] Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds)
-> [MyHost1:energy VM runner:(1) 5.000000] [jmsg/INFO] Wait another 5 seconds. The tasks stop at some point in between
-> [MyHost2:p21:(4) 6.000000] [jmsg/INFO] This worker is done.
-> [MyHost2:p22:(5) 6.000000] [jmsg/INFO] This worker is done.
-> [MyHost1:p12:(3) 6.000000] [jmsg/INFO] This worker is done.
-> [vmHost1:p11:(2) 6.000000] [jmsg/INFO] This worker is done.
-> [vmHost3:p31:(6) 6.000000] [jmsg/INFO] This worker is done.
-> [vmHost3:p312:(7) 6.000000] [jmsg/INFO] This worker is done.
+> [0.000000] [java/INFO] Using regular java threads.
+> [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Creating and starting two VMs
+> [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Create two tasks on Host1: one inside a VM, the other directly on the host
+> [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Create two tasks on Host2: both directly on the host
+> [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Create two tasks on Host3: both inside a VM
+> [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds)
+> [MyHost1:energy VM runner:(1) 5.000000] [java/INFO] Wait another 5 seconds. The tasks stop at some point in between
+> [MyHost2:p21:(4) 6.000000] [java/INFO] This worker is done.
+> [MyHost2:p22:(5) 6.000000] [java/INFO] This worker is done.
+> [MyHost1:p12:(3) 6.000000] [java/INFO] This worker is done.
+> [vmHost1:p11:(2) 6.000000] [java/INFO] This worker is done.
+> [vmHost3:p31:(6) 6.000000] [java/INFO] This worker is done.
+> [vmHost3:p312:(7) 6.000000] [java/INFO] This worker is done.
 > [10.000000] [surf_energy/INFO] Total energy consumption: 3360.000000 Joules (used hosts: 3360.000000 Joules; unused/idle hosts: 0.000000)
-> [10.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [10.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...
 > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 1120.000000 Joules
 > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 1120.000000 Joules
 > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 1120.000000 Joules

diff --git a/examples/java/io/file/io_file.tesh b/examples/java/io/file/io_file.tesh
index 9c88942..57606d1 100644 (file)
--- a/examples/java/io/file/io_file.tesh
+++ b/examples/java/io/file/io_file.tesh
@@ -1,26 +1,26 @@
 #! tesh
 
 $ java -classpath ${classpath:=.} io/file/Main ${srcdir:=.}/../platforms/storage/storage.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [0.000000] [jmsg/INFO] Number of hosts:4
-> [alice:0:(1) 0.000000] [jmsg/INFO] Open file c:\Windows\setupact.log
-> [bob:1:(2) 0.000000] [jmsg/INFO] Open file /home/doc/simgrid/examples/platforms/nancy.xml
-> [carl:2:(3) 0.000000] [jmsg/INFO] Open file /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
-> [denise:3:(4) 0.000000] [jmsg/INFO] Open file /home/doc/simgrid/examples/platforms/g5k.xml
-> [bob:1:(2) 0.000040] [jmsg/INFO] Having read 4028 on /home/doc/simgrid/examples/platforms/nancy.xml
-> [alice:0:(1) 0.000050] [jmsg/INFO] Having read 10000 on c:\Windows\setupact.log
-> [denise:3:(4) 0.000050] [jmsg/INFO] Having read 10000 on /home/doc/simgrid/examples/platforms/g5k.xml
-> [carl:2:(3) 0.000100] [jmsg/INFO] Having read 10000 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
-> [alice:0:(1) 0.001717] [jmsg/INFO] Having write 100000 on c:\Windows\setupact.log
-> [alice:0:(1) 0.001717] [jmsg/INFO] Seek back to the beginning of c:\Windows\setupact.log
-> [denise:3:(4) 0.001717] [jmsg/INFO] Having write 100000 on /home/doc/simgrid/examples/platforms/g5k.xml
-> [denise:3:(4) 0.001717] [jmsg/INFO] Seek back to the beginning of /home/doc/simgrid/examples/platforms/g5k.xml
-> [alice:0:(1) 0.002267] [jmsg/INFO] Having read 110000 on c:\Windows\setupact.log
-> [denise:3:(4) 0.002267] [jmsg/INFO] Having read 110000 on /home/doc/simgrid/examples/platforms/g5k.xml
-> [bob:1:(2) 0.003374] [jmsg/INFO] Having write 100000 on /home/doc/simgrid/examples/platforms/nancy.xml
-> [bob:1:(2) 0.003374] [jmsg/INFO] Seek back to the beginning of /home/doc/simgrid/examples/platforms/nancy.xml
-> [carl:2:(3) 0.003433] [jmsg/INFO] Having write 100000 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
-> [carl:2:(3) 0.003433] [jmsg/INFO] Seek back to the beginning of /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
-> [bob:1:(2) 0.004414] [jmsg/INFO] Having read 104028 on /home/doc/simgrid/examples/platforms/nancy.xml
-> [carl:2:(3) 0.004533] [jmsg/INFO] Having read 110000 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
-> [0.004533] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [0.000000] [java/INFO] Using regular java threads.
+> [0.000000] [java/INFO] Number of hosts:4
+> [alice:0:(1) 0.000000] [java/INFO] Open file c:\Windows\setupact.log
+> [bob:1:(2) 0.000000] [java/INFO] Open file /home/doc/simgrid/examples/platforms/nancy.xml
+> [carl:2:(3) 0.000000] [java/INFO] Open file /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [denise:3:(4) 0.000000] [java/INFO] Open file /home/doc/simgrid/examples/platforms/g5k.xml
+> [bob:1:(2) 0.000040] [java/INFO] Having read 4028 on /home/doc/simgrid/examples/platforms/nancy.xml
+> [alice:0:(1) 0.000050] [java/INFO] Having read 10000 on c:\Windows\setupact.log
+> [denise:3:(4) 0.000050] [java/INFO] Having read 10000 on /home/doc/simgrid/examples/platforms/g5k.xml
+> [carl:2:(3) 0.000100] [java/INFO] Having read 10000 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [alice:0:(1) 0.001717] [java/INFO] Having write 100000 on c:\Windows\setupact.log
+> [alice:0:(1) 0.001717] [java/INFO] Seek back to the beginning of c:\Windows\setupact.log
+> [denise:3:(4) 0.001717] [java/INFO] Having write 100000 on /home/doc/simgrid/examples/platforms/g5k.xml
+> [denise:3:(4) 0.001717] [java/INFO] Seek back to the beginning of /home/doc/simgrid/examples/platforms/g5k.xml
+> [alice:0:(1) 0.002267] [java/INFO] Having read 110000 on c:\Windows\setupact.log
+> [denise:3:(4) 0.002267] [java/INFO] Having read 110000 on /home/doc/simgrid/examples/platforms/g5k.xml
+> [bob:1:(2) 0.003374] [java/INFO] Having write 100000 on /home/doc/simgrid/examples/platforms/nancy.xml
+> [bob:1:(2) 0.003374] [java/INFO] Seek back to the beginning of /home/doc/simgrid/examples/platforms/nancy.xml
+> [carl:2:(3) 0.003433] [java/INFO] Having write 100000 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [carl:2:(3) 0.003433] [java/INFO] Seek back to the beginning of /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [bob:1:(2) 0.004414] [java/INFO] Having read 104028 on /home/doc/simgrid/examples/platforms/nancy.xml
+> [carl:2:(3) 0.004533] [java/INFO] Having read 110000 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [0.004533] [java/INFO] MSG_main finished; Cleaning up the simulation...

diff --git a/examples/java/io/storage/io_storage.tesh b/examples/java/io/storage/io_storage.tesh
index 34d4604..f72972e 100644 (file)
--- a/examples/java/io/storage/io_storage.tesh
+++ b/examples/java/io/storage/io_storage.tesh
@@ -1,25 +1,25 @@
 #! tesh
 
 $ java -classpath ${classpath:=.} io/storage/Main ${srcdir:=.}/../platforms/storage/storage.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [denise:0:(1) 0.000000] [jmsg/INFO] ------------------------------------
-> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk2
-> [denise:0:(1) 0.000000] [jmsg/INFO] Size: 536870912000 bytes.
-> [denise:0:(1) 0.000000] [jmsg/INFO] Free Size: 534479374867 bytes.
-> [denise:0:(1) 0.000000] [jmsg/INFO] Used Size: 2391537133 bytes.
-> [denise:0:(1) 0.000000] [jmsg/INFO] ------------------------------------
-> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk4
-> [denise:0:(1) 0.000000] [jmsg/INFO] Size: 536870912000 bytes.
-> [denise:0:(1) 0.000000] [jmsg/INFO] Free Size: 536857690006 bytes.
-> [denise:0:(1) 0.000000] [jmsg/INFO] Used Size: 13221994 bytes.
-> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk2
-> [denise:0:(1) 0.000000] [jmsg/INFO] Attached to host:alice
-> [denise:0:(1) 0.000000] [jmsg/INFO] Property key: Pierre
-> [denise:0:(1) 0.000000] [jmsg/INFO] Property key2: Pierre
-> [denise:0:(1) 0.000000] [jmsg/INFO] Disk attached: Disk4
-> [denise:0:(1) 0.000000] [jmsg/INFO] **************** ALL *************************
-> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk1
-> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk2
-> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk3
-> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk4
-> [0.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [0.000000] [java/INFO] Using regular java threads.
+> [denise:0:(1) 0.000000] [java/INFO] ------------------------------------
+> [denise:0:(1) 0.000000] [java/INFO] Disk name: Disk2
+> [denise:0:(1) 0.000000] [java/INFO] Size: 536870912000 bytes.
+> [denise:0:(1) 0.000000] [java/INFO] Free Size: 534479374867 bytes.
+> [denise:0:(1) 0.000000] [java/INFO] Used Size: 2391537133 bytes.
+> [denise:0:(1) 0.000000] [java/INFO] ------------------------------------
+> [denise:0:(1) 0.000000] [java/INFO] Disk name: Disk4
+> [denise:0:(1) 0.000000] [java/INFO] Size: 536870912000 bytes.
+> [denise:0:(1) 0.000000] [java/INFO] Free Size: 536857690006 bytes.
+> [denise:0:(1) 0.000000] [java/INFO] Used Size: 13221994 bytes.
+> [denise:0:(1) 0.000000] [java/INFO] Disk name: Disk2
+> [denise:0:(1) 0.000000] [java/INFO] Attached to host:alice
+> [denise:0:(1) 0.000000] [java/INFO] Property key: Pierre
+> [denise:0:(1) 0.000000] [java/INFO] Property key2: Pierre
+> [denise:0:(1) 0.000000] [java/INFO] Disk attached: Disk4
+> [denise:0:(1) 0.000000] [java/INFO] **************** ALL *************************
+> [denise:0:(1) 0.000000] [java/INFO] Disk: Disk1
+> [denise:0:(1) 0.000000] [java/INFO] Disk: Disk2
+> [denise:0:(1) 0.000000] [java/INFO] Disk: Disk3
+> [denise:0:(1) 0.000000] [java/INFO] Disk: Disk4
+> [0.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...

diff --git a/examples/java/process/kill/process_kill.tesh b/examples/java/process/kill/process_kill.tesh
index cca85d0..7af2010 100644 (file)
--- a/examples/java/process/kill/process_kill.tesh
+++ b/examples/java/process/kill/process_kill.tesh
@@ -1,12 +1,12 @@
 #! tesh
 
 $ java -classpath ${classpath:=.} process/kill/Main ${srcdir:=.}/../platforms/small_platform.xml --lof=no_loc
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [Jacquelin:killer:(1) 0.000000] [jmsg/INFO] Hello!
-> [Boivin:victim:(2) 0.000000] [jmsg/INFO] Hello!
-> [Boivin:victim:(2) 0.000000] [jmsg/INFO] Suspending myself
-> [Jacquelin:killer:(1) 10.000000] [jmsg/INFO] Resume Process
-> [Boivin:victim:(2) 10.000000] [jmsg/INFO] OK, OK. Let's work
-> [Jacquelin:killer:(1) 11.000000] [jmsg/INFO] Kill Process
-> [Jacquelin:killer:(1) 11.000000] [jmsg/INFO] Ok, goodbye now.
-> [11.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [0.000000] [java/INFO] Using regular java threads.
+> [Jacquelin:killer:(1) 0.000000] [java/INFO] Hello!
+> [Boivin:victim:(2) 0.000000] [java/INFO] Hello!
+> [Boivin:victim:(2) 0.000000] [java/INFO] Suspending myself
+> [Jacquelin:killer:(1) 10.000000] [java/INFO] Resume Process
+> [Boivin:victim:(2) 10.000000] [java/INFO] OK, OK. Let's work
+> [Jacquelin:killer:(1) 11.000000] [java/INFO] Kill Process
+> [Jacquelin:killer:(1) 11.000000] [java/INFO] Ok, goodbye now.
+> [11.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...

diff --git a/examples/java/process/startkilltime/process_startkilltime.tesh b/examples/java/process/startkilltime/process_startkilltime.tesh
index fd2c1d5..a7792a3 100644 (file)
--- a/examples/java/process/startkilltime/process_startkilltime.tesh
+++ b/examples/java/process/startkilltime/process_startkilltime.tesh
@@ -1,12 +1,12 @@
 #! tesh
 $ java -classpath ${classpath:=.} process/startkilltime/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/process/startkilltime/startkilltime.xml
-> [0.000000] [jmsg/INFO] Using regular java threads.
-> [node-0.acme.org:process.startkilltime.Sleeper:(1) 0.000000] [jmsg/INFO] Hello! I go to sleep.
-> [node-1.acme.org:process.startkilltime.Sleeper:(2) 1.000000] [jmsg/INFO] Hello! I go to sleep.
-> [node-2.acme.org:process.startkilltime.Sleeper:(3) 2.000000] [jmsg/INFO] Hello! I go to sleep.
-> [node-3.acme.org:process.startkilltime.Sleeper:(4) 3.000000] [jmsg/INFO] Hello! I go to sleep.
-> [node-4.acme.org:process.startkilltime.Sleeper:(5) 4.000000] [jmsg/INFO] Hello! I go to sleep.
-> [node-5.acme.org:process.startkilltime.Sleeper:(6) 5.000000] [jmsg/INFO] Hello! I go to sleep.
-> [node-2.acme.org:process.startkilltime.Sleeper:(3) 6.000000] [jmsg/INFO] Done sleeping
-> [node-3.acme.org:process.startkilltime.Sleeper:(4) 7.000000] [jmsg/INFO] Done sleeping
-> [10.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+> [0.000000] [java/INFO] Using regular java threads.
+> [node-0.acme.org:process.startkilltime.Sleeper:(1) 0.000000] [java/INFO] Hello! I go to sleep.
+> [node-1.acme.org:process.startkilltime.Sleeper:(2) 1.000000] [java/INFO] Hello! I go to sleep.
+> [node-2.acme.org:process.startkilltime.Sleeper:(3) 2.000000] [java/INFO] Hello! I go to sleep.
+> [node-3.acme.org:process.startkilltime.Sleeper:(4) 3.000000] [java/INFO] Hello! I go to sleep.
+> [node-4.acme.org:process.startkilltime.Sleeper:(5) 4.000000] [java/INFO] Hello! I go to sleep.
+> [node-5.acme.org:process.startkilltime.Sleeper:(6) 5.000000] [java/INFO] Hello! I go to sleep.
+> [node-2.acme.org:process.startkilltime.Sleeper:(3) 6.000000] [java/INFO] Done sleeping
+> [node-3.acme.org:process.startkilltime.Sleeper:(4) 7.000000] [java/INFO] Done sleeping
+> [10.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...

diff --git a/examples/java/trace/pingpong/trace_pingpong.tesh b/examples/java/trace/pingpong/trace_pingpong.tesh
index a3b011a..0ef97e5 100644 (file)
--- a/examples/java/trace/pingpong/trace_pingpong.tesh
+++ b/examples/java/trace/pingpong/trace_pingpong.tesh
@@ -3,37 +3,37 @@
 ! output sort 19
 
 $ java -classpath ${classpath:=.} trace/pingpong/Main ${srcdir:=.}/../platforms/small_platform.xml --cfg=tracing:yes  --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:yes
-> [0.000000] [jmsg/INFO] Using regular java threads.
+> [0.000000] [java/INFO] Using regular java threads.
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'simulation.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
-> [3.817809] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
-> [Boivin:Receiver:(2) 0.000000] [jmsg/INFO] hello!
-> [Boivin:Receiver:(2) 0.000000] [jmsg/INFO] try to get a task
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO] Got at time 1.0488818628325232
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO] Was sent at time 0.0
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO] Communication time : 1.0488818628325232
-> [Boivin:Receiver:(2) 1.048882] [jmsg/INFO]  --- bw 9.533962169004269E7 ----
-> [Boivin:Receiver:(2) 2.097764] [jmsg/INFO] goodbye!
-> [Jacquelin:Sender:(1) 0.000000] [jmsg/INFO] hello !
-> [Jacquelin:Sender:(1) 0.000000] [jmsg/INFO] host count: 2
-> [Jacquelin:Sender:(1) 0.000000] [jmsg/INFO] sender time: 0.0
-> [Jacquelin:Sender:(1) 2.097764] [jmsg/INFO] Got at time 2.0977637256650463
-> [Jacquelin:Sender:(1) 2.097764] [jmsg/INFO] Was sent at time 0.0
-> [Jacquelin:Sender:(1) 2.097764] [jmsg/INFO] Communication time : 2.0977637256650463
-> [Jacquelin:Sender:(1) 2.097764] [jmsg/INFO]  --- bw 4.7669810845021345E7 ----
-> [Jacquelin:Sender:(1) 2.097764] [jmsg/INFO] sender time: 2.0977637256650463
-> [Jacquelin:Sender:(1) 3.817809] [jmsg/INFO] Got at time 3.8178087458100927
-> [Jacquelin:Sender:(1) 3.817809] [jmsg/INFO] Was sent at time 2.0977637256650463
-> [Jacquelin:Sender:(1) 3.817809] [jmsg/INFO] Communication time : 1.7200450201450463
-> [Jacquelin:Sender:(1) 3.817809] [jmsg/INFO]  --- bw 5.813801315012516E7 ----
-> [Jacquelin:Sender:(1) 3.817809] [jmsg/INFO] goodbye!
-> [Tremblay:Receiver:(3) 0.000000] [jmsg/INFO] hello!
-> [Tremblay:Receiver:(3) 0.000000] [jmsg/INFO] try to get a task
-> [Tremblay:Receiver:(3) 2.957786] [jmsg/INFO] Got at time 2.9577862357375695
-> [Tremblay:Receiver:(3) 2.957786] [jmsg/INFO] Was sent at time 2.0977637256650463
-> [Tremblay:Receiver:(3) 2.957786] [jmsg/INFO] Communication time : 0.8600225100725232
-> [Tremblay:Receiver:(3) 2.957786] [jmsg/INFO]  --- bw 1.1627602630025032E8 ----
-> [Tremblay:Receiver:(3) 3.817809] [jmsg/INFO] goodbye!
+> [3.817809] [java/INFO] MSG_main finished; Cleaning up the simulation...
+> [Boivin:Receiver:(2) 0.000000] [java/INFO] hello!
+> [Boivin:Receiver:(2) 0.000000] [java/INFO] try to get a task
+> [Boivin:Receiver:(2) 1.048882] [java/INFO] Got at time 1.0488818628325232
+> [Boivin:Receiver:(2) 1.048882] [java/INFO] Was sent at time 0.0
+> [Boivin:Receiver:(2) 1.048882] [java/INFO] Communication time : 1.0488818628325232
+> [Boivin:Receiver:(2) 1.048882] [java/INFO]  --- bw 9.533962169004269E7 ----
+> [Boivin:Receiver:(2) 2.097764] [java/INFO] goodbye!
+> [Jacquelin:Sender:(1) 0.000000] [java/INFO] hello !
+> [Jacquelin:Sender:(1) 0.000000] [java/INFO] host count: 2
+> [Jacquelin:Sender:(1) 0.000000] [java/INFO] sender time: 0.0
+> [Jacquelin:Sender:(1) 2.097764] [java/INFO] Got at time 2.0977637256650463
+> [Jacquelin:Sender:(1) 2.097764] [java/INFO] Was sent at time 0.0
+> [Jacquelin:Sender:(1) 2.097764] [java/INFO] Communication time : 2.0977637256650463
+> [Jacquelin:Sender:(1) 2.097764] [java/INFO]  --- bw 4.7669810845021345E7 ----
+> [Jacquelin:Sender:(1) 2.097764] [java/INFO] sender time: 2.0977637256650463
+> [Jacquelin:Sender:(1) 3.817809] [java/INFO] Got at time 3.8178087458100927
+> [Jacquelin:Sender:(1) 3.817809] [java/INFO] Was sent at time 2.0977637256650463
+> [Jacquelin:Sender:(1) 3.817809] [java/INFO] Communication time : 1.7200450201450463
+> [Jacquelin:Sender:(1) 3.817809] [java/INFO]  --- bw 5.813801315012516E7 ----
+> [Jacquelin:Sender:(1) 3.817809] [java/INFO] goodbye!
+> [Tremblay:Receiver:(3) 0.000000] [java/INFO] hello!
+> [Tremblay:Receiver:(3) 0.000000] [java/INFO] try to get a task
+> [Tremblay:Receiver:(3) 2.957786] [java/INFO] Got at time 2.9577862357375695
+> [Tremblay:Receiver:(3) 2.957786] [java/INFO] Was sent at time 2.0977637256650463
+> [Tremblay:Receiver:(3) 2.957786] [java/INFO] Communication time : 0.8600225100725232
+> [Tremblay:Receiver:(3) 2.957786] [java/INFO]  --- bw 1.1627602630025032E8 ----
+> [Tremblay:Receiver:(3) 3.817809] [java/INFO] goodbye!
 
 $ rm -rf simulation.trace

diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp
index dcb5883..fff1ca5 100644 (file)
--- a/src/bindings/java/JavaContext.cpp
+++ b/src/bindings/java/JavaContext.cpp
@@ -15,7 +15,7 @@
 
 extern "C" JavaVM* __java_vm;
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg, "MSG for Java(TM)");
+XBT_LOG_NEW_DEFAULT_CATEGORY(java, "MSG for Java(TM)");
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 389a671..47a8e3b 100644 (file)
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -41,7 +41,7 @@ SG_BEGIN_DECL()
 int JAVA_HOST_LEVEL = -1;
 int JAVA_STORAGE_LEVEL = -1;
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 JavaVM *__java_vm = nullptr;
 
@@ -101,7 +101,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j
   jstring jval;
   const char *tmp;
 
-  XBT_LOG_CONNECT(jmsg);
+  XBT_LOG_CONNECT(java);
   XBT_LOG_CONNECT(jtrace);
 
   env->GetJavaVM(&__java_vm);

diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp
index 8124ac4..cac6920 100644 (file)
--- a/src/bindings/java/jmsg_as.cpp
+++ b/src/bindings/java/jmsg_as.cpp
@@ -13,7 +13,7 @@
 #include "jxbt_utilities.h"
 #include "jmsg.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 SG_BEGIN_DECL()
 

diff --git a/src/bindings/java/jmsg_comm.cpp b/src/bindings/java/jmsg_comm.cpp
index 772b40d..320b159 100644 (file)
--- a/src/bindings/java/jmsg_comm.cpp
+++ b/src/bindings/java/jmsg_comm.cpp
@@ -10,7 +10,7 @@
 #include "jmsg.h"
 
 #include <simgrid/msg.h>
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 SG_BEGIN_DECL()
 

diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp
index cecd8a2..f3f0fc5 100644 (file)
--- a/src/bindings/java/jmsg_host.cpp
+++ b/src/bindings/java/jmsg_host.cpp
@@ -13,7 +13,7 @@
 #include "jxbt_utilities.h"
 #include "jmsg_storage.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 SG_BEGIN_DECL()
 

diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index b089ee6..90b43ea 100644 (file)
--- a/src/bindings/java/jmsg_process.cpp
+++ b/src/bindings/java/jmsg_process.cpp
@@ -14,7 +14,7 @@
 #include "jxbt_utilities.h"
 #include "JavaContext.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 SG_BEGIN_DECL()
 

diff --git a/src/bindings/java/jmsg_storage.cpp b/src/bindings/java/jmsg_storage.cpp
index 8afa119..48e73bc 100644 (file)
--- a/src/bindings/java/jmsg_storage.cpp
+++ b/src/bindings/java/jmsg_storage.cpp
@@ -12,7 +12,7 @@
 #include "jmsg_storage.h"
 #include "jxbt_utilities.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 SG_BEGIN_DECL()
 

diff --git a/src/bindings/java/jmsg_synchro.cpp b/src/bindings/java/jmsg_synchro.cpp
index d25b97b..4fd0836 100644 (file)
--- a/src/bindings/java/jmsg_synchro.cpp
+++ b/src/bindings/java/jmsg_synchro.cpp
@@ -12,7 +12,7 @@
 #include "jxbt_utilities.h"
 #include "xbt/synchro.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 SG_BEGIN_DECL()
 

diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp
index 73a9ba0..8e2c1fc 100644 (file)
--- a/src/bindings/java/jmsg_task.cpp
+++ b/src/bindings/java/jmsg_task.cpp
@@ -13,7 +13,7 @@
 #include "jmsg_process.h"
 #include "jxbt_utilities.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 SG_BEGIN_DECL()
 

diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp
index 1c4d84e..616c054 100644 (file)
--- a/src/bindings/java/jmsg_vm.cpp
+++ b/src/bindings/java/jmsg_vm.cpp
@@ -11,7 +11,7 @@
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "xbt/ex.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
 SG_BEGIN_DECL()