c43e9340f1
* cygtls.h (_cygtls::wait_signal_arrived): Renamed from
set_signal_arrived.
(_cygtls::set_signal_arrived): New function signalling signal_arrived.
(_cygtls::reset_signal_arrived): Don't reset will_wait_for_signal.
(_cygtls::unwait_signal_arrived): New function only resetting
will_wait_for_signal.
(class wait_signal_arrived): Rename from set_signal_arrived.
Accommodate name change throughout Cygwin.
(wait_signal_arrived::~wait_signal_arrived): Call
_cygtls::unwait_signal_arrived. Add comment.
* cygserver_ipc.h (ipc_set_proc_info): Fetch signal_arrived handle
via call to _cygtls::get_signal_arrived.
* exceptions.cc (_cygtls::interrupt_setup): Signal signal_arrived via
call to _cygtls::set_signal_arrived.
(_cygtls::handle_SIGCONT): Ditto.
* fhandler_socket.cc (fhandler_socket::wait_for_events): Generate
WSAEVENT array prior to entering wait loop. Add cancel event object
if available. Remove calls to pthread_testcancel and just call
pthread::static_cancel_self if the cancel event object is signalled.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
108 lines
2.4 KiB
C++
108 lines
2.4 KiB
C++
/* cygserver_ipc.h
|
|
|
|
Copyright 2002, 2003, 2004, 2012, 2013, 2014, 2015 Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef __CYGSERVER_IPC_H__
|
|
#define __CYGSERVER_IPC_H__
|
|
|
|
/*
|
|
* Datastructure which is part of any IPC input parameter block.
|
|
*/
|
|
struct vmspace {
|
|
void *vm_map; /* UNUSED */
|
|
struct shmmap_state *vm_shm;
|
|
};
|
|
|
|
struct proc {
|
|
pid_t cygpid;
|
|
DWORD winpid;
|
|
uid_t uid;
|
|
gid_t gid;
|
|
int gidcnt;
|
|
gid_t *gidlist;
|
|
bool is_admin;
|
|
struct vmspace *p_vmspace;
|
|
HANDLE signal_arrived;
|
|
};
|
|
|
|
#ifdef __INSIDE_CYGWIN__
|
|
#include "sigproc.h"
|
|
extern inline void
|
|
ipc_set_proc_info (proc &blk, bool in_fork = false)
|
|
{
|
|
blk.cygpid = getpid ();
|
|
blk.winpid = GetCurrentProcessId ();
|
|
blk.uid = geteuid32 ();
|
|
blk.gid = getegid32 ();
|
|
blk.gidcnt = 0;
|
|
blk.gidlist = NULL;
|
|
blk.is_admin = false;
|
|
blk.signal_arrived = in_fork ? NULL : _my_tls.get_signal_arrived (true);
|
|
}
|
|
#endif /* __INSIDE_CYGWIN__ */
|
|
|
|
#ifndef __INSIDE_CYGWIN__
|
|
class ipc_retval {
|
|
private:
|
|
union {
|
|
int i;
|
|
ssize_t ssz;
|
|
size_t sz;
|
|
vm_offset_t off;
|
|
vm_object_t obj;
|
|
};
|
|
|
|
public:
|
|
ipc_retval () { ssz = 0; }
|
|
ipc_retval (ssize_t nssz) { ssz = nssz; }
|
|
|
|
operator int () const { return i; }
|
|
int operator = (int ni) { return i = ni; }
|
|
|
|
#ifndef __x86_64__
|
|
/* On x86_64: size_t == vm_offset_t == unsigned long */
|
|
operator size_t () const { return sz; }
|
|
size_t operator = (size_t nsz) { return sz = nsz; }
|
|
#else
|
|
/* On i686: ssize_t == long == int */
|
|
operator ssize_t () const { return ssz; }
|
|
ssize_t operator = (ssize_t nssz) { return ssz = nssz; }
|
|
#endif
|
|
|
|
operator vm_offset_t () const { return off; }
|
|
vm_offset_t operator = (vm_offset_t noff) { return off = noff; }
|
|
|
|
operator vm_object_t () const { return obj; }
|
|
vm_object_t operator = (vm_object_t nobj) { return obj = nobj; }
|
|
};
|
|
|
|
class thread {
|
|
private:
|
|
/* Implemented in cgyserver/process.cc */
|
|
void dup_signal_arrived ();
|
|
void close_signal_arrived ();
|
|
public:
|
|
class process *client;
|
|
proc *ipcblk;
|
|
ipc_retval td_retval[2];
|
|
|
|
thread (class process *_client, proc *_proc, bool _init_m1)
|
|
: client (_client), ipcblk (_proc)
|
|
{
|
|
td_retval[0] = td_retval[1] = _init_m1 ? -1 : 0;
|
|
dup_signal_arrived ();
|
|
}
|
|
~thread () { close_signal_arrived (); }
|
|
};
|
|
#define td_proc ipcblk
|
|
#define p_pid cygpid
|
|
#endif
|
|
|
|
#endif /* __CYGSERVER_IPC_H__ */
|