i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logging calculations was done outside the #def TRACE_VM_PAGE, but never printed.

Browse Source 
Now done inside #def as well as this triggered unused variables warnings.
This commit is contained in:
Fredrik Holmqvist
2012-06-23 22:43:24 +02:00
parent 6f55e249df
commit 91102c544e
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm_page.cpp
+13 -7
View File
@@ -714,7 +714,7 @@ public:
private: private:
bool fPrintStackTrace; bool fPrintStackTrace;
page_num_t fPageFilter; page_num_t fPageFilter;
team_id fTeamFilter; team_id fTeamFilter;
thread_id fThreadFilter; thread_id fThreadFilter;
}; };
@@ -1530,7 +1530,7 @@ free_page(vm_page* page, bool clear)
TA(FreePage(page->physical_page_number)); TA(FreePage(page->physical_page_number));
#if VM_PAGE_ALLOCATION_TRACKING_AVAILABLE #if VM_PAGE_ALLOCATION_TRACKING_AVAILABLE
page->allocation_tracking_info.Clear(); page->allocation_tracking_info.Clear();
#endif #endif
ReadLocker locker(sFreePageQueuesLock); ReadLocker locker(sFreePageQueuesLock);
@@ -2295,12 +2295,12 @@ status_t
page_writer(void* /*unused*/) page_writer(void* /*unused*/)
{ {
const uint32 kNumPages = 256; const uint32 kNumPages = 256;
uint32 writtenPages = 0;
#ifdef TRACE_VM_PAGE #ifdef TRACE_VM_PAGE
uint32 writtenPages = 0;
bigtime_t lastWrittenTime = 0; bigtime_t lastWrittenTime = 0;
#endif
bigtime_t pageCollectionTime = 0; bigtime_t pageCollectionTime = 0;
bigtime_t pageWritingTime = 0; bigtime_t pageWritingTime = 0;
#endif
PageWriterRun run; PageWriterRun run;
if (run.Init(kNumPages) != B_OK) { if (run.Init(kNumPages) != B_OK) {
@@ -2356,7 +2356,9 @@ page_writer(void* /*unused*/)
// enough to do). // enough to do).
// collect pages to be written // collect pages to be written
#ifdef TRACE_VM_PAGE
pageCollectionTime -= system_time(); pageCollectionTime -= system_time();
#endif
page_num_t maxPagesToSee = modifiedPages; page_num_t maxPagesToSee = modifiedPages;
@@ -2429,31 +2431,35 @@ page_writer(void* /*unused*/)
numPages++; numPages++;
} }
#ifdef TRACE_VM_PAGE
pageCollectionTime += system_time(); pageCollectionTime += system_time();
#endif
if (numPages == 0) if (numPages == 0)
continue; continue;
// write pages to disk and do all the cleanup // write pages to disk and do all the cleanup
#ifdef TRACE_VM_PAGE
pageWritingTime -= system_time(); pageWritingTime -= system_time();
#endif
uint32 failedPages = run.Go(); uint32 failedPages = run.Go();
#ifdef TRACE_VM_PAGE
pageWritingTime += system_time(); pageWritingTime += system_time();
// debug output only... // debug output only...
writtenPages += numPages; writtenPages += numPages;
if (writtenPages >= 1024) { if (writtenPages >= 1024) {
#ifdef TRACE_VM_PAGE
bigtime_t now = system_time(); bigtime_t now = system_time();
TRACE(("page writer: wrote 1024 pages (total: %llu ms, " TRACE(("page writer: wrote 1024 pages (total: %llu ms, "
"collect: %llu ms, write: %llu ms)\n", "collect: %llu ms, write: %llu ms)\n",
(now - lastWrittenTime) / 1000, (now - lastWrittenTime) / 1000,
pageCollectionTime / 1000, pageWritingTime / 1000)); pageCollectionTime / 1000, pageWritingTime / 1000));
lastWrittenTime = now; lastWrittenTime = now;
#endif
writtenPages -= 1024; writtenPages -= 1024;
pageCollectionTime = 0; pageCollectionTime = 0;
pageWritingTime = 0; pageWritingTime = 0;
} }
#endif
if (failedPages == numPages) if (failedPages == numPages)
pagesSinceLastSuccessfulWrite += modifiedPages - maxPagesToSee; pagesSinceLastSuccessfulWrite += modifiedPages - maxPagesToSee;