4 files changed, 29 insertions(+), 4 deletions(-)

M carrera/dat.h
M pc/dat.h
M port/proc.c
M port/taslock.c

@@ 25,6 25,7 @@ struct Lock
 {
 	ulong	key;			/* semaphore (non-zero = locked) */
 	ulong	sr;
+	ulong	pc;
 };
 
 struct Label

@@ 28,6 28,7 @@ struct Lock
 {
 	ulong	key;
 	ulong	sr;
+	ulong	pc;
 };
 
 struct Label

@@ 793,6 793,10 @@ procdump(void)
 	ulong bss;
 	Schedq *rq;
 
+	if(up)
+		print("up %d\n", up->pid);
+	else
+		print("no current process\n");
 	for(i=0; i<conf.nproc; i++) {
 		p = &procalloc.arena[i];
 		if(p->state == Dead)


@@ 813,7 817,8 @@ procdump(void)
 			continue;
 		print("rq%d:", rq-runq);
 		for(p = rq->head; p; p = p->rnext)
-			print(" %d(%d)", p->pid, m->ticks - p->readytime);
+			print(" %d(%d, %d)", p->pid, m->ticks - p->readytime,
+				m->ticks - p->movetime);
 		print("\n");
 	}
 	print("nrdy %d\n", nrdy);

@@ 8,14 8,26 @@
 void
 lock(Lock *l)
 {
-	if(tas(&l->key) == 0)
+	int i;
+	ulong pc;
+
+	pc = getcallerpc(l);
+
+	if(tas(&l->key) == 0){
+		l->pc = pc;
 		return;
+	}
 
 	for(;;){
+		i = 0;
 		while(l->key)
-			;
-		if(tas(&l->key) == 0)
+			if(i++ > 10000000)
+				panic("lock loop key 0x%lux pc 0x%lux held by pc 0x%lux\n",
+					l->key, getcallerpc(l), l->pc);
+		if(tas(&l->key) == 0){
+			l->pc = pc;
 			return;
+		}
 	}
 }
 


@@ 23,10 35,14 @@ void
 ilock(Lock *l)
 {
 	ulong x;
+	ulong pc;
+
+	pc = getcallerpc(l);
 
 	x = splhi();
 	if(tas(&l->key) == 0){
 		l->sr = x;
+		l->pc = pc;
 		return;
 	}
 


@@ 35,6 51,7 @@ ilock(Lock *l)
 			;
 		if(tas(&l->key) == 0){
 			l->sr = x;
+			l->pc = pc;
 			return;
 		}
 	}


@@ 46,6 63,7 @@ canlock(Lock *l)
 	if(tas(&l->key))
 		return 0;
 
+	l->pc = getcallerpc(l);
 	return 1;
 }