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

Merge branch 'master' of boinc.berkeley.edu:boinc-v2

This commit is contained in:
David Anderson 2013-11-14 08:00:24 +00:00
parent 90d9881d5f 3d910a0190
commit 3a1f1da871
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/client_state.cpp
View File

@ -1945,14 +1945,6 @@ int CLIENT_STATE::detach_project(PROJECT* project) {
}
}
// if global prefs came from this project, delete file and reinit
//
p = lookup_project(global_prefs.source_project);
if (p == project) {
boinc_delete_file(GLOBAL_PREFS_FILE_NAME);
global_prefs.defaults();
}
// find project and remove it from the vector
//
for (project_iter = projects.begin(); project_iter != projects.end(); project_iter++) {

4
client/cpu_sched.cpp
View File

@ -269,7 +269,7 @@ bool check_coprocs_usable() {
}
}
msg_printf(NULL, MSG_INFO,
"GPUs have become unusable; disabling tasks"
"Remote desktop in use; disabling GPU tasks"
);
return true;
}
@ -283,7 +283,7 @@ bool check_coprocs_usable() {
}
}
msg_printf(NULL, MSG_INFO,
"GPUs have become usable; enabling tasks"
"Remote desktop not in use; enabling GPU tasks"
);
return true;
}

30
samples/vboxwrapper/vboxwrapper.cpp
View File

@ -485,6 +485,26 @@ int main(int argc, char** argv) {
);
}
// Record if anonymous platform was used.
//
if (boinc_file_exists((std::string(aid.project_dir) + std::string("/app_info.xml")).c_str())) {
fprintf(
stderr,
"%s Detected: Anonymous Platform Enabled\n",
vboxwrapper_msg_prefix(buf, sizeof(buf))
);
}
// Record if the sandboxed configuration is going to be used.
//
if (aid.using_sandbox) {
fprintf(
stderr,
"%s Detected: Sandbox Configuration Enabled\n",
vboxwrapper_msg_prefix(buf, sizeof(buf))
);
}
// Check against known incompatible versions of VirtualBox.
// NOTE: Incompatible in this case means that VirtualBox 4.2.6 crashes during snapshot operations
// and 4.2.18 fails to restore from snapshots properly.
@ -513,16 +533,6 @@ int main(int argc, char** argv) {
boinc_temporary_exit(300, message.c_str());
}
// Record if anonymous platform was used.
//
if (boinc_file_exists((std::string(aid.project_dir) + std::string("/app_info.xml")).c_str())) {
fprintf(
stderr,
"%s Detected: Anonymous Platform Enabled\n",
vboxwrapper_msg_prefix(buf, sizeof(buf))
);
}
// Parse Job File
//
retval = parse_job_file(vm, copy_to_shared);