mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 02:09:19 +08:00
166b2571ce
* dcrt0.cc (dll_crt0_1): Call signal_fixup_after_exec where appropriate. Set myself->uid from parent version. Just use ThreadItem Init method. Close or store hexec_proc as appropriate. (_dll_crt0): Store user_data->forkee here so that proper tests can be made subsequently. (do_exit): Remove hExeced stuff. * environ.cc (environ_init): Accept environ count as well as environ pointer. * environ.h: Reflect above change. * pinfo.cc (pinfo_init): Ditto. Accept environ count. (fixup_in_spawned_child): Remove. * spawn.cc (spawn_guts): Move signal code to dll_crt0_1. Don't suspend execing process since it is no longer necessary. Store envc. * exceptions.cc (signal_fixup_after_exec): New function. (call_handler): Remove hExeced test. * child_info.h (cygheap_exec_info): Store envc as well as envp. (child_info_spawn): Store hexec_proc so that it can be closed in child. * path.cc (normalize_posix_path): Avoid intermediate use of temporary cwd buf. (normalize_win32_path): Ditto. (cwdstuff::get_initial): Always set lock. * sigproc.h: Remove hExeced. * strace.cc (strace::vsprntf): Modify to accomodate for lack of hExeced. * thread.cc (MTinterface::Init): Merge Init1 and ClearReent into this method. (MTinterface::Init1): Eliminate. (MTinterface::ClearReent): Eliminate. * thread.h: Reflect above changes. * include/sys/strace.h (strace): Make microseconds() public. Make various functions 'regparm', throughout. * pinfo.h (_pinfo): Inline simple signal manipulation functions. Requires inclusion of thread.h which was removed from .cc files, where appropriate. throughout. * pinfo.cc: Eliminate signal manipulation functions. (_pinfo::exit): Calculate total rusage for exiting process here. * cygheap.cc (size2bucket): Eliminate. (init_buckets): Ditto. (_cmalloc): Calculate size and bits in a loop rather than going through a function call. (_crealloc): Use stored array index to calculate allocated size. * spawn.cc (spawn_guts): Use _pinfo exit method to exit, calculating cpu usage.
115 lines
2.6 KiB
C++
115 lines
2.6 KiB
C++
/* sigproc.h
|
|
|
|
Copyright 1997, 1998, 2000 Cygnus Solutions.
|
|
|
|
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. */
|
|
|
|
#include <signal.h>
|
|
|
|
#define EXIT_SIGNAL 0x010000
|
|
#define EXIT_REPARENTING 0x020000
|
|
#define EXIT_NOCLOSEALL 0x040000
|
|
|
|
enum procstuff
|
|
{
|
|
PROC_ADDCHILD = 1, // add a new subprocess to list
|
|
PROC_CHILDSTOPPED = 2, // a child stopped
|
|
PROC_CHILDTERMINATED = 3, // a child died
|
|
PROC_CLEARWAIT = 4, // clear all waits - signal arrived
|
|
PROC_WAIT = 5 // setup for wait() for subproc
|
|
};
|
|
|
|
typedef struct struct_waitq
|
|
{
|
|
int pid;
|
|
int options;
|
|
int status;
|
|
HANDLE ev;
|
|
void *rusage; /* pointer to potential rusage */
|
|
struct struct_waitq *next;
|
|
HANDLE thread_ev;
|
|
} waitq;
|
|
|
|
struct sigthread
|
|
{
|
|
DWORD id;
|
|
DWORD frame;
|
|
muto *lock;
|
|
void init (const char *s);
|
|
};
|
|
|
|
class sigframe
|
|
{
|
|
private:
|
|
sigthread *st;
|
|
|
|
public:
|
|
void set (sigthread &t, DWORD ebp)
|
|
{
|
|
t.lock->acquire ();
|
|
st = &t;
|
|
t.frame = ebp;
|
|
t.lock->release ();
|
|
}
|
|
|
|
sigframe () {st = NULL;}
|
|
sigframe (sigthread &t, DWORD ebp = (DWORD) __builtin_frame_address (0))
|
|
{
|
|
if (!t.frame && t.id == GetCurrentThreadId ())
|
|
set (t, ebp);
|
|
else
|
|
st = NULL;
|
|
}
|
|
~sigframe ()
|
|
{
|
|
if (st)
|
|
{
|
|
st->lock->acquire ();
|
|
st->frame = 0;
|
|
st->lock->release ();
|
|
st = NULL;
|
|
}
|
|
}
|
|
};
|
|
|
|
extern sigthread mainthread;
|
|
extern HANDLE signal_arrived;
|
|
|
|
/* non-NULL if this process is a child of a cygwin process */
|
|
extern HANDLE parent_alive;
|
|
|
|
BOOL __stdcall my_parent_is_alive ();
|
|
extern "C" int __stdcall sig_dispatch_pending (int force = FALSE);
|
|
extern "C" void __stdcall set_process_mask (sigset_t newmask);
|
|
int __stdcall sig_handle (int);
|
|
void __stdcall sig_clear (int);
|
|
void __stdcall sig_set_pending (int);
|
|
int __stdcall handle_sigsuspend (sigset_t);
|
|
|
|
int __stdcall proc_subproc (DWORD, DWORD);
|
|
|
|
class _pinfo;
|
|
void __stdcall proc_terminate ();
|
|
void __stdcall sigproc_init ();
|
|
void __stdcall subproc_init ();
|
|
void __stdcall sigproc_terminate ();
|
|
BOOL __stdcall proc_exists (_pinfo *);
|
|
BOOL __stdcall pid_exists (pid_t);
|
|
int __stdcall sig_send (_pinfo *, int, DWORD ebp = (DWORD) __builtin_frame_address (0));
|
|
void __stdcall signal_fixup_after_fork ();
|
|
void __stdcall signal_fixup_after_exec (bool);
|
|
|
|
extern char myself_nowait_dummy[];
|
|
extern char myself_nowait_nonmain_dummy[];
|
|
|
|
#define WAIT_SIG_EXITING (WAIT_OBJECT_0 + 1)
|
|
|
|
#define allow_sig_dispatch(n) __allow_sig_dispatch (__FILE__, __LINE__, (n))
|
|
|
|
#define myself_nowait ((_pinfo *)myself_nowait_dummy)
|
|
#define myself_nowait_nonmain ((_pinfo *)myself_nowait_nonmain_dummy)
|