From 19831db930af438f28bcf190fdeb6f69a85ad998 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Wed, 23 Apr 2008 18:04:50 +0000
Subject: [PATCH] Stop waiting for ENTER_FRAME to process incoming messages.
 This was residual from the initial conversion from Java, but I don't think
 it's very necessary on the flash side, and Zell is working to decouple the
 presents layer from flash-player specific classes and events like
 ENTER_FRAME. So now we just process everything immediately. I did some tests,
 it seems that the flash player dispatches ENTER_FRAME, then it dispatches any
 network events, then the frame is rendered. So our old way of doing things
 was pointlessly

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5015 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../presents/client/ClientDObjectMgr.as       | 93 +++----------------
 1 file changed, 14 insertions(+), 79 deletions(-)

diff --git a/src/as/com/threerings/presents/client/ClientDObjectMgr.as b/src/as/com/threerings/presents/client/ClientDObjectMgr.as
index 692efe8a7..afc73e579 100644
--- a/src/as/com/threerings/presents/client/ClientDObjectMgr.as
+++ b/src/as/com/threerings/presents/client/ClientDObjectMgr.as
@@ -78,9 +78,6 @@ public class ClientDObjectMgr
         _flushInterval = new Timer(FLUSH_INTERVAL);
         _flushInterval.addEventListener(TimerEvent.TIMER, flushObjects);
         _flushInterval.start();
-
-        client.getStage().addEventListener(
-            Event.ENTER_FRAME, processNextAction);
     }
 
     // documentation inherited from interface DObjectManager
@@ -96,21 +93,14 @@ public class ClientDObjectMgr
         if (oid <= 0) {
             target.requestFailed(oid, new ObjectAccessError("Invalid oid " + oid + "."));
         } else {
-            queueAction(oid, target, true);
+            doSubscribe(oid, target);
         }
     }
 
     // inherit documentation from the interface DObjectManager
     public function unsubscribeFromObject (oid :int, target :Subscriber) :void
     {
-        queueAction(oid, target, false);
-    }
-
-    protected function queueAction (
-            oid :int, target :Subscriber, subscribe :Boolean) :void
-    {
-        // queue up an action
-        _actions.push(new ObjectAction(oid, target, subscribe));
+        doUnsubscribe(oid, target);
     }
 
     // inherit documentation from the interface
@@ -157,60 +147,29 @@ public class ClientDObjectMgr
      */
     public function processMessage (msg :DownstreamMessage) :void
     {
-        // append it to our queue
-        _actions.push(msg);
-    }
-
-    /**
-     * Invoked on the main client thread to process any newly arrived
-     * messages that we have waiting in our queue.
-     */
-    public function processNextAction (event :Event) :void
-    {
-        while (_actions.length > 0) {
-            doNextAction();
-        }
-    }
-
-    protected function doNextAction () :void
-    {
-        // process the next event on our queue
-        if (_actions.length == 0) {
-            return;
-        }
-
-        var obj :Object = _actions.shift();
         // do the proper thing depending on the object
-        if (obj is EventNotification) {
-            var evt :DEvent = (obj as EventNotification).getEvent();
+        if (msg is EventNotification) {
+            var evt :DEvent = (msg as EventNotification).getEvent();
 //             log.info("Dispatch event: " + evt);
             dispatchEvent(evt);
 
-        } else if (obj is BootstrapNotification) {
-            _client.gotBootstrap((obj as BootstrapNotification).getData(), this);
+        } else if (msg is BootstrapNotification) {
+            _client.gotBootstrap((msg as BootstrapNotification).getData(), this);
 
-        } else if (obj is ObjectResponse) {
-            registerObjectAndNotify((obj as ObjectResponse).getObject());
+        } else if (msg is ObjectResponse) {
+            registerObjectAndNotify((msg as ObjectResponse).getObject());
 
-        } else if (obj is UnsubscribeResponse) {
-            var oid :int = (obj as UnsubscribeResponse).getOid();
+        } else if (msg is UnsubscribeResponse) {
+            var oid :int = (msg as UnsubscribeResponse).getOid();
             if (_dead.remove(oid) == null) {
                 log.warning("Received unsub ACK from unknown object [oid=" + oid + "].");
             }
 
-        } else if (obj is FailureResponse) {
-            notifyFailure((obj as FailureResponse).getOid(), (obj as FailureResponse).getMessage());
+        } else if (msg is FailureResponse) {
+            notifyFailure((msg as FailureResponse).getOid(), (msg as FailureResponse).getMessage());
 
-        } else if (obj is PongResponse) {
-            _client.gotPong(obj as PongResponse);
-
-        } else if (obj is ObjectAction) {
-            var act :ObjectAction = (obj as ObjectAction);
-            if (act.subscribe) {
-                doSubscribe(act.oid, act.target);
-            } else {
-                doUnsubscribe(act.oid, act.target);
-            }
+        } else if (msg is PongResponse) {
+            _client.gotPong(msg as PongResponse);
         }
     }
 
@@ -444,30 +403,6 @@ public class ClientDObjectMgr
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.Subscriber;
 
-/**
- * The object action is used to queue up a subscribe or unsubscribe
- * request.
- */
-class ObjectAction
-{
-    public var oid :int;
-    public var target :Subscriber;
-    public var subscribe :Boolean;
-
-    public function ObjectAction (
-            oid :int, target :Subscriber, subscribe :Boolean)
-    {
-        this.oid = oid;
-        this.target = target;
-        this.subscribe = subscribe;
-    }
-
-    public function toString () :String
-    {
-        return "oid=" + oid + ", target=" + target + ", subscribe=" + subscribe;
-    }
-}
-
 class PendingRequest
 {
     public var oid :int;