mirror of https://github.com/BOINC/boinc.git
- API: if get a resume message from client while in a critical section,
clear the suspend_request flag. Otherwise we'll end up doing two suspends, and on Win the app will be suspended forever. svn path=/trunk/boinc/; revision=26143
This commit is contained in:
parent
7d3bc3e3cf
commit
be540c8318
|
@ -944,8 +944,12 @@ static void handle_process_control_msg() {
|
|||
|
||||
if (match_tag(buf, "<resume/>")) {
|
||||
BOINCINFO("Received resume message");
|
||||
if (boinc_status.suspended && options.direct_process_action) {
|
||||
if (options.direct_process_action) {
|
||||
if (boinc_status.suspended) {
|
||||
resume_activities();
|
||||
} else if (suspend_request) {
|
||||
suspend_request = false;
|
||||
}
|
||||
}
|
||||
boinc_status.suspended = false;
|
||||
}
|
||||
|
|
|
@ -6063,3 +6063,12 @@ David 23 Sept 2012
|
|||
prefs.inc
|
||||
lib/
|
||||
prefs.cpp
|
||||
|
||||
David 30 Sept 2012
|
||||
- API: if get a resume message from client while in a critical section,
|
||||
clear the suspend_request flag.
|
||||
Otherwise we'll end up doing two suspends,
|
||||
and on Win the app will be suspended forever.
|
||||
|
||||
api/
|
||||
boinc_api.cpp
|
||||
|
|
|
@ -34,6 +34,9 @@ function friendly_name($p) {
|
|||
case 'windows_amd64': $q = 'Windows/Opteron'; break;
|
||||
case 'x86_64-pc-solaris': $q = 'Solaris/x64'; break;
|
||||
case 'windows_intelx86_64': $q = 'Windows/x64'; break;
|
||||
case 'arm-android-linux-gnu': $q = 'Android/ARM'; break;
|
||||
case 'arm-unknown-linux-gnu': $q = 'Linux/ARM'; break;
|
||||
case 'x86_64-pc-freebsd': $q = 'FreeBSD/x86'; break;
|
||||
}
|
||||
if (strlen($pc)) {
|
||||
if (strstr($pc, 'cuda')) $q .= " (NVIDIA GPU)";
|
||||
|
|
|
@ -300,6 +300,14 @@ $mixed = array(
|
|||
$math = array(
|
||||
tra("Mathematics, computing, and games"),
|
||||
array(
|
||||
array(
|
||||
"OProject@Home",
|
||||
"http://oproject.goldbach.pl/",
|
||||
tra("Private"),
|
||||
tra("Mathematics, Physics, Artificial Intelligence"),
|
||||
tra("Simulation of quantum computing; Goldbach's conjecture."),
|
||||
"oproject_logo.png"
|
||||
),
|
||||
array(
|
||||
"NumberFields@home",
|
||||
"http://stat.la.asu.edu/NumberFields/",
|
||||
|
|
Loading…
Reference in New Issue