From a14bacbb5074c688418ba94a469380b39c21e00a Mon Sep 17 00:00:00 2001
From: Ronald1985 <ronald1985@protonmail.com>
Date: Thu, 29 Jun 2023 22:03:58 +0100
Subject: [PATCH] Fixed get_cpu_usage_perc(), continued working on storage
 functions

get_mountpoint_total_gb is still a working in progress, function causes
segmentation fault, still working out why
---
 foreign.odin |  5 +++++
 sysinfo.odin | 48 ++++++++++++++++++++++++++++++++++--------------
 types.odin   | 20 ++++++++++++++++----
 3 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100644 foreign.odin

diff --git a/foreign.odin b/foreign.odin
new file mode 100644
index 0000000..3f0d515
--- /dev/null
+++ b/foreign.odin
@@ -0,0 +1,5 @@
+package sysinfo
+
+foreign {
+	statvfs :: proc(path: cstring, stat: ^Sys_statvfs) ---
+}
diff --git a/sysinfo.odin b/sysinfo.odin
index 610a052..f581e2d 100644
--- a/sysinfo.odin
+++ b/sysinfo.odin
@@ -201,35 +201,55 @@ get_numb_cpu_cores :: proc() -> (int, bool) {
 }
 
 get_cpu_usage_perc :: proc() -> (f64, bool) {
+	a, b: [10]f64
+	i := 0
+	fields: []string
+
 	data, ok := read_entire_file_from_filename("/proc/stat")
 	if !ok {
 		fmt.fprintln(os.stderr, "Issue whilst passing /proc/stat")
 		return 0, false
 	}
 
-	a, b: [4]f64
-	i: int = 0
-	fields: []string
 	data_str := string(data)
 
-	for line in strings.split_lines_iterator(&data_str) {
-		fields = strings.fields(line)
-		if i < 4 {
-			a[i] = strconv.atof(fields[i])
-		} else if i >= 4 {
-			b[i-4] = strconv.atof(fields[i-4])
+	fields = strings.fields(data_str[:strings.index(data_str, "\n")])
+	for field in fields {
+		if !strings.contains(field, "cpu") {
+			a[i] = strconv.atof(field)
+			i += 1
 		}
-		i+=1
 	}
 
-	fmt.println("a: ", a)
-	fmt.println("b: ", b)
+	time.sleep(time.Second * 1)
+
+	i = 0
+	data, ok = read_entire_file_from_filename("/proc/stat")
+	if !ok {
+		fmt.fprintln(os.stderr, "Issue whilst passing /proc/stat")
+		return 0, false
+	}
+	data_str = string(data)
+
+	fields = strings.fields(data_str[:strings.index(data_str, "\n")])
+	for field in fields {
+		if !strings.contains(field, "cpu") {
+			b[i] = strconv.atof(field)
+			i += 1
+		}
+	}
 
 	return (100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]))), true
 }
 
-get_mountpoint_total_gb(mountpoint: string) -> (total: f64, ok: bool) {
+get_mountpoint_total_gb :: proc(mountpoint: string) {
+	mountpoint_statvfs: Sys_statvfs
 
+	mountpoint_cstr := strings.clone_to_cstring(mountpoint)
 
-	return
+	statvfs(mountpoint_cstr, &mountpoint_statvfs)
+
+	total := (f64(mountpoint_statvfs.f_blocks) * f64(mountpoint_statvfs.f_bsize)) / 1073741824
+
+	fmt.println(total)
 }
diff --git a/types.odin b/types.odin
index 9f559f8..f15ddb6 100644
--- a/types.odin
+++ b/types.odin
@@ -1,7 +1,19 @@
 package sysinfo
 
-statfs :: struct {
-	f_type:		uint,
-	f_bsize:	uint,
-	f_blocks:	uint
+import c "core:c/libc"
+
+Sys_statvfs :: struct {
+	f_bsize:    c.ulong,
+	f_frsize:   c.ulong,
+	f_blocks:   c.ulong,
+	f_bfree:    c.ulong,
+	f_bavail:   c.ulong,
+
+	f_files:    c.ulong,
+	f_ffree:    c.ulong,
+	f_favail:   c.ulong,
+
+	f_fsid:     c.ulong,
+	f_flag:     c.ulong,
+	f_namemax:  c.ulong,
 }