summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Brown <kbrown@cornell.edu>2019-04-18 15:39:52 +0000
committerCorinna Vinschen <corinna@vinschen.de>2019-04-18 19:34:07 +0200
commit230c5df2dfddeb83d31b16f791a079871ba224e8 (patch)
treea4b928990b62a8f9f4133b7f91198a17b7f4aaf9
parentf811485ffb78286929cd555d65bb70b8cac51c0c (diff)
downloadcygnal-230c5df2dfddeb83d31b16f791a079871ba224e8.tar.gz
cygnal-230c5df2dfddeb83d31b16f791a079871ba224e8.tar.bz2
cygnal-230c5df2dfddeb83d31b16f791a079871ba224e8.zip
Cygwin: FIFO: avoid hang after exec
Define fhandler:fifo::fixup_after_exec, which sets listen_client_thr and lct_termination_evt to NULL. This forces the listen_client thread to restart on the first attempt to read after an exec. Previously the exec'd process could hang in fhandler_fifo::raw_read.
-rw-r--r--winsup/cygwin/fhandler.h1
-rw-r--r--winsup/cygwin/fhandler_fifo.cc9
2 files changed, 10 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 8fb176b24..da007ee45 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1301,6 +1301,7 @@ public:
ssize_t __reg3 raw_write (const void *ptr, size_t ulen);
bool arm (HANDLE h);
void fixup_after_fork (HANDLE);
+ void fixup_after_exec ();
int __reg2 fstatvfs (struct statvfs *buf);
void clear_readahead ()
{
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc
index 1d02adbaa..bc9c23998 100644
--- a/winsup/cygwin/fhandler_fifo.cc
+++ b/winsup/cygwin/fhandler_fifo.cc
@@ -943,6 +943,15 @@ fhandler_fifo::fixup_after_fork (HANDLE parent)
}
void
+fhandler_fifo::fixup_after_exec ()
+{
+ fhandler_base::fixup_after_exec ();
+ listen_client_thr = NULL;
+ lct_termination_evt = NULL;
+ fifo_client_unlock ();
+}
+
+void
fhandler_fifo::set_close_on_exec (bool val)
{
fhandler_base::set_close_on_exec (val);