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

Fix build breakage from my previous commit.

Browse Source 
Now I test for PT_SETOPTIONS being #defined.
Remove trailing whitespace.
No actual code changes.
This commit is contained in:
Denys Vlasenko 2008-12-23 16:14:42 +00:00
parent 1e3ce32a4f
commit b1efe53531
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desc.c
View File

@ -834,7 +834,7 @@ struct tcb *tcp;
tprintf("{%p, %p, %ld, %ld}",
event.data, event.obj,
event.res, event.res2);
else
else
#endif
tprintf("{...}");
}

6
strace.c
View File

@ -2408,7 +2408,9 @@ Process %d attached (waiting for parent)\n",
return -1;
}
}
#ifdef LINUX /* add more OSes after you verified it works for them */
/* PTRACE_SETOPTIONS is not a #define. PT_SETOPTIONS is. */
/* Add more OSes after you verified it works for them. */
#if defined LINUX && defined PT_SETOPTIONS
/*
* Ask kernel to set signo to SIGTRAP | 0x80
* on ptrace-generated SIGTRAPs, and mark
@ -2423,7 +2425,7 @@ Process %d attached (waiting for parent)\n",
goto tracing;
}
#ifdef LINUX
#if defined LINUX && defined PT_SETOPTIONS
if (tcp->sigtrap80 != SIGTRAP && WSTOPSIG(status) == SIGTRAP) {
/*
* We told ptrace to report SIGTRAP | 0x80 on this process

2
svr4/syscallent.h
View File

@ -823,5 +823,5 @@
{ -1, TF, sys_aioaread64, "aioaread64" }, /* 417 */
{ -1, TF, sys_aioawrite64, "aioawrite64" }, /* 418 */
{ -1, TF, sys_aiocancel64, "aiocancel64" }, /* 419 */
{ -1, TF, sys_aiofsync, "aiofsync" }, /* 420 */
{ -1, TF, sys_aiofsync, "aiofsync" }, /* 420 */
#endif

2
test/childthread.c
View File

@ -1,7 +1,7 @@
/* Test exit of a child of a TCB_EXITING child where the toplevel process starts
* waiting on it. The middle one gets detached and strace must update the
* toplevel process'es number of attached children to 0.
*
*
* gcc -o test/childthread test/childthread.c -Wall -ggdb2 -pthread;./strace -f ./test/childthread
* It must print: write(1, "OK\n", ...
*/

2
test/leaderkill.c
View File

@ -1,7 +1,7 @@
/* Test handle_group_exit () handling of a thread leader still alive with its
* thread child calling exit_group () and proper passing of the process exit
* code to the process parent of this whole thread group.
*
*
* gcc -o test/leaderkill test/leaderkill.c -Wall -ggdb2 -pthread;./test/leaderkill & pid=$!;sleep 1;strace -o x -q ./strace -f -p $pid
* It must print: write(1, "OK\n", ...
*/