Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add vm_page_free_etc()

Browse Source 
It additionally gets a vm_page_reservation* argument. If not NULL, the
page count of the reservation is incremented for the freed page.
This commit is contained in:
Ingo Weinhold 2014-10-29 02:29:57 +01:00
parent 70d3bd5592
commit 9da590f73e
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
headers/private/kernel/vm/vm_page.h
View File

@ -34,7 +34,9 @@ status_t vm_page_init_post_thread(struct kernel_args *args);
status_t vm_mark_page_inuse(page_num_t page); status_t vm_mark_page_inuse(page_num_t page);
status_t vm_mark_page_range_inuse(page_num_t startPage, page_num_t length); status_t vm_mark_page_range_inuse(page_num_t startPage, page_num_t length);
void vm_page_free(struct VMCache *cache, struct vm_page *page); void vm_page_free_etc(VMCache* cache, vm_page* page,
vm_page_reservation* reservation);
void vm_page_set_state(struct vm_page *page, int state); void vm_page_set_state(struct vm_page *page, int state);
void vm_page_requeue(struct vm_page *page, bool tail); void vm_page_requeue(struct vm_page *page, bool tail);
@ -71,4 +73,12 @@ bool vm_page_is_dummy(struct vm_page *page);
} }
#endif #endif
static inline void
vm_page_free(struct VMCache *cache, struct vm_page *page)
{
vm_page_free_etc(cache, page, NULL);
}
#endif /* _KERNEL_VM_VM_PAGE_H */ #endif /* _KERNEL_VM_VM_PAGE_H */

21
src/system/kernel/vm/vm_page.cpp
View File

@ -1524,8 +1524,6 @@ free_page(vm_page* page, bool clear)
} }
locker.Unlock(); locker.Unlock();
unreserve_pages(1);
} }
@ -2013,6 +2011,7 @@ PageWriteWrapper::Done(status_t result)
// TODO: Unmapping should already happen when resizing the cache! // TODO: Unmapping should already happen when resizing the cache!
fCache->RemovePage(fPage); fCache->RemovePage(fPage);
free_page(fPage, false); free_page(fPage, false);
unreserve_pages(1);
} else { } else {
// Writing the page failed -- mark the page modified and move it to // Writing the page failed -- mark the page modified and move it to
// an appropriate queue other than the modified queue, so we don't // an appropriate queue other than the modified queue, so we don't
@ -3938,9 +3937,18 @@ vm_page_is_dummy(struct vm_page *page)
/*! Free the page that belonged to a certain cache. /*! Free the page that belonged to a certain cache.
You can use vm_page_set_state() manually if you prefer, but only You can use vm_page_set_state() manually if you prefer, but only
if the page does not equal PAGE_STATE_MODIFIED. if the page does not equal PAGE_STATE_MODIFIED.
\param cache The cache the page was previously owned by or NULL. The page
must have been removed from its cache before calling this method in
either case.
\param page The page to free.
\param reservation If not NULL, the page count of the reservation will be
incremented, thus allowing to allocate another page for the freed one at
a later time.
*/ */
void void
vm_page_free(VMCache *cache, vm_page *page) vm_page_free_etc(VMCache* cache, vm_page* page,
vm_page_reservation* reservation)
{ {
PAGE_ASSERT(page, page->State() != PAGE_STATE_FREE PAGE_ASSERT(page, page->State() != PAGE_STATE_FREE
&& page->State() != PAGE_STATE_CLEAR); && page->State() != PAGE_STATE_CLEAR);
@ -3949,6 +3957,8 @@ vm_page_free(VMCache *cache, vm_page *page)
atomic_add(&sModifiedTemporaryPages, -1); atomic_add(&sModifiedTemporaryPages, -1);
free_page(page, false); free_page(page, false);
if (reservation == NULL)
unreserve_pages(1);
} }
@ -3958,9 +3968,10 @@ vm_page_set_state(vm_page *page, int pageState)
PAGE_ASSERT(page, page->State() != PAGE_STATE_FREE PAGE_ASSERT(page, page->State() != PAGE_STATE_FREE
&& page->State() != PAGE_STATE_CLEAR); && page->State() != PAGE_STATE_CLEAR);
if (pageState == PAGE_STATE_FREE || pageState == PAGE_STATE_CLEAR) if (pageState == PAGE_STATE_FREE || pageState == PAGE_STATE_CLEAR) {
free_page(page, pageState == PAGE_STATE_CLEAR); free_page(page, pageState == PAGE_STATE_CLEAR);
else unreserve_pages(1);
} else
set_page_state(page, pageState); set_page_state(page, pageState);
} }