gfwleak/pxz-hos-client-cpp-module
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞fix(fs2): 修复偶尔会导致程序重启的bug

Browse Source
This commit is contained in:
彭宣正
2021-03-24 15:12:48 +08:00
parent bf1b324890
commit 94e8a4b54b
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/hos_client.cpp
View File

@@ -166,7 +166,6 @@ void hos_set_cache_size(hos_client_handle client, size_t cache_size)
return; return;
} }
client->cache_size = cache_size; client->cache_size = cache_size;
hos_cache = (size_t *)calloc(client->thread_sum, sizeof(size_t));
return ; return ;
} }
@@ -245,6 +244,8 @@ hos_client_handle hos_client_create(const char *serverip, size_t port, const cha
g_hos_handle->pool_thread_size = pool_size; g_hos_handle->pool_thread_size = pool_size;
g_hos_handle->executor = std::dynamic_pointer_cast<Aws::Utils::Threading::PooledThreadExecutor>(config.executor); g_hos_handle->executor = std::dynamic_pointer_cast<Aws::Utils::Threading::PooledThreadExecutor>(config.executor);
hos_cache = (size_t *)calloc(g_hos_handle->thread_sum, sizeof(size_t));
fd_info[0][0] = 65533; fd_info[0][0] = 65533;
fd_info[0][1] = 0; fd_info[0][1] = 0;
fd_info[0][2] = 0; fd_info[0][2] = 0;
@@ -495,17 +496,15 @@ void hos_expand_fs2(hos_client_handle handle, const char * path, int format, cha
********************************************************/ ********************************************************/
fs2_info = &handle->fs2_info[3]; fs2_info = &handle->fs2_info[3];
fs2_handle = &handle->fs2_info[3].fs2_handle; fs2_handle = &handle->fs2_info[3].fs2_handle;
fs2_info->line_ids = (int *)calloc(4, sizeof(int)); fs2_info->line_ids = (int *)calloc(1, sizeof(int));
fs2_info->column_ids = (int *)calloc(1, sizeof(int)); fs2_info->column_ids = (int *)calloc(4, sizeof(int));
const char *poolthread_col[4] = {"PoolSize", "Busy", "TopBusy", "AveBusy"}; const char *poolthread_col[4] = {"PoolSize", "Busy", "TopBusy", "AveBusy"};
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
snprintf(buff, sizeof(buff), poolthread_col[i]); fs2_info->column_ids[i] = FS_register(*fs2_handle, FS_STYLE_COLUMN, FS_CALC_CURRENT, poolthread_col[i]);
fs2_info->column_ids[i] = FS_register(*fs2_handle, FS_STYLE_COLUMN, FS_CALC_CURRENT, buff);
} }
snprintf(buff, sizeof(buff), "ThreadNum"); fs2_info->line_ids[0] = FS_register(*fs2_handle, FS_STYLE_LINE, FS_CALC_CURRENT, "ThreadNum");
fs2_info->line_ids[0] = FS_register(*fs2_handle, FS_STYLE_LINE, FS_CALC_CURRENT, buff);
FS_start(*fs2_handle); FS_start(*fs2_handle);
@@ -972,7 +971,7 @@ int hos_client_destory(hos_client_handle handle)
{ {
handle->fs2_status = HOS_FS2_STOP; handle->fs2_status = HOS_FS2_STOP;
pthread_join(handle->fs2_thread, NULL); pthread_join(handle->fs2_thread, NULL);
for (i = 0; i < 3; i++) for (i = 0; i < FS2_RECORD_EVENTS; i++)
{ {
screen_stat_handle_t *fs2_handle = &handle->fs2_info[i].fs2_handle; screen_stat_handle_t *fs2_handle = &handle->fs2_info[i].fs2_handle;
FS_stop(fs2_handle); FS_stop(fs2_handle);