Skip to content

Commit 0608aa1

Browse files
chenBrightchenBright
authored
Fix gflag namespace of example and tools (#2879)
1 parent c93d0e0 commit 0608aa1

86 files changed

Lines changed: 94 additions & 383 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,6 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
114114

115115
find_package(GFLAGS REQUIRED)
116116

117-
execute_process(
118-
COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}' | tr -d '\n'"
119-
OUTPUT_VARIABLE GFLAGS_NS
120-
)
121-
if(${GFLAGS_NS} STREQUAL "GFLAGS_NAMESPACE")
122-
execute_process(
123-
COMMAND bash -c "grep \"#define GFLAGS_NAMESPACE [_A-Za-z0-9]\\+\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $3}' | tr -d '\n'"
124-
OUTPUT_VARIABLE GFLAGS_NS
125-
)
126-
endif()
127-
128117
include_directories(
129118
${PROJECT_SOURCE_DIR}/src
130119
${CMAKE_CURRENT_BINARY_DIR}
@@ -144,7 +133,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
144133
set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wno-deprecated-declarations -Wno-inconsistent-missing-override")
145134
endif()
146135

147-
set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEFINE_CLOCK_GETTIME} -DBRPC_WITH_GLOG=${WITH_GLOG_VAL} -DBRPC_WITH_RDMA=${WITH_RDMA_VAL} -DGFLAGS_NS=${GFLAGS_NS} -DBRPC_DEBUG_BTHREAD_SCHE_SAFETY=${WITH_DEBUG_BTHREAD_SCHE_SAFETY_VAL} -DBRPC_DEBUG_LOCK=${WITH_DEBUG_LOCK_VAL}")
136+
set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEFINE_CLOCK_GETTIME} -DBRPC_WITH_GLOG=${WITH_GLOG_VAL} -DBRPC_WITH_RDMA=${WITH_RDMA_VAL} -DBRPC_DEBUG_BTHREAD_SCHE_SAFETY=${WITH_DEBUG_BTHREAD_SCHE_SAFETY_VAL} -DBRPC_DEBUG_LOCK=${WITH_DEBUG_LOCK_VAL}")
148137
if(WITH_MESALINK)
149138
set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DUSE_MESALINK")
150139
endif()

‎example/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ COPTS = [
2828
"-fPIC",
2929
"-Wno-unused-parameter",
3030
"-fno-omit-frame-pointer",
31-
"-DGFLAGS_NS=google",
3231
] + select({
3332
"//bazel/config:brpc_with_glog": ["-DBRPC_WITH_GLOG=1"],
3433
"//conditions:default": ["-DBRPC_WITH_GLOG=0"],

‎example/asynchronous_echo_c++/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ if((NOT GFLAGS_INCLUDE_PATH) OR (NOT GFLAGS_LIBRARY))
5858
endif()
5959
include_directories(${GFLAGS_INCLUDE_PATH})
6060

61-
execute_process(
62-
COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}' | tr -d '\n'"
63-
OUTPUT_VARIABLE GFLAGS_NS
64-
)
65-
if(${GFLAGS_NS} STREQUAL "GFLAGS_NAMESPACE")
66-
execute_process(
67-
COMMAND bash -c "grep \"#define GFLAGS_NAMESPACE [_A-Za-z0-9]\\+\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $3}' | tr -d '\n'"
68-
OUTPUT_VARIABLE GFLAGS_NS
69-
)
70-
endif()
7161
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
7262
include(CheckFunctionExists)
7363
CHECK_FUNCTION_EXISTS(clock_gettime HAVE_CLOCK_GETTIME)
@@ -76,8 +66,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
7666
endif()
7767
endif()
7868

79-
set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}")
80-
set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer")
69+
set(CMAKE_CXX_FLAGS "${DEFINE_CLOCK_GETTIME} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer")
8170

8271
if(CMAKE_VERSION VERSION_LESS "3.1.3")
8372
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

‎example/asynchronous_echo_c++/client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void HandleEchoResponse(
5151

5252
int main(int argc, char* argv[]) {
5353
// Parse gflags. We recommend you to use gflags as well.
54-
GFLAGS_NS::ParseCommandLineFlags(&argc, &argv, true);
54+
GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
5555

5656
// A Channel represents a communication line to a Server. Notice that
5757
// Channel is thread-safe and can be shared by all threads in your program.

‎example/asynchronous_echo_c++/server.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class EchoServiceImpl : public example::EchoService {
8787

8888
int main(int argc, char* argv[]) {
8989
// Parse gflags. We recommend you to use gflags as well.
90-
GFLAGS_NS::ParseCommandLineFlags(&argc, &argv, true);
90+
GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
9191

9292
// Generally you only need one Server.
9393
brpc::Server server;

‎example/auto_concurrency_limiter/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,6 @@ if((NOT GFLAGS_INCLUDE_PATH) OR (NOT GFLAGS_LIBRARY))
5151
endif()
5252
include_directories(${GFLAGS_INCLUDE_PATH})
5353

54-
execute_process(
55-
COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}' | tr -d '\n'"
56-
OUTPUT_VARIABLE GFLAGS_NS
57-
)
58-
if(${GFLAGS_NS} STREQUAL "GFLAGS_NAMESPACE")
59-
execute_process(
60-
COMMAND bash -c "grep \"#define GFLAGS_NAMESPACE [_A-Za-z0-9]\\+\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $3}' | tr -d '\n'"
61-
OUTPUT_VARIABLE GFLAGS_NS
62-
)
63-
endif()
6454
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
6555
include(CheckFunctionExists)
6656
CHECK_FUNCTION_EXISTS(clock_gettime HAVE_CLOCK_GETTIME)
@@ -69,8 +59,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
6959
endif()
7060
endif()
7161

72-
set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}")
73-
set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer")
62+
set(CMAKE_CXX_FLAGS "${DEFINE_CLOCK_GETTIME} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer")
7463

7564
if(CMAKE_VERSION VERSION_LESS "3.1.3")
7665
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

‎example/auto_concurrency_limiter/client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void RunCase(test::ControlService_Stub &cntl_stub,
215215

216216
int main(int argc, char* argv[]) {
217217
// Parse gflags. We recommend you to use gflags as well.
218-
GFLAGS_NS::ParseCommandLineFlags(&argc, &argv, true);
218+
GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
219219
Expose();
220220

221221
brpc::Channel channel;

‎example/auto_concurrency_limiter/server.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ class ControlServiceImpl : public test::ControlService {
271271

272272
int main(int argc, char* argv[]) {
273273
// Parse gflags. We recommend you to use gflags as well.
274-
GFLAGS_NS::ParseCommandLineFlags(&argc, &argv, true);
274+
GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
275275
bthread::FLAGS_bthread_concurrency= FLAGS_server_bthread_concurrency;
276276

277277
brpc::Server server;

‎example/backup_request_c++/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ if((NOT GFLAGS_INCLUDE_PATH) OR (NOT GFLAGS_LIBRARY))
5858
endif()
5959
include_directories(${GFLAGS_INCLUDE_PATH})
6060

61-
execute_process(
62-
COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}' | tr -d '\n'"
63-
OUTPUT_VARIABLE GFLAGS_NS
64-
)
65-
if(${GFLAGS_NS} STREQUAL "GFLAGS_NAMESPACE")
66-
execute_process(
67-
COMMAND bash -c "grep \"#define GFLAGS_NAMESPACE [_A-Za-z0-9]\\+\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $3}' | tr -d '\n'"
68-
OUTPUT_VARIABLE GFLAGS_NS
69-
)
70-
endif()
7161
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
7262
include(CheckFunctionExists)
7363
CHECK_FUNCTION_EXISTS(clock_gettime HAVE_CLOCK_GETTIME)
@@ -76,8 +66,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
7666
endif()
7767
endif()
7868

79-
set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}")
80-
set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer")
69+
set(CMAKE_CXX_FLAGS "${DEFINE_CLOCK_GETTIME} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer")
8170

8271
if(CMAKE_VERSION VERSION_LESS "3.1.3")
8372
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

‎example/backup_request_c++/client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DEFINE_int32(backup_request_ms, 2, "Timeout for sending backup request");
3535

3636
int main(int argc, char* argv[]) {
3737
// Parse gflags. We recommend you to use gflags as well.
38-
GFLAGS_NS::ParseCommandLineFlags(&argc, &argv, true);
38+
GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true);
3939

4040
// A Channel represents a communication line to a Server. Notice that
4141
// Channel is thread-safe and can be shared by all threads in your program.

0 commit comments

Comments
 (0)