fix: fix memory leaks
This commit is contained in:
@@ -54,6 +54,7 @@ namespace Montauk {
|
||||
|
||||
// Track the allocation so Sys_Free can release it
|
||||
int slot = GetCurrentSlot();
|
||||
if (slot >= 0) Sched::g_allocatedPages[slot] += numPages;
|
||||
if (slot >= 0 && g_heapAllocCount[slot] < MaxHeapAllocs) {
|
||||
g_heapAllocs[slot][g_heapAllocCount[slot]++] = { userVa, numPages };
|
||||
}
|
||||
@@ -66,6 +67,7 @@ namespace Montauk {
|
||||
static void CleanupHeapForSlot(int slot, uint64_t /*pml4Phys*/) {
|
||||
if (slot < 0 || slot >= Sched::MaxProcesses) return;
|
||||
g_heapAllocCount[slot] = 0;
|
||||
Sched::g_allocatedPages[slot] = 0;
|
||||
}
|
||||
|
||||
static void Sys_Free(uint64_t addr) {
|
||||
@@ -98,6 +100,8 @@ namespace Montauk {
|
||||
Memory::VMM::Paging::UnmapUserIn(proc->pml4Phys, pageVa);
|
||||
}
|
||||
|
||||
if (slot >= 0) Sched::g_allocatedPages[slot] -= numPages;
|
||||
|
||||
// Remove tracking entry by swapping with the last element
|
||||
g_heapAllocs[slot][idx] = g_heapAllocs[slot][g_heapAllocCount[slot] - 1];
|
||||
g_heapAllocCount[slot]--;
|
||||
|
||||
@@ -92,8 +92,7 @@ namespace Montauk {
|
||||
buf[count].name[j] = proc->name[j];
|
||||
buf[count].name[j] = '\0';
|
||||
}
|
||||
buf[count].heapUsed = (proc->heapNext > Sched::UserHeapBase)
|
||||
? proc->heapNext - Sched::UserHeapBase : 0;
|
||||
buf[count].heapUsed = Sched::g_allocatedPages[i] * 0x1000;
|
||||
count++;
|
||||
}
|
||||
return count;
|
||||
|
||||
@@ -85,6 +85,25 @@ namespace WinServer {
|
||||
WindowSlot& slot = g_slots[windowId];
|
||||
if (!slot.used || slot.ownerPid != callerPid) return -1;
|
||||
|
||||
// Unmap pixel pages from desktop's address space
|
||||
if (slot.desktopVa != 0 && slot.desktopPid != 0) {
|
||||
auto* desktopProc = Sched::GetProcessByPid(slot.desktopPid);
|
||||
if (desktopProc) {
|
||||
for (int p = 0; p < slot.pixelNumPages; p++) {
|
||||
Memory::VMM::Paging::UnmapUserIn(
|
||||
desktopProc->pml4Phys,
|
||||
slot.desktopVa + (uint64_t)p * 0x1000);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Free physical pixel pages
|
||||
for (int i = 0; i < slot.pixelNumPages; i++) {
|
||||
if (slot.pixelPhysPages[i] != 0) {
|
||||
Memory::g_pfa->Free((void*)Memory::HHDM(slot.pixelPhysPages[i]));
|
||||
}
|
||||
}
|
||||
|
||||
slot.used = false;
|
||||
return 0;
|
||||
}
|
||||
@@ -179,6 +198,15 @@ namespace WinServer {
|
||||
int numPages = (int)((bufSize + 0xFFF) / 0x1000);
|
||||
if (numPages > MaxPixelPages) return -1;
|
||||
|
||||
// Free old pixel pages before allocating new ones
|
||||
int oldNumPages = slot.pixelNumPages;
|
||||
for (int i = 0; i < oldNumPages; i++) {
|
||||
if (slot.pixelPhysPages[i] != 0) {
|
||||
Memory::g_pfa->Free((void*)Memory::HHDM(slot.pixelPhysPages[i]));
|
||||
slot.pixelPhysPages[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Allocate new pages and map into owner's address space
|
||||
uint64_t userVa = heapNext;
|
||||
for (int i = 0; i < numPages; i++) {
|
||||
@@ -243,6 +271,13 @@ namespace WinServer {
|
||||
}
|
||||
}
|
||||
|
||||
// Free physical pixel pages
|
||||
for (int p = 0; p < g_slots[i].pixelNumPages; p++) {
|
||||
if (g_slots[i].pixelPhysPages[p] != 0) {
|
||||
Memory::g_pfa->Free((void*)Memory::HHDM(g_slots[i].pixelPhysPages[p]));
|
||||
}
|
||||
}
|
||||
|
||||
g_slots[i].used = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,4 +88,7 @@ namespace Sched {
|
||||
// Get a pointer to slot i in the process table (for enumeration)
|
||||
Process* GetProcessSlot(int slot);
|
||||
|
||||
// Per-process allocated page count (tracked by Heap syscalls, separate from Process struct)
|
||||
inline uint64_t g_allocatedPages[MaxProcesses] = {};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user