ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-03 14:18:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2583 from JamesDSource/master

Browse Source 
Correct Timeval struct to use microseconds on darwin and linux (Issue #2489)
This commit is contained in:
Jeroen van Rijn
2023-06-08 09:39:25 +02:00
committed by GitHub
parent 21c1618d94 fed0c2ea26
commit eac53fed59
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/net/socket_darwin.odin
+4 -4
View File
@@ -268,9 +268,9 @@ _set_option :: proc(s: Any_Socket, option: Socket_Option, value: any, loc := #ca
t, ok := value.(time.Duration) t, ok := value.(time.Duration)
if !ok do panic("set_option() value must be a time.Duration here", loc) if !ok do panic("set_option() value must be a time.Duration here", loc)
nanos := time.duration_nanoseconds(t) micros := i64(time.duration_microseconds(t))
timeval_value.nanoseconds = int(nanos % 1e9) timeval_value.microseconds = int(micros % 1e6)
timeval_value.seconds = (nanos - i64(timeval_value.nanoseconds)) / 1e9 timeval_value.seconds = (micros - i64(timeval_value.microseconds)) / 1e6
ptr = &timeval_value ptr = &timeval_value
len = size_of(timeval_value) len = size_of(timeval_value)
@@ -368,4 +368,4 @@ _sockaddr_to_endpoint :: proc(native_addr: ^os.SOCKADDR_STORAGE_LH) -> (ep: Endp
panic("native_addr is neither IP4 or IP6 address") panic("native_addr is neither IP4 or IP6 address")
} }
return return
} }
core/net/socket_linux.odin
+4 -4
View File
@@ -283,9 +283,9 @@ _set_option :: proc(s: Any_Socket, option: Socket_Option, value: any, loc := #ca
t, ok := value.(time.Duration) t, ok := value.(time.Duration)
if !ok do panic("set_option() value must be a time.Duration here", loc) if !ok do panic("set_option() value must be a time.Duration here", loc)
nanos := time.duration_nanoseconds(t) micros := i64(time.duration_microseconds(t))
timeval_value.nanoseconds = int(nanos % 1e9) timeval_value.microseconds = int(micros % 1e6)
timeval_value.seconds = (nanos - i64(timeval_value.nanoseconds)) / 1e9 timeval_value.seconds = (micros - i64(timeval_value.microseconds)) / 1e6
ptr = &timeval_value ptr = &timeval_value
len = size_of(timeval_value) len = size_of(timeval_value)
@@ -404,4 +404,4 @@ _sockaddr_basic_to_endpoint :: proc(native_addr: ^os.SOCKADDR) -> (ep: Endpoint)
panic("native_addr is neither IP4 or IP6 address") panic("native_addr is neither IP4 or IP6 address")
} }
return return
} }
core/os/os_darwin.odin
+1 -1
View File
@@ -355,7 +355,7 @@ in6_addr :: struct #packed {
Timeval :: struct { Timeval :: struct {
seconds: i64, seconds: i64,
nanoseconds: int, microseconds: int,
} }
Linger :: struct { Linger :: struct {
core/os/os_linux.odin
+2 -2
View File
@@ -241,7 +241,7 @@ socklen_t :: c.int
Timeval :: struct { Timeval :: struct {
seconds: i64, seconds: i64,
nanoseconds: int, microseconds: int,
} }
// "Argv" arguments converted to Odin strings // "Argv" arguments converted to Odin strings
@@ -1086,4 +1086,4 @@ fcntl :: proc(fd: int, cmd: int, arg: int) -> (int, Errno) {
return 0, _get_errno(result) return 0, _get_errno(result)
} }
return result, ERROR_NONE return result, ERROR_NONE
} }