From eabc5d52ac250ce7564e7a67f610de004d5c60a0 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Tue, 23 Jun 2026 15:43:27 +0800 Subject: [PATCH] log libfastcommon and libserverframe versions --- src/Makefile.in | 8 ++++---- src/sf_global.c | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 1476811..052aa90 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -10,7 +10,7 @@ TOP_HEADERS = sf_types.h sf_global.h sf_define.h sf_nio.h sf_service.h \ sf_sharding_htable.h sf_connection_manager.h sf_serializer.h \ sf_binlog_index.h sf_file_writer.h sf_binlog_writer.h \ sf_ordered_writer.h sf_buffered_writer.h sf_iov.h \ - sf_shared_mbuffer.h + sf_shared_mbuffer.h sf_version.h IDEMP_COMMON_HEADER = idempotency/common/idempotency_types.h @@ -32,9 +32,9 @@ SHARED_OBJS = sf_nio.lo sf_iov.lo sf_service.lo sf_global.lo \ sf_func.lo sf_util.lo sf_configs.lo sf_proto.lo \ sf_sharding_htable.lo sf_cluster_cfg.lo \ sf_connection_manager.lo sf_serializer.lo \ - sf_binlog_index.lo sf_file_writer.lo \ - sf_binlog_writer.lo sf_ordered_writer.lo \ - sf_shared_mbuffer.lo \ + sf_binlog_index.lo sf_file_writer.lo \ + sf_binlog_writer.lo sf_ordered_writer.lo \ + sf_shared_mbuffer.lo sf_version.lo \ idempotency/server/server_channel.lo \ idempotency/server/request_htable.lo \ idempotency/server/channel_htable.lo \ diff --git a/src/sf_global.c b/src/sf_global.c index aa4dec1..121d9c6 100644 --- a/src/sf_global.c +++ b/src/sf_global.c @@ -32,6 +32,8 @@ #include "fastcommon/process_ctrl.h" #include "fastcommon/local_ip_func.h" #include "fastcommon/logger.h" +#include "fastcommon/fc_version.h" +#include "sf_version.h" #include "sf_nio.h" #include "sf_service.h" #include "sf_global.h" @@ -1026,6 +1028,8 @@ void sf_global_config_to_string_ex(const char *max_pkg_size_item_nm, int max_pkg_size; int min_buff_size; int max_buff_size; + Version fc_ver; + Version sf_ver; char pkg_buff[256]; max_pkg_size = g_sf_global_vars.net_buffer_cfg.max_pkg_size - @@ -1045,9 +1049,18 @@ void sf_global_config_to_string_ex(const char *max_pkg_size_item_nm, min_buff_size / 1024, max_buff_size / 1024); } - len = snprintf(output, size, + fc_version(&fc_ver); + sf_version(&sf_ver); + len = snprintf(output, size, "libfastcommon version " + "{compile: %d.%d.%d, runtime: %d.%d.%d}, " + "libserverframe version " + "{compile: %d.%d.%d, runtime: %d.%d.%d}, " "base_path=%s, max_connections=%d, connect_timeout=%d, " "network_timeout=%d, thread_stack_size=%d KB, %s, ", + FC_MAJOR_VERSION, FC_MINOR_VERSION, FC_PATCH_VERSION, + fc_ver.major, fc_ver.minor, fc_ver.patch, + SF_MAJOR_VERSION, SF_MINOR_VERSION, SF_PATCH_VERSION, + sf_ver.major, sf_ver.minor, sf_ver.patch, SF_G_BASE_PATH_STR, g_sf_global_vars.net_buffer_cfg.max_connections, g_sf_global_vars.net_buffer_cfg.connect_timeout,