mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename memory_free to memory_used

Browse Source
This commit is contained in:
twinaphex 2016-06-12 20:50:03 +02:00
parent 040798cdb9
commit dae55553b7
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/drivers/platform_darwin.m
View File

@ -681,7 +681,7 @@ static uint64_t frontend_darwin_get_mem_total(void)
#endif
}
static uint64_t frontend_darwin_get_mem_free(void)
static uint64_t frontend_darwin_get_mem_used(void)
{
#if defined(OSX) && !defined(OSX_PPC)
vm_size_t page_size;
@ -720,6 +720,6 @@ frontend_ctx_driver_t frontend_ctx_darwin = {
frontend_darwin_get_powerstate,
frontend_darwin_parse_drive_list,
frontend_darwin_get_mem_total,
frontend_darwin_get_mem_free,
frontend_darwin_get_mem_used,
"darwin",
};

4
frontend/drivers/platform_gx.c
View File

@ -495,7 +495,7 @@ static uint64_t frontend_gx_get_mem_total(void)
return total;
}
static uint64_t frontend_gx_get_mem_free(void)
static uint64_t frontend_gx_get_mem_used(void)
{
uint64_t total = SYSMEM1_SIZE - SYS_GetArena1Size();
#if defined(HW_RVL) && !defined(IS_SALAMANDER)
@ -525,6 +525,6 @@ frontend_ctx_driver_t frontend_ctx_gx = {
NULL, /* get_powerstate */
frontend_gx_parse_drive_list,
frontend_gx_get_mem_total,
frontend_gx_get_mem_free,
frontend_gx_get_mem_used,
"gx",
};

4
frontend/drivers/platform_linux.c
View File

@ -1888,7 +1888,7 @@ static uint64_t frontend_linux_get_mem_total(void)
return pages * page_size;
}
static uint64_t frontend_linux_get_mem_free(void)
static uint64_t frontend_linux_get_mem_used(void)
{
long pages = sysconf(_SC_AVPHYS_PAGES);
long page_size = sysconf(_SC_PAGE_SIZE);
@ -1930,7 +1930,7 @@ frontend_ctx_driver_t frontend_ctx_linux = {
NULL, /* parse_drive_list */
#endif
frontend_linux_get_mem_total,
frontend_linux_get_mem_free,
frontend_linux_get_mem_used,
#ifdef ANDROID
"android"
#else

6
frontend/drivers/platform_win32.c
View File

@ -307,7 +307,7 @@ static uint64_t frontend_win32_get_mem_total(void)
return mem_info.ullTotalPhys;
}
static uint64_t frontend_win32_get_mem_free(void)
static uint64_t frontend_win32_get_mem_used(void)
{
MEMORYSTATUSEX mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUSEX);
@ -332,6 +332,6 @@ frontend_ctx_driver_t frontend_ctx_win32 = {
frontend_win32_get_powerstate,
frontend_win32_parse_drive_list,
frontend_win32_get_mem_total,
frontend_win32_get_mem_free,
"win32",
frontend_win32_get_mem_used,
"win32"
};

6
frontend/frontend_driver.c
View File

@ -317,11 +317,11 @@ uint64_t frontend_driver_get_total_memory(void)
return frontend->get_total_mem();
}
uint64_t frontend_driver_get_free_memory(void)
uint64_t frontend_driver_get_used_memory(void)
{
frontend_ctx_driver_t *frontend = frontend_get_ptr();
if (!frontend || !frontend->get_free_mem)
if (!frontend || !frontend->get_used_mem)
return 0;
return frontend->get_free_mem();
return frontend->get_used_mem();
}
#endif

4
frontend/frontend_driver.h
View File

@ -81,7 +81,7 @@ typedef struct frontend_ctx_driver
enum frontend_powerstate (*get_powerstate)(int *seconds, int *percent);
int (*parse_drive_list)(void*);
uint64_t (*get_total_mem)(void);
uint64_t (*get_free_mem)(void);
uint64_t (*get_used_mem)(void);
const char *ident;
@ -157,7 +157,7 @@ bool frontend_driver_get_salamander_basename(char *s, size_t len);
uint64_t frontend_driver_get_total_memory(void);
uint64_t frontend_driver_get_free_memory(void);
uint64_t frontend_driver_get_used_memory(void);
RETRO_END_DECLS

22
menu/menu_displaylist.c
View File

@ -784,57 +784,57 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
char tmp[PATH_MAX_LENGTH] = {0};
char tmp2[PATH_MAX_LENGTH] = {0};
char tmp3[PATH_MAX_LENGTH] = {0};
uint64_t memory_free = frontend_driver_get_free_memory();
uint64_t memory_used = frontend_driver_get_used_memory();
uint64_t memory_total = frontend_driver_get_total_memory();
if (memory_free != 0 && memory_total != 0)
if (memory_used != 0 && memory_total != 0)
{
#ifdef _WIN32
snprintf(tmp, sizeof(tmp),
"Memory (in bytes): %Iu/%Iu B",
memory_free,
memory_used,
memory_total
);
snprintf(tmp2, sizeof(tmp2),
"Memory (in megabytes): %Iu/%Iu MB",
bytes_to_mb(memory_free),
bytes_to_mb(memory_used),
bytes_to_mb(memory_total)
);
snprintf(tmp3, sizeof(tmp3),
"Memory (in gigabytes): %Iu/%Iu GB",
bytes_to_gb(memory_free),
bytes_to_gb(memory_used),
bytes_to_gb(memory_total)
);
#elif defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
snprintf(tmp, sizeof(tmp),
"Memory (in bytes) : %llu/%llu B",
(unsigned long long)memory_free,
(unsigned long long)memory_used,
(unsigned long long)memory_total
);
snprintf(tmp2, sizeof(tmp2),
"Memory (in megabytes) : %llu/%llu MB",
(unsigned long long)bytes_to_mb(memory_free),
(unsigned long long)bytes_to_mb(memory_used),
(unsigned long long)bytes_to_mb(memory_total)
);
snprintf(tmp3, sizeof(tmp3),
"Memory (in gigabytes): %llu/%llu GB",
(unsigned long long)bytes_to_gb(memory_free),
(unsigned long long)bytes_to_gb(memory_used),
(unsigned long long)bytes_to_gb(memory_total)
);
#else
snprintf(tmp, sizeof(tmp),
"Memory (in bytes): %lu/%lu B",
memory_free,
memory_used,
memory_total
);
snprintf(tmp2, sizeof(tmp2),
"Memory (in megabytes) : %1u/%1u MB",
bytes_to_mb(memory_free),
bytes_to_mb(memory_used),
bytes_to_mb(memory_total)
);
snprintf(tmp3, sizeof(tmp3),
"Memory (in gigabytes) : %1u/%1u GB",
bytes_to_gb(memory_free),
bytes_to_gb(memory_used),
bytes_to_gb(memory_total)
);
#endif