projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make tests public. Rewrite most tests. Add tests.
[pintos-anon]
/
src
/
threads
/
palloc.c
diff --git
a/src/threads/palloc.c
b/src/threads/palloc.c
index 545a7d4c20e15937b2c298dcf3190536388cc55b..cef065ae98f11a9e7cac3cee0971a4435949c1ef 100644
(file)
--- a/
src/threads/palloc.c
+++ b/
src/threads/palloc.c
@@
-162,7
+162,7
@@
init_pool (struct pool *p, void *base, size_t page_cnt, const char *name)
/* We'll put the pool's used_map at its base.
Calculate the space needed for the bitmap
and subtract it from the pool's size. */
/* We'll put the pool's used_map at its base.
Calculate the space needed for the bitmap
and subtract it from the pool's size. */
- size_t bm_pages = DIV_ROUND_UP (bitmap_
needed_bytes
(page_cnt), PGSIZE);
+ size_t bm_pages = DIV_ROUND_UP (bitmap_
buf_size
(page_cnt), PGSIZE);
if (bm_pages > page_cnt)
PANIC ("Not enough memory in %s for bitmap.", name);
page_cnt -= bm_pages;
if (bm_pages > page_cnt)
PANIC ("Not enough memory in %s for bitmap.", name);
page_cnt -= bm_pages;
@@
-170,9
+170,8
@@
init_pool (struct pool *p, void *base, size_t page_cnt, const char *name)
printf ("%zu pages available in %s.\n", page_cnt, name);
/* Initialize the pool. */
printf ("%zu pages available in %s.\n", page_cnt, name);
/* Initialize the pool. */
- lock_init (&p->lock, name);
- p->used_map = bitmap_create_preallocated (page_cnt, base,
- bm_pages * PGSIZE);
+ lock_init (&p->lock);
+ p->used_map = bitmap_create_in_buf (page_cnt, base, bm_pages * PGSIZE);
p->base = base + bm_pages * PGSIZE;
}
p->base = base + bm_pages * PGSIZE;
}