Changeset 101895 in vbox

Timestamp:

Nov 6, 2023 7:11:38 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Rmove unused code and convert other to use IPRT, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/tests

Files:

• TestAutoLock.cpp (modified) (3 diffs)
• TestThreads.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/xpcom/tests/TestAutoLock.cpp

@@ -43 +43 @@
 
 #include "nsAutoLock.h"
-#include "prthread.h"
+
+#include <iprt/assert.h>
+#include <iprt/errcore.h>
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+#include <iprt/thread.h>
 
 PRLock* gLock;
 int gCount;
 
-static void PR_CALLBACK run(void* arg)
+static DECLCALLBACK(int) run(RTTHREAD hSelf, void* arg)
 {
+    RT_NOREF(hSelf, arg);
+
     for (int i = 0; i < 1000000; ++i) {
         nsAutoLock guard(gLock);
         ++gCount;
-        PR_ASSERT(gCount == 1);
+        AssertRelease(gCount == 1);
         --gCount;
     }
+
+    return VINF_SUCCESS;
 }
 
@@ -63 +72 @@
     gLock = PR_NewLock();
     gCount = 0;
+
+    int vrc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(vrc))
+        return RTMsgInitFailure(vrc);
 
     // This shouldn't compile
@@ -74 +87 @@
 
     // Fork a thread to access the shared variable in a tight loop
-    PRThread* t1 =
-        PR_CreateThread(PR_SYSTEM_THREAD,
-                        run,
-                        nsnull,
-                        PR_PRIORITY_NORMAL,
-                        PR_GLOBAL_THREAD,
-                        PR_JOINABLE_THREAD,
-                        0);
+    RTTHREAD hThread = NIL_RTTHREAD;
+    vrc = RTThreadCreate(&hThread, run, NULL, 0 /*cbStack*/,
+                         RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "AutoLockTest");
 
     // ...and now do the same thing ourselves
-    run(nsnull);
+    run(NIL_RTTHREAD, nsnull);
 
     // Wait for the background thread to finish, if necessary.
-    PR_JoinThread(t1);
+    int rcThread;
+    RTThreadWait(hThread, RT_INDEFINITE_WAIT, &rcThread);
+    AssertRC(rcThread);
+
     return 0;
 }

trunk/src/libs/xpcom18a4/xpcom/tests/TestThreads.cpp

@@ -41 +41 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "nspr.h"
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
@@ -132 +131 @@
 }
 
-class nsStressRunner : public nsIRunnable {
-public:
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD Run() {
-        NS_ASSERTION(!mWasRun, "run twice!");
-        mWasRun = PR_TRUE;
-        PR_Sleep(1);
-        if (!PR_AtomicDecrement(&gNum)) {
-            printf("   last thread was %d\n", mNum);
-        }
-        return NS_OK;
-    }
-
-    nsStressRunner(int num) : mNum(num), mWasRun(PR_FALSE) {
-        PR_AtomicIncrement(&gNum);
-    }
-
-    static PRInt32 GetGlobalCount() {return gNum;}
-
-private:
-    ~nsStressRunner() {
-        NS_ASSERTION(mWasRun, "never run!");
-    }
-
-protected:
-    static PRInt32 gNum;
-    PRInt32 mNum;
-    PRBool mWasRun;
-};
-
-PRInt32 nsStressRunner::gNum = 0;
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsStressRunner, nsIRunnable)
-
-static int Stress(int loops, int threads)
-{
-
-    for (int i = 0; i < loops; i++) {
-        printf("Loop %d of %d\n", i+1, loops);
-
-        int k;
-        nsIThread** array = new nsIThread*[threads];
-        NS_ASSERTION(array, "out of memory");
-
-        NS_ASSERTION(!nsStressRunner::GetGlobalCount(), "bad count of runnables");
-        
-        for (k = 0; k < threads; k++) {
-            nsCOMPtr<nsIThread> t;
-            nsresult rv = NS_NewThread(getter_AddRefs(t), 
-                                       new nsStressRunner(k),
-                                       0, PR_JOINABLE_THREAD);
-            NS_ASSERTION(NS_SUCCEEDED(rv), "can't create thread");
-            NS_ADDREF(array[k] = t);
-        }
-
-        for (k = threads-1; k >= 0; k--) {
-            array[k]->Join();
-            NS_RELEASE(array[k]);    
-        }
-        delete [] array;
-    }
-    return 0;
-}
-
-PR_STATIC_CALLBACK(void) threadProc(void *arg)
-{
-    // printf("   running thread %d\n", (int) arg);
-    PR_Sleep(1);
-    PR_ASSERT(PR_JOINABLE_THREAD == PR_GetThreadState(PR_GetCurrentThread()));
-}
-
-static int StressNSPR(int loops, int threads)
-{
-
-    for (int i = 0; i < loops; i++) {
-        printf("Loop %d of %d\n", i+1, loops);
-
-        int k;
-        PRThread** array = new PRThread*[threads];
-        PR_ASSERT(array);
-
-        for (k = 0; k < threads; k++) {
-            array[k] = PR_CreateThread(PR_USER_THREAD,
-                                       threadProc, (void*)(uintptr_t)k,
-                                       PR_PRIORITY_NORMAL,
-                                       PR_GLOBAL_THREAD,
-                                       PR_JOINABLE_THREAD,
-                                       0);
-            PR_ASSERT(array[k]);
-        }                               
-
-        for (k = 0; k < threads; k++) {
-            PR_ASSERT(PR_JOINABLE_THREAD == PR_GetThreadState(array[k]));
-        }                               
-
-        for (k = threads-1; k >= 0; k--) {
-            PR_JoinThread(array[k]);
-        }
-        delete [] array;
-    }
-    return 0;
-}
-
-
 int
 main(int argc, char** argv)
@@ -246 +140 @@
     if (NS_FAILED(rv)) return -1;
 
-    if (argc > 1 && !strcmp(argv[1], "-stress")) {
-        int loops;
-        int threads;
-        if (argc != 4 || *argv[2] != '-' || *argv[3] != '-' ||
-            !(loops = atoi(argv[2]+1)) || !(threads = atoi(argv[3]+1))) {
-           printf("To use -stress you must pass loop count and thread count...\n"
-                  "   TestThreads -stress -1000 -50\n");
-        } else {
-           printf("Running stress test with %d loops of %d threads each\n",
-                  loops, threads);
-           retval = Stress(loops, threads);
-        }
-    } else if (argc > 1 && !strcmp(argv[1], "-stress-nspr")) {
-        int loops;
-        int threads;
-        if (argc != 4 || *argv[2] != '-' || *argv[3] != '-' ||
-            !(loops = atoi(argv[2]+1)) || !(threads = atoi(argv[3]+1))) {
-           printf("To use -stress-nspr you must pass loop count and thread count...\n"
-                  "   TestThreads -stress -1000 -50\n");
-        } else {
-           printf("Running stress test with %d loops of %d threads each\n",
-                  loops, threads);
-           retval = StressNSPR(loops, threads);
-        }
-    } else {
-        rv = TestThreads();
-        if (NS_FAILED(rv)) return -1;
-    }
+    rv = TestThreads();
+    if (NS_FAILED(rv)) return -1;
 
     rv = NS_ShutdownXPCOM(nsnull);