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.
73 lines
2.3 KiB
C
73 lines
2.3 KiB
C
/* debug.h
|
|
|
|
Copyright 1998, 1999, 2000 Cygnus Solutions.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef MALLOC_DEBUG
|
|
#define MALLOC_CHECK do {} while (0)
|
|
#else
|
|
#define MALLOC_CHECK ({\
|
|
debug_printf ("checking malloc pool");\
|
|
(void)mallinfo ();\
|
|
})
|
|
#endif
|
|
|
|
extern "C" {
|
|
DWORD __stdcall WFSO (HANDLE, DWORD) __attribute__ ((regparm(2)));
|
|
DWORD __stdcall WFMO (DWORD, CONST HANDLE *, BOOL, DWORD) __attribute__ ((regparm(3)));
|
|
}
|
|
|
|
#define WaitForSingleObject WFSO
|
|
#define WaitForMultipleObject WFMO
|
|
|
|
#if !defined(_DEBUG_H_)
|
|
#define _DEBUG_H_
|
|
|
|
void threadname_init ();
|
|
HANDLE __stdcall makethread (LPTHREAD_START_ROUTINE, LPVOID, DWORD, const char *);
|
|
const char * __stdcall threadname (DWORD, int lockit = TRUE);
|
|
void __stdcall regthread (const char *, DWORD);
|
|
int __stdcall iscygthread ();
|
|
|
|
#ifndef DEBUGGING
|
|
# define cygbench(s)
|
|
# define ForceCloseHandle CloseHandle
|
|
# define ForceCloseHandle1(h, n) CloseHandle (h)
|
|
# define ForceCloseHandle2(h, n) CloseHandle (h)
|
|
# define ProtectHandle(h) do {} while (0)
|
|
# define ProtectHandle1(h,n) do {} while (0)
|
|
# define ProtectHandle2(h,n) do {} while (0)
|
|
# define debug_init() do {} while (0)
|
|
|
|
#else
|
|
|
|
# ifdef NO_DEBUG_DEFINES
|
|
# undef NO_DEBUG_DEFINES
|
|
# else
|
|
# define CloseHandle(h) \
|
|
close_handle (__PRETTY_FUNCTION__, __LINE__, (h), #h, FALSE)
|
|
# define ForceCloseHandle(h) \
|
|
close_handle (__PRETTY_FUNCTION__, __LINE__, (h), #h, TRUE)
|
|
# define ForceCloseHandle1(h,n) \
|
|
close_handle (__PRETTY_FUNCTION__, __LINE__, (h), #n, TRUE)
|
|
# define ForceCloseHandle2(h,n) \
|
|
close_handle (__PRETTY_FUNCTION__, __LINE__, (h), n, TRUE)
|
|
# define lock_pinfo_for_update(n) lpfu(__PRETTY_FUNCTION__, __LINE__, n)
|
|
# endif
|
|
|
|
# define ProtectHandle(h) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #h)
|
|
# define ProtectHandle1(h,n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #n)
|
|
# define ProtectHandle2(h,n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), n)
|
|
|
|
void debug_init ();
|
|
void __stdcall add_handle (const char *, int, HANDLE, const char *);
|
|
BOOL __stdcall close_handle (const char *, int, HANDLE, const char *, BOOL);
|
|
int __stdcall lpfu (const char *, int, DWORD timeout);
|
|
void __stdcall cygbench (const char *s);
|
|
|
|
#endif /*DEBUGGING*/
|
|
#endif /*_DEBUG_H_*/
|