the java samples alias0 and alias1 are renamed autoDestination and explicitDestination

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5195 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/java/alias0/Alias0Test.java b/examples/java/autoDestination/AutoDestinationTest.java
similarity index 93%
rename from examples/java/alias0/Alias0Test.java
rename to examples/java/autoDestination/AutoDestinationTest.java
index 78dd152..cc42183 100644 (file)
--- a/examples/java/alias0/Alias0Test.java
+++ b/examples/java/autoDestination/AutoDestinationTest.java
@@ -10,7 +10,7 @@
 \r
 import simgrid.msg.*;\r
 \r
 \r
 import simgrid.msg.*;\r
 \r

-public class Alias0Test {\r
+public class AutoDestinationTest {\r

    \r
    /* This only contains the launcher. If you do nothing more than than you can run \r
     *   java simgrid.msg.Msg\r
    \r
    /* This only contains the launcher. If you do nothing more than than you can run \r
     *   java simgrid.msg.Msg\r

diff --git a/examples/java/alias0/BasicTask.java b/examples/java/autoDestination/BasicTask.java
similarity index 100%
rename from examples/java/alias0/BasicTask.java
rename to examples/java/autoDestination/BasicTask.java

diff --git a/examples/java/alias0/FinalizeTask.java b/examples/java/autoDestination/FinalizeTask.java
similarity index 100%
rename from examples/java/alias0/FinalizeTask.java
rename to examples/java/autoDestination/FinalizeTask.java

diff --git a/examples/java/alias0/Forwarder.java b/examples/java/autoDestination/Forwarder.java
similarity index 95%
rename from examples/java/alias0/Forwarder.java
rename to examples/java/autoDestination/Forwarder.java
index 3f9b5ee..1949bc8 100644 (file)
--- a/examples/java/alias0/Forwarder.java
+++ b/examples/java/autoDestination/Forwarder.java
@@ -17,17 +17,17 @@ public class Forwarder extends simgrid.msg.Process {
                Msg.info("hello!");\r
        \r
                int aliasCount = args.length;\r
                Msg.info("hello!");\r
        \r
                int aliasCount = args.length;\r

+               \r
+               int taskCount = 0;\r
+               \r

                Task taskReceived;\r
                Task finalizeTask;\r
                BasicTask basicTask;\r
                \r
                Task taskReceived;\r
                Task finalizeTask;\r
                BasicTask basicTask;\r
                \r

-               int taskCount = 0;\r
-               \r

                while(true) \r
                {\r
                        taskReceived = Task.receive();\r
                                \r
                while(true) \r
                {\r
                        taskReceived = Task.receive();\r
                                \r

-       \r

                        if(taskReceived instanceof FinalizeTask) \r
                        {\r
                                Msg.info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
                        if(taskReceived instanceof FinalizeTask) \r
                        {\r
                                Msg.info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r

diff --git a/examples/java/alias0/Master.java b/examples/java/autoDestination/Master.java
similarity index 91%
rename from examples/java/alias0/Master.java
rename to examples/java/autoDestination/Master.java
index b3d6c07..4df8255 100644 (file)
--- a/examples/java/alias0/Master.java
+++ b/examples/java/autoDestination/Master.java
@@ -58,7 +58,7 @@ public class Master extends simgrid.msg.Process
                \r
                for (int i = 0; i < taskCount; i++) \r
                {       \r
                \r
                for (int i = 0; i < taskCount; i++) \r
                {       \r

-                       Msg.info("current host name : " + (aliases[i % aliasCount].split(":"))[0]);\r
+                       Msg.info("Sending \"" + basicTasks[i].getName()+ "\" to \"" + aliases[i % aliasCount] + "\"");\r

                        \r
                        if((Host.currentHost().getName()).equals((aliases[i % aliasCount].split(":"))[0]))\r
                                Msg.info("Hey ! It's me ! ");\r
                        \r
                        if((Host.currentHost().getName()).equals((aliases[i % aliasCount].split(":"))[0]))\r
                                Msg.info("Hey ! It's me ! ");\r

diff --git a/examples/java/alias0/Slave.java b/examples/java/autoDestination/Slave.java
similarity index 79%
rename from examples/java/alias0/Slave.java
rename to examples/java/autoDestination/Slave.java
index 0b10cc7..acd0edf 100644 (file)
--- a/examples/java/alias0/Slave.java
+++ b/examples/java/autoDestination/Slave.java
@@ -16,16 +16,19 @@ public class Slave extends simgrid.msg.Process
        {\r
                Msg.info("Hello !");\r
                \r
        {\r
                Msg.info("Hello !");\r
                \r

+               Task receivedTask;\r
+               BasicTask basicTask;\r
+               \r

                while(true) \r
                { \r
                while(true) \r
                { \r

-                       Task received = Task.receive(); \r
+                       receivedTask = Task.receive();  \r

                \r
                \r

-                       if (received instanceof FinalizeTask) \r
+                       if (receivedTask instanceof FinalizeTask) \r

                        {\r
                                break;\r
                        }\r
                \r
                        {\r
                                break;\r
                        }\r
                \r

-                       BasicTask basicTask = (BasicTask)received;\r
+                       basicTask = (BasicTask)receivedTask;\r

                        \r
                        Msg.info("Received \"" + basicTask.getName() + "\" ");\r
                \r
                        \r
                        Msg.info("Received \"" + basicTask.getName() + "\" ");\r
                \r

diff --git a/examples/java/alias0/alias0_deployment.xml b/examples/java/autoDestination/autoDestination_deployment.xml
similarity index 100%
rename from examples/java/alias0/alias0_deployment.xml
rename to examples/java/autoDestination/autoDestination_deployment.xml

diff --git a/examples/java/alias0/alias0_platform.xml b/examples/java/autoDestination/autoDestination_platform.xml
similarity index 100%
rename from examples/java/alias0/alias0_platform.xml
rename to examples/java/autoDestination/autoDestination_platform.xml

diff --git a/examples/java/alias1/BasicTask.java b/examples/java/explicitDestination/BasicTask.java
similarity index 100%
rename from examples/java/alias1/BasicTask.java
rename to examples/java/explicitDestination/BasicTask.java

diff --git a/examples/java/alias1/Alias1Test.java b/examples/java/explicitDestination/ExplicitDestinationTest.java
similarity index 93%
rename from examples/java/alias1/Alias1Test.java
rename to examples/java/explicitDestination/ExplicitDestinationTest.java
index 1d6d0b5..107dcaa 100644 (file)
--- a/examples/java/alias1/Alias1Test.java
+++ b/examples/java/explicitDestination/ExplicitDestinationTest.java
@@ -10,7 +10,7 @@
 \r
 import simgrid.msg.*;\r
 \r
 \r
 import simgrid.msg.*;\r
 \r

-public class Alias1Test {\r
+public class ExplicitDestinationTest {\r

    \r
    /* This only contains the launcher. If you do nothing more than than you can run \r
     *   java simgrid.msg.Msg\r
    \r
    /* This only contains the launcher. If you do nothing more than than you can run \r
     *   java simgrid.msg.Msg\r

diff --git a/examples/java/alias1/FinalizeTask.java b/examples/java/explicitDestination/FinalizeTask.java
similarity index 100%
rename from examples/java/alias1/FinalizeTask.java
rename to examples/java/explicitDestination/FinalizeTask.java

diff --git a/examples/java/alias1/Forwarder.java b/examples/java/explicitDestination/Forwarder.java
similarity index 78%
rename from examples/java/alias1/Forwarder.java
rename to examples/java/explicitDestination/Forwarder.java
index d33e8d8..f2689b6 100644 (file)
--- a/examples/java/alias1/Forwarder.java
+++ b/examples/java/explicitDestination/Forwarder.java
@@ -29,7 +29,7 @@ public class Forwarder extends simgrid.msg.Process
                \r
                Task receivedTask;\r
                FinalizeTask finalizeTask;\r
                \r
                Task receivedTask;\r
                FinalizeTask finalizeTask;\r

-               BasicTask task;\r
+               BasicTask basicTask;\r

                \r
                while(true) \r
                {\r
                \r
                while(true) \r
                {\r


@@ -48,13 +48,13 @@ public class Forwarder extends simgrid.msg.Process
                                break;\r
                        }\r
                \r
                                break;\r
                        }\r
                \r

-                       task = (BasicTask)receivedTask;\r
+                       basicTask = (BasicTask)receivedTask;\r

                        \r
                        \r

-                       Msg.info("Received \"" + task.getName() + "\" ");\r
+                       Msg.info("Received \"" + basicTask.getName() + "\" ");\r

                        \r
                        \r

-                       Msg.info("Sending \"" + task.getName() + "\" to \"" + aliases[taskCount % aliasCount] + "\"");\r
+                       Msg.info("Sending \"" + basicTask.getName() + "\" to \"" + aliases[taskCount % aliasCount] + "\"");\r

                        \r
                        \r

-                       task.send(aliases[taskCount % aliasCount]);\r
+                       basicTask.send(aliases[taskCount % aliasCount]);\r

                        \r
                        taskCount++;\r
                }\r
                        \r
                        taskCount++;\r
                }\r

diff --git a/examples/java/alias1/Master.java b/examples/java/explicitDestination/Master.java
similarity index 79%
rename from examples/java/alias1/Master.java
rename to examples/java/explicitDestination/Master.java
index f11a43b..9a123b3 100644 (file)
--- a/examples/java/alias1/Master.java
+++ b/examples/java/explicitDestination/Master.java
@@ -28,17 +28,21 @@ public class Master extends simgrid.msg.Process
                        System.exit(1);\r
                }\r
                \r
                        System.exit(1);\r
                }\r
                \r

-               int numberOfTasks = Integer.valueOf(args[0]).intValue();                \r
-               double taskComputeSize = Double.valueOf(args[1]).doubleValue();         \r
+               int numberOfTasks = Integer.valueOf(args[0]).intValue();        \r
+                       \r
+               double taskComputeSize = Double.valueOf(args[1]).doubleValue(); \r
+                       \r

                double taskCommunicateSize = Double.valueOf(args[2]).doubleValue();\r
                double taskCommunicateSize = Double.valueOf(args[2]).doubleValue();\r

-               BasicTask[] todo = new BasicTask[numberOfTasks];\r
+               \r
+               BasicTask[] basicTasks = new BasicTask[numberOfTasks];\r

                \r
                for (int i = 0; i < numberOfTasks; i++) \r
                {\r
                \r
                for (int i = 0; i < numberOfTasks; i++) \r
                {\r

-                       todo[i] = new BasicTask("Task_" + i, taskComputeSize, taskCommunicateSize); \r
+                       basicTasks[i] = new BasicTask("Task_" + i, taskComputeSize, taskCommunicateSize); \r

                }\r
                \r
                int aliasCount = args.length - 3;\r
                }\r
                \r
                int aliasCount = args.length - 3;\r

+               \r

                String[] aliases = new String[aliasCount];\r
                \r
                for(int i = 3; i < args.length ; i++)  \r
                String[] aliases = new String[aliasCount];\r
                \r
                for(int i = 3; i < args.length ; i++)  \r


@@ -55,12 +59,12 @@ public class Master extends simgrid.msg.Process
                \r
                for (int i = 0; i < numberOfTasks; i++) \r
                {\r
                \r
                for (int i = 0; i < numberOfTasks; i++) \r
                {\r

-                       Msg.info("Sending \"" + todo[i].getName()+ "\" to \"" + aliases[i % aliasCount] + "\"");\r
+                       Msg.info("Sending \"" + basicTasks[i].getName()+ "\" to \"" + aliases[i % aliasCount] + "\"");\r

                \r
                        if((Host.currentHost()).getName().equals(aliases[i % aliasCount])) \r
                                Msg.info("Hey ! It's me ! ");\r
                                \r
                \r
                        if((Host.currentHost()).getName().equals(aliases[i % aliasCount])) \r
                                Msg.info("Hey ! It's me ! ");\r
                                \r

-                       todo[i].send(aliases[i % aliasCount]);\r
+                       basicTasks[i].send(aliases[i % aliasCount]);\r

                }\r
                \r
                Msg.info("Send completed");\r
                }\r
                \r
                Msg.info("Send completed");\r


@@ -68,6 +72,7 @@ public class Master extends simgrid.msg.Process
                Msg.info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
                \r
                FinalizeTask finalizeTask;\r
                Msg.info("All tasks have been dispatched. Let's tell everybody the computation is over.");\r
                \r
                FinalizeTask finalizeTask;\r

+               \r

                for (int i = 0; i < aliasCount; i++) \r
                {\r
                        finalizeTask = new FinalizeTask();\r
                for (int i = 0; i < aliasCount; i++) \r
                {\r
                        finalizeTask = new FinalizeTask();\r

diff --git a/examples/java/alias1/Slave.java b/examples/java/explicitDestination/Slave.java
similarity index 57%
rename from examples/java/alias1/Slave.java
rename to examples/java/explicitDestination/Slave.java
index 48443b9..668e367 100644 (file)
--- a/examples/java/alias1/Slave.java
+++ b/examples/java/explicitDestination/Slave.java
@@ -16,21 +16,24 @@ public class Slave extends simgrid.msg.Process
        {\r
                Msg.info("Hello !");\r
                \r
        {\r
                Msg.info("Hello !");\r
                \r

+               BasicTask basicTask;\r
+               Task receivedTask;\r
+               \r

                while(true) \r
                { \r
                while(true) \r
                { \r

-                       Task t = Task.receive(Host.currentHost().getName());    \r
+                       receivedTask = Task.receive(Host.currentHost().getName());      \r

                \r
                \r

-                       if (t instanceof FinalizeTask) \r
+                       if (receivedTask instanceof FinalizeTask) \r

                        {\r
                                break;\r
                        }\r
                        \r
                        {\r
                                break;\r
                        }\r
                        \r

-                       BasicTask task = (BasicTask)t;\r
-                       Msg.info("Received \"" + task.getName() + "\" ");\r
+                       basicTask = (BasicTask)receivedTask;\r
+                       Msg.info("Received \"" + basicTask.getName() + "\" ");\r

                \r
                \r

-                       Msg.info("Processing \"" + task.getName() +  "\" ");     \r
-                       task.execute();\r
-                       Msg.info("\"" + task.getName() + "\" done ");\r
+                       Msg.info("Processing \"" + basicTask.getName() +  "\" ");        \r
+                       basicTask.execute();\r
+                       Msg.info("\"" + basicTask.getName() + "\" done ");\r

                }\r
                \r
                Msg.info("Received Finalize. I'm done. See you!");\r
                }\r
                \r
                Msg.info("Received Finalize. I'm done. See you!");\r

diff --git a/examples/java/alias1/alias1_deployment.xml b/examples/java/explicitDestination/explicitDestination_deployment.xml
similarity index 100%
rename from examples/java/alias1/alias1_deployment.xml
rename to examples/java/explicitDestination/explicitDestination_deployment.xml

diff --git a/examples/java/alias1/alias1_platform.xml b/examples/java/explicitDestination/explicitDestination_platform.xml
similarity index 100%
rename from examples/java/alias1/alias1_platform.xml
rename to examples/java/explicitDestination/explicitDestination_platform.xml