diff options
Diffstat (limited to 'src/common/mem_arena.cpp')
| -rw-r--r-- | src/common/mem_arena.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp index 7d4fda0e2..9904d2472 100644 --- a/src/common/mem_arena.cpp +++ b/src/common/mem_arena.cpp | |||
| @@ -71,7 +71,7 @@ int ashmem_create_region(const char *name, size_t size) | |||
| 71 | return fd; | 71 | return fd; |
| 72 | 72 | ||
| 73 | error: | 73 | error: |
| 74 | ERROR_LOG(MEMMAP, "NASTY ASHMEM ERROR: ret = %08x", ret); | 74 | LOG_ERROR(Common_Memory, "NASTY ASHMEM ERROR: ret = %08x", ret); |
| 75 | close(fd); | 75 | close(fd); |
| 76 | return ret; | 76 | return ret; |
| 77 | } | 77 | } |
| @@ -130,7 +130,7 @@ void MemArena::GrabLowMemSpace(size_t size) | |||
| 130 | // Note that it appears that ashmem is pinned by default, so no need to pin. | 130 | // Note that it appears that ashmem is pinned by default, so no need to pin. |
| 131 | if (fd < 0) | 131 | if (fd < 0) |
| 132 | { | 132 | { |
| 133 | ERROR_LOG(MEMMAP, "Failed to grab ashmem space of size: %08x errno: %d", (int)size, (int)(errno)); | 133 | LOG_ERROR(Common_Memory, "Failed to grab ashmem space of size: %08x errno: %d", (int)size, (int)(errno)); |
| 134 | return; | 134 | return; |
| 135 | } | 135 | } |
| 136 | #else | 136 | #else |
| @@ -148,12 +148,12 @@ void MemArena::GrabLowMemSpace(size_t size) | |||
| 148 | } | 148 | } |
| 149 | else if (errno != EEXIST) | 149 | else if (errno != EEXIST) |
| 150 | { | 150 | { |
| 151 | ERROR_LOG(MEMMAP, "shm_open failed: %s", strerror(errno)); | 151 | LOG_ERROR(Common_Memory, "shm_open failed: %s", strerror(errno)); |
| 152 | return; | 152 | return; |
| 153 | } | 153 | } |
| 154 | } | 154 | } |
| 155 | if (ftruncate(fd, size) < 0) | 155 | if (ftruncate(fd, size) < 0) |
| 156 | ERROR_LOG(MEMMAP, "Failed to allocate low memory space"); | 156 | LOG_ERROR(Common_Memory, "Failed to allocate low memory space"); |
| 157 | #endif | 157 | #endif |
| 158 | } | 158 | } |
| 159 | 159 | ||
| @@ -197,7 +197,7 @@ void *MemArena::CreateView(s64 offset, size_t size, void *base) | |||
| 197 | 197 | ||
| 198 | if (retval == MAP_FAILED) | 198 | if (retval == MAP_FAILED) |
| 199 | { | 199 | { |
| 200 | NOTICE_LOG(MEMMAP, "mmap failed"); | 200 | LOG_ERROR(Common_Memory, "mmap failed"); |
| 201 | return nullptr; | 201 | return nullptr; |
| 202 | } | 202 | } |
| 203 | return retval; | 203 | return retval; |
| @@ -423,7 +423,7 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena | |||
| 423 | base = (u8 *)base_addr; | 423 | base = (u8 *)base_addr; |
| 424 | if (Memory_TryBase(base, views, num_views, flags, arena)) | 424 | if (Memory_TryBase(base, views, num_views, flags, arena)) |
| 425 | { | 425 | { |
| 426 | INFO_LOG(MEMMAP, "Found valid memory base at %p after %i tries.", base, base_attempts); | 426 | LOG_DEBUG(Common_Memory, "Found valid memory base at %p after %i tries.", base, base_attempts); |
| 427 | base_attempts = 0; | 427 | base_attempts = 0; |
| 428 | break; | 428 | break; |
| 429 | } | 429 | } |
| @@ -442,7 +442,7 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena | |||
| 442 | u8 *base = MemArena::Find4GBBase(); | 442 | u8 *base = MemArena::Find4GBBase(); |
| 443 | if (!Memory_TryBase(base, views, num_views, flags, arena)) | 443 | if (!Memory_TryBase(base, views, num_views, flags, arena)) |
| 444 | { | 444 | { |
| 445 | ERROR_LOG(MEMMAP, "MemoryMap_Setup: Failed finding a memory base."); | 445 | LOG_ERROR(Common_Memory, "MemoryMap_Setup: Failed finding a memory base."); |
| 446 | PanicAlert("MemoryMap_Setup: Failed finding a memory base."); | 446 | PanicAlert("MemoryMap_Setup: Failed finding a memory base."); |
| 447 | return 0; | 447 | return 0; |
| 448 | } | 448 | } |