Browse Source

[sys/info] Better sysctl wrapper

Jeroen van Rijn 3 years ago
parent
commit
9e47c72b98
1 changed files with 14 additions and 14 deletions
  1. 14 14
      core/sys/info/platform_darwin.odin

+ 14 - 14
core/sys/info/platform_darwin.odin

@@ -3,11 +3,10 @@ package sysinfo
 
 import sys "core:sys/darwin"
 import "core:intrinsics"
-import "core:fmt"
 
 @(init, private)
 init_os_version :: proc "c" () {
-	os_version = {}
+	os_version.platform = .MacOS
 }
 
 @(init)
@@ -17,21 +16,22 @@ init_ram :: proc() {
 	CTL_HW     :: 6
 	HW_MEMSIZE :: 24
 
-	sysctls := []i32{CTL_HW, HW_MEMSIZE}
+	mib := []i32{CTL_HW, HW_MEMSIZE}
+	mem_size: i64
+	ok := sysctl(mib, &mem_size)
+	ram.total_ram = int(mem_size)
+}
 
-	result: i64
-	result_size := i64(size_of(result))
+@(private)
+sysctl :: proc(mib: []i32, val: ^$T) -> (ok: bool) {
+	mib := mib
+	result_size := i64(size_of(T))
 
 	res := intrinsics.syscall(
 		sys.unix_offset_syscall(.sysctl),
-		uintptr(&sysctls[0]), uintptr(2),
-		uintptr(&result), uintptr(&result_size),
+		uintptr(raw_data(mib)), uintptr(len(mib)),
+		uintptr(val), uintptr(&result_size),
 		uintptr(0), uintptr(0),
 	)
-	fmt.println(res, result)
-	
-	ram.total_ram = int(result)
-}
-
-@(private)
-sysctl :: proc(leaf: int)
+	return res == 0
+}