run Lindent over source to get everything looking about the same
diff --git a/process_event.c b/process_event.c
index 9263184..242292e 100644
--- a/process_event.c
+++ b/process_event.c
@@ -20,32 +20,34 @@
#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(struct process *proc, int signum) {
- static char * signalent0[] = {
- #include "signalent.h"
+static char *shortsignal(struct process *proc, int signum)
+{
+ static char *signalent0[] = {
+#include "signalent.h"
};
- static char * signalent1[] = {
- #include "signalent1.h"
+ static char *signalent1[] = {
+#include "signalent1.h"
};
static char **signalents[] = { signalent0, signalent1 };
int nsignals[] = { sizeof signalent0 / sizeof signalent0[0],
- sizeof signalent1 / sizeof signalent1[0] };
+ sizeof signalent1 / sizeof signalent1[0]
+ };
if (proc->personality > sizeof signalents / sizeof signalents[0])
- abort ();
+ abort();
if (signum < 0 || signum >= nsignals[proc->personality]) {
return "UNKNOWN_SIGNAL";
} else {
@@ -53,68 +55,78 @@
}
}
-static char *
-sysname(struct process *proc, int sysnum) {
+static char *sysname(struct process *proc, int sysnum)
+{
static char result[128];
- static char * syscalent0[] = {
- #include "syscallent.h"
+ static char *syscalent0[] = {
+#include "syscallent.h"
};
- static char * syscalent1[] = {
- #include "syscallent1.h"
+ static char *syscalent1[] = {
+#include "syscallent1.h"
};
static char **syscalents[] = { syscalent0, syscalent1 };
int nsyscals[] = { sizeof syscalent0 / sizeof syscalent0[0],
- sizeof syscalent1 / sizeof syscalent1[0] };
+ sizeof syscalent1 / sizeof syscalent1[0]
+ };
if (proc->personality > sizeof syscalents / sizeof syscalents[0])
- abort ();
+ abort();
if (sysnum < 0 || sysnum >= nsyscals[proc->personality]) {
sprintf(result, "SYS_%d", sysnum);
return result;
} else {
- sprintf(result, "SYS_%s", syscalents[proc->personality][sysnum]);
+ sprintf(result, "SYS_%s",
+ syscalents[proc->personality][sysnum]);
return result;
}
}
-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->proc, 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->proc, 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->proc, event->e_un.sysnum), event->e_un.sysnum);
- process_syscall(event);
- return;
- case LT_EV_SYSRET:
- debug(1, "event: sysret (%s [%d])", sysname (event->proc, 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->proc, 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->proc, 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->proc, event->e_un.sysnum),
+ event->e_un.sysnum);
+ process_syscall(event);
+ return;
+ case LT_EV_SYSRET:
+ debug(1, "event: sysret (%s [%d])",
+ sysname(event->proc, 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);
@@ -124,26 +136,27 @@
return;
}
output_line(event->proc, "--- %s (%s) ---",
- shortsignal(event->proc, event->e_un.signum), strsignal(event->e_un.signum));
+ shortsignal(event->proc, 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->proc, event->e_un.signum));
+ shortsignal(event->proc, 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);
@@ -155,8 +168,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);
@@ -166,10 +179,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->proc, event->e_un.sysnum));
+ output_left(LT_TOF_SYSCALL, event->proc,
+ sysname(event->proc, event->e_un.sysnum));
}
if (fork_p(event->proc, event->e_un.sysnum)
|| exec_p(event->proc, event->e_un.sysnum)) {
@@ -183,14 +197,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);
@@ -204,15 +218,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->proc, 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);
}
}
@@ -220,10 +235,11 @@
}
callstack_pop(event->proc);
if (opt_S) {
- output_right(LT_TOF_SYSCALLR, event->proc, sysname(event->proc, event->e_un.sysnum));
+ output_right(LT_TOF_SYSCALLR, event->proc,
+ sysname(event->proc, event->e_un.sysnum));
}
if (exec_p(event->proc, event->e_un.sysnum)) {
- if (gimme_arg(LT_TOF_SYSCALLR,event->proc,-1)==0) {
+ if (gimme_arg(LT_TOF_SYSCALLR, event->proc, -1) == 0) {
pid_t saved_pid;
event->proc->mask_32bit = 0;
event->proc->personality = 0;
@@ -241,30 +257,33 @@
continue_process(event->proc->pid);
}
-static void
-process_breakpoint(struct event * event) {
- int i,j;
- struct breakpoint *sbp;
+static void process_breakpoint(struct event *event)
+{
+ int i, j;
+ struct breakpoint *sbp;
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__
/*
* PPC HACK! (XXX FIXME TODO)
* The PLT gets modified during the first call,
* so be sure to re-enable the breakpoint.
- */
+ */
unsigned long a;
struct library_symbol *libsym =
- event->proc->callstack[i].c_un.libfunc;
+ event->proc->callstack[i].c_un.libfunc;
void *addr = plt2addr(event->proc, libsym->enter_addr);
if (event->proc->e_machine == EM_PPC) {
@@ -272,20 +291,23 @@
sbp = address2bpstruct(event->proc, addr);
assert(sbp);
- a = ptrace(PTRACE_PEEKTEXT, event->proc->pid, addr);
+ a = ptrace(PTRACE_PEEKTEXT, event->proc->pid,
+ addr);
if (memcmp(&a, break_insn, 4)) {
sbp->enabled--;
- insert_breakpoint(event->proc, addr, libsym);
+ insert_breakpoint(event->proc, addr,
+ libsym);
}
} else {
sbp = libsym->brkpnt;
assert(sbp);
- if (addr != sbp->addr)
- insert_breakpoint(event->proc, addr, libsym);
+ if (addr != sbp->addr)
+ insert_breakpoint(event->proc, addr,
+ libsym);
}
#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) {
@@ -294,44 +316,48 @@
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;
}
}
- if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr)))
- {
- 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, sbp->libsym->name);
- callstack_push_symfunc(event->proc, sbp->libsym);
- if (PLTs_initialized_by_here
- && event->proc->need_to_reinitialize_breakpoints
- && (strcmp(sbp->libsym->name, PLTs_initialized_by_here) == 0))
- reinitialize_breakpoints(event->proc);
-
- continue_after_breakpoint(event->proc, sbp);
- return;
- }
+ if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr))) {
+ 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, sbp->libsym->name);
+ callstack_push_symfunc(event->proc, sbp->libsym);
+ if (PLTs_initialized_by_here
+ && event->proc->need_to_reinitialize_breakpoints
+ && (strcmp(sbp->libsym->name, PLTs_initialized_by_here) ==
+ 0))
+ reinitialize_breakpoints(event->proc);
+
+ continue_after_breakpoint(event->proc, sbp);
+ return;
+ }
output_line(event->proc, "unexpected breakpoint 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;
@@ -344,16 +370,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;
@@ -367,12 +394,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);
}