Changeset 26566 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/extensions

Timestamp:

Feb 16, 2010 11:03:52 AM (15 years ago)

Author:

vboxsync

Message:

XPCOM: back out r57733 which breaks automatic SVC startup

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -51 +51 @@
 #include "nsDeque.h"
 #include "xptcall.h"
-
-#ifdef VBOX
-#include <map>
-#include <list>
-#endif /* VBOX */
 
 #if defined(DCONNECT_MULTITHREADED)
@@ -1260 +1255 @@
 //-----------------------------------------------------------------------------
 
-#ifdef VBOX
-typedef struct ClientDownInfo
-{
-    ClientDownInfo(PRUint32 aClient)
-    {
-        uClient = aClient;
-        uTimestamp = PR_IntervalNow();
-    }
-
-    PRUint32 uClient;
-    PRIntervalTime uTimestamp;
-} ClientDownInfo;
-typedef std::map<PRUint32, ClientDownInfo *> ClientDownMap;
-typedef std::list<ClientDownInfo *> ClientDownList;
-
-#define MAX_CLIENT_DOWN_SIZE 10000
-
-/* Protected by the queue monitor. */
-static ClientDownMap g_ClientDownMap;
-static ClientDownList g_ClientDownList;
-
-#endif /* VBOX */
-
 class DConnectMsgSelector : public ipcIMessageObserver
 {
@@ -1303 +1275 @@
     // accept special "client dead" messages for a given peer
     // (empty target id, zero data and data length)
-#ifndef VBOX
     if (aSenderID == mPeer && aTarget.Equals(nsID()) && !aData && !aDataLen)
         return NS_OK;
-#else /* VBOX */
-    if (aSenderID != IPC_SENDER_ANY && aTarget.Equals(nsID()) && !aData && !aDataLen)
-    {
-        // Insert new client down information. Start by expiring outdated
-        // entries and free one element if there's still no space (if needed).
-        PRIntervalTime now = PR_IntervalNow();
-        do {
-            ClientDownInfo *cInfo = g_ClientDownList.back();
-            if (!cInfo)
-                break;
-            PRInt64 diff = (PRInt64)now - cInfo->uTimestamp;
-            if (diff < 0)
-                diff += (PRInt64)((PRIntervalTime)-1) + 1;
-            if (diff > PR_SecondsToInterval(15 * 60))
-            {
-                g_ClientDownMap.erase(cInfo->uClient);
-                g_ClientDownList.pop_back();
-                delete cInfo;
-            }
-            else
-                break;
-        } while (true);
-
-        ClientDownMap::iterator it = g_ClientDownMap.find(aSenderID);
-        if (it == g_ClientDownMap.end())
-        {
-            while (g_ClientDownList.size() >= MAX_CLIENT_DOWN_SIZE)
-            {
-                ClientDownInfo *cInfo = g_ClientDownList.back();
-                g_ClientDownMap.erase(cInfo->uClient);
-                g_ClientDownList.pop_back();
-                delete cInfo;
-            }
-
-            ClientDownInfo *cInfo = new ClientDownInfo(aSenderID);
-            g_ClientDownMap[aSenderID] = cInfo;
-            g_ClientDownList.push_front(cInfo);
-        }
-        return (aSenderID == mPeer) ? NS_OK : IPC_WAIT_NEXT_MESSAGE;
-    }
-    // accept special "client up" messages for a given peer
-    // (empty target id, zero data and data length=1)
-    if (aTarget.Equals(nsID()) && !aData && aDataLen == 1)
-    {
-        ClientDownMap::iterator it = g_ClientDownMap.find(aSenderID);
-        if (it != g_ClientDownMap.end())
-        {
-            ClientDownInfo *cInfo = it->second;
-            g_ClientDownMap.erase(it);
-            g_ClientDownList.remove(cInfo);
-            delete cInfo;
-        }
-        return (aSenderID == mPeer) ? NS_OK : IPC_WAIT_NEXT_MESSAGE;
-    }
-    // accept special "client check" messages for an anonymous sender
-    // (invalid sender id, empty target id, zero data and data length
-    if (aSenderID == IPC_SENDER_ANY && aTarget.Equals(nsID()) && !aData && !aDataLen)
-    {
-        LOG(("DConnectMsgSelector::OnMessageAvailable: poll liveness for mPeer=%d\n",
-             mPeer));
-        ClientDownMap::iterator it = g_ClientDownMap.find(mPeer);
-        return (it == g_ClientDownMap.end()) ? IPC_WAIT_NEXT_MESSAGE : NS_OK;
-    }
-#endif /* VBOX */
     const DConnectOp *op = (const DConnectOp *) aData;
     // accept only reply messages with the given peer/opcode/index