Get rid of TCB_INUSE and TCB_STRACE_CHILD

[strace] / defs.h

diff --git a/defs.h b/defs.h
index 3873c10ada35b911a34efdca3af69480e793f05a..1f1602a2e69ab0024f3b9d3bd2ffd6c1a681e5d0 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -36,9 +36,20 @@
 #  define _LFS64_LARGEFILE 1
 # endif
 #endif
+
 #ifdef MIPS
 # include <sgidefs.h>
+# if _MIPS_SIM == _MIPS_SIM_ABI64
+#  define LINUX_MIPSN64
+# elif _MIPS_SIM == _MIPS_SIM_NABI32
+#  define LINUX_MIPSN32
+# elif _MIPS_SIM == _MIPS_SIM_ABI32
+#  define LINUX_MIPSO32
+# else
+#  error Unsupported _MIPS_SIM
+# endif
 #endif
+
 #include <features.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
@@ -114,10 +125,15 @@ extern char *stpcpy(char *dst, const char *src);
  * Maximum number of args to a syscall.
  *
  * Make sure that all entries in all syscallent.h files have nargs <= MAX_ARGS!
- * linux/<ARCH>/syscallent.h: all have nargs <= 6.
+ * linux/<ARCH>/syscallent*.h:
+ *     all have nargs <= 6 except mips o32 which has nargs <= 7.
  */
 #ifndef MAX_ARGS
-# define MAX_ARGS      6
+# ifdef LINUX_MIPSO32
+#  define MAX_ARGS     7
+# else
+#  define MAX_ARGS     6
+# endif
 #endif
 /* default sorting method for call profiling */
 #ifndef DEFAULT_SORTBY
@@ -131,17 +147,6 @@ extern char *stpcpy(char *dst, const char *src);
 /* To force NOMMU build, set to 1 */
 #define NOMMU_SYSTEM 0
 
-
-#if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_ABI32
-# define LINUX_MIPSO32
-#endif
-#if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_NABI32
-# define LINUX_MIPSN32
-#endif
-#if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_ABI64
-# define LINUX_MIPSN64
-#endif
-
 #if (defined(SPARC) || defined(SPARC64) \
     || defined(I386) || defined(X32) || defined(X86_64) \
     || defined(ARM) || defined(AARCH64) \
@@ -222,16 +227,14 @@ extern long ptrace(int, int, char *, long);
 # define PTRACE_POKEUSER PTRACE_POKEUSR
 #endif
 
-#if USE_SEIZE
-# undef PTRACE_SEIZE
-# define PTRACE_SEIZE          0x4206
-# undef PTRACE_INTERRUPT
-# define PTRACE_INTERRUPT      0x4207
-# undef PTRACE_LISTEN
-# define PTRACE_LISTEN         0x4208
-# undef PTRACE_EVENT_STOP
-# define PTRACE_EVENT_STOP     128
-#endif
+#undef PTRACE_SEIZE
+#define PTRACE_SEIZE           0x4206
+#undef PTRACE_INTERRUPT
+#define PTRACE_INTERRUPT       0x4207
+#undef PTRACE_LISTEN
+#define PTRACE_LISTEN          0x4208
+#undef PTRACE_EVENT_STOP
+#define PTRACE_EVENT_STOP      128
 
 #ifdef ALPHA
 # define REG_R0 0
@@ -390,7 +393,7 @@ typedef struct ioctlent {
 /* Trace Control Block */
 struct tcb {
        int flags;              /* See below for TCB_ values */
-       int pid;                /* Process Id of this entry */
+       int pid;                /* If 0, this tcb is free */
        int qual_flg;           /* qual_flags[scno] or DEFAULT_QUAL_FLAGS + RAW */
        int u_error;            /* Error code */
        long scno;              /* System call number */
@@ -415,10 +418,9 @@ struct tcb {
 };
 
 /* TCB flags */
-#define TCB_INUSE              00001   /* This table entry is in use */
 /* We have attached to this process, but did not see it stopping yet */
-#define TCB_STARTUP            00002
-#define TCB_IGNORE_ONE_SIGSTOP 00004   /* Next SIGSTOP is to be ignored */
+#define TCB_STARTUP            0x01
+#define TCB_IGNORE_ONE_SIGSTOP 0x02    /* Next SIGSTOP is to be ignored */
 /*
  * Are we in system call entry or in syscall exit?
  *
@@ -437,14 +439,13 @@ struct tcb {
  *
  * Use entering(tcp) / exiting(tcp) to check this bit to make code more readable.
  */
-#define TCB_INSYSCALL  00010
-#define TCB_ATTACHED   00020   /* It is attached already */
-/* Are we PROG from "strace PROG [ARGS]" invocation? */
-#define TCB_STRACE_CHILD 0040
-#define TCB_BPTSET     00100   /* "Breakpoint" set after fork(2) */
-#define TCB_REPRINT    00200   /* We should reprint this syscall on exit */
-#define TCB_FILTERED   00400   /* This system call has been filtered out */
-/* x86 does not need TCB_WAITEXECVE.
+#define TCB_INSYSCALL  0x04
+#define TCB_ATTACHED   0x08    /* We attached to it already */
+#define TCB_BPTSET     0x10    /* "Breakpoint" set after fork(2) */
+#define TCB_REPRINT    0x20    /* We should reprint this syscall on exit */
+#define TCB_FILTERED   0x40    /* This system call has been filtered out */
+/*
+ * x86 does not need TCB_WAITEXECVE.
  * It can detect post-execve SIGTRAP by looking at eax/rax.
  * See "not a syscall entry (eax = %ld)\n" message.
  *
@@ -465,7 +466,7 @@ struct tcb {
 /* This tracee has entered into execve syscall. Expect post-execve SIGTRAP
  * to happen. (When it is detected, tracee is continued and this bit is cleared.)
  */
-# define TCB_WAITEXECVE        01000
+# define TCB_WAITEXECVE        0x80
 #endif
 
 /* qualifier flags */
@@ -534,9 +535,10 @@ typedef enum {
 extern cflag_t cflag;
 extern bool debug_flag;
 extern bool Tflag;
-extern bool qflag;
+extern unsigned int qflag;
 extern bool not_failing_only;
 extern bool show_fd_path;
+extern bool hide_log_until_execve;
 /* are we filtering traces based on paths? */
 extern const char **paths_selected;
 #define tracing_paths (paths_selected != NULL)