Merge branch 'master' into actor-yield

[simgrid.git] / examples / java / trace / pingpong / Sender.java

diff --git a/examples/java/trace/pingpong/Sender.java b/examples/java/trace/pingpong/Sender.java
index 5fe2760..c97be48 100644 (file)
--- a/examples/java/trace/pingpong/Sender.java
+++ b/examples/java/trace/pingpong/Sender.java
@@ -1,25 +1,24 @@
-/* Copyright (c) 2006-2014, 2016. The SimGrid Team.
+/* Copyright (c) 2006-2014, 2016-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 package trace.pingpong;
-import org.simgrid.msg.Msg;
 import org.simgrid.msg.Host;
-import org.simgrid.msg.Task;
-import org.simgrid.msg.Process;
-import org.simgrid.msg.MsgException;
-import org.simgrid.msg.NativeException;
 import org.simgrid.msg.HostNotFoundException;
+import org.simgrid.msg.Msg;
+import org.simgrid.msg.MsgException;
+import org.simgrid.msg.Process;
+import org.simgrid.msg.Task;
 import org.simgrid.trace.Trace;
 
 public class Sender extends Process {
-  private static final double commSizeLat = 1;
-  private static final double commSizeBw = 100000000;
-  private static final String PM_STATE = "PM_STATE";
+  private static final double COMM_SIZE_LAT = 1;
+  private static final double COMM_SIZE_BW = 100000000;
+  private static final String PM_STATE = Main.PM_STATE;
 
-  public Sender(String hostname, String name, String[] args) throws HostNotFoundException, NativeException {
+  public Sender(String hostname, String name, String[] args) throws HostNotFoundException {
     super(hostname,name,args);
   }
 
@@ -29,7 +28,7 @@ public class Sender extends Process {
 
     int hostCount = args.length;
     Msg.info("host count: " + hostCount);
-    String mailboxes[] = new String[hostCount]; 
+    String[] mailboxes = new String[hostCount]; 
     double time;
     double computeDuration = 0;
     PingPongTask ping;
@@ -41,12 +40,12 @@ public class Sender extends Process {
     for (int pos = 0; pos < hostCount; pos++) { 
       time = Msg.getClock(); 
       Msg.info("sender time: " + time);
-      ping = new PingPongTask("no name",computeDuration,commSizeLat);
+      ping = new PingPongTask("no name",computeDuration,COMM_SIZE_LAT);
       ping.setTime(time);
       ping.send(mailboxes[pos]);
 
       Trace.hostPushState (getHost().getName(), PM_STATE, "waitingPong");
-      PingPongTask pong = (PingPongTask)Task.receive(getHost().getName());
+      Task.receive(getHost().getName());
       double timeGot = Msg.getClock();
       double timeSent = ping.getTime();
       double communicationTime;
@@ -58,7 +57,7 @@ public class Sender extends Process {
       communicationTime=timeGot - time;
       Msg.info("Communication time : " + communicationTime);
 
-      Msg.info(" --- bw "+ commSizeBw/communicationTime + " ----");
+      Msg.info(" --- bw "+ COMM_SIZE_BW/communicationTime + " ----");
 
       /* Pop the last state (going back to sending ping) */  
       Trace.hostPopState (getHost().getName(), PM_STATE);