Changeset 72571 in vbox for trunk/src/VBox/Runtime/common/fuzz/fuzz-observer.cpp

Timestamp:

Jun 15, 2018 8:36:17 PM (7 years ago)

Author:

vboxsync

Message:

Runtime/RTFuzz: Started to extend the master command to provide a network interface for controlling the fuzzing process. The interface uses JSON requests and responses to control the fuzzing process, like creating a new fuzzing run and suspending, resuming and stopping it. The JSON request contains everything required (except for the binary itself) for easier control of multiple masters on different hosts via a central control mechanism (later integration into the validation kit).

File:

• trunk/src/VBox/Runtime/common/fuzz/fuzz-observer.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/fuzz/fuzz-observer.cpp

@@ -880 +880 @@
 
         if (RT_SUCCESS(rc))
+        {
             pThis->paObsThreads = paObsThreads;
+            pThis->cThreads     = cThreads;
+        }
         else
             RTMemFree(paObsThreads);
@@ -957 +960 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
 
-    /* Wait for the master thread to terminate. */
-    if (pThis->hThreadGlobal != NIL_RTTHREAD)
-    {
-        ASMAtomicXchgBool(&pThis->fShutdown, true);
-        RTThreadWait(pThis->hThreadGlobal, RT_INDEFINITE_WAIT, NULL);
-    }
-
-    /* Clean up the workers. */
-    if (pThis->paObsThreads)
-    {
-        for (unsigned i = 0; i < pThis->cThreads; i++)
-        {
-            PRTFUZZOBSTHRD pThrd = &pThis->paObsThreads[i];
-            ASMAtomicXchgBool(&pThrd->fShutdown, true);
-            RTThreadWait(pThrd->hThread, RT_INDEFINITE_WAIT, NULL);
-            if (pThrd->hFuzzInput)
-                RTFuzzInputRelease(pThrd->hFuzzInput);
-        }
-        RTMemFree(pThis->paObsThreads);
-        pThis->paObsThreads = NULL;
-    }
+    RTFuzzObsExecStop(hFuzzObs);
 
     /* Clean up all acquired resources. */
@@ -1145 +1128 @@
 RTDECL(int) RTFuzzObsExecStop(RTFUZZOBS hFuzzObs)
 {
-    RT_NOREF(hFuzzObs);
-    return VERR_NOT_IMPLEMENTED;
-}
-
+    PRTFUZZOBSINT pThis = hFuzzObs;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+
+    /* Wait for the master thread to terminate. */
+    if (pThis->hThreadGlobal != NIL_RTTHREAD)
+    {
+        ASMAtomicXchgBool(&pThis->fShutdown, true);
+        RTSemEventSignal(pThis->hEvtGlobal);
+        RTThreadWait(pThis->hThreadGlobal, RT_INDEFINITE_WAIT, NULL);
+        pThis->hThreadGlobal = NIL_RTTHREAD;
+    }
+
+    /* Destroy the workers. */
+    if (pThis->paObsThreads)
+    {
+        for (unsigned i = 0; i < pThis->cThreads; i++)
+        {
+            PRTFUZZOBSTHRD pThrd = &pThis->paObsThreads[i];
+            ASMAtomicXchgBool(&pThrd->fShutdown, true);
+            RTThreadUserSignal(pThrd->hThread);
+            RTThreadWait(pThrd->hThread, RT_INDEFINITE_WAIT, NULL);
+            if (pThrd->hFuzzInput)
+                RTFuzzInputRelease(pThrd->hFuzzInput);
+        }
+
+        RTMemFree(pThis->paObsThreads);
+        pThis->paObsThreads = NULL;
+        pThis->cThreads     = 0;
+    }
+
+    RTSemEventDestroy(pThis->hEvtGlobal);
+    pThis->hEvtGlobal = NIL_RTSEMEVENT;
+    return VINF_SUCCESS;
+}
+