JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: FIFO: stop the listen_client thread before fork/exec

Browse Source 
Add methods need_fixup_before, init_fixup_before, and
fixup_before_fork_exec to accomplish this.  Stopping the thread makes
sure that the client handler lists of the parent and child remain in
sync while the forking/execing is in progress.
This commit is contained in:
Ken Brown 2019-04-20 11:41:12 -04:00
parent 252cd0ce2b
commit 4443100b53
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
winsup/cygwin/fhandler.h
View File

@ -1300,6 +1300,9 @@ public:
void __reg3 raw_read (void *ptr, size_t& ulen); void __reg3 raw_read (void *ptr, size_t& ulen);
ssize_t __reg3 raw_write (const void *ptr, size_t ulen); ssize_t __reg3 raw_write (const void *ptr, size_t ulen);
bool arm (HANDLE h); bool arm (HANDLE h);
bool need_fixup_before () const { return reader; }
int fixup_before_fork_exec (DWORD) { return stop_listen_client (); }
void init_fixup_before ();
void fixup_after_fork (HANDLE); void fixup_after_fork (HANDLE);
void fixup_after_exec (); void fixup_after_exec ();
int __reg2 fstatvfs (struct statvfs *buf); int __reg2 fstatvfs (struct statvfs *buf);

13
winsup/cygwin/fhandler_fifo.cc
View File

@ -522,8 +522,11 @@ fhandler_fifo::open (int flags, mode_t)
goto out; goto out;
} }
else else
{
init_fixup_before ();
res = success; res = success;
} }
}
/* If we're writing, wait for read_ready and then connect to the /* If we're writing, wait for read_ready and then connect to the
pipe. This should always succeed quickly if the reader's pipe. This should always succeed quickly if the reader's
@ -752,7 +755,7 @@ fhandler_fifo::raw_read (void *in_ptr, size_t& len)
{ {
size_t orig_len = len; size_t orig_len = len;
/* Start the listen_client thread if necessary (e.g., after dup or fork). */ /* Start the listen_client thread if necessary (e.g., after fork or exec). */
if (!listen_client_thr && !listen_client ()) if (!listen_client_thr && !listen_client ())
goto errout; goto errout;
@ -934,10 +937,18 @@ fhandler_fifo::dup (fhandler_base *child, int flags)
fhf->fifo_client_unlock (); fhf->fifo_client_unlock ();
if (!reader || fhf->listen_client ()) if (!reader || fhf->listen_client ())
ret = 0; ret = 0;
if (reader)
fhf->init_fixup_before ();
out: out:
return ret; return ret;
} }
void
fhandler_fifo::init_fixup_before ()
{
cygheap->fdtab.inc_need_fixup_before ();
}
void void
fhandler_fifo::fixup_after_fork (HANDLE parent) fhandler_fifo::fixup_after_fork (HANDLE parent)
{ {