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

network buff_size support extra size

connection_manager
YuQing 2020-12-01 20:58:07 +08:00
parent acf27b0e4f
commit e01048f462
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/sf_global.c
View File

@ -36,7 +36,7 @@ SFGlobalVariables g_sf_global_vars = {
DEFAULT_CONNECT_TIMEOUT, DEFAULT_NETWORK_TIMEOUT,
{'/', 't', 'm', 'p', '\0'}, true, DEFAULT_MAX_CONNECTONS,
SF_DEF_MAX_PACKAGE_SIZE, SF_DEF_MIN_BUFF_SIZE,
SF_DEF_MAX_BUFF_SIZE, SF_DEF_THREAD_STACK_SIZE,
SF_DEF_MAX_BUFF_SIZE, 0, SF_DEF_THREAD_STACK_SIZE,
SYNC_LOG_BUFF_DEF_INTERVAL, 0, 0, 0, {'\0'}, {'\0'}, false, 0, {0, 0}
};
@ -56,7 +56,8 @@ static inline void set_config_str_value(const char *value,
}
}
static int load_network_parameters(IniFullContext *ini_ctx)
static int load_network_parameters(IniFullContext *ini_ctx,
const int task_buffer_extra_size)
{
int result;
char *pMaxPkgSize;
@ -155,11 +156,22 @@ static int load_network_parameters(IniFullContext *ini_ctx)
}
}
if (task_buffer_extra_size > 0) {
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 = g_sf_global_vars.min_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;
}
}
return 0;
}
int sf_load_global_config_ex(const char *server_name,
IniFullContext *ini_ctx, const bool load_network_params)
IniFullContext *ini_ctx, const bool load_network_params,
const int task_buffer_extra_size)
{
int result;
char *pBasePath;
@ -168,6 +180,7 @@ int sf_load_global_config_ex(const char *server_name,
char *pThreadStackSize;
int64_t thread_stack_size;
g_sf_global_vars.task_buffer_extra_size = task_buffer_extra_size;
pBasePath = iniGetStrValue(NULL, "base_path", ini_ctx->context);
if (pBasePath == NULL) {
logError("file: "__FILE__", line: %d, "
@ -193,7 +206,9 @@ int sf_load_global_config_ex(const char *server_name,
}
if (load_network_params) {
if ((result=load_network_parameters(ini_ctx)) != 0) {
if ((result=load_network_parameters(ini_ctx,
task_buffer_extra_size)) != 0)
{
return result;
}
}
@ -296,11 +311,12 @@ int sf_load_global_config_ex(const char *server_name,
return 0;
}
int sf_load_config_ex(const char *server_name, SFContextIniConfig *config)
int sf_load_config_ex(const char *server_name,
SFContextIniConfig *config, const int task_buffer_extra_size)
{
int result;
if ((result=sf_load_global_config_ex(server_name,
&config->ini_ctx, true)) != 0)
if ((result=sf_load_global_config_ex(server_name, &config->ini_ctx,
true, task_buffer_extra_size)) != 0)
{
return result;
}
@ -425,8 +441,8 @@ void sf_global_config_to_string(char *output, const int size)
snprintf(output, size,
"base_path=%s, max_connections=%d, connect_timeout=%d, "
"network_timeout=%d, thread_stack_size=%s, max_pkg_size=%s, "
"min_buff_size=%s, max_buff_size=%s, log_level=%s, "
"sync_log_buff_interval=%d, rotate_error_log=%d, "
"min_buff_size=%s, max_buff_size=%s, task_buffer_extra_size=%d, "
"log_level=%s, sync_log_buff_interval=%d, rotate_error_log=%d, "
"log_file_keep_days=%d, run_by_group=%s, run_by_user=%s",
g_sf_global_vars.base_path,
g_sf_global_vars.max_connections,
@ -437,6 +453,7 @@ void sf_global_config_to_string(char *output, const int size)
int_to_comma_str(g_sf_global_vars.max_pkg_size, sz_max_pkg_size),
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,
log_get_level_caption(),
g_sf_global_vars.sync_log_buff_interval,
g_sf_global_vars.rotate_error_log,

17
src/sf_global.h
View File

@ -39,6 +39,7 @@ typedef struct sf_global_variables {
int max_pkg_size;
int min_buff_size;
int max_buff_size;
int task_buffer_extra_size;
int thread_stack_size;
int sync_log_buff_interval; //sync log buff to disk every interval seconds
@ -113,30 +114,33 @@ extern SFContext g_sf_context;
} while (0)
int sf_load_global_config_ex(const char *server_name,
IniFullContext *ini_ctx, const bool load_network_params);
IniFullContext *ini_ctx, const bool load_network_params,
const int task_buffer_extra_size);
static inline int sf_load_global_config(const char *server_name,
IniFullContext *ini_ctx)
{
const bool load_network_params = true;
return sf_load_global_config_ex(server_name,
ini_ctx, load_network_params);
const int task_buffer_extra_size = 0;
return sf_load_global_config_ex(server_name, ini_ctx,
load_network_params, task_buffer_extra_size);
}
int sf_load_config_ex(const char *server_name,
SFContextIniConfig *config);
SFContextIniConfig *config, const int task_buffer_extra_size);
static inline int sf_load_config(const char *server_name,
const char *filename, IniContext *pIniContext,
const char *section_name, const int default_inner_port,
const int default_outer_port)
const int default_outer_port, const int task_buffer_extra_size)
{
SFContextIniConfig config;
SF_SET_CONTEXT_INI_CONFIG(config, filename, pIniContext,
section_name, default_inner_port, default_outer_port,
DEFAULT_WORK_THREADS);
return sf_load_config_ex(server_name, &config);
return sf_load_config_ex(server_name, &config, task_buffer_extra_size);
}
int sf_load_context_from_config_ex(SFContext *sf_context,
@ -169,4 +173,3 @@ void sf_log_config_ex(const char *other_config);
#endif
#endif