diff options
author | 2017-10-10 22:38:30 -0700 | |
---|---|---|
committer | 2017-10-10 22:38:30 -0700 | |
commit | effa87358986331bd6e09f33f99ef9cac6d85b88 (patch) | |
tree | f115341479c87bd3d13d4e5d12a4f403edff891c | |
parent | 4c2f7025921d07bad72db4ee00749a4fdfd4c2fd (diff) | |
parent | f0a24123389beba7350071d0b20f05ac664b525d (diff) |
Merge branch 'verify' of github.com:ctiller/grpc into verify
-rw-r--r-- | test/core/debug/stats_test.cc | 75 |
1 files changed, 40 insertions, 35 deletions
diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index db9105672e..501581952d 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -88,41 +88,46 @@ class HistogramTest : public ::testing::TestWithParam<int> {}; TEST_P(HistogramTest, IncHistogram) { const int kHistogram = GetParam(); std::vector<std::thread> threads; - int cur_bucket = 0; - auto run = [kHistogram](const std::vector<int>& test_values, int expected_bucket) { - gpr_log(GPR_DEBUG, "expected_bucket:%d nvalues=%" PRIdPTR, expected_bucket, test_values.size()); - for (auto j : test_values) { - Snapshot snapshot; - - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_stats_inc_histogram[kHistogram](&exec_ctx, j); - grpc_exec_ctx_finish(&exec_ctx); - - auto delta = snapshot.delta(); - - EXPECT_EQ(delta.histograms[grpc_stats_histo_start[kHistogram] + - expected_bucket], - 1) - << "\nhistogram:" << kHistogram - << "\nexpected_bucket:" << expected_bucket - << "\nj:" << j; - } - }; - std::vector<int> test_values; - for (int j = -1000; - j < grpc_stats_histo_bucket_boundaries - [kHistogram][grpc_stats_histo_buckets[kHistogram] - 1] + - 1000; - j ++) { - int expected_bucket = FindExpectedBucket(kHistogram, j); - if (cur_bucket != expected_bucket) { - threads.emplace_back([test_values, run, cur_bucket]() { run(test_values, cur_bucket); }); - cur_bucket = expected_bucket; - test_values.clear(); - } - test_values.push_back(j); - } - run(test_values, cur_bucket); + int cur_bucket = 0; + auto run = [kHistogram](const std::vector<int>& test_values, + int expected_bucket) { + gpr_log(GPR_DEBUG, "expected_bucket:%d nvalues=%" PRIdPTR, expected_bucket, + test_values.size()); + for (auto j : test_values) { + Snapshot snapshot; + + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_stats_inc_histogram[kHistogram](&exec_ctx, j); + grpc_exec_ctx_finish(&exec_ctx); + + auto delta = snapshot.delta(); + + EXPECT_EQ( + delta + .histograms[grpc_stats_histo_start[kHistogram] + expected_bucket], + 1) + << "\nhistogram:" << kHistogram + << "\nexpected_bucket:" << expected_bucket << "\nj:" << j; + } + }; + std::vector<int> test_values; + for (int j = -1000; + j < + grpc_stats_histo_bucket_boundaries[kHistogram] + [grpc_stats_histo_buckets[kHistogram] - + 1] + + 1000; + j++) { + int expected_bucket = FindExpectedBucket(kHistogram, j); + if (cur_bucket != expected_bucket) { + threads.emplace_back( + [test_values, run, cur_bucket]() { run(test_values, cur_bucket); }); + cur_bucket = expected_bucket; + test_values.clear(); + } + test_values.push_back(j); + } + run(test_values, cur_bucket); for (auto& t : threads) { t.join(); } |