Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove allocMutex to avoid possible deadlocks #38

Merged
merged 1 commit into from
May 3, 2024
Merged

Remove allocMutex to avoid possible deadlocks #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions source/memory_mapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

// #define DEBUG_FUNCTION_LINE(x,...)

OSMutex allocMutex;
//OSMutex allocMutex;

void runOnAllCores(CThread::Callback callback, void *callbackArg, int32_t iAttr = 0, int32_t iPriority = 16, int32_t iStackSize = 0x8000) {
int32_t aff[] = {CThread::eAttributeAffCore2, CThread::eAttributeAffCore1, CThread::eAttributeAffCore0};
Expand Down Expand Up @@ -552,14 +552,14 @@ void MemoryMapping_setupMemoryMapping() {
//readTestValuesFromMemory();

//runOnAllCores(writeSegmentRegister,&srTableCpy);
OSInitMutex(&allocMutex);
// OSInitMutex(&allocMutex);

memset(pageTableCpy, 0, sizePageTable);
gMEMFreeToDefaultHeapForThreads(pageTableCpy);
}

void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
OSLockMutex(&allocMutex);
//OSLockMutex(&allocMutex);
void *res = nullptr;
for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) {
Expand Down Expand Up @@ -587,7 +587,7 @@ void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
}
}
OSMemoryBarrier();
OSUnlockMutex(&allocMutex);
//OSUnlockMutex(&allocMutex);
return res;
}

Expand Down Expand Up @@ -659,7 +659,7 @@ bool CheckMemExpHeap(MEMExpHeap *heap) {
}

void MemoryMapping_checkHeaps() {
OSLockMutex(&allocMutex);
//OSLockMutex(&allocMutex);
for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) {
break;
Expand All @@ -672,7 +672,7 @@ void MemoryMapping_checkHeaps() {
#endif
}
}
OSUnlockMutex(&allocMutex);
//OSUnlockMutex(&allocMutex);
}

void *MemoryMapping_alloc(uint32_t size, int32_t align) {
Expand Down Expand Up @@ -710,7 +710,7 @@ void MemoryMapping_free(void *ptr) {
if (ptr == nullptr) {
return;
}
OSLockMutex(&allocMutex);
//OSLockMutex(&allocMutex);
auto ptr_val = (uint32_t) ptr;
for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) {
Expand All @@ -723,15 +723,15 @@ void MemoryMapping_free(void *ptr) {
}
}
OSMemoryBarrier();
OSUnlockMutex(&allocMutex);
//OSUnlockMutex(&allocMutex);
}

uint32_t MemoryMapping_MEMGetAllocatableSize() {
return MemoryMapping_MEMGetAllocatableSizeEx(4);
}

uint32_t MemoryMapping_MEMGetAllocatableSizeEx(uint32_t align) {
OSLockMutex(&allocMutex);
//OSLockMutex(&allocMutex);
uint32_t res = 0;
for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) {
Expand All @@ -743,12 +743,12 @@ uint32_t MemoryMapping_MEMGetAllocatableSizeEx(uint32_t align) {
res = curRes;
}
}
OSUnlockMutex(&allocMutex);
//OSUnlockMutex(&allocMutex);
return res;
}

uint32_t MemoryMapping_GetFreeSpace() {
OSLockMutex(&allocMutex);
//OSLockMutex(&allocMutex);
uint32_t res = 0;
for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) {
Expand All @@ -758,12 +758,12 @@ uint32_t MemoryMapping_GetFreeSpace() {
DEBUG_FUNCTION_LINE_VERBOSE("heap at %08X MEMGetTotalFreeSizeForExpHeap: %d KiB", mem_mapping[i].effective_start_address, curRes / 1024);
res += curRes;
}
OSUnlockMutex(&allocMutex);
//OSUnlockMutex(&allocMutex);
return res;
}

void MemoryMapping_CreateHeaps() {
OSLockMutex(&allocMutex);
//OSLockMutex(&allocMutex);
for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) {
break;
Expand All @@ -780,11 +780,11 @@ void MemoryMapping_CreateHeaps() {
DEBUG_FUNCTION_LINE("Created heap @%08X, size %d KiB", heap, size / 1024);
#endif
}
OSUnlockMutex(&allocMutex);
//OSUnlockMutex(&allocMutex);
}

void MemoryMapping_DestroyHeaps() {
OSLockMutex(&allocMutex);
//OSLockMutex(&allocMutex);
for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) {
break;
Expand All @@ -796,7 +796,7 @@ void MemoryMapping_DestroyHeaps() {
memset(address, 0, size);
DEBUG_FUNCTION_LINE_VERBOSE("Destroyed heap @%08X", address);
}
OSUnlockMutex(&allocMutex);
//OSUnlockMutex(&allocMutex);
}

uint32_t MemoryMapping_getAreaSizeFromPageTable(uint32_t start, uint32_t maxSize) {
Expand Down