Fix crash on systems with many CPUs

SAPikachu · SAPikachu · commit 4ed9b4f18277 · 2017-10-27T08:05:15.000+08:00
diff --git a/AVS_SplitProcess/AVS_SplitProcess.vcxproj b/AVS_SplitProcess/AVS_SplitProcess.vcxproj
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,27 +28,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/AVS_SplitProcess/MP_Pipeline.cpp b/AVS_SplitProcess/MP_Pipeline.cpp
@@ -438,7 +438,7 @@ int get_cpu_arrangement(int* arrangement)
             }
         }
         auto ptr = buffer;
-        while (buffer_size >= sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION))
+        while (buffer_size >= sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION) && cpu_group_count < MAX_CPU)
         {
             if (ptr->Relationship == RelationProcessorCore)
             {
diff --git a/AVS_SplitProcess/MP_Pipeline.h b/AVS_SplitProcess/MP_Pipeline.h
@@ -7,8 +7,7 @@
 static const char* SCRIPT_SPLITTER_PATTERN = "^(\\s*### ###\\s*)$";
 
 // for use with SetThreadAffinityMask
-// limit to 32 for compatibility with 32bit OSes
-static const int MAX_CPU = 32;
+static const int MAX_CPU = 64;
 
 typedef struct _cpu_arrangement_info_t
 {
diff --git a/SplitProcess_Slave/SplitProcess_Slave.vcxproj b/SplitProcess_Slave/SplitProcess_Slave.vcxproj
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,27 +28,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ int get_cpu_arrangement(int* arrangement)`
`438`	`438`	`}`
`439`	`439`	`}`
`440`	`440`	`auto ptr = buffer;`
`441`		`- while (buffer_size >= sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION))`
	`441`	`+ while (buffer_size >= sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION) && cpu_group_count < MAX_CPU)`
`442`	`442`	`{`
`443`	`443`	`if (ptr->Relationship == RelationProcessorCore)`
`444`	`444`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@`
`7`	`7`	`static const char* SCRIPT_SPLITTER_PATTERN = "^(\\s### ###\\s)$";`
`8`	`8`
`9`	`9`	`// for use with SetThreadAffinityMask`
`10`		`-// limit to 32 for compatibility with 32bit OSes`
`11`		`-static const int MAX_CPU = 32;`
	`10`	`+static const int MAX_CPU = 64;`
`12`	`11`
`13`	`12`	`typedef struct _cpu_arrangement_info_t`
`14`	`13`	`{`