AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't let presents' ping interval into Connection

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6384 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Charlie Groves
2010-12-16 01:59:47 +00:00
parent 4d163ffd7f
commit 6a45fec4ea
5 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/presents/server/net/PresentsConnection.java
+3 -2
View File
@@ -60,10 +60,11 @@ public class PresentsConnection extends Connection
* {@link PresentsConnectionManager} as <code>cmgr</code>.
*/
@Override
public void init (ConnectionManager cmgr, SocketChannel channel, long createStamp)
public void init (ConnectionManager cmgr, SocketChannel channel, long createStamp,
long idleTime)
throws IOException
{
super.init(cmgr, channel, createStamp);
super.init(cmgr, channel, createStamp, idleTime);
_pcmgr = (PresentsConnectionManager)cmgr;
}
src/main/java/com/threerings/presents/server/net/PresentsConnectionManager.java
+4 -3
View File
@@ -51,6 +51,7 @@ import com.threerings.presents.annotation.AuthInvoker;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.PresentsConMgrStats;
import com.threerings.presents.net.Message;
import com.threerings.presents.net.PingRequest;
import com.threerings.presents.net.PongResponse;
import com.threerings.presents.net.Transport;
import com.threerings.presents.server.Authenticator;
@@ -76,7 +77,7 @@ public class PresentsConnectionManager extends ConnectionManager
public PresentsConnectionManager (Lifecycle cycle, ReportManager repmgr)
throws IOException
{
super(cycle);
super(cycle, LATENCY_GRACE + PingRequest.PING_INTERVAL);
repmgr.registerReporter(this);
_stats = new PresentsConMgrStats();
}
@@ -306,7 +307,7 @@ public class PresentsConnectionManager extends ConnectionManager
// have the non-blocking connect process started
SocketChannel sockchan = SocketChannel.open();
sockchan.configureBlocking(false);
conn.init(this, sockchan, System.currentTimeMillis());
conn.init(this, sockchan, System.currentTimeMillis(), _idleTime);
_connectq.append(Tuple.newTuple(conn, new InetSocketAddress(hostname, port)));
}
@@ -451,7 +452,7 @@ public class PresentsConnectionManager extends ConnectionManager
// construct a new running connection to handle this connections network traffic
// from here on out
PresentsConnection rconn = new PresentsConnection();
rconn.init(this, conn.getChannel(), iterStamp);
rconn.init(this, conn.getChannel(), iterStamp, _idleTime);
rconn.selkey = conn.selkey;
// we need to keep using the same object input and output streams from the