Thinking about it more, what we really want is for the client to target the per

second rate (10 messages per second), and to do the same 10x buffer on the
server that we were doing before so that we avoid disconnects due to network
congestion (which might "save up" some throttled messages and then end up
delivering them in a bunch with some later messages).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5424 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/presents/client/Client.java

@@ -62,8 +62,8 @@ public class Client
     /** The maximum size of a datagram. */
     public static final int MAX_DATAGRAM_SIZE = 1500;
 
-    /** Our default maximum outgoing message rate as { messages, milliseconds }. */
-    public static final int[] DEFAULT_MAX_MSG_RATE = { 50, 5*1000 };
+    /** Our default maximum outgoing message rate in messages per second. */
+    public static final int DEFAULT_MSGS_PER_SECOND = 10;
 
     /**
      * Constructs a client object with the supplied credentials and RunQueue. The creds will be
@@ -82,10 +82,6 @@ public class Client
     {
         _creds = creds;
         _runQueue = runQueue;
-
-        // initialize our default throttle; we use a slightly lowered rate from the default to
-        // avoid edge cases where we and the server disagree about a single millisecond
-        _outThrottle = new Throttle(DEFAULT_MAX_MSG_RATE[0]-1, DEFAULT_MAX_MSG_RATE[1]);
     }
 
     /**
@@ -644,10 +640,10 @@ public class Client
      * Configures the outgoing message throttle. This is done when the server informs us that a new
      * rate is in effect.
      */
-    protected synchronized void setOutgoingMessageThrottle (int msgs, long period)
+    protected synchronized void setOutgoingMessageThrottle (int msgsPerSec)
     {
-        log.info("Updating outgoing message throttle", "msgs", msgs, "period", period);
-        _outThrottle.reinit(msgs, period);
+        log.info("Updating outgoing message throttle", "msgsPerSec", msgsPerSec);
+        _outThrottle.reinit(msgsPerSec, 1000L);
         _comm.postMessage(new ThrottleUpdatedMessage());
     }
 
@@ -1075,7 +1071,7 @@ public class Client
     protected Interval _tickInterval;
 
     /** Our outgoing message throttle. */
-    protected Throttle _outThrottle;
+    protected Throttle _outThrottle = new Throttle(DEFAULT_MSGS_PER_SECOND, 1000L);
 
     /** How often we recompute our time offset from the server. */
     protected static final long CLOCK_SYNC_INTERVAL = 600 * 1000L;

src/java/com/threerings/presents/client/ClientDObjectMgr.java

@@ -202,7 +202,7 @@ public class ClientDObjectMgr
 
             } else if (obj instanceof UpdateThrottleMessage) {
                 UpdateThrottleMessage upmsg = (UpdateThrottleMessage)obj;
-                _client.setOutgoingMessageThrottle(upmsg.messages, upmsg.period);
+                _client.setOutgoingMessageThrottle(upmsg.messagesPerSec);
 
             } else if (obj instanceof ObjectAction<?>) {
                 ObjectAction<?> act = (ObjectAction<?>)obj;