diff options
| author | Lars Ingebrigtsen | 2022-03-04 16:27:10 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2022-03-04 16:27:10 +0100 |
| commit | cdbc2f9d274a23bcf6cb03046b1e5b4bdcedafb1 (patch) | |
| tree | aef3f6a300ddbfe0a55364f0dc310e27a391dbdc /admin | |
| parent | 345c4c6532d3784eed5acbaea8a78ce3aad071e4 (diff) | |
| download | emacs-cdbc2f9d274a23bcf6cb03046b1e5b4bdcedafb1.tar.gz emacs-cdbc2f9d274a23bcf6cb03046b1e5b4bdcedafb1.zip | |
Add some sleeps to gnutls_try_handshake
* admin/merge-gnulib (GNULIB_MODULES): Add the nanosleep module.
* m4/gnulib-comp.m4 (gl_EARLY):
* lib/gnulib.mk.in: Automatic update.
* m4/nanosleep.m4:
* lib/nanosleep.c: New module.
* nt/mingw-cfg.site (gl_cv_func_free_preserves_errno):
* nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_nanosleep): Omit nanosleep,
since mingw has it.
* src/gnutls.c (gnutls_try_handshake): Add some sleeping to the
busy-wait loop so that we don't use 100% CPU here (bug#32452).
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index fec469c0179..ea3d23686f4 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -40,7 +40,7 @@ GNULIB_MODULES=' | |||
| 40 | getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog | 40 | getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog |
| 41 | ieee754-h ignore-value intprops largefile libgmp lstat | 41 | ieee754-h ignore-value intprops largefile libgmp lstat |
| 42 | manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime | 42 | manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime |
| 43 | nproc nstrftime | 43 | nanosleep nproc nstrftime |
| 44 | pathmax pipe2 pselect pthread_sigmask | 44 | pathmax pipe2 pselect pthread_sigmask |
| 45 | qcopy-acl readlink readlinkat regex | 45 | qcopy-acl readlink readlinkat regex |
| 46 | sig2str sigdescr_np socklen stat-time std-gnu11 stdalign stddef stdio | 46 | sig2str sigdescr_np socklen stat-time std-gnu11 stdalign stddef stdio |