diff --git a/core/os/os_darwin.odin b/core/os/os_darwin.odin index 69411fdb7..f694dd588 100644 --- a/core/os/os_darwin.odin +++ b/core/os/os_darwin.odin @@ -7,6 +7,7 @@ foreign import pthread "system:System.framework" import "base:runtime" import "core:strings" import "core:c" +import "core:sys/posix" Handle :: distinct i32 Pid :: distinct i32 @@ -585,8 +586,6 @@ F_GETPATH :: 50 // return the full path of the fd foreign libc { @(link_name="__error") __error :: proc() -> ^c.int --- - @(link_name="posix_spawn") _unix_posix_spawn :: proc(pid: ^Pid, path: cstring, file_actions: rawptr, attrp: rawptr, argv: [^]cstring, envp: [^]cstring) -> c.int --- - @(link_name="open") _unix_open :: proc(path: cstring, flags: i32, #c_vararg mode: ..u16) -> Handle --- @(link_name="close") _unix_close :: proc(handle: Handle) -> c.int --- @(link_name="read") _unix_read :: proc(handle: Handle, buffer: rawptr, count: c.size_t) -> int --- @@ -680,7 +679,7 @@ get_last_error_string :: proc() -> string { return string(_darwin_string_error(__error()^)) } -posix_spawn :: proc(path: string, args: []string, envs: []string, file_actions: rawptr, attributes: rawptr) -> (Pid, Error) { +_spawn :: #force_inline proc(path: string, args: []string, envs: []string, file_actions: rawptr, attributes: rawptr, is_spawnp: bool) -> (posix.pid_t, Error) { runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD() path_cstr := strings.clone_to_cstring(path, context.temp_allocator) @@ -695,13 +694,24 @@ posix_spawn :: proc(path: string, args: []string, envs: []string, file_actions: envs_cstrs[i] = strings.clone_to_cstring(envs[i], context.temp_allocator) } - child_pid: Pid - status := _unix_posix_spawn(&child_pid, path_cstr, file_actions, attributes, raw_data(args_cstrs), raw_data(envs_cstrs)) + child_pid: posix.pid_t + status: i32 + if is_spawnp { + status = posix.posix_spawnp(&child_pid, path_cstr, file_actions, attributes, raw_data(args_cstrs), raw_data(envs_cstrs)) + } else { + status = posix.posix_spawn(&child_pid, path_cstr, file_actions, attributes, raw_data(args_cstrs), raw_data(envs_cstrs)) + } if status != 0 { - return 0, get_last_error() + return 0, Platform_Error(status) } return child_pid, nil } +spawn :: proc(path: string, args: []string, envs: []string, file_actions: rawptr, attributes: rawptr) -> (posix.pid_t, Error) { + return _spawn(path, args, envs, file_actions, attributes, false) +} +spawnp :: proc(path: string, args: []string, envs: []string, file_actions: rawptr, attributes: rawptr) -> (posix.pid_t, Error) { + return _spawn(path, args, envs, file_actions, attributes, true) +} @(require_results) open :: proc(path: string, flags: int = O_RDWR, mode: int = 0) -> (handle: Handle, err: Error) { diff --git a/core/sys/darwin/mach_darwin.odin b/core/sys/darwin/mach_darwin.odin index bbaa290e6..1e728fe78 100644 --- a/core/sys/darwin/mach_darwin.odin +++ b/core/sys/darwin/mach_darwin.odin @@ -255,6 +255,7 @@ foreign mach { task_resume :: proc(task: task_t) -> kern_return_t --- task_threads :: proc(task: task_t, thread_list: ^thread_list_t, list_count: ^u32) -> kern_return_t --- task_info :: proc(task: task_t, flavor: i32, info: task_info_t, count: ^u32) -> kern_return_t --- + task_terminate :: proc(task: task_t) -> kern_return_t --- thread_get_state :: proc(thread: thread_act_t, flavor: i32, thread_state: thread_state_t, old_state_count: ^u32) -> kern_return_t --- thread_info :: proc(thread: thread_act_t, flavor: u32, thread_info: ^thread_identifier_info, info_count: ^u32) -> kern_return_t --- diff --git a/core/sys/posix/spawn.odin b/core/sys/posix/spawn.odin index 3ef738b52..154509160 100644 --- a/core/sys/posix/spawn.odin +++ b/core/sys/posix/spawn.odin @@ -10,4 +10,5 @@ when ODIN_OS == .Darwin { foreign lib { posix_spawn :: proc(pid: ^pid_t, path: cstring, file_actions: rawptr, attrp: rawptr, argv: [^]cstring, envp: [^]cstring) -> c.int --- + posix_spawnp :: proc(pid: ^pid_t, file: cstring, file_actions: rawptr, attrp: rawptr, argv: [^]cstring, envp: [^]cstring) -> c.int --- }