Ticket #463: boinc-idlefix.patch

client/client_state.C

@@ -34 +34 @@
 #endif
 #endif
 
+#ifdef linux
+#include <sys/fcntl.h>
+#endif
+
 #include "parse.h"
 #include "str_util.h"
 #include "util.h"
@@ -125 +129 @@
     launched_by_manager = false;
     initialized = false;
     last_wakeup_time = dtime();
+#ifdef linux
+    mouse_moved = true;
+    mouse_event_t = time(NULL);
+    mouse_fd = open("/dev/input/mouse0", O_RDONLY);
+#endif    
+}
+
+CLIENT_STATE::~CLIENT_STATE()
+{
+#ifdef linux
+    if(mouse_fd != -1)
+        close(mouse_fd);
+#endif
 }
 
 void CLIENT_STATE::show_host_info() {
@@ -414 +431 @@
                 http_ops->get_fdset(curl_fds);
         all_fds = curl_fds;
         gui_rpcs.get_fdset(gui_rpc_fds, all_fds);
+#ifdef linux
+        FD_SET(mouse_fd, &all_fds.read_fds);
+        if (mouse_fd > all_fds.max_fd) all_fds.max_fd = mouse_fd;
+#endif        
         double_to_timeval(x, tv);
         n = select(
             all_fds.max_fd+1,
@@ -429 +451 @@
 
         http_ops->got_select(all_fds, x);
         gui_rpcs.got_select(all_fds);
+#ifdef linux
+        if (mouse_fd != -1) {
+            if (FD_ISSET(mouse_fd, &all_fds.read_fds)) {
+                char ps2_packet[3]; //assume ps/2 mouse protocol 3 byte packet
+                if(read(mouse_fd, ps2_packet, 3) == 3) {
+                    mouse_moved = true;
+                    mouse_event_t = time(NULL);
+                }
+            }
+        }
+#endif
 
         if (n==0) break;
 
@@ -496 +529 @@
 #ifdef __APPLE__
          , &idletime
 #endif
+#ifdef linux
+         , &mouse_moved
+         , mouse_event_t
+#endif
     );
 
     if (user_active != old_user_active) {

client/client_state.h

@@ -213 +213 @@
 // --------------- client_state.C:
 public:
     CLIENT_STATE();
+    ~CLIENT_STATE();    
     void show_host_info();
     int init();
     bool poll_slow_events();
@@ -243 +244 @@
     bool garbage_collect_always();
     bool update_results();
     int nresults_for_project(PROJECT*);
+#ifdef linux
+    int mouse_fd;
+    bool mouse_moved;
+    time_t mouse_event_t;
+#endif
 
 // --------------- cpu_sched.C:
 private:

client/hostinfo_unix.C

@@ -946 +946 @@
     return (idleTime > (60 * idle_time_to_run));
 }
 
+#elif linux
+
+bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run, bool* mouse_moved, time_t mouse_event_t) {
+    time_t cur_time = time(NULL);
+    time_t idle_time = cur_time - (long) (60 * idle_time_to_run);
+    if (mouse_event_t != 0) {
+        if (mouse_moved && mouse_event_t < idle_time)
+            *mouse_moved = false;
+    }
+
+    bool idle_result = true;
+#ifdef HAVE_UTMP_H
+    idle_result = idle_result && all_logins_idle(idle_time);
+#endif
+    idle_result = idle_result && (mouse_moved ? !*mouse_moved : true);
+    return idle_result;
+}
+
 #else  // ! __APPLE__
 
 bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run) {

lib/hostinfo.h

@@ -72 +72 @@
     bool host_is_running_on_batteries();
 #ifdef __APPLE__
     bool users_idle(bool check_all_logins, double idle_time_to_run, double *actual_idle_time=NULL);
+#elif linux
+    bool users_idle(bool check_all_logins, double idle_time_to_run, bool* mouse_moved = NULL, time_t mouse_event_t = 0);
 #else
     bool users_idle(bool check_all_logins, double idle_time_to_run);
 #endif

checkin_notes

@@ -7985 +7985 @@
     mac_installer/
         release_boinc.sh
         release_GridRepublic.sh
+
+Orson Teodoro 04 Jan 2008
+    - Linux: Input event mouse idle detection and segfault fix
+    client/
+        client_state.C
+        client_state.h
+        hostinfo_unix.C
+        main.C
+    lib/
+        hostinfo.h