X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fpalloc.c;h=7e6a967a9d884559a672ee382ba135be35552330;hb=04abef1571d323539c9a9e2e29e5ddc47126b417;hp=c99abe35daaafb66568bce5b24256be1e02a6660;hpb=a735930b337c32c28e7641401f47999845adba78;p=pintos-anon diff --git a/src/threads/palloc.c b/src/threads/palloc.c index c99abe3..7e6a967 100644 --- a/src/threads/palloc.c +++ b/src/threads/palloc.c @@ -85,8 +85,9 @@ palloc_get_multiple (enum palloc_flags flags, size_t page_cnt) return NULL; lock_acquire (&pool->lock); - page_idx = bitmap_scan_and_flip (pool->used_map, 0, page_cnt, false); + lock_release (&pool->lock); + if (page_idx != BITMAP_ERROR) pages = pool->base + PGSIZE * page_idx; else @@ -103,8 +104,6 @@ palloc_get_multiple (enum palloc_flags flags, size_t page_cnt) PANIC ("palloc_get: out of pages"); } - lock_release (&pool->lock); - return pages; } @@ -144,10 +143,8 @@ palloc_free_multiple (void *pages, size_t page_cnt) memset (pages, 0xcc, PGSIZE * page_cnt); #endif - lock_acquire (&pool->lock); ASSERT (bitmap_all (pool->used_map, page_idx, page_idx + page_cnt)); bitmap_set_multiple (pool->used_map, page_idx, page_idx + page_cnt, false); - lock_release (&pool->lock); } /* Frees the page at PAGE. */