* 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:
@ -22,106 +22,16 @@ details. */
|
||||
#define WRITE_LOCK 1
|
||||
#define READ_LOCK 2
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#if defined (_CYG_THREAD_FAILSAFE) && defined (_MT_SAFE)
|
||||
void AssertResourceOwner (int, int);
|
||||
#else
|
||||
#define AssertResourceOwner(i,ii)
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef _MT_SAFE
|
||||
|
||||
#define SetResourceLock(i,n,c)
|
||||
#define ReleaseResourceLock(i,n,c)
|
||||
|
||||
#else
|
||||
|
||||
#include <pthread.h>
|
||||
#include <limits.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
#include <security.h>
|
||||
#define _NOMNTENT_FUNCS
|
||||
#include <mntent.h>
|
||||
#include <errno.h>
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
||||
struct _winsup_t
|
||||
{
|
||||
/*
|
||||
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;
|
||||
DWORD 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;
|
||||
};
|
||||
|
||||
|
||||
struct __reent_t
|
||||
{
|
||||
struct _reent *_clib;
|
||||
struct _winsup_t *_winsup;
|
||||
void init_clib (_reent&);
|
||||
};
|
||||
|
||||
_winsup_t *_reent_winsup ();
|
||||
void SetResourceLock (int, int, const char *) __attribute__ ((regparm (3)));
|
||||
void ReleaseResourceLock (int, int, const char *)
|
||||
__attribute__ ((regparm (3)));
|
||||
|
||||
#ifdef _CYG_THREAD_FAILSAFE
|
||||
void AssertResourceOwner (int, int);
|
||||
#else
|
||||
#define AssertResourceOwner(i,ii)
|
||||
#endif
|
||||
}
|
||||
|
||||
class fast_mutex
|
||||
@ -173,16 +83,9 @@ class pinfo;
|
||||
class ResourceLocks
|
||||
{
|
||||
public:
|
||||
ResourceLocks ()
|
||||
{
|
||||
}
|
||||
LPCRITICAL_SECTION Lock (int);
|
||||
void Init ();
|
||||
void Delete ();
|
||||
#ifdef _CYG_THREAD_FAILSAFE
|
||||
DWORD owner;
|
||||
DWORD count;
|
||||
#endif
|
||||
private:
|
||||
CRITICAL_SECTION lock;
|
||||
bool inited;
|
||||
@ -770,36 +673,22 @@ struct MTinterface
|
||||
int concurrency;
|
||||
long int threadcount;
|
||||
|
||||
// Used for main thread data, and sigproc thread
|
||||
struct __reent_t reents;
|
||||
struct _winsup_t winsup_reent;
|
||||
|
||||
callback *pthread_prepare;
|
||||
callback *pthread_child;
|
||||
callback *pthread_parent;
|
||||
|
||||
pthread_key reent_key;
|
||||
pthread_key thread_self_key;
|
||||
|
||||
void Init ();
|
||||
void fixup_before_fork (void);
|
||||
void fixup_after_fork (void);
|
||||
|
||||
#if 1 // avoid initialization since zero is implied and
|
||||
// only use of this class is static
|
||||
MTinterface () : reent_key (NULL), thread_self_key (NULL) {}
|
||||
#else
|
||||
#if 0 // avoid initialization since zero is implied and
|
||||
MTinterface () :
|
||||
concurrency (0), threadcount (0),
|
||||
pthread_prepare (NULL), pthread_child (NULL), pthread_parent (NULL),
|
||||
reent_key (NULL), thread_self_key (NULL)
|
||||
pthread_prepare (NULL), pthread_child (NULL), pthread_parent (NULL)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
||||
#define MT_INTERFACE user_data->threadinterface
|
||||
|
||||
#endif // MT_SAFE
|
||||
|
||||
#endif // _CYGNUS_THREADS_
|
||||
|
Reference in New Issue
Block a user