gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(TSG-15308): 修复packet io thread启动时，intercept_policy_enforcer为空导致core

Browse Source
This commit is contained in:
wangmenglan
2023-05-31 19:41:18 +08:00
parent 6574566276
commit 0973d8c35a
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/include/internal/proxy.h
View File

@@ -177,6 +177,7 @@ struct tfe_proxy
}; };
extern struct tfe_proxy * g_default_proxy; extern struct tfe_proxy * g_default_proxy;
extern int worker_thread_ready;
#define TFE_PROXY_STAT_INCREASE(field, val) \ #define TFE_PROXY_STAT_INCREASE(field, val) \
do { __atomic_fetch_add(&g_default_proxy->stat_val[field], val, __ATOMIC_RELAXED); } while(0) do { __atomic_fetch_add(&g_default_proxy->stat_val[field], val, __ATOMIC_RELAXED); } while(0)

8
platform/src/acceptor_kni_v4.cpp
View File

@@ -93,15 +93,19 @@ static void *worker_thread_cycle(void *arg)
void * logger = thread_ctx->logger; void * logger = thread_ctx->logger;
int pkg_len = 0; int pkg_len = 0;
char thread_name[32]; char thread_name[16];
int n_pkt_recv_from_nf = 0; int n_pkt_recv_from_nf = 0;
int n_pkt_recv_from_tap = 0; int n_pkt_recv_from_tap = 0;
int n_pkt_recv_from_tap_c = 0; int n_pkt_recv_from_tap_c = 0;
int n_pkt_recv_from_tap_s = 0; int n_pkt_recv_from_tap_s = 0;
snprintf(thread_name, sizeof(thread_name), "packet-io:worker-%d", thread_ctx->thread_index); snprintf(thread_name, sizeof(thread_name), "pkt:worker-%d", thread_ctx->thread_index);
prctl(PR_SET_NAME, (unsigned long long)thread_name, NULL, NULL, NULL); prctl(PR_SET_NAME, (unsigned long long)thread_name, NULL, NULL, NULL);
while (!worker_thread_ready) {
sleep(1);
}
if (packet_io_thread_init(handle, thread_ctx, logger) != 0) if (packet_io_thread_init(handle, thread_ctx, logger) != 0)
{ {
goto error_out; goto error_out;

2
platform/src/proxy.cpp
View File

@@ -72,6 +72,7 @@ static int signals[] = {SIGHUP, SIGPIPE, SIGUSR1, SIGUSR2};
void * g_default_logger = NULL; void * g_default_logger = NULL;
struct tfe_proxy * g_default_proxy = NULL; struct tfe_proxy * g_default_proxy = NULL;
bool g_print_to_stderr = true; bool g_print_to_stderr = true;
int worker_thread_ready = 0;
/* Per thread resource */ /* Per thread resource */
thread_local unsigned int __currect_thread_id = 0; thread_local unsigned int __currect_thread_id = 0;
@@ -749,6 +750,7 @@ int main(int argc, char * argv[])
g_print_to_stderr = false; g_print_to_stderr = false;
sleep(1); sleep(1);
} }
worker_thread_ready = 1;
event_base_dispatch(g_default_proxy->evbase); event_base_dispatch(g_default_proxy->evbase);
return 0; return 0;