Changeset 4 for src/main/java

Timestamp:

09/18/19 10:00:24 (5 years ago)

Author:

bart

Message:

Faster example parties

Location:

src/main/java/geniusweb/partiesserver

Files:

• RunningPartiesUpdater.java (modified) (3 diffs)
• repository/RunningParty.java (modified) (2 diffs)
• websocket/PartySocket.java (modified) (2 diffs)

src/main/java/geniusweb/partiesserver/RunningPartiesUpdater.java

@@ -5 +5 @@
 import geniusweb.partiesserver.repository.RunningPartiesRepo;
 import geniusweb.partiesserver.repository.RunningParty;
+import geniusweb.party.Party;
 import tudelft.utilities.logging.ReportToLogger;
 import tudelft.utilities.logging.Reporter;
@@ -11 +12 @@
  * 
  * This object keeps the {@link RunningPartiesRepo} up to date. Main job is to
- * remove parties that have been timed out. Start and run only once.
+ * remove parties that have been timed out. When a party times out,
+ * it calls {@link Party#terminate()} but that might fail to stop a party. 
+ * In the end, the protocol should close the connection after the deadline. Start and run only once.
  */
 public class RunningPartiesUpdater implements Runnable {
@@ -64 +67 @@
                         if (now >= party.getEndDate().getTime() + KILL_DELAY) {
                                 running.remove(party.getID());
-                                log.log(Level.WARNING, "party " + party.getID() + " was timed out and terminated");
+                                log.log(Level.WARNING, "party " + party.getID() + " still running 2s after deadline. Removed now.");
                         }
                 }

src/main/java/geniusweb/partiesserver/repository/RunningParty.java

@@ -12 +12 @@
 import geniusweb.actions.PartyId;
 import geniusweb.connection.DefaultConnection;
+import geniusweb.partiesserver.RunningPartiesUpdater;
 import geniusweb.party.Party;
 import geniusweb.party.inform.Inform;
@@ -100 +101 @@
          * @param name         The name, this should match the filename in the repo
          *                     (without the .jar).
-         * @param maxRunTimeMS the maximum runtime for this party (ms)
+         * @param maxRunTimeMS the maximum runtime for this party (ms). The {@link RunningPartiesUpdater} 
+         * will keep an eye on the time and handle removal after time is up.
+         * 
          */
         public static RunningParty create(Party party, String name,

src/main/java/geniusweb/partiesserver/websocket/PartySocket.java

@@ -125 +125 @@
                 RunningParty party = runningparties.get(partyID);
                 if (party != null) {
+                        // first sniff, to ensure the deadlines are updated first.
+                        sniff(info, party);
                         log.log(Level.FINE, "Inform " + partyID + ": " + info);
                         try {
@@ -132 +134 @@
                                 log.log(Level.WARNING, "Party failed on inform:", e);
                         }
-                        sniff(info, party);
                 } // else dead but that's handled in the listener above
         }