mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-13 13:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Add fallback to sysinfo() if /proc/meminfo can't be read

Browse Source 
This is likely to never _actually_ execute, and the possibility of this
failing is extremely slim, but if this _does_ fail, then this fallback
should catch it, as long as I'm understanding things correctly. If the
fallback fails, we just go back to the original assert that existed
before.
This commit is contained in:
Alexander Cusaac (MightyChubz)
2026-06-03 16:47:37 -04:00
parent 3d3aa45e02
commit 962f8dfd1b
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/sys/info/platform_linux.odin
View File

@@ -86,8 +86,21 @@ _ram_stats :: proc() -> (total_ram, free_ram, total_swap, free_swap: i64, ok: bo
fd, errno := linux.open("/proc/meminfo", {})
if errno != .NONE {
// This should never happen since something would be wrong with the system
// if /proc/meminfo wasn't able to be opened for any reason
return 0, 0, 0, 0, false
// if /proc/meminfo wasn't able to be opened for any reason. But, in the
// event that this _does_ happen, let's just try to recover through the
// syscall
sys_info: linux.Sys_Info
sysinfo_errno := linux.sysinfo(&sys_info)
assert_contextless(sysinfo_errno == .NONE, "If this has failed, there is no recovery from this")
total_ram = i64(sys_info.totalram) * i64(sys_info.mem_unit)
free_ram = i64(sys_info.freeram) * i64(sys_info.mem_unit)
total_swap = i64(sys_info.totalswap) * i64(sys_info.mem_unit)
free_swap = i64(sys_info.freeswap) * i64(sys_info.mem_unit)
ok = true
return
}
defer linux.close(fd)
@@ -96,7 +109,18 @@ _ram_stats :: proc() -> (total_ram, free_ram, total_swap, free_swap: i64, ok: bo
meminfo_buf: [4096]u8
n, read_errno := linux.read(fd, meminfo_buf[:])
if read_errno != .NONE {
return 0, 0, 0, 0, false
sys_info: linux.Sys_Info
sysinfo_errno := linux.sysinfo(&sys_info)
assert_contextless(sysinfo_errno == .NONE, "If this has failed, there is no recovery from this")
total_ram = i64(sys_info.totalram) * i64(sys_info.mem_unit)
free_ram = i64(sys_info.freeram) * i64(sys_info.mem_unit)
total_swap = i64(sys_info.totalswap) * i64(sys_info.mem_unit)
free_swap = i64(sys_info.freeswap) * i64(sys_info.mem_unit)
ok = true
return
}
meminfo := string(meminfo_buf[:n])