* Makefile.in: Remove some obsolete stuff.
* 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.
This commit is contained in:
@ -20,8 +20,8 @@ enum
|
||||
|
||||
#define PSIZE 1024
|
||||
|
||||
class ThreadItem;
|
||||
#include <sys/resource.h>
|
||||
#include "thread.h"
|
||||
|
||||
class _pinfo
|
||||
{
|
||||
@ -104,20 +104,41 @@ public:
|
||||
/* Non-zero if process was stopped by a signal. */
|
||||
char stopsig;
|
||||
|
||||
struct sigaction& getsig (int);
|
||||
void copysigs (_pinfo* );
|
||||
sigset_t& getsigmask ();
|
||||
void setsigmask (sigset_t);
|
||||
LONG* getsigtodo (int);
|
||||
HANDLE getthread2signal ();
|
||||
void setthread2signal (void *);
|
||||
void exit (UINT n) __attribute__ ((noreturn));
|
||||
void exit (UINT n, bool norecord = 0) __attribute__ ((noreturn, regparm(2)));
|
||||
|
||||
inline struct sigaction& getsig (int sig)
|
||||
{
|
||||
return thread2signal ? thread2signal->sigs[sig] : sigs[sig];
|
||||
}
|
||||
|
||||
inline void copysigs (_pinfo *p) {sigs = p->sigs;}
|
||||
|
||||
inline sigset_t& getsigmask ()
|
||||
{
|
||||
return thread2signal ? *thread2signal->sigmask : sig_mask;
|
||||
}
|
||||
|
||||
inline void setsigmask (sigset_t mask)
|
||||
{
|
||||
if (thread2signal)
|
||||
*(thread2signal->sigmask) = mask;
|
||||
sig_mask = mask;
|
||||
}
|
||||
|
||||
inline LONG* getsigtodo (int sig) {return _sigtodo + __SIGOFFSET + sig;}
|
||||
|
||||
inline HANDLE getthread2signal ()
|
||||
{
|
||||
return thread2signal ? thread2signal->win32_obj_id : hMainThread;
|
||||
}
|
||||
|
||||
inline void setthread2signal (void *thr) {thread2signal = (ThreadItem *) thr;}
|
||||
|
||||
private:
|
||||
struct sigaction sigs[NSIG];
|
||||
sigset_t sig_mask; /* one set for everything to ignore. */
|
||||
LONG _sigtodo[NSIG + __SIGOFFSET];
|
||||
ThreadItem* thread2signal; // NULL means means thread any other means a pthread
|
||||
ThreadItem *thread2signal; // NULL means means thread any other means a pthread
|
||||
};
|
||||
|
||||
class pinfo
|
||||
@ -172,7 +193,7 @@ cygwin_pid (pid_t pid)
|
||||
return (pid_t) (os_being_run == winNT) ? pid : -(int) pid;
|
||||
}
|
||||
|
||||
void __stdcall pinfo_init (char **);
|
||||
void __stdcall pinfo_init (char **, int);
|
||||
void __stdcall set_myself (pid_t pid, HANDLE h = NULL);
|
||||
extern pinfo myself;
|
||||
|
||||
@ -181,7 +202,7 @@ extern "C" int _spawnve (HANDLE hToken, int mode, const char *path,
|
||||
const char *const *argv, const char *const *envp);
|
||||
|
||||
extern void __stdcall pinfo_fixup_after_fork ();
|
||||
extern void __stdcall pinfo_fixup_in_spawned_child (HANDLE hchild);
|
||||
extern HANDLE hexec_proc;
|
||||
|
||||
/* For mmaps across fork(). */
|
||||
int __stdcall recreate_mmaps_after_fork (void *);
|
||||
|
Reference in New Issue
Block a user