Changeset 39635 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd

Timestamp:

Dec 16, 2011 12:02:38 AM (13 years ago)

Author:

vboxsync

Message:

xpcom18x4: Added code for using the IPRT request pool, currently disabled.

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

• Makefile.kup (added)
• extensions/Makefile.kup (added)
• extensions/dconnect/Makefile.kup (added)
• extensions/dconnect/src/Makefile.kup (added)
• extensions/dconnect/src/ipcDConnectService.cpp (modified) (12 diffs)
• extensions/dconnect/src/ipcDConnectService.h (modified) (6 diffs)

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

@@ -53 +53 @@
 
 #ifdef VBOX
-#include <map>
-#include <list>
+# include <map>
+# include <list>
+# include <iprt/err.h>
+# include <iprt/req.h>
+# include <iprt/mem.h>
 #endif /* VBOX */
 
-#if defined(DCONNECT_MULTITHREADED)
+#if defined(DCONNECT_MULTITHREADED) && !defined(DCONNECT_WITH_IPRT_REQ_POOL)
 
 #include "nsIThread.h"
@@ -2869 +2872 @@
 //-----------------------------------------------------------------------------
 
-#if defined(DCONNECT_MULTITHREADED)
+#if defined(DCONNECT_MULTITHREADED)  && !defined(DCONNECT_WITH_IPRT_REQ_POOL)
 
 class DConnectWorker : public nsIRunnable
@@ -2977 +2980 @@
 }
 
-#endif // defined(DCONNECT_MULTITHREADED)
+#endif // defined(DCONNECT_MULTITHREADED) && !defined(DCONNECT_WITH_IPRT_REQ_POOL)
 
 //-----------------------------------------------------------------------------
@@ -2986 +2989 @@
  , mDisconnected(PR_TRUE)
  , mStubQILock(NULL)
+#if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+ , mhReqPool(NIL_RTREQPOOL)
+#endif
 {
 }
@@ -3018 +3024 @@
   PR_DestroyLock(mStubLock);
   PR_DestroyLock(mLock);
+#if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+  RTReqPoolRelease(mhReqPool);
+  mhReqPool = NIL_RTREQPOOL;
+#endif
 }
 
@@ -3062 +3072 @@
 
 #if defined(DCONNECT_MULTITHREADED)
+# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+  int vrc = RTReqPoolCreate(1024 /*cMaxThreads*/, 10*RT_MS_1SEC /*cMsMinIdle*/,
+                            8 /*cThreadsPushBackThreshold */, RT_MS_1SEC /* cMsMaxPushBack */,
+                            "dconnect", &mhReqPool);
+  if (RT_FAILURE(vrc))
+  {
+    mhReqPool = NIL_RTREQPOOL;
+    return NS_ERROR_FAILURE;
+  }
+
+  /// @todo check where this is used.
+  mDisconnected = PR_FALSE;
+
+# else
 
   mPendingMon = nsAutoMonitor::NewMonitor("DConnect pendingQ monitor");
@@ -3086 +3110 @@
   }
 
+# endif
 #else
 
@@ -3109 +3134 @@
 
 #if defined(DCONNECT_MULTITHREADED)
+# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+
+#  if defined(DCONNECT_STATS)
+  /// @todo print pool stats.
+#  endif
+
+  RTReqPoolRelease(mhReqPool);
+  mhReqPool = NIL_RTREQPOOL;
+
+# else
 
   {
@@ -3138 +3173 @@
   nsAutoMonitor::DestroyMonitor(mPendingMon);
 
+# endif
 #endif
 
@@ -3410 +3446 @@
 
 #if defined(DCONNECT_MULTITHREADED)
+# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+
+  void *pvDataDup = RTMemDup(aData, aDataLen);
+  if (RT_UNLIKELY(!pvDataDup))
+    return NS_ERROR_OUT_OF_MEMORY;
+  int rc = RTReqPoolCallVoidNoWait(mhReqPool, (PFNRT)ProcessMessageOnWorkerThread, 4,
+                                   this, aSenderID, pvDataDup, aDataLen);
+  if (RT_FAILURE(rc))
+    return NS_ERROR_FAILURE;
+
+# else
 
   nsAutoMonitor mon(mPendingMon);
@@ -3441 +3488 @@
   }
 
+# endif
 #else
 
@@ -3543 +3591 @@
 
 //-----------------------------------------------------------------------------
+
+#if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+/**
+ * Function called by the request thread pool to process a incoming request in
+ * the context of a worker thread.
+ */
+/* static */ DECLCALLBACK(void)
+ipcDConnectService::ProcessMessageOnWorkerThread(ipcDConnectService *aThis, PRUint32 aSenderID, void *aData, PRUint32 aDataLen)
+{
+  if (!aThis->mDisconnected)
+    aThis->OnIncomingRequest(aSenderID, (const DConnectOp *)aData, aDataLen);
+  RTMemFree(aData);
+}
+#endif
 
 void

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

@@ -40 +40 @@
 #if !defined(DCONNECT_SINGLETHREADED) && !defined(DCONNECT_MULTITHREADED)
 #define DCONNECT_MULTITHREADED
+# ifdef VBOX
+//#  define DCONNECT_WITH_IPRT_REQ_POOL - needs testing
+# endif
 #endif
 
@@ -59 +62 @@
 
 #if defined(DCONNECT_MULTITHREADED)
+# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+
+#  include <iprt/req.h>
+
+# else /* !DCONNECT_WITH_IPRT_REQ_POOL*/
 
 #include "ipcList.h"
@@ -80 +88 @@
 };
 
+# endif // !DCONNECT_WITH_IPRT_REQ_POOL
 #endif // DCONNECT_MULTITHREADED
 
@@ -275 +284 @@
 
 #if defined(DCONNECT_MULTITHREADED)
+# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+  static DECLCALLBACK(void) ProcessMessageOnWorkerThread(ipcDConnectService *aThis, PRUint32 aSenderID, void *aData, PRUint32 aDataLen);
+# else
   NS_HIDDEN_(nsresult) CreateWorker();
+# endif
 #endif
 
@@ -310 +323 @@
 
 #if defined(DCONNECT_MULTITHREADED)
+# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
+
+  /** Request pool. */
+  RTREQPOOL mhReqPool;
+
+# else
 
   friend class DConnectWorker;
@@ -323 +342 @@
   // monitor used to wait on changes in mWaitingWorkers.
   PRMonitor *mWaitingWorkersMon;
-
+# endif
 #endif