aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-01-31 18:50:54 +0000
committerYann Herklotz <ymherklotz@gmail.com>2017-01-31 18:50:54 +0000
commit300051e16cd4ab9cfe5beda2cf62e3ea40e415c7 (patch)
tree653ce6008ae4256cafa4d8f54fcf7f3fe51a4968
parentd8a70796945ef3ece866ad16a95aab1e79f01b89 (diff)
downloadNetworkCoursework-300051e16cd4ab9cfe5beda2cf62e3ea40e415c7.tar.gz
NetworkCoursework-300051e16cd4ab9cfe5beda2cf62e3ea40e415c7.zip
Finished RMI, now testing
-rwxr-xr-xrmi/RMIClient.java1
-rwxr-xr-xrmi/RMIServer.java11
-rwxr-xr-xrmiclient.sh9
3 files changed, 16 insertions, 5 deletions
diff --git a/rmi/RMIClient.java b/rmi/RMIClient.java
index 7fcd822..3312879 100755
--- a/rmi/RMIClient.java
+++ b/rmi/RMIClient.java
@@ -41,7 +41,6 @@ public class RMIClient {
MessageInfo msg = new MessageInfo(numMessages, i);
try {
iRMIServer.receiveMessage(msg);
- System.out.println("Sent Message: " + Integer.toString(i + 1) + " out of " + Integer.toString(numMessages));
} catch(Exception e) {
System.err.println("RMIClient exception:");
e.printStackTrace();
diff --git a/rmi/RMIServer.java b/rmi/RMIServer.java
index 55b5c80..7152ab6 100755
--- a/rmi/RMIServer.java
+++ b/rmi/RMIServer.java
@@ -33,10 +33,8 @@ public class RMIServer extends UnicastRemoteObject implements RMIServerI {
// increment the total messages when a new call is made
totalMessages++;
- System.out.println("Receieved Message: " + Integer.toString(msg.messageNum + 1) + " out of " + Integer.toString(msg.totalMessages));
-
// buffer the incomming messages
- receivedMessages[totalMessages - 1] = msg.messageNum;
+ receivedMessages[msg.messageNum] = 1;
// when last expected message was sent, see which ones were lost
if(msg.messageNum == msg.totalMessages - 1) {
@@ -46,6 +44,13 @@ public class RMIServer extends UnicastRemoteObject implements RMIServerI {
System.out.println("Messages received: " + Integer.toString(totalMessages));
System.out.println("Total messages sent: " + Integer.toString(msg.totalMessages));
System.out.println("Success rate: " + Double.toString((double)totalMessages / (double)msg.totalMessages * 100.0) + "%");
+ if(totalMessages != msg.totalMessages) {
+ System.out.println("#######################################");
+ System.out.println("Messages lost: ");
+ for(int i = 0; i < msg.totalMessages; ++i)
+ if(receivedMessages[i] != 1)
+ System.out.println("Message " + Integer.toString(i) + " out of " + Integer.toString(msg.totalMessages));
+ }
totalMessages = -1;
}
}
diff --git a/rmiclient.sh b/rmiclient.sh
index 1d69b4a..555d3d5 100755
--- a/rmiclient.sh
+++ b/rmiclient.sh
@@ -1,4 +1,11 @@
#!/bin/bash
export SECPOLICY="file:./policy"
-java -cp . -Djava.security.policy=$SECPOLICY rmi.RMIClient $*
+
+#!/bin/bash
+for i in `seq 0 50 2000`
+do
+ echo "Running client, sending messages: " $i
+ java -cp . -Djava.security.policy=$SECPOLICY rmi.RMIClient $1 $i
+ sleep 1s
+done