From f8a89fae19b9a113885a0c0d5bbd8cc5587f746d Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 18 Apr 2003 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2003-04-18 --- port/page.c | 1 - port/taslock.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/port/page.c b/port/page.c index 38803a1b2a530aa875583330be14efb135e63288..e38ee41ba0af0d10b3d5d2528b74cb2e5cc8c171 100644 --- a/port/page.c +++ b/port/page.c @@ -177,7 +177,6 @@ newpage(int clear, Segment **s, ulong va) } pageunchain(p); - lock(p); if(p->ref != 0) panic("newpage"); diff --git a/port/taslock.c b/port/taslock.c index fd36223056854d1ae222408c3e8c32c51db287f6..fd70e120f46d15f406fe0f7eea75549e4fec3c00 100644 --- a/port/taslock.c +++ b/port/taslock.c @@ -43,15 +43,12 @@ lock(Lock *l) { int i; ulong pc; -Lock *_l = l; pc = getcallerpc(&l); lockstats.locks++; if(up) up->nlocks++; /* prevent being scheded */ - if(l->key == 0x55555555) - panic("lock(1): l %p, key 5*, pc %.lux, %p\n", l, pc, _l); if(tas(&l->key) == 0){ if(up) up->lastlock = l; @@ -60,8 +57,6 @@ Lock *_l = l; l->isilock = 0; return 0; } - if(l->key == 0x55555555) - panic("lock(1a): l %p, key 5*, pc %.lux, %p\n", l, pc, _l); if(up) up->nlocks--; /* didn't get the lock, allow scheding */ @@ -69,24 +64,14 @@ Lock *_l = l; for(;;){ lockstats.inglare++; i = 0; - if(l->key == 0x55555555) - panic("lock(2): l %p, key 5*, pc %.lux, %p\n", l, pc, _l); while(l->key){ if(i++ > 100000000){ i = 0; - if(l->key == 0x55555555) - panic("lock(3): l %p, key 5*, pc %.lux, %p\n", l, pc, _l); lockloop(l, pc); - if(l->key == 0x55555555) - panic("lock(4): l %p, key 5*, pc %.lux, %p\n", l, pc, _l); } } - if(l->key == 0x55555555) - panic("lock(5): l %p, key 5*, pc %.lux, %p\n", l, pc, _l); if(up) up->nlocks++; - if(l->key == 0x55555555) - panic("lock(6): l %p, key 5*, pc %.lux, %p\n", l, pc, _l); if(tas(&l->key) == 0){ if(up) up->lastlock = l; @@ -95,8 +80,6 @@ Lock *_l = l; l->isilock = 0; return 1; } - if(l->key == 0x55555555) - panic("lock(7): l %p, key 5*, pc %.lux, %p\n", l, pc, _l); if(up) up->nlocks--; }