Changeset 103488 in vbox

Timestamp:

Feb 21, 2024 10:55:12 AM (9 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove the old multithread code because testboxes appear to be happy with the IPRT thread pool approach, bugref:5973

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src

Files:

• ipcDConnectService.cpp (modified) (13 diffs)
• ipcDConnectService.h (modified) (4 diffs)

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

@@ -64 +64 @@
 #endif /* VBOX */
 
-#if defined(DCONNECT_MULTITHREADED)
-
-#if !defined(DCONNECT_WITH_IPRT_REQ_POOL)
-#include "nsIRunnable.h"
-#endif
-
 #if defined(DEBUG) && !defined(DCONNECT_STATS)
 #define DCONNECT_STATS
@@ -76 +70 @@
 #if defined(DCONNECT_STATS)
 #include <stdio.h>
-#endif
-
 #endif
 
@@ -2881 +2873 @@
 //-----------------------------------------------------------------------------
 
-#if defined(DCONNECT_MULTITHREADED)  && !defined(DCONNECT_WITH_IPRT_REQ_POOL)
-
-class DConnectWorker : public nsIRunnable
-{
-public:
-  // no reference counting
-  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
-  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
-  NS_IMETHOD QueryInterface(const nsIID &aIID, void **aInstancePtr);
-
-  NS_DECL_NSIRUNNABLE
-
-  DConnectWorker(ipcDConnectService *aDConnect) : mDConnect (aDConnect), mIsRunnable (PR_FALSE) {}
-  NS_HIDDEN_(nsresult) Init();
-  NS_HIDDEN_(void) Join()
-  {
-    int rcThread;
-    int vrc = RTThreadWait(mThread, RT_INDEFINITE_WAIT, &rcThread);
-    AssertRC(vrc); RT_NOREF(vrc);
-    AssertRC(rcThread);
-  };
-  NS_HIDDEN_(bool) IsRunning() { return mIsRunnable; };
-
-private:
-
-  static DECLCALLBACK(int) dconnectWorkerRun(RTTHREAD hSelf, void *pvUser);
-
-  RTTHREAD           mThread;
-  ipcDConnectService *mDConnect;
-
-  // Indicate if thread might be quickly joined on shutdown.
-  volatile bool mIsRunnable;
-};
-
-NS_IMPL_QUERY_INTERFACE1(DConnectWorker, nsIRunnable)
-
-/*static*/
-DECLCALLBACK(int) DConnectWorker::dconnectWorkerRun(RTTHREAD hSelf, void *pvUser)
-{
-  DConnectWorker *pThis = (DConnectWorker *)pvUser;
-  pThis->Run();
-  return VINF_SUCCESS;
-}
-
-
-nsresult
-DConnectWorker::Init()
-{
-  int vrc = RTThreadCreate(&mThread, dconnectWorkerRun, this, 0 /*cbStack*/,
-                           RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "DConWrk");
-  if (RT_FAILURE(vrc))
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-DConnectWorker::Run()
-{
-  Log(("DConnect Worker thread started.\n"));
-
-  mIsRunnable = PR_TRUE;
-
-  nsAutoMonitor mon(mDConnect->mPendingMon);
-
-  while (!mDConnect->mDisconnected)
-  {
-    DConnectRequest *request = mDConnect->mPendingQ.First();
-    if (!request)
-    {
-      mDConnect->mWaitingWorkers++;
-      {
-        // Note: we attempt to enter mWaitingWorkersMon from under mPendingMon
-        // here, but it should be safe because it's the only place where it
-        // happens. We could exit mPendingMon first, but we need to wait on it
-        // shorltly afterwards, which in turn will require us to enter it again
-        // just to exit immediately and start waiting. This seems to me a bit
-        // stupid (exit->enter->exit->wait).
-        nsAutoMonitor workersMon(mDConnect->mWaitingWorkersMon);
-        workersMon.NotifyAll();
-      }
-
-      nsresult rv = mon.Wait();
-      mDConnect->mWaitingWorkers--;
-
-      if (NS_FAILED(rv))
-        break;
-    }
-    else
-    {
-      Log(("DConnect Worker thread got request.\n"));
-
-      // remove the request from the queue
-      mDConnect->mPendingQ.RemoveFirst();
-
-      PRBool pendingQEmpty = mDConnect->mPendingQ.IsEmpty();
-      mon.Exit();
-
-      if (pendingQEmpty)
-      {
-        nsAutoMonitor workersMon(mDConnect->mWaitingWorkersMon);
-        workersMon.NotifyAll();
-      }
-
-      // request is processed outside the queue monitor
-      mDConnect->OnIncomingRequest(request->peer, request->op, request->opLen);
-      delete request;
-
-      mon.Enter();
-    }
-  }
-
-  mIsRunnable = PR_FALSE;
-
-  Log(("DConnect Worker thread stopped.\n"));
-  return NS_OK;
-}
-
-// called only on DConnect message thread
-nsresult
-ipcDConnectService::CreateWorker()
-{
-  DConnectWorker *worker = new DConnectWorker(this);
-  if (!worker)
-    return NS_ERROR_OUT_OF_MEMORY;
-  nsresult rv = worker->Init();
-  if (NS_SUCCEEDED(rv))
-  {
-    nsAutoLock lock(mLock);
-    /* tracking an illegal join in Shutdown. */
-    NS_ASSERTION(!mDisconnected, "CreateWorker racing Shutdown");
-    if (!mWorkers.AppendElement(worker))
-      rv = NS_ERROR_OUT_OF_MEMORY;
-  }
-  if (NS_FAILED(rv))
-    delete worker;
-  return rv;
-}
-
-#endif // defined(DCONNECT_MULTITHREADED) && !defined(DCONNECT_WITH_IPRT_REQ_POOL)
-
-//-----------------------------------------------------------------------------
-
 ipcDConnectService::ipcDConnectService()
  : mLock(NIL_RTSEMFASTMUTEX)
@@ -3029 +2878 @@
  , mDisconnected(PR_TRUE)
  , mStubQILock(NIL_RTSEMFASTMUTEX)
-#if defined(DCONNECT_WITH_IPRT_REQ_POOL)
  , mhReqPool(NIL_RTREQPOOL)
-#endif
 {
 }
@@ -3068 +2915 @@
     RTSemFastMutexDestroy(mLock);
 
-#if defined(DCONNECT_WITH_IPRT_REQ_POOL)
   RTReqPoolRelease(mhReqPool);
   mhReqPool = NIL_RTREQPOOL;
-#endif
 }
 
@@ -3115 +2960 @@
     return NS_ERROR_OUT_OF_MEMORY;
 
-#if defined(DCONNECT_MULTITHREADED)
-# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
   vrc = RTReqPoolCreate(1024 /*cMaxThreads*/, 10*RT_MS_1SEC /*cMsMinIdle*/,
                         8 /*cThreadsPushBackThreshold */, RT_MS_1SEC /* cMsMaxPushBack */,
@@ -3127 +2970 @@
 
   mDisconnected = PR_FALSE;
-
-# else
-
-  mPendingMon = nsAutoMonitor::NewMonitor("DConnect pendingQ monitor");
-  if (!mPendingMon)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  mWaitingWorkers = 0;
-
-  mWaitingWorkersMon = nsAutoMonitor::NewMonitor("DConnect waiting workers monitor");
-  if (!mWaitingWorkersMon)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  /* The DConnectWorker::Run method checks the ipcDConnectService::mDisconnected.
-   * So mDisconnect must be set here to avoid an immediate exit of the worker thread.
-   */
-  mDisconnected = PR_FALSE;
-
-  // create a single worker thread
-  rv = CreateWorker();
-  if (NS_FAILED(rv))
-  {
-    mDisconnected = PR_TRUE;
-    return rv;
-  }
-
-# endif
-#else
-
-  mDisconnected = PR_FALSE;
-
-#endif
-
   mInstance = this;
 
@@ -3176 +2986 @@
   }
 
-#if defined(DCONNECT_MULTITHREADED)
-# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
-
-#  if defined(DCONNECT_STATS)
+#if defined(DCONNECT_STATS)
   fprintf(stderr, "ipcDConnectService Stats\n");
   fprintf(stderr,
@@ -3192 +2999 @@
           RTReqPoolGetStat(mhReqPool, RTREQPOOLSTAT_NS_AVERAGE_REQ_QUEUED)
           );
-#  endif
+#endif
 
   RTReqPoolRelease(mhReqPool);
   mhReqPool = NIL_RTREQPOOL;
-
-# else
-
-  {
-    // remove all pending messages and wake up all workers.
-    // mDisconnected is true here and they will terminate execution after
-    // processing the last request.
-    nsAutoMonitor mon(mPendingMon);
-    mPendingQ.DeleteAll();
-    mon.NotifyAll();
-  }
-
-#if defined(DCONNECT_STATS)
-  fprintf(stderr, "ipcDConnectService Stats\n");
-  fprintf(stderr, " => number of worker threads: %d\n", mWorkers.Count());
-  Log(("ipcDConnectService Stats\n"));
-  Log((" => number of worker threads: %d\n", mWorkers.Count()));
-#endif
-
-
-  // Iterate over currently running worker threads
-  // during VBOX_XPCOM_SHUTDOWN_TIMEOUT_MS, join() those who
-  // exited a working loop and abandon ones which have not
-  // managed to do that when timeout occurred.
-  Log(("Worker threads: %d\n", mWorkers.Count()));
-  uint64_t tsStart = RTTimeMilliTS();
-  while ((tsStart + VBOX_XPCOM_SHUTDOWN_TIMEOUT_MS ) > RTTimeMilliTS() && mWorkers.Count() > 0)
-  {
-    // Some array elements might be deleted while iterating. Going from the last
-    // to the first array element (intentionally) in order to do not conflict with
-    // array indexing once element is deleted.
-    for (int i = mWorkers.Count() - 1; i >= 0; i--)
-    {
-      DConnectWorker *worker = NS_STATIC_CAST(DConnectWorker *, mWorkers[i]);
-      if (worker->IsRunning() == PR_FALSE)
-      {
-        Log(("Worker %p joined.\n", worker));
-        worker->Join();
-        delete worker;
-        mWorkers.RemoveElementAt(i);
-      }
-    }
-
-    /* Double-ckeck if we already allowed to quit. */
-    if ((tsStart + VBOX_XPCOM_SHUTDOWN_TIMEOUT_MS ) < RTTimeMilliTS() || mWorkers.Count() == 0)
-        break;
-
-    // Relax a bit before the next round.
-    RTThreadSleep(10);
-  }
-
-  Log(("There are %d thread(s) left.\n", mWorkers.Count()));
-
-  // If there are some running threads left, terminate the process.
-  if (mWorkers.Count() > 0)
-    exit(1);
-
-
-  nsAutoMonitor::DestroyMonitor(mWaitingWorkersMon);
-  nsAutoMonitor::DestroyMonitor(mPendingMon);
-
-# endif
-#endif
 
   // make sure we have released all instances
@@ -3529 +3273 @@
         aSenderID, op->opcode_major, op->request_index));
 
-#if defined(DCONNECT_MULTITHREADED)
-# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
-
   void *pvDataDup = RTMemDup(aData, aDataLen);
   if (RT_UNLIKELY(!pvDataDup))
@@ -3540 +3281 @@
     return NS_ERROR_FAILURE;
 
-# else
-
-  nsAutoMonitor mon(mPendingMon);
-  mPendingQ.Append(new DConnectRequest(aSenderID, op, aDataLen));
-  // notify a worker
-  mon.Notify();
-  mon.Exit();
-
-  // Yield the cpu so a worker can get a chance to start working without too much fuss.
-  RTThreadYield();
-  mon.Enter();
-  // examine the queue
-  if (mPendingQ.Count() > mWaitingWorkers)
-  {
-    // wait a little while to let the workers empty the queue.
-    mon.Exit();
-    {
-      nsAutoMonitor workersMon(mWaitingWorkersMon);
-      workersMon.Wait(PR_MIN(mWorkers.Count() / 20 + 1, 10));
-    }
-    mon.Enter();
-    // examine the queue again
-    if (mPendingQ.Count() > mWaitingWorkers)
-    {
-      // we need one more worker
-      nsresult rv = CreateWorker();
-      NS_ASSERTION(NS_SUCCEEDED(rv), "failed to create one more worker thread");
-      rv = rv;
-    }
-  }
-
-# endif
-#else
-
-  OnIncomingRequest(aSenderID, op, aDataLen);
-
-#endif
-
   return NS_OK;
 }
@@ -3675 +3378 @@
 //-----------------------------------------------------------------------------
 
-#if defined(DCONNECT_WITH_IPRT_REQ_POOL)
 /**
  * Function called by the request thread pool to process a incoming request in
@@ -3687 +3389 @@
   RTMemFree(aData);
 }
-#endif
 
 void

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

@@ -36 +36 @@
  *
  * ***** END LICENSE BLOCK ***** */
-
-// DConnect service is multithreaded by default...
-#if !defined(DCONNECT_SINGLETHREADED) && !defined(DCONNECT_MULTITHREADED)
-#define DCONNECT_MULTITHREADED
-# ifdef VBOX
-#  define DCONNECT_WITH_IPRT_REQ_POOL
-# endif
-#endif
-
 #include "ipcIDConnectService.h"
 #include "ipcdclient.h"
@@ -61 +52 @@
 #include "xptinfo.h"
 
-#if defined(DCONNECT_MULTITHREADED)
-# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
-
-#  include <iprt/req.h>
-
-# else /* !DCONNECT_WITH_IPRT_REQ_POOL*/
-
-#include "ipcList.h"
-
-struct DConnectOp;
-
-struct DConnectRequest : public ipcListNode<DConnectRequest>
-{
-  DConnectRequest (PRUint32 aPeer, const DConnectOp *aOp, PRUint32 aOpLen)
-    : peer(aPeer)
-    , opLen(aOpLen)
-  {
-    op = (const DConnectOp *) malloc(aOpLen);
-    memcpy ((void *) op, aOp, aOpLen);
-  }
-  ~DConnectRequest() { free((void *) op); }
-
-  const PRUint32 peer;
-  const DConnectOp *op;
-  const PRUint32 opLen;
-};
-
-# endif // !DCONNECT_WITH_IPRT_REQ_POOL
-#endif // DCONNECT_MULTITHREADED
+#include <iprt/req.h>
 
 class nsIException;
@@ -283 +246 @@
   NS_HIDDEN_(void) OnInvoke(PRUint32 peer, const struct DConnectInvoke *, PRUint32 opLen);
 
-#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
 
 private:
@@ -314 +271 @@
   PRBool mDisconnected;
 
-// member is never initialized or used, no point in wasting memory or making
-// someone believe it contains anything relevant
-#ifndef VBOX
-  // our IPC client ID
-  PRUint32 mSelfID;
-#endif
-
   // global lock to protect access to protect DConnectStub::QueryInterface()
   // (we cannot use mStubLock because it isn't supposed to be held long,
   // like in case of an IPC call and such)
   RTSEMFASTMUTEX mStubQILock;
-
-#if defined(DCONNECT_MULTITHREADED)
-# if defined(DCONNECT_WITH_IPRT_REQ_POOL)
-
   /** Request pool. */
   RTREQPOOL mhReqPool;
-
-# else
-
-  friend class DConnectWorker;
-
-  // pool of worker threads to serve incoming requests
-  nsVoidArray mWorkers;
-  // queue of pending requests
-  ipcList<DConnectRequest> mPendingQ;
-  // monitor to protect mPendingQ
-  PRMonitor *mPendingMon;
-  // number of waiting workers
-  PRUint32 mWaitingWorkers;
-  // monitor used to wait on changes in mWaitingWorkers.
-  PRMonitor *mWaitingWorkersMon;
-# endif
-#endif
 
   // global ipcDConnectService instance for internal usage