Cleanup directory and make minor changes

qqzhang · Nov 2, 2015 · aa39192 · aa39192
1 parent b8024dd
commit aa39192
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 75 deletions.
diff --git a/Makefile b/Makefile
diff --git a/build.yaml b/build.yaml
@@ -752,9 +752,9 @@ libs:
   - test/cpp/util/benchmark_config.h
   src:
   - test/proto/messages.proto
-  - test/proto/perf_tests/perf_control.proto
-  - test/proto/perf_tests/perf_services.proto
-  - test/proto/perf_tests/perf_stats.proto
+  - test/proto/benchmarks/control.proto
+  - test/proto/benchmarks/services.proto
+  - test/proto/benchmarks/stats.proto
   - test/cpp/qps/perf_db.proto
   - test/cpp/qps/client_async.cc
   - test/cpp/qps/client_sync.cc

diff --git a/test/cpp/qps/histogram.h b/test/cpp/qps/histogram.h
@@ -35,7 +35,7 @@
 #define TEST_QPS_HISTOGRAM_H
 
 #include <grpc/support/histogram.h>
-#include "test/proto/perf_tests/perf_stats.grpc.pb.h"
+#include "test/proto/benchmarks/stats.grpc.pb.h"
 
 namespace grpc {
 namespace testing {

diff --git a/test/cpp/qps/perf_db.proto b/test/cpp/qps/perf_db.proto
@@ -29,7 +29,7 @@
 
 syntax = "proto3";
 
-import "test/proto/perf_tests/perf_control.proto";
+import "test/proto/benchmarks/control.proto";
 
 package grpc.testing;
 

diff --git a/test/proto/perf_tests/perf_control.proto → test/proto/benchmarks/control.proto b/test/proto/perf_tests/perf_control.proto → test/proto/benchmarks/control.proto
@@ -31,17 +31,17 @@
 // of unary/streaming requests/responses.
 syntax = "proto3";
 
-import "test/proto/perf_tests/perf_stats.proto";
+import "test/proto/benchmarks/stats.proto";
 
 package grpc.testing;
 
 enum ClientType {
-  SYNCHRONOUS_CLIENT = 0;
+  SYNC_CLIENT = 0;
   ASYNC_CLIENT = 1;
 }
 
 enum ServerType {
-  SYNCHRONOUS_SERVER = 0;
+  SYNC_SERVER = 0;
   ASYNC_SERVER = 1;
 }
 
@@ -73,11 +73,11 @@ message ClosedLoopParams {
 
 message LoadParams {
   oneof load {
-    PoissonParams poisson = 1;
-    UniformParams uniform = 2;
-    DeterministicParams determ = 3;
-    ParetoParams pareto = 4;
-    ClosedLoopParams closed = 5;
+    ClosedLoopParams closed_loop = 1;
+    PoissonParams poisson = 2;
+    UniformParams uniform = 3;
+    DeterministicParams determ = 4;
+    ParetoParams pareto = 5;
   };
 }
 

diff --git a/test/proto/perf_tests/perf_services.proto → test/proto/benchmarks/services.proto b/test/proto/perf_tests/perf_services.proto → test/proto/benchmarks/services.proto
@@ -32,8 +32,7 @@
 syntax = "proto3";
 
 import "test/proto/messages.proto";
-import "test/proto/perf_tests/perf_stats.proto";
-import "test/proto/perf_tests/perf_control.proto";
+import "test/proto/benchmarks/control.proto";
 
 package grpc.testing;
 

diff --git a/test/proto/perf_tests/perf_stats.proto → test/proto/benchmarks/stats.proto b/test/proto/perf_tests/perf_stats.proto → test/proto/benchmarks/stats.proto
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
@@ -14649,14 +14649,14 @@
       "test/cpp/qps/stats.h", 
       "test/cpp/qps/timer.h", 
       "test/cpp/util/benchmark_config.h", 
+      "test/proto/benchmarks/control.grpc.pb.h", 
+      "test/proto/benchmarks/control.pb.h", 
+      "test/proto/benchmarks/services.grpc.pb.h", 
+      "test/proto/benchmarks/services.pb.h", 
+      "test/proto/benchmarks/stats.grpc.pb.h", 
+      "test/proto/benchmarks/stats.pb.h", 
       "test/proto/messages.grpc.pb.h", 
-      "test/proto/messages.pb.h", 
-      "test/proto/perf_tests/perf_control.grpc.pb.h", 
-      "test/proto/perf_tests/perf_control.pb.h", 
-      "test/proto/perf_tests/perf_services.grpc.pb.h", 
-      "test/proto/perf_tests/perf_services.pb.h", 
-      "test/proto/perf_tests/perf_stats.grpc.pb.h", 
-      "test/proto/perf_tests/perf_stats.pb.h"
+      "test/proto/messages.pb.h"
     ], 
     "language": "c++", 
     "name": "qps", 

diff --git a/vsprojects/vcxproj/qps/qps.vcxproj b/vsprojects/vcxproj/qps/qps.vcxproj
@@ -155,29 +155,29 @@
     </ClCompile>
     <ClInclude Include="..\..\..\test\proto\messages.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_control.pb.cc">
+    <ClCompile Include="..\..\..\test\proto\benchmarks\control.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\perf_tests\perf_control.pb.h">
+    <ClInclude Include="..\..\..\test\proto\benchmarks\control.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_control.grpc.pb.cc">
+    <ClCompile Include="..\..\..\test\proto\benchmarks\control.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\perf_tests\perf_control.grpc.pb.h">
+    <ClInclude Include="..\..\..\test\proto\benchmarks\control.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_services.pb.cc">
+    <ClCompile Include="..\..\..\test\proto\benchmarks\services.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\perf_tests\perf_services.pb.h">
+    <ClInclude Include="..\..\..\test\proto\benchmarks\services.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_services.grpc.pb.cc">
+    <ClCompile Include="..\..\..\test\proto\benchmarks\services.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\perf_tests\perf_services.grpc.pb.h">
+    <ClInclude Include="..\..\..\test\proto\benchmarks\services.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_stats.pb.cc">
+    <ClCompile Include="..\..\..\test\proto\benchmarks\stats.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\perf_tests\perf_stats.pb.h">
+    <ClInclude Include="..\..\..\test\proto\benchmarks\stats.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_stats.grpc.pb.cc">
+    <ClCompile Include="..\..\..\test\proto\benchmarks\stats.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\perf_tests\perf_stats.grpc.pb.h">
+    <ClInclude Include="..\..\..\test\proto\benchmarks\stats.grpc.pb.h">
     </ClInclude>
     <ClCompile Include="..\..\..\test\cpp\qps\perf_db.pb.cc">
     </ClCompile>

diff --git a/vsprojects/vcxproj/qps/qps.vcxproj.filters b/vsprojects/vcxproj/qps/qps.vcxproj.filters
@@ -4,14 +4,14 @@
     <ClCompile Include="..\..\..\test\proto\messages.proto">
       <Filter>test\proto</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_control.proto">
-      <Filter>test\proto\perf_tests</Filter>
+    <ClCompile Include="..\..\..\test\proto\benchmarks\control.proto">
+      <Filter>test\proto\benchmarks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_services.proto">
-      <Filter>test\proto\perf_tests</Filter>
+    <ClCompile Include="..\..\..\test\proto\benchmarks\services.proto">
+      <Filter>test\proto\benchmarks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\perf_tests\perf_stats.proto">
-      <Filter>test\proto\perf_tests</Filter>
+    <ClCompile Include="..\..\..\test\proto\benchmarks\stats.proto">
+      <Filter>test\proto\benchmarks</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\test\cpp\qps\perf_db.proto">
       <Filter>test\cpp\qps</Filter>
@@ -99,8 +99,8 @@
     <Filter Include="test\proto">
       <UniqueIdentifier>{44e63a33-67f4-0575-e87a-711a7c9111e2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="test\proto\perf_tests">
-      <UniqueIdentifier>{cf788def-630c-8a5f-9a8c-6abdd500d712}</UniqueIdentifier>
+    <Filter Include="test\proto\benchmarks">
+      <UniqueIdentifier>{4180a094-39b4-e46c-1576-940bfe87d284}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>