A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
java: kill obscure NativeException
[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
f17cabd
..
d3f107d
100644
(file)
--- a/
examples/java/trace/pingpong/Sender.java
+++ b/
examples/java/trace/pingpong/Sender.java
@@
-5,41
+5,36
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
package trace.pingpong;
* 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.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.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 {
import org.simgrid.trace.Trace;
public class Sender extends Process {
- private final double commSizeLat = 1;
- private final double commSizeBw = 100000000;
+ private static final double commSizeLat = 1;
+ private static final double commSizeBw = 100000000;
+ private static final String PM_STATE = "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);
}
public void main(String[] args) throws MsgException {
Msg.info("hello !");
super(hostname,name,args);
}
public void main(String[] args) throws MsgException {
Msg.info("hello !");
- Trace.hostPushState (getHost().getName(),
"PM_STATE"
, "sendingPing");
+ Trace.hostPushState (getHost().getName(),
PM_STATE
, "sendingPing");
int hostCount = args.length;
Msg.info("host count: " + hostCount);
int hostCount = args.length;
Msg.info("host count: " + hostCount);
- String
mailboxes[]
= new String[hostCount];
+ String
[] mailboxes
= new String[hostCount];
double time;
double computeDuration = 0;
double time;
double computeDuration = 0;
- PingPongTask ping
, pong
;
+ PingPongTask ping;
for(int pos = 0; pos < args.length ; pos++) {
for(int pos = 0; pos < args.length ; pos++) {
- try {
- mailboxes[pos] = Host.getByName(args[pos]).getName();
- } catch (HostNotFoundException e) {
- Msg.info("Invalid deployment file: " + e.toString());
- System.exit(1);
- }
+ mailboxes[pos] = Host.getByName(args[pos]).getName();
}
for (int pos = 0; pos < hostCount; pos++) {
}
for (int pos = 0; pos < hostCount; pos++) {
@@
-49,15
+44,15
@@
public class Sender extends Process {
ping.setTime(time);
ping.send(mailboxes[pos]);
ping.setTime(time);
ping.send(mailboxes[pos]);
- Trace.hostPushState (getHost().getName(),
"PM_STATE"
, "waitingPong");
-
pong = (PingPongTask)
Task.receive(getHost().getName());
+ Trace.hostPushState (getHost().getName(),
PM_STATE
, "waitingPong");
+ Task.receive(getHost().getName());
double timeGot = Msg.getClock();
double timeSent = ping.getTime();
double timeGot = Msg.getClock();
double timeSent = ping.getTime();
- double communicationTime
=0
;
+ double communicationTime;
Msg.info("Got at time "+ timeGot);
Msg.info("Was sent at time "+timeSent);
Msg.info("Got at time "+ timeGot);
Msg.info("Was sent at time "+timeSent);
- time
=
timeSent;
+ time
=
timeSent;
communicationTime=timeGot - time;
Msg.info("Communication time : " + communicationTime);
communicationTime=timeGot - time;
Msg.info("Communication time : " + communicationTime);
@@
-65,11
+60,11
@@
public class Sender extends Process {
Msg.info(" --- bw "+ commSizeBw/communicationTime + " ----");
/* Pop the last state (going back to sending ping) */
Msg.info(" --- bw "+ commSizeBw/communicationTime + " ----");
/* Pop the last state (going back to sending ping) */
- Trace.hostPopState (getHost().getName(),
"PM_STATE"
);
+ Trace.hostPopState (getHost().getName(),
PM_STATE
);
}
/* Pop the sendingPong state */
}
/* Pop the sendingPong state */
- Trace.hostPopState (getHost().getName(),
"PM_STATE"
);
+ Trace.hostPopState (getHost().getName(),
PM_STATE
);
Msg.info("goodbye!");
}
}
Msg.info("goodbye!");
}
}