commit 30ad0dd6ad90131cdcc71b8b9c33a17598a25671
author Elliott Hughes <enh@google.com> Tue Jun 07 20:16:26 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 07 20:16:26 2016 +0000
tree c6cacd47ab18669c87ecc6540fcd93b6d84b456e
parent d80d42740d9d2ad532c8445fd4835186c252e6e6
parent f4840507b57db927c3359914649380d53e5bf7bf

Merge "Preliminary cleanup of <sys/cdefs.h>."

benchmarks/semaphore_benchmark.cpp

diff --git a/benchmarks/semaphore_benchmark.cpp b/benchmarks/semaphore_benchmark.cpp
index d260803..b932a2b3 100644
--- a/benchmarks/semaphore_benchmark.cpp
+++ b/benchmarks/semaphore_benchmark.cpp
@@ -96,22 +96,27 @@
     sched_setscheduler(0, SCHED_IDLE, &param);
 
     BM_semaphore_sem_post_running = 1;
+    setup = true;
   }
 
   ~SemaphoreFixture() {
-    sched_setscheduler(0, SCHED_OTHER, &param);
+    if (setup) {
+      // Only do this if the test was actually run.
+      sched_setscheduler(0, SCHED_OTHER, &param);
 
-    if (BM_semaphore_sem_post_running > 0) {
-      BM_semaphore_sem_post_running = 0;
+      if (BM_semaphore_sem_post_running > 0) {
+        BM_semaphore_sem_post_running = 0;
+      }
+      do {
+        sem_post(&semaphore);
+        sched_yield();
+      } while (BM_semaphore_sem_post_running != -1);
     }
-    do {
-      sem_post(&semaphore);
-      sched_yield();
-    } while (BM_semaphore_sem_post_running != -1);
   }
 
   sem_t semaphore;
   sched_param param;
+  bool setup = false;
 };
 
 BENCHMARK_F(SemaphoreFixture, semaphore_sem_post)(benchmark::State& state) {