automatic import of glibcopeneuler22.03_LTS_SP4openeuler22.03_LTS_SP3openeuler20.03

1 files changed, 102 insertions, 0 deletions

diff --git a/linux-Use-proc-stat-fallback-for-__get_nprocs_conf-B.patch b/linux-Use-proc-stat-fallback-for-__get_nprocs_conf-B.patch
new file mode 100644
index 0000000..57c9aa2
--- /dev/null
+++ b/linux-Use-proc-stat-fallback-for-__get_nprocs_conf-B.patch
@@ -0,0 +1,102 @@
+From 137ed5ac440a4d3cf4178ce97f349b349a9c2c66 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Thu, 25 Nov 2021 09:12:00 -0300
+Subject: [PATCH] linux: Use /proc/stat fallback for __get_nprocs_conf (BZ
+ #28624)
+
+The /proc/statm fallback was removed by f13fb81ad3159 if sysfs is
+not available, reinstate it.
+
+Checked on x86_64-linux-gnu.
+---
+ sysdeps/unix/sysv/linux/getsysstats.c | 60 ++++++++++++++++++++---------------
+ 1 file changed, 35 insertions(+), 25 deletions(-)
+
+diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
+index 15ad91c..d376f05 100644
+--- a/sysdeps/unix/sysv/linux/getsysstats.c
++++ b/sysdeps/unix/sysv/linux/getsysstats.c
+@@ -107,6 +107,37 @@ next_line (int fd, char *const buffer, char **cp, char **re,
+   return res == *re ? NULL : res;
+ }
+ 
++static int
++get_nproc_stat (char *buffer, size_t buffer_size)
++{
++  char *buffer_end = buffer + buffer_size;
++  char *cp = buffer_end;
++  char *re = buffer_end;
++
++  /* Default to an SMP system in case we cannot obtain an accurate
++     number.  */
++  int result = 2;
++
++  const int flags = O_RDONLY | O_CLOEXEC;
++  int fd = __open_nocancel ("/proc/stat", flags);
++  if (fd != -1)
++    {
++      result = 0;
++
++      char *l;
++      while ((l = next_line (fd, buffer, &cp, &re, buffer_end)) != NULL)
++	/* The current format of /proc/stat has all the cpu* entries
++	   at the front.  We assume here that stays this way.  */
++	if (strncmp (l, "cpu", 3) != 0)
++	  break;
++	else if (isdigit (l[3]))
++	  ++result;
++
++      __close_nocancel_nostatus (fd);
++    }
++
++  return result;
++}
+ 
+ int
+ __get_nprocs (void)
+@@ -162,30 +193,7 @@ __get_nprocs (void)
+ 	return result;
+     }
+ 
+-  cp = buffer_end;
+-  re = buffer_end;
+-
+-  /* Default to an SMP system in case we cannot obtain an accurate
+-     number.  */
+-  result = 2;
+-
+-  fd = __open_nocancel ("/proc/stat", flags);
+-  if (fd != -1)
+-    {
+-      result = 0;
+-
+-      while ((l = next_line (fd, buffer, &cp, &re, buffer_end)) != NULL)
+-	/* The current format of /proc/stat has all the cpu* entries
+-	   at the front.  We assume here that stays this way.  */
+-	if (strncmp (l, "cpu", 3) != 0)
+-	  break;
+-	else if (isdigit (l[3]))
+-	  ++result;
+-
+-      __close_nocancel_nostatus (fd);
+-    }
+-
+-  return result;
++  return get_nproc_stat (buffer, buffer_size);
+ }
+ libc_hidden_def (__get_nprocs)
+ weak_alias (__get_nprocs, get_nprocs)
+@@ -219,7 +227,9 @@ __get_nprocs_conf (void)
+       return count;
+     }
+ 
+-  return 1;
++  enum { buffer_size = 1024 };
++  char buffer[buffer_size];
++  return get_nproc_stat (buffer, buffer_size);
+ }
+ libc_hidden_def (__get_nprocs_conf)
+ weak_alias (__get_nprocs_conf, get_nprocs_conf)
+-- 
+1.8.3.1
+