From 4ebbdf88bbc20737e7d7d8e0f9e4b303bcf8db73 Mon Sep 17 00:00:00 2001 From: Ronald1985 Date: Wed, 15 Jun 2022 08:11:05 +0100 Subject: [PATCH] Updated indentation and styling so that it's consistant --- odin-sysinfo.odin | 121 +++++++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/odin-sysinfo.odin b/odin-sysinfo.odin index 8622b7d..e1a9446 100644 --- a/odin-sysinfo.odin +++ b/odin-sysinfo.odin @@ -10,88 +10,89 @@ import "core:time" import "core:unicode" read_entire_file_from_filename :: proc(name: string, allocator := context.allocator) -> ([]byte, bool) { - context.allocator = allocator + context.allocator = allocator - fd, err := os.open(name, os.O_RDONLY, 0) - if err != 0 { - return nil, false - } - defer os.close(fd) + fd, err := os.open(name, os.O_RDONLY, 0) + if err != 0 { + return nil, false + } + defer os.close(fd) - return read_entire_file_from_handle(fd, allocator) + return read_entire_file_from_handle(fd, allocator) } read_entire_file_from_handle :: proc(fd: os.Handle, allocator := context.allocator) -> ([]byte, bool) { - context.allocator = allocator + context.allocator = allocator - length: i64 - err: os.Errno + length: i64 + err: os.Errno - if length, err = os.file_size(fd); err != 0 { - return nil, false - } + if length, err = os.file_size(fd); err != 0 { + return nil, false + } - BLOCK_SIZE :: 4096 + BLOCK_SIZE :: 4096 - length = max(length, BLOCK_SIZE) + length = max(length, BLOCK_SIZE) - _data: [dynamic]byte - read_err: os.Errno - bytes_read, bytes_total: int + _data: [dynamic]byte + read_err: os.Errno + bytes_read, bytes_total: int - resize(&_data, int(length)) + resize(&_data, int(length)) - for { - bytes_read, read_err = os.read(fd, _data[bytes_total:]) - if bytes_read == 0 { + for { + bytes_read, read_err = os.read(fd, _data[bytes_total:]) + if bytes_read == 0 { break } - bytes_total += bytes_read - resize(&_data, bytes_total + BLOCK_SIZE) - } - return _data[:bytes_total], true + bytes_total += bytes_read + resize(&_data, bytes_total + BLOCK_SIZE) + } + return _data[:bytes_total], true } get_key :: proc(s: string) -> (string, bool) { - if len(s) > 1 && s[len(s) - 1] == ':' { - // Yes, this ends in a colon and is a key - return s[:len(s) - 1], true - } - return s, false + if len(s) > 1 && s[len(s) - 1] == ':' { + // Yes, this ends in a colon and is a key + return s[:len(s) - 1], true + } + return s, false } +// TODO: Maybe look at re-writing this? parse_meminfo :: proc(meminfo: string) -> (map[string]f64, bool) { - s := strings.fields(meminfo) + s := strings.fields(meminfo) orig := s defer delete(orig) - values: map[string]f64 - - last_key := "" - - for len(s) > 0 { - key, key_ok := get_key(s[0]) - if !key_ok { - // Must've been a suffix, so let's multiply the last value - switch key { - case "kB": - values[last_key] *= 1024 - - } - s = s[1:] - continue - } - s = s[1:] // Advance - - if val, val_ok := strconv.parse_f64(s[0]); !val_ok { - break - } else { - values[key] = val - s = s[1:] - } - last_key = key - } + values: map[string]f64 + + last_key := "" + + for len(s) > 0 { + key, key_ok := get_key(s[0]) + if !key_ok { + // Must've been a suffix, so let's multiply the last value + switch key { + case "kB": + values[last_key] *= 1024 + + } + s = s[1:] + continue + } + s = s[1:] // Advance + + if val, val_ok := strconv.parse_f64(s[0]); !val_ok { + break + } else { + values[key] = val + s = s[1:] + } + last_key = key + } return values, true } @@ -129,7 +130,7 @@ parse_cpuinfo :: proc(cpuinfo: string) -> (map[string]string, bool) { for line in strings.split_lines_iterator(&cpuinfo_string) { key, _, value = strings.partition(line, ":") - values[strings.trim_space(key)] = strings.trim_space(value) + values[strings.trim_space(key)] = strings.trim_space(value) } return values, true @@ -166,7 +167,7 @@ main :: proc() { fmt.println("CPU Name: ", cpu_name) } - for { + for i := 1; i < 10; i += 1 { if mem_usage_perc, ok = get_ram_usage_perc(); !ok { fmt.fprintln(os.stderr, "Failed to read memory usage") }