Simplified sync test

(cherry picked from commit 18ceebb774312b013172839bebb176017fc719b3)

diff --git a/winpr/libwinpr/synch/test/TestSynchMultipleThreads.c b/winpr/libwinpr/synch/test/TestSynchMultipleThreads.c
index 0fa567d..b0bf8f2 100644 (file)
--- a/winpr/libwinpr/synch/test/TestSynchMultipleThreads.c
+++ b/winpr/libwinpr/synch/test/TestSynchMultipleThreads.c
@@ -5,11 +5,12 @@
 #include <winpr/synch.h>
 #include <winpr/thread.h>
 
+#define THREADS 24
+
 static DWORD WINAPI test_thread(LPVOID arg)
 {
-       long timeout = rand();
-       timeout %= 1000;
-       timeout += 100;
+       long timeout = 100 + (rand() % 1000);
+       WINPR_UNUSED(arg);
        Sleep(timeout);
        ExitThread(0);
        return 0;
@@ -25,7 +26,7 @@ static int start_threads(DWORD count, HANDLE* threads)
 
                if (!threads[i])
                {
-                       printf("CreateThread [%" PRIu32 "] failure\n", i);
+                       fprintf(stderr, "%s: CreateThread [%" PRIu32 "] failure\n", __FUNCTION__, i);
                        return -1;
                }
        }
@@ -41,7 +42,7 @@ static int close_threads(DWORD count, HANDLE* threads)
        {
                if (!CloseHandle(threads[i]))
                {
-                       printf("CloseHandle [%" PRIu32 "] failure\n", i);
+                       fprintf(stderr, "%s: CloseHandle [%" PRIu32 "] failure\n", __FUNCTION__, i);
                        return -1;
                }
        }
@@ -49,111 +50,194 @@ static int close_threads(DWORD count, HANDLE* threads)
        return 0;
 }
 
-int TestSynchMultipleThreads(int argc, char* argv[])
+static BOOL TestWaitForAll(void)
 {
-#define THREADS 24
-       DWORD rc = 0, ev, i;
+       BOOL rc = FALSE;
+       DWORD ret;
        HANDLE threads[THREADS];
-
        /* WaitForAll, timeout */
        if (start_threads(THREADS, threads))
-               return 1;
+       {
+               fprintf(stderr, "%s: start_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
-       if (WaitForMultipleObjects(THREADS, threads, TRUE, 50) != WAIT_TIMEOUT)
+       ret = WaitForMultipleObjects(THREADS, threads, TRUE, 50);
+       if (ret != WAIT_TIMEOUT)
        {
-               printf("WaitForMultipleObjects bWaitAll, timeout 50 failed\n");
-               rc = 2;
+               fprintf(stderr, "%s: WaitForMultipleObjects bWaitAll, timeout 50 failed, ret=%d\n",
+                       __FUNCTION__, ret);
+               goto fail;
        }
 
        if (WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE) != WAIT_OBJECT_0)
        {
-               printf("WaitForMultipleObjects bWaitAll, INFINITE failed\n");
-               rc = 3;
+               fprintf(stderr, "%s: WaitForMultipleObjects bWaitAll, INFINITE failed\n", __FUNCTION__);
+               goto fail;
        }
 
        if (close_threads(THREADS, threads))
-               return 4;
+       {
+               fprintf(stderr, "%s: close_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
-       /* WaitOne, infinite */
-       if (rc)
-               return rc;
+       rc = TRUE;
+fail:
+       return rc;
+}
 
+static BOOL TestWaitOne(void)
+{
+       BOOL rc = FALSE;
+       DWORD ret;
+       HANDLE threads[THREADS];
+       /* WaitForAll, timeout */
        if (start_threads(THREADS, threads))
-               return 5;
-
-       ev = WaitForMultipleObjects(THREADS, threads, FALSE, INFINITE);
+       {
+               fprintf(stderr, "%s: start_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
-       if (ev > (WAIT_OBJECT_0 + THREADS))
+       ret = WaitForMultipleObjects(THREADS, threads, FALSE, INFINITE);
+       if (ret > (WAIT_OBJECT_0 + THREADS))
        {
-               printf("WaitForMultipleObjects INFINITE failed\n");
-               rc = 6;
+               fprintf(stderr, "%s: WaitForMultipleObjects INFINITE failed\n", __FUNCTION__);
+               goto fail;
        }
 
        if (WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE) != WAIT_OBJECT_0)
        {
-               printf("WaitForMultipleObjects bWaitAll, INFINITE failed\n");
-               rc = 7;
+               fprintf(stderr, "%s: WaitForMultipleObjects bWaitAll, INFINITE failed\n", __FUNCTION__);
+               goto fail;
        }
 
        if (close_threads(THREADS, threads))
-               return 8;
+       {
+               fprintf(stderr, "%s: close_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
-       if (rc)
-               return rc;
+       rc = TRUE;
+fail:
+       return rc;
+}
 
-       /* WaitOne, timeout */
+static BOOL TestWaitOneTimeout(void)
+{
+       BOOL rc = FALSE;
+       DWORD ret;
+       HANDLE threads[THREADS];
+       /* WaitForAll, timeout */
        if (start_threads(THREADS, threads))
-               return 9;
+       {
+               fprintf(stderr, "%s: start_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
-       if (WaitForMultipleObjects(THREADS, threads, FALSE, 50) != WAIT_TIMEOUT)
+       ret = WaitForMultipleObjects(THREADS, threads, FALSE, 50);
+       if (ret != WAIT_TIMEOUT)
        {
-               printf("WaitForMultipleObjects timeout 50 failed\n");
-               rc = 10;
+               fprintf(stderr, "%s: WaitForMultipleObjects timeout 50 failed, ret=%d\n", __FUNCTION__,
+                       ret);
+               goto fail;
        }
 
        if (WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE) != WAIT_OBJECT_0)
        {
-               printf("WaitForMultipleObjects bWaitAll, INFINITE failed\n");
-               rc = 11;
+               fprintf(stderr, "%s: WaitForMultipleObjects bWaitAll, INFINITE failed\n", __FUNCTION__);
+               goto fail;
        }
 
        if (close_threads(THREADS, threads))
-               return 12;
+       {
+               fprintf(stderr, "%s: close_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
-       if (rc)
-               return 13;
+       rc = TRUE;
+fail:
+       return rc;
+}
 
-       /* WaitOne, timeout, multiple joins */
+static BOOL TestWaitOneTimeoutMultijoin(void)
+{
+       BOOL rc = FALSE;
+       DWORD ret, i;
+       HANDLE threads[THREADS];
+       /* WaitForAll, timeout */
        if (start_threads(THREADS, threads))
-               return 14;
+       {
+               fprintf(stderr, "%s: start_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
        for (i = 0; i < THREADS; i++)
        {
-               if (WaitForMultipleObjects(THREADS, threads, FALSE, 0) != WAIT_TIMEOUT)
+               ret = WaitForMultipleObjects(THREADS, threads, FALSE, 0);
+               if (ret != WAIT_TIMEOUT)
                {
-                       printf("WaitForMultipleObjects timeout 50 failed\n");
-                       rc = 15;
+                       fprintf(stderr, "%s: WaitForMultipleObjects timeout 50 failed, ret=%d\n", __FUNCTION__,
+                               ret);
+                       goto fail;
                }
        }
 
        if (WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE) != WAIT_OBJECT_0)
        {
-               printf("WaitForMultipleObjects bWaitAll, INFINITE failed\n");
-               rc = 16;
+               fprintf(stderr, "%s: WaitForMultipleObjects bWaitAll, INFINITE failed\n", __FUNCTION__);
+               goto fail;
        }
 
        if (close_threads(THREADS, threads))
-               rc = 17;
+       {
+               fprintf(stderr, "%s: close_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
-       if (rc)
-               return rc;
+       rc = TRUE;
+fail:
+       return rc;
+}
 
-       /* Thread detach test */
+static BOOL TestDetach(void)
+{
+       HANDLE threads[THREADS];
+       /* WaitForAll, timeout */
        if (start_threads(THREADS, threads))
-               return 18;
+       {
+               fprintf(stderr, "%s: start_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
 
        if (close_threads(THREADS, threads))
-               return 19;
+       {
+               fprintf(stderr, "%s: close_threads failed\n", __FUNCTION__);
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+int TestSynchMultipleThreads(int argc, char* argv[])
+{
+       WINPR_UNUSED(argc);
+       WINPR_UNUSED(argv);
+
+       if (!TestWaitForAll())
+               return -1;
+
+       if (!TestWaitOne())
+               return -2;
+
+       if (!TestWaitOneTimeout())
+               return -3;
+
+       if (!TestWaitOneTimeoutMultijoin())
+               return -4;
+
+       if (!TestDetach())
+               return -5;
 
        return 0;
 }