[compiler-rt] r252815 - [sanitizer coverage] reset global counters in __sanitizer_reset_coverage

[Kostya Serebryany via llvm-commits]

Author: kcc
Date: Wed Nov 11 16:44:25 2015
New Revision: 252815

URL: http://llvm.org/viewvc/llvm-project?rev=252815&view=rev
Log:
[sanitizer coverage] reset global counters in __sanitizer_reset_coverage

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
    compiler-rt/trunk/test/asan/TestCases/coverage-reset.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc?rev=252815&r1=252814&r2=252815&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc Wed Nov 11 16:44:25 2015
@@ -55,6 +55,11 @@ static atomic_uint32_t dump_once_guard;
 static atomic_uintptr_t coverage_counter;
 static atomic_uintptr_t caller_callee_counter;
 
+static void ResetGlobalCounters() {
+  return atomic_store(&coverage_counter, 0, memory_order_relaxed);
+  return atomic_store(&caller_callee_counter, 0, memory_order_relaxed);
+}
+
 // pc_array is the array containing the covered PCs.
 // To make the pc_array thread- and async-signal-safe it has to be large enough.
 // 128M counters "ought to be enough for anybody" (4M on 32-bit).
@@ -924,6 +929,7 @@ void __sanitizer_cov_trace_basic_block(s
 }
 SANITIZER_INTERFACE_ATTRIBUTE
 void __sanitizer_reset_coverage() {
+  ResetGlobalCounters();
   coverage_data.ReinitializeGuards();
   internal_bzero_aligned16(
       coverage_data.data(),

Modified: compiler-rt/trunk/test/asan/TestCases/coverage-reset.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/coverage-reset.cc?rev=252815&r1=252814&r2=252815&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/coverage-reset.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/coverage-reset.cc Wed Nov 11 16:44:25 2015
@@ -42,6 +42,7 @@ int main() {
   assert(IS_POWER_OF_TWO(bar_bit));
 
   __sanitizer_reset_coverage();
+  assert(__sanitizer_get_total_unique_coverage() == 0);
   GET_AND_PRINT_COVERAGE();
   assert(bitset == 0);