Skip to content

Commit 1c79258

Browse files
lkpworkspacelkpworkspace
committed
modify Argument macros name
1 parent d24ac78 commit 1c79258

13 files changed

+74
-74
lines changed

‎launcher/launcher.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ int main(int argc, char** argv) {
7777
// 初始化并启动线程
7878
g_app = std::make_shared<myframe::App>();
7979
myframe::Arguments args;
80-
args.SetString(MYFRAME_SERVICE_LIB_DIR, lib_dir.string());
81-
args.SetInt(MYFRAME_THREAD_POOL_SIZE, module_args.GetThreadPoolSize());
82-
args.SetInt(MYFRAME_EVENT_CONNE_SIZE, module_args.GetConnEventSize());
83-
args.SetInt(MYFRAME_WARNING_MSG_SIZE, module_args.GetWarningMsgSize());
84-
args.SetInt(MYFRAME_PENDING_QUEUE_SIZE,
80+
args.SetStr(MYFRAME_KEY_SERVICE_LIB_DIR, lib_dir.string());
81+
args.SetInt(MYFRAME_KEY_THREAD_POOL_SIZE, module_args.GetThreadPoolSize());
82+
args.SetInt(MYFRAME_KEY_EVENT_CONNE_SIZE, module_args.GetConnEventSize());
83+
args.SetInt(MYFRAME_KEY_WARNING_MSG_SIZE, module_args.GetWarningMsgSize());
84+
args.SetInt(MYFRAME_KEY_PENDING_QUEUE_SIZE,
8585
module_args.GetDefaultPendingQueueSize());
86-
args.SetInt(MYFRAME_RUN_QUEUE_SIZE, module_args.GetDefaultRunQueueSize());
86+
args.SetInt(MYFRAME_KEY_RUN_QUEUE_SIZE, module_args.GetDefaultRunQueueSize());
8787
LOG(INFO) << "\n" << args.DebugString();
8888
if (false == g_app->Init(args)) {
8989
LOG(ERROR) << "Init failed";

‎myframe/app.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,25 @@ bool App::Init(const Arguments& args) {
7676
int default_run_queue_size = 2;
7777
for (const auto& arg : args) {
7878
if (arg.type == Argument::ArgType::kArgString) {
79-
if (arg.key == MYFRAME_SERVICE_LIB_DIR) {
79+
if (arg.key == MYFRAME_KEY_SERVICE_LIB_DIR) {
8080
lib_dir = arg.value_str;
8181
}
8282
}
8383
if (arg.type == Argument::ArgType::kArgInteger) {
8484
int value_int = arg.value_int;
85-
if (arg.key == MYFRAME_THREAD_POOL_SIZE) {
85+
if (arg.key == MYFRAME_KEY_THREAD_POOL_SIZE) {
8686
thread_pool_size = value_int;
8787
}
88-
if (arg.key == MYFRAME_WARNING_MSG_SIZE) {
88+
if (arg.key == MYFRAME_KEY_WARNING_MSG_SIZE) {
8989
warning_msg_size = value_int;
9090
}
91-
if (arg.key == MYFRAME_PENDING_QUEUE_SIZE) {
91+
if (arg.key == MYFRAME_KEY_PENDING_QUEUE_SIZE) {
9292
default_pending_queue_size = value_int;
9393
}
94-
if (arg.key == MYFRAME_RUN_QUEUE_SIZE) {
94+
if (arg.key == MYFRAME_KEY_RUN_QUEUE_SIZE) {
9595
default_run_queue_size = value_int;
9696
}
97-
if (arg.key == MYFRAME_EVENT_CONNE_SIZE) {
97+
if (arg.key == MYFRAME_KEY_EVENT_CONNE_SIZE) {
9898
event_conn_size = value_int;
9999
}
100100
}

‎myframe/arguments.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ std::string Argument::DebugString() {
2323
return ss.str();
2424
}
2525

26-
void Arguments::SetString(const std::string& key, const std::string& value) {
26+
void Arguments::SetStr(const std::string& key, const std::string& value) {
2727
Argument arg;
2828
arg.type = Argument::ArgType::kArgString;
2929
arg.key = key;

‎myframe/arguments.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ class MYFRAME_EXPORT Argument {
3030

3131
class MYFRAME_EXPORT Arguments : public std::vector<Argument> {
3232
public:
33-
void SetString(const std::string& key, const std::string& value);
33+
void SetStr(const std::string& key, const std::string& value);
3434

3535
void SetInt(const std::string& key, int value);
3636

3737
std::string DebugString();
3838
};
3939

40-
#define MYFRAME_SERVICE_LIB_DIR "app.lib_dir"
40+
#define MYFRAME_KEY_SERVICE_LIB_DIR "app.lib_dir"
4141

42-
#define MYFRAME_THREAD_POOL_SIZE "app.thread_pool_size"
42+
#define MYFRAME_KEY_THREAD_POOL_SIZE "app.thread_pool_size"
4343

44-
#define MYFRAME_WARNING_MSG_SIZE "app.warning_msg_size"
44+
#define MYFRAME_KEY_WARNING_MSG_SIZE "app.warning_msg_size"
4545

46-
#define MYFRAME_PENDING_QUEUE_SIZE "app.pending_queue_size"
46+
#define MYFRAME_KEY_PENDING_QUEUE_SIZE "app.pending_queue_size"
4747

48-
#define MYFRAME_RUN_QUEUE_SIZE "app.run_queue_size"
48+
#define MYFRAME_KEY_RUN_QUEUE_SIZE "app.run_queue_size"
4949

50-
#define MYFRAME_EVENT_CONNE_SIZE "app.event_conn_size"
50+
#define MYFRAME_KEY_EVENT_CONNE_SIZE "app.event_conn_size"
5151

5252
} // namespace myframe

‎test/actor_run_queue_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ int main() {
5959

6060
auto app = std::make_shared<myframe::App>();
6161
myframe::Arguments args;
62-
args.SetString(MYFRAME_SERVICE_LIB_DIR, lib_dir);
63-
args.SetInt(MYFRAME_THREAD_POOL_SIZE, 4);
64-
args.SetInt(MYFRAME_EVENT_CONNE_SIZE, 2);
65-
args.SetInt(MYFRAME_WARNING_MSG_SIZE, 10);
66-
args.SetInt(MYFRAME_PENDING_QUEUE_SIZE, -1);
67-
args.SetInt(MYFRAME_RUN_QUEUE_SIZE, 2);
62+
args.SetStr(MYFRAME_KEY_SERVICE_LIB_DIR, lib_dir);
63+
args.SetInt(MYFRAME_KEY_THREAD_POOL_SIZE, 4);
64+
args.SetInt(MYFRAME_KEY_EVENT_CONNE_SIZE, 2);
65+
args.SetInt(MYFRAME_KEY_WARNING_MSG_SIZE, 10);
66+
args.SetInt(MYFRAME_KEY_PENDING_QUEUE_SIZE, -1);
67+
args.SetInt(MYFRAME_KEY_RUN_QUEUE_SIZE, 2);
6868
if (false == app->Init(args)) {
6969
LOG(ERROR) << "Init failed";
7070
return -1;

‎test/app_send_req_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ int main() {
4949

5050
auto app = std::make_shared<myframe::App>();
5151
myframe::Arguments args;
52-
args.SetString(MYFRAME_SERVICE_LIB_DIR, lib_dir);
53-
args.SetInt(MYFRAME_THREAD_POOL_SIZE, 4);
54-
args.SetInt(MYFRAME_EVENT_CONNE_SIZE, 2);
55-
args.SetInt(MYFRAME_WARNING_MSG_SIZE, 10);
56-
args.SetInt(MYFRAME_PENDING_QUEUE_SIZE, -1);
57-
args.SetInt(MYFRAME_RUN_QUEUE_SIZE, 2);
52+
args.SetStr(MYFRAME_KEY_SERVICE_LIB_DIR, lib_dir);
53+
args.SetInt(MYFRAME_KEY_THREAD_POOL_SIZE, 4);
54+
args.SetInt(MYFRAME_KEY_EVENT_CONNE_SIZE, 2);
55+
args.SetInt(MYFRAME_KEY_WARNING_MSG_SIZE, 10);
56+
args.SetInt(MYFRAME_KEY_PENDING_QUEUE_SIZE, -1);
57+
args.SetInt(MYFRAME_KEY_RUN_QUEUE_SIZE, 2);
5858
if (false == app->Init(args)) {
5959
LOG(ERROR) << "Init failed";
6060
return -1;

‎test/app_send_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ int main() {
4040

4141
auto app = std::make_shared<myframe::App>();
4242
myframe::Arguments args;
43-
args.SetString(MYFRAME_SERVICE_LIB_DIR, lib_dir);
44-
args.SetInt(MYFRAME_THREAD_POOL_SIZE, 4);
45-
args.SetInt(MYFRAME_EVENT_CONNE_SIZE, 2);
46-
args.SetInt(MYFRAME_WARNING_MSG_SIZE, 10);
47-
args.SetInt(MYFRAME_PENDING_QUEUE_SIZE, -1);
48-
args.SetInt(MYFRAME_RUN_QUEUE_SIZE, 2);
43+
args.SetStr(MYFRAME_KEY_SERVICE_LIB_DIR, lib_dir);
44+
args.SetInt(MYFRAME_KEY_THREAD_POOL_SIZE, 4);
45+
args.SetInt(MYFRAME_KEY_EVENT_CONNE_SIZE, 2);
46+
args.SetInt(MYFRAME_KEY_WARNING_MSG_SIZE, 10);
47+
args.SetInt(MYFRAME_KEY_PENDING_QUEUE_SIZE, -1);
48+
args.SetInt(MYFRAME_KEY_RUN_QUEUE_SIZE, 2);
4949
if (false == app->Init(args)) {
5050
LOG(ERROR) << "Init failed";
5151
return -1;

‎test/hello_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ int main() {
3636

3737
auto app = std::make_shared<myframe::App>();
3838
myframe::Arguments args;
39-
args.SetString(MYFRAME_SERVICE_LIB_DIR, lib_dir);
40-
args.SetInt(MYFRAME_THREAD_POOL_SIZE, 1);
41-
args.SetInt(MYFRAME_EVENT_CONNE_SIZE, 2);
42-
args.SetInt(MYFRAME_WARNING_MSG_SIZE, 10);
43-
args.SetInt(MYFRAME_PENDING_QUEUE_SIZE, -1);
44-
args.SetInt(MYFRAME_RUN_QUEUE_SIZE, 2);
39+
args.SetStr(MYFRAME_KEY_SERVICE_LIB_DIR, lib_dir);
40+
args.SetInt(MYFRAME_KEY_THREAD_POOL_SIZE, 1);
41+
args.SetInt(MYFRAME_KEY_EVENT_CONNE_SIZE, 2);
42+
args.SetInt(MYFRAME_KEY_WARNING_MSG_SIZE, 10);
43+
args.SetInt(MYFRAME_KEY_PENDING_QUEUE_SIZE, -1);
44+
args.SetInt(MYFRAME_KEY_RUN_QUEUE_SIZE, 2);
4545
if (false == app->Init(args)) {
4646
std::cout << "Init failed\n";
4747
return -1;

‎test/performance_trans100_fullspeed_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ int main() {
9494

9595
auto app = std::make_shared<myframe::App>();
9696
myframe::Arguments args;
97-
args.SetString(MYFRAME_SERVICE_LIB_DIR, lib_dir);
98-
args.SetInt(MYFRAME_THREAD_POOL_SIZE, 4);
99-
args.SetInt(MYFRAME_EVENT_CONNE_SIZE, 2);
100-
args.SetInt(MYFRAME_WARNING_MSG_SIZE, 10);
101-
args.SetInt(MYFRAME_PENDING_QUEUE_SIZE, -1);
102-
args.SetInt(MYFRAME_RUN_QUEUE_SIZE, 2);
97+
args.SetStr(MYFRAME_KEY_SERVICE_LIB_DIR, lib_dir);
98+
args.SetInt(MYFRAME_KEY_THREAD_POOL_SIZE, 4);
99+
args.SetInt(MYFRAME_KEY_EVENT_CONNE_SIZE, 2);
100+
args.SetInt(MYFRAME_KEY_WARNING_MSG_SIZE, 10);
101+
args.SetInt(MYFRAME_KEY_PENDING_QUEUE_SIZE, -1);
102+
args.SetInt(MYFRAME_KEY_RUN_QUEUE_SIZE, 2);
103103
if (false == app->Init(args)) {
104104
LOG(ERROR) << "Init failed";
105105
return -1;

‎test/performance_trans10_cost_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ int main() {
105105

106106
auto app = std::make_shared<myframe::App>();
107107
myframe::Arguments args;
108-
args.SetString(MYFRAME_SERVICE_LIB_DIR, lib_dir);
109-
args.SetInt(MYFRAME_THREAD_POOL_SIZE, 4);
110-
args.SetInt(MYFRAME_EVENT_CONNE_SIZE, 2);
111-
args.SetInt(MYFRAME_WARNING_MSG_SIZE, 10);
112-
args.SetInt(MYFRAME_PENDING_QUEUE_SIZE, -1);
113-
args.SetInt(MYFRAME_RUN_QUEUE_SIZE, 2);
108+
args.SetStr(MYFRAME_KEY_SERVICE_LIB_DIR, lib_dir);
109+
args.SetInt(MYFRAME_KEY_THREAD_POOL_SIZE, 4);
110+
args.SetInt(MYFRAME_KEY_EVENT_CONNE_SIZE, 2);
111+
args.SetInt(MYFRAME_KEY_WARNING_MSG_SIZE, 10);
112+
args.SetInt(MYFRAME_KEY_PENDING_QUEUE_SIZE, -1);
113+
args.SetInt(MYFRAME_KEY_RUN_QUEUE_SIZE, 2);
114114
if (false == app->Init(args)) {
115115
LOG(ERROR) << "Init failed";
116116
return -1;

0 commit comments

Comments
 (0)