Index: ksrc/nucleus/shadow.c
===================================================================
--- ksrc/nucleus/shadow.c	(revision 470)
+++ ksrc/nucleus/shadow.c	(working copy)
@@ -384,6 +384,7 @@
 	xnlock_get_irqsave(&nklock, s);
 
 	thread = gk->thread;
+ipipe_trace_special(1, xnthread_archtcb(thread)->user_task->pid);
 
 	/* In the very rare case where the requestor has been awaken
 	   by a signal before we have been able to process the
@@ -459,6 +460,7 @@
     gk->thread = thread;
     set_current_state(TASK_INTERRUPTIBLE);
     wake_up_interruptible_sync(&gk->waitq);
+ipipe_trace_special(2, current->pid);
 
     if (rthal_current_domain == rthal_root_domain) {
 
@@ -575,6 +577,7 @@
 	set_current_state((current->state&~TASK_UNINTERRUPTIBLE)|TASK_INTERRUPTIBLE);
 
     schedule_linux_call(LO_WAKEUP_REQ,current,0);
+ipipe_trace_special(3, current->pid);
 
     splhigh(s);
     xnpod_renice_root(thread->cprio);
@@ -1520,6 +1523,10 @@
 
     prev = current;
     threadin = xnshadow_thread(next);
+ipipe_trace_special(4, prev->pid);
+ipipe_trace_special(4, prev->state);
+ipipe_trace_special(5, next->pid);
+ipipe_trace_special(5, next->state);
 
     rthal_load_cpuid();	/* Linux is running in a migration-safe
 			   portion of code. */