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.
296 lines
6.5 KiB
C++
296 lines
6.5 KiB
C++
/* external.cc: Interface to Cygwin internals from external programs.
|
|
|
|
Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
|
|
|
|
Written by Christopher Faylor <cgf@cygnus.com>
|
|
|
|
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 "security.h"
|
|
#include "sigproc.h"
|
|
#include "pinfo.h"
|
|
#include <exceptions.h>
|
|
#include "shared_info.h"
|
|
#include "cygwin_version.h"
|
|
#include "perprocess.h"
|
|
#include "cygerrno.h"
|
|
#include "path.h"
|
|
#include "fhandler.h"
|
|
#include "dtable.h"
|
|
#include "cygheap.h"
|
|
#include "wincap.h"
|
|
#include "heap.h"
|
|
#include "cygthread.h"
|
|
#include "pwdgrp.h"
|
|
#include "cygtls.h"
|
|
|
|
static external_pinfo *
|
|
fillout_pinfo (pid_t pid, int winpid)
|
|
{
|
|
BOOL nextpid;
|
|
static external_pinfo ep;
|
|
|
|
if ((nextpid = !!(pid & CW_NEXTPID)))
|
|
pid ^= CW_NEXTPID;
|
|
|
|
static winpids pids (0);
|
|
|
|
static unsigned int i;
|
|
if (!pids.npids || !nextpid)
|
|
{
|
|
pids.set (winpid);
|
|
i = 0;
|
|
}
|
|
|
|
if (!pid)
|
|
i = 0;
|
|
|
|
memset (&ep, 0, sizeof ep);
|
|
while (i < pids.npids)
|
|
{
|
|
DWORD thispid = pids.winpid (i);
|
|
_pinfo *p = pids[i];
|
|
i++;
|
|
|
|
if (!p)
|
|
{
|
|
if (!nextpid && thispid != (DWORD) pid)
|
|
continue;
|
|
ep.pid = cygwin_pid (thispid);
|
|
ep.dwProcessId = thispid;
|
|
ep.process_state = PID_IN_USE;
|
|
ep.ctty = -1;
|
|
break;
|
|
}
|
|
else if (nextpid || p->pid == pid || (winpid && thispid == (DWORD) pid))
|
|
{
|
|
ep.ctty = p->ctty;
|
|
ep.pid = p->pid;
|
|
ep.ppid = p->ppid;
|
|
ep.hProcess = p->hProcess;
|
|
ep.dwProcessId = p->dwProcessId;
|
|
ep.uid = p->uid;
|
|
ep.gid = p->gid;
|
|
ep.pgid = p->pgid;
|
|
ep.sid = p->sid;
|
|
ep.umask = 0;
|
|
ep.start_time = p->start_time;
|
|
ep.rusage_self = p->rusage_self;
|
|
ep.rusage_children = p->rusage_children;
|
|
strcpy (ep.progname, p->progname);
|
|
ep.strace_mask = 0;
|
|
ep.version = EXTERNAL_PINFO_VERSION;
|
|
|
|
ep.process_state = p->process_state;
|
|
|
|
ep.uid32 = p->uid;
|
|
ep.gid32 = p->gid;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!ep.pid)
|
|
{
|
|
i = 0;
|
|
pids.reset ();
|
|
return 0;
|
|
}
|
|
return &ep;
|
|
}
|
|
|
|
static DWORD
|
|
get_cygdrive_info (char *user, char *system, char *user_flags,
|
|
char *system_flags)
|
|
{
|
|
int res = mount_table->get_cygdrive_info (user, system, user_flags,
|
|
system_flags);
|
|
return (res == ERROR_SUCCESS) ? 1 : 0;
|
|
}
|
|
|
|
static DWORD
|
|
get_cygdrive_prefixes (char *user, char *system)
|
|
{
|
|
char user_flags[CYG_MAX_PATH];
|
|
char system_flags[CYG_MAX_PATH];
|
|
DWORD res = get_cygdrive_info (user, system, user_flags, system_flags);
|
|
return res;
|
|
}
|
|
|
|
static DWORD
|
|
check_ntsec (const char *filename)
|
|
{
|
|
if (!filename)
|
|
return wincap.has_security () && allow_ntsec;
|
|
path_conv pc (filename);
|
|
return wincap.has_security () && allow_ntsec && pc.has_acls ();
|
|
}
|
|
|
|
extern "C" unsigned long
|
|
cygwin_internal (cygwin_getinfo_types t, ...)
|
|
{
|
|
va_list arg;
|
|
va_start (arg, t);
|
|
|
|
switch (t)
|
|
{
|
|
case CW_LOCK_PINFO:
|
|
return 1;
|
|
|
|
case CW_UNLOCK_PINFO:
|
|
return 1;
|
|
|
|
case CW_GETTHREADNAME:
|
|
return (DWORD) cygthread::name (va_arg (arg, DWORD));
|
|
|
|
case CW_SETTHREADNAME:
|
|
{
|
|
set_errno (ENOSYS);
|
|
return 0;
|
|
}
|
|
|
|
case CW_GETPINFO:
|
|
return (DWORD) fillout_pinfo (va_arg (arg, DWORD), 0);
|
|
|
|
case CW_GETVERSIONINFO:
|
|
return (DWORD) cygwin_version_strings;
|
|
|
|
case CW_READ_V1_MOUNT_TABLES:
|
|
set_errno (ENOSYS);
|
|
return 1;
|
|
|
|
case CW_USER_DATA:
|
|
return (DWORD) &__cygwin_user_data;
|
|
|
|
case CW_PERFILE:
|
|
perfile_table = va_arg (arg, struct __cygwin_perfile *);
|
|
return 0;
|
|
|
|
case CW_GET_CYGDRIVE_PREFIXES:
|
|
{
|
|
char *user = va_arg (arg, char *);
|
|
char *system = va_arg (arg, char *);
|
|
return get_cygdrive_prefixes (user, system);
|
|
}
|
|
|
|
case CW_GETPINFO_FULL:
|
|
return (DWORD) fillout_pinfo (va_arg (arg, pid_t), 1);
|
|
|
|
case CW_INIT_EXCEPTIONS:
|
|
init_exceptions (va_arg (arg, exception_list *));
|
|
return 0;
|
|
|
|
case CW_GET_CYGDRIVE_INFO:
|
|
{
|
|
char *user = va_arg (arg, char *);
|
|
char *system = va_arg (arg, char *);
|
|
char *user_flags = va_arg (arg, char *);
|
|
char *system_flags = va_arg (arg, char *);
|
|
return get_cygdrive_info (user, system, user_flags, system_flags);
|
|
}
|
|
|
|
case CW_SET_CYGWIN_REGISTRY_NAME:
|
|
{
|
|
const char *cr = va_arg (arg, char *);
|
|
if (check_null_empty_str_errno (cr))
|
|
return (DWORD) NULL;
|
|
cygheap->cygwin_regname = (char *) crealloc (cygheap->cygwin_regname,
|
|
strlen (cr) + 1);
|
|
strcpy (cygheap->cygwin_regname, cr);
|
|
}
|
|
case CW_GET_CYGWIN_REGISTRY_NAME:
|
|
return (DWORD) cygheap->cygwin_regname;
|
|
|
|
case CW_STRACE_TOGGLE:
|
|
{
|
|
pid_t pid = va_arg (arg, pid_t);
|
|
pinfo p (pid);
|
|
if (p)
|
|
{
|
|
sig_send (p, __SIGSTRACE);
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
set_errno (ESRCH);
|
|
return (DWORD) -1;
|
|
}
|
|
}
|
|
|
|
case CW_STRACE_ACTIVE:
|
|
{
|
|
return strace.active;
|
|
}
|
|
|
|
case CW_CYGWIN_PID_TO_WINPID:
|
|
{
|
|
pinfo p (va_arg (arg, pid_t));
|
|
return p ? p->dwProcessId : 0;
|
|
}
|
|
case CW_EXTRACT_DOMAIN_AND_USER:
|
|
{
|
|
struct passwd *pw = va_arg (arg, struct passwd *);
|
|
char *domain = va_arg (arg, char *);
|
|
char *user = va_arg (arg, char *);
|
|
extract_nt_dom_user (pw, domain, user);
|
|
return 0;
|
|
}
|
|
case CW_CMDLINE:
|
|
{
|
|
size_t n;
|
|
pid_t pid = va_arg (arg, pid_t);
|
|
pinfo p (pid);
|
|
return (DWORD) p->cmdline (n);
|
|
}
|
|
case CW_CHECK_NTSEC:
|
|
{
|
|
char *filename = va_arg (arg, char *);
|
|
return check_ntsec (filename);
|
|
}
|
|
case CW_GET_ERRNO_FROM_WINERROR:
|
|
{
|
|
int error = va_arg (arg, int);
|
|
int deferrno = va_arg (arg, int);
|
|
return geterrno_from_win_error (error, deferrno);
|
|
}
|
|
case CW_GET_POSIX_SECURITY_ATTRIBUTE:
|
|
{
|
|
security_descriptor sd;
|
|
int attribute = va_arg (arg, int);
|
|
PSECURITY_ATTRIBUTES psa = va_arg (arg, PSECURITY_ATTRIBUTES);
|
|
void *sd_buf = va_arg (arg, void *);
|
|
DWORD sd_buf_size = va_arg (arg, DWORD);
|
|
set_security_attribute (attribute, psa, sd);
|
|
if (!psa->lpSecurityDescriptor || sd.size () > sd_buf_size)
|
|
return sd.size ();
|
|
memcpy (sd_buf, sd, sd.size ());
|
|
psa->lpSecurityDescriptor = sd_buf;
|
|
return 0;
|
|
}
|
|
case CW_GET_SHMLBA:
|
|
{
|
|
return getshmlba ();
|
|
}
|
|
case CW_GET_UID_FROM_SID:
|
|
{
|
|
PSID psid = va_arg (arg, PSID);
|
|
cygsid sid (psid);
|
|
struct passwd *pw = internal_getpwsid (sid);
|
|
return pw ? pw->pw_uid : (__uid32_t)-1;
|
|
}
|
|
case CW_GET_GID_FROM_SID:
|
|
{
|
|
PSID psid = va_arg (arg, PSID);
|
|
cygsid sid (psid);
|
|
struct __group32 *gr = internal_getgrsid (sid);
|
|
return gr ? gr->gr_gid : (__gid32_t)-1;
|
|
}
|
|
default:
|
|
return (DWORD) -1;
|
|
}
|
|
}
|