final

janusle · May 19, 2012 · 4d1214e · 4d1214e
1 parent 7a18474
commit 4d1214e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 4 deletions.
diff --git a/client/MultiClient.java b/client/MultiClient.java
@@ -9,7 +9,7 @@
 public class MultiClient{
 
 
-    private final String SERVER_HOST = "yallara.cs.rmit.edu.au";//change address before submitting!
+    private final String SERVER_HOST = "yallara.cs.rmit.edu.au";
     private final int SERVER_PORT = 40302;
     private ServerSocket ss = null;
     private int port;

diff --git a/readme.txt b/readme.txt
@@ -8,7 +8,8 @@
 
    # generate key
    ./genkey.sh  
-
+   # the password should be 123456 
+
    # run iterative server
    ./runserver.sh iterative
 
@@ -21,7 +22,8 @@
 
    # generate key
    ./genkey.sh
-
+   # the password should be 123456 
+
    # run concurrent server
    ./runserver.sh concurrent
 
@@ -46,3 +48,7 @@
 3. Clean the *.class files
 
    make clean
+
+
+
+Note: Please run all the servers on yallara becuase client assumes the time servers are on yallara
diff --git a/server/MultiServer.java b/server/MultiServer.java
@@ -11,7 +11,7 @@ class NoSuchClientException extends Exception{};
 public class MultiServer{
 
     private final int PORT = 40302;
-    private final int DELAY = 5000;
+    private final int DELAY = 60000;
     private ArrayList<clientInfo> addresses = new ArrayList<clientInfo>();
     private Timer timer = null;
 

diff --git a/screenshot/compile → testing_results/compile b/screenshot/compile → testing_results/compile
diff --git a/screenshot/concurrent_result → testing_results/concurrent_result b/screenshot/concurrent_result → testing_results/concurrent_result
@@ -1,3 +1,4 @@
+# Server screenshot
 Script started on Thu May 17 20:32:30 2012
 %./runserver.sh concurrent
 Server started...
@@ -85,6 +86,8 @@ Thread 27 finished
 exit
 
 script done on Thu May 17 20:33:54 2012
+
+# client screenshot
 Script started on Thu May 17 20:33:11 2012
 %./runclient.sh concurrent
 %20:33:27 17:05:2012

diff --git a/screenshot/iterative_result → testing_results/iterative_result b/screenshot/iterative_result → testing_results/iterative_result
@@ -1,3 +1,4 @@
+# Server screenshot
 Script started on Thu May 17 20:27:30 2012
 %./runclient.sh iterative
 %20:28:09 17:05:2012
@@ -25,6 +26,8 @@ Script started on Thu May 17 20:27:30 2012
 exit
 
 script done on Thu May 17 20:28:19 2012
+
+# Client screenshot
 Script started on Thu May 17 20:27:30 2012
 %./runclient.sh iterative
 %20:28:09 17:05:2012

diff --git a/screenshot/multicast_result → testing_results/multicast_result b/screenshot/multicast_result → testing_results/multicast_result
@@ -1,3 +1,4 @@
+# Server screenshot
 Script started on Thu May 17 21:14:20 2012
 %./runserver.sh multi
 Server is started...
@@ -30,6 +31,8 @@ No subscription, will try one minute after
 exit
 
 script done on Thu May 17 21:15:40 2012
+
+# 0th Client screenshot
 Script started on Thu May 17 21:13:29 2012
 %./runclient.sh multi
 Time subscribed, client id is 64073f2f:1375a81cf5d:-8000
@@ -56,6 +59,8 @@ Client is exiting...
 exit
 
 script done on Thu May 17 21:15:45 2012
+
+# 1st Client screenshot
 Script started on Thu May 17 21:13:34 2012
 %./runclient.sh multi
 Time subscribed, client id is 64073f2f:1375a81cf5d:-7fff