Compare commits

..

No commits in common. "master" and "V1.2.11" have entirely different histories.

4 changed files with 5 additions and 38 deletions

18
debian/changelog vendored
View File

@ -1,21 +1,3 @@
libserverframe (1.2.11-1) unstable; urgency=medium
* upgrade to 1.2.11-1
-- YuQing <384681@qq.com> Sun, 23 Nov 2025 10:48:22 +0000
libserverframe (1.2.11-1) unstable; urgency=medium
* upgrade to 1.2.11-1
-- YuQing <384681@qq.com> Sun, 23 Nov 2025 10:00:56 +0000
libserverframe (1.2.11-1) unstable; urgency=medium
* upgrade to 1.2.11-1
-- YuQing <384681@qq.com> Sun, 23 Nov 2025 09:06:43 +0000
libserverframe (1.2.8-1) unstable; urgency=medium
* upgrade to 1.2.8-1

2
debian/substvars vendored
View File

@ -1 +1 @@
libfastcommon:Version=1.0.83
libfastcommon:Version=1.0.78

View File

@ -2,7 +2,7 @@
%define CommitVersion %(echo $COMMIT_VERSION)
Name: libserverframe
Version: 1.2.12
Version: 1.2.11
Release: 1%{?dist}
Summary: network framework library
License: AGPL v3.0
@ -12,9 +12,9 @@ Source: http://github.com/happyfish100/libserverframe/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libfastcommon-devel >= 1.0.84
BuildRequires: libfastcommon-devel >= 1.0.83
Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
Requires: libfastcommon >= 1.0.84
Requires: libfastcommon >= 1.0.83
%description
common framework library

View File

@ -671,9 +671,7 @@ int sf_load_context_from_config_ex(SFContext *sf_context,
int outer_port;
int port;
#if IOEVENT_USE_URING
bool global_use_io_uring;
bool global_use_send_zc;
bool use_io_uring;
bool use_send_zc;
#endif
int i;
@ -713,15 +711,6 @@ int sf_load_context_from_config_ex(SFContext *sf_context,
}
#if IOEVENT_USE_URING
global_use_io_uring = iniGetBoolValue(NULL, "use_io_uring",
config->ini_ctx.context, false);
if (config->ini_ctx.section_name == NULL) {
use_io_uring = global_use_io_uring;
} else {
use_io_uring = iniGetBoolValue(config->ini_ctx.section_name,
"use_io_uring", config->ini_ctx.context, global_use_io_uring);
}
global_use_send_zc = iniGetBoolValue(NULL, "use_send_zc",
config->ini_ctx.context, true);
if (config->ini_ctx.section_name == NULL) {
@ -777,11 +766,7 @@ int sf_load_context_from_config_ex(SFContext *sf_context,
}
#if IOEVENT_USE_URING
if (config->comm_type == fc_comm_type_sock) {
sf_context->use_io_uring = use_io_uring;
} else {
sf_context->use_io_uring = false;
}
sf_context->use_io_uring = (config->comm_type == fc_comm_type_sock);
sf_context->use_send_zc = sf_context->use_io_uring ? use_send_zc : false;
#else
sf_context->use_io_uring = false;