Ticket #15804: vm-traces.patch

src/system/kernel/vm/VMUserAddressSpace.cpp

@@ -24 +24 @@
 #include <vm/VMArea.h>
 
 
-//#define TRACE_VM
+#define TRACE_VM
 #ifdef TRACE_VM
 #   define TRACE(x) dprintf x
 #else
@@ -450 +450 @@
 VMUserAddressSpace::_InsertAreaIntoReservedRegion(addr_t start, size_t size,
     VMUserArea* area, uint32 allocationFlags)
 {
+    TRACE(("VMUserAddressSpace::_InsertAreaIntoReservedRegion: address space %p, start "
+        "0x%lx, size %ld, area %p\n",
+        this, start, size, area));
+
     VMUserArea* next;
 
     for (VMUserAreaList::Iterator it = fAreas.GetIterator();
@@ -770 +774 @@
             return B_BAD_VALUE;
     }
 
-    if (!foundSpot)
+    if (!foundSpot) {
+        TRACE(("121\n"));
         return addressSpec == B_EXACT_ADDRESS ? B_BAD_VALUE : B_NO_MEMORY;
+    }
 
     area->SetSize(size);
     if (last)

src/system/kernel/vm/vm.cpp

@@ -59 +59 @@
 #include "IORequest.h"
 
 
-//#define TRACE_VM
+#define TRACE_VM
 //#define TRACE_FAULTS
 #ifdef TRACE_VM
 #   define TRACE(x) dprintf x
@@ -618 +618 @@
 cut_area(VMAddressSpace* addressSpace, VMArea* area, addr_t address,
     addr_t lastAddress, VMArea** _secondArea, bool kernel)
 {
+    TRACE(("cut_area: aspace %p, address %" B_PRIuADDR ", lastAddress %" B_PRIuADDR
+        ", kernel %d\n", addressSpace, address, lastAddress, kernel));
+
     // Does the cut range intersect with the area at all?
     addr_t areaLast = area->Base() + (area->Size() - 1);
     if (area->Base() > lastAddress || areaLast < address)
@@ -747 +750 @@
 unmap_address_range(VMAddressSpace* addressSpace, addr_t address, addr_t size,
     bool kernel)
 {
+    TRACE(("unmap_address_range: aspace %p, address %" B_PRIuADDR ", size %" B_PRIuADDR
+        ", kernel %d\n", addressSpace, address, size, kernel));
+
     size = PAGE_ALIGN(size);
     addr_t lastAddress = address + (size - 1);
 
@@ -857 +863 @@
 
     if ((flags & CREATE_AREA_DONT_COMMIT_MEMORY) == 0) {
         status = cache->SetMinimalCommitment(size, priority);
+        TRACE(("err2 CREATE_AREA_DONT_COMMIT_MEMORY: %d\n", status));
         if (status != B_OK)
             goto err2;
     }
@@ -866 +873 @@
         // okay, someone is trying to delete this address space now, so we can't
         // insert the area, so back out
         status = B_BAD_TEAM_ID;
+        TRACE(("err2 IsBeingDeleted: %d\n", status));
         goto err2;
     }
 
@@ -887 +895 @@
         // for space to be freed up, but it would be good to at least notify
         // that we tried and failed to allocate some amount.
     }
+    TRACE(("err2 InsertArea: %d\n", status));
     if (status != B_OK)
         goto err2;
 
@@ -912 +921 @@
     return B_OK;
 
 err2:
+    TRACE(("map_backing_store: err2\n"));
     if (mapping == REGION_PRIVATE_MAP) {
         // We created this cache, so we must delete it again. Note, that we
         // need to temporarily unlock the source cache or we'll otherwise
@@ -921 +931 @@
         sourceCache->Lock();
     }
 err1:
+    TRACE(("map_backing_store: err1\n"));
     addressSpace->DeleteArea(area, allocationFlags);
     return status;
 }