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 ssh://boinc.berkeley.edu/boinc-v2

This commit is contained in:
Rom Walton 2013-06-27 02:08:34 -04:00
parent a1e2422499 3614870952
commit 31e3bf2783
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/work_fetch.cpp
View File

@ -474,7 +474,7 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) {
clear_request(); clear_request();
if (config.fetch_minimal_work && gstate.had_or_requested_work) return; if (config.fetch_minimal_work && gstate.had_or_requested_work) return;
if (p->non_cpu_intensive) { if (p->non_cpu_intensive) {
if (!has_a_job_in_progress(p)) { if (!has_a_job_in_progress(p) && !p->dont_request_more_work) {
rsc_work_fetch[0].req_secs = 1; rsc_work_fetch[0].req_secs = 1;
} }
return; return;

5
html/inc/host.inc
View File

@ -117,6 +117,9 @@ function show_host($host, $user, $ipprivate) {
row2(tra("Coprocessors"), gpu_desc($host->serialnum)); row2(tra("Coprocessors"), gpu_desc($host->serialnum));
} }
row2(tra("Operating System"), "$host->os_name <br> $host->os_version"); row2(tra("Operating System"), "$host->os_name <br> $host->os_version");
if ($user && $host->product_name) {
row2(tra("Product name"), $host->product_name);
}
$v = boinc_version($host->serialnum); $v = boinc_version($host->serialnum);
if ($v) { if ($v) {
row2(tra("BOINC version"), $v); row2(tra("BOINC version"), $v);
@ -124,9 +127,11 @@ function show_host($host, $user, $ipprivate) {
$x = $host->m_nbytes/(1024*1024); $x = $host->m_nbytes/(1024*1024);
$y = round($x, 2); $y = round($x, 2);
row2(tra("Memory"), tra("%1 MB", $y)); row2(tra("Memory"), tra("%1 MB", $y));
if ($host->m_cache > 0) {
$x = $host->m_cache/1024; $x = $host->m_cache/1024;
$y = round($x, 2); $y = round($x, 2);
row2(tra("Cache"), tra("%1 KB", $y)); row2(tra("Cache"), tra("%1 KB", $y));
}
if ($user) { if ($user) {
$x = $host->m_swap/(1024*1024); $x = $host->m_swap/(1024*1024);

1
lib/str_util.cpp
View File

@ -575,6 +575,7 @@ const char* suspend_reason_string(int reason) {
case SUSPEND_REASON_WIFI_STATE: return "not connected to WiFi network"; case SUSPEND_REASON_WIFI_STATE: return "not connected to WiFi network";
case SUSPEND_REASON_BATTERY_CHARGING: return "battery low"; case SUSPEND_REASON_BATTERY_CHARGING: return "battery low";
case SUSPEND_REASON_BATTERY_OVERHEATED: return "battery thermal protection"; case SUSPEND_REASON_BATTERY_OVERHEATED: return "battery thermal protection";
case SUSPEND_REASON_NO_GUI_KEEPALIVE: return "GUI not active";
} }
return "unknown reason"; return "unknown reason";
} }