baidu · zd-double · Jul 19, 2016 · Jul 20, 2016 · Jul 20, 2016 · Jul 20, 2016
diff --git a/Makefile b/Makefile
@@ -22,6 +22,8 @@ OPT ?= -O2        # (A) Production use (optimized mode)
 #   SOFA_PBRPC_ENABLE_DETAILED_LOGGING : print current-time and thread-id in logging header
 #   SOFA_PBRPC_ENABLE_FUNCTION_TRACE : print trace log when enter and leave function
 #   SOFA_PBRPC_USE_SPINLOCK : use SpinLock as FastLock
+#   SOFA_PBRPC_PROFILING : use Profiling
+#   SOFA_PBRPC_USE_PROTO3 : use proto3 version of the Protocol Buffers language
 #
 CXXFLAGS ?= -DSOFA_PBRPC_ENABLE_DETAILED_LOGGING
 #-----------------------------------------------
@@ -35,7 +37,7 @@ include depends.mk
 LIB=libsofa-pbrpc.a
 LIB_SRC=$(wildcard src/sofa/pbrpc/*.cc)
 LIB_OBJ=$(patsubst %.cc,%.o,$(LIB_SRC))
-PROTO=$(wildcard src/sofa/pbrpc/*.proto)
+PROTO=$(wildcard src/sofa/pbrpc/$(PROTO_VERSION)/*.proto)
 PROTO_SRC=$(patsubst %.proto,%.pb.cc,$(PROTO))
 PROTO_HEADER=$(patsubst %.proto,%.pb.h,$(PROTO))
 PROTO_OBJ=$(patsubst %.cc,%.o,$(PROTO_SRC))
@@ -53,8 +55,7 @@ PUB_INC=src/sofa/pbrpc/pbrpc.h src/sofa/pbrpc/closure_helper.h src/sofa/pbrpc/cl
 	src/sofa/pbrpc/locks.h src/sofa/pbrpc/mutex_lock.h src/sofa/pbrpc/spin_lock.h \
 	src/sofa/pbrpc/fast_lock.h src/sofa/pbrpc/rw_lock.h src/sofa/pbrpc/scoped_locker.h \
 	src/sofa/pbrpc/condition_variable.h src/sofa/pbrpc/wait_event.h src/sofa/pbrpc/http.h \
-	src/sofa/pbrpc/buffer.h src/sofa/pbrpc/buf_handle.h src/sofa/pbrpc/profiling_linker.h \
-	$(PROTO) $(PROTO_HEADER)
+	src/sofa/pbrpc/buffer.h src/sofa/pbrpc/buf_handle.h src/sofa/pbrpc/profiling_linker.h
 
 #-----------------------------------------------
 ifeq ($(OS),Windows_NT)
@@ -73,6 +74,9 @@ else
     endif
 endif
 
+ifeq ($(PROTO_VERSION), proto3)
+    CXXFLAGS += -DSOFA_PBRPC_USE_PROTO3
+endif
 #-----------------------------------------------
 
 CXX=g++
@@ -124,6 +128,9 @@ install: $(LIB) $(BIN)
 	cp src/sofa/pbrpc/smart_ptr/*.hpp $(PREFIX)/include/sofa/pbrpc/smart_ptr
 	mkdir -p $(PREFIX)/include/sofa/pbrpc/smart_ptr/detail
 	cp src/sofa/pbrpc/smart_ptr/detail/*.hpp $(PREFIX)/include/sofa/pbrpc/smart_ptr/detail
+	mkdir -p $(PREFIX)/include/sofa/pbrpc/$(PROTO_VERSION)
+	cp src/sofa/pbrpc/$(PROTO_VERSION)/*.proto $(PREFIX)/include/sofa/pbrpc/$(PROTO_VERSION)
+	cp src/sofa/pbrpc/$(PROTO_VERSION)/*.pb.h $(PREFIX)/include/sofa/pbrpc/$(PROTO_VERSION)
 	mkdir -p $(PREFIX)/lib
 	cp $(LIB) $(PREFIX)/lib/
 	mkdir -p $(PREFIX)/bin

diff --git a/depends.mk b/depends.mk
@@ -9,6 +9,16 @@
 ##
 ################################################################
 
+################################################################
+## Version of Protocol Buffers language.
+##
+## Support Protocol Buffers version:
+##   proto2
+##   proto3
+##
+PROTO_VERSION=proto2
+################################################################
+
 ################################################################
 ## Boost header directory.
 ##

diff --git a/sample/compress_sample/Makefile b/sample/compress_sample/Makefile
@@ -44,7 +44,15 @@ else
     endif
 endif
 
-PROTO_SRC=echo_service.proto
+#-----------------------------------------------
+# Customized macro switch:
+#   SOFA_PBRPC_USE_PROTO3 : use proto3 version of the protocol buffers language
+ifeq ($(PROTO_VERSION),proto3)
+    CXXFLAGS += -DSOFA_PBRPC_USE_PROTO3
+endif
+#----------------------------------------------
+
+PROTO_SRC=$(PROTO_VERSION)/echo_service.proto
 PROTO_OBJ=$(patsubst %.proto,%.pb.o,$(PROTO_SRC))
 PROTO_OPTIONS=--proto_path=. --proto_path=$(SOFA_PBRPC)/include --proto_path=$(PROTOBUF_DIR)/include
 
@@ -64,7 +72,7 @@ check_depends:
 	@if [ ! -f "$(SOFA_PBRPC)/lib/libsofa-pbrpc.a" ]; then echo "ERROR: need sofa-pbrpc lib"; exit 1; fi
 
 clean:
-	@rm -f $(BIN) *.o *.pb.*
+	@rm -f $(BIN) *.o $(PROTO_VERSION)/*.pb.*
 
 rebuild: clean all
 

diff --git a/sample/compress_sample/client.cc b/sample/compress_sample/client.cc
@@ -5,7 +5,12 @@
 // Author: [email protected] (Qin Zuoyan)
 
 #include <sofa/pbrpc/pbrpc.h>
-#include "echo_service.pb.h"
+
+#if defined ( SOFA_PBRPC_USE_PROTO3 )
+#include "proto3/echo_service.pb.h"
+#else
+#include "proto2/echo_service.pb.h"
+#endif
 
 int main(int /*argc*/, char** /*argv*/)
 {

diff --git a/sample/compress_sample/echo_service.proto → ...compress_sample/proto2/echo_service.proto b/sample/compress_sample/echo_service.proto → ...compress_sample/proto2/echo_service.proto
@@ -1,4 +1,6 @@
-import "sofa/pbrpc/rpc_option.proto";
+syntax = "proto2";
+
+import "sofa/pbrpc/proto2/rpc_option.proto";
 
 package sofa.pbrpc.test;
 

diff --git a/sample/compress_sample/proto3/echo_service.proto b/sample/compress_sample/proto3/echo_service.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+import "sofa/pbrpc/proto3/rpc_option.proto";
+
+package sofa.pbrpc.test;
+
+option cc_generic_services = true;
+
+message EchoRequest {
+    string message = 1;
+}
+
+message EchoResponse {
+    string message = 1;
+}
+
+service EchoServer {
+    rpc Echo(EchoRequest) returns(EchoResponse) {
+        option (sofa.pbrpc.request_compress_type) = CompressTypeSnappy;
+        option (sofa.pbrpc.response_compress_type) = CompressTypeSnappy;
+    }
+}
diff --git a/sample/compress_sample/server.cc b/sample/compress_sample/server.cc
@@ -7,7 +7,12 @@
 #include <signal.h>
 #include <unistd.h>
 #include <sofa/pbrpc/pbrpc.h>
-#include "echo_service.pb.h"
+
+#if defined ( SOFA_PBRPC_USE_PROTO3 )
+#include "proto3/echo_service.pb.h"
+#else
+#include "proto2/echo_service.pb.h"
+#endif
 
 class EchoServerImpl : public sofa::pbrpc::test::EchoServer
 {

diff --git a/sample/echo/Makefile b/sample/echo/Makefile
@@ -44,7 +44,15 @@ else
     endif
 endif
 
-PROTO_SRC=echo_service.proto
+#-----------------------------------------------
+# Customized macro switch:
+#   SOFA_PBRPC_USE_PROTO3 : use proto3 version of the protocol buffers language
+ifeq ($(PROTO_VERSION),proto3)
+    CXXFLAGS += -DSOFA_PBRPC_USE_PROTO3
+endif
+#----------------------------------------------
+
+PROTO_SRC=$(PROTO_VERSION)/echo_service.proto
 PROTO_OBJ=$(patsubst %.proto,%.pb.o,$(PROTO_SRC))
 PROTO_OPTIONS=--proto_path=. --proto_path=$(SOFA_PBRPC)/include --proto_path=$(PROTOBUF_DIR)/include
 
@@ -64,7 +72,7 @@ check_depends:
 	@if [ ! -f "$(SOFA_PBRPC)/lib/libsofa-pbrpc.a" ]; then echo "ERROR: need sofa-pbrpc lib"; exit 1; fi
 
 clean:
-	@rm -f $(BIN) *.o *.pb.*
+	@rm -f $(BIN) *.o $(PROTO_VERSION)/*.pb.*
 
 rebuild: clean all
 

diff --git a/sample/echo/client_async.cc b/sample/echo/client_async.cc
@@ -6,7 +6,12 @@
 
 #include <unistd.h>
 #include <sofa/pbrpc/pbrpc.h>
-#include "echo_service.pb.h"
+
+#if defined ( SOFA_PBRPC_USE_PROTO3 )
+#include "proto3/echo_service.pb.h"
+#else
+#include "proto2/echo_service.pb.h"
+#endif
 
 void EchoCallback(sofa::pbrpc::RpcController* cntl,
         sofa::pbrpc::test::EchoRequest* request,

diff --git a/sample/echo/client_sync.cc b/sample/echo/client_sync.cc
@@ -5,7 +5,12 @@
 // Author: [email protected] (Qin Zuoyan)
 
 #include <sofa/pbrpc/pbrpc.h>
-#include "echo_service.pb.h"
+
+#if defined ( SOFA_PBRPC_USE_PROTO3 )
+#include "proto3/echo_service.pb.h"
+#else
+#include "proto2/echo_service.pb.h"
+#endif
 
 // Using global RpcClient object can help share resources such as threads and buffers.
 sofa::pbrpc::RpcClient g_rpc_client;

diff --git a/sample/echo/echo_service.proto → sample/echo/proto2/echo_service.proto b/sample/echo/echo_service.proto → sample/echo/proto2/echo_service.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package sofa.pbrpc.test;
 
 option cc_generic_services = true;

diff --git a/sample/echo/proto3/echo_service.proto b/sample/echo/proto3/echo_service.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package sofa.pbrpc.test;
+
+option cc_generic_services = true;
+option java_generic_services = true;
+
+message EchoRequest {
+    string message = 1;
+}
+
+message EchoResponse {
+    string message = 1;
+}
+
+service EchoServer {
+    rpc Echo(EchoRequest) returns(EchoResponse);
+}
diff --git a/sample/echo/server.cc b/sample/echo/server.cc
@@ -7,7 +7,12 @@
 #include <signal.h>
 #include <unistd.h>
 #include <sofa/pbrpc/pbrpc.h>
-#include "echo_service.pb.h"
+
+#if defined ( SOFA_PBRPC_USE_PROTO3 )
+#include "proto3/echo_service.pb.h"
+#else
+#include "proto2/echo_service.pb.h"
+#endif
 
 bool WebServlet(const sofa::pbrpc::HTTPRequest& request, sofa::pbrpc::HTTPResponse& response)
 {

diff --git a/sample/mock_sample/Makefile b/sample/mock_sample/Makefile
@@ -45,7 +45,15 @@ else
     endif
 endif
 
-PROTO_SRC=echo_service.proto
+#-----------------------------------------------
+# Customized macro switch:
+#   SOFA_PBRPC_USE_PROTO3 : use proto3 version of the protocol buffers language
+ifeq ($(PROTO_VERSION),proto3)
+    CXXFLAGS += -DSOFA_PBRPC_USE_PROTO3
+endif
+#-----------------------------------------------
+
+PROTO_SRC=$(PROTO_VERSION)/echo_service.proto
 PROTO_OBJ=$(patsubst %.proto,%.pb.o,$(PROTO_SRC))
 PROTO_OPTIONS=--proto_path=. --proto_path=$(SOFA_PBRPC)/include --proto_path=$(PROTOBUF_DIR)/include
 
@@ -66,7 +74,7 @@ check_depends:
 	@if [ ! -f "$(GTEST_DIR)/src/gtest-all.cc" ]; then echo "ERROR: need gtest"; exit 1; fi
 
 clean:
-	@rm -f $(BIN) *.o *.pb.* libgtest.a
+	@rm -f $(BIN) *.o $(PROTO_VERSION)/*.pb.* libgtest.a
 
 rebuild: clean all
 

diff --git a/sample/mock_sample/mock_test_sample.cc b/sample/mock_sample/mock_test_sample.cc
@@ -8,7 +8,12 @@
 #include <sofa/pbrpc/mock_test_helper.h>
 #include <gtest/gtest.h>
 #include <unistd.h>
-#include "echo_service.pb.h"
+
+#if defined ( SOFA_PBRPC_USE_PROTO3 )
+#include "proto3/echo_service.pb.h"
+#else
+#include "proto2/echo_service.pb.h"
+#endif
 
 using namespace ::sofa::pbrpc;
 using namespace ::sofa::pbrpc::test;

diff --git a/test/kill_test/echo_service.proto → sample/mock_sample/proto2/echo_service.proto b/test/kill_test/echo_service.proto → sample/mock_sample/proto2/echo_service.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package sofa.pbrpc.test;
 
 option cc_generic_services = true;

diff --git a/sample/mock_sample/proto3/echo_service.proto b/sample/mock_sample/proto3/echo_service.proto
@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package sofa.pbrpc.test;
+
+option cc_generic_services = true;
+
+message EchoRequest {
+    string message = 1;
+}
+
+message EchoResponse {
+    string message = 1;
+}
+
+service EchoServer {
+    rpc Echo(EchoRequest) returns(EchoResponse);
+}
diff --git a/sample/multi_server_sample/Makefile b/sample/multi_server_sample/Makefile
@@ -44,7 +44,15 @@ else
     endif
 endif
 
-PROTO_SRC=echo_service.proto
+#-----------------------------------------------
+# Customized macro switch:
+#   SOFA_PBRPC_USE_PROTO3 : use proto3 version of the protocol buffers language
+ifeq ($(PROTO_VERSION),proto3)
+    CXXFLAGS += -DSOFA_PBRPC_USE_PROTO3
+endif
+#----------------------------------------------
+
+PROTO_SRC=$(PROTO_VERSION)/echo_service.proto
 PROTO_OBJ=$(patsubst %.proto,%.pb.o,$(PROTO_SRC))
 PROTO_OPTIONS=--proto_path=. --proto_path=$(SOFA_PBRPC)/include --proto_path=$(PROTOBUF_DIR)/include
 
@@ -64,7 +72,7 @@ check_depends:
 	@if [ ! -f "$(SOFA_PBRPC)/lib/libsofa-pbrpc.a" ]; then echo "ERROR: need sofa-pbrpc lib"; exit 1; fi
 
 clean:
-	@rm -f $(BIN) *.o *.pb.*
+	@rm -f $(BIN) *.o $(PROTO_VERSION)/*.pb.*
 
 rebuild: clean all
 

diff --git a/sample/multi_server_sample/client.cc b/sample/multi_server_sample/client.cc
@@ -12,7 +12,12 @@
 #include <set>
 
 #include <sofa/pbrpc/pbrpc.h>
-#include "echo_service.pb.h"
+
+#if defined ( SOFA_PBRPC_USE_PROTO3 )
+#include "proto3/echo_service.pb.h"
+#else
+#include "proto2/echo_service.pb.h"
+#endif
 
 class ReloadableAddressProvider : public sofa::pbrpc::RpcChannel::AddressProvider
 {

diff --git a/...le/multi_server_sample/echo_service.proto → ...i_server_sample/proto2/echo_service.proto b/...le/multi_server_sample/echo_service.proto → ...i_server_sample/proto2/echo_service.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package sofa.pbrpc.test;
 
 option cc_generic_services = true;

diff --git a/sample/multi_server_sample/proto3/echo_service.proto b/sample/multi_server_sample/proto3/echo_service.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package sofa.pbrpc.test;
+
+option cc_generic_services = true;
+option java_generic_services = true;
+
+message EchoRequest {
+    string message = 1;
+}
+
+message EchoResponse {
+    string message = 1;
+}
+
+service EchoServer {
+    rpc Echo(EchoRequest) returns(EchoResponse);
+}
diff --git a/sample/multi_server_sample/server.cc b/sample/multi_server_sample/server.cc
@@ -8,7 +8,12 @@
 #include <signal.h>
 #include <unistd.h>
 #include <sofa/pbrpc/pbrpc.h>
-#include "echo_service.pb.h"
+
+#if defined ( SOFA_PBRPC_USE_PROTO3 )
+#include "proto3/echo_service.pb.h"
+#else
+#include "proto2/echo_service.pb.h"
+#endif
 
 class EchoServerImpl : public sofa::pbrpc::test::EchoServer
 {