mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-29 02:20:21 +08:00
2d1d1eb1e4
compiler bug. * autoload.cc (TryEnterCriticalSection): Remove. * dcrt0.cc (dll_crt0_0): Delete inappropriate setting of _my_tls.stackptr to NULL since it has really bad consequences. Make 'si' an automatic variable. * cygtls.cc (_threadinfo::init_thread): Correct thinko which caused thread list to be allocated every time. * cygtls.h (CYGTLS_PADSIZE): Define as const int. * sync.h: Make multiple inclusion safe. (muto::next): Eliminate. (muto::exiting_thread): New variable. (muto::set_exiting_thread): New function. (new_muto): Change to use different section for mutos since c++ give inexplicable warning in some cases otherwise. (new_muto1): Ditto. * dcrt0.cc (do_exit): Call muto::set_exiting_thread here. * sync.cc (muto_start): Eliminate. (muto::acquire): Always give exiting thread a lock. Never give thread a lock if exiting. (muto::release): Ditto for releasing. * dtable.cc (dtable::init_lock): Unline function and define here. * dtable.h (lock_cs): Define as a muto since critical sections seem to work oddly on Windows Me. (lock): Accommodate switch to muto. (unlock): Ditto. * exceptions.cc (setup_handler): Don't worry about acquiring mutos since that hasn't mattered for a long time. (signal_exit): Ditto: muto stuff will be handled automatically on exit now. * Makefile.in (DLL_IMPORTS): Link advapi32 to ensure proper DLL initialization. * autoload.cc (RegCloseKey): Arbitrarily choose this function as a "seed" to pull the advapi32 link library in. So, comment out the autoloading. * cygtls.cc (_threadinfo::init_thread): Just clear CYGTLS_PADSIZE. (_threadinfo::remove): Add debugging. (_threadinfo::find_tls): Ditto. * cygtls.h (_threadinfo::padding): Make zero length (for now?). * dcrt0.cc (dll_crt0_0): Move more initialization here from dll_crt0_1. (dll_crt0_1): See above. * dtable.h (dtable::lock): Remove commented out critical section locking. * dtable.h (dtable::init_lock): Remove commented out critical section locking. * dtable.h (dtable::unlock): Remove commented out critical section locking. * exceptions.cc (interruptible): bool'ize. * init.cc (threadfunc_fe): Revert to storing threadfunc at stack bottom. (munge_threadfunc): Ditto. Avoid adding overhead to calibration_thread. (prime_threads): Don't initialize tls stuff. (dll_entry): Make minor change to initialization order. * tlsoffsets.h: Regenerate. * sigproc.cc (wait_sig): Add sanity check for end of process thread exit. * select.h: Make minor formatting change. * Makefile.in: Add still more -fomit-frame-pointer functions. * dtable.h (dtable::lock): New function. (dtable::unlock): New function. (dtable::init_lock): New function. * cygheap.h (HEAP_TLS): Declare new enum value. (init_cygheap::threadlist): Declare new array. (init_cygheap::sthreads): Declare new variable. (cygheap_fdmanip::~cygheap_fdmanip): Use new dtable lock/unlock functions. (cygheap_fdnew::cygheap_fdnew): Ditto. (cygheap_fdget::cygheap_fdget): Ditto. * dtable.cc (dtable_init): Initialize fdtab critical section. (dtable::fixup_after_fork): Ditto. (dtable::fixup_after_exec): Ditto. (dtable::dup2): Use lock/unlock calls to protect access to fdtab. (dtable::find_fifo): Ditto. (dtable::fixup_before_fork): Ditto. (dtable::fixup_before_exec): Ditto. (dtable::set_file_pointers_for_exec): Ditto. (dtable::vfork_child_dup): Ditto. (dtable::vfork_parent_restore): Ditto. * syscalls.cc (close_all_files): Ditto. * sync.h (muto::acquired): Declare new function. (new_muto1): Declare new macro used to specify name of muto storage. * sync.cc (muto::acquired): Define new function. * cygthread.cc (cygthread::stub): Remove signal chain removal call since it is handled during initialization now. * cygthread.cc (cygthread::simplestub): Remove signal chain removal call since it is handled during initialization now. * cygtls.cc (sentry): New class used for locking. Use throughout. (_threadinfo::reset_exception): Don't pop stack. (_threadinfo::find_tls): Move from exceptions.cc. (_threadinfo::init_thread): Initialize array of threads rather than linked list. Take second argument indicating thread function for this thread. (_threadinfo::remove): Search thread array rather than linked list. Use sentry to lock. Only unlock if we got the lock. (_threadinfo::find_tls): Ditto for first two. (handle_threadlist_exception): Handle exceptions when manipulating the thread list in case of premature thread termination. (_threadinfo::init_threadlist_exceptions): Ditto. * cygtls.h (TLS_STACK_SIZE): Decrease size. (_threadinfo::padding): Add element to avoid overwriting lower part of stack. (_threadinfo::remove): Add a "wait" argument to control how long we wait for a lock before removing. * exceptions.cc (init_exception_handler): Make global. Take argument to control exception handler being set. (ctrl_c_handler): Wait forever when removing self from signal chain. (_threadinfo::find_tls): Move to cygtls.cc. (sig_handle): Reorganize detection for thread-specific signals. * heap.cc (heap_init): Rework slightly. Make fatal error more verbose. Remove malloc initialization since it can't happen during dll attach. * init.cc (search_for): Move address to search for on stack here. (threadfunc_ix): Ditto for stack offset. Make shared so that stack walk potentially only has to be done once when cygwin processes are running. (threadfunc_fe): Use standard tls to store thread function (may change back later). (calibration_thread): New function. Potentially called to find threadfunc_ix. (munge_threadfunc): Search for "search_for" value on stack. Output warning when thread func not found on stack. Use standard tls to store thread function. (prime_threads): New function. Called to prime thread front end. (dll_entry): Call dll_crt0_0 here when DLL_PROCESS_ATTACH. Call prime_threads here. Try to remove thread from signal list here. * sigproc.cc (wait_sig): Initialize threadlist exception stuff here. * thread.cc (pthread::exit): Pass argument to signal list remove function. * thread.h: Remove obsolete *ResourceLock defines. * tlsoffsets.h: Regenerate. * winsup.h (spf): Define temporary debug macro to be deleted later. * dcrt0.cc (dll_crt0_0): New function, called during DLL initialization. Mainly consists of code pulled from dll_crt0_1. (dll_crt0_1): See above. (_dll_crt0): Wait for initial calibration thread to complete, if appropriate. Move some stuff to dll_crt0_0. (initialize_main_tls): Accommodate argument change to _thread_info::init_thread. * fork.cc (fork_child): Ditto. (sync_with_child): Fix debug message. * external.cc (cygwin_internal): Remove special considerations for uninitialized dll since initialization happens during dll attach now. * dlfcn.cc (dlopen): Remove obsolete *ResourceLock calls. (dlclose): Ditto. * cygheap.h (init_cygheap::close_ctty): Declare new function. * cygheap.cc (init_cygheap::close_ctty): Define new function. * syscalls.cc (close_all_files): Use close_ctty. (setsid): Ditto. * cygthread.cc (cygthread::stub): Remove exception initialization. * cygthread.cc (cygthread::stub): Remove exception initialization. (cygthread::simplestub): Ditto. * thread.cc (pthread::thread_init_wrapper): Ditto. * cygtls.cc (_last_thread): Make static. (_threadinfo::call2): Initialize exception handler here. (_threadinfo::find_tls): Move here. * exceptions.cc (_threadinfo::find_tls): Move. * dcrt0.cc (__api_fatal): Add prefix info to message here rather than including it in every call to function. * winsup.h (api_fatal): Accommodate above change. * debug.cc (add_handle): Don't do anything if cygheap not around. (mark_closed): Ditto. * dll_init.cc (dll_list::detach): Fix debug output. * fork.cc (sync_with_child): Ditto. (vfork): Improve debug output. * heap.cc (heap_init): Ditto. * exceptions.cc (try_to_debug): Clarify message when debugger attaches.
232 lines
5.1 KiB
C++
232 lines
5.1 KiB
C++
/* debug.cc
|
|
|
|
Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#include "winsup.h"
|
|
#include "sync.h"
|
|
#include "sigproc.h"
|
|
#include "pinfo.h"
|
|
#include "perthread.h"
|
|
#include "perprocess.h"
|
|
#include "security.h"
|
|
#include "cygerrno.h"
|
|
#ifdef DEBUGGING
|
|
#include "path.h"
|
|
#include "fhandler.h"
|
|
#include "dtable.h"
|
|
#include "cygheap.h"
|
|
#endif
|
|
|
|
#undef CloseHandle
|
|
|
|
#ifdef DEBUGGING
|
|
/* Here lies extra debugging routines which help track down internal
|
|
Cygwin problems when compiled with -DDEBUGGING . */
|
|
#include <stdlib.h>
|
|
#define NFREEH (sizeof (cygheap->debug.freeh) / sizeof (cygheap->debug.freeh[0]))
|
|
|
|
class lock_debug
|
|
{
|
|
static muto *locker;
|
|
bool acquired;
|
|
public:
|
|
lock_debug () : acquired (0)
|
|
{
|
|
if (locker && !exit_state)
|
|
acquired = !!locker->acquire (INFINITE);
|
|
}
|
|
void unlock ()
|
|
{
|
|
if (locker && acquired)
|
|
{
|
|
locker->release ();
|
|
acquired = false;
|
|
}
|
|
}
|
|
~lock_debug () {unlock ();}
|
|
friend void debug_init ();
|
|
};
|
|
|
|
muto NO_COPY *lock_debug::locker = NULL;
|
|
|
|
static bool __stdcall mark_closed (const char *, int, HANDLE, const char *, bool);
|
|
|
|
void
|
|
debug_init ()
|
|
{
|
|
muto *debug_lock_muto;
|
|
lock_debug::locker = new_muto (debug_lock_muto);
|
|
}
|
|
|
|
/* Find a registered handle in the linked list of handles. */
|
|
static handle_list * __stdcall
|
|
find_handle (HANDLE h)
|
|
{
|
|
handle_list *hl;
|
|
for (hl = &cygheap->debug.starth; hl->next != NULL; hl = hl->next)
|
|
if (hl->next->h == h)
|
|
goto out;
|
|
cygheap->debug.endh = hl;
|
|
hl = NULL;
|
|
|
|
out:
|
|
return hl;
|
|
}
|
|
|
|
#ifdef DEBUGGING_AND_FDS_PROTECTED
|
|
void
|
|
setclexec (HANDLE oh, HANDLE nh, bool not_inheriting)
|
|
{
|
|
handle_list *hl = find_handle (oh);
|
|
if (hl)
|
|
{
|
|
hl = hl->next;
|
|
hl->inherited = !not_inheriting;
|
|
hl->h = nh;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/* Create a new handle record */
|
|
static handle_list * __stdcall
|
|
newh ()
|
|
{
|
|
handle_list *hl;
|
|
lock_debug here;
|
|
|
|
for (hl = cygheap->debug.freeh; hl < cygheap->debug.freeh + NFREEH; hl++)
|
|
if (hl->name == NULL)
|
|
return hl;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Add a handle to the linked list of known handles. */
|
|
void __stdcall
|
|
add_handle (const char *func, int ln, HANDLE h, const char *name, bool inh)
|
|
{
|
|
handle_list *hl;
|
|
lock_debug here;
|
|
|
|
if (!cygheap)
|
|
return;
|
|
|
|
if ((hl = find_handle (h)))
|
|
{
|
|
hl = hl->next;
|
|
if (hl->name == name && hl->func == func && hl->ln == ln)
|
|
return;
|
|
system_printf ("%s:%d - multiple attempts to add handle %s<%p>", func,
|
|
ln, name, h);
|
|
system_printf (" previously allocated by %s:%d(%s<%p>) winpid %d",
|
|
hl->func, hl->ln, hl->name, hl->h, hl->pid);
|
|
return;
|
|
}
|
|
|
|
if ((hl = newh ()) == NULL)
|
|
{
|
|
here.unlock ();
|
|
debug_printf ("couldn't allocate memory for %s(%d): %s(%p)",
|
|
func, ln, name, h);
|
|
return;
|
|
}
|
|
hl->h = h;
|
|
hl->name = name;
|
|
hl->func = func;
|
|
hl->ln = ln;
|
|
hl->next = NULL;
|
|
hl->inherited = inh;
|
|
hl->pid = GetCurrentProcessId ();
|
|
cygheap->debug.endh->next = hl;
|
|
cygheap->debug.endh = hl;
|
|
debug_printf ("protecting handle '%s', inherited flag %d", hl->name, hl->inherited);
|
|
|
|
return;
|
|
}
|
|
|
|
static void __stdcall
|
|
delete_handle (handle_list *hl)
|
|
{
|
|
handle_list *hnuke = hl->next;
|
|
debug_printf ("nuking handle '%s'", hnuke->name);
|
|
hl->next = hl->next->next;
|
|
memset (hnuke, 0, sizeof (*hnuke));
|
|
}
|
|
|
|
void
|
|
debug_fixup_after_fork_exec ()
|
|
{
|
|
/* No lock needed at this point */
|
|
handle_list *hl;
|
|
for (hl = &cygheap->debug.starth; hl->next != NULL; /* nothing */)
|
|
if (hl->next->inherited)
|
|
hl = hl->next;
|
|
else
|
|
delete_handle (hl); // removes hl->next
|
|
}
|
|
|
|
static bool __stdcall
|
|
mark_closed (const char *func, int ln, HANDLE h, const char *name, bool force)
|
|
{
|
|
handle_list *hl;
|
|
lock_debug here;
|
|
|
|
if (!cygheap)
|
|
return true;
|
|
|
|
if ((hl = find_handle (h)) && !force)
|
|
{
|
|
hl = hl->next;
|
|
here.unlock (); // race here
|
|
system_printf ("attempt to close protected handle %s:%d(%s<%p>) winpid %d",
|
|
hl->func, hl->ln, hl->name, hl->h, hl->pid);
|
|
system_printf (" by %s:%d(%s<%p>)", func, ln, name, h);
|
|
return false;
|
|
}
|
|
|
|
handle_list *hln;
|
|
if (hl && (hln = hl->next) && strcmp (name, hln->name))
|
|
{
|
|
system_printf ("closing protected handle %s:%d(%s<%p>)",
|
|
hln->func, hln->ln, hln->name, hln->h);
|
|
system_printf (" by %s:%d(%s<%p>)", func, ln, name, h);
|
|
}
|
|
|
|
if (hl)
|
|
delete_handle (hl);
|
|
|
|
return true;
|
|
}
|
|
|
|
/* Close a known handle. Complain if !force and closing a known handle or
|
|
if the name of the handle being closed does not match the registered name. */
|
|
bool __stdcall
|
|
close_handle (const char *func, int ln, HANDLE h, const char *name, bool force)
|
|
{
|
|
bool ret;
|
|
lock_debug here;
|
|
|
|
if (!mark_closed (func, ln, h, name, force))
|
|
return false;
|
|
|
|
ret = CloseHandle (h);
|
|
|
|
#if 0 /* Uncomment to see CloseHandle failures */
|
|
if (!ret)
|
|
small_printf ("CloseHandle(%s) failed %s:%d\n", name, func, ln);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
int __stdcall
|
|
__set_errno (const char *func, int ln, int val)
|
|
{
|
|
debug_printf ("%s:%d val %d", func, ln, val);
|
|
return errno = val;
|
|
}
|
|
#endif /*DEBUGGING*/
|