1 Star 0 Fork 38

huyab/rsyslog

forked from src-openEuler/rsyslog 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
克隆/下载
backport-tcpsrv-do-not-decrease-number-of-to-be-processed-fds.patch 1.01 KB
一键复制 编辑 原始数据 按行查看 历史
周文培 提交于 2022-08-04 15:45 +08:00 . backport patches from upstream and enable check
From d909290dc2d9ffab86409e054abd1abaaf998571 Mon Sep 17 00:00:00 2001
From: Iwan Timmer <iwan.timmer@northwave.nl>
Date: Fri, 29 Apr 2022 15:14:27 +0200
Subject: [PATCH] tcpsrv: do not decrease number of to be processed fds on
error
nfds should only be decreased for processed streams and not for
streams returning an error code, like RS_RET_RETRY.
Conflict:NA
Reference:https://github.com/rsyslog/rsyslog/commit/6ffc14fd450b90872272871130d29ab3ecf85f6f
---
runtime/tcpsrv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/runtime/tcpsrv.c b/runtime/tcpsrv.c
index 06b9abe..2c91c2e 100644
--- a/runtime/tcpsrv.c
+++ b/runtime/tcpsrv.c
@@ -880,7 +880,8 @@ RunSelect(tcpsrv_t *pThis, nsd_epworkset_t workset[], size_t sizeWorkset)
processWorkset(pThis, NULL, iWorkset, workset);
iWorkset = 0;
}
- --nfds; /* indicate we have processed one */
+ if(bIsReady)
+ --nfds; /* indicate we have processed one */
}
iTCPSess = TCPSessGetNxtSess(pThis, iTCPSess);
}
--
2.33.0
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/huyab/rsyslog.git
git@gitee.com:huyab/rsyslog.git
huyab
rsyslog
rsyslog
master

搜索帮助