glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanups. No logic changes.

Browse Source 
* defs.h: Define new ptrace constants unconditionally.
* strace.c (detach): Fix comment.
(trace): Remove now unnecessary "if USE_SEIZE".

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2013-06-18 18:09:39 +02:00
parent 02d2c708de
commit f1669e7975
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
defs.h
View File

@ -227,16 +227,14 @@ extern long ptrace(int, int, char *, long);
# define PTRACE_POKEUSER PTRACE_POKEUSR # define PTRACE_POKEUSER PTRACE_POKEUSR
#endif #endif
#if USE_SEIZE #undef PTRACE_SEIZE
# undef PTRACE_SEIZE #define PTRACE_SEIZE 0x4206
# define PTRACE_SEIZE 0x4206 #undef PTRACE_INTERRUPT
# undef PTRACE_INTERRUPT #define PTRACE_INTERRUPT 0x4207
# define PTRACE_INTERRUPT 0x4207 #undef PTRACE_LISTEN
# undef PTRACE_LISTEN #define PTRACE_LISTEN 0x4208
# define PTRACE_LISTEN 0x4208 #undef PTRACE_EVENT_STOP
# undef PTRACE_EVENT_STOP #define PTRACE_EVENT_STOP 128
# define PTRACE_EVENT_STOP 128
#endif
#ifdef ALPHA #ifdef ALPHA
# define REG_R0 0 # define REG_R0 0

4
strace.c
View File

@ -724,7 +724,7 @@ droptcb(struct tcb *tcp)
memset(tcp, 0, sizeof(*tcp)); memset(tcp, 0, sizeof(*tcp));
} }
/* detach traced process; continue with sig /* Detach traced process.
* Never call DETACH twice on the same process as both unattached and * Never call DETACH twice on the same process as both unattached and
* attached-unstopped processes give the same ESRCH. For unattached process we * attached-unstopped processes give the same ESRCH. For unattached process we
* would SIGSTOP it and wait for its SIGSTOP notification forever. * would SIGSTOP it and wait for its SIGSTOP notification forever.
@ -2252,7 +2252,6 @@ trace(void)
goto restart_tracee; goto restart_tracee;
/* It's group-stop */ /* It's group-stop */
#if USE_SEIZE
if (use_seize) { if (use_seize) {
/* /*
* This ends ptrace-stop, but does *not* end group-stop. * This ends ptrace-stop, but does *not* end group-stop.
@ -2266,7 +2265,6 @@ trace(void)
continue; continue;
} }
/* We don't have PTRACE_LISTEN support... */ /* We don't have PTRACE_LISTEN support... */
#endif
goto restart_tracee; goto restart_tracee;
} }