|
 |
768acb9 |
diff -BurpN ltrace-x86/ltrace.h ltrace-0.5/ltrace.h
|
|
|
768acb9 |
--- ltrace-x86/ltrace.h 2006-12-06 11:34:44.000000000 -0500
|
|
|
768acb9 |
+++ ltrace-0.5/ltrace.h 2006-12-06 14:42:52.000000000 -0500
|
|
|
768acb9 |
@@ -175,6 +173,7 @@ extern void reinitialize_breakpoints(str
|
|
|
768acb9 |
|
|
|
768acb9 |
extern struct process *open_program(char *filename, pid_t pid);
|
|
|
768acb9 |
extern void open_pid(pid_t pid, int verbose);
|
|
|
768acb9 |
+extern void open_forked_pid(pid_t pid);
|
|
|
768acb9 |
extern void show_summary(void);
|
|
|
768acb9 |
|
|
|
768acb9 |
/* Arch-dependent stuff: */
|
|
|
768acb9 |
diff -BurpN ltrace-x86/proc.c ltrace-0.5/proc.c
|
|
|
768acb9 |
--- ltrace-x86/proc.c 2006-12-06 11:34:45.000000000 -0500
|
|
|
768acb9 |
+++ ltrace-0.5/proc.c 2006-12-06 14:42:13.000000000 -0500
|
|
|
768acb9 |
@@ -61,3 +59,11 @@ void open_pid(pid_t pid, int options)
|
|
|
768acb9 |
proc->pid = pid;
|
|
|
768acb9 |
proc->breakpoints_enabled = -1;
|
|
|
768acb9 |
}
|
|
|
768acb9 |
+
|
|
|
768acb9 |
+void open_forked_pid(pid_t pid)
|
|
|
768acb9 |
+{
|
|
|
768acb9 |
+ char *filename = pid2name(pid);
|
|
|
768acb9 |
+ struct process *proc = open_program(filename, 0);
|
|
|
768acb9 |
+ proc->pid = pid;
|
|
|
768acb9 |
+ proc->breakpoints_enabled = -1;
|
|
|
768acb9 |
+}
|
|
|
768acb9 |
diff -BurpN ltrace-x86/testsuite/lib/ltrace.exp ltrace-0.5/testsuite/lib/ltrace.exp
|
|
|
768acb9 |
--- ltrace-x86/testsuite/lib/ltrace.exp 2006-12-06 11:34:43.000000000 -0500
|
|
|
768acb9 |
+++ ltrace-0.5/testsuite/lib/ltrace.exp 2006-12-06 15:31:42.000000000 -0500
|
|
|
768acb9 |
@@ -260,7 +260,7 @@ proc ltrace_saveoutput { args } {
|
|
|
768acb9 |
proc ltrace_verify_output { file_to_search pattern {instance_no 0}} {
|
|
|
768acb9 |
|
|
|
768acb9 |
# compute the number of PATTERN in FILE_TO_SEARCH by grep and wc.
|
|
|
768acb9 |
- catch "exec sh -c {grep $pattern $file_to_search | wc -l ;exit}" output
|
|
|
768acb9 |
+ catch "exec sh -c {egrep $pattern $file_to_search | wc -l ;exit}" output
|
|
|
768acb9 |
verbose "output = $output"
|
|
|
768acb9 |
|
|
|
768acb9 |
if { $instance_no == 0 } then {
|
|
|
768acb9 |
diff -BurpN ltrace-x86/testsuite/ltrace.minor/trace-fork.exp ltrace-0.5/testsuite/ltrace.minor/trace-fork.exp
|
|
|
768acb9 |
--- ltrace-x86/testsuite/ltrace.minor/trace-fork.exp 2006-12-06 11:34:43.000000000 -0500
|
|
|
768acb9 |
+++ ltrace-0.5/testsuite/ltrace.minor/trace-fork.exp 2006-12-06 15:29:40.000000000 -0500
|
|
|
768acb9 |
@@ -35,6 +35,19 @@ if [regexp {ELF from incompatible archit
|
|
|
768acb9 |
|
|
|
768acb9 |
ltrace_saveoutput "${exec_output}" ${srcdir}/${subdir}/${testfile}.ltrace
|
|
|
768acb9 |
|
|
|
768acb9 |
-set pattern "fork"
|
|
|
768acb9 |
+if [ regexp {Cannot attach} $exec_output ] {
|
|
|
768acb9 |
+ fail "Couldn't attach to forked process!"
|
|
|
768acb9 |
+ return
|
|
|
768acb9 |
+}
|
|
|
768acb9 |
+
|
|
|
768acb9 |
+set pattern "^fork"
|
|
|
768acb9 |
ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
|
|
|
768acb9 |
|
|
|
768acb9 |
+set pattern {'^\[pid [0-9]*\][ \t]*(printf|puts)'}
|
|
|
768acb9 |
+ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 2
|
|
|
768acb9 |
+
|
|
|
768acb9 |
+set pattern {'^\[pid [0-9]*\][ \t]*wait'}
|
|
|
768acb9 |
+ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
|
|
|
768acb9 |
+
|
|
|
768acb9 |
+set pattern {'^\[pid [0-9]*\][ \t]*sleep'}
|
|
|
768acb9 |
+ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
|
|
|
768acb9 |
diff -BurpN ltrace-x86/wait_for_something.c ltrace-0.5/wait_for_something.c
|
|
|
768acb9 |
--- ltrace-x86/wait_for_something.c 2006-12-06 21:43:33.000000000 +0100
|
|
|
768acb9 |
+++ ltrace-0.5/wait_for_something.c 2006-12-06 21:45:06.000000000 +0100
|
|
|
768acb9 |
@@ -103,7 +103,8 @@
|
|
|
768acb9 |
event.e_un.signum = WSTOPSIG(status);
|
|
|
768acb9 |
child_pid = (pid_t) get_child_pid(event.proc->pid);
|
|
|
768acb9 |
if (child_pid){
|
|
|
768acb9 |
- open_pid(child_pid,0);
|
|
|
768acb9 |
+ debug (3, "fork: get_child_pid gave us %d", child_pid);
|
|
|
768acb9 |
+ open_forked_pid(child_pid);
|
|
|
768acb9 |
}
|
|
|
768acb9 |
enable_all_breakpoints(event.proc);
|
|
|
768acb9 |
continue_after_signal(event.proc->pid, event.e_un.signum);
|