diff options
author | Eli Zaretskii <eliz@gnu.org> | 2013-08-29 18:32:04 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2013-08-29 18:32:04 +0300 |
commit | 3f940c5aa6fc1d03e6658cda5c440fb6bd75e4c5 (patch) | |
tree | 5729694efb5e29a00b9fad2f9c081d2198f3ccc9 /src/w32proc.c | |
parent | 20de2834a594370b2f30fa55932c9de3da6150ed (diff) | |
download | emacs-3f940c5aa6fc1d03e6658cda5c440fb6bd75e4c5.tar.gz |
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/w32proc.c')
-rw-r--r-- | src/w32proc.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/w32proc.c b/src/w32proc.c index 54316a6f80f..dabaa62f71c 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -990,6 +990,18 @@ find_child_pid (DWORD pid) return NULL; } +void +release_listen_threads (void) +{ + int i; + + for (i = child_proc_count - 1; i >= 0; i--) + { + if (CHILD_ACTIVE (&child_procs[i]) + && (fd_info[child_procs[i].fd].flags & FILE_LISTEN)) + child_procs[i].status = STATUS_READ_ERROR; + } +} /* Thread proc for child process and socket reader threads. Each thread is normally blocked until woken by select() to check for input by |