Add some thread stress tests used to figure out problem in bug 61369. r=brendan sr=waterson

xpcom/tests/TestThreads.cpp

@@ -25,6 +25,8 @@
 #include "nsIThreadPool.h"
 #include "nsIRunnable.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include "nspr.h"
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
 
@@ -137,28 +139,162 @@ TestThreadPools(PRUint32 poolMinSize, PRUint32 poolMaxSize,
     return rv;
 }
 
-int
-main()
+
+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) {
+        NS_INIT_REFCNT();
+        PR_AtomicIncrement(&gNum);
+    }
+
+    ~nsStressRunner() {
+        NS_ASSERTION(mWasRun, "never run!");
+    }
+
+    static PRInt32 GetGlobalCount() {return gNum;}
+
+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;
+}
+
+static 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*) 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)
+{
+    int retval = 0;
     nsresult rv;
+    
     rv = NS_InitXPCOM(nsnull, nsnull);
     if (NS_FAILED(rv)) return -1;
 
-    rv = TestThreads();
-    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 = TestThreadPools(1, 4, 100);
-    if (NS_FAILED(rv)) return -1;
+        rv = TestThreadPools(1, 4, 100);
+        if (NS_FAILED(rv)) return -1;
 
-    rv = TestThreadPools(4, 16, 100);
-    if (NS_FAILED(rv)) return -1;
+        rv = TestThreadPools(4, 16, 100);
+        if (NS_FAILED(rv)) return -1;
 
-    // this test delays between each request to give threads a chance to 
-    // decide to go away:
-    rv = TestThreadPools(4, 8, 32, PR_MillisecondsToInterval(1000));
-    if (NS_FAILED(rv)) return -1;
+        // this test delays between each request to give threads a chance to 
+        // decide to go away:
+        rv = TestThreadPools(4, 8, 32, PR_MillisecondsToInterval(1000));
+        if (NS_FAILED(rv)) return -1;
+    }
 
     rv = NS_ShutdownXPCOM(nsnull);
     if (NS_FAILED(rv)) return -1;
-    return 0;
+    return retval;
 }