Browse Source

shuffle to private/public wrapper

Colin Davidson 2 years ago
parent
commit
6ff2db47b4

+ 4 - 0
core/os/os.odin

@@ -261,3 +261,7 @@ heap_allocator :: proc() -> mem.Allocator {
 		data = nil,
 		data = nil,
 	}
 	}
 }
 }
+
+processor_core_count :: proc() -> int {
+	return _processor_core_count()
+}

+ 2 - 1
core/os/os_darwin.odin

@@ -772,7 +772,8 @@ get_page_size :: proc() -> int {
 	return page_size
 	return page_size
 }
 }
 
 
-get_processor_thread_count :: proc() -> int {
+@(private)
+_processor_core_count :: proc() -> int {
 	count : int = 0
 	count : int = 0
 	count_size := size_of(count)
 	count_size := size_of(count)
 	if _sysctlbyname("hw.logicalcpu", &count, &count_size, nil, 0) == 0 {
 	if _sysctlbyname("hw.logicalcpu", &count, &count_size, nil, 0) == 0 {

+ 2 - 1
core/os/os_freebsd.odin

@@ -703,7 +703,8 @@ get_page_size :: proc() -> int {
 	return page_size
 	return page_size
 }
 }
 
 
-get_processor_thread_count :: proc() -> int {
+@(private)
+_processor_core_count :: proc() -> int {
 	count : int = 0
 	count : int = 0
 	count_size := size_of(count)
 	count_size := size_of(count)
 	if _sysctlbyname("hw.logicalcpu", &count, &count_size, nil, 0) == 0 {
 	if _sysctlbyname("hw.logicalcpu", &count, &count_size, nil, 0) == 0 {

+ 3 - 3
core/os/os_linux.odin

@@ -879,9 +879,9 @@ get_page_size :: proc() -> int {
 	return page_size
 	return page_size
 }
 }
 
 
-get_processor_thread_count :: proc() -> int {
-	thread_count := int(_unix_get_nprocs())
-	return thread_count
+@(private)
+_processor_core_count :: proc() -> int {
+	return int(_unix_get_nprocs())
 }
 }
 
 
 _alloc_command_line_arguments :: proc() -> []string {
 _alloc_command_line_arguments :: proc() -> []string {

+ 4 - 3
core/os/os_openbsd.odin

@@ -706,9 +706,10 @@ get_page_size :: proc() -> int {
 }
 }
 
 
 _SC_NPROCESSORS_ONLN :: 503
 _SC_NPROCESSORS_ONLN :: 503
-get_processor_thread_count :: proc() -> int {
-	thread_count := int(_sysconf(_SC_NPROCESSORS_ONLN))
-	return thread_count
+
+@(private)
+_processor_core_count :: proc() -> int {
+	return int(_sysconf(_SC_NPROCESSORS_ONLN))
 }
 }
 
 
 _alloc_command_line_arguments :: proc() -> []string {
 _alloc_command_line_arguments :: proc() -> []string {

+ 4 - 1
core/os/os_wasi.odin

@@ -89,7 +89,10 @@ seek :: proc(fd: Handle, offset: i64, whence: int) -> (i64, Errno) {
 current_thread_id :: proc "contextless" () -> int {
 current_thread_id :: proc "contextless" () -> int {
 	return 0
 	return 0
 }
 }
-
+@(private)
+_processor_core_count :: proc() -> int {
+	return 1
+}
 
 
 file_size :: proc(fd: Handle) -> (i64, Errno) {
 file_size :: proc(fd: Handle) -> (i64, Errno) {
 	stat, err := wasi.fd_filestat_get(wasi.fd_t(fd))
 	stat, err := wasi.fd_filestat_get(wasi.fd_t(fd))

+ 2 - 2
core/os/os_windows.odin

@@ -127,7 +127,8 @@ get_page_size :: proc() -> int {
 	return page_size
 	return page_size
 }
 }
 
 
-get_processor_thread_count :: proc() -> int {
+@(private)
+_processor_core_count :: proc() -> int {
 	length : c.int = 0
 	length : c.int = 0
 	result := win32.GetLogicalProcessorInformation(nil, &length)
 	result := win32.GetLogicalProcessorInformation(nil, &length)
 
 
@@ -149,7 +150,6 @@ get_processor_thread_count :: proc() -> int {
 	return thread_count
 	return thread_count
 }
 }
 
 
-
 exit :: proc "contextless" (code: int) -> ! {
 exit :: proc "contextless" (code: int) -> ! {
 	runtime._cleanup_runtime_contextless()
 	runtime._cleanup_runtime_contextless()
 	win32.ExitProcess(win32.DWORD(code))
 	win32.ExitProcess(win32.DWORD(code))