Move prefetch codes into its own folder (istio#52)

* Move prefetch codes into its own folder.

* Add prefetch/BUILD.

* Update include quard.

* Update comment to trigger a PR test.

Author: qiwzhang

mixerclient/BUILD

@@ -37,12 +37,9 @@ cc_library(
         "src/signature.h",
         "src/stream_transport.h",
         "src/transport.h",
-        "utils/circular_queue.h",
         "utils/md5.cc",
         "utils/md5.h",
         "utils/status_test_util.h",
-        "utils/time_based_counter.cc",
-        "utils/time_based_counter.h",
     ],
     hdrs = [
         "include/attribute.h",
@@ -128,28 +125,6 @@ cc_test(
     ],
 )
 
-cc_test(
-    name = "circular_queue_test",
-    size = "small",
-    srcs = ["utils/circular_queue_test.cc"],
-    linkstatic = 1,
-    deps = [
-        ":mixer_client_lib",
-        "//external:googletest_main",
-    ],
-)
-
-cc_test(
-    name = "time_based_counter_test",
-    size = "small",
-    srcs = ["utils/time_based_counter_test.cc"],
-    linkstatic = 1,
-    deps = [
-        ":mixer_client_lib",
-        "//external:googletest_main",
-    ],
-)
-
 cc_test(
     name = "cache_key_set_test",
     size = "small",

mixerclient/prefetch/BUILD

@@ -0,0 +1,57 @@
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+licenses(["notice"])
+
+cc_library(
+    name = "quota_prefetch_lib",
+    srcs = [
+        "time_based_counter.cc",
+    ],
+    hdrs = [
+        "circular_queue.h",
+        "time_based_counter.h",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_test(
+    name = "circular_queue_test",
+    size = "small",
+    srcs = ["circular_queue_test.cc"],
+    linkopts = [
+        "-lm",
+        "-lpthread",
+    ],
+    linkstatic = 1,
+    deps = [
+        ":quota_prefetch_lib",
+        "//external:googletest_main",
+    ],
+)
+
+cc_test(
+    name = "time_based_counter_test",
+    size = "small",
+    srcs = ["time_based_counter_test.cc"],
+    linkopts = [
+        "-lm",
+        "-lpthread",
+    ],
+    linkstatic = 1,
+    deps = [
+        ":quota_prefetch_lib",
+        "//external:googletest_main",
+    ],
+)

mixerclient/utils/circular_queue.h renamed to mixerclient/prefetch/circular_queue.h

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef MIXER_CLIENT_UTILS_CIRCULAR_QUEUE_H_
-#define MIXER_CLIENT_UTILS_CIRCULAR_QUEUE_H_
+#ifndef MIXER_CLIENT_PREFETCH_CIRCULAR_QUEUE_H_
+#define MIXER_CLIENT_PREFETCH_CIRCULAR_QUEUE_H_
 
 #include <functional>
 #include <vector>
@@ -94,4 +94,4 @@ void CircularQueue<T>::Iterate(std::function<bool(const T&)> fn) const {
 }  // namespace mixer_client
 }  // namespace istio
 
-#endif  // MIXER_CLIENT_CLIENT_UTILS_CIRCULAR_QUEUE_H_
+#endif  // MIXER_CLIENT_CLIENT_PREFETCH_CIRCULAR_QUEUE_H_

mixerclient/utils/circular_queue_test.cc renamed to mixerclient/prefetch/circular_queue_test.cc

@@ -50,10 +50,10 @@ void TimeBasedCounter::Roll(Tick t) {
   }
 }
 
-void TimeBasedCounter::Inc(Tick t) {
+void TimeBasedCounter::Inc(int n, Tick t) {
   Roll(t);
-  slots_[tail_]++;
-  count_++;
+  slots_[tail_] += n;
+  count_ += n;
 }
 
 int TimeBasedCounter::Count(Tick t) {

mixerclient/utils/time_based_counter.cc renamed to mixerclient/prefetch/time_based_counter.cc

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef MIXER_CLIENT_UTILS_TIME_BASED_COUNTER_H_
-#define MIXER_CLIENT_UTILS_TIME_BASED_COUNTER_H_
+#ifndef MIXER_CLIENT_PREFETCH_TIME_BASED_COUNTER_H_
+#define MIXER_CLIENT_PREFETCH_TIME_BASED_COUNTER_H_
 
 #include <chrono>
 #include <vector>
@@ -36,8 +36,8 @@ class TimeBasedCounter {
   // But for easy unit_test, pass the time in.
   // The input time should be always increasing.
 
-  // Add a count
-  void Inc(Tick t);
+  // Add n count to the counter.
+  void Inc(int n, Tick t);
 
   // Get the count.
   int Count(Tick t);
@@ -58,4 +58,4 @@ class TimeBasedCounter {
 }  // namespace mixer_client
 }  // namespace istio
 
-#endif  // MIXER_CLIENT_CLIENT_UTILS_TIME_BASED_COUNTER_H_
+#endif  // MIXER_CLIENT_CLIENT_PREFETCH_TIME_BASED_COUNTER_H_

mixerclient/utils/time_based_counter.h renamed to mixerclient/prefetch/time_based_counter.h

@@ -27,9 +27,9 @@ std::chrono::time_point<std::chrono::system_clock> FakeTime(int t) {
 
 TEST(TimeBasedCounterTest, Test1) {
   TimeBasedCounter c(3, std::chrono::nanoseconds(3), FakeTime(0));
-  c.Inc(FakeTime(4));
-  c.Inc(FakeTime(5));
-  c.Inc(FakeTime(7));
+  c.Inc(1, FakeTime(4));
+  c.Inc(1, FakeTime(5));
+  c.Inc(1, FakeTime(7));
 
   // Current slots are 6, 7, 8. and 4 and 5 are out.
   ASSERT_EQ(c.Count(FakeTime(8)), 1);