From 58b5d8d78829948f50164d6b39292157cc3f4e1d Mon Sep 17 00:00:00 2001 From: cherierm Date: Fri, 11 Jan 2008 10:20:07 +0000 Subject: [PATCH] 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 --- .../AutoDestinationTest.java} | 2 +- .../{alias0 => autoDestination}/BasicTask.java | 0 .../FinalizeTask.java | 0 .../{alias0 => autoDestination}/Forwarder.java | 6 +++--- .../{alias0 => autoDestination}/Master.java | 2 +- .../java/{alias0 => autoDestination}/Slave.java | 9 ++++++--- .../autoDestination_deployment.xml} | 0 .../autoDestination_platform.xml} | 0 .../BasicTask.java | 0 .../ExplicitDestinationTest.java} | 2 +- .../FinalizeTask.java | 0 .../Forwarder.java | 10 +++++----- .../{alias1 => explicitDestination}/Master.java | 17 +++++++++++------ .../{alias1 => explicitDestination}/Slave.java | 17 ++++++++++------- .../explicitDestination_deployment.xml} | 0 .../explicitDestination_platform.xml} | 0 16 files changed, 38 insertions(+), 27 deletions(-) rename examples/java/{alias0/Alias0Test.java => autoDestination/AutoDestinationTest.java} (93%) rename examples/java/{alias0 => autoDestination}/BasicTask.java (100%) rename examples/java/{alias0 => autoDestination}/FinalizeTask.java (100%) rename examples/java/{alias0 => autoDestination}/Forwarder.java (95%) rename examples/java/{alias0 => autoDestination}/Master.java (91%) rename examples/java/{alias0 => autoDestination}/Slave.java (79%) rename examples/java/{alias0/alias0_deployment.xml => autoDestination/autoDestination_deployment.xml} (100%) rename examples/java/{alias0/alias0_platform.xml => autoDestination/autoDestination_platform.xml} (100%) rename examples/java/{alias1 => explicitDestination}/BasicTask.java (100%) rename examples/java/{alias1/Alias1Test.java => explicitDestination/ExplicitDestinationTest.java} (93%) rename examples/java/{alias1 => explicitDestination}/FinalizeTask.java (100%) rename examples/java/{alias1 => explicitDestination}/Forwarder.java (78%) rename examples/java/{alias1 => explicitDestination}/Master.java (79%) rename examples/java/{alias1 => explicitDestination}/Slave.java (57%) rename examples/java/{alias1/alias1_deployment.xml => explicitDestination/explicitDestination_deployment.xml} (100%) rename examples/java/{alias1/alias1_platform.xml => explicitDestination/explicitDestination_platform.xml} (100%) 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 78dd152cc0..cc42183efc 100644 --- a/examples/java/alias0/Alias0Test.java +++ b/examples/java/autoDestination/AutoDestinationTest.java @@ -10,7 +10,7 @@ import simgrid.msg.*; -public class Alias0Test { +public class AutoDestinationTest { /* This only contains the launcher. If you do nothing more than than you can run * java simgrid.msg.Msg 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 3f9b5ee2d8..1949bc8231 100644 --- 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!"); int aliasCount = args.length; + + int taskCount = 0; + Task taskReceived; Task finalizeTask; BasicTask basicTask; - int taskCount = 0; - while(true) { taskReceived = Task.receive(); - if(taskReceived instanceof FinalizeTask) { Msg.info("All tasks have been dispatched. Let's tell everybody the computation is over."); 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 b3d6c07798..4df8255332 100644 --- a/examples/java/alias0/Master.java +++ b/examples/java/autoDestination/Master.java @@ -58,7 +58,7 @@ public class Master extends simgrid.msg.Process for (int i = 0; i < taskCount; i++) { - Msg.info("current host name : " + (aliases[i % aliasCount].split(":"))[0]); + Msg.info("Sending \"" + basicTasks[i].getName()+ "\" to \"" + aliases[i % aliasCount] + "\""); if((Host.currentHost().getName()).equals((aliases[i % aliasCount].split(":"))[0])) Msg.info("Hey ! It's me ! "); 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 0b10cc7995..acd0edf618 100644 --- a/examples/java/alias0/Slave.java +++ b/examples/java/autoDestination/Slave.java @@ -16,16 +16,19 @@ public class Slave extends simgrid.msg.Process { Msg.info("Hello !"); + Task receivedTask; + BasicTask basicTask; + while(true) { - Task received = Task.receive(); + receivedTask = Task.receive(); - if (received instanceof FinalizeTask) + if (receivedTask instanceof FinalizeTask) { break; } - BasicTask basicTask = (BasicTask)received; + basicTask = (BasicTask)receivedTask; Msg.info("Received \"" + basicTask.getName() + "\" "); 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 1d6d0b5d67..107dcaa071 100644 --- a/examples/java/alias1/Alias1Test.java +++ b/examples/java/explicitDestination/ExplicitDestinationTest.java @@ -10,7 +10,7 @@ import simgrid.msg.*; -public class Alias1Test { +public class ExplicitDestinationTest { /* This only contains the launcher. If you do nothing more than than you can run * java simgrid.msg.Msg 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 d33e8d82b8..f2689b6182 100644 --- a/examples/java/alias1/Forwarder.java +++ b/examples/java/explicitDestination/Forwarder.java @@ -29,7 +29,7 @@ public class Forwarder extends simgrid.msg.Process Task receivedTask; FinalizeTask finalizeTask; - BasicTask task; + BasicTask basicTask; while(true) { @@ -48,13 +48,13 @@ public class Forwarder extends simgrid.msg.Process break; } - task = (BasicTask)receivedTask; + basicTask = (BasicTask)receivedTask; - Msg.info("Received \"" + task.getName() + "\" "); + Msg.info("Received \"" + basicTask.getName() + "\" "); - Msg.info("Sending \"" + task.getName() + "\" to \"" + aliases[taskCount % aliasCount] + "\""); + Msg.info("Sending \"" + basicTask.getName() + "\" to \"" + aliases[taskCount % aliasCount] + "\""); - task.send(aliases[taskCount % aliasCount]); + basicTask.send(aliases[taskCount % aliasCount]); taskCount++; } 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 f11a43b515..9a123b30ff 100644 --- 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); } - int numberOfTasks = Integer.valueOf(args[0]).intValue(); - double taskComputeSize = Double.valueOf(args[1]).doubleValue(); + int numberOfTasks = Integer.valueOf(args[0]).intValue(); + + double taskComputeSize = Double.valueOf(args[1]).doubleValue(); + double taskCommunicateSize = Double.valueOf(args[2]).doubleValue(); - BasicTask[] todo = new BasicTask[numberOfTasks]; + + BasicTask[] basicTasks = new BasicTask[numberOfTasks]; for (int i = 0; i < numberOfTasks; i++) { - todo[i] = new BasicTask("Task_" + i, taskComputeSize, taskCommunicateSize); + basicTasks[i] = new BasicTask("Task_" + i, taskComputeSize, taskCommunicateSize); } int aliasCount = args.length - 3; + String[] aliases = new String[aliasCount]; for(int i = 3; i < args.length ; i++) @@ -55,12 +59,12 @@ public class Master extends simgrid.msg.Process for (int i = 0; i < numberOfTasks; i++) { - Msg.info("Sending \"" + todo[i].getName()+ "\" to \"" + aliases[i % aliasCount] + "\""); + Msg.info("Sending \"" + basicTasks[i].getName()+ "\" to \"" + aliases[i % aliasCount] + "\""); if((Host.currentHost()).getName().equals(aliases[i % aliasCount])) Msg.info("Hey ! It's me ! "); - todo[i].send(aliases[i % aliasCount]); + basicTasks[i].send(aliases[i % aliasCount]); } Msg.info("Send completed"); @@ -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."); FinalizeTask finalizeTask; + for (int i = 0; i < aliasCount; i++) { finalizeTask = new FinalizeTask(); 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 48443b9725..668e367979 100644 --- a/examples/java/alias1/Slave.java +++ b/examples/java/explicitDestination/Slave.java @@ -16,21 +16,24 @@ public class Slave extends simgrid.msg.Process { Msg.info("Hello !"); + BasicTask basicTask; + Task receivedTask; + while(true) { - Task t = Task.receive(Host.currentHost().getName()); + receivedTask = Task.receive(Host.currentHost().getName()); - if (t instanceof FinalizeTask) + if (receivedTask instanceof FinalizeTask) { break; } - BasicTask task = (BasicTask)t; - Msg.info("Received \"" + task.getName() + "\" "); + basicTask = (BasicTask)receivedTask; + Msg.info("Received \"" + basicTask.getName() + "\" "); - Msg.info("Processing \"" + task.getName() + "\" "); - task.execute(); - Msg.info("\"" + task.getName() + "\" done "); + Msg.info("Processing \"" + basicTask.getName() + "\" "); + basicTask.execute(); + Msg.info("\"" + basicTask.getName() + "\" done "); } Msg.info("Received Finalize. I'm done. See you!"); 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 -- 2.20.1