Changeset 1344 in vbox for trunk

Timestamp:

Mar 8, 2007 6:13:39 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19321

Message:

Disabled obsolete code in HGCM, added logging.

Location:

trunk/src/VBox/Main

Files:

• hgcm/HGCMThread.cpp (modified) (10 diffs)
• include/hgcm/HGCMObjects.h (modified) (5 diffs)
• include/hgcm/HGCMThread.h (modified) (3 diffs)

trunk/src/VBox/Main/hgcm/HGCMThread.cpp

@@ -69 +69 @@
 #define HGCMMSG_TF_TERMINATED          (0x00000004)
 
+/** @todo consider use of RTReq */
 
 static DECLCALLBACK(int) hgcmWorkerThreadFunc (RTTHREAD ThreadSelf, void *pvUser);
@@ -100 +101 @@
         uint32_t m_fu32ThreadFlags;
 
-        /* Typical message size for this thread, messages with
-         * this size will be put in the Free list and reused,
-         * instead of reallocating. Should speed up processing
-         * in cases when the message size is fixed.
-         */
-        uint32_t m_cbMsg;
-
         /* Message queue variables. Messages are inserted at tail of message
          * queue. They are consumed by worker thread sequently. If a message was
@@ -146 +140 @@
         int MsgPost (HGCMMsgCore *pMsg, PHGCMMSGCALLBACK pfnCallback, bool bWait);
         void MsgComplete (HGCMMsgCore *pMsg, int32_t result);
-
-        bool MsgReuse (HGCMMsgCore *pMsg);
 };
 
@@ -161 +153 @@
 void HGCMMsgCore::InitializeCore (uint32_t cbMsg, uint32_t u32MsgId, HGCMThread *pThread)
 {
-    m_cbMsg       = cbMsg;
     m_u32Version  = HGCMMSG_VERSION;
     m_u32Msg      = u32MsgId;
@@ -171 +162 @@
 
     m_pThread     = pThread;
-}
-
-bool HGCMMsgCore::Reuse (void)
-{
-    return m_pThread->MsgReuse (this);
 }
 
@@ -218 +204 @@
     m_eventSend (0),
     m_fu32ThreadFlags (0),
-    m_cbMsg (0),
     m_pMsgInputQueueHead (NULL),
     m_pMsgInputQueueTail (NULL),
@@ -281 +266 @@
                 m_pfnThread = pfnThread;
                 m_pvUser    = pvUser;
-                m_cbMsg     = cbMsg;
 
                 m_fu32ThreadFlags = HGCMMSG_TF_INITIALIZING;
@@ -352 +336 @@
     bool fFromFreeList = false;
 
-#if 0 /* @todo to be replaced with RTReq */
-    if (cbMsg == m_cbMsg)
-    {
-        rc = Enter ();
-
-        if (VBOX_SUCCESS(rc))
-        {
-            /* May be we can reuse a previously allocated message memory block. */
-
-            if (m_pFreeHead)
-            {
-                /* Take existing message object from the head of the free list. */
-                pmsg = m_pFreeHead;
-
-                m_pFreeHead = m_pFreeHead->m_pNext;
-
-                if (m_pFreeHead == NULL)
-                {
-                    m_pFreeTail = NULL;
-                }
-
-                fFromFreeList = true;
-            }
-
-            Leave ();
-        }
-    }
-#endif
-
     if (!pmsg && VBOX_SUCCESS(rc))
     {
@@ -397 +352 @@
         Reference ();
 
-        /* Initialize just allocated or reused message core */
+        /* Initialize just allocated message core */
         pmsg->InitializeCore (cbMsg, u32MsgId, this);
 
@@ -632 +587 @@
 }
 
-
-bool HGCMThread::MsgReuse (HGCMMsgCore *pMsg)
-{
-    if (pMsg->m_cbMsg != m_cbMsg)
-    {
-        /* Message no longer belong to the thread. */
-        Dereference ();
-
-        return false;
-    }
-
-    int rc = Enter ();
-
-    if (VBOX_SUCCESS (rc))
-    {
-        /* Put the message to the tail of free list. */
-
-        /* Reference message because it will still be in free list. */
-        pMsg->Reference ();
-
-        pMsg->Uninitialize ();
-
-        if (m_pFreeTail)
-        {
-            m_pFreeTail->m_pNext = pMsg;
-        }
-        else
-        {
-            m_pFreeHead = pMsg;
-        }
-
-        m_pFreeTail = pMsg;
-
-        Leave ();
-
-        /* Dereference the thread. */
-        Dereference ();
-    }
-
-    return true;
-}
-
-
-
 /*
  * Thread API. Public interface.

trunk/src/VBox/Main/include/hgcm/HGCMObjects.h

@@ -22 +22 @@
 #ifndef __HGCMOBJECTS__H
 #define __HGCMOBJECTS__H
+
+#define LOG_GROUP_MAIN_OVERRIDE LOG_GROUP_HGCM
+#include "Logging.h"
 
 #include <iprt/assert.h>
@@ -54 +57 @@
         ObjectAVLCore Core;
 
-        virtual bool Reuse (void) { return false; };
-
     protected:
         virtual ~HGCMObject (void) {};
@@ -67 +68 @@
         void Reference (void)
         {
-            ASMAtomicIncS32 (&cRef);
+            int32_t refCnt = ASMAtomicIncS32 (&cRef);
+            
+            Log(("Reference: refCnt = %d\n", refCnt));
         }
 
@@ -74 +77 @@
             int32_t refCnt = ASMAtomicDecS32 (&cRef);
 
+            Log(("Dereference: refCnt = %d\n", refCnt));
+            
             AssertRelease(refCnt >= 0);
 
@@ -81 +86 @@
             }
 
-            if (!Reuse ())
-            {
-                delete this;
-            }
+            delete this;
         }
 

trunk/src/VBox/Main/include/hgcm/HGCMThread.h

@@ -61 +61 @@
         friend class HGCMThread;
 
-        /** Size of entire message block. */
-        uint32_t m_cbMsg;
-
         /** Version of message header. */
         uint32_t m_u32Version;
@@ -89 +86 @@
         void InitializeCore (uint32_t cbMsg, uint32_t u32MsgId, HGCMThread *pThread);
 
-        virtual bool Reuse (void);
-
     protected:
         virtual ~HGCMMsgCore () {};
@@ -101 +96 @@
         HGCMThread *Thread (void) { return m_pThread; };
 
-        /** Initialize message after it was allocated or reused. */
+        /** Initialize message after it was allocated. */
         virtual void Initialize (void) {};
 
-        /** Uninitialize message, message will then be freed or put to
-         * a list, from where it can be reused.
-         */
+        /** Uninitialize message. */
         virtual void Uninitialize (void) {};