* exceptions.cc (set_signal_mask): Redefine to not pass by address. Report
calculated mask in debugging output. * sigproc.h (set_signal_mask): Reflect above change in declaration. * path.cc (mount_item::build_win32): Take path apart before feeding it to fnmunge. Throughout, change use of _reent_winsup()-> to _my_tls.locals. instead. Throughout, remove obsolete MT_SAFE/_CYG_THREAD_FAILSAFE considerations. Througout, add cygtls.h include. * Makefile.in (DLL_OFILES): Add cygtls.o. Add some more objects to the -fomit-frame-pointer list. * acconfig.h: Remove obsolete settings. * config.h.in: Ditto. * bsdlib.cc: Add cygtls.h include. * configure.in: Remove --enable-extra-threadsafe-checking. * configure: Regenerate. * cygtls.h (_local_storage): New struct renamed from _winsup_t (sic). (_threadinfo:local_clib): Add new field. (_threadinfo::locals): Ditto. (_threadinfo::init_thread): Accept second _reent * argument. (_threadinfo::call): Define as regparm. (CYGTLS_PADSIZE): Remove unnecessary slop. (_getreent): Define as a macro. * thread.h: Remove _CYG_THREAD_FAILSAFE and MT_SAFE stuff. (_winsup_t): Move to cygtls.h. (ResourceLocks::ResourceLocks): Eliminate empty constructor. (MTinterface::reents): Eliminate. (MTinterface::thread_self_key): Eliminate. (MTinterface::MTinterface): Eliminate. * dcrt0.cc: Include stdio.h for _impure_ptr initialization. (do_global_ctors): Remove run_ctors_p (sic) considerations. Don't call atexit here. (__main): Initialize destructors for user here. (dll_crt0_1): Accept a dummy argument. Don't call init_thread here. Don't set _impure_ptr here. Call do_global_ctors after more things have been initialized. (_dll_crt0): Define zeros buffer as max of needed size of CYGTLS_PADSIZE so that it can be used for two purposes while minimizing stack usage. Initialize _impure_ptr specifically, for speed. Call dll_crt0_1 with buffer argument. (cygwin_dll_init): Call dll_crt0_1 with dummy argument. * dtable.cc (dtable::find_unused_handle): Remove call to AssertResourceOwner. * exceptions.cc: Move _threadinfo stuff to new file. * cygtls.cc: New file. * gentls_offsets: Accommodate increasing complexity of cygtls.h. * hires.h (hires_base::~hires_base): Remove. * init.cc (dll_entry): Remove setting of reents. * thread.cc: Remove syslog.h include. (__getreent): Simplify to use _my_tls. (_reent_winsup): Delete. (AssertResourceOwner): Delete. (MTinterface::Init): Remove setting of _clib and _winsup, with all that entails. (MTinterface::fixup_after_fork): Ditto. (pthread::thread_init_wrapper): Ditto. Also remove call to set_tls_self_pointer. (pthread::set_tls_self_pointer): Eliminate. (pthread::get_tls_self_pointer): Just return _my_tls.tid; (__reent_t::init_clib): Eliminate. * tlsoffsets.h: Regenerate.
This commit is contained in:
@@ -9,16 +9,83 @@ details. */
|
||||
#ifndef _CYGTLS_H
|
||||
#define _CYGTLS_H
|
||||
|
||||
#include <cygwin/signal.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
|
||||
|
||||
#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). */
|
||||
|
||||
#pragma pack(push,4)
|
||||
typedef __uint32_t __stack_t;
|
||||
struct _threadinfo
|
||||
{
|
||||
@@ -35,6 +102,8 @@ struct _threadinfo
|
||||
siginfo_t *sigwait_info;
|
||||
siginfo_t infodata;
|
||||
struct pthread *tid;
|
||||
struct _reent local_clib;
|
||||
struct _local_storage locals;
|
||||
struct _threadinfo *prev, *next;
|
||||
__stack_t stack[8];
|
||||
int sig;
|
||||
@@ -43,9 +112,9 @@ struct _threadinfo
|
||||
/*gentls_offsets*/
|
||||
static CRITICAL_SECTION protect_linked_list;
|
||||
static void init ();
|
||||
void init_thread (void *);
|
||||
static void call (DWORD (*) (void *, void *), void *);
|
||||
void call2 (DWORD (*) (void *, void *), void *, void *);
|
||||
void init_thread (void *) __attribute__ ((regparm (2)));
|
||||
static void call (DWORD (*) (void *, void *), void *) __attribute__ ((regparm (3)));
|
||||
static void call2 (DWORD (*) (void *, void *), void *, void *) __attribute__ ((regparm (3)));
|
||||
static struct _threadinfo *find_tls (int sig);
|
||||
void remove ();
|
||||
void push (__stack_t, bool = false);
|
||||
@@ -67,5 +136,7 @@ extern char *_tlstop __asm__ ("%fs:8");
|
||||
#define _my_tls (((_threadinfo *) _tlsbase)[-1])
|
||||
extern _threadinfo *_main_tls;
|
||||
|
||||
#define CYGTLS_PADSIZE (sizeof (_threadinfo) + 64)
|
||||
#define __getreent() (&_my_tls.local_clib)
|
||||
|
||||
#define CYGTLS_PADSIZE (sizeof (_threadinfo))
|
||||
#endif /*_CYGTLS_H*/
|
||||
|
Reference in New Issue
Block a user