LT_EV_* -> EVENT_*

3 files changed, 36 insertions, 34 deletions

diff --git a/ltrace.h b/ltrace.h
index fd60594..c1e24c6 100644
--- a/ltrace.h
+++ b/ltrace.h
@@ -186,22 +186,24 @@ struct process {
 struct event {
 	struct process *proc;
 	enum {
-		LT_EV_UNKNOWN,
-		LT_EV_NONE,
-		LT_EV_SIGNAL,
-		LT_EV_EXIT,
-		LT_EV_EXIT_SIGNAL,
-		LT_EV_SYSCALL,
-		LT_EV_SYSRET,
-		LT_EV_ARCH_SYSCALL,
-		LT_EV_ARCH_SYSRET,
-		LT_EV_BREAKPOINT
+		EVENT_NONE,
+		EVENT_SIGNAL,
+		EVENT_EXIT,
+		EVENT_EXIT_SIGNAL,
+		EVENT_SYSCALL,
+		EVENT_SYSRET,
+		EVENT_ARCH_SYSCALL,
+		EVENT_ARCH_SYSRET,
+		EVENT_FORK,
+		EVENT_EXEC,
+		EVENT_BREAKPOINT
 	} thing;
 	union {
 		int ret_val;	/* _EV_EXIT */
-		int signum;	/* _EV_SIGNAL, _EV_EXIT_SIGNAL */
-		int sysnum;	/* _EV_SYSCALL, _EV_SYSRET, _EV_ARCH_SYSCALL, _EV_ARCH_SYSRET */
+		int signum;     /* _EV_SIGNAL, _EV_EXIT_SIGNAL */
+		int sysnum;     /* _EV_SYSCALL, _EV_SYSRET */
 		void *brk_addr;	/* _EV_BREAKPOINT */
+		int newpid;     /* _EV_FORK */
 	} e_un;
 };
 
diff --git a/process_event.c b/process_event.c
index f3c966d..2461b7d 100644
--- a/process_event.c
+++ b/process_event.c
@@ -104,50 +104,50 @@ arch_sysname(struct process *proc, int sysnum) {
 void
 process_event(struct event *event) {
 	switch (event->thing) {
-	case LT_EV_NONE:
+	case EVENT_NONE:
 		debug(1, "event: none");
 		return;
-	case LT_EV_SIGNAL:
+	case EVENT_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:
+	case EVENT_EXIT:
 		debug(1, "event: exit (%d)", event->e_un.ret_val);
 		process_exit(event);
 		return;
-	case LT_EV_EXIT_SIGNAL:
+	case EVENT_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:
+	case EVENT_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:
+	case EVENT_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_ARCH_SYSCALL:
+	case EVENT_ARCH_SYSCALL:
 		debug(1, "event: arch_syscall (%s [%d])",
 				arch_sysname(event->proc, event->e_un.sysnum),
 				event->e_un.sysnum);
 		process_arch_syscall(event);
 		return;
-	case LT_EV_ARCH_SYSRET:
+	case EVENT_ARCH_SYSRET:
 		debug(1, "event: arch_sysret (%s [%d])",
 				arch_sysname(event->proc, event->e_un.sysnum),
 				event->e_un.sysnum);
 		process_arch_sysret(event);
 		return;
-	case LT_EV_BREAKPOINT:
+	case EVENT_BREAKPOINT:
 		debug(1, "event: breakpoint");
 		process_breakpoint(event);
 		return;
diff --git a/wait_for_something.c b/wait_for_something.c
index eb7ea52..e772e92 100644
--- a/wait_for_something.c
+++ b/wait_for_something.c
@@ -34,7 +34,7 @@ wait_for_something(void) {
 			exit(0);
 		} else if (errno == EINTR) {
 			debug(1, "wait received EINTR ?");
-			event.thing = LT_EV_NONE;
+			event.thing = EVENT_NONE;
 			return &event;
 		}
 		perror("wait");
@@ -50,7 +50,7 @@ wait_for_something(void) {
 	debug(3, "signal from pid %u", pid);
 	if (event.proc->breakpoints_enabled == -1) {
 		enable_all_breakpoints(event.proc);
-		event.thing = LT_EV_NONE;
+		event.thing = EVENT_NONE;
 		trace_set_options(event.proc, event.proc->pid);
 		continue_process(event.proc->pid);
 		return &event;
@@ -61,38 +61,38 @@ wait_for_something(void) {
 	}
 	switch (syscall_p(event.proc, status, &tmp)) {
 		case 1:
-			event.thing = LT_EV_SYSCALL;
+			event.thing = EVENT_SYSCALL;
 			event.e_un.sysnum = tmp;
 			return &event;
 		case 2:
-			event.thing = LT_EV_SYSRET;
+			event.thing = EVENT_SYSRET;
 			event.e_un.sysnum = tmp;
 			return &event;
 		case 3:
-			event.thing = LT_EV_ARCH_SYSCALL;
+			event.thing = EVENT_ARCH_SYSCALL;
 			event.e_un.sysnum = tmp;
 			return &event;
 		case 4:
-			event.thing = LT_EV_ARCH_SYSRET;
+			event.thing = EVENT_ARCH_SYSRET;
 			event.e_un.sysnum = tmp;
 			return &event;
 		case -1:
-			event.thing = LT_EV_NONE;
+			event.thing = EVENT_NONE;
 			continue_process(event.proc->pid);
 			return &event;
 	}
 	if (WIFEXITED(status)) {
-		event.thing = LT_EV_EXIT;
+		event.thing = EVENT_EXIT;
 		event.e_un.ret_val = WEXITSTATUS(status);
 		return &event;
 	}
 	if (WIFSIGNALED(status)) {
-		event.thing = LT_EV_EXIT_SIGNAL;
+		event.thing = EVENT_EXIT_SIGNAL;
 		event.e_un.signum = WTERMSIG(status);
 		return &event;
 	}
 	if (!WIFSTOPPED(status)) {
-		event.thing = LT_EV_UNKNOWN;
+		event.thing = EVENT_NONE;
 		return &event;
 	}
 
@@ -118,7 +118,7 @@ wait_for_something(void) {
 
 	if (stop_signal != (SIGTRAP | event.proc->tracesysgood)
 	    && stop_signal != SIGTRAP) {
-		event.thing = LT_EV_SIGNAL;
+		event.thing = EVENT_SIGNAL;
 		event.e_un.signum = stop_signal;
 		return &event;
 	}
@@ -126,7 +126,7 @@ wait_for_something(void) {
 	if (was_exec(event.proc, status)) {
 		pid_t saved_pid;
 
-		event.thing = LT_EV_NONE;
+		event.thing = EVENT_NONE;
 		event.e_un.signum = WSTOPSIG(status);
 		debug(1, "Placing breakpoints for the new program");
 		event.proc->mask_32bit = 0;
@@ -141,7 +141,7 @@ wait_for_something(void) {
 		return &event;
 	}
 
-	event.thing = LT_EV_BREAKPOINT;
+	event.thing = EVENT_BREAKPOINT;
 	if (!event.proc->instruction_pointer) {
 		event.proc->instruction_pointer =
 		    get_instruction_pointer(event.proc);