Cleanup RunBenchmark code. (#289)

.travis.yml

@@ -65,6 +65,16 @@ matrix:
             - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug
             - LIBCXX_BUILD=1 LIBCXX_SANITIZER=MemoryWithOrigins
             - EXTRA_FLAGS="-stdlib=libc++ -g -O2 -fno-omit-frame-pointer -fsanitize=memory -fsanitize-memory-track-origins"
+        # Clang w/ libc++ and MSAN
+        - compiler: clang
+          addons:
+            apt:
+              packages:
+                clang-3.8
+          env:
+            - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=RelWithDebInfo
+            - LIBCXX_BUILD=1 LIBCXX_SANITIZER=Thread
+            - EXTRA_FLAGS="-stdlib=libc++ -g -O2 -fno-omit-frame-pointer -fsanitize=thread -fno-sanitize-recover=all"
 
 before_script:
     - if [ -n "${LIBCXX_BUILD}" ]; then

src/benchmark_api_internal.h

@@ -27,8 +27,7 @@ struct Benchmark::Instance {
   bool             last_benchmark_instance;
   int              repetitions;
   double           min_time;
-  int              threads;    // Number of concurrent threads to use
-  bool             multithreaded;  // Is benchmark multi-threaded?
+  int              threads;    // Number of concurrent threads to us
 };
 
 bool FindBenchmarksInternal(const std::string& re,

src/benchmark_register.cc

@@ -151,7 +151,6 @@ bool BenchmarkFamilies::FindBenchmarks(
         instance.complexity = family->complexity_;
         instance.complexity_lambda = family->complexity_lambda_;
         instance.threads = num_threads;
-        instance.multithreaded = !(family->thread_counts_.empty());
 
         // Add arguments to instance name
         for (auto const& arg : args) {