Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client: add <dont_use_vbox> cc_config option

This commit is contained in:
David Anderson 2014-09-25 01:28:19 -07:00
parent 10276d51b1
commit f8538c29b3
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/hostinfo_unix.cpp
View File

@ -1264,7 +1264,9 @@ int HOST_INFO::get_host_info() {
"get_filesystem_info() failed: %s", boincerror(retval)
);
}
get_virtualbox_version();
if (!cc_config.dont_use_vbox) {
get_virtualbox_version();
}
///////////// p_vendor, p_model, p_features /////////////////
#if LINUX_LIKE_SYSTEM

4
client/hostinfo_win.cpp
View File

@ -1202,7 +1202,9 @@ int HOST_INFO::get_host_info() {
get_os_information(
os_name, sizeof(os_name), os_version, sizeof(os_version)
);
get_virtualbox_version();
if (!cc_config.dont_use_vbox) {
get_virtualbox_version();
}
get_processor_info(
p_vendor, sizeof(p_vendor),
p_model, sizeof(p_model),

3
client/log_flags.cpp
View File

@ -159,6 +159,9 @@ void CC_CONFIG::show() {
if (no_gpus) {
msg_printf(NULL, MSG_INFO, "Config: don't use coprocessors");
}
if (dont_use_vbox) {
msg_printf(NULL, MSG_INFO, "Config: don't use VirtualBox");
}
if (no_info_fetch) {
msg_printf(NULL, MSG_INFO, "Config: don't fetch project list or client version info");
}

8
lib/cc_config.cpp
View File

@ -209,6 +209,7 @@ void CC_CONFIG::defaults() {
disallow_attach = false;
dont_check_file_sizes = false;
dont_contact_ref_site = false;
dont_use_vbox = false;
exclude_gpus.clear();
exclusive_apps.clear();
exclusive_gpu_apps.clear();
@ -341,6 +342,7 @@ int CC_CONFIG::parse_options(XML_PARSER& xp) {
if (xp.parse_bool("disallow_attach", disallow_attach)) continue;
if (xp.parse_bool("dont_check_file_sizes", dont_check_file_sizes)) continue;
if (xp.parse_bool("dont_contact_ref_site", dont_contact_ref_site)) continue;
if (xp.parse_bool("dont_use_vbox", dont_use_vbox)) continue;
if (xp.match_tag("exclude_gpu")) {
EXCLUDE_GPU eg;
retval = eg.parse(xp);
@ -548,10 +550,12 @@ int CC_CONFIG::write(MIOFILE& out, LOG_FLAGS& log_flags) {
out.printf(
" <disallow_attach>%d</disallow_attach>\n"
" <dont_check_file_sizes>%d</dont_check_file_sizes>\n"
" <dont_contact_ref_site>%d</dont_contact_ref_site>\n",
" <dont_contact_ref_site>%d</dont_contact_ref_site>\n"
" <dont_use_vbox>%d</dont_use_vbox>\n",
disallow_attach,
dont_check_file_sizes,
dont_contact_ref_site
dont_contact_ref_site,
dont_use_vbox
);
for (i=0; i<exclude_gpus.size(); i++) {

3
lib/cc_config.h
View File

@ -149,8 +149,8 @@ struct CC_CONFIG {
char data_dir[256];
bool disallow_attach;
bool dont_check_file_sizes;
int max_event_log_lines;
bool dont_contact_ref_site;
bool dont_use_vbox;
std::vector<EXCLUDE_GPU> exclude_gpus;
std::vector<std::string> exclusive_apps;
std::vector<std::string> exclusive_gpu_apps;
@ -164,6 +164,7 @@ struct CC_CONFIG {
int http_transfer_timeout_bps;
int http_transfer_timeout;
std::vector<int> ignore_gpu_instance[NPROC_TYPES];
int max_event_log_lines;
int max_file_xfers;
int max_file_xfers_per_project;
int max_stderr_file_size;