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

A bunch more peer business.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4241 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2006-07-01 03:34:00 +00:00
parent 0bceb75365
commit 3a9c6ced44
13 changed files with 675 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/peer/server/PeerClient.java
+43 -1
View File
@@ -21,11 +21,53 @@
package com.threerings.presents.peer.server;
import com.threerings.presents.net.BootstrapData;
import com.threerings.presents.server.PresentsClient;
import com.threerings.presents.peer.net.PeerBootstrapData;
/**
* Manages a peer server connection.
* Manages a peer connection.
*/
public class PeerClient extends PresentsClient
{
/**
* Creates a peer client and provides it with a reference to the peer
* manager. This is only done by the {@link PeerClientFactory}.
*/
protected PeerClient (PeerManager peermgr)
{
_peermgr = peermgr;
}
/**
* Derived client classes can override this member to create derived
* bootstrap data classes that contain extra bootstrap information, if
* desired.
*/
protected BootstrapData createBootstrapData ()
{
return new PeerBootstrapData();
}
/**
* Derived client classes can override this member to populate the
* bootstrap data with additional information. They should be sure to
* call <code>super.populateBootstrapData</code> before doing their
* own populating, however.
*
* <p><em>Note:</em> This function will be called on the dobjmgr
* thread which means that object manipulations are OK, but client
* instance manipulations must be done carefully.
*/
protected void populateBootstrapData (BootstrapData data)
{
super.populateBootstrapData(data);
// tell our peer about our node object so they can wire up
PeerBootstrapData pdata = (PeerBootstrapData)data;
pdata.nodeOid = _peermgr.getNodeObject().getOid();
}
protected PeerManager _peermgr;
}
src/java/com/threerings/presents/peer/server/PeerClientFactory.java
+4 -2
View File
@@ -36,8 +36,9 @@ import com.threerings.presents.peer.net.PeerCreds;
*/
public class PeerClientFactory implements ClientFactory
{
public PeerClientFactory (ClientFactory delegate)
public PeerClientFactory (PeerManager peermgr, ClientFactory delegate)
{
_peermgr = peermgr;
_delegate = delegate;
}
@@ -45,7 +46,7 @@ public class PeerClientFactory implements ClientFactory
public PresentsClient createClient (AuthRequest areq)
{
if (areq.getCredentials() instanceof PeerCreds) {
return new PeerClient();
return new PeerClient(_peermgr);
} else {
return _delegate.createClient(areq);
}
@@ -61,5 +62,6 @@ public class PeerClientFactory implements ClientFactory
}
}
protected PeerManager _peermgr;
protected ClientFactory _delegate;
}
src/java/com/threerings/presents/peer/server/PeerManager.java
+110 -34
View File
@@ -33,8 +33,12 @@ import com.samskivert.util.Invoker;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.ClientObserver;
import com.threerings.presents.dobj.ObjectAccessException;
import com.threerings.presents.dobj.Subscriber;
import com.threerings.presents.server.PresentsServer;
import com.threerings.presents.peer.data.NodeObject;
import com.threerings.presents.peer.net.PeerBootstrapData;
import com.threerings.presents.peer.net.PeerCreds;
import com.threerings.presents.peer.server.persist.NodeRecord;
import com.threerings.presents.peer.server.persist.NodeRepository;
@@ -51,7 +55,29 @@ public class PeerManager
{
/**
* Creates a peer manager which will create a {@link NodeRepository} which
* is used to publish our existence and discover the other nodes.
* will be used to publish our existence and discover the other nodes.
*/
public PeerManager (ConnectionProvider conprov, Invoker invoker)
throws PersistenceException
{
_invoker = invoker;
_noderepo = new NodeRepository(conprov);
}
/**
* Returns the distributed object that represents this node to its peers.
*/
public NodeObject getNodeObject ()
{
return _nodeobj;
}
/**
* Initializes this peer manager and initiates the process of connecting to
* its peer nodes. This will also reconfigure the ConnectionManager and
* ClientManager with peer related bits, so this should not be called until
* <em>after</em> the main server has set up its client factory and
* authenticator.
*
* @param nodeName this node's unique name.
* @param sharedSecret a shared secret used to allow the peers to
@@ -62,46 +88,32 @@ public class PeerManager
* @param invoker we will perform all database operations on the supplied
* invoker thread.
*/
public PeerManager (
String nodeName, String sharedSecret, String hostName, int port,
ConnectionProvider conprov, Invoker invoker)
throws PersistenceException
public void init (String nodeName, String sharedSecret,
String hostName, int port)
{
_nodeName = nodeName;
_hostName = hostName;
_port = port;
_sharedSecret = sharedSecret;
_invoker = invoker;
_noderepo = new NodeRepository(conprov);
}
/**
* Instructs the node manager to load up information about its other nodes
* and attempt to establish connections with those nodes.
*/
public void init ()
{
// first register ourselves with the node table
_invoker.postUnit(new Invoker.Unit() {
public boolean invoke () {
NodeRecord record = new NodeRecord(_nodeName, _hostName, _port);
try {
_noderepo.updateNode(record);
} catch (PersistenceException pe) {
log.warning("Failed to register node record " +
"[rec=" + record + ", error=" + pe + "].");
}
return false;
// wire ourselves into the server
PresentsServer.conmgr.setAuthenticator(
new PeerAuthenticator(
this, PresentsServer.conmgr.getAuthenticator()));
PresentsServer.clmgr.setClientFactory(
new PeerClientFactory(
this, PresentsServer.clmgr.getClientFactory()));
// create our node object
Class<NodeObject> clazz = (Class<NodeObject>)getNodeObjectClass();
PresentsServer.omgr.createObject(clazz, new Subscriber<NodeObject>() {
public void objectAvailable (NodeObject object) {
finishInit(object);
}
public void requestFailed (int oid, ObjectAccessException cause) {
log.warning("Failed to create NodeObject: " + cause + ".");
}
});
// then start our peer refresh interval (this need not use a runqueue
// as all it will do is post an invoker unit)
new Interval() {
public void expired () {
refreshPeers();
}
}.schedule(5000L, 60*1000L);
}
/**
@@ -126,6 +138,37 @@ public class PeerManager
creds.getNodeName(), _sharedSecret).equals(creds.getPassword());
}
/**
* Called once our node object is available.
*/
protected void finishInit (NodeObject nodeobj)
{
// keep a handle on our node object
_nodeobj = nodeobj;
// register ourselves with the node table
_invoker.postUnit(new Invoker.Unit() {
public boolean invoke () {
NodeRecord record = new NodeRecord(_nodeName, _hostName, _port);
try {
_noderepo.updateNode(record);
} catch (PersistenceException pe) {
log.warning("Failed to register node record " +
"[rec=" + record + ", error=" + pe + "].");
}
return false;
}
});
// and start our peer refresh interval (this need not use a runqueue as
// all it will do is post an invoker unit)
new Interval() {
public void expired () {
refreshPeers();
}
}.schedule(5000L, 60*1000L);
}
/**
* Reloads the list of peer nodes from our table and refreshes each with a
* call to {@link #refreshPeer}.
@@ -174,12 +217,23 @@ public class PeerManager
peer.refresh(record);
}
/**
* Returns the class we use when creating our {@link NodeObject}.
*/
protected Class<? extends NodeObject> getNodeObjectClass ()
{
return NodeObject.class;
}
/**
* Contains all runtime information for one of our peer nodes.
*/
protected class PeerNode
implements ClientObserver
implements ClientObserver, Subscriber<NodeObject>
{
/** This peer's node object. */
public NodeObject nodeobj;
public PeerNode (NodeRecord record)
{
_record = record;
@@ -242,11 +296,17 @@ public class PeerManager
public void clientDidLogon (Client client)
{
log.info("Connected to peer " + _record + ".");
// subscribe to this peer's node object
PeerBootstrapData pdata = (PeerBootstrapData)
client.getBootstrapData();
client.getDObjectManager().subscribeToObject(pdata.nodeOid, this);
}
// documentation inherited from interface ClientObserver
public void clientObjectDidChange (Client client)
{
// nothing doing
}
// documentation inherited from interface ClientObserver
@@ -258,6 +318,21 @@ public class PeerManager
// documentation inherited from interface ClientObserver
public void clientDidLogoff (Client client)
{
// TODO: clean things up?
}
// documentation inherited from interface Subscriber
public void objectAvailable (NodeObject object)
{
nodeobj = object;
// TODO: stuff!
}
// documentation inherited from interface Subscriber
public void requestFailed (int oid, ObjectAccessException cause)
{
log.warning("Failed to subscribe to peer's node object " +
"[peer=" + _record + ", cause=" + cause + "].");
}
protected NodeRecord _record;
@@ -269,5 +344,6 @@ public class PeerManager
protected int _port;
protected Invoker _invoker;
protected NodeRepository _noderepo;
protected NodeObject _nodeobj;
protected HashMap<String,PeerNode> _peers = new HashMap<String,PeerNode>();
}