mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 11:00:04 +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.
147 lines
3.4 KiB
C
147 lines
3.4 KiB
C
/* cygtls.h
|
|
|
|
Copyright 2003 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. */
|
|
|
|
#ifndef _CYGTLS_H
|
|
#define _CYGTLS_H
|
|
|
|
#include <signal.h>
|
|
#include <pwd.h>
|
|
#include <grp.h>
|
|
#include <sys/time.h>
|
|
#define _NOMNTENT_FUNCS
|
|
#include <mntent.h>
|
|
#undef _NOMNTENT_FUNCS
|
|
|
|
#define CYGTLS_INITIALIZED 0x43227
|
|
#define CYGTLS_EXCEPTION (0x43227 + true)
|
|
|
|
#ifndef CYG_MAX_PATH
|
|
# define CYG_MAX_PATH 260
|
|
#endif
|
|
|
|
#ifndef UNLEN
|
|
# define UNLEN 256
|
|
#endif
|
|
|
|
#define TLS_STACK_SIZE 256
|
|
|
|
#pragma pack(push,4)
|
|
struct _local_storage
|
|
{
|
|
/*
|
|
Needed for the group functions
|
|
*/
|
|
struct __group16 grp;
|
|
char *namearray[2];
|
|
int grp_pos;
|
|
|
|
/* console.cc */
|
|
unsigned rarg;
|
|
|
|
/* dlfcn.cc */
|
|
int dl_error;
|
|
char dl_buffer[256];
|
|
|
|
/* passwd.cc */
|
|
struct passwd res;
|
|
char pass[_PASSWORD_LEN];
|
|
int pw_pos;
|
|
|
|
/* path.cc */
|
|
struct mntent mntbuf;
|
|
int iteration;
|
|
unsigned available_drives;
|
|
char mnt_type[80];
|
|
char mnt_opts[80];
|
|
char mnt_fsname[CYG_MAX_PATH];
|
|
char mnt_dir[CYG_MAX_PATH];
|
|
|
|
/* strerror */
|
|
char strerror_buf[20];
|
|
|
|
/* sysloc.cc */
|
|
char *process_ident;
|
|
int process_logopt;
|
|
int process_facility;
|
|
int process_logmask;
|
|
|
|
/* times.cc */
|
|
char timezone_buf[20];
|
|
struct tm _localtime_buf;
|
|
|
|
/* uinfo.cc */
|
|
char username[UNLEN + 1];
|
|
|
|
/* net.cc */
|
|
char *ntoa_buf;
|
|
struct protoent *protoent_buf;
|
|
struct servent *servent_buf;
|
|
struct hostent *hostent_buf;
|
|
};
|
|
|
|
/* Please keep this file simple. Changes to the below structure may require
|
|
acompanying changes to the very simple parser in the perl script
|
|
'gentls_offsets' (<<-- start parsing here). */
|
|
|
|
typedef __uint32_t __stack_t;
|
|
struct _threadinfo
|
|
{
|
|
void (*func) /*gentls_offsets*/(int)/*gentls_offsets*/;
|
|
int saved_errno;
|
|
int sa_flags;
|
|
sigset_t oldmask;
|
|
sigset_t newmask;
|
|
HANDLE event;
|
|
int *errno_addr;
|
|
unsigned initialized;
|
|
sigset_t sigmask;
|
|
sigset_t sigwait_mask;
|
|
siginfo_t *sigwait_info;
|
|
siginfo_t infodata;
|
|
struct pthread *tid;
|
|
struct _reent local_clib;
|
|
struct _local_storage locals;
|
|
struct _threadinfo *prev, *next;
|
|
__stack_t *stackptr;
|
|
int sig;
|
|
__stack_t stack[TLS_STACK_SIZE];
|
|
unsigned padding[0];
|
|
|
|
/*gentls_offsets*/
|
|
static CRITICAL_SECTION protect_linked_list;
|
|
static void init ();
|
|
void init_thread (void *, DWORD (*) (void *, void *));
|
|
static void call (DWORD (*) (void *, void *), void *);
|
|
static void call2 (DWORD (*) (void *, void *), void *, void *) __attribute__ ((regparm (3)));
|
|
static struct _threadinfo *find_tls (int sig);
|
|
void remove (DWORD);
|
|
void push (__stack_t, bool = false);
|
|
__stack_t pop ();
|
|
bool isinitialized () {return initialized == CYGTLS_INITIALIZED || initialized == CYGTLS_EXCEPTION;}
|
|
void set_state (bool);
|
|
void reset_exception ();
|
|
bool interrupt_now (CONTEXT *, int, void *, struct sigaction&)
|
|
__attribute__((regparm(3)));
|
|
void __stdcall interrupt_setup (int sig, void *handler, struct sigaction& siga, __stack_t retaddr)
|
|
__attribute__((regparm(3)));
|
|
void init_threadlist_exceptions (struct _exception_list *);
|
|
operator HANDLE () const {return tid->win32_obj_id;}
|
|
/*gentls_offsets*/
|
|
};
|
|
#pragma pack(pop)
|
|
|
|
extern char *_tlsbase __asm__ ("%fs:4");
|
|
extern char *_tlstop __asm__ ("%fs:8");
|
|
#define _my_tls (((_threadinfo *) _tlsbase)[-1])
|
|
extern _threadinfo *_main_tls;
|
|
|
|
#define __getreent() (&_my_tls.local_clib)
|
|
|
|
const int CYGTLS_PADSIZE = (((char *) _main_tls->padding) - ((char *) _main_tls));
|
|
#endif /*_CYGTLS_H*/
|