TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid paging out pages on the first attempt if a page is used in the current frame or previous frame.

Browse Source
This commit is contained in:
aignacio_sf 2007-05-22 02:30:11 +00:00
parent 16d3fd7dad
commit 99ab24614f
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
panda/src/display/lru.cxx
View File

@ -808,7 +808,7 @@ void Lru::update_lru_page_old (LruPage *lru_page)
if(this->_m.total_lru_page_priority_changes if(this->_m.total_lru_page_priority_changes
< FRAME_MAXIMUM_PRIORITY_CHANGES) { < FRAME_MAXIMUM_PRIORITY_CHANGES) {
this->_m.lru_page_priority_change_array this->_m.lru_page_priority_change_array
[this->_m.total_lru_page_priority_changes ]= lru_page; [this->_m.total_lru_page_priority_changes]= lru_page;
this->_m.total_lru_page_priority_changes++; this->_m.total_lru_page_priority_changes++;
} }
} }
@ -1016,6 +1016,9 @@ bool Lru::page_out_lru (int memory_required)
do { do {
int index; int index;
int minimum_frame_identifier;
minimum_frame_identifier = this->_m.current_frame_identifier - 1;
// page out lower priority pages first // page out lower priority pages first
for(index = LPP_PageOut - 1; index >= 0; index--) { for(index = LPP_PageOut - 1; index >= 0; index--) {
@ -1026,24 +1029,29 @@ bool Lru::page_out_lru (int memory_required)
while(lru_page) { while(lru_page) {
next_lru_page = lru_page->_m.next; next_lru_page = lru_page->_m.next;
if(lru_page->_m.v.lock == false && lru_page->_m.v.in_cache) { if(attempts == 0 && (lru_page->_m.current_frame_identifier >= minimum_frame_identifier)) {
memory_required -= lru_page->_m.size; // avoid swapping out pages used in the current and last frame on the first attempt
this->_m.available_memory += lru_page->_m.size; }
lru_page->_m.v.in_cache = false; else {
if(lru_page->_m.v.lock == false && lru_page->_m.v.in_cache) {
memory_required -= lru_page->_m.size;
this->_m.available_memory += lru_page->_m.size;
lru_page->_m.v.in_cache = false;
// PAGE OUT CALLBACK // PAGE OUT CALLBACK
this->_m.page_out_function_array[lru_page->_m.v.type](lru_page); this->_m.page_out_function_array[lru_page->_m.v.type](lru_page);
this->_m.total_lifetime_page_outs++; this->_m.total_lifetime_page_outs++;
// MOVE THE PAGE TO THE LPP_PageOut PRIORITY // MOVE THE PAGE TO THE LPP_PageOut PRIORITY
this->remove_page(lru_page); this->remove_page(lru_page);
this->add_page(LPP_PageOut, lru_page); this->add_page(LPP_PageOut, lru_page);
if(memory_required <= 0) { if(memory_required <= 0) {
break; break;
}
} }
} }
lru_page = next_lru_page; lru_page = next_lru_page;
} }
@ -1053,8 +1061,6 @@ bool Lru::page_out_lru (int memory_required)
} }
if(memory_required > 0) { if(memory_required > 0) {
// WARNING: pages could not be freed, all pages unlocked
this->unlock_all_pages( );
state = false; state = false;
} }
else { else {