commit d46aa71fdad655f9dc2e33e0fbb96a776a55d095
author Michal Karpinski <mkarpinski@google.com> Thu Oct 13 10:04:36 2016 +0100
committer Lorenzo Colitti <lorenzo@google.com> Thu Oct 27 18:15:49 2016 +0900
tree badea81919189b650db08ee93a8b383ef6cca4be
parent 69943802dcf2e1005b9d233f0ef97698d0e87332

Fixing the netd benchmark

Bug: 29748723

(cherry picked from commit fe7f72b4709c2b735287d817b6f1277e2f40b11c)

Change-Id: Ic586c18f0a13cc2dbeb93193a4c4e374ed9a08cc

tests/benchmarks/dns_benchmark.cpp

diff --git a/tests/benchmarks/dns_benchmark.cpp b/tests/benchmarks/dns_benchmark.cpp
index 4307861..7cfd5a5 100644
--- a/tests/benchmarks/dns_benchmark.cpp
+++ b/tests/benchmarks/dns_benchmark.cpp
@@ -28,8 +28,10 @@
 
 #include "dns_responder_client.h"
 #include "NetdClient.h"
+#include "android/net/metrics/INetdEventListener.h"
 
 using android::base::StringPrintf;
+using android::net::metrics::INetdEventListener;
 
 constexpr int MIN_THREADS = 1;
 constexpr int MAX_THREADS = 32;
@@ -126,7 +128,7 @@
 
 // DNS calls without any metrics logged or sent.
 BENCHMARK_DEFINE_F(DnsFixture, getaddrinfo_log_nothing)(benchmark::State& state) {
-    benchmark_at_reporting_level(state, 0);
+    benchmark_at_reporting_level(state, INetdEventListener::REPORTING_LEVEL_NONE);
 }
 BENCHMARK_REGISTER_F(DnsFixture, getaddrinfo_log_nothing)
     ->ThreadRange(MIN_THREADS, MAX_THREADS)
@@ -134,7 +136,7 @@
 
 // DNS calls with metrics only (netId, latency, return code) sent to the system server.
 BENCHMARK_DEFINE_F(DnsFixture, getaddrinfo_log_metrics)(benchmark::State& state) {
-    benchmark_at_reporting_level(state, 1);
+    benchmark_at_reporting_level(state, INetdEventListener::REPORTING_LEVEL_METRICS);
 }
 BENCHMARK_REGISTER_F(DnsFixture, getaddrinfo_log_metrics)
     ->ThreadRange(MIN_THREADS, MAX_THREADS)
@@ -142,7 +144,7 @@
 
 // DNS calls with all information logged and sent to the system server.
 BENCHMARK_DEFINE_F(DnsFixture, getaddrinfo_log_everything)(benchmark::State& state) {
-    benchmark_at_reporting_level(state, 2);
+    benchmark_at_reporting_level(state, INetdEventListener::REPORTING_LEVEL_FULL);
 }
 BENCHMARK_REGISTER_F(DnsFixture, getaddrinfo_log_everything)
     ->ThreadRange(MIN_THREADS, MAX_THREADS)