Changeset 43879 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Nov 15, 2012 2:49:23 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82091

Message:

Extended RTOnce with termination cleanups. (Changes existing structures and functions.)

File:

• trunk/src/VBox/Runtime/testcase/tstOnce.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/testcase/tstOnce.cpp

@@ -49 +49 @@
 
 
-static DECLCALLBACK(int) Once1CB(void *pvUser1, void *pvUser2)
+static DECLCALLBACK(int) Once1CB(void *pvUser)
 {
     if (g_fOnceCB1)
         return VERR_WRONG_ORDER;
-    if (pvUser1 != (void *)1 || pvUser2 != (void *)42)
+    if (pvUser != (void *)1)
     {
-        RTPrintf("tstOnce: ERROR - Once1CB: pvUser1=%p pvUser2=%p!\n", pvUser1, pvUser2);
+        RTPrintf("tstOnce: ERROR - Once1CB: pvUser=%p!\n", pvUser);
         g_cErrors++;
         return VERR_INVALID_PARAMETER;
@@ -63 +63 @@
 
 
-static DECLCALLBACK(int) Once2CB(void *pvUser1, void *pvUser2)
+static DECLCALLBACK(int) Once2CB(void *pvUser)
 {
     if (ASMAtomicIncU32(&g_cOnce2CB) != 1)
@@ -71 +71 @@
         return VERR_WRONG_ORDER;
     }
-    if (pvUser1 != (void *)42 || pvUser2 != (void *)1)
+    if (pvUser != (void *)42)
     {
-        RTPrintf("tstOnce: ERROR - Once2CB: pvUser1=%p pvUser2=%p!\n", pvUser1, pvUser2);
+        RTPrintf("tstOnce: ERROR - Once2CB: pvUser=%p!\n", pvUser);
         g_cErrors++;
         return VERR_INVALID_PARAMETER;
@@ -90 +90 @@
     if (RT_FAILURE(rc))
         return rc;
-    rc = RTOnce(&g_Once2, Once2CB, (void *)42, (void *)1);
+    rc = RTOnce(&g_Once2, Once2CB, (void *)42);
     if (RT_SUCCESS(rc))
     {
@@ -113 +113 @@
     RTONCE Once1 = RTONCE_INITIALIZER;
     g_fOnceCB1 = false;
-    int rc = RTOnce(&Once1, Once1CB, (void *)1, (void *)42);
+    int rc = RTOnce(&Once1, Once1CB, (void *)1);
     if (rc != VINF_SUCCESS)
         RTPrintf("tstOnce: ERROR - Once1, 1 failed, rc=%Rrc\n", rc);
     g_fOnceCB1 = false;
-    rc = RTOnce(&Once1, Once1CB, (void *)1, (void *)42);
+    rc = RTOnce(&Once1, Once1CB, (void *)1);
     if (rc != VINF_SUCCESS)
         RTPrintf("tstOnce: ERROR - Once1, 2 failed, rc=%Rrc\n", rc);