commit 76ecd5e960e8d28cf5d77a4d31cc62f33f421ce6
author Robert Swiecki <swiecki@google.com> Wed Mar 16 14:57:03 2016 +0100
committer Robert Swiecki <swiecki@google.com> Wed Mar 16 14:57:03 2016 +0100
tree 109a259d7d26fc54f5e88c20fcbdc33bc9a48148
parent f3a5f6ae3e05b4fd06531aa870ae2f6bb3df7af4

Introduce scoped mutexes

fuzz.c

diff --git a/fuzz.c b/fuzz.c
index 2de815f..b55ce36 100644
--- a/fuzz.c
+++ b/fuzz.c
@@ -161,8 +161,7 @@
     struct dynfile_t *dynfile;
 
     {
-        MX_LOCK(&hfuzz->dynfileq_mutex);
-        DEFER(MX_UNLOCK(&hfuzz->dynfileq_mutex));
+        MX_SCOPED_LOCK(&hfuzz->dynfileq_mutex);
 
         if (hfuzz->dynfileqCnt == 0) {
             LOG_F("The dynamic file corpus is empty. Apparently, the initial fuzzing of the "
@@ -411,8 +410,7 @@
          fuzzer->hwCnts.cpuInstrCnt, hfuzz->hwCnts.cpuInstrCnt, fuzzer->hwCnts.cpuBranchCnt,
          hfuzz->hwCnts.cpuBranchCnt, fuzzer->hwCnts.bbCnt, hfuzz->hwCnts.bbCnt);
 
-    MX_LOCK(&hfuzz->dynfileq_mutex);
-    DEFER(MX_UNLOCK(&hfuzz->dynfileq_mutex));
+    MX_SCOPED_LOCK(&hfuzz->dynfileq_mutex);
 
     int64_t diff0 = hfuzz->hwCnts.cpuInstrCnt - fuzzer->hwCnts.cpuInstrCnt;
     int64_t diff1 = hfuzz->hwCnts.cpuBranchCnt - fuzzer->hwCnts.cpuBranchCnt;
@@ -443,8 +441,7 @@
          hfuzz->sanCovCnts.iDsoCnt, fuzzer->sanCovCnts.hitBBCnt, fuzzer->sanCovCnts.iDsoCnt,
          fuzzer->sanCovCnts.newBBCnt);
 
-    MX_LOCK(&hfuzz->dynfileq_mutex);
-    DEFER(MX_UNLOCK(&hfuzz->dynfileq_mutex));
+    MX_SCOPED_LOCK(&hfuzz->dynfileq_mutex);
 
     /*
      * Keep mutated seed if: