diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-15 03:55:15 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-03-02 14:03:34 +0200 |
| commit | b37f1aa6398065be806e6605a023189685669885 (patch) | |
| tree | b9b32091e3d70a31852302b24c99ecb62465464a /build2/b-options.cxx | |
| parent | a64b2ae2099346471ead988d5f2d383d55a9bf89 (diff) | |
Implement parallel match
Diffstat (limited to 'build2/b-options.cxx')
| -rw-r--r-- | build2/b-options.cxx | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/build2/b-options.cxx b/build2/b-options.cxx index 8a133dd..1118eb4 100644 --- a/build2/b-options.cxx +++ b/build2/b-options.cxx @@ -576,6 +576,8 @@ namespace build2 verbose_specified_ (false), jobs_ (), jobs_specified_ (false), + max_jobs_ (), + max_jobs_specified_ (false), serial_stop_ (), no_column_ (), no_line_ (), @@ -689,12 +691,18 @@ namespace build2 << " 6. Even more detailed information, including state dumps." << ::std::endl; os << std::endl - << "\033[1m--jobs\033[0m|\033[1m-j\033[0m \033[4mnum\033[0m Number of jobs to perform in parallel. This includes both" << ::std::endl - << " the number of active threads inside the build system as" << ::std::endl - << " well as the number of external commands (compilers," << ::std::endl - << " linkers, etc) started but not yet finished. If this option" << ::std::endl - << " is not specified, then the number of available hardware" << ::std::endl - << " threads is used." << ::std::endl; + << "\033[1m--jobs\033[0m|\033[1m-j\033[0m \033[4mnum\033[0m Number of active jobs to perform in parallel. This" << ::std::endl + << " includes both the number of active threads inside the" << ::std::endl + << " build system as well as the number of external commands" << ::std::endl + << " (compilers, linkers, etc) started but not yet finished. If" << ::std::endl + << " this option is not specified, then the number of available" << ::std::endl + << " hardware threads is used." << ::std::endl; + + os << std::endl + << "\033[1m--max-jobs\033[0m|\033[1m-J\033[0m \033[4mnum\033[0m Maximum number of jobs (threads) to create. The default is" << ::std::endl + << " 16x the number of active jobs (--jobs|j\033[0m) on 32-bit" << ::std::endl + << " architectures and 32x on 64-bit. See the build system" << ::std::endl + << " scheduler implementation for details." << ::std::endl; os << std::endl << "\033[1m--serial-stop\033[0m|\033[1m-s\033[0m Run serially and stop at the first error. This mode is" << ::std::endl @@ -783,6 +791,12 @@ namespace build2 _cli_options_map_["-j"] = &::build2::cl::thunk< options, size_t, &options::jobs_, &options::jobs_specified_ >; + _cli_options_map_["--max-jobs"] = + &::build2::cl::thunk< options, size_t, &options::max_jobs_, + &options::max_jobs_specified_ >; + _cli_options_map_["-J"] = + &::build2::cl::thunk< options, size_t, &options::max_jobs_, + &options::max_jobs_specified_ >; _cli_options_map_["--serial-stop"] = &::build2::cl::thunk< options, bool, &options::serial_stop_ >; _cli_options_map_["-s"] = |