aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2024-06-29 19:16:32 +0100
committergingerBill <bill@gingerbill.org>2024-06-29 19:16:32 +0100
commit663661db53719b1a7797a3772f5a227405c5ca98 (patch)
tree71c57e33b5c99b2ced55c8d20ac5c4c21e975906
parent835e8bf87a700c695b30d1efaa224e2207cb61f4 (diff)
Update `core` to `-strict-style`
-rw-r--r--core/container/bit_array/bit_array.odin7
-rw-r--r--core/sys/linux/sys.odin17
-rw-r--r--core/sys/linux/wrappers.odin3
-rw-r--r--core/testing/runner.odin11
4 files changed, 17 insertions, 21 deletions
diff --git a/core/container/bit_array/bit_array.odin b/core/container/bit_array/bit_array.odin
index 398cede50..b53bacda7 100644
--- a/core/container/bit_array/bit_array.odin
+++ b/core/container/bit_array/bit_array.odin
@@ -210,8 +210,11 @@ set :: proc(ba: ^Bit_Array, #any_int index: uint, set_to: bool = true, allocator
ba.max_index = max(idx, ba.max_index)
- if set_to{ ba.bits[leg_index] |= 1 << uint(bit_index) }
- else { ba.bits[leg_index] &~= 1 << uint(bit_index) }
+ if set_to {
+ ba.bits[leg_index] |= 1 << uint(bit_index)
+ } else {
+ ba.bits[leg_index] &~= 1 << uint(bit_index)
+ }
return true
}
diff --git a/core/sys/linux/sys.odin b/core/sys/linux/sys.odin
index ed40719bf..450af9ca9 100644
--- a/core/sys/linux/sys.odin
+++ b/core/sys/linux/sys.odin
@@ -2241,8 +2241,7 @@ futex_wake :: proc "contextless" (futex: ^Futex, op: Futex_Wake_Type, flags: Fut
Returns the total number of waiters that have been woken up plus the number of waiters requeued.
*/
futex_cmp_requeue :: proc "contextless" (futex: ^Futex, op: Futex_Cmp_Requeue_Type, flags: Futex_Flags, requeue_threshold: u32,
- requeue_max: i32, requeue_futex: ^Futex, val: i32) -> (int, Errno)
-{
+ requeue_max: i32, requeue_futex: ^Futex, val: i32) -> (int, Errno) {
futex_flags := cast(u32) op + transmute(u32) flags
ret := syscall(SYS_futex, futex, futex_flags, requeue_threshold, requeue_max, requeue_futex, val)
return errno_unwrap(ret, int)
@@ -2253,8 +2252,7 @@ futex_cmp_requeue :: proc "contextless" (futex: ^Futex, op: Futex_Cmp_Requeue_Ty
Returns the total number of waiters that have been woken up.
*/
futex_requeue :: proc "contextless" (futex: ^Futex, op: Futex_Requeue_Type, flags: Futex_Flags, requeue_threshold: u32,
- requeue_max: i32, requeue_futex: ^Futex) -> (int, Errno)
-{
+ requeue_max: i32, requeue_futex: ^Futex) -> (int, Errno) {
futex_flags := cast(u32) op + transmute(u32) flags
ret := syscall(SYS_futex, futex, futex_flags, requeue_threshold, requeue_max, requeue_futex)
return errno_unwrap(ret, int)
@@ -2265,8 +2263,7 @@ futex_requeue :: proc "contextless" (futex: ^Futex, op: Futex_Requeue_Type, flag
purpose is to allow implementing conditional values sync primitive, it seems like.
*/
futex_wake_op :: proc "contextless" (futex: ^Futex, op: Futex_Wake_Op_Type, flags: Futex_Flags, wakeup: i32,
- dst_wakeup, dst: ^Futex, futex_op: u32) -> (int, Errno)
-{
+ dst_wakeup, dst: ^Futex, futex_op: u32) -> (int, Errno) {
futex_flags := cast(u32) op + transmute(u32) flags
ret := syscall(SYS_futex, futex, futex_flags, wakeup, dst_wakeup, dst, futex_op)
return errno_unwrap(ret, int)
@@ -2276,8 +2273,7 @@ futex_wake_op :: proc "contextless" (futex: ^Futex, op: Futex_Wake_Op_Type, flag
Same as wait, but mask specifies bits that must be equal for the mutex to wake up.
*/
futex_wait_bitset :: proc "contextless" (futex: ^Futex, op: Futex_Wait_Bitset_Type, flags: Futex_Flags, val: u32,
- timeout: ^Time_Spec, mask: u32) -> (int, Errno)
-{
+ timeout: ^Time_Spec, mask: u32) -> (int, Errno) {
futex_flags := cast(u32) op + transmute(u32) flags
ret := syscall(SYS_futex, futex, futex_flags, val, timeout, 0, mask)
return errno_unwrap(ret, int)
@@ -2286,8 +2282,7 @@ futex_wait_bitset :: proc "contextless" (futex: ^Futex, op: Futex_Wait_Bitset_Ty
/*
Wake up on bitset.
*/
-futex_wake_bitset :: proc "contextless" (futex: ^Futex, op: Futex_Wake_Bitset_Type, flags: Futex_Flags, n_wakeup: u32, mask: u32) -> (int, Errno)
-{
+futex_wake_bitset :: proc "contextless" (futex: ^Futex, op: Futex_Wake_Bitset_Type, flags: Futex_Flags, n_wakeup: u32, mask: u32) -> (int, Errno) {
futex_flags := cast(u32) op + transmute(u32) flags
ret := syscall(SYS_futex, futex, futex_flags, n_wakeup, 0, 0, mask)
return errno_unwrap(ret, int)
@@ -2295,7 +2290,7 @@ futex_wake_bitset :: proc "contextless" (futex: ^Futex, op: Futex_Wake_Bitset_Ty
// TODO(flysand): Priority inheritance (PI) futicees
-futex :: proc {
+futex :: proc{
futex_wait,
futex_wake,
futex_cmp_requeue,
diff --git a/core/sys/linux/wrappers.odin b/core/sys/linux/wrappers.odin
index 95c818b9d..998a9244c 100644
--- a/core/sys/linux/wrappers.odin
+++ b/core/sys/linux/wrappers.odin
@@ -115,7 +115,6 @@ futex_op :: proc "contextless" (arg_op: Futex_Arg_Op, cmp_op: Futex_Cmp_Op, op_a
/// Helper function for constructing the config for caches
perf_cache_config :: #force_inline proc "contextless" (id: Perf_Hardware_Cache_Id,
op: Perf_Hardware_Cache_Op_Id,
- res: Perf_Hardware_Cache_Result_Id) -> u64
-{
+ res: Perf_Hardware_Cache_Result_Id) -> u64 {
return u64(id) | (u64(op) << 8) | (u64(res) << 16)
} \ No newline at end of file
diff --git a/core/testing/runner.odin b/core/testing/runner.odin
index fffbb648c..fa7c2ffd2 100644
--- a/core/testing/runner.odin
+++ b/core/testing/runner.odin
@@ -51,12 +51,11 @@ get_log_level :: #force_inline proc() -> runtime.Logger_Level {
// Always use .Debug in `-debug` mode.
return .Debug
} else {
- when LOG_LEVEL == "debug" { return .Debug }
- else when LOG_LEVEL == "info" { return .Info }
- else when LOG_LEVEL == "warning" { return .Warning }
- else when LOG_LEVEL == "error" { return .Error }
- else when LOG_LEVEL == "fatal" { return .Fatal }
- else {
+ when LOG_LEVEL == "debug" { return .Debug } else
+ when LOG_LEVEL == "info" { return .Info } else
+ when LOG_LEVEL == "warning" { return .Warning } else
+ when LOG_LEVEL == "error" { return .Error } else
+ when LOG_LEVEL == "fatal" { return .Fatal } else {
#panic("Unknown `ODIN_TEST_LOG_LEVEL`: \"" + LOG_LEVEL + "\", possible levels are: \"debug\", \"info\", \"warning\", \"error\", or \"fatal\".")
}
}