Merge branch 'master' of https://github.com/BOINC/boinc

Author: romw

client/app.cpp

@@ -454,12 +454,22 @@ void ACTIVE_TASK_SET::get_memory_usage() {
 
     for (i=0; i<cc_config.exclusive_apps.size(); i++) {
         if (app_running(pm, cc_config.exclusive_apps[i].c_str())) {
+            if (log_flags.mem_usage_debug) {
+                msg_printf(NULL, MSG_INFO,
+                    "[mem_usage] exclusive app %s is running", cc_config.exclusive_apps[i].c_str()
+                );
+            }
             exclusive_app_running = gstate.now;
             break;
         }
     }
     for (i=0; i<cc_config.exclusive_gpu_apps.size(); i++) {
         if (app_running(pm, cc_config.exclusive_gpu_apps[i].c_str())) {
+            if (log_flags.mem_usage_debug) {
+                msg_printf(NULL, MSG_INFO,
+                    "[mem_usage] exclusive GPU app %s is running", cc_config.exclusive_gpu_apps[i].c_str()
+                );
+            }
             exclusive_gpu_app_running = gstate.now;
             break;
         }

client/app_control.cpp

@@ -1171,8 +1171,15 @@ void ACTIVE_TASK_SET::suspend_all(int reason) {
             continue;
         }
 
-        if (cc_config.dont_suspend_nci && atp->result->non_cpu_intensive()) {
-            continue;
+        // special cases for non-CPU-intensive apps
+        //
+        if (atp->result->non_cpu_intensive()) {
+            if (cc_config.dont_suspend_nci) {
+                continue;
+            }
+            if (reason == SUSPEND_REASON_BATTERIES) {
+                continue;
+            }
         }
 
         // handle CPU throttling separately

client/client_state.h

@@ -559,6 +559,7 @@ extern THREAD throttle_thread;
 #define GUI_HTTP_POLL_PERIOD    1.0
 
 #define MEMORY_USAGE_PERIOD     10
+    // computer memory usage and check for exclusive apps this often
 
 //////// WORK FETCH
 
@@ -623,7 +624,7 @@ extern THREAD throttle_thread;
 
 //////// MISC
 
-#define EXCLUSIVE_APP_WAIT   30
+#define EXCLUSIVE_APP_WAIT   5
     // if "exclusive app" feature used,
     // wait this long after app exits before restarting jobs
 

client/cs_prefs.cpp

@@ -244,7 +244,7 @@ int CLIENT_STATE::check_suspend_processing() {
                 return SUSPEND_REASON_NO_RECENT_INPUT;
             }
         }
-        if (now - exclusive_app_running < EXCLUSIVE_APP_WAIT) {
+        if (now - exclusive_app_running < MEMORY_USAGE_PERIOD + EXCLUSIVE_APP_WAIT) {
             return SUSPEND_REASON_EXCLUSIVE_APP_RUNNING;
         }
         if (global_prefs.suspend_cpu_usage && non_boinc_cpu_usage*100 > global_prefs.suspend_cpu_usage) {
@@ -321,7 +321,7 @@ int CLIENT_STATE::check_suspend_processing() {
             gpu_suspend_reason = SUSPEND_REASON_USER_REQ;
             break;
         default:
-            if (now - exclusive_gpu_app_running < EXCLUSIVE_APP_WAIT) {
+            if (now - exclusive_gpu_app_running < MEMORY_USAGE_PERIOD + EXCLUSIVE_APP_WAIT) {
                 gpu_suspend_reason = SUSPEND_REASON_EXCLUSIVE_APP_RUNNING;
                 break;
             }
@@ -477,7 +477,7 @@ void CLIENT_STATE::check_suspend_network() {
         if (!recent_rpc) network_suspended = true;
         network_suspend_reason = SUSPEND_REASON_TIME_OF_DAY;
     }
-    if (now - exclusive_app_running < EXCLUSIVE_APP_WAIT) {
+    if (now - exclusive_app_running < MEMORY_USAGE_PERIOD + EXCLUSIVE_APP_WAIT) {
         file_xfers_suspended = true;
         if (!recent_rpc) network_suspended = true;
         network_suspend_reason = SUSPEND_REASON_EXCLUSIVE_APP_RUNNING;

client/hostinfo_unix.cpp

@@ -2090,6 +2090,7 @@ bool xss_idle(long idle_threshold) {
 	  "[idle_detection] XScreenSaver extension not available for DISPLAY '%s'.",
 	  it->c_str());
       }
+      XCloseDisplay(disp);
       continue;
     }
 
@@ -2098,6 +2099,9 @@ bool xss_idle(long idle_threshold) {
     XScreenSaverQueryInfo(disp, DefaultRootWindow(disp), xssInfo);
     idle_time = xssInfo->idle;
 
+    // Close the connection to the XServer
+    XCloseDisplay(disp);
+
     // convert from milliseconds to seconds
     idle_time = idle_time / 1000;
 

configure.ac

@@ -1245,10 +1245,8 @@ AC_SUBST(CLIENTLIBS)
 
 if test "${enable_debug}" = "yes" ; then
     CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -D_DEBUG -DDEBUG"
-fi
-
-# disable wxWidgets debug support which is by default enabled since 2.9.1
-if test "${enable_wx_debug}" = "no" ; then
+else
+    # disable wxWidgets debug support which is by default enabled since 2.9.1
     CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -DNDEBUG"
 fi
 

db/schema.sql

@@ -132,6 +132,7 @@ create table team (
     ping_user               integer         not null default 0,
     ping_time               integer unsigned not null default 0,
     joinable                tinyint         not null default 1,
+    mod_time                timestamp default current_timestamp on update current_timestamp,
     primary key (id)
 ) engine=MyISAM;  
 

doc/projects.inc

@@ -456,7 +456,7 @@ $mixed = array(
             "http://casathome.ihep.ac.cn/",
             tra("Chinese Academy of Sciences"),
             tra("Physics, biochemistry, and others"),
-            tra("The objective of CAS@home is to encourage and assist scientists in China to adopt the technologies of volunteer computing and volunteer thinking for their research."),
+            tra("CAS@home is hosted by the Computing Centre of the Institute of High Energy Physics (IHEP), Chinese Academy of Sciences, for Chinese scientists with projects studying protein structure, nanotechnology, cancer genomics, and high energy physics."),
             "cas_at_home.jpg",
             "",
             tra("Help Chinese researchers")
@@ -471,16 +471,16 @@ $mixed = array(
             "",
             tra("Do research in math, physics, and evolution")
         ),
-        array(
-            "EDGeS@Home",
-            "http://home.edges-grid.eu/home/",
-            tra("MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"),
-            tra("European research projects"),
-            tra("The EDGeS@Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."),
-            "logo_edges.png",
-            "",
-            tra("Help European researchers")
-        ),
+//        array(
+//            "EDGeS@Home",
+//            "http://home.edges-grid.eu/home/",
+//            tra("MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"),
+//            tra("European research projects"),
+//            tra("The EDGeS@Home Beta project integrates volunteer computing into the service grid network of Europe by allowing service grids to send workunits to be processed by the volunteers of this project. The scientific projects covered by the project include math, physics, biology, etc."),
+//            "logo_edges.png",
+//            "",
+//            tra("Help European researchers")
+//        ),
         array(
             "Ibercivis",
             "http://registro.ibercivis.es/",

drupal/sites/default/boinc/modules/contrib/wysiwyg/wysiwyg.info

@@ -7,4 +7,4 @@ core = 6.x
 version = "6.x-2.4-dev-boinc-1"
 core = "6.x"
 project = "wysiwyg"
-datestamp = "1452920286"
+datestamp = "1453962141"

html/inc/team.inc

@@ -271,7 +271,7 @@ function display_team_members($team, $offset, $sort_by) {
         }
         echo "<tr class=row1>
             <td align=left>$j) $x
-        ";
+        </td>";
         if (!no_computing()) {
             echo "
                 <td align=right>$user_total_credit</td>