*** cygwin DLL Changes:
* 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'.
This commit is contained in:
Christopher Faylor
@@ -1,6 +1,7 @@
|
||||
/* sys/strace.h
|
||||
|
||||
Copyright 1996, 1997, 1998, 1999, 2000, 2001 Red Hat, Inc.
|
||||
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||
2005 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@@ -8,8 +9,6 @@ This software is a copyrighted work licensed under the terms of the
|
||||
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||
details. */
|
||||
|
||||
/* sys/strace.h */
|
||||
|
||||
/* This file contains routines for tracing system calls and other internal
|
||||
phenomenon.
|
||||
|
||||
@@ -33,21 +32,25 @@ details. */
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
class child_info;
|
||||
class strace
|
||||
{
|
||||
int vsprntf (char *buf, const char *func, const char *infmt, va_list ap);
|
||||
void write (unsigned category, const char *buf, int count);
|
||||
unsigned char _active;
|
||||
public:
|
||||
int microseconds ();
|
||||
int version;
|
||||
int active;
|
||||
int lmicrosec;
|
||||
int execing;
|
||||
int inited;
|
||||
void hello ();
|
||||
bool execing;
|
||||
void hello () __attribute__ ((regparm (1)));
|
||||
void prntf (unsigned, const char *func, const char *, ...) /*__attribute__ ((regparm(3)))*/;
|
||||
void vprntf (unsigned, const char *func, const char *, va_list ap) /*__attribute__ ((regparm(3)))*/;
|
||||
void wm (int message, int word, int lon) __attribute__ ((regparm(3)));
|
||||
void write_childpid (child_info&, unsigned long) __attribute__ ((regparm (2)));
|
||||
bool attached () const {return _active == 3;}
|
||||
bool active () const {return _active & 1;}
|
||||
unsigned char& active_val () {return _active;}
|
||||
};
|
||||
|
||||
extern strace strace;
|
||||
@@ -56,6 +59,7 @@ extern strace strace;
|
||||
|
||||
#define _STRACE_INTERFACE_ACTIVATE_ADDR -1
|
||||
#define _STRACE_INTERFACE_ACTIVATE_ADDR1 -2
|
||||
#define _STRACE_CHILD_PID -3
|
||||
|
||||
/* Bitmasks of tracing messages to print. */
|
||||
|
||||
@@ -78,13 +82,6 @@ extern strace strace;
|
||||
#define _STRACE_MALLOC 0x20000 // trace malloc calls
|
||||
#define _STRACE_THREAD 0x40000 // thread-locking calls
|
||||
#define _STRACE_NOTALL 0x80000 // don't include if _STRACE_ALL
|
||||
#if defined (DEBUGGING)
|
||||
# define _STRACE_ON strace.active = 1
|
||||
# define _STRACE_OFF strace.active = 0
|
||||
#else
|
||||
# define _STRACE_ON
|
||||
# define _STRACE_OFF
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -108,7 +105,7 @@ void strace_printf (unsigned, const char *func, const char *, ...);
|
||||
|
||||
#define define_strace0(c,...) \
|
||||
do { \
|
||||
if ((c & _STRACE_SYSTEM) || strace.active) \
|
||||
if ((c & _STRACE_SYSTEM) || strace.active ()) \
|
||||
strace.prntf (c, __PRETTY_FUNCTION__, __VA_ARGS__); \
|
||||
} \
|
||||
while (0)
|
||||
@@ -130,13 +127,13 @@ void strace_printf (unsigned, const char *func, const char *, ...);
|
||||
#else
|
||||
#define strace_printf_wrap(what, fmt, args...) \
|
||||
((void) ({\
|
||||
if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active) \
|
||||
if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active ()) \
|
||||
strace.prntf(_STRACE_ ## what, __PRETTY_FUNCTION__, fmt, ## args); \
|
||||
0; \
|
||||
}))
|
||||
#define strace_printf_wrap1(what, fmt, args...) \
|
||||
((void) ({\
|
||||
if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active) \
|
||||
if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active ()) \
|
||||
strace.prntf((_STRACE_ ## what) | _STRACE_NOTALL, __PRETTY_FUNCTION__, fmt, ## args); \
|
||||
0; \
|
||||
}))
|
||||
|
||||
Reference in New Issue
Block a user