xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: include lock pointer in error report, stop spamming lockloop prints when we are panicing

Browse source
This commit is contained in:
cinap_lenrek 2019-05-01 09:39:02 +02:00
parent 54562b6ac2
commit a6ee23a739
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
sys/src/9/port/taslock.c
View file

@ -36,8 +36,12 @@ dumplockmem(char *tag, Lock *l)
void void
lockloop(Lock *l, uintptr pc) lockloop(Lock *l, uintptr pc)
{ {
extern int panicking;
Proc *p; Proc *p;
if(panicking)
return;
p = l->p; p = l->p;
print("lock %#p loop key %#lux pc %#p held by pc %#p proc %lud\n", print("lock %#p loop key %#lux pc %#p held by pc %#p proc %lud\n",
l, l->key, pc, l->pc, p ? p->pid : 0); l, l->key, pc, l->pc, p ? p->pid : 0);
@ -186,11 +190,17 @@ unlock(Lock *l)
} }
#endif #endif
if(l->key == 0) if(l->key == 0)
print("unlock: not locked: pc %#p\n", getcallerpc(&l)); print("unlock(%#p): not locked: pc %#p\n",
l, getcallerpc(&l));
if(l->isilock) if(l->isilock)
print("unlock of ilock: pc %#p, held by %#p\n", getcallerpc(&l), l->pc); print("unlock(%#p) of ilock: pc %#p, held by %#p\n",
if(l->p != up) l, getcallerpc(&l), l->pc);
print("unlock: up changed: pc %#p, acquired at pc %#p, lock p %#p, unlock up %#p\n", getcallerpc(&l), l->pc, l->p, up); if(l->p != up){
print("unlock(%#p): up changed: pc %#p, acquired at pc %#p, lock p %#p, unlock up %#p\n",
l, getcallerpc(&l), l->pc, l->p, up);
dumpaproc(l->p);
dumpaproc(up);
}
l->m = nil; l->m = nil;
coherence(); coherence();
l->key = 0; l->key = 0;
@ -223,11 +233,11 @@ iunlock(Lock *l)
ilockpcs[n++ & 0xff] = l->pc; ilockpcs[n++ & 0xff] = l->pc;
#endif #endif
if(l->key == 0) if(l->key == 0)
print("iunlock: not locked: pc %#p\n", getcallerpc(&l)); print("iunlock(%#p): not locked: pc %#p\n", l, getcallerpc(&l));
if(!l->isilock) if(!l->isilock)
print("iunlock of lock: pc %#p, held by %#p\n", getcallerpc(&l), l->pc); print("iunlock(%#p) of lock: pc %#p, held by %#p\n", l, getcallerpc(&l), l->pc);
if(islo()) if(islo())
print("iunlock while lo: pc %#p, held by %#p\n", getcallerpc(&l), l->pc); print("iunlock(%#p) while lo: pc %#p, held by %#p\n", l, getcallerpc(&l), l->pc);
sr = l->sr; sr = l->sr;
l->m = nil; l->m = nil;