From f0ee6ce73f0cf6f9e249a30304e0ef1b5c0812d4 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Sun, 21 Sep 2025 15:08:08 +0800 Subject: [PATCH] struct sf_context remove field: remove_from_ready_list --- src/idempotency/client/receipt_handler.c | 1 - src/sf_global.c | 2 +- src/sf_nio.c | 4 ---- src/sf_nio.h | 9 --------- src/sf_service.c | 4 ++++ src/sf_types.h | 1 - 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/idempotency/client/receipt_handler.c b/src/idempotency/client/receipt_handler.c index 0a44d01..e0c1d06 100644 --- a/src/idempotency/client/receipt_handler.c +++ b/src/idempotency/client/receipt_handler.c @@ -565,7 +565,6 @@ int receipt_handler_init(FCAddressPtrArray *address_array) } sf_enable_thread_notify(true); - sf_set_remove_from_ready_list(false); fc_sleep_ms(100); return 0; diff --git a/src/sf_global.c b/src/sf_global.c index 26c7046..3c91200 100644 --- a/src/sf_global.c +++ b/src/sf_global.c @@ -51,7 +51,7 @@ SFContext g_sf_context = {{'\0'}, NULL, 0, false, sf_address_family_auto, {{AF_UNSPEC, {{true, fc_comm_type_sock}, {false, fc_comm_type_rdma}}}, {AF_UNSPEC, {{true, fc_comm_type_sock}, {false, fc_comm_type_rdma}}}}, {DEFAULT_MAX_CONNECTONS, SF_DEF_MAX_PACKAGE_SIZE, SF_DEF_MIN_BUFF_SIZE, - SF_DEF_MAX_BUFF_SIZE}, 1, DEFAULT_WORK_THREADS, 0, true, true, true, + SF_DEF_MAX_BUFF_SIZE}, 1, DEFAULT_WORK_THREADS, 0, true, true, {false, 0, 0}, {sf_task_finish_clean_up} }; diff --git a/src/sf_nio.c b/src/sf_nio.c index 1d4d60f..4eb374d 100644 --- a/src/sf_nio.c +++ b/src/sf_nio.c @@ -68,10 +68,6 @@ void sf_task_detach_thread(struct fast_task_info *task) &task->event.timer); task->event.timer.expires = 0; } - - if (SF_CTX->remove_from_ready_list) { - ioevent_remove(&task->thread_data->ev_puller, task); - } } void sf_task_switch_thread(struct fast_task_info *task, diff --git a/src/sf_nio.h b/src/sf_nio.h index 2e93f3f..64e5403 100644 --- a/src/sf_nio.h +++ b/src/sf_nio.h @@ -68,15 +68,6 @@ static inline void sf_set_connect_done_callback_ex(SFContext *sf_context, sf_set_connect_done_callback_ex(&g_sf_context, done_callback) -static inline void sf_set_remove_from_ready_list_ex( - SFContext *sf_context, const bool enabled) -{ - sf_context->remove_from_ready_list = enabled; -} - -#define sf_set_remove_from_ready_list(enabled) \ - sf_set_remove_from_ready_list_ex(&g_sf_context, enabled); - static inline TaskCleanUpCallback sf_get_task_cleanup_callback_ex( SFContext *sf_context) { diff --git a/src/sf_service.c b/src/sf_service.c index 685ed01..aa6df86 100644 --- a/src/sf_service.c +++ b/src/sf_service.c @@ -161,7 +161,11 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name, if (SF_G_EPOLL_EDGE_TRIGGER) { #ifdef OS_LINUX +#if IOEVENT_USE_EPOLL extra_events = EPOLLET; +#else + extra_events = 0; +#endif #elif defined(OS_FREEBSD) extra_events = EV_CLEAR; #else diff --git a/src/sf_types.h b/src/sf_types.h index 6548a35..2a946e2 100644 --- a/src/sf_types.h +++ b/src/sf_types.h @@ -190,7 +190,6 @@ typedef struct sf_context { int work_threads; int header_size; - bool remove_from_ready_list; bool realloc_task_buffer; bool connect_need_log; //for client connect FCSmartPollingConfig smart_polling;