boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

Rework sysinfo cpu to avoid overcounts.

Browse Source 
When running in Linux containers the POSIX sysconf can return "too many"
cores or cpus. Instead we prefer using Linux specific sched_getaffinity
there.
This commit is contained in:
Rene Rivera
2019-06-11 21:26:25 -05:00
parent 1309749518
commit c27d575fb3
2 changed files with 101 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/engine/jam.cpp
View File

@@ -272,6 +272,7 @@ int main( int argc, char * * argv, char * * arg_environ )
char const * progname = argv[ 0 ];
module_t * environ_module;
int is_debugger;
b2::system_info sys_info;
saved_argv0 = argv[ 0 ];
@@ -362,23 +363,23 @@ int main( int argc, char * * argv, char * * arg_environ )
usage( progname );
}
/* Set default parallel jobs to match cpu threads. This can be overridden
the usual way with -jX or PARALLELISM env var. */
globs.jobs = sys_info.cpu_thread_count();
/* Version info. */
if ( ( s = getoptval( optv, 'v', 0 ) ) )
{
out_printf( "B2 Version %s. %s.\n", VERSION, OSMINOR );
out_printf( " Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc.\n" );
out_printf( " Copyright 2001 David Turner.\n" );
out_printf( " Copyright 2001-2004 David Abrahams.\n" );
out_printf( " Copyright 2002-2019 Rene Rivera.\n" );
out_printf( " Copyright 2003-2015 Vladimir Prus.\n" );
out_printf( " Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc.\n" );
out_printf( " Copyright 2001 David Turner.\n" );
out_printf( " Copyright 2001-2004 David Abrahams.\n" );
out_printf( " Copyright 2002-2019 Rene Rivera.\n" );
out_printf( " Copyright 2003-2015 Vladimir Prus.\n" );
out_printf( "\n DEFAULTS: jobs = %i\n", globs.jobs);
return EXITOK;
}
/* Set default parallel jobs to match cpu threads. This can be overridden
the usual way with -jX or PARALLELISM env var. */
b2::system_info sys_info;
globs.jobs = sys_info.cpu_thread_count();
/* Pick up interesting options. */
if ( ( s = getoptval( optv, 'n', 0 ) ) )
{