libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: POSIX msg queues: Implement dup 

Create a private method fhandler_mqueue::_dup and call it from
dup and fixup_after_fork methods.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-05-25 16:50:16 +02:00
parent b62450cf17
commit fbcd61063b
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/fhandler.h
View File

@ -3113,6 +3113,8 @@ class fhandler_mqueue: public fhandler_disk_file
struct mq_info *mqinfo_open (int); struct mq_info *mqinfo_open (int);
void mq_open_finish (bool success, bool created); void mq_open_finish (bool success, bool created);
int _dup (HANDLE parent, fhandler_mqueue *child);
public: public:
fhandler_mqueue (); fhandler_mqueue ();
fhandler_mqueue (void *) {} fhandler_mqueue (void *) {}

44
winsup/cygwin/fhandler_mqueue.cc
View File

@ -353,15 +353,7 @@ fhandler_mqueue::fstat (struct stat *buf)
} }
int int
fhandler_mqueue::dup (fhandler_base *child, int flags) fhandler_mqueue::_dup (HANDLE parent, fhandler_mqueue *fhc)
{
/* FIXME */
set_errno (EBADF);
return -1;
}
void
fhandler_mqueue::fixup_after_fork (HANDLE parent)
{ {
__try __try
{ {
@ -370,7 +362,7 @@ fhandler_mqueue::fixup_after_fork (HANDLE parent)
NTSTATUS status; NTSTATUS status;
if (!DuplicateHandle (parent, mqinfo ()->mqi_sect, if (!DuplicateHandle (parent, mqinfo ()->mqi_sect,
GetCurrentProcess (), &mqinfo ()->mqi_sect, GetCurrentProcess (), &fhc->mqinfo ()->mqi_sect,
0, FALSE, DUPLICATE_SAME_ACCESS)) 0, FALSE, DUPLICATE_SAME_ACCESS))
__leave; __leave;
status = NtMapViewOfSection (mqinfo ()->mqi_sect, NtCurrentProcess (), status = NtMapViewOfSection (mqinfo ()->mqi_sect, NtCurrentProcess (),
@ -380,31 +372,47 @@ fhandler_mqueue::fixup_after_fork (HANDLE parent)
api_fatal ("Mapping message queue failed in fork, status 0x%x\n", api_fatal ("Mapping message queue failed in fork, status 0x%x\n",
status); status);
mqinfo ()->mqi_hdr = (struct mq_hdr *) mptr; fhc->mqinfo ()->mqi_hdr = (struct mq_hdr *) mptr;
if (!DuplicateHandle (parent, mqinfo ()->mqi_waitsend, if (!DuplicateHandle (parent, mqinfo ()->mqi_waitsend,
GetCurrentProcess (), &mqinfo ()->mqi_waitsend, GetCurrentProcess (), &fhc->mqinfo ()->mqi_waitsend,
0, FALSE, DUPLICATE_SAME_ACCESS)) 0, FALSE, DUPLICATE_SAME_ACCESS))
__leave; __leave;
if (!DuplicateHandle (parent, mqinfo ()->mqi_waitrecv, if (!DuplicateHandle (parent, mqinfo ()->mqi_waitrecv,
GetCurrentProcess (), &mqinfo ()->mqi_waitrecv, GetCurrentProcess (), &fhc->mqinfo ()->mqi_waitrecv,
0, FALSE, DUPLICATE_SAME_ACCESS)) 0, FALSE, DUPLICATE_SAME_ACCESS))
__leave; __leave;
if (!DuplicateHandle (parent, mqinfo ()->mqi_lock, if (!DuplicateHandle (parent, mqinfo ()->mqi_lock,
GetCurrentProcess (), &mqinfo ()->mqi_lock, GetCurrentProcess (), &fhc->mqinfo ()->mqi_lock,
0, FALSE, DUPLICATE_SAME_ACCESS)) 0, FALSE, DUPLICATE_SAME_ACCESS))
__leave; __leave;
return; return 0;
} }
__except (EFAULT) {} __except (EFAULT) {}
__endtry __endtry
api_fatal ("Creating IPC object failed in fork, %E"); return -1;
}
int
fhandler_mqueue::dup (fhandler_base *child, int flags)
{
fhandler_mqueue *fhc = (fhandler_mqueue *) child;
int ret = fhandler_disk_file::dup (child, flags);
if (!ret)
ret = _dup (GetCurrentProcess (), fhc);
return ret;
}
void
fhandler_mqueue::fixup_after_fork (HANDLE parent)
{
if (_dup (parent, this))
api_fatal ("Creating IPC object failed in fork, %E");
} }
int int
fhandler_mqueue::close () fhandler_mqueue::close ()
{ {
int ret = -1;
__try __try
{ {
mqinfo ()->mqi_magic = 0; /* just in case */ mqinfo ()->mqi_magic = 0; /* just in case */