process-attributes uses /proc/stat for boot time

With a Linux kernel, use /proc/stat rather than get_boot_time
to get boot time, since when Emacs is running in a container
we want the underlying host boot time, not the container boot time.
This should be a better way to fix Bug#63496.
* src/sysdep.c: Do not include boot-time.h.
(get_host_boot_time) [GNU_LINUX || CYGWIN || __ANDROID__]:
New function.
(system_process_attributes) [GNU_LINUX || CYGWIN || __ANDROID__]:
Use it instead of get_boot_time.

(cherry picked from commit 73cebbb87b72effb948f0d73e756a0dc0c55b71c)

diff --git a/src/sysdep.c b/src/sysdep.c
index 71108f50db18aba1b538c1603ce09743ae1879d6..1836891ab88f83a18c891ff68c6c8b8e9d8522dd 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -30,7 +30,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <sys/random.h>
 #include <unistd.h>
 
-#include <boot-time.h>
 #include <c-ctype.h>
 #include <close-stream.h>
 #include <pathmax.h>
@@ -3454,6 +3453,48 @@ put_jiffies (Lisp_Object attrs, Lisp_Object propname,
   return Fcons (Fcons (propname, time_from_jiffies (ticks, hz, Qnil)), attrs);
 }
 
+/* Get the host boot time into *BT and return 0 if successful;
+   otherwise, possibly set *BT and return -1.
+   Do not use get_boot_time, which returns a container's
+   boot time instead of the underlying host's boot time.  */
+static int
+get_host_boot_time (struct timespec *bt)
+{
+  int ret = -1;
+
+  block_input ();
+  FILE *fp = emacs_fopen ("/proc/stat", "r");
+
+  if (fp)
+    {
+      /* Look for "btime SECONDS" at line start, and return SECONDS if found.
+        N counts bytes currently matched in BTIME_PAT.
+        It starts at 1 to pretend scanning starts just after '\n'.  */
+      int n = 1;
+      static char const btime_pat[7] ATTRIBUTE_NONSTRING = "\nbtime ";
+
+      for (int c; 0 <= (c = getc (fp)); )
+       {
+         n = c == btime_pat[n] ? n + 1 : c == '\n';
+         if (n == sizeof btime_pat)
+           {
+             intmax_t btime;
+             if (fscanf (fp, "%jd", &btime) == 1)
+               {
+                 ret = -ckd_add (&bt->tv_sec, btime, 0);
+                 bt->tv_nsec = 0;
+               }
+             break;
+           }
+       }
+
+      emacs_fclose (fp);
+    }
+  unblock_input ();
+
+  return ret;
+}
+
 # if defined GNU_LINUX || defined __ANDROID__
 #define MAJOR(d) (((unsigned)(d) >> 8) & 0xfff)
 #define MINOR(d) (((unsigned)(d) & 0xff) | (((unsigned)(d) & 0xfff00000) >> 12))
@@ -3671,7 +3712,7 @@ system_process_attributes (Lisp_Object pid)
              attrs = put_jiffies (attrs, Qctime, cstime + cutime, hz);
 
              struct timespec bt;
-             if (get_boot_time (&bt) == 0)
+             if (get_host_boot_time (&bt) == 0)
                {
                  Lisp_Object boot = Ftime_convert (timespec_to_lisp (bt), hz);
                  Lisp_Object now = Ftime_convert (Qnil, hz);