pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set max_pkg_size correctly 

output size parameters more gracefully
iovec_array V1.1.7
YuQing 2021-05-11 11:39:23 +08:00
parent e3a37b4e41
commit e93f6aa506
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/sf_global.c
View File

@ -120,11 +120,9 @@ static int load_network_parameters(IniFullContext *ini_ctx,
if (task_buffer_extra_size > 0) { if (task_buffer_extra_size > 0) {
g_sf_global_vars.min_buff_size += task_buffer_extra_size; g_sf_global_vars.min_buff_size += task_buffer_extra_size;
if (g_sf_global_vars.max_buff_size < g_sf_global_vars.min_buff_size) { g_sf_global_vars.max_buff_size += task_buffer_extra_size;
g_sf_global_vars.max_buff_size = g_sf_global_vars.min_buff_size; if (g_sf_global_vars.max_pkg_size < g_sf_global_vars.max_buff_size) {
} g_sf_global_vars.max_pkg_size = g_sf_global_vars.max_buff_size;
if (g_sf_global_vars.max_pkg_size < g_sf_global_vars.min_buff_size) {
g_sf_global_vars.max_pkg_size = g_sf_global_vars.min_buff_size;
} }
} }
@ -509,27 +507,29 @@ void sf_slow_log_config_to_string(SFSlowLogConfig *slow_log_cfg,
void sf_global_config_to_string(char *output, const int size) void sf_global_config_to_string(char *output, const int size)
{ {
int len; int len;
char sz_thread_stack_size[32]; int max_pkg_size;
char sz_max_pkg_size[32]; int min_buff_size;
char sz_min_buff_size[32]; int max_buff_size;
char sz_max_buff_size[32];
max_pkg_size = g_sf_global_vars.max_pkg_size -
g_sf_global_vars.task_buffer_extra_size;
min_buff_size = g_sf_global_vars.min_buff_size -
g_sf_global_vars.task_buffer_extra_size;
max_buff_size = g_sf_global_vars.max_buff_size -
g_sf_global_vars.task_buffer_extra_size;
len = snprintf(output, size, len = snprintf(output, size,
"base_path=%s, max_connections=%d, connect_timeout=%d, " "base_path=%s, max_connections=%d, connect_timeout=%d, "
"network_timeout=%d, thread_stack_size=%s, max_pkg_size=%s, " "network_timeout=%d, thread_stack_size=%d KB, "
"min_buff_size=%s, max_buff_size=%s, task_buffer_extra_size=%d, " "max_pkg_size=%d KB, min_buff_size=%d KB, "
"tcp_quick_ack=%d, log_level=%s, " "max_buff_size=%d KB, tcp_quick_ack=%d, log_level=%s, "
"run_by_group=%s, run_by_user=%s, ", "run_by_group=%s, run_by_user=%s, ",
g_sf_global_vars.base_path, g_sf_global_vars.base_path,
g_sf_global_vars.max_connections, g_sf_global_vars.max_connections,
g_sf_global_vars.connect_timeout, g_sf_global_vars.connect_timeout,
g_sf_global_vars.network_timeout, g_sf_global_vars.network_timeout,
int_to_comma_str(g_sf_global_vars.thread_stack_size, g_sf_global_vars.thread_stack_size / 1024,
sz_thread_stack_size), max_pkg_size / 1024, min_buff_size / 1024,
int_to_comma_str(g_sf_global_vars.max_pkg_size, sz_max_pkg_size), max_buff_size / 1024,
int_to_comma_str(g_sf_global_vars.min_buff_size, sz_min_buff_size),
int_to_comma_str(g_sf_global_vars.max_buff_size, sz_max_buff_size),
g_sf_global_vars.task_buffer_extra_size,
g_sf_global_vars.tcp_quick_ack, g_sf_global_vars.tcp_quick_ack,
log_get_level_caption(), log_get_level_caption(),
g_sf_global_vars.run_by_group, g_sf_global_vars.run_by_group,