--- /n/sources/plan9/sys/include/trace.h	Sat Jan 28 14:53:42 2006
+++ /sys/include/trace.h	Tue Dec 15 00:00:00 2015
@@ -13,12 +13,14 @@
 	SInts,		/* Interrupt start */
 	SInte,		/* Interrupt end */
 	SUser,		/* user event */
+	SLock,		/* blocked on a queue or lock */
 	Nevent,
 } Tevent;
 
 typedef struct Traceevent	Traceevent;
 struct Traceevent {
-	ulong	pid;	
-	ulong	etype;	/* Event type */
-	vlong	time;	/* time stamp  */
+	u32int	pid;	
+	u32int	etype;	/* Event type */
+	u64int	time;	/* time stamp  */
+	u32int	core;	/* core number */
 };
--- /n/sources/plan9/sys/src/cmd/trace.c	Fri May  9 17:54:58 2008
+++ /sys/src/cmd/trace.c	Tue Dec 15 00:00:00 2015
@@ -538,7 +538,7 @@
 		}
 		break;
 	case SDead:
-print("task died %ld %t %s\n", event->pid, event->time, schedstatename[event->etype & 0xffff]);
+print("task died %d %U %s\n", event->pid, event->time, schedstatename[event->etype & 0xffff]);
 		free(t->events);
 		free(t->name);
 		ntasks--;
@@ -695,12 +695,12 @@
 				nevents = n / sizeof(Traceevent);
 				for (ep = eventbuf; ep < eventbuf + nevents; ep++){
 					if ((ep->etype & 0xffff) >= Nevent){
-						print("%ld %t Illegal event %ld\n",
+						print("%d %U Illegal event %d\n",
 							ep->pid, ep->time, ep->etype & 0xffff);
 						continue;
 					}
 					if (verbose)
-						print("%ld %t %s\n",
+						print("%d %U %s\n",
 							ep->pid, ep->time, schedstatename[ep->etype & 0xffff]);
 
 					for(i = 0; i < ntasks; i++)