Paul Gofman : ntdll: Move init_cpu_info() below create_logical_proc_info().
Alexandre Julliard
julliard at winehq.org
Mon May 16 15:37:57 CDT 2022
Module: wine
Branch: master
Commit: aadc1a0a80bf7db28a1430ec4e5852ee826e9800
URL: https://source.winehq.org/git/wine.git/?a=commit;h=aadc1a0a80bf7db28a1430ec4e5852ee826e9800
Author: Paul Gofman <pgofman at codeweavers.com>
Date: Tue May 3 16:20:17 2022 -0500
ntdll: Move init_cpu_info() below create_logical_proc_info().
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/unix/system.c | 80 ++++++++++++++++++++++++------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 64829559c1d..0710b72e42f 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -536,46 +536,6 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info )
#endif /* End architecture specific feature detection for CPUs */
-/******************************************************************
- * init_cpu_info
- *
- * inits a couple of places with CPU related information:
- * - cpu_info in this file
- * - Peb->NumberOfProcessors
- * - SharedUserData->ProcessFeatures[] array
- */
-void init_cpu_info(void)
-{
- long num;
-
-#ifdef _SC_NPROCESSORS_ONLN
- num = sysconf(_SC_NPROCESSORS_ONLN);
- if (num < 1)
- {
- num = 1;
- WARN("Failed to detect the number of processors.\n");
- }
-#elif defined(CTL_HW) && defined(HW_NCPU)
- int mib[2];
- size_t len = sizeof(num);
- mib[0] = CTL_HW;
- mib[1] = HW_NCPU;
- if (sysctl(mib, 2, &num, &len, NULL, 0) != 0)
- {
- num = 1;
- WARN("Failed to detect the number of processors.\n");
- }
-#else
- num = 1;
- FIXME("Detecting the number of processors is not supported.\n");
-#endif
- peb->NumberOfProcessors = num;
- get_cpuinfo( &cpu_info );
- TRACE( "<- CPU arch %d, level %d, rev %d, features 0x%x\n",
- cpu_info.ProcessorArchitecture, cpu_info.ProcessorLevel, cpu_info.ProcessorRevision,
- cpu_info.ProcessorFeatureBits );
-}
-
static BOOL grow_logical_proc_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, DWORD *max_len )
{
SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data;
@@ -1254,6 +1214,46 @@ static NTSTATUS create_logical_proc_info( SYSTEM_LOGICAL_PROCESSOR_INFORMATION *
}
#endif
+/******************************************************************
+ * init_cpu_info
+ *
+ * inits a couple of places with CPU related information:
+ * - cpu_info in this file
+ * - Peb->NumberOfProcessors
+ * - SharedUserData->ProcessFeatures[] array
+ */
+void init_cpu_info(void)
+{
+ long num;
+
+#ifdef _SC_NPROCESSORS_ONLN
+ num = sysconf(_SC_NPROCESSORS_ONLN);
+ if (num < 1)
+ {
+ num = 1;
+ WARN("Failed to detect the number of processors.\n");
+ }
+#elif defined(CTL_HW) && defined(HW_NCPU)
+ int mib[2];
+ size_t len = sizeof(num);
+ mib[0] = CTL_HW;
+ mib[1] = HW_NCPU;
+ if (sysctl(mib, 2, &num, &len, NULL, 0) != 0)
+ {
+ num = 1;
+ WARN("Failed to detect the number of processors.\n");
+ }
+#else
+ num = 1;
+ FIXME("Detecting the number of processors is not supported.\n");
+#endif
+ peb->NumberOfProcessors = num;
+ get_cpuinfo( &cpu_info );
+ TRACE( "<- CPU arch %d, level %d, rev %d, features 0x%x\n",
+ cpu_info.ProcessorArchitecture, cpu_info.ProcessorLevel, cpu_info.ProcessorRevision,
+ cpu_info.ProcessorFeatureBits );
+}
+
static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info)
{
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *proc_info;
More information about the wine-cvs
mailing list