LTTng : Linux Trace Toolkit Next Generation 0.5.95, kernel 2.6.17

index 53ea723..747c209 100644
@@ -57,12 +57,14 @@ #include <linux/mc146818rtc.h>
 #include <linux/time.h>
 #include <linux/init.h>
 #include <linux/profile.h>
+#include <linux/ltt/ltt-facility-kernel.h>
 
 #include <asm/io.h>
 #include <asm/nvram.h>
 #include <asm/cache.h>
 #include <asm/8xx_immap.h>
 #include <asm/machdep.h>
+#include <asm/ltt.h>
 
 #include <asm/time.h>
 

@@ -140,6 +142,8 @@ void timer_interrupt(struct pt_regs * re
 	if (atomic_read(&ppc_n_lost_interrupts) != 0)
 		do_IRQ(regs);
 
+	trace_kernel_trap_entry(regs->trap, (void *)instruction_pointer(regs));
+
 	irq_enter();
 
 	while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) <= 0) {

@@ -154,6 +158,9 @@ void timer_interrupt(struct pt_regs * re
 		/* We are in an interrupt, no need to save/restore flags */
 		write_seqlock(&xtime_lock);
 		tb_last_stamp = jiffy_stamp;
+#ifdef CONFIG_LTT
+		ltt_reset_timestamp();
+#endif //CONFIG_LTT
 		do_timer(regs);
 
 		/*

@@ -192,6 +199,8 @@ void timer_interrupt(struct pt_regs * re
 		ppc_md.heartbeat();
 
 	irq_exit();
+
+ 	trace_kernel_trap_exit();
 }
 
 /*

index 1c0d680..9d78487 100644
@@ -29,6 +29,8 @@ #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/prctl.h>
+#include <linux/ltt/ltt-facility-kernel.h>
+#include <linux/ltt-core.h>
 
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>

@@ -37,6 +39,7 @@ #include <asm/io.h>
 #include <asm/reg.h>
 #include <asm/xmon.h>
 #include <asm/pmc.h>
+#include <asm/ltt/ltt-facility-kernel_arch_ppc.h>
 
 #ifdef CONFIG_XMON
 extern int xmon_bpt(struct pt_regs *regs);

@@ -107,11 +110,13 @@ void _exception(int signr, struct pt_reg
 		debugger(regs);
 		die("Exception in kernel mode", regs, signr);
 	}
+	trace_kernel_trap_entry(regs->trap, (void *)instruction_pointer(regs));
 	info.si_signo = signr;
 	info.si_errno = 0;
 	info.si_code = code;
 	info.si_addr = (void __user *) addr;
 	force_sig_info(signr, &info, current);
+	trace_kernel_trap_exit();
 
 	/*
 	 * Init gets no signals that it doesn't have a handler for.

@@ -737,6 +742,23 @@ void StackOverflow(struct pt_regs *regs)
 	panic("kernel stack overflow");
 }
 
+/* Trace related code */
+#ifdef CONFIG_LTT
+
+/* Simple syscall tracing : only keep the caller's address. */
+asmlinkage void trace_real_syscall_entry(struct pt_regs *regs)
+{
+	trace_kernel_arch_syscall_entry(
+			(enum lttng_syscall_name)regs->gpr[0],
+			(void*)instruction_pointer(regs));
+}
+
+asmlinkage void trace_real_syscall_exit(void)
+{
+	trace_kernel_arch_syscall_exit();
+}
+#endif				/* CONFIG_LTT */
+
 void nonrecoverable_exception(struct pt_regs *regs)
 {
 	printk(KERN_ERR "Non-recoverable exception at PC=%lx MSR=%lx\n",

index 8e08ca3..10850a7 100644
@@ -26,6 +26,7 @@ #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/highmem.h>
 #include <linux/module.h>
+#include <linux/ltt/ltt-facility-kernel.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>

@@ -114,22 +115,29 @@ #else
 		is_write = error_code & 0x02000000;
 #endif /* CONFIG_4xx || CONFIG_BOOKE */
 
+	trace_kernel_trap_entry(regs->trap, (void*)instruction_pointer(regs));
+
 #if defined(CONFIG_XMON) || defined(CONFIG_KGDB)
 	if (debugger_fault_handler && TRAP(regs) == 0x300) {
 		debugger_fault_handler(regs);
+		trace_kernel_trap_exit();
 		return 0;
 	}
 #if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))
 	if (error_code & 0x00400000) {
 		/* DABR match */
-		if (debugger_dabr_match(regs))
+		if (debugger_dabr_match(regs)) {
+			trace_kernel_trap_exit();;
 			return 0;
+		}
 	}
 #endif /* !(CONFIG_4xx || CONFIG_BOOKE)*/
 #endif /* CONFIG_XMON || CONFIG_KGDB */
 
-	if (in_atomic() || mm == NULL)
+	if (in_atomic() || mm == NULL) {
+		trace_kernel_trap_exit();
 		return SIGSEGV;
+	}
 
 	down_read(&mm->mmap_sem);
 	vma = find_vma(mm, address);

@@ -230,6 +238,7 @@ #endif
 				_tlbie(address);
 				pte_unmap_unlock(ptep, ptl);
 				up_read(&mm->mmap_sem);
+				trace_kernel_trap_exit();
 				return 0;
 			}
 			pte_unmap_unlock(ptep, ptl);

@@ -272,6 +281,7 @@ #endif
 	 * -- Cort
 	 */
 	pte_misses++;
+	trace_kernel_trap_exit();
 	return 0;
 
 bad_area:

@@ -281,9 +291,10 @@ bad_area:
 	/* User mode accesses cause a SIGSEGV */
 	if (user_mode(regs)) {
 		_exception(SIGSEGV, regs, code, address);
+		trace_kernel_trap_exit();
 		return 0;
 	}
-
+	trace_kernel_trap_exit();
 	return SIGSEGV;
 
 /*

@@ -300,6 +311,7 @@ out_of_memory:
 	printk("VM: killing process %s\n", current->comm);
 	if (user_mode(regs))
 		do_exit(SIGKILL);
+	trace_kernel_trap_exit();
 	return SIGKILL;
 
 do_sigbus:

@@ -309,6 +321,7 @@ do_sigbus:
 	info.si_code = BUS_ADRERR;
 	info.si_addr = (void __user *)address;
 	force_sig_info (SIGBUS, &info, current);
+	trace_kernel_trap_exit();
 	if (!user_mode(regs))
 		return SIGBUS;
 	return 0;