Ticket #1925: 1925-page-mapper-debug-output.diff

src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp

@@ -480 +480 @@
 LargeMemoryPhysicalPageMapper::Init(kernel_args* args,
     TranslationMapPhysicalPageMapper*& _kernelPageMapper)
 {
+dprintf("%p->LargeMemoryPhysicalPageMapper::Init()\n", this);
     // We reserve more, so that we can guarantee to align the base address
     // to page table ranges.
     addr_t virtualBase = vm_allocate_early(args,
@@ -489 +490 @@
             "physical page pool space in virtual address space!");
         return B_ERROR;
     }
+dprintf("  reserved page pool space: %#" B_PRIxADDR "\n", virtualBase);
     virtualBase = (virtualBase + kPageTableAlignment - 1)
         / kPageTableAlignment * kPageTableAlignment;
+dprintf("  aligned page pool space: %#" B_PRIxADDR "\n", virtualBase);
 
     // allocate memory for the page table and data
     size_t areaSize = B_PAGE_SIZE + sizeof(PhysicalPageSlot[1024]);
     page_table_entry* pageTable = (page_table_entry*)vm_allocate_early(args,
         areaSize, ~0L, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, false);
+dprintf("  allocated memory for page table and data: %p (%" B_PRIuSIZE
+" bytes)\n", pageTable, areaSize);
 
     // prepare the page table
     x86_early_prepare_page_tables(pageTable, virtualBase,
@@ -506 +511 @@
     fNonEmptyPools.Add(&fInitialPool);
 
     // get the debug slot
-    GetSlot(true, fDebugSlot);
+    status_t error = GetSlot(true, fDebugSlot);
+dprintf("  GetSlot() returned: %s, fDebugSlot: %p\n", strerror(error), fDebugSlot);
 
     // init the kernel translation map physical page mapper
-    status_t error = fKernelMapper.Init();
+    error = fKernelMapper.Init();
     if (error != B_OK) {
         panic("LargeMemoryPhysicalPageMapper::Init(): Failed to init "
             "kernel translation map physical page mapper!");
@@ -522 +528 @@
     for (int32 i = 0; i < cpuCount; i++)
         fPerCPUData[i].Init();
 
+dprintf("LargeMemoryPhysicalPageMapper::Init() done\n");
     return B_OK;
 }
 
@@ -802 +809 @@
     PhysicalPageSlot*& slot)
 {
     MutexLocker locker(fLock);
+dprintf("LargeMemoryPhysicalPageMapper::GetSlot(%d)\n", canWait);
 
     PhysicalPageSlotPool* pool = fNonEmptyPools.Head();
     if (pool == NULL) {
+dprintf("  no non-empty pool\n");
         if (!canWait)
             return B_WOULD_BLOCK;
 
@@ -812 +821 @@
         locker.Unlock();
         status_t error = _AllocatePool(pool);
         if (error != B_OK)
+{
+dprintf("LargeMemoryPhysicalPageMapper::GetSlot(): failed to allocate new pool: %s\n", strerror(error));
             return error;
+}
         locker.Lock();
+dprintf("  allocated pool %p\n", pool);
 
         fNonEmptyPools.Add(pool);
         pool = fNonEmptyPools.Head();
     }
 
+dprintf("  got pool %p\n", pool);
+
     slot = pool->GetSlot();
+dprintf("  got slot %p\n", slot);
 
     if (pool->IsEmpty()) {
         fNonEmptyPools.Remove(pool);
         fEmptyPools.Add(pool);
     }
 
+dprintf("LargeMemoryPhysicalPageMapper::GetSlot() done: %p\n", slot);
     return B_OK;
 }