5d97040501
* child_info.h (CURR_CHILD_INFO_MAGIC): Reset. (child_info::dwProcessId): Delete. (child_info::straced): New variable. (child_info::handle_fork): New member function. * dcrt0.cc (in_forkee): New global variable. (__cygwin_user_data::forkee): Mark as obsolete. (do_global_ctors): Use in_forkee rather than user_data->forkee. (get_cygwin_startup_info): Ditto. Deal with new straced field to allow strace to deal with children of attached processes. (initial_env): Accommodate changes to strace::hello. (child_info_fork::handle_fork): Rename from plain old 'handle_fork'. Move alloc_stack() call elsewhere. (dll_crt0_0): Fill out more of user_data. Reference handle_fork via fork_info. Add some debugging output. (_dll_crt0): Don't wait for sync thread if sync_startup is invalid. Zero sync_startup here. Call alloc_stack() here, if appropriate. (dll_crt0_1): Use in_forkee rather than user_data->forkee. (dll_crt0): Ditto. * malloc_wrapper.cc (malloc_init): Ditto. * dll_init.cc (in_forkee): Remove local static version of this variable. (dll_list::load_after_fork): Don't set in_forkee here. * external.cc (cygwin_internal): Use strace method rather than accessing field directly. * fhandler.cc (fhandler_base::read): Ditto. * fhandler_tty.cc (fhandler_tty_common::__acquire_output_mutex): Ditto. * fork.cc (frok::parent): Invoke strace write_childpid to communicate with potential strace. (child_copy): Add more detail to debugging output. * init.cc (calibration_id): New static variable. (prime_threads): Set sync_startup to invalid handle if we already know about thread_func_ix. Use static calibration_id to hold calibration thread id. * munge_threadfunc (munge_threadfunc): Don't try to debug if we don't find threadfunc_ix. (dll_entry): Avoid calling munge_threadfunc and _cygtls::remove on non-cygwin threads invoked during process startup. * pinfo.cc (set_myself): Always call strace.hello here regardless of DEBUGGING. * sigproc.cc (child_info::child_info): Remove spurious handling of dwProcessId. Set straced as appropriate. * spawn.cc (spawn_guts): Rename ciresrv to ch. Invoke strace write_childpid to communicate with potential strace. * strace.cc: Include child_info.h. (strace::hello): Remove inited test. Use active() method to test if strace has been activated. Handle case where we are started before (mypid): New function. (strace::vsprntf): Try to deal more intelligently with case where progname may not be filled out. Put pid in parentheses if it is a windows pid rather than a cygwin pid. myself has been filled out. (strace::write_childpid): New function for notifying strace about the creation of children. (strace::vprntf): Use strace method rather than accessing field directly. (strace_printf): Ditto. (strace::wm): Ditto. * winsup.h (in_forkee): Declare. * include/sys/strace.h (strace::write_childpid): Declare new function. (strace::attached): Define new function. (strace::active): Ditto. (strace::active_val): Ditto. (_STRACE_ON): Delete. (_STRACE_OFF): Ditto. (define_strace0): Use strace method rather than accessing field directly. (strace_printf_wrap): Ditto. (strace_printf_wrap1): Ditto. *** cygwin utils changes: * strace.cc (nprocesses): Make static global. (quiet): New variable. (strace_active): Ditto. (add_child): Increment nprocesses here. Don't add a child if it is already added (windows bug?). Report on child if not quiet. (get_child): Just return NULL if child not found. (remove_child): Report on child if not quiet. (attach_process): Don't complain if given a windows process. Use windows pid in error. (handle_output_debug_string): Issue error if trying to manipulate a process that we don't know about. Handle _STRACE_CHILD_PID - attach to reported child when we get this. (proc_child): Move nprocesses to file scope. Report on exceptions. (longopts): Implement "--quiet". (opts): Implement "-q". (main): Manipulate quiet flag. * utils.sgml (strace): Add words describing '-q'.
274 lines
5.1 KiB
C++
274 lines
5.1 KiB
C++
/* malloc_wrapper.cc
|
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
Red Hat, Inc.
|
|
|
|
Originally written by Steve Chamberlain of Cygnus Support
|
|
sac@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 <stdlib.h>
|
|
#include <assert.h>
|
|
#include "cygerrno.h"
|
|
#include "security.h"
|
|
#include "path.h"
|
|
#include "fhandler.h"
|
|
#include "dtable.h"
|
|
#include "cygheap.h"
|
|
#include "heap.h"
|
|
#include "sync.h"
|
|
#include "perprocess.h"
|
|
#include "cygmalloc.h"
|
|
#ifndef MALLOC_DEBUG
|
|
#include <malloc.h>
|
|
#endif
|
|
extern "C" struct mallinfo dlmallinfo ();
|
|
|
|
/* we provide these stubs to call into a user's
|
|
provided malloc if there is one - otherwise
|
|
functions we provide - like strdup will cause
|
|
problems if malloced on our heap and free'd on theirs.
|
|
*/
|
|
|
|
static int export_malloc_called;
|
|
static int use_internal_malloc = 1;
|
|
|
|
/* These routines are used by the application if it
|
|
doesn't provide its own malloc. */
|
|
|
|
extern "C" void
|
|
free (void *p)
|
|
{
|
|
malloc_printf ("(%p), called by %p", p, __builtin_return_address (0));
|
|
if (!use_internal_malloc)
|
|
user_data->free (p);
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
dlfree (p);
|
|
__malloc_unlock ();
|
|
}
|
|
}
|
|
|
|
extern "C" void *
|
|
malloc (size_t size)
|
|
{
|
|
void *res;
|
|
export_malloc_called = 1;
|
|
if (!use_internal_malloc)
|
|
res = user_data->malloc (size);
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
res = dlmalloc (size);
|
|
__malloc_unlock ();
|
|
}
|
|
malloc_printf ("(%d) = %x, called by %p", size, res, __builtin_return_address (0));
|
|
return res;
|
|
}
|
|
|
|
extern "C" void *
|
|
realloc (void *p, size_t size)
|
|
{
|
|
void *res;
|
|
if (!use_internal_malloc)
|
|
res = user_data->realloc (p, size);
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
res = dlrealloc (p, size);
|
|
__malloc_unlock ();
|
|
}
|
|
malloc_printf ("(%x, %d) = %x, called by %x", p, size, res, __builtin_return_address (0));
|
|
return res;
|
|
}
|
|
|
|
extern "C" void *
|
|
calloc (size_t nmemb, size_t size)
|
|
{
|
|
void *res;
|
|
if (!use_internal_malloc)
|
|
res = user_data->calloc (nmemb, size);
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
res = dlcalloc (nmemb, size);
|
|
__malloc_unlock ();
|
|
}
|
|
malloc_printf ("(%d, %d) = %x, called by %x", nmemb, size, res, __builtin_return_address (0));
|
|
return res;
|
|
}
|
|
|
|
extern "C" void *
|
|
memalign (size_t alignment, size_t bytes)
|
|
{
|
|
void *res;
|
|
if (!use_internal_malloc)
|
|
{
|
|
set_errno (ENOSYS);
|
|
res = NULL;
|
|
}
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
res = dlmemalign (alignment, bytes);
|
|
__malloc_unlock ();
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
extern "C" void *
|
|
valloc (size_t bytes)
|
|
{
|
|
void *res;
|
|
if (!use_internal_malloc)
|
|
{
|
|
set_errno (ENOSYS);
|
|
res = NULL;
|
|
}
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
res = dlvalloc (bytes);
|
|
__malloc_unlock ();
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
extern "C" size_t
|
|
malloc_usable_size (void *p)
|
|
{
|
|
size_t res;
|
|
if (!use_internal_malloc)
|
|
{
|
|
set_errno (ENOSYS);
|
|
res = 0;
|
|
}
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
res = dlmalloc_usable_size (p);
|
|
__malloc_unlock ();
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
extern "C" int
|
|
malloc_trim (size_t pad)
|
|
{
|
|
size_t res;
|
|
if (!use_internal_malloc)
|
|
{
|
|
set_errno (ENOSYS);
|
|
res = 0;
|
|
}
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
res = dlmalloc_trim (pad);
|
|
__malloc_unlock ();
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
extern "C" int
|
|
mallopt (int p, int v)
|
|
{
|
|
int res;
|
|
if (!use_internal_malloc)
|
|
{
|
|
set_errno (ENOSYS);
|
|
res = 0;
|
|
}
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
res = dlmallopt (p, v);
|
|
__malloc_unlock ();
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
extern "C" void
|
|
malloc_stats ()
|
|
{
|
|
if (!use_internal_malloc)
|
|
set_errno (ENOSYS);
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
dlmalloc_stats ();
|
|
__malloc_unlock ();
|
|
}
|
|
}
|
|
|
|
extern "C" struct mallinfo
|
|
mallinfo ()
|
|
{
|
|
struct mallinfo m;
|
|
if (!use_internal_malloc)
|
|
set_errno (ENOSYS);
|
|
else
|
|
{
|
|
__malloc_lock ();
|
|
m = dlmallinfo ();
|
|
__malloc_unlock ();
|
|
}
|
|
|
|
return m;
|
|
}
|
|
|
|
extern "C" char *
|
|
strdup (const char *s)
|
|
{
|
|
char *p;
|
|
size_t len = strlen (s) + 1;
|
|
if ((p = (char *) malloc (len)) != NULL)
|
|
memcpy (p, s, len);
|
|
return p;
|
|
}
|
|
|
|
/* We use a critical section to lock access to the malloc data
|
|
structures. This permits malloc to be called from different
|
|
threads. Note that it does not make malloc reentrant, and it does
|
|
not permit a signal handler to call malloc. The malloc code in
|
|
newlib will call __malloc_lock and __malloc_unlock at appropriate
|
|
times. */
|
|
|
|
muto NO_COPY mallock;
|
|
|
|
void
|
|
malloc_init ()
|
|
{
|
|
mallock.init ("mallock");
|
|
|
|
#ifndef MALLOC_DEBUG
|
|
/* Check if malloc is provided by application. If so, redirect all
|
|
calls to malloc/free/realloc to application provided. This may
|
|
happen if some other dll calls cygwin's malloc, but main code provides
|
|
its own malloc */
|
|
if (!in_forkee)
|
|
{
|
|
user_data->free (user_data->malloc (16));
|
|
if (export_malloc_called)
|
|
malloc_printf ("using internal malloc");
|
|
else
|
|
{
|
|
use_internal_malloc = 0;
|
|
malloc_printf ("using external malloc");
|
|
}
|
|
}
|
|
#endif
|
|
}
|