diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2015-07-19 22:38:30 +0200 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2015-07-19 22:38:30 +0200 |
commit | 4889f730c1fa5db8cea2780eaa1d2156c92b298a (patch) | |
tree | db15dda9f3bece0057cadae0f53048eac191371d /winsup/cygwin/pseudo-reloc.cc | |
parent | 93a8435f826453396f0d30f1f0ee07098aa78530 (diff) | |
download | cygnal-4889f730c1fa5db8cea2780eaa1d2156c92b298a.tar.gz cygnal-4889f730c1fa5db8cea2780eaa1d2156c92b298a.tar.bz2 cygnal-4889f730c1fa5db8cea2780eaa1d2156c92b298a.zip |
Reduce stack pressure throughout Cygwin
* dcrt0.cc (initial_env): Reduce size of local path buffers to
PATH_MAX. Allocate debugger_command from process heap.
(init_windows_system_directory): Very early initialize new global
variable global_progname.
* dll_init.cc (dll_list::alloc): Make path buffer static. Explain why.
(dll_list::populate_deps): Use tmp_pathbuf for local path buffer.
* exceptions.cc (debugger_command): Convert to PWCHAR.
(error_start_init): Allocate debugger_command and fill with wide char
strings. Only allocate if NULL.
(try_to_debug): Just check if debugger_command is a NULL pointer to
return. Drop conversion from char to WCHAR and drop local variable
dbg_cmd.
* globals.cc (global_progname): New global variable to store Windows
application path.
* pinfo.cc (pinfo_basic::pinfo_basic): Just copy progname over from
global_progname.
(pinfo::status_exit): Let path_conv create the POSIX path to
avoid local buffer.
* pseudo_reloc.cc (__report_error): Utilize global_progname, drop local
buffer.
* smallprint.cc (__small_vsprintf): Just utilize global_progname for
%P format specifier.
(__small_vswprintf): Ditto.
* strace.cc (PROTECT): Change to reflect x being a pointer. Reformat.
(CHECK): Ditto. Reformat.
(strace::activate): Utilize global_progname, drop local buffer.
Fix formatting.
(strace::vsprntf): Reduce size of local progname buffer to NAME_MAX.
Copy and, if necessary, convert only the last path component to
progname.
(strace_buf_guard): New muto.
(buf): New static pointer.
(strace::vprntf): Use buf under strace_buf_guard lock only. Allocate
buffer space for buf on Windows heap.
* wow64.cc (wow64_respawn_process): Utilize global_progname, drop
local path buffer.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/pseudo-reloc.cc')
-rw-r--r-- | winsup/cygwin/pseudo-reloc.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/winsup/cygwin/pseudo-reloc.cc b/winsup/cygwin/pseudo-reloc.cc index bdcde2a4b..f374d2260 100644 --- a/winsup/cygwin/pseudo-reloc.cc +++ b/winsup/cygwin/pseudo-reloc.cc @@ -85,20 +85,18 @@ __report_error (const char *msg, ...) * cygwin ptys. */ char buf[128]; - WCHAR module[PATH_MAX]; - char * posix_module = NULL; + char *posix_module = NULL; static const char UNKNOWN_MODULE[] = "<unknown module>: "; static const char CYGWIN_FAILURE_MSG[] = "Cygwin runtime failure: "; HANDLE errh = GetStdHandle (STD_ERROR_HANDLE); - ssize_t modulelen = GetModuleFileNameW (NULL, module, PATH_MAX); va_list args; /* FIXME: cleanup further to avoid old use of cygwin_internal */ if (errh == INVALID_HANDLE_VALUE) cygwin_internal (CW_EXIT_PROCESS, STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION, 1); - if (modulelen > 0) - posix_module = (char *) cygwin_create_path (CCP_WIN_W_TO_POSIX, module); + posix_module = (char *) cygwin_create_path (CCP_WIN_W_TO_POSIX, + global_progname); va_start (args, msg); vsnprintf (buf, sizeof (buf), msg, args); |