* fhandler.h (fhandler_fifo::get_io_handle): New fifo-specific method.
* fhandler_fifo.cc (fhandler_fifo::close): Close output_handle only if it is
open.
(fhandler_fifo::open_not_mine): Reorganize slightly. Don't call _pinfo methods
when the fifo is owned by me or suffer dtable lock_cs deadlock.
(fhandler_fifo::open): Call open_not_mine first, otherwise open myself
(racy).
* pinfo.cc (_pinfo::commune_recv): Duplicate fifo handles here in requesting
processes arena to avoid one potential race (of many).
(_pinfo::commune_send): Move all PICOM_FIFO code under one case statement.
* thread.cc (pthread::init_mainthread) Use existing hMainProc handle rather
than calling GetCurrentProcess.
+2004-06-07 Christopher Faylor <cgf@alum.bu.edu>
+
+ * dtable.cc (dtable::find_fifo): Release lock after fifo found (still
+ racy).
+ * fhandler.h (fhandler_fifo::get_io_handle): New fifo-specific method.
+ * fhandler_fifo.cc (fhandler_fifo::close): Close output_handle only if
+ it is open.
+ (fhandler_fifo::open_not_mine): Reorganize slightly. Don't call _pinfo
+ methods when the fifo is owned by me or suffer dtable lock_cs deadlock.
+ (fhandler_fifo::open): Call open_not_mine first, otherwise open myself
+ (racy).
+ * pinfo.cc (_pinfo::commune_recv): Duplicate fifo handles here in
+ requesting processes arena to avoid one potential race (of many).
+ (_pinfo::commune_send): Move all PICOM_FIFO code under one case
+ statement.
+
+ * thread.cc (pthread::init_mainthread) Use existing hMainProc handle
+ rather than calling GetCurrentProcess.
+
2004-06-04 Christopher Faylor <cgf@alum.bu.edu>
* winbase.h (ilockincr): Add more neverending changes from the
dtable::find_fifo (const char *path)
{
lock ();
+ fhandler_fifo *fh_res = NULL;
for (unsigned i = 0; i < size; i++)
{
fhandler_base *fh = fds[i];
if (fh && fh->isfifo () && strcmp (path, fh->get_win32_name ()) == 0)
- return (fhandler_fifo *) fh;
+ {
+ fh_res = (fhandler_fifo *) fh;
+ break;
+ }
}
- return NULL;
+ unlock ();
+ return fh_res;
}
select_record *
bool is_fs_special () {return pc.is_fs_special ();}
bool device_access_denied (int) __attribute__ ((regparm (2)));
int fhaccess (int flags) __attribute__ ((regparm (2)));
+ friend class fhandler_fifo;
};
class fhandler_socket: public fhandler_base
HANDLE owner; // You can't have too many mutexes, now, can you?
long read_use;
long write_use;
+ virtual HANDLE& get_io_handle () { return io_handle ?: output_handle; }
public:
fhandler_fifo ();
int open (int flags, mode_t mode = 0);
fhandler_fifo::close ()
{
fhandler_pipe::close ();
- CloseHandle (get_output_handle ());
+ if (get_output_handle ())
+ CloseHandle (get_output_handle ());
set_use (-1);
return 0;
}
winpids pids;
static int flagtypes[] = {DUMMY_O_RDONLY | O_RDWR, O_WRONLY | O_APPEND | O_RDWR};
HANDLE *usehandles[2] = {&(get_handle ()), &(get_output_handle ())};
- int res;
+ int res = 0;
+ int testflags = (flags & (O_RDWR | O_WRONLY | O_APPEND)) ?: DUMMY_O_RDONLY;
for (unsigned i = 0; i < pids.npids; i++)
{
_pinfo *p = pids[i];
- HANDLE hp = OpenProcess (PROCESS_DUP_HANDLE, false, p->dwProcessId);
- if (!hp)
+ commune_result r;
+ if (p->pid != myself->pid)
{
- __seterrno ();
- goto err;
+ r = p->commune_send (PICOM_FIFO, get_win32_name ());
+ if (r.handles[0] == NULL)
+ continue; // process doesn't own fifo
}
-
- HANDLE handles[2];
- commune_result r;
- r = p->commune_send (PICOM_FIFO, get_win32_name ());
- if (r.handles[0] == NULL)
- continue; // process doesn't own fifo
-
- flags = (flags & (O_RDWR | O_WRONLY | O_APPEND)) ?: DUMMY_O_RDONLY;
- for (int i = 0; i < 2; i++)
+ else
{
- if (!(flags & flagtypes[i]))
+ /* FIXME: racy? */
+ fhandler_fifo *fh = cygheap->fdtab.find_fifo (get_win32_name ());
+ if (!fh)
continue;
- if (!DuplicateHandle (hp, r.handles[i], hMainProc, usehandles[i], 0,
- false, DUPLICATE_SAME_ACCESS))
+ if (!DuplicateHandle (hMainProc, fh->get_handle (), hMainProc,
+ &r.handles[0], 0, false, DUPLICATE_SAME_ACCESS))
{
- debug_printf ("couldn't duplicate handle %d/%p, %E", i, handles[i]);
__seterrno ();
- goto err;
+ goto out;
}
-
- if (i == 0)
+ if (!DuplicateHandle (hMainProc, fh->get_handle (), hMainProc,
+ &r.handles[1], 0, false, DUPLICATE_SAME_ACCESS))
{
- read_state = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
- need_fork_fixup (true);
+ CloseHandle (r.handles[0]);
+ __seterrno ();
+ goto out;
}
}
- CloseHandle (hp);
+
+ for (int i = 0; i < 2; i++)
+ if (!(testflags & flagtypes[i]))
+ CloseHandle (r.handles[i]);
+ else
+ {
+ *usehandles[i] = r.handles[i];
+
+ if (i == 0)
+ {
+ read_state = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
+ need_fork_fixup (true);
+ }
+ }
res = 1;
set_flags (flags);
set_errno (EAGAIN);
-err:
- res = 0;
- debug_printf ("failed");
-
out:
debug_printf ("res %d", res);
return res;
{
int res = 1;
+ set_io_handle (NULL);
+ set_output_handle (NULL);
+ if (open_not_mine (flags))
+ goto out;
+
fhandler_pipe *fhs[2];
if (create (fhs, 0, flags, true))
- goto errnout;
-
- set_flags (fhs[0]->get_flags ());
- set_io_handle (fhs[0]->get_handle ());
- set_output_handle (fhs[1]->get_handle ());
- guard = fhs[0]->guard;
- read_state = fhs[0]->read_state;
- writepipe_exists = fhs[1]->writepipe_exists;
- orig_pid = fhs[0]->orig_pid;
- id = fhs[0]->id;
- delete (fhs[0]);
- delete (fhs[1]);
- set_use (1);
- goto out;
-
-errnout:
- __seterrno ();
- res = 0;
+ {
+ __seterrno ();
+ res = 0;
+ }
+ else
+ {
+ set_flags (fhs[0]->get_flags ());
+ set_io_handle (fhs[0]->get_handle ());
+ set_output_handle (fhs[1]->get_handle ());
+ guard = fhs[0]->guard;
+ read_state = fhs[0]->read_state;
+ writepipe_exists = fhs[1]->writepipe_exists;
+ orig_pid = fhs[0]->orig_pid;
+ id = fhs[0]->id;
+ delete (fhs[0]);
+ delete (fhs[1]);
+ set_use (1);
+ }
out:
debug_printf ("returning %d, errno %d", res, get_errno ());
return;
}
- CloseHandle (hp);
hello_pid = 0;
if (!ReadFile (__fromthem, &code, sizeof code, &nr, NULL) || nr != sizeof code)
{
+ CloseHandle (hp);
/* __seterrno ();*/ // this is run from the signal thread, so don't set errno
goto out;
}
CloseHandle (__fromthem); __fromthem = NULL;
extern int __argc_safe;
const char *argv[__argc_safe + 1];
+
+ CloseHandle (hp);
for (int i = 0; i < __argc_safe; i++)
{
if (IsBadStringPtr (__argv[i], INT32_MAX))
if (!ReadFile (__fromthem, &len, sizeof len, &nr, NULL)
|| nr != sizeof len)
{
+ CloseHandle (hp);
/* __seterrno ();*/ // this is run from the signal thread, so don't set errno
goto out;
}
if (!ReadFile (__fromthem, path, len, &nr, NULL)
|| nr != len)
{
+ CloseHandle (hp);
/* __seterrno ();*/ // this is run from the signal thread, so don't set errno
goto out;
}
{
it[0] = fh->get_handle ();
it[1] = fh->get_output_handle ();
+ for (int i = 0; i < 2; i++)
+ if (!DuplicateHandle (hMainProc, it[i], hp, &it[i], 0, false,
+ DUPLICATE_SAME_ACCESS))
+ {
+ it[0] = it[1] = NULL; /* FIXME: possibly left a handle open in child? */
+ break;
+ }
}
+ CloseHandle (hp);
if (!WriteFile (__tothem, it, sizeof (it), &nr, NULL))
{
/*__seterrno ();*/ // this is run from the signal thread, so don't set errno
CloseHandle (__tothem);
}
-#define PIPEBUFSIZE (16 * sizeof (DWORD))
+#define PIPEBUFSIZE (4096 * sizeof (DWORD))
commune_result
_pinfo::commune_send (DWORD code, ...)
goto err;
}
- switch (code)
- {
- case PICOM_FIFO:
- {
- char *path = va_arg (args, char *);
- size_t len = strlen (path) + 1;
- if (!WriteFile (tothem, path, len, &nr, NULL) || nr != len)
- {
- __seterrno ();
- goto err;
- }
- break;
- }
- }
-
if (sig_send (this, __SIGCOMMUNE))
goto err;
break;
case PICOM_FIFO:
{
+ char *path = va_arg (args, char *);
+ size_t len = strlen (path) + 1;
+ if (!WriteFile (tothem, &len, sizeof (len), &nr, NULL)
+ || nr != sizeof (len))
+ {
+ __seterrno ();
+ goto err;
+ }
+ if (!WriteFile (tothem, path, len, &nr, NULL) || nr != len)
+ {
+ __seterrno ();
+ goto err;
+ }
+
DWORD x = ReadFile (fromthem, res.handles, sizeof (res.handles), &nr, NULL);
- WriteFile (tothem, &x, sizeof (x), &x, NULL);
+ (void) WriteFile (tothem, &x, sizeof (x), &x, NULL);
if (!x)
goto err;
+
if (nr != sizeof (res.handles))
{
set_errno (EPIPE);
set_tls_self_pointer (thread);
thread->thread_id = GetCurrentThreadId ();
- if (!DuplicateHandle (GetCurrentProcess (), GetCurrentThread (),
- GetCurrentProcess (), &thread->win32_obj_id,
- 0, FALSE, DUPLICATE_SAME_ACCESS))
+ if (!DuplicateHandle (hMainProc, GetCurrentThread (), hMainProc,
+ &thread->win32_obj_id, 0, FALSE, DUPLICATE_SAME_ACCESS))
api_fatal ("failed to create mainthread handle");
if (!thread->create_cancel_event ())
api_fatal ("couldn't create cancel event for main thread");
OSDN Git Service
