diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2025-03-04 07:51:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-04 07:51:33 +0000 |
| commit | 69b6c59ea6ef4af755d77865f0e451c0a8601d2f (patch) | |
| tree | 50025b8afe84c7cfeaaaaeba6ed18378a43d79ec | |
| parent | 8214892b5be5f9e23c8d7cf3f10823a6189dfce6 (diff) | |
| parent | 2d0dc44636c3f20bb1c41433a5d9cbd52098792b (diff) | |
Merge pull request #4905 from Feoramund/os2-fix-random-string
Use `context.random_generator` for `os2.random_string`
| -rw-r--r-- | core/os/os2/internal_util.odin | 47 | ||||
| -rw-r--r-- | core/os/os2/temp_file.odin | 4 |
2 files changed, 11 insertions, 40 deletions
diff --git a/core/os/os2/internal_util.odin b/core/os/os2/internal_util.odin index 164e1e1be..ce253d17b 100644 --- a/core/os/os2/internal_util.odin +++ b/core/os/os2/internal_util.odin @@ -3,6 +3,7 @@ package os2 import "base:intrinsics" import "base:runtime" +import "core:math/rand" // Splits pattern by the last wildcard "*", if it exists, and returns the prefix and suffix @@ -84,45 +85,15 @@ concatenate :: proc(strings: []string, allocator: runtime.Allocator) -> (res: st return string(buf), nil } - - -@(private="file") -random_string_seed: [2]u64 - -@(init, private="file") -init_random_string_seed :: proc() { - seed := u64(intrinsics.read_cycle_counter()) - s := &random_string_seed - s[0] = 0 - s[1] = (seed << 1) | 1 - _ = next_random(s) - s[1] += seed - _ = next_random(s) -} - -@(require_results) -next_random :: proc(r: ^[2]u64) -> u64 { - old_state := r[0] - r[0] = old_state * 6364136223846793005 + (r[1]|1) - xor_shifted := (((old_state >> 59) + 5) ~ old_state) * 12605985483714917081 - rot := (old_state >> 59) - return (xor_shifted >> rot) | (xor_shifted << ((-rot) & 63)) -} - @(require_results) random_string :: proc(buf: []byte) -> string { - @(static, rodata) digits := "0123456789" - - u := next_random(&random_string_seed) - - b :: 10 - i := len(buf) - for u >= b { - i -= 1 - buf[i] = digits[u % b] - u /= b + for i := 0; i < len(buf); i += 16 { + n := rand.uint64() + end := min(i + 16, len(buf)) + for j := i; j < end; j += 1 { + buf[j] = '0' + u8(n) % 10 + n >>= 4 + } } - i -= 1 - buf[i] = digits[u % b] - return string(buf[i:]) + return string(buf) } diff --git a/core/os/os2/temp_file.odin b/core/os/os2/temp_file.odin index 5ca4e1453..e93117f02 100644 --- a/core/os/os2/temp_file.odin +++ b/core/os/os2/temp_file.odin @@ -20,7 +20,7 @@ create_temp_file :: proc(dir, pattern: string) -> (f: ^File, err: Error) { prefix, suffix := _prefix_and_suffix(pattern) or_return prefix = temp_join_path(dir, prefix) or_return - rand_buf: [32]byte + rand_buf: [10]byte name_buf := make([]byte, len(prefix)+len(rand_buf)+len(suffix), temp_allocator()) attempts := 0 @@ -52,7 +52,7 @@ make_directory_temp :: proc(dir, pattern: string, allocator: runtime.Allocator) prefix, suffix := _prefix_and_suffix(pattern) or_return prefix = temp_join_path(dir, prefix) or_return - rand_buf: [32]byte + rand_buf: [10]byte name_buf := make([]byte, len(prefix)+len(rand_buf)+len(suffix), temp_allocator()) attempts := 0 |