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

The great invocation services rethink of 2002! Rearchitected the remote

Browse Source 
method invocation services and converted everything to the new style.
Could this be my biggest checkin ever?


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1642 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-08-14 19:08:01 +00:00
parent 4481c5f835
commit e54a4d41f4
161 changed files with 6083 additions and 2805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
+55
View File
@@ -0,0 +1,55 @@
//
// $Id: ZoneDispatcher.java,v 1.1 2002/08/14 19:07:58 mdb Exp $
package com.threerings.whirled.zone.server;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.zone.client.ZoneService;
import com.threerings.whirled.zone.client.ZoneService.ZoneMoveListener;
import com.threerings.whirled.zone.data.ZoneMarshaller;
import com.threerings.whirled.zone.data.ZoneSummary;
/**
* Dispatches requests to the {@link ZoneProvider}.
*/
public class ZoneDispatcher extends InvocationDispatcher
{
/**
* Creates a dispatcher that may be registered to dispatch invocation
* service requests for the specified provider.
*/
public ZoneDispatcher (ZoneProvider provider)
{
this.provider = provider;
}
// documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new ZoneMarshaller();
}
// documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
{
switch (methodId) {
case ZoneMarshaller.MOVE_TO:
((ZoneProvider)provider).moveTo(
source,
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneMoveListener)args[3]
);
return;
default:
super.dispatchRequest(source, methodId, args);
}
}
}
src/java/com/threerings/whirled/zone/server/ZoneProvider.java
+48 -54
View File
@@ -1,11 +1,11 @@
//
// $Id: ZoneProvider.java,v 1.9 2002/05/26 02:29:13 mdb Exp $
// $Id: ZoneProvider.java,v 1.10 2002/08/14 19:07:58 mdb Exp $
package com.threerings.whirled.zone.server;
import com.threerings.presents.server.InvocationManager;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.presents.server.ServiceFailedException;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.PlaceConfig;
@@ -17,6 +17,7 @@ import com.threerings.whirled.server.SceneRegistry;
import com.threerings.whirled.server.SceneManager;
import com.threerings.whirled.zone.Log;
import com.threerings.whirled.zone.client.ZoneService.ZoneMoveListener;
import com.threerings.whirled.zone.data.ZoneCodes;
import com.threerings.whirled.zone.data.ZoneSummary;
import com.threerings.whirled.zone.data.ZonedBodyObject;
@@ -26,7 +27,7 @@ import com.threerings.whirled.zone.data.ZonedBodyObject;
* from zone to zone.
*/
public class ZoneProvider
extends InvocationProvider implements ZoneCodes
implements ZoneCodes, InvocationProvider
{
/**
* Constructs a zone provider that will interoperate with the supplied
@@ -34,10 +35,10 @@ public class ZoneProvider
* constructed and registered by the {@link ZoneRegistry}, which a
* zone-using system must create and initialize in their server.
*/
public ZoneProvider (
InvocationManager invmgr, ZoneRegistry zonereg, SceneRegistry screg)
public ZoneProvider (LocationProvider locprov, ZoneRegistry zonereg,
SceneRegistry screg)
{
_invmgr = invmgr;
_locprov = locprov;
_zonereg = zonereg;
_screg = screg;
}
@@ -45,45 +46,45 @@ public class ZoneProvider
/**
* Processes a request from a client to move to a scene in a new zone.
*
* @param source the user requesting the move.
* @param caller the user requesting the move.
* @param invid the invocation id of the request.
* @param zoneId the qualified zone id of the new zone.
* @param sceneId the identifier of the new scene.
* @param sceneVew the version of the scene model currently held by
* @param sceneVer the version of the scene model currently held by
* the client.
* @param listener the entity to inform of success or failure.
*/
public void handleMoveToRequest (BodyObject source, int invid,
int zoneId, int sceneId, int sceneVer)
public void moveTo (ClientObject caller, int zoneId, int sceneId,
int sceneVer, ZoneMoveListener listener)
throws InvocationException
{
// avoid cluttering up the method declaration with final keywords
final BodyObject fsource = (BodyObject)caller;
final int fsceneId = sceneId;
final int fsceneVer = sceneVer;
final ZoneMoveListener flistener = listener;
// look up the zone manager for the zone
ZoneManager zmgr = _zonereg.getZoneManager(zoneId);
if (zmgr == null) {
Log.warning("Requested to enter a zone for which we have no " +
"manager [user=" + source +
"manager [user=" + fsource.who() +
", zoneId=" + zoneId + "].");
sendResponse(source, invid, MOVE_FAILED_RESPONSE, NO_SUCH_ZONE);
return;
throw new InvocationException(NO_SUCH_ZONE);
}
// avoid cluttering up the method declaration with final keywords
final BodyObject fsource = source;
final int finvid = invid;
final int fsceneId = sceneId;
final int fsceneVer = sceneVer;
// resolve the zone!
ZoneManager.ResolutionListener zl = new ZoneManager.ResolutionListener()
{
public void zoneWasResolved (ZoneSummary summary) {
continueMoveToRequest(fsource, finvid, summary,
fsceneId, fsceneVer);
continueMoveTo(
fsource, summary, fsceneId, fsceneVer, flistener);
}
public void zoneFailedToResolve (int zoneId, Exception reason) {
Log.warning("Unable to resolve zone [zoneId=" + zoneId +
", reason=" + reason + "].");
sendResponse(fsource, finvid,
MOVE_FAILED_RESPONSE, NO_SUCH_ZONE);
flistener.requestFailed(NO_SUCH_ZONE);
}
};
zmgr.resolveZone(zoneId, zl);
@@ -92,21 +93,21 @@ public class ZoneProvider
/**
* This is called after we have resolved our zone.
*/
protected void continueMoveToRequest (
BodyObject source, int invid, ZoneSummary summary,
int sceneId, int sceneVer)
protected void continueMoveTo (
BodyObject source, ZoneSummary summary, int sceneId, int sceneVer,
ZoneMoveListener listener)
{
// avoid cluttering up the method declaration with final keywords
final BodyObject fsource = source;
final int finvid = invid;
final ZoneSummary fsum = summary;
final int fsceneVer = sceneVer;
final ZoneMoveListener flistener = listener;
// give the zone manager a chance to veto the request
ZoneManager zmgr = _zonereg.getZoneManager(summary.zoneId);
String errmsg = zmgr.ratifyBodyEntry(source, summary.zoneId);
if (errmsg != null) {
sendResponse(fsource, finvid, MOVE_FAILED_RESPONSE, errmsg);
listener.requestFailed(errmsg);
return;
}
@@ -116,15 +117,14 @@ public class ZoneProvider
new SceneRegistry.ResolutionListener()
{
public void sceneWasResolved (SceneManager scmgr) {
finishMoveToRequest(fsource, finvid, fsum, scmgr, fsceneVer);
finishMoveTo(fsource, fsum, scmgr, fsceneVer, flistener);
}
public void sceneFailedToResolve (int sceneId, Exception reason) {
Log.warning("Unable to resolve scene [sceneid=" + sceneId +
", reason=" + reason + "].");
// pretend like the scene doesn't exist to the client
sendResponse(fsource, finvid,
MOVE_FAILED_RESPONSE, NO_SUCH_PLACE);
flistener.requestFailed(NO_SUCH_PLACE);
}
};
@@ -137,9 +137,9 @@ public class ZoneProvider
* This is called after the scene to which we are moving is guaranteed
* to have been loaded into the server.
*/
protected void finishMoveToRequest (
BodyObject source, int invid, ZoneSummary summary,
SceneManager scmgr, int sceneVersion)
protected void finishMoveTo (
BodyObject source, ZoneSummary summary, SceneManager scmgr,
int sceneVersion, ZoneMoveListener listener)
{
// move to the place object associated with this scene
PlaceObject plobj = scmgr.getPlaceObject();
@@ -147,7 +147,7 @@ public class ZoneProvider
try {
// try doing the actual move
PlaceConfig config = LocationProvider.moveTo(source, ploid);
PlaceConfig config = _locprov.moveTo(source, ploid);
// now that we've finally moved, we can update the user object
// with the new zone id
@@ -157,23 +157,19 @@ public class ZoneProvider
SceneModel model = scmgr.getSceneModel();
if (sceneVersion < model.version) {
// then send the moveTo response
sendResponse(source, invid, MOVE_SUCCEEDED_PLUS_UPDATE_RESPONSE,
new Object[] { new Integer(ploid), config,
summary, model });
listener.moveSucceededPlusUpdate(ploid, config, summary, model);
} else {
// then send the moveTo response
sendResponse(source, invid, MOVE_SUCCEEDED_RESPONSE,
new Integer(ploid), config, summary);
listener.moveSucceeded(ploid, config, summary);
}
// let the zone manager know that someone just came on in
ZoneManager zmgr = _zonereg.getZoneManager(summary.zoneId);
zmgr.bodyDidEnterZone(source, summary.zoneId);
} catch (ServiceFailedException sfe) {
sendResponse(source, invid,
MOVE_FAILED_RESPONSE, sfe.getMessage());
} catch (InvocationException ie) {
listener.requestFailed(ie.getMessage());
}
}
@@ -182,23 +178,21 @@ public class ZoneProvider
* request to move to the specified new zone and scene. This is the
* zone-equivalent to {@link LocationProvider#moveBody}.
*/
public static void moveBody (BodyObject source, int zoneId, int sceneId)
public void moveBody (BodyObject source, int zoneId, int sceneId)
{
// first remove them from their old place
LocationProvider.leaveOccupiedPlace(source);
_locprov.leaveOccupiedPlace(source);
// then send a move notification
_invmgr.sendNotification(
source.getOid(), MODULE_NAME, MOVE_NOTIFICATION,
new Object[] { new Integer(zoneId), new Integer(sceneId) });
// then send a forced move notification
ZoneSender.forcedMove(source, zoneId, sceneId);
}
/** The invocation manager with which we interact. */
protected static InvocationManager _invmgr;
/** The entity that handles basic location changes. */
protected LocationProvider _locprov;
/** The zone registry with which we communicate. */
protected static ZoneRegistry _zonereg;
protected ZoneRegistry _zonereg;
/** The scene registry with which we communicate. */
protected static SceneRegistry _screg;
protected SceneRegistry _screg;
}
src/java/com/threerings/whirled/zone/server/ZoneRegistry.java
+10 -4
View File
@@ -1,11 +1,13 @@
//
// $Id: ZoneRegistry.java,v 1.7 2002/05/26 02:24:46 mdb Exp $
// $Id: ZoneRegistry.java,v 1.8 2002/08/14 19:07:58 mdb Exp $
package com.threerings.whirled.zone.server;
import com.samskivert.util.HashIntMap;
import com.threerings.presents.server.InvocationManager;
import com.threerings.crowd.server.PlaceRegistry;
import com.threerings.whirled.server.SceneRegistry;
import com.threerings.whirled.zone.Log;
@@ -17,15 +19,19 @@ import com.threerings.whirled.zone.util.ZoneUtil;
*/
public class ZoneRegistry
{
/** Implements the server-side of the zone-related services. */
public ZoneProvider zoneprov;
/**
* Creates a zone manager with the supplied configuration.
*/
public ZoneRegistry (InvocationManager invmgr, SceneRegistry screg)
public ZoneRegistry (InvocationManager invmgr, PlaceRegistry plreg,
SceneRegistry screg)
{
// create a zone provider and register it with the invocation
// services
ZoneProvider provider = new ZoneProvider(invmgr, this, screg);
invmgr.registerProvider(ZoneProvider.MODULE_NAME, provider);
zoneprov = new ZoneProvider(plreg.locprov, this, screg);
invmgr.registerDispatcher(new ZoneDispatcher(zoneprov), true);
}
/**
src/java/com/threerings/whirled/zone/server/ZoneSender.java
+30
View File
@@ -0,0 +1,30 @@
//
// $Id: ZoneSender.java,v 1.1 2002/08/14 19:07:58 mdb Exp $
package com.threerings.whirled.zone.server;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationSender;
import com.threerings.whirled.zone.client.ZoneDecoder;
import com.threerings.whirled.zone.client.ZoneReceiver;
/**
* Used to issue notifications to a {@link ZoneReceiver} instance on a
* client.
*/
public class ZoneSender extends InvocationSender
{
/**
* Issues a notification that will result in a call to {@link
* ZoneReceiver#forcedMove} on a client.
*/
public static void forcedMove (
ClientObject target, int arg1, int arg2)
{
sendNotification(
target, ZoneDecoder.RECEIVER_CODE, ZoneDecoder.FORCED_MOVE,
new Object[] { new Integer(arg1), new Integer(arg2) });
}
// Generated on 11:25:47 08/12/02.
}