[java] cosmetics in the Task.dsend() example

diff --git a/examples/java/async/dsend/Main.java b/examples/java/async/dsend/Main.java
index 02955ab..f244276 100644 (file)
--- a/examples/java/async/dsend/Main.java
+++ b/examples/java/async/dsend/Main.java
@@ -6,6 +6,12 @@
 
 package async.dsend;
 
+/** This example demonstrates the use of the Task.dsend() method.
+ * 
+ *  This way, the sender can be detached from the communication: it is not blocked as with Task.send() 
+ *  and has nothing to do at the end as with Task.isend() where it must do a Comm.wait().
+ */
+
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.Host;
 import org.simgrid.msg.NativeException;
@@ -13,20 +19,20 @@ import org.simgrid.msg.HostNotFoundException;
 
 class Main {
   private Main() {
+       /* This is just to ensure that nobody creates an instance of this singleton */
     throw new IllegalAccessError("Utility class");
   }
 
   public static void main(String[] args) throws NativeException, HostNotFoundException {
     Msg.init(args);
 
-    if (args.length < 1) {
-    Msg.info("Usage   : Main platform_file");
-    Msg.info("example : Main ../platforms/small_platform.xml");
-    System.exit(1);
-  }
+    String platform = "../platforms/small_platform.xml";
+    if (args.length >= 1) {
+       platform = args[0]; // Override the default value if passed on the command line
+    }
 
     /* construct the platform and deploy the application */
-    Msg.createEnvironment(args[0]);
+    Msg.createEnvironment(platform);
     Host[] hosts = Host.all();
     new Sender(hosts[0],"Sender").start();
     for (int i=1; i < hosts.length; i++){

diff --git a/examples/java/async/dsend/Sender.java b/examples/java/async/dsend/Sender.java
index ea14a66..329d24c 100644 (file)
--- a/examples/java/async/dsend/Sender.java
+++ b/examples/java/async/dsend/Sender.java
@@ -32,10 +32,10 @@ public class Sender extends Process {
     }
 
     Msg.info("All tasks have been (asynchronously) dispatched."+
-             " Let's sleep for 10s so that nobody gets a message from a terminated process.");
+             " Let's sleep for 20s so that nobody gets a message from a terminated process.");
 
     waitFor(20);
 
-    Msg.info("Goodbye now!");
+    Msg.info("Done sleeping. Goodbye now!");
   }
 }

diff --git a/examples/java/async/dsend/async_dsend.tesh b/examples/java/async/dsend/async_dsend.tesh
index 1e1cc73..5ea7cd0 100644 (file)
--- a/examples/java/async/dsend/async_dsend.tesh
+++ b/examples/java/async/dsend/async_dsend.tesh
@@ -1,28 +1,27 @@
 #! tesh
 
-! output sort 19
 ! timeout 30
 $ java -classpath ${classpath:=.} async/dsend/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:Sender@Jacquelin) Hello! Got 6 receivers to contact
 > [  0.000000] (1:Sender@Jacquelin) Sending "Task_1" to "Fafard"
-> [  0.000000] (1:Sender@Jacquelin) Sending "Task_2" to "Tremblay"
-> [  0.000000] (1:Sender@Jacquelin) Sending "Task_3" to "Bourassa"
-> [  0.000000] (1:Sender@Jacquelin) Sending "Task_4" to "Jupiter"
-> [  0.000000] (1:Sender@Jacquelin) Sending "Task_5" to "Boivin"
-> [  0.000000] (1:Sender@Jacquelin) Sending "Task_6" to "Ginette"
-> [  0.000000] (1:Sender@Jacquelin) All tasks have been (asynchronously) dispatched. Let's sleep for 10s so that nobody gets a message from a terminated process.
 > [  0.000000] (2:Receiver@Fafard) Receiving on 'Fafard'
 > [  0.000000] (3:Receiver@Tremblay) Receiving on 'Tremblay'
 > [  0.000000] (4:Receiver@Bourassa) Receiving on 'Bourassa'
 > [  0.000000] (5:Receiver@Jupiter) Receiving on 'Jupiter'
 > [  0.000000] (6:Receiver@Boivin) Receiving on 'Boivin'
 > [  0.000000] (7:Receiver@Ginette) Receiving on 'Ginette'
+> [  0.000000] (1:Sender@Jacquelin) Sending "Task_2" to "Tremblay"
+> [  0.000000] (1:Sender@Jacquelin) Sending "Task_3" to "Bourassa"
+> [  0.000000] (1:Sender@Jacquelin) Sending "Task_4" to "Jupiter"
+> [  0.000000] (1:Sender@Jacquelin) Sending "Task_5" to "Boivin"
+> [  0.000000] (1:Sender@Jacquelin) Sending "Task_6" to "Ginette"
+> [  0.000000] (1:Sender@Jacquelin) All tasks have been (asynchronously) dispatched. Let's sleep for 20s so that nobody gets a message from a terminated process.
 > [  6.801793] (4:Receiver@Bourassa) Received a task. I'm done. See you!
 > [  6.801793] (5:Receiver@Jupiter) Received a task. I'm done. See you!
 > [  6.801793] (7:Receiver@Ginette) Received a task. I'm done. See you!
 > [ 11.931226] (3:Receiver@Tremblay) Received a task. I'm done. See you!
 > [ 12.364875] (2:Receiver@Fafard) Received a task. I'm done. See you!
 > [ 12.575806] (6:Receiver@Boivin) Received a task. I'm done. See you!
+> [ 20.000000] (1:Sender@Jacquelin) Done sleeping. Goodbye now!
 > [ 20.000000] (0:maestro@) MSG_main finished; Cleaning up the simulation...
-> [ 20.000000] (1:Sender@Jacquelin) Goodbye now!