开源软件构建与测试

_service:tar_scm:procps-ng.spec Changed

@@ -1,5 +1,5 @@
 Name: 		procps-ng
-Version: 	3.3.17
+Version: 	4.0.2
 Release:	2
 Summary: 	Utilities that provide system information.
 License: 	GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
@@ -9,11 +9,10 @@
 Source1: 	README.md
 Source2: 	README.top
 
-Patch1: 	0001-top-fix-two-potential-alternate-display-mode-abends.patch
-Patch2: 	0002-top-In-the-bye_bye-function-replace-fputs-with-the-w.patch
-Patch3: 	0003-add-options-M-and-N-for-top.patch
-Patch4: 	0004-top-exit-with-error-when-pid-overflow.patch
-Patch5:		0005-fix-a-fix-for-the-bye_bye-function.patch
+Patch1: 	openeuler-add-M-and-N-options-for-top.patch
+Patch2: 	openeuler-top-exit-with-error-when-pid-overflow.patch
+Patch3:		skill-Restore-the-p-flag-functionality.patch
+Patch4:		backport-top-address-the-missing-guest-tics-for-summary-area.patch
 
 BuildRequires: 	ncurses-devel libtool autoconf automake gcc gettext-devel systemd-devel
 
@@ -45,10 +44,10 @@
 %package_help
 
 %prep
-%autosetup -n procps-%{version} -p1
+%autosetup -n procps-ng-%{version} -p1
 
 cp -p %{SOURCE1} .
-cp -p %{SOURCE2} top/
+cp -p %{SOURCE2} src/top/
 
 %build
 autoreconf -ivf
@@ -58,6 +57,9 @@
 
 make CFLAGS="%{optflags}"
 
+%check
+make check
+
 %install
 %make_install
 
@@ -71,10 +73,10 @@
 %doc COPYING COPYING.LIB
 %{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LIB
-%{_libdir}/libprocps.so.*
+%{_libdir}/libproc2.so.*
 %{_bindir}/*
 %{_sbindir}/*
-%exclude %{_libdir}/libprocps.la
+%exclude %{_libdir}/libproc2.la
 %exclude /unwanted/*
 %exclude %{_libdir}/*.a
 
@@ -82,17 +84,35 @@
 %doc COPYING COPYING.LIB
 %{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LIB
-%{_libdir}/libprocps.so
-%{_libdir}/pkgconfig/libprocps.pc
-%{_includedir}/proc
+%{_libdir}/libproc2.so
+%{_libdir}/pkgconfig/libproc2.pc
+%{_includedir}/libproc2
 
 %files i18n -f %{name}.lang
 
 %files help
-%doc AUTHORS Documentation/bugs.md Documentation/FAQ NEWS README.md top/README.top Documentation/TODO
+%doc AUTHORS NEWS README.md
 %{_mandir}/man*
 
 %changelog
+* Sat Mar 25 2023 zhoujie <zhoujie133@huawei.com> - 4.0.2-2
+- top: top address the missing guest tics for summary area
+
+* Wed Feb 1 2023 Qiang Wei <qiang.wei@suse.com> - 4.0.2-1
+- Update to 4.0.2.
+
+* Mon Dec 12 2022 Liu Chao <liuchao173@huawei.com> - 4.0.0-4
+- skill: Restore the -p flag functionality
+ 
+* Tue Nov 29 2022 zhoujie <zhoujie133@huawei.com> - 4.0.0-3
+- enable make check
+
+* Mon Nov 7 2022 zhoujie <zhoujie133@huawei.com> - 4.0.0-2
+- top eliminate a potential abend when exiting A mode
+
+* Fri Nov 4 2022 zhoujie <zhoujie133@huawei.com> - 4.0.0-1
+- update the release to 4.0.0-1
+
 * Sat Jan 29 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 3.3.17-2
 - fix file type chamges caused by top -b redirection

_service:tar_scm:0001-top-fix-two-potential-alternate-display-mode-abends.patch Deleted

@@ -1,79 +0,0 @@
-From 84e85611c36d31a478e1b62e5668671d9389265d Mon Sep 17 00:00:00 2001
-From: Jim Warner <james.warner@comcast.net>
-Date: Mon, 31 May 2021 00:00:00 -0500
-Subject: PATCH top: fix two potential 'alternate display mode' abends
-
-This commit will address potential abends upon leaving
-the windows help or color mapping screens and invoking
-alternate display mode ('A').  It only happens if that
-current window was changed with multiple 'a'/'w' keys.
-
-So now, rather than leaving a trail of negative values
-in the 'begtask' field, compliments of that win_select
-function, we'll remove the mkVIZrow1 macro. Henceforth
-it will be issued just once per user interaction. Thus
-a promise of 'Curwin' only being impacted is restored.
-
- my thanks to Vladimir Chren for reporting this bug 
-
-Reference(s):
-https://gitlab.com/procps-ng/procps/-/issues/210
-https://gitlab.com/procps-ng/procps/-/merge_requests/135
-
-Discovered by:Vladimir Chren <vladimir.chren@gmail.com>
-Signed-off-by: Jim Warner <james.warner@comcast.net>
----
- top/top.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/top/top.c b/top/top.c
-index c1f30fb..dd6e3d5 100644
---- a/top/top.c
-+++ b/top/top.c
-@@ -4475,7 +4475,6 @@ static WIN_t *win_select (int ch) {
-          break;
-    }
-    Curwin = w;
--   mkVIZrow1(Curwin);
-    return Curwin;
- } // end: win_select
- 
-@@ -5148,6 +5147,7 @@ static void keys_global (int ch) {
-       case '?':
-       case 'h':
-          help_view();
-+         mkVIZrow1(Curwin);
-          break;
-       case 'B':
-          TOGw(w, View_NOBOLD);
-@@ -5175,6 +5175,7 @@ static void keys_global (int ch) {
-          break;
-       case 'g':
-          win_select(0);
-+         mkVIZrow1(Curwin);
-          break;
-       case 'H':
-          Thread_mode = !Thread_mode;
-@@ -5254,6 +5255,7 @@ static void keys_global (int ch) {
-          break;
-       case 'Z':
-          wins_colors();
-+         mkVIZrow1(Curwin);
-          break;
-       case '0':
-          Rc.zero_suppress = !Rc.zero_suppress;
-@@ -5573,7 +5575,10 @@ static void keys_window (int ch) {
-          break;
-       case 'a':
-       case 'w':
--         if (ALTCHKw) win_select(ch);
-+         if (ALTCHKw) {
-+            win_select(ch);
-+            mkVIZrow1(Curwin);
-+         }
-          break;
-       case 'G':
-          if (ALTCHKw) {
--- 
-1.8.3.1
-

_service:tar_scm:0002-top-In-the-bye_bye-function-replace-fputs-with-the-w.patch Deleted

@@ -1,35 +0,0 @@
-From 0bf15c004db6a3342703a3c420a5692e376c457d Mon Sep 17 00:00:00 2001
-From: Shaohua Zhan <shaohua.zhan@windriver.com>
-Date: Thu, 3 Dec 2020 10:24:09 +0800
-Subject: PATCH top: In the bye_bye function, replace fputs with the write
- interface.
-
-When top calls malloc, if a signal is received, it will
-call sig_endpgm to process the signal. In the bye_bye function, if the
--b option is enable, the Batch variable is set, the fputs function
-will calls malloc at the same time. The malloc function is not reentrant, so
-it will cause the program to crash.
-
-Signed-off-by: Shaohua Zhan <shaohua.zhan@windriver.com>
----
- top/top.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/top/top.c b/top/top.c
-index 2ec6357..eb62001 100644
---- a/top/top.c
-+++ b/top/top.c
-@@ -571,7 +571,9 @@ static void bye_bye (const char *str) {
-       fputs(str, stderr);
-       exit(EXIT_FAILURE);
-    }
--   if (Batch) fputs("\n", stdout);
-+   if (Batch) {
-+      write(fileno(stdout), "\n", sizeof("\n"));
-+   }
-    exit(EXIT_SUCCESS);
- } // end: bye_bye
- 
--- 
-1.8.3.1
-

_service:tar_scm:0003-add-options-M-and-N-for-top.patch Deleted

@@ -1,55 +0,0 @@
-From 6e59f5e746c15df4d4b53f2df85b64aa1f10d0c3 Mon Sep 17 00:00:00 2001
-From: xuchunmei <xuchunmei@huawei.com>
-Date: Fri, 11 Jan 2019 01:29:55 -0500
-Subject: PATCH procps-ng: add -M and -N options for top
-
-Signed-off-by: xuchunmei <xuchunmei@huawei.com>
----
- top/top.c     | 17 +++++++++++++++++
- top/top_nls.c |  2 +-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/top/top.c b/top/top.c
-index b53e532..20cf7a1 100644
---- a/top/top.c
-+++ b/top/top.c
-@@ -4337,6 +4337,23 @@ static void parse_args (char **args) {
-                args += ai;
-                if (pn) cp = pn + ci;
-             }  continue;
-+             case 'M':
-+			{
-+                 Curwin->rc.sortindx = EU_MEM;
-+                 break;
-+			}
-+             case 'N':
-+			{
-+			     if (cp1)
-+                     cp++;
-+                 else if (*args)
-+                     cp = *args++;
-+                 else
-+                     error_exit("-N requires argument");
-+                 if (sscanf(cp, "%d", &Curwin->rc.maxtasks) != 1 || Curwin->rc.maxtasks < 0)
-+                     error_exit(fmtmk("bad iterations arg '%s'", cp));
-+                 break;
-+			}
-             default :
-                error_exit(fmtmk(N_fmt(UNKNOWN_opts_fmt)
-                   , *cp, Myname, N_txt(USAGE_abbrev_txt)));
-diff --git a/top/top_nls.c b/top/top_nls.c
-index ab3029e..97c3468 100644
---- a/top/top_nls.c
-+++ b/top/top_nls.c
-@@ -350,7 +350,7 @@ static void build_norm_nlstab (void) {
-    Norm_nlstabOFF_one_word_txt = _("Off");
- /* Translation Hint: Only the following words should be translated
-    .                 secs (seconds), max (maximum), user, field, cols (columns)*/
--   Norm_nlstabUSAGE_abbrev_txt = _(" -hv | -bcEeHiOSs1 -d secs -n max -u|U user -p pid(s) -o field -w cols");
-+   Norm_nlstabUSAGE_abbrev_txt = _(" -hv | -bcEeHiOSs1 -d secs -n max -u|U user -p pid(s) -o field -w cols -M -N num");
-    Norm_nlstabFAIL_statget_txt = _("failed /proc/stat read");
-    Norm_nlstabFOREST_modes_fmt = _("Forest mode %s");
-    Norm_nlstabFAIL_tty_get_txt = _("failed tty get");
--- 
-2.27.0
-

_service:tar_scm:0004-top-exit-with-error-when-pid-overflow.patch Deleted

_service:tar_scm:0005-fix-a-fix-for-the-bye_bye-function.patch Deleted

@@ -1,39 +0,0 @@
-From 27e60e86e9f5b85520da001422176700fc9d824a Mon Sep 17 00:00:00 2001
-From: Jim Warner <james.warner@comcast.net>
-Date: Mon, 21 Jun 2021 00:00:00 -0500
-Subject: PATCH top: fix a fix for the 'bye_bye' function (merge #127)
-
-In the merge request shown below, 1 too many bytes are
-written to stdout thus including the terminating null.
-As the cure, this commit just reduces the length by 1.
-
- along the way, we will remove some unneeded braces 
- plus add some additional comments with attribution 
-
-Reference(s):
-https://gitlab.com/procps-ng/procps/-/merge_requests/127
-. original ported cchange
-commit 6b8980a3b6279058d727377e914cfb6439d6f178
-
-Signed-off-by: Jim Warner <james.warner@comcast.net>
-
----
- top/top.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/top/top.c b/top/top.c
-index b3e1bcf..9248c7a 100644
---- a/top/top.c
-+++ b/top/top.c
-@@ -572,7 +572,7 @@ static void bye_bye (const char *str) {
-       exit(EXIT_FAILURE);
-    }
-    if (Batch) {
--      write(fileno(stdout), "\n", sizeof("\n"));
-+      write(fileno(stdout), "\n", sizeof("\n") - 1);
-    }
-    exit(EXIT_SUCCESS);
- } // end: bye_bye
--- 
-1.8.3.1
-

_service:tar_scm:backport-top-address-the-missing-guest-tics-for-summary-area.patch Added

@@ -0,0 +1,93 @@
+From bb7e161d5a06f1bbd5a98cf868eab356c6c1bac2 Mon Sep 17 00:00:00 2001
+From: Jim Warner <james.warner@comcast.net>
+Date: Thu, 16 Mar 2023 00:00:00 -0500
+Subject: PATCH top: address the missing 'guest' tics for summary area
+
+Well this is embarrassing. After repeatedly flogging a
+horse (represented by issue #274) I was certain it was
+dead. But, it turns out that the darn thing yet lived.
+
+In fact, the bug that was patched was not even the one
+the poster experienced. Now merge request #173 finally
+penetrated my foggy brain and explicated the real bug.
+
+Since forever (linux 2.6), top has ignored those guest
+and guest_nice fields in /proc/stat. When many virtual
+machines were running that overhead went unrecognized.
+
+So, this commit simply adds those tics to the 'system'
+figures so that it can be seen in text or graph modes.
+
+Reference(s):
+https://gitlab.com/procps-ng/procps/-/merge_requests/173
+
+https://gitlab.com/procps-ng/procps/-/issues/274
+. Mar 2023, avoid keystroke '%Cpu' distortions
+commit 7e33fc47c642aceea8ad53e86a6797239b91f5f9
+
+Signed-off-by: Jim Warner <james.warner@comcast.net>
+---
+ man/top.1     | 7 +++++--
+ src/top/top.c | 7 +++++++
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/man/top.1 b/man/top.1
+index 5a77beb1..8bf804aa 100644
+--- a/man/top.1
++++ b/man/top.1
+@@ -527,6 +527,9 @@ Depending on your kernel version, the \fBst\fR field may not be shown.
+     \fBst\fR : time stolen from this vm by the hypervisor
+ .fi
+ 
++The `sy' value above also reflects the time running a virtual \*(Pu
++for guest operating systems, including those that have been niced.
++
+ Beyond the first tasks/threads line, there are alternate \*(PU display
+ modes available via the 4-way `t' \*(CT.
+ They show an abbreviated summary consisting of these elements:
+@@ -537,8 +540,8 @@ They show an abbreviated summary consisting of these elements:
+ .fi
+ 
+ Where: a) is the `user' (us + ni) percentage; b) is the `system'
+-(sy + hi + si) percentage; c) is the total percentage; and d) is
+-one of two visual graphs of those representations.
++(sy + hi + si + guests) percentage; c) is the total percentage;
++and d) is one of two visual graphs of those representations.
+ Such graphs also reflect separate `user' and `system' portions.
+ 
+ If the `4' \*(CT is used to yield more than two cpus per line,
+diff --git a/src/top/top.c b/src/top/top.c
+index 26a9adb5..02ef8f6d 100644
+--- a/src/top/top.c
++++ b/src/top/top.c
+@@ -286,6 +286,7 @@ static enum stat_item Stat_items = {
+    STAT_TIC_DELTA_NICE,     STAT_TIC_DELTA_IDLE,
+    STAT_TIC_DELTA_IOWAIT,   STAT_TIC_DELTA_IRQ,
+    STAT_TIC_DELTA_SOFTIRQ,  STAT_TIC_DELTA_STOLEN,
++   STAT_TIC_DELTA_GUEST,    STAT_TIC_DELTA_GUEST_NICE,
+    STAT_TIC_SUM_DELTA_USER, STAT_TIC_SUM_DELTA_SYSTEM,
+ #ifdef CORE_TYPE_NO
+    STAT_TIC_SUM_DELTA_TOTAL };
+@@ -298,6 +299,7 @@ enum Rel_statitems {
+    stat_NI, stat_IL,
+    stat_IO, stat_IR,
+    stat_SI, stat_ST,
++   stat_GU, stat_GN,
+    stat_SUM_USR, stat_SUM_SYS,
+ #ifdef CORE_TYPE_NO
+    stat_SUM_TOT };
+@@ -6340,6 +6342,11 @@ static int sum_tics (struct stat_stack *this, const char *pfx, int nobuf) {
+    if (1 > tot_frme) idl_frme = tot_frme = 1;
+    scale = 100.0 / (float)tot_frme;
+ 
++   /* account for VM tics not otherwise provided for ...
++      ( with xtra-procps-debug.h, can't use PID_VAL w/ assignment ) */
++   this->headstat_SY.result.sl_int += rSv(stat_GU) + rSv(stat_GN);
++   this->headstat_SUM_SYS.result.sl_int += rSv(stat_GU) + rSv(stat_GN);
++
+    /* display some kinda' cpu state percentages
+       (who or what is explained by the passed prefix) */
+    if (Curwin->rc.graph_cpus) {
+-- 
+2.27.0
+

_service:tar_scm:openeuler-add-M-and-N-options-for-top.patch Added

@@ -0,0 +1,62 @@
+From 6e59f5e746c15df4d4b53f2df85b64aa1f10d0c3 Mon Sep 17 00:00:00 2001
+From: xuchunmei <xuchunmei@huawei.com>
+Date: Fri, 11 Jan 2019 01:29:55 -0500
+Subject: PATCH procps-ng: add -M and -N options for top
+
+Signed-off-by: xuchunmei <xuchunmei@huawei.com>
+Signed-off-by: zhoujie <zhoujie133@huawei.com>
+Signed-off-by: Qiang Wei <qiang.wei@suse.com>
+---
+ top/top.c     | 15 ++++++++++++++-
+ top/top_nls.c |  2 ++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+--- a/src/top/top.c
++++ b/src/top/top.c
+@@ -4227,7 +4227,7 @@ default_or_error:
+          *       overridden -- we'll force some on and negate others in our
+          *       best effort to honor the loser's (oops, user's) wishes... */
+ static void parse_args (int argc, char **argv) {
+-    static const char sopts = "bcd:E:e:Hhin:Oo:p:SsU:u:Vw::1";
++    static const char sopts = "bcd:E:e:Hhin:Oo:p:SsU:u:Vw::1MN:";
+     static const struct option lopts = {
+        { "batch-mode",        no_argument,       NULL, 'b' },
+        { "cmdline-toggle",    no_argument,       NULL, 'c' },
+@@ -4248,6 +4248,8 @@ static void parse_args (int argc, char *
+        { "version",           no_argument,       NULL, 'V' },
+        { "width",             optional_argument, NULL, 'w' },
+        { "single-cpu-toggle", no_argument,       NULL, '1' },
++       { "sort-by-mem",       no_argument,       NULL, 'M' },
++       { "display-task-num",  required_argument, NULL, 'N' },
+        { NULL, 0, NULL, 0 }
+    };
+    float tmp_delay = FLT_MAX;
+@@ -4370,6 +4372,17 @@ static void parse_args (int argc, char *
+                error_exit(fmtmk(N_fmt(BAD_widtharg_fmt), cp));
+             Width_mode = (int)tmp;
+             continue;
++	 case 'M':
++         {
++            Curwin->rc.sortindx = EU_MEM;
++               break;
++         }
++         case 'N':
++         {
++            if (sscanf(cp, "%d", &Curwin->rc.maxtasks) != 1 || Curwin->rc.maxtasks < 0)
++               error_exit(fmtmk("bad iterations arg '%s'", cp));
++            continue;
++         }
+          default:
+             // we'll rely on getopt for any error message ...
+             bye_bye(NULL);
+--- a/src/top/top_nls.c
++++ b/src/top/top_nls.c
+@@ -431,6 +431,8 @@ static void build_norm_nlstab (void) {
+       " -u, --filter-only-euser =USER   show only processes owned by USER\n"
+       " -w, --width =COLUMNS          change print width ,use COLUMNS\n"
+       " -1, --single-cpu-toggle         reverse last remembered '1' state\n"
++      " -M, --sort-by-mem               show tasks by memory usage\n"
++      " -N, --show-task-num		show the specified number of tasks\n"
+       "\n"
+       " -h, --help                      display this help text, then exit\n"
+       " -V, --version                   output version information & exit\n"

_service:tar_scm:openeuler-top-exit-with-error-when-pid-overflow.patch Added

_service:tar_scm:skill-Restore-the-p-flag-functionality.patch Added

@@ -0,0 +1,85 @@
+From f7a33746f8484629df9055f9a2dc5654f377c2fe Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@dropbear.xyz>
+Date: Mon, 12 Dec 2022 16:46:36 +1100
+Subject: PATCH skill: Restore the -p flag functionality
+
+When the skill program was ported to the new API the code to filter
+on PID, used by the -p option, was missed. It is now restored.
+
+References:
+ https://bugs.debian.org/1025915
+
+Signed-off-by: Qiang Wei <qiang.wei@suse.com>
+---
+ NEWS                           |  4 ++++
+ src/skill.c                    |  2 ++
+ testsuite/skill.test/skill.exp | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 38 insertions(+)
+ create mode 100644 testsuite/skill.test/skill.exp
+
+diff --git a/NEWS b/NEWS
+index d334c0d6..2d13978d 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,7 @@
++procps-ng-NEXT
++---------------
++  * docs: Don't install English manpages twice
++  * skill: Match on -p again                               Debian #1025915
+ procps-ng-4.0.2
+ ---------------
+   * library revision - 0:1:0
+diff --git a/src/skill.c b/src/skill.c
+index 9f617bfd..c2e52744 100644
+--- a/src/skill.c
++++ b/src/skill.c
+@@ -287,6 +287,8 @@ static void scan_procs(struct run_time_conf_t *run_time)
+     for (i=0; i < total_procs; i++) {
+         if (PIDS_GETINT(PID) == my_pid || PIDS_GETINT(PID) == 0)
+             continue;
++	if (pids && !match_intlist(PIDS_GETINT(PID), pid_count, pids))
++	    continue;
+         if (uids && !match_intlist(PIDS_GETUNT(EUID), uid_count, (int *)uids))
+             continue;
+         if (ttys && !match_intlist(PIDS_GETINT(TTY), tty_count, ttys))
+diff --git a/testsuite/skill.test/skill.exp b/testsuite/skill.test/skill.exp
+new file mode 100644
+index 00000000..162d9610
+--- /dev/null
++++ b/testsuite/skill.test/skill.exp
+@@ -0,0 +1,32 @@
++#
++# Dejagnu testsuite for skill - part of procps
++#
++set skill ${topdir}src/skill
++set tty  get_tty 
++
++if { ! file exists $skill  } {
++    untested { skipping (not built)}
++    return
++}
++
++set test "skill with no arguments"
++spawn $skill
++expect_pass "$test" "Usage:\\s+$lt-$?skill \\\signal\\\ \\\options\\\ <expression>"
++
++set test "skill list signal names"
++spawn $skill -l
++expect_pass "$test" "^$\A-Z12+-\\\s*$+$"
++
++set test "skill list signal names in table"
++spawn $skill -L
++expect_pass "$test" "^$\\s+\\d+ \A-Z12+-\+$+\\s*$"
++
++make_testproc
++
++# Debian 1025915
++set test "skill find one process"
++spawn $skill -n -p $testproc1_pid
++expect_pass "$test" "^$testproc1_pid\\s*$"
++
++# Cleanup
++kill_testproc
+-- 
+2.33.0
+

_service Changed

_service:tar_scm:procps-ng-3.3.17.tar.xz -> _service:tar_scm:procps-ng-4.0.2.tar.xz Changed

Changes of Revision 2