From 0f75b039f60bd65f0ac1c5d5133ac133a7e02d8c Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Fri, 26 Sep 2025 19:57:03 +0800 Subject: [PATCH] sf_logger_set_schedule_entry change to sf_logger_set_schedule_entries --- src/sf_define.h | 2 ++ src/sf_service.c | 12 +++++------- src/sf_util.c | 2 +- src/sf_util.h | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/sf_define.h b/src/sf_define.h index 76a05a0..81f6059 100644 --- a/src/sf_define.h +++ b/src/sf_define.h @@ -96,6 +96,8 @@ #define SF_BINLOG_SOURCE_USER 'U' //by user call #define SF_BINLOG_SOURCE_REPLAY 'R' //by binlog replay +#define SF_LOG_SCHEDULE_ENTRIES_COUNT 3 + #ifdef __cplusplus extern "C" { #endif diff --git a/src/sf_service.c b/src/sf_service.c index 685ed01..9f1f0b6 100644 --- a/src/sf_service.c +++ b/src/sf_service.c @@ -782,15 +782,13 @@ int sf_setup_signal_handler() return 0; } -#define LOG_SCHEDULE_ENTRIES_COUNT 3 - int sf_startup_schedule(pthread_t *schedule_tid) { ScheduleArray scheduleArray; - ScheduleEntry scheduleEntries[LOG_SCHEDULE_ENTRIES_COUNT]; + ScheduleEntry scheduleEntries[SF_LOG_SCHEDULE_ENTRIES_COUNT]; scheduleArray.entries = scheduleEntries; - sf_setup_schedule(&g_log_context, &g_sf_global_vars.error_log, + sf_logger_setup_schedule(&g_log_context, &g_sf_global_vars.error_log, &scheduleArray); return sched_start(&scheduleArray, schedule_tid, g_sf_global_vars.thread_stack_size, (bool * volatile) @@ -801,7 +799,7 @@ int sf_add_slow_log_schedule(SFSlowLogContext *slowlog_ctx) { int result; ScheduleArray scheduleArray; - ScheduleEntry scheduleEntries[LOG_SCHEDULE_ENTRIES_COUNT]; + ScheduleEntry scheduleEntries[SF_LOG_SCHEDULE_ENTRIES_COUNT]; if (!slowlog_ctx->cfg.enabled) { return 0; @@ -814,8 +812,8 @@ int sf_add_slow_log_schedule(SFSlowLogContext *slowlog_ctx) } scheduleArray.entries = scheduleEntries; - sf_setup_schedule(&slowlog_ctx->ctx, &slowlog_ctx->cfg.log_cfg, - &scheduleArray); + sf_logger_setup_schedule(&slowlog_ctx->ctx, &slowlog_ctx-> + cfg.log_cfg, &scheduleArray); return sched_add_entries(&scheduleArray); } diff --git a/src/sf_util.c b/src/sf_util.c index db82a8b..59cc162 100644 --- a/src/sf_util.c +++ b/src/sf_util.c @@ -281,7 +281,7 @@ int sf_logger_init(LogContext *pContext, const char *filename_prefix) return 0; } -ScheduleEntry *sf_logger_set_schedule_entry(struct log_context *pContext, +ScheduleEntry *sf_logger_set_schedule_entries(struct log_context *pContext, SFLogConfig *log_cfg, ScheduleEntry *pScheduleEntry) { INIT_SCHEDULE_ENTRY(*pScheduleEntry, sched_generate_next_id(), diff --git a/src/sf_util.h b/src/sf_util.h index e6b72e9..58b4381 100644 --- a/src/sf_util.h +++ b/src/sf_util.h @@ -96,14 +96,14 @@ void sf_parse_cmd_option_bool(int argc, char *argv[], int sf_logger_init(LogContext *pContext, const char *filename_prefix); -ScheduleEntry *sf_logger_set_schedule_entry(struct log_context *pContext, +ScheduleEntry *sf_logger_set_schedule_entries(struct log_context *pContext, SFLogConfig *log_cfg, ScheduleEntry *pScheduleEntry); -static inline void sf_setup_schedule(struct log_context *pContext, +static inline void sf_logger_setup_schedule(struct log_context *pContext, SFLogConfig *log_cfg, ScheduleArray *scheduleArray) { ScheduleEntry *scheduleEntry; - scheduleEntry = sf_logger_set_schedule_entry(pContext, + scheduleEntry = sf_logger_set_schedule_entries(pContext, log_cfg, scheduleArray->entries); scheduleArray->count = scheduleEntry - scheduleArray->entries; }