From 7914e62d48b8209e9d621f83a6ec07c863a48ec2 Mon Sep 17 00:00:00 2001
From: vjpai <vpai@google.com>
Date: Fri, 12 Feb 2016 15:57:08 -0800
Subject: [PATCH] Attack of the const police. I also added some unrequested
 const's

---
 test/cpp/qps/client.h        | 13 ++++++-------
 test/cpp/qps/client_async.cc |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h
index 6962d336dd7..61d99669b81 100644
--- a/test/cpp/qps/client.h
+++ b/test/cpp/qps/client.h
@@ -200,7 +200,7 @@ class Client {
       closed_loop_ = false;
       // set up interarrival timer according to random dist
       interarrival_timer_.init(*random_dist, num_threads);
-      auto now = gpr_now(GPR_CLOCK_MONOTONIC);
+      const auto now = gpr_now(GPR_CLOCK_MONOTONIC);
       for (size_t i = 0; i < num_threads; i++) {
         next_time_.push_back(gpr_time_add(
             now,
@@ -210,7 +210,7 @@ class Client {
   }
 
   gpr_timespec NextIssueTime(int thread_idx) {
-    gpr_timespec result = next_time_[thread_idx];
+    const gpr_timespec result = next_time_[thread_idx];
     next_time_[thread_idx] =
         gpr_time_add(next_time_[thread_idx],
                      gpr_time_from_nanos(interarrival_timer_.next(thread_idx),
@@ -289,7 +289,7 @@ class Client {
     Histogram* new_stats_;
     Histogram histogram_;
     Client* client_;
-    size_t idx_;
+    const size_t idx_;
     std::thread impl_;
   };
 
@@ -306,9 +306,8 @@ class ClientImpl : public Client {
   ClientImpl(const ClientConfig& config,
              std::function<std::unique_ptr<StubType>(std::shared_ptr<Channel>)>
                  create_stub)
-      : channels_(config.client_channels()), create_stub_(create_stub) {
-    cores_ = LimitCores(config.core_list().data(), config.core_list_size());
-
+    : cores_(LimitCores(config.core_list().data(), config.core_list_size())),
+      channels_(config.client_channels()), create_stub_(create_stub) {
     for (int i = 0; i < config.client_channels(); i++) {
       channels_[i].init(config.server_targets(i % config.server_targets_size()),
                         config, create_stub_);
@@ -320,7 +319,7 @@ class ClientImpl : public Client {
   virtual ~ClientImpl() {}
 
  protected:
-  int cores_;
+  const int cores_;
   RequestType request_;
 
   class ClientChannelInfo {
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc
index b02d399fc68..9e8767d1033 100644
--- a/test/cpp/qps/client_async.cc
+++ b/test/cpp/qps/client_async.cc
@@ -222,7 +222,7 @@ class AsyncClient : public ClientImpl<StubType, RequestType> {
   }
 
  protected:
-  int num_async_threads_;
+  const int num_async_threads_;
 
  private:
   int NumThreads(const ClientConfig& config) {