aboutsummaryrefslogtreecommitdiff
path: root/core/sys
diff options
context:
space:
mode:
authorgingerBill <gingerBill@users.noreply.github.com>2025-08-10 12:47:15 +0100
committerGitHub <noreply@github.com>2025-08-10 12:47:15 +0100
commita0ff05e63307f533b384820717bb582e1ff47c39 (patch)
treed9adfd28090dc72044003fed211383a63bdb3587 /core/sys
parentdbc338248e8693994f232d02f1aff9536f204add (diff)
parent14ca1c8c89dd219dd52d061649d4db7778df2e64 (diff)
Merge pull request #5558 from odin-lang/bill/init-fini-changes
`@(init)` & `@(finit)` Changes.
Diffstat (limited to 'core/sys')
-rw-r--r--core/sys/info/cpu_intel.odin4
-rw-r--r--core/sys/info/cpu_linux_arm.odin4
-rw-r--r--core/sys/info/cpu_linux_intel.odin5
-rw-r--r--core/sys/info/cpu_linux_riscv64.odin10
-rw-r--r--core/sys/info/cpu_windows.odin5
-rw-r--r--core/sys/info/platform_bsd.odin6
-rw-r--r--core/sys/info/platform_darwin.odin5
-rw-r--r--core/sys/info/platform_freebsd.odin6
-rw-r--r--core/sys/info/platform_linux.odin9
-rw-r--r--core/sys/info/platform_windows.odin12
-rw-r--r--core/sys/posix/stdlib_libc.odin2
-rw-r--r--core/sys/unix/sysctl_freebsd.odin2
-rw-r--r--core/sys/unix/sysctl_netbsd.odin2
-rw-r--r--core/sys/unix/sysctl_openbsd.odin2
-rw-r--r--core/sys/windows/util.odin4
15 files changed, 50 insertions, 28 deletions
diff --git a/core/sys/info/cpu_intel.odin b/core/sys/info/cpu_intel.odin
index 7c5b38ca4..e8f07c732 100644
--- a/core/sys/info/cpu_intel.odin
+++ b/core/sys/info/cpu_intel.odin
@@ -52,7 +52,7 @@ CPU :: struct {
cpu: CPU
@(init, private)
-init_cpu_features :: proc "c" () {
+init_cpu_features :: proc "contextless" () {
is_set :: #force_inline proc "c" (bit: u32, value: u32) -> bool {
return (value>>bit) & 0x1 != 0
}
@@ -156,7 +156,7 @@ init_cpu_features :: proc "c" () {
_cpu_name_buf: [72]u8
@(init, private)
-init_cpu_name :: proc "c" () {
+init_cpu_name :: proc "contextless" () {
number_of_extended_ids, _, _, _ := cpuid(0x8000_0000, 0)
if number_of_extended_ids < 0x8000_0004 {
return
diff --git a/core/sys/info/cpu_linux_arm.odin b/core/sys/info/cpu_linux_arm.odin
index cde76a83d..6e8b1a634 100644
--- a/core/sys/info/cpu_linux_arm.odin
+++ b/core/sys/info/cpu_linux_arm.odin
@@ -2,11 +2,13 @@
#+build linux
package sysinfo
+import "base:runtime"
import "core:sys/linux"
import "core:strings"
@(init, private)
-init_cpu_features :: proc() {
+init_cpu_features :: proc "contextless" () {
+ context = runtime.default_context()
fd, err := linux.open("/proc/cpuinfo", {})
if err != .NONE { return }
defer linux.close(fd)
diff --git a/core/sys/info/cpu_linux_intel.odin b/core/sys/info/cpu_linux_intel.odin
index e43737475..af76a75e4 100644
--- a/core/sys/info/cpu_linux_intel.odin
+++ b/core/sys/info/cpu_linux_intel.odin
@@ -2,12 +2,15 @@
#+build linux
package sysinfo
+import "base:runtime"
import "core:sys/linux"
import "core:strings"
import "core:strconv"
@(init, private)
-init_cpu_core_count :: proc() {
+init_cpu_core_count :: proc "contextless" () {
+ context = runtime.default_context()
+
fd, err := linux.open("/proc/cpuinfo", {})
if err != .NONE { return }
defer linux.close(fd)
diff --git a/core/sys/info/cpu_linux_riscv64.odin b/core/sys/info/cpu_linux_riscv64.odin
index 3d36d126d..e65e8a3d2 100644
--- a/core/sys/info/cpu_linux_riscv64.odin
+++ b/core/sys/info/cpu_linux_riscv64.odin
@@ -7,7 +7,7 @@ import "base:intrinsics"
import "core:sys/linux"
@(init, private)
-init_cpu_features :: proc() {
+init_cpu_features :: proc "contextless" () {
_features: CPU_Features
defer cpu.features = _features
@@ -81,11 +81,11 @@ init_cpu_features :: proc() {
}
err := linux.riscv_hwprobe(raw_data(pairs), len(pairs), 0, nil, {})
if err != nil {
- assert(err == .ENOSYS, "unexpected error from riscv_hwprobe()")
+ assert_contextless(err == .ENOSYS, "unexpected error from riscv_hwprobe()")
return
}
- assert(pairs[0].key == .IMA_EXT_0)
+ assert_contextless(pairs[0].key == .IMA_EXT_0)
exts := pairs[0].value.ima_ext_0
exts -= { .FD, .C, .V }
_features += transmute(CPU_Features)exts
@@ -97,7 +97,7 @@ init_cpu_features :: proc() {
_features += { .Misaligned_Supported }
}
} else {
- assert(pairs[1].key == .CPUPERF_0)
+ assert_contextless(pairs[1].key == .CPUPERF_0)
if .FAST in pairs[1].value.cpu_perf_0 {
_features += { .Misaligned_Supported, .Misaligned_Fast }
} else if .UNSUPPORTED not_in pairs[1].value.cpu_perf_0 {
@@ -108,6 +108,6 @@ init_cpu_features :: proc() {
}
@(init, private)
-init_cpu_name :: proc() {
+init_cpu_name :: proc "contextless" () {
cpu.name = "RISCV64"
}
diff --git a/core/sys/info/cpu_windows.odin b/core/sys/info/cpu_windows.odin
index 7dd2d2a8c..72d79f9a7 100644
--- a/core/sys/info/cpu_windows.odin
+++ b/core/sys/info/cpu_windows.odin
@@ -2,9 +2,12 @@ package sysinfo
import sys "core:sys/windows"
import "base:intrinsics"
+import "base:runtime"
@(init, private)
-init_cpu_core_count :: proc() {
+init_cpu_core_count :: proc "contextless" () {
+ context = runtime.default_context()
+
infos: []sys.SYSTEM_LOGICAL_PROCESSOR_INFORMATION
defer delete(infos)
diff --git a/core/sys/info/platform_bsd.odin b/core/sys/info/platform_bsd.odin
index 6bb32cd3d..2f8d7f5bb 100644
--- a/core/sys/info/platform_bsd.odin
+++ b/core/sys/info/platform_bsd.odin
@@ -10,7 +10,9 @@ import "base:runtime"
version_string_buf: [1024]u8
@(init, private)
-init_os_version :: proc () {
+init_os_version :: proc "contextless" () {
+ context = runtime.default_context()
+
when ODIN_OS == .NetBSD {
os_version.platform = .NetBSD
} else {
@@ -66,7 +68,7 @@ init_os_version :: proc () {
}
@(init, private)
-init_ram :: proc() {
+init_ram :: proc "contextless" () {
// Retrieve RAM info using `sysctl`
mib := []i32{sys.CTL_HW, sys.HW_PHYSMEM64}
mem_size: u64
diff --git a/core/sys/info/platform_darwin.odin b/core/sys/info/platform_darwin.odin
index 3fc8064ec..07c26ec28 100644
--- a/core/sys/info/platform_darwin.odin
+++ b/core/sys/info/platform_darwin.odin
@@ -1,5 +1,7 @@
package sysinfo
+import "base:runtime"
+
import "core:strconv"
import "core:strings"
import "core:sys/unix"
@@ -9,7 +11,8 @@ import NS "core:sys/darwin/Foundation"
version_string_buf: [1024]u8
@(init, private)
-init_platform :: proc() {
+init_platform :: proc "contextless" () {
+ context = runtime.default_context()
ws :: strings.write_string
wi :: strings.write_int
diff --git a/core/sys/info/platform_freebsd.odin b/core/sys/info/platform_freebsd.odin
index b26fb7875..eb39769de 100644
--- a/core/sys/info/platform_freebsd.odin
+++ b/core/sys/info/platform_freebsd.odin
@@ -9,7 +9,9 @@ import "base:runtime"
version_string_buf: [1024]u8
@(init, private)
-init_os_version :: proc () {
+init_os_version :: proc "contextless" () {
+ context = runtime.default_context()
+
os_version.platform = .FreeBSD
kernel_version_buf: [1024]u8
@@ -68,7 +70,7 @@ init_os_version :: proc () {
}
@(init, private)
-init_ram :: proc() {
+init_ram :: proc "contextless" () {
// Retrieve RAM info using `sysctl`
mib := []i32{sys.CTL_HW, sys.HW_PHYSMEM}
mem_size: u64
diff --git a/core/sys/info/platform_linux.odin b/core/sys/info/platform_linux.odin
index 9c342e567..43cd580c1 100644
--- a/core/sys/info/platform_linux.odin
+++ b/core/sys/info/platform_linux.odin
@@ -1,6 +1,7 @@
package sysinfo
import "base:intrinsics"
+import "base:runtime"
import "core:strconv"
import "core:strings"
@@ -10,7 +11,9 @@ import "core:sys/linux"
version_string_buf: [1024]u8
@(init, private)
-init_os_version :: proc () {
+init_os_version :: proc "contextless" () {
+ context = runtime.default_context()
+
os_version.platform = .Linux
b := strings.builder_from_bytes(version_string_buf[:])
@@ -91,11 +94,11 @@ init_os_version :: proc () {
}
@(init, private)
-init_ram :: proc() {
+init_ram :: proc "contextless" () {
// Retrieve RAM info using `sysinfo`
sys_info: linux.Sys_Info
errno := linux.sysinfo(&sys_info)
- assert(errno == .NONE, "Good luck to whoever's debugging this, something's seriously cucked up!")
+ assert_contextless(errno == .NONE, "Good luck to whoever's debugging this, something's seriously cucked up!")
ram = RAM{
total_ram = int(sys_info.totalram) * int(sys_info.mem_unit),
free_ram = int(sys_info.freeram) * int(sys_info.mem_unit),
diff --git a/core/sys/info/platform_windows.odin b/core/sys/info/platform_windows.odin
index dd1441d30..ff8ebe2ee 100644
--- a/core/sys/info/platform_windows.odin
+++ b/core/sys/info/platform_windows.odin
@@ -12,7 +12,9 @@ import "base:runtime"
version_string_buf: [1024]u8
@(init, private)
-init_os_version :: proc () {
+init_os_version :: proc "contextless" () {
+ context = runtime.default_context()
+
/*
NOTE(Jeroen):
`GetVersionEx` will return 6.2 for Windows 10 unless the program is manifested for Windows 10.
@@ -43,6 +45,7 @@ init_os_version :: proc () {
os_version.minor = int(osvi.dwMinorVersion)
os_version.build[0] = int(osvi.dwBuildNumber)
+
b := strings.builder_from_bytes(version_string_buf[:])
strings.write_string(&b, "Windows ")
@@ -259,7 +262,7 @@ init_os_version :: proc () {
}
@(init, private)
-init_ram :: proc() {
+init_ram :: proc "contextless" () {
state: sys.MEMORYSTATUSEX
state.dwLength = size_of(state)
@@ -276,10 +279,11 @@ init_ram :: proc() {
}
@(init, private)
-init_gpu_info :: proc() {
-
+init_gpu_info :: proc "contextless" () {
GPU_INFO_BASE :: "SYSTEM\\ControlSet001\\Control\\Class\\{4d36e968-e325-11ce-bfc1-08002be10318}\\"
+ context = runtime.default_context()
+
gpu_list: [dynamic]GPU
gpu_index: int
diff --git a/core/sys/posix/stdlib_libc.odin b/core/sys/posix/stdlib_libc.odin
index e31c51704..966dc1d32 100644
--- a/core/sys/posix/stdlib_libc.odin
+++ b/core/sys/posix/stdlib_libc.odin
@@ -60,7 +60,7 @@ wctomb :: libc.wctomb
mbstowcs :: libc.mbstowcs
wcstombs :: libc.wcstombs
-free :: #force_inline proc(ptr: $T) where intrinsics.type_is_pointer(T) || intrinsics.type_is_multi_pointer(T) || T == cstring {
+free :: #force_inline proc "c" (ptr: $T) where intrinsics.type_is_pointer(T) || intrinsics.type_is_multi_pointer(T) || T == cstring {
libc.free(rawptr(ptr))
}
diff --git a/core/sys/unix/sysctl_freebsd.odin b/core/sys/unix/sysctl_freebsd.odin
index f5fee6c6c..cdd591a5b 100644
--- a/core/sys/unix/sysctl_freebsd.odin
+++ b/core/sys/unix/sysctl_freebsd.odin
@@ -3,7 +3,7 @@ package unix
import "base:intrinsics"
-sysctl :: proc(mib: []i32, val: ^$T) -> (ok: bool) {
+sysctl :: proc "contextless" (mib: []i32, val: ^$T) -> (ok: bool) {
mib := mib
result_size := u64(size_of(T))
diff --git a/core/sys/unix/sysctl_netbsd.odin b/core/sys/unix/sysctl_netbsd.odin
index ad89b9ad4..b70740721 100644
--- a/core/sys/unix/sysctl_netbsd.odin
+++ b/core/sys/unix/sysctl_netbsd.odin
@@ -8,7 +8,7 @@ foreign libc {
@(link_name="sysctl") _unix_sysctl :: proc(name: [^]i32, namelen: u32, oldp: rawptr, oldlenp: ^c.size_t, newp: rawptr, newlen: c.size_t) -> i32 ---
}
-sysctl :: proc(mib: []i32, val: ^$T) -> (ok: bool) {
+sysctl :: proc "contextless" (mib: []i32, val: ^$T) -> (ok: bool) {
mib := mib
result_size := c.size_t(size_of(T))
res := _unix_sysctl(raw_data(mib), u32(len(mib)), val, &result_size, nil, 0)
diff --git a/core/sys/unix/sysctl_openbsd.odin b/core/sys/unix/sysctl_openbsd.odin
index 49c9b6336..e71b743f8 100644
--- a/core/sys/unix/sysctl_openbsd.odin
+++ b/core/sys/unix/sysctl_openbsd.odin
@@ -9,7 +9,7 @@ foreign libc {
@(link_name="sysctl") _unix_sysctl :: proc(name: [^]i32, namelen: u32, oldp: rawptr, oldlenp: ^c.size_t, newp: rawptr, newlen: c.size_t) -> i32 ---
}
-sysctl :: proc(mib: []i32, val: ^$T) -> (ok: bool) {
+sysctl :: proc "contextless" (mib: []i32, val: ^$T) -> (ok: bool) {
mib := mib
result_size := c.size_t(size_of(T))
res := _unix_sysctl(raw_data(mib), u32(len(mib)), val, &result_size, nil, 0)
diff --git a/core/sys/windows/util.odin b/core/sys/windows/util.odin
index 10dc907e7..125038ac4 100644
--- a/core/sys/windows/util.odin
+++ b/core/sys/windows/util.odin
@@ -628,7 +628,7 @@ run_as_user :: proc(username, password, application, commandline: string, pi: ^P
}
}
-ensure_winsock_initialized :: proc() {
+ensure_winsock_initialized :: proc "contextless" () {
@static gate := false
@static initted := false
@@ -644,7 +644,7 @@ ensure_winsock_initialized :: proc() {
unused_info: WSADATA
version_requested := WORD(2) << 8 | 2
res := WSAStartup(version_requested, &unused_info)
- assert(res == 0, "unable to initialized Winsock2")
+ assert_contextless(res == 0, "unable to initialized Winsock2")
initted = true
}