id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-01 23:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug in Sys_CPUCount()

Browse source
This commit is contained in:
Robert Beckebans 2012-12-12 00:37:01 +01:00
parent 6c4590d8d4
commit 47f3f1b999
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
neo/sys/linux/linux_main.cpp
View file

@ -318,6 +318,7 @@ void Sys_CPUCount( int& numLogicalCPUCores, int& numPhysicalCPUCores, int& numCP
int fd, len, pos, end;
char buf[ 4096 ];
char number[100];
if( init )
{
@ -344,8 +345,11 @@ void Sys_CPUCount( int& numLogicalCPUCores, int& numPhysicalCPUCores, int& numCP
end = strchr( buf + pos, '\n' ) - buf;
if( pos < len && end < len )
{
buf[end] = '\0';
int processor = atoi( buf + pos );
idStr::Copynz( number, buf + pos, sizeof( number ) );
assert( ( end - pos ) > 0 && ( end - pos ) < sizeof( number ) );
number[ end - pos ] = '\0';
int processor = atoi( number );
if( ( processor + 1 ) > s_numPhysicalCPUCores )
{
@ -358,15 +362,17 @@ void Sys_CPUCount( int& numLogicalCPUCores, int& numPhysicalCPUCores, int& numCP
break;
}
}
if( !idStr::Cmpn( buf + pos, "core id", 7 ) )
else if( !idStr::Cmpn( buf + pos, "core id", 7 ) )
{
pos = strchr( buf + pos, ':' ) - buf + 2;
end = strchr( buf + pos, '\n' ) - buf;
if( pos < len && end < len )
{
buf[end] = '\0';
int coreId = atoi( buf + pos );
idStr::Copynz( number, buf + pos, sizeof( number ) );
assert( ( end - pos ) > 0 && ( end - pos ) < sizeof( number ) );
number[ end - pos ] = '\0';
int coreId = atoi( number );
if( ( coreId + 1 ) > s_numLogicalCPUCores )
{