summaryrefslogtreecommitdiff
path: root/sys/lib/acid
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@localhost>2011-06-30 12:20:30 +0200
committercinap_lenrek <cinap_lenrek@localhost>2011-06-30 12:20:30 +0200
commit1a5cf98c99fa20d0dd0768cd9c61fab84c2a77f8 (patch)
tree109c58e7ddf54d98da7f63b91c290f8781b13270 /sys/lib/acid
parentd0085768cb2daeb8891cff098f52c62c6e4e91df (diff)
acid/pool: fix issue #61
Diffstat (limited to 'sys/lib/acid')
-rw-r--r--sys/lib/acid/pool24
1 files changed, 14 insertions, 10 deletions
diff --git a/sys/lib/acid/pool b/sys/lib/acid/pool
index d49c4ea13..e6604347b 100644
--- a/sys/lib/acid/pool
+++ b/sys/lib/acid/pool
@@ -95,18 +95,22 @@ Tail(addr)
defn
Magic(m)
{
+ if m == DEAD_MAGIC then
+ return "dead";
if m == FREE_MAGIC then
return "free";
+ if m == ALLOC_MAGIC then
+ return "alloc";
+ if m == UNALLOC_MAGIC then
+ return "unalloc";
if m == ARENA_MAGIC then
return "arena";
- if m == UNKEMPT_MAGIC then
- return "unkempt";
- if m == KEMPT_MAGIC then
- return "kempt";
if m == ARENATAIL_MAGIC then
return "arenatail";
- if m == DEAD_MAGIC then
- return "dead";
+ if m == ALIGN_MAGIC then
+ return "align";
+ if m == FLOATING_MAGIC then
+ return "floating";
return "unknown magic";
}
@@ -150,7 +154,7 @@ checkblock(addr)
taddr = B2T(addr);
complex Btail taddr;
- if addr.magic == FREE_MAGIC || addr.magic == UNKEMPT_MAGIC then {
+ if addr.magic == FREE_MAGIC || addr.magic == UNALLOC_MAGIC then {
if taddr.magic0 != TAIL_MAGIC0 || taddr.magic1 != TAIL_MAGIC1 then
print(addr\X, " corrupt tail magic\n");
if taddr.size != addr.size then
@@ -170,7 +174,7 @@ checkblock(addr)
print(addr\X, " bad size in arena tail\n");
}
- if addr.magic == KEMPT_MAGIC then {
+ if addr.magic == ALLOC_MAGIC then {
a = addr;
complex Alloc a;
if a.size > 1024*1024*1024 then
@@ -296,8 +300,8 @@ blockhdr(addr)
while *addr != FREE_MAGIC
&& *addr != ARENA_MAGIC
- && *addr != UNKEMPT_MAGIC
- && *addr != KEMPT_MAGIC
+ && *addr != UNALLOC_MAGIC
+ && *addr != ALLOC_MAGIC
&& *addr != ARENATAIL_MAGIC
do
addr = addr-4;