From 166b2571ce446b4085d4c2067b0d0d36c608f131 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 16 Oct 2000 23:55:58 +0000 Subject: * 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. --- winsup/cygwin/debug.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'winsup/cygwin/debug.h') diff --git a/winsup/cygwin/debug.h b/winsup/cygwin/debug.h index 419cbab1b..ff4313f77 100644 --- a/winsup/cygwin/debug.h +++ b/winsup/cygwin/debug.h @@ -16,22 +16,12 @@ details. */ #endif extern "C" { -#ifndef DEBUGGING0 -DWORD __stdcall WFSO (HANDLE, DWORD); -DWORD __stdcall WFMO (DWORD, CONST HANDLE *, BOOL, DWORD); -#else -DWORD __stdcall WFSO (const char *fn, int ln, HANDLE, DWORD); -DWORD __stdcall WFMO (const char *fn, int ln, DWORD, CONST HANDLE *, BOOL, DWORD); -#endif +DWORD __stdcall WFSO (HANDLE, DWORD) __attribute__ ((regparm(2))); +DWORD __stdcall WFMO (DWORD, CONST HANDLE *, BOOL, DWORD) __attribute__ ((regparm(3))); } -#ifndef DEBUGGING0 #define WaitForSingleObject WFSO #define WaitForMultipleObject WFMO -#else -#define WaitForSingleObject(a, b) WFSO (__FUNCTION__, __LINE__, a, b) -#define WaitForMultipleObject(a, b, c, d) WFMO (__FUNCTION__, __LINE__, a, b, c, d) -#endif #if !defined(_DEBUG_H_) #define _DEBUG_H_ @@ -43,6 +33,7 @@ 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) @@ -75,6 +66,7 @@ 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_*/ -- cgit v1.2.3