[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when se
From: |
Lars Ingebrigtsen |
Subject: |
Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy |
Date: |
Wed, 02 Mar 2022 02:22:37 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) |
Paul Eggert <eggert@cs.ucla.edu> writes:
> Do you see this problem with a fresh checkout from the latest master
> branch, combined with the latest Gnulib?
Yes, when I add the nanosleep module as previously described.
> If not, problem solved. If so, what's the output of 'git status' and
> of 'git diff' when things fail?
larsi@giant:~/src/emacs/gtest$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: lib/nanosleep.c
new file: m4/nanosleep.m4
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: admin/merge-gnulib
modified: lib/gnulib.mk.in
modified: m4/gnulib-comp.m4
modified: src/gnutls.c
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index fec469c017..ea3d23686f 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -40,7 +40,7 @@ GNULIB_MODULES=
getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog
ieee754-h ignore-value intprops largefile libgmp lstat
manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime
- nproc nstrftime
+ nanosleep nproc nstrftime
pathmax pipe2 pselect pthread_sigmask
qcopy-acl readlink readlinkat regex
sig2str sigdescr_np socklen stat-time std-gnu11 stdalign stddef stdio
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 3a9f5b9818..b79eebc804 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -129,6 +129,7 @@
# minmax \
# mkostemp \
# mktime \
+# nanosleep \
# nproc \
# nstrftime \
# pathmax \
@@ -2497,6 +2498,16 @@ EXTRA_libgnu_a_SOURCES += mktime.c
endif
## end gnulib module mktime-internal
+## begin gnulib module nanosleep
+ifeq (,$(OMIT_GNULIB_MODULE_nanosleep))
+
+ifneq (,$(GL_COND_OBJ_NANOSLEEP_CONDITION))
+libgnu_a_SOURCES += nanosleep.c
+endif
+
+endif
+## end gnulib module nanosleep
+
## begin gnulib module nproc
ifeq (,$(OMIT_GNULIB_MODULE_nproc))
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 1d31239d2d..fb5f1b52a4 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -140,6 +140,7 @@ AC_DEFUN
# Code from module mktime:
# Code from module mktime-internal:
# Code from module multiarch:
+ # Code from module nanosleep:
# Code from module nocrash:
# Code from module nproc:
# Code from module nstrftime:
@@ -430,6 +431,10 @@ AC_DEFUN
fi
gl_TIME_MODULE_INDICATOR([mktime])
gl_MULTIARCH
+ gl_FUNC_NANOSLEEP
+ gl_CONDITIONAL([GL_COND_OBJ_NANOSLEEP],
+ [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1])
+ gl_TIME_MODULE_INDICATOR([nanosleep])
gl_NPROC
gl_FUNC_GNU_STRFTIME
gl_PATHMAX
@@ -1304,6 +1309,7 @@ AC_DEFUN
lib/mkostemp.c
lib/mktime-internal.h
lib/mktime.c
+ lib/nanosleep.c
lib/nproc.c
lib/nproc.h
lib/nstrftime.c
@@ -1456,6 +1462,7 @@ AC_DEFUN
m4/mktime.m4
m4/mode_t.m4
m4/multiarch.m4
+ m4/nanosleep.m4
m4/nocrash.m4
m4/nproc.m4
m4/nstrftime.m4
diff --git a/src/gnutls.c b/src/gnutls.c
index 3ec3837067..5389b15b1e 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -616,6 +616,7 @@ gnutls_try_handshake (struct Lisp_Process *proc)
gnutls_session_t state = proc->gnutls_state;
int ret;
bool non_blocking = proc->is_non_blocking_client;
+ struct timespec delay = { 0, 1000 * 1000 * 10 };
if (proc->gnutls_complete_negotiation_p)
non_blocking = false;
@@ -630,6 +631,7 @@ gnutls_try_handshake (struct Lisp_Process *proc)
maybe_quit ();
if (non_blocking && ret != GNUTLS_E_INTERRUPTED)
break;
+ nanosleep (&delay, NULL);
}
proc->gnutls_initstage = GNUTLS_STAGE_HANDSHAKE_TRIED;
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Lars Ingebrigtsen, 2022/03/01
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Paul Eggert, 2022/03/01
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Lars Ingebrigtsen, 2022/03/01
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Paul Eggert, 2022/03/01
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy,
Lars Ingebrigtsen <=
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Paul Eggert, 2022/03/01
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Lars Ingebrigtsen, 2022/03/03
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Paul Eggert, 2022/03/03
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Lars Ingebrigtsen, 2022/03/04
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Lars Ingebrigtsen, 2022/03/03
- Message not available
- Re: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy, Lars Ingebrigtsen, 2022/03/01