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

We've always been at war with Eurasia. Changed InvocationManager to

Browse Source 
InvocationDirector (please god let the renaming be done). Removed IntMap
and modified code to use samskivert's HashIntMap.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@375 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-10-02 02:08:16 +00:00
parent 1f663669c9
commit 6620936a04
13 changed files with 73 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/server/PresentsClient.java
+8 -8
View File
@@ -1,19 +1,19 @@
//
// $Id: PresentsClient.java,v 1.18 2001/08/11 00:12:11 mdb Exp $
// $Id: PresentsClient.java,v 1.19 2001/10/02 02:05:50 mdb Exp $
package com.threerings.cocktail.cher.server;
import java.io.IOException;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import com.samskivert.util.HashIntMap;
import com.threerings.cocktail.cher.Log;
import com.threerings.cocktail.cher.data.ClientObject;
import com.threerings.cocktail.cher.dobj.*;
import com.threerings.cocktail.cher.net.*;
import com.threerings.cocktail.cher.server.net.*;
import com.threerings.cocktail.cher.util.IntMap;
/**
* A client object represents a client session in the server. It is
@@ -213,9 +213,9 @@ public class CherClient implements Subscriber, MessageHandler
*/
protected synchronized void clearSubscrips ()
{
Enumeration enum = _subscrips.elements();
while (enum.hasMoreElements()) {
DObject object = (DObject)enum.nextElement();
Iterator enum = _subscrips.elements();
while (enum.hasNext()) {
DObject object = (DObject)enum.next();
// Log.info("Clearing subscription [client=" + this +
// ", obj=" + object + "].");
object.removeSubscriber(this);
@@ -562,7 +562,7 @@ public class CherClient implements Subscriber, MessageHandler
protected String _username;
protected Connection _conn;
protected ClientObject _clobj;
protected IntMap _subscrips = new IntMap();
protected HashIntMap _subscrips = new HashIntMap();
protected static HashMap _disps = new HashMap();
src/java/com/threerings/presents/server/PresentsDObjectMgr.java
+6 -6
View File
@@ -1,16 +1,16 @@
//
// $Id: PresentsDObjectMgr.java,v 1.14 2001/08/11 01:00:26 mdb Exp $
// $Id: PresentsDObjectMgr.java,v 1.15 2001/10/02 02:05:50 mdb Exp $
package com.threerings.cocktail.cher.server;
import java.lang.reflect.*;
import java.util.HashMap;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.Queue;
import com.threerings.cocktail.cher.Log;
import com.threerings.cocktail.cher.dobj.*;
import com.threerings.cocktail.cher.util.IntMap;
/**
* The cher distributed object manager implements the
@@ -328,7 +328,7 @@ public class CherDObjectMgr implements DObjectManager
int oid = oae.getOid();
// ensure that the target object exists
if (!_objects.contains(oid)) {
if (!_objects.containsKey(oid)) {
Log.info("Rejecting object added event of non-existent object " +
"[refferOid=" + target.getOid() +
", reffedOid=" + oid + "].");
@@ -427,7 +427,7 @@ public class CherDObjectMgr implements DObjectManager
// come to an end long before we had two billion objects
do {
_nextOid = (_nextOid + 1) % Integer.MAX_VALUE;
} while (_objects.contains(_nextOid));
} while (_objects.containsKey(_nextOid));
return _nextOid;
}
@@ -646,13 +646,13 @@ public class CherDObjectMgr implements DObjectManager
protected Queue _evqueue = new Queue();
/** The managed distributed objects table. */
protected IntMap _objects = new IntMap();
protected HashIntMap _objects = new HashIntMap();
/** Used to assign a unique oid to each distributed object. */
protected int _nextOid = 0;
/** Used to track oid list references of distributed objects. */
protected IntMap _refs = new IntMap();
protected HashIntMap _refs = new HashIntMap();
/** The default size of an oid list refs vector. */
protected static final int DEFREFVEC_SIZE = 4;