Merge pull request #6242 from BOINC/dpa_idle_time2

client (Unix): add support for idle detection in a separate process

Author: davidpanderson

client/Makefile.linux

@@ -144,7 +144,7 @@ LIBS = ../lib/boinc.a \
     -lpthread \
     -lX11 \
     -lcurl -lssl -lcrypto \
-    -lz -ldl
+    -lz -ldl -lrt
 
 .cpp.o:
 	$(CC) -c -o $*.o $<

client/hostinfo_unix.cpp

@@ -49,7 +49,9 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
-
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
 #include <sys/param.h>
 
 #if HAVE_SYS_TYPES_H
@@ -65,8 +67,6 @@
 #include <sys/vmmeter.h>
 #endif
 
-#include <sys/stat.h>
-
 #if HAVE_SYS_SWAP_H
 #include <sys/swap.h>
 #endif
@@ -106,6 +106,7 @@
 #include "error_numbers.h"
 #include "common_defs.h"
 #include "filesys.h"
+#include "shmem.h"
 #include "str_util.h"
 #include "str_replace.h"
 #include "util.h"
@@ -541,12 +542,11 @@ static void parse_cpuinfo_linux(HOST_INFO& host) {
 
 #if defined(__aarch64__) || defined(__arm__)
         if (
-            // Hardware is specifying the board this CPU is on, store it in product_name while we parse /proc/cpuinfo
+            // Hardware is specifying the board this CPU is on,
+            // store it in product_name while we parse /proc/cpuinfo
             strstr(buf, "Hardware\t: ")
         ) {
-            // this makes sure we only ever copy as much bytes as we can still store in host.product_name
-            int t = sizeof(host.product_name) - strlen(host.product_name) - 2;
-            strlcpy(buf2, strchr(buf, ':') + 2, ((t<sizeof(buf2))?t:sizeof(buf2)));
+            strlcpy(buf2, strchr(buf, ':') + 2, sizeof(buf2));
             strip_whitespace(buf2);
             if (strlen(host.product_name)) {
                 safe_strcat(host.product_name, " ");
@@ -2291,9 +2291,92 @@ long xss_idle() {
 
 #endif // LINUX_LIKE_SYSTEM
 
+#ifndef ANDROID     // Android doesn't have shm_open()
+// idle time detection.
+// old approach: do it ourselves by looking at devices
+//  and trying to get info from X11
+//  (big mess, permissions problems, doesn't generally work)
+// new approach: get last-input time from a separate daemon process,
+//  communicated via shmem
+
+bool get_idle_time_from_daemon(long &idle_time) {
+    static int64_t* seg_ptr = NULL;
+    if (!seg_ptr) {
+        int fd = shm_open("/idle_detect_shmem",  O_RDONLY, 0);
+        if (fd < 0) {
+            return false;
+        }
+
+        struct stat st;
+        if (fstat(fd, &st)) {
+            close(fd);
+            return false;
+        }
+        if (st.st_size < 2*sizeof(int64_t)) {
+            close(fd);
+            return false;
+        }
+
+        int64_t* mapped_ptr = (int64_t*)mmap(
+            NULL, 2*sizeof(int64_t), PROT_READ, MAP_SHARED, fd, 0
+        );
+        close(fd);
+        if (mapped_ptr == MAP_FAILED) {
+            return false;
+        }
+
+        seg_ptr = mapped_ptr;
+    }
+    if (!seg_ptr) return false;
+
+    // make sure the shmem is actually being updated
+    //
+    int64_t update_time = seg_ptr[0];
+    if (update_time > gstate.now+10) return false;
+    if (update_time < gstate.now-60) return false;
+
+    int64_t input_time = seg_ptr[1];
+    idle_time = gstate.now - input_time;
+    //printf("idle time: %ld\n", idle_time);
+    return true;
+}
+
+bool detect_wayland() {
+    const char* wayland_display = getenv("WAYLAND_DISPLAY");
+    if (wayland_display && strlen(wayland_display)) {
+        return true;
+    }
+    const char* xdg_session_type = getenv("XDG_SESSION_TYPE");
+    if (xdg_session_type && strcmp(xdg_session_type, "wayland") == 0) {
+        return true;
+    }
+    return false;
+}
+
+#endif      // !ANDROID
+
+// get idle time.  Try the new approach, if it fails use old
+//
 long HOST_INFO::user_idle_time(bool check_all_logins) {
     long idle_time = USER_IDLE_TIME_INF;
 
+#ifndef ANDROID
+    static bool show_idle_time_legacy_warning = true;
+    if (get_idle_time_from_daemon(idle_time)) {
+        show_idle_time_legacy_warning = false;
+        return idle_time;
+    }
+
+    if (show_idle_time_legacy_warning) {
+        msg_printf(NULL, MSG_INFO,
+            "Currently BOINC uses legacy idle detection methods that might not \
+work properly on all systems. Please consider installing a modern idle detection \
+utility that works on Wayland and X11: \
+https://github.com/jamescowens/idle_detect");
+        show_idle_time_legacy_warning = false;
+    }
+#endif
+
 #if HAVE_UTMP_H
     if (check_all_logins) {
         idle_time = min(idle_time, all_logins_idle());
@@ -2305,7 +2388,13 @@ long HOST_INFO::user_idle_time(bool check_all_logins) {
 #if LINUX_LIKE_SYSTEM
 
 #if HAVE_XSS
-    idle_time = min(idle_time, xss_idle());
+#ifndef ANDROID
+    static bool wayland_detected = detect_wayland();
+    if (!wayland_detected) {
+        //printf("Using XScreenSaver API for idle detection\n");
+        idle_time = min(idle_time, xss_idle());
+    }
+#endif // !ANDROID
 #endif // HAVE_XSS
 
 #else

configure.ac

@@ -556,7 +556,7 @@ dnl Special rules for specific targets go here:  It's easier to add static libs
 dnl than subtract them.  If you need to remove something from the list above,
 dnl please add it to the lists below...
 case ${target} in
-	*-linux*|*-k*bsd*-gnu)	STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl"
+	*-linux*|*-k*bsd*-gnu)	STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl rt"
 	;;
 	*-solaris*)	STATIC_LIB_LIST="${STATIC_LIB_LIST} X* ssl crypto"
 	;;
@@ -594,7 +594,7 @@ ERROR: could not find (recent enough) development-libs for libcurl.
       ],
       [
         ## add libcurl et al. to the list of statically linked libs
-        STATIC_LIB_LIST="${STATIC_LIB_LIST} curl idn ssh2 crypto ssl krb5 k5crypto gssapi_krb5 com_err resolv lber ldap socket nsl z rt gcrypt gpg-error"
+        STATIC_LIB_LIST="${STATIC_LIB_LIST} curl idn ssh2 ssl crypto krb5 k5crypto gssapi_krb5 com_err resolv lber ldap socket nsl z rt gcrypt gpg-error"
         CPPFLAGS="${CPPFLAGS} ${LIBCURL_CPPFLAGS}"
         CURL_LIB_PATHS=`echo $LIBCURL | sed 's/[^[a-zA-Z]]*-l[^ ]*//g'`
 
@@ -628,6 +628,8 @@ SAH_CHECK_LIB([freetype], [fopen],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
 SAH_CHECK_LIB([socket], [bind],
     [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
+SAH_CHECK_LIB([rt], [shm_open],
+    [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
 SAH_CHECK_LIB([z], [gzopen], [
       zlib_found=yes
       BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])

lib/hostinfo.h

@@ -126,7 +126,8 @@ class HOST_INFO {
 
     bool host_is_running_on_batteries();
     long user_idle_time(bool check_all_logins);
-        // seconds since last user interaction
+        // seconds since last user interaction,
+        // or a large number (USER_IDLE_TIME_INF) if we have no info
     int get_host_info(bool init);
     int get_cpu_info();
     int get_cpu_count();