29d52c8a27
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.
155 lines
3.5 KiB
C++
155 lines
3.5 KiB
C++
/* dlfcn.cc
|
|
|
|
Copyright 1998, 2000, 2001 Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
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 <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <ctype.h>
|
|
#include "security.h"
|
|
#include "path.h"
|
|
#include "fhandler.h"
|
|
#include "perprocess.h"
|
|
#include "thread.h"
|
|
#include "dlfcn.h"
|
|
#include "dll_init.h"
|
|
#include "cygerrno.h"
|
|
#include "cygtls.h"
|
|
|
|
static void __stdcall
|
|
set_dl_error (const char *str)
|
|
{
|
|
__small_sprintf (_my_tls.locals.dl_buffer, "%s: %E", str);
|
|
_my_tls.locals.dl_error = 1;
|
|
}
|
|
|
|
/* Look for an executable file given the name and the environment
|
|
variable to use for searching (eg., PATH); returns the full
|
|
pathname (static buffer) if found or NULL if not. */
|
|
inline const char * __stdcall
|
|
check_path_access (const char *mywinenv, const char *name, path_conv& buf)
|
|
{
|
|
return find_exec (name, buf, mywinenv, FE_NNF | FE_NATIVE | FE_CWD);
|
|
}
|
|
|
|
/* Search LD_LIBRARY_PATH for dll, if it exists.
|
|
Return Windows version of given path. */
|
|
static const char * __stdcall
|
|
get_full_path_of_dll (const char* str, char *name)
|
|
{
|
|
int len = strlen (str);
|
|
|
|
/* empty string or too long to be legal win32 pathname? */
|
|
if (len == 0 || len >= CYG_MAX_PATH - 1)
|
|
return str; /* Yes. Let caller deal with it. */
|
|
|
|
const char *ret;
|
|
|
|
strcpy (name, str); /* Put it somewhere where we can manipulate it. */
|
|
|
|
/* Add extension if necessary */
|
|
if (str[len - 1] != '.')
|
|
{
|
|
/* Add .dll only if no extension provided. */
|
|
const char *p = strrchr (str, '.');
|
|
if (!p || strpbrk (p, "\\/"))
|
|
strcat (name, ".dll");
|
|
}
|
|
|
|
path_conv real_filename;
|
|
|
|
if (isabspath (name) ||
|
|
(ret = check_path_access ("LD_LIBRARY_PATH=", name, real_filename)) == NULL)
|
|
real_filename.check (name); /* Convert */
|
|
|
|
if (!real_filename.error)
|
|
ret = strcpy (name, real_filename);
|
|
else
|
|
{
|
|
set_errno (real_filename.error);
|
|
ret = NULL;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
void *
|
|
dlopen (const char *name, int)
|
|
{
|
|
SetResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlopen");
|
|
|
|
void *ret;
|
|
|
|
if (name == NULL)
|
|
ret = (void *) GetModuleHandle (NULL); /* handle for the current module */
|
|
else
|
|
{
|
|
char buf[CYG_MAX_PATH];
|
|
/* handle for the named library */
|
|
const char *fullpath = get_full_path_of_dll (name, buf);
|
|
if (!fullpath)
|
|
ret = NULL;
|
|
else
|
|
{
|
|
ret = (void *) LoadLibrary (fullpath);
|
|
if (ret == NULL)
|
|
__seterrno ();
|
|
}
|
|
}
|
|
|
|
if (!ret)
|
|
set_dl_error ("dlopen");
|
|
debug_printf ("ret %p", ret);
|
|
|
|
ReleaseResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlopen");
|
|
return ret;
|
|
}
|
|
|
|
void *
|
|
dlsym (void *handle, const char *name)
|
|
{
|
|
void *ret = (void *) GetProcAddress ((HMODULE) handle, name);
|
|
if (!ret)
|
|
set_dl_error ("dlsym");
|
|
debug_printf ("ret %p", ret);
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
dlclose (void *handle)
|
|
{
|
|
SetResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlclose");
|
|
|
|
int ret = -1;
|
|
void *temphandle = (void *) GetModuleHandle (NULL);
|
|
if (temphandle == handle || FreeLibrary ((HMODULE) handle))
|
|
ret = 0;
|
|
if (ret)
|
|
set_dl_error ("dlclose");
|
|
CloseHandle ((HMODULE) temphandle);
|
|
|
|
ReleaseResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlclose");
|
|
return ret;
|
|
}
|
|
|
|
char *
|
|
dlerror ()
|
|
{
|
|
char *res;
|
|
if (!_my_tls.locals.dl_error)
|
|
res = NULL;
|
|
else
|
|
{
|
|
_my_tls.locals.dl_error = 0;
|
|
res = _my_tls.locals.dl_buffer;
|
|
}
|
|
return res;
|
|
}
|