aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2013-08-29 18:32:04 +0300
committerEli Zaretskii2013-08-29 18:32:04 +0300
commit3f940c5aa6fc1d03e6658cda5c440fb6bd75e4c5 (patch)
tree5729694efb5e29a00b9fad2f9c081d2198f3ccc9 /src/ChangeLog
parent20de2834a594370b2f30fa55932c9de3da6150ed (diff)
downloademacs-3f940c5aa6fc1d03e6658cda5c440fb6bd75e4c5.tar.gz
emacs-3f940c5aa6fc1d03e6658cda5c440fb6bd75e4c5.zip
A possible fix for bug #14333 with hanging at exit on MS-Windows.
src/w32.c (term_winsock): Call release_listen_threads before calling WSACleanup. (_sys_wait_accept): Wait for accept event in a loop with a finite timeout, instead of waiting indefinitely. Will hopefully avoid hanging during exit because WSACleanup deadlocks waiting for the event object to be released. src/w32proc.c (release_listen_threads): New function, signals all the reader threads that listen for connections to stop waiting. src/w32.h (release_listen_threads): Add prototype.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a020c1278e3..0a24427f683 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
12013-08-29 Eli Zaretskii <eliz@gnu.org>
2
3 * w32.c (term_winsock): Call release_listen_threads before calling
4 WSACleanup.
5 (_sys_wait_accept): Wait for accept event in a loop with a finite
6 timeout, instead of waiting indefinitely. Will hopefully avoid
7 hanging during exit because WSACleanup deadlocks waiting for the
8 event object to be released. (Bug#14333)
9
10 * w32proc.c (release_listen_threads): New function, signals all
11 the reader threads that listen for connections to stop waiting.
12
13 * w32.h (release_listen_threads): Add prototype.
14
12013-08-29 Dmitry Antipov <dmantipov@yandex.ru> 152013-08-29 Dmitry Antipov <dmantipov@yandex.ru>
2 16
3 * alloc.c (Fmake_marker, build_marker): Zero need_adjustment 17 * alloc.c (Fmake_marker, build_marker): Zero need_adjustment