Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move qpstest.proto to a common area (test/proto) instead of test/cpp/qps

Browse Source
pull/3881/head
vjpai 9 years ago
parent 627f98454c
commit 0cc1341199
17 changed files with 50 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      Makefile
  2. 2
      build.yaml
  3. 2
      test/cpp/qps/client.h
  4. 2
      test/cpp/qps/client_async.cc
  5. 2
      test/cpp/qps/client_sync.cc
  6. 2
      test/cpp/qps/driver.h
  7. 2
      test/cpp/qps/histogram.h
  8. 2
      test/cpp/qps/perf_db.proto
  9. 2
      test/cpp/qps/qps_worker.cc
  10. 2
      test/cpp/qps/report.h
  11. 2
      test/cpp/qps/server.h
  12. 2
      test/cpp/qps/server_async.cc
  13. 2
      test/cpp/qps/server_sync.cc
  14. 0
      test/proto/qpstest.proto
  15. 6
      tools/run_tests/sources_and_headers.json
  16. 8
      vsprojects/vcxproj/qps/qps.vcxproj
  17. 7
      vsprojects/vcxproj/qps/qps.vcxproj.filters

52
Makefile
Unescape View File

@ -3510,21 +3510,6 @@ $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc: test/cpp/qps/perf_db.proto $(PROTOBUF
$(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $< $(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $<
endif endif
ifeq ($(NO_PROTOC),true)
$(GENDIR)/test/cpp/qps/qpstest.pb.cc: protoc_dep_error
$(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc: protoc_dep_error
else
$(GENDIR)/test/cpp/qps/qpstest.pb.cc: test/cpp/qps/qpstest.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
$(E) "[PROTOC] Generating protobuf CC file from $<"
$(Q) mkdir -p `dirname $@`
$(Q) $(PROTOC) --cpp_out=$(GENDIR) $<
$(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc: test/cpp/qps/qpstest.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
$(E) "[GRPC] Generating gRPC's protobuf service CC file from $<"
$(Q) mkdir -p `dirname $@`
$(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $<
endif
ifeq ($(NO_PROTOC),true) ifeq ($(NO_PROTOC),true)
$(GENDIR)/test/cpp/util/echo.pb.cc: protoc_dep_error $(GENDIR)/test/cpp/util/echo.pb.cc: protoc_dep_error
$(GENDIR)/test/cpp/util/echo.grpc.pb.cc: protoc_dep_error $(GENDIR)/test/cpp/util/echo.grpc.pb.cc: protoc_dep_error
@ -3600,6 +3585,21 @@ $(GENDIR)/test/proto/messages.grpc.pb.cc: test/proto/messages.proto $(PROTOBUF_D
$(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $< $(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $<
endif endif
ifeq ($(NO_PROTOC),true)
$(GENDIR)/test/proto/qpstest.pb.cc: protoc_dep_error
$(GENDIR)/test/proto/qpstest.grpc.pb.cc: protoc_dep_error
else
$(GENDIR)/test/proto/qpstest.pb.cc: test/proto/qpstest.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
$(E) "[PROTOC] Generating protobuf CC file from $<"
$(Q) mkdir -p `dirname $@`
$(Q) $(PROTOC) --cpp_out=$(GENDIR) $<
$(GENDIR)/test/proto/qpstest.grpc.pb.cc: test/proto/qpstest.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
$(E) "[GRPC] Generating gRPC's protobuf service CC file from $<"
$(Q) mkdir -p `dirname $@`
$(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $<
endif
ifeq ($(NO_PROTOC),true) ifeq ($(NO_PROTOC),true)
$(GENDIR)/test/proto/test.pb.cc: protoc_dep_error $(GENDIR)/test/proto/test.pb.cc: protoc_dep_error
$(GENDIR)/test/proto/test.grpc.pb.cc: protoc_dep_error $(GENDIR)/test/proto/test.grpc.pb.cc: protoc_dep_error
@ -5187,7 +5187,7 @@ $(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o: $(GENDIR)/test/proto/empty.pb.cc
LIBQPS_SRC = \ LIBQPS_SRC = \
$(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc \ $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc \
$(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc \ $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc \
test/cpp/qps/client_async.cc \ test/cpp/qps/client_async.cc \
test/cpp/qps/client_sync.cc \ test/cpp/qps/client_sync.cc \
@ -5242,16 +5242,16 @@ ifneq ($(NO_DEPS),true)
-include $(LIBQPS_OBJS:.o=.dep) -include $(LIBQPS_OBJS:.o=.dep)
endif endif
endif endif
$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/qps/perf_db_client.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/perf_db_client.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
$(OBJDIR)/$(CONFIG)/test/cpp/util/benchmark_config.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc $(OBJDIR)/$(CONFIG)/test/cpp/util/benchmark_config.o: $(GENDIR)/test/proto/qpstest.pb.cc $(GENDIR)/test/proto/qpstest.grpc.pb.cc $(GENDIR)/test/cpp/qps/perf_db.pb.cc $(GENDIR)/test/cpp/qps/perf_db.grpc.pb.cc
LIBGRPC_CSHARP_EXT_SRC = \ LIBGRPC_CSHARP_EXT_SRC = \

2
build.yaml
Unescape View File

@ -747,7 +747,7 @@ libs:
- test/cpp/qps/timer.h - test/cpp/qps/timer.h
- test/cpp/util/benchmark_config.h - test/cpp/util/benchmark_config.h
src: src:
- test/cpp/qps/qpstest.proto - test/proto/qpstest.proto
- test/cpp/qps/perf_db.proto - test/cpp/qps/perf_db.proto
- test/cpp/qps/client_async.cc - test/cpp/qps/client_async.cc
- test/cpp/qps/client_sync.cc - test/cpp/qps/client_sync.cc

2
test/cpp/qps/client.h
Unescape View File

@ -40,7 +40,7 @@
#include "test/cpp/qps/histogram.h" #include "test/cpp/qps/histogram.h"
#include "test/cpp/qps/interarrival.h" #include "test/cpp/qps/interarrival.h"
#include "test/cpp/qps/timer.h" #include "test/cpp/qps/timer.h"
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
#include "test/cpp/util/create_test_channel.h" #include "test/cpp/util/create_test_channel.h"
namespace grpc { namespace grpc {

2
test/cpp/qps/client_async.cc
Unescape View File

@ -48,7 +48,7 @@
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <grpc++/client_context.h> #include <grpc++/client_context.h>
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
#include "test/cpp/qps/timer.h" #include "test/cpp/qps/timer.h"
#include "test/cpp/qps/client.h" #include "test/cpp/qps/client.h"
#include "test/cpp/util/create_test_channel.h" #include "test/cpp/util/create_test_channel.h"

2
test/cpp/qps/client_sync.cc
Unescape View File

@ -54,7 +54,7 @@
#include "test/cpp/util/create_test_channel.h" #include "test/cpp/util/create_test_channel.h"
#include "test/cpp/qps/client.h" #include "test/cpp/qps/client.h"
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
#include "test/cpp/qps/histogram.h" #include "test/cpp/qps/histogram.h"
#include "test/cpp/qps/interarrival.h" #include "test/cpp/qps/interarrival.h"
#include "test/cpp/qps/timer.h" #include "test/cpp/qps/timer.h"

2
test/cpp/qps/driver.h
Unescape View File

@ -37,7 +37,7 @@
#include <memory> #include <memory>
#include "test/cpp/qps/histogram.h" #include "test/cpp/qps/histogram.h"
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
namespace grpc { namespace grpc {
namespace testing { namespace testing {

2
test/cpp/qps/histogram.h
Unescape View File

@ -35,7 +35,7 @@
#define TEST_QPS_HISTOGRAM_H #define TEST_QPS_HISTOGRAM_H
#include <grpc/support/histogram.h> #include <grpc/support/histogram.h>
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
namespace grpc { namespace grpc {
namespace testing { namespace testing {

2
test/cpp/qps/perf_db.proto
Unescape View File

@ -29,7 +29,7 @@
syntax = "proto3"; syntax = "proto3";
import "test/cpp/qps/qpstest.proto"; import "test/proto/qpstest.proto";
package grpc.testing; package grpc.testing;

2
test/cpp/qps/qps_worker.cc
Unescape View File

@ -52,7 +52,7 @@
#include <grpc++/security/server_credentials.h> #include <grpc++/security/server_credentials.h>
#include "test/core/util/grpc_profiler.h" #include "test/core/util/grpc_profiler.h"
#include "test/cpp/qps/qpstest.pb.h" #include "test/proto/qpstest.pb.h"
#include "test/cpp/qps/client.h" #include "test/cpp/qps/client.h"
#include "test/cpp/qps/server.h" #include "test/cpp/qps/server.h"
#include "test/cpp/util/create_test_channel.h" #include "test/cpp/util/create_test_channel.h"

2
test/cpp/qps/report.h
Unescape View File

@ -41,7 +41,7 @@
#include <grpc++/support/config.h> #include <grpc++/support/config.h>
#include "test/cpp/qps/driver.h" #include "test/cpp/qps/driver.h"
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
#include "test/cpp/qps/perf_db_client.h" #include "test/cpp/qps/perf_db_client.h"
namespace grpc { namespace grpc {

2
test/cpp/qps/server.h
Unescape View File

@ -35,7 +35,7 @@
#define TEST_QPS_SERVER_H #define TEST_QPS_SERVER_H
#include "test/cpp/qps/timer.h" #include "test/cpp/qps/timer.h"
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
namespace grpc { namespace grpc {
namespace testing { namespace testing {

2
test/cpp/qps/server_async.cc
Unescape View File

@ -49,7 +49,7 @@
#include <grpc++/security/server_credentials.h> #include <grpc++/security/server_credentials.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
#include "test/cpp/qps/server.h" #include "test/cpp/qps/server.h"
namespace grpc { namespace grpc {

2
test/cpp/qps/server_sync.cc
Unescape View File

@ -43,7 +43,7 @@
#include <grpc++/server_context.h> #include <grpc++/server_context.h>
#include <grpc++/security/server_credentials.h> #include <grpc++/security/server_credentials.h>
#include "test/cpp/qps/qpstest.grpc.pb.h" #include "test/proto/qpstest.grpc.pb.h"
#include "test/cpp/qps/server.h" #include "test/cpp/qps/server.h"
#include "test/cpp/qps/timer.h" #include "test/cpp/qps/timer.h"

0
test/cpp/qps/qpstest.proto → test/proto/qpstest.proto
Unescape View File

6
tools/run_tests/sources_and_headers.json
Unescape View File

@ -13645,13 +13645,13 @@
"test/cpp/qps/perf_db.pb.h", "test/cpp/qps/perf_db.pb.h",
"test/cpp/qps/perf_db_client.h", "test/cpp/qps/perf_db_client.h",
"test/cpp/qps/qps_worker.h", "test/cpp/qps/qps_worker.h",
"test/cpp/qps/qpstest.grpc.pb.h",
"test/cpp/qps/qpstest.pb.h",
"test/cpp/qps/report.h", "test/cpp/qps/report.h",
"test/cpp/qps/server.h", "test/cpp/qps/server.h",
"test/cpp/qps/stats.h", "test/cpp/qps/stats.h",
"test/cpp/qps/timer.h", "test/cpp/qps/timer.h",
"test/cpp/util/benchmark_config.h" "test/cpp/util/benchmark_config.h",
"test/proto/qpstest.grpc.pb.h",
"test/proto/qpstest.pb.h"
], ],
"language": "c++", "language": "c++",
"name": "qps", "name": "qps",

8
vsprojects/vcxproj/qps/qps.vcxproj
Unescape View File

@ -147,13 +147,13 @@
<ClInclude Include="..\..\..\test\cpp\util\benchmark_config.h" /> <ClInclude Include="..\..\..\test\cpp\util\benchmark_config.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\test\cpp\qps\qpstest.pb.cc"> <ClCompile Include="..\..\..\test\proto\qpstest.pb.cc">
</ClCompile> </ClCompile>
<ClInclude Include="..\..\..\test\cpp\qps\qpstest.pb.h"> <ClInclude Include="..\..\..\test\proto\qpstest.pb.h">
</ClInclude> </ClInclude>
<ClCompile Include="..\..\..\test\cpp\qps\qpstest.grpc.pb.cc"> <ClCompile Include="..\..\..\test\proto\qpstest.grpc.pb.cc">
</ClCompile> </ClCompile>
<ClInclude Include="..\..\..\test\cpp\qps\qpstest.grpc.pb.h"> <ClInclude Include="..\..\..\test\proto\qpstest.grpc.pb.h">
</ClInclude> </ClInclude>
<ClCompile Include="..\..\..\test\cpp\qps\perf_db.pb.cc"> <ClCompile Include="..\..\..\test\cpp\qps\perf_db.pb.cc">
</ClCompile> </ClCompile>

7
vsprojects/vcxproj/qps/qps.vcxproj.filters
Unescape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\test\cpp\qps\qpstest.proto"> <ClCompile Include="..\..\..\test\proto\qpstest.proto">
<Filter>test\cpp\qps</Filter> <Filter>test\proto</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\test\cpp\qps\perf_db.proto"> <ClCompile Include="..\..\..\test\cpp\qps\perf_db.proto">
<Filter>test\cpp\qps</Filter> <Filter>test\cpp\qps</Filter>
@ -87,6 +87,9 @@
<Filter Include="test\cpp\util"> <Filter Include="test\cpp\util">
<UniqueIdentifier>{9042d134-6d5a-a907-799e-01768a475055}</UniqueIdentifier> <UniqueIdentifier>{9042d134-6d5a-a907-799e-01768a475055}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="test\proto">
<UniqueIdentifier>{44e63a33-67f4-0575-e87a-711a7c9111e2}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

Write Preview
Loading…
Cancel
Save