Some fixes...
* read_config_file.c: initialise pt stack argument to stop warning
* summary.c: make show_summary() obey -C for demangaling function names
diff --git a/process_event.c b/process_event.c
index 096cd30..1323d39 100644
--- a/process_event.c
+++ b/process_event.c
@@ -20,22 +20,23 @@
#include <sys/ptrace.h>
#endif
-static void process_signal(struct event * event);
-static void process_exit(struct event * event);
-static void process_exit_signal(struct event * event);
-static void process_syscall(struct event * event);
-static void process_sysret(struct event * event);
-static void process_breakpoint(struct event * event);
-static void remove_proc(struct process * proc);
+static void process_signal(struct event *event);
+static void process_exit(struct event *event);
+static void process_exit_signal(struct event *event);
+static void process_syscall(struct event *event);
+static void process_sysret(struct event *event);
+static void process_breakpoint(struct event *event);
+static void remove_proc(struct process *proc);
-static void callstack_push_syscall(struct process * proc, int sysnum);
-static void callstack_push_symfunc(struct process * proc, struct library_symbol * sym);
-static void callstack_pop(struct process * proc);
+static void callstack_push_syscall(struct process *proc, int sysnum);
+static void callstack_push_symfunc(struct process *proc,
+ struct library_symbol *sym);
+static void callstack_pop(struct process *proc);
-static char *
-shortsignal(int signum) {
- static char * signalent0[] = {
- #include "signalent.h"
+static char *shortsignal(int signum)
+{
+ static char *signalent0[] = {
+#include "signalent.h"
};
int nsignals0 = sizeof signalent0 / sizeof signalent0[0];
@@ -46,11 +47,11 @@
}
}
-static char *
-sysname(int sysnum) {
+static char *sysname(int sysnum)
+{
static char result[128];
- static char * syscalent0[] = {
- #include "syscallent.h"
+ static char *syscalent0[] = {
+#include "syscallent.h"
};
int nsyscals0 = sizeof syscalent0 / sizeof syscalent0[0];
@@ -63,44 +64,48 @@
}
}
-void
-process_event(struct event * event) {
+void process_event(struct event *event)
+{
switch (event->thing) {
- case LT_EV_NONE:
- debug(1, "event: none");
- return;
- case LT_EV_SIGNAL:
- debug(1, "event: signal (%s [%d])", shortsignal(event->e_un.signum), event->e_un.signum);
- process_signal(event);
- return;
- case LT_EV_EXIT:
- debug(1, "event: exit (%d)", event->e_un.ret_val);
- process_exit(event);
- return;
- case LT_EV_EXIT_SIGNAL:
- debug(1, "event: exit signal (%s [%d])", shortsignal(event->e_un.signum), event->e_un.signum);
- process_exit_signal(event);
- return;
- case LT_EV_SYSCALL:
- debug(1, "event: syscall (%s [%d])", sysname (event->e_un.sysnum), event->e_un.sysnum);
- process_syscall(event);
- return;
- case LT_EV_SYSRET:
- debug(1, "event: sysret (%s [%d])", sysname (event->e_un.sysnum), event->e_un.sysnum);
- process_sysret(event);
- return;
- case LT_EV_BREAKPOINT:
- debug(1, "event: breakpoint");
- process_breakpoint(event);
- return;
- default:
- fprintf(stderr, "Error! unknown event?\n");
- exit(1);
+ case LT_EV_NONE:
+ debug(1, "event: none");
+ return;
+ case LT_EV_SIGNAL:
+ debug(1, "event: signal (%s [%d])",
+ shortsignal(event->e_un.signum), event->e_un.signum);
+ process_signal(event);
+ return;
+ case LT_EV_EXIT:
+ debug(1, "event: exit (%d)", event->e_un.ret_val);
+ process_exit(event);
+ return;
+ case LT_EV_EXIT_SIGNAL:
+ debug(1, "event: exit signal (%s [%d])",
+ shortsignal(event->e_un.signum), event->e_un.signum);
+ process_exit_signal(event);
+ return;
+ case LT_EV_SYSCALL:
+ debug(1, "event: syscall (%s [%d])",
+ sysname(event->e_un.sysnum), event->e_un.sysnum);
+ process_syscall(event);
+ return;
+ case LT_EV_SYSRET:
+ debug(1, "event: sysret (%s [%d])", sysname(event->e_un.sysnum),
+ event->e_un.sysnum);
+ process_sysret(event);
+ return;
+ case LT_EV_BREAKPOINT:
+ debug(1, "event: breakpoint");
+ process_breakpoint(event);
+ return;
+ default:
+ fprintf(stderr, "Error! unknown event?\n");
+ exit(1);
}
}
-static void
-process_signal(struct event * event) {
+static void process_signal(struct event *event)
+{
if (exiting && event->e_un.signum == SIGSTOP) {
pid_t pid = event->proc->pid;
disable_all_breakpoints(event->proc);
@@ -110,26 +115,27 @@
return;
}
output_line(event->proc, "--- %s (%s) ---",
- shortsignal(event->e_un.signum), strsignal(event->e_un.signum));
+ shortsignal(event->e_un.signum),
+ strsignal(event->e_un.signum));
continue_after_signal(event->proc->pid, event->e_un.signum);
}
-static void
-process_exit(struct event * event) {
+static void process_exit(struct event *event)
+{
output_line(event->proc, "+++ exited (status %d) +++",
- event->e_un.ret_val);
+ event->e_un.ret_val);
remove_proc(event->proc);
}
-static void
-process_exit_signal(struct event * event) {
+static void process_exit_signal(struct event *event)
+{
output_line(event->proc, "+++ killed by %s +++",
- shortsignal(event->e_un.signum));
+ shortsignal(event->e_un.signum));
remove_proc(event->proc);
}
-static void
-remove_proc(struct process * proc) {
+static void remove_proc(struct process *proc)
+{
struct process *tmp, *tmp2;
debug(1, "Removing pid %u\n", proc->pid);
@@ -141,8 +147,8 @@
return;
}
tmp = list_of_processes;
- while(tmp->next) {
- if (tmp->next==proc) {
+ while (tmp->next) {
+ if (tmp->next == proc) {
tmp2 = tmp->next;
tmp->next = tmp->next->next;
free(tmp2);
@@ -152,10 +158,11 @@
}
}
-static void
-process_syscall(struct event * event) {
+static void process_syscall(struct event *event)
+{
if (opt_S) {
- output_left(LT_TOF_SYSCALL, event->proc, sysname(event->e_un.sysnum));
+ output_left(LT_TOF_SYSCALL, event->proc,
+ sysname(event->e_un.sysnum));
}
if (fork_p(event->e_un.sysnum)) {
disable_all_breakpoints(event->proc);
@@ -168,14 +175,14 @@
struct timeval current_time_spent;
-static void
-calc_time_spent(struct process * proc) {
+static void calc_time_spent(struct process *proc)
+{
struct timeval tv;
struct timezone tz;
struct timeval diff;
- struct callstack_element * elem;
+ struct callstack_element *elem;
- elem = & proc->callstack[proc->callstack_depth-1];
+ elem = &proc->callstack[proc->callstack_depth - 1];
gettimeofday(&tv, &tz);
@@ -189,15 +196,16 @@
current_time_spent = diff;
}
-static void
-process_sysret(struct event * event) {
+static void process_sysret(struct event *event)
+{
if (opt_T || opt_c) {
calc_time_spent(event->proc);
}
if (fork_p(event->e_un.sysnum)) {
if (opt_f) {
- pid_t child = gimme_arg(LT_TOF_SYSCALLR,event->proc,-1);
- if (child>0) {
+ pid_t child =
+ gimme_arg(LT_TOF_SYSCALLR, event->proc, -1);
+ if (child > 0) {
open_pid(child, 0);
}
}
@@ -205,10 +213,11 @@
}
callstack_pop(event->proc);
if (opt_S) {
- output_right(LT_TOF_SYSCALLR, event->proc, sysname(event->e_un.sysnum));
+ output_right(LT_TOF_SYSCALLR, event->proc,
+ sysname(event->e_un.sysnum));
}
if (exec_p(event->e_un.sysnum)) {
- if (gimme_arg(LT_TOF_SYSCALLR,event->proc,-1)==0) {
+ if (gimme_arg(LT_TOF_SYSCALLR, event->proc, -1) == 0) {
event->proc->filename = pid2name(event->proc->pid);
breakpoints_init(event->proc);
}
@@ -216,40 +225,45 @@
continue_process(event->proc->pid);
}
-static void
-process_breakpoint(struct event * event) {
- struct library_symbol * tmp;
- int i,j;
+static void process_breakpoint(struct event *event)
+{
+ struct library_symbol *tmp;
+ int i, j;
debug(2, "event: breakpoint (%p)", event->e_un.brk_addr);
if (event->proc->breakpoint_being_enabled) {
/* Reinsert breakpoint */
- continue_enabling_breakpoint(event->proc->pid, event->proc->breakpoint_being_enabled);
+ continue_enabling_breakpoint(event->proc->pid,
+ event->proc->
+ breakpoint_being_enabled);
event->proc->breakpoint_being_enabled = NULL;
return;
}
- for(i=event->proc->callstack_depth-1; i>=0; i--) {
- if (event->e_un.brk_addr == event->proc->callstack[i].return_addr) {
+ for (i = event->proc->callstack_depth - 1; i >= 0; i--) {
+ if (event->e_un.brk_addr ==
+ event->proc->callstack[i].return_addr) {
#ifdef __powerpc__
- unsigned long a;
- unsigned long addr = event->proc->callstack[i].c_un.libfunc->enter_addr;
- struct breakpoint *sbp = address2bpstruct(event->proc, addr);
- unsigned char break_insn[] = BREAKPOINT_VALUE;
+ unsigned long a;
+ unsigned long addr =
+ event->proc->callstack[i].c_un.libfunc->enter_addr;
+ struct breakpoint *sbp =
+ address2bpstruct(event->proc, addr);
+ unsigned char break_insn[] = BREAKPOINT_VALUE;
- /*
- * PPC HACK! (XXX FIXME TODO)
- * The PLT gets modified during the first call,
- * so be sure to re-enable the breakpoint.
- */
- a = ptrace(PTRACE_PEEKTEXT, event->proc->pid, addr);
+ /*
+ * PPC HACK! (XXX FIXME TODO)
+ * The PLT gets modified during the first call,
+ * so be sure to re-enable the breakpoint.
+ */
+ a = ptrace(PTRACE_PEEKTEXT, event->proc->pid, addr);
- if (memcmp(&a, break_insn, 4)) {
- sbp->enabled--;
- insert_breakpoint(event->proc, addr);
- }
+ if (memcmp(&a, break_insn, 4)) {
+ sbp->enabled--;
+ insert_breakpoint(event->proc, addr);
+ }
#endif
- for(j=event->proc->callstack_depth-1; j>i; j--) {
+ for (j = event->proc->callstack_depth - 1; j > i; j--) {
callstack_pop(event->proc);
}
if (opt_T || opt_c) {
@@ -258,41 +272,50 @@
callstack_pop(event->proc);
event->proc->return_addr = event->e_un.brk_addr;
output_right(LT_TOF_FUNCTIONR, event->proc,
- event->proc->callstack[i].c_un.libfunc->name);
+ event->proc->callstack[i].c_un.libfunc->
+ name);
continue_after_breakpoint(event->proc,
- address2bpstruct(event->proc, event->e_un.brk_addr));
+ address2bpstruct(event->proc,
+ event->e_un.
+ brk_addr));
return;
}
}
tmp = event->proc->list_of_symbols;
- while(tmp) {
+ while (tmp) {
if (event->e_un.brk_addr == tmp->enter_addr) {
- event->proc->stack_pointer = get_stack_pointer(event->proc);
- event->proc->return_addr = get_return_addr(event->proc, event->proc->stack_pointer);
+ event->proc->stack_pointer =
+ get_stack_pointer(event->proc);
+ event->proc->return_addr =
+ get_return_addr(event->proc,
+ event->proc->stack_pointer);
output_left(LT_TOF_FUNCTION, event->proc, tmp->name);
callstack_push_symfunc(event->proc, tmp);
- continue_after_breakpoint(event->proc, address2bpstruct(event->proc, tmp->enter_addr));
+ continue_after_breakpoint(event->proc,
+ address2bpstruct(event->proc,
+ tmp->
+ enter_addr));
return;
}
tmp = tmp->next;
}
output_line(event->proc, "breakpointed at %p (?)",
- (void *)event->e_un.brk_addr);
+ (void *)event->e_un.brk_addr);
continue_process(event->proc->pid);
}
-static void
-callstack_push_syscall(struct process * proc, int sysnum) {
- struct callstack_element * elem;
+static void callstack_push_syscall(struct process *proc, int sysnum)
+{
+ struct callstack_element *elem;
/* FIXME: not good -- should use dynamic allocation. 19990703 mortene. */
- if (proc->callstack_depth == MAX_CALLDEPTH-1) {
+ if (proc->callstack_depth == MAX_CALLDEPTH - 1) {
fprintf(stderr, "Error: call nesting too deep!\n");
return;
}
- elem = & proc->callstack[proc->callstack_depth];
+ elem = &proc->callstack[proc->callstack_depth];
elem->is_syscall = 1;
elem->c_un.syscall = sysnum;
elem->return_addr = NULL;
@@ -305,16 +328,17 @@
}
static void
-callstack_push_symfunc(struct process * proc, struct library_symbol * sym) {
- struct callstack_element * elem;
+callstack_push_symfunc(struct process *proc, struct library_symbol *sym)
+{
+ struct callstack_element *elem;
/* FIXME: not good -- should use dynamic allocation. 19990703 mortene. */
- if (proc->callstack_depth == MAX_CALLDEPTH-1) {
+ if (proc->callstack_depth == MAX_CALLDEPTH - 1) {
fprintf(stderr, "Error: call nesting too deep!\n");
return;
}
- elem = & proc->callstack[proc->callstack_depth];
+ elem = &proc->callstack[proc->callstack_depth];
elem->is_syscall = 0;
elem->c_un.libfunc = sym;
@@ -328,12 +352,12 @@
}
}
-static void
-callstack_pop(struct process * proc) {
- struct callstack_element * elem;
+static void callstack_pop(struct process *proc)
+{
+ struct callstack_element *elem;
assert(proc->callstack_depth > 0);
- elem = & proc->callstack[proc->callstack_depth-1];
+ elem = &proc->callstack[proc->callstack_depth - 1];
if (!elem->is_syscall) {
delete_breakpoint(proc, elem->return_addr);
}