diff --git a/bugfix-check-unsigned-number-flip-before-getting-del.patch b/bugfix-check-unsigned-number-flip-before-getting-del.patch index f1535a1b7a1418c8699629b0cf18adb621ffb7c2..53eafc9321ac8e83878781865f98fda48c94a609 100644 --- a/bugfix-check-unsigned-number-flip-before-getting-del.patch +++ b/bugfix-check-unsigned-number-flip-before-getting-del.patch @@ -1,7 +1,7 @@ From 4eb3e65353484c6c5cf81046d7b2296151ef3b83 Mon Sep 17 00:00:00 2001 From: nocjj <1250062498@qq.com> Date: Sat, 19 Sep 2020 14:48:06 +0800 -Subject: [PATCH 4/4] bugfix: check unsigned number flip before getting delta +Subject: [PATCH] bugfix: check unsigned number flip before getting delta Sometimes, a very large number will appear in EXTxxx display items. The reason of this phenomenon is that we do not check the size of diff --git a/bugfix-exit-vmtop-when-arguments-are-invalid.patch b/bugfix-exit-vmtop-when-arguments-are-invalid.patch index 01cd4ed43738e0dcc0196e174a277d9ae4935b13..93272a3ac40b641df80b24c02474736dffd7221a 100644 --- a/bugfix-exit-vmtop-when-arguments-are-invalid.patch +++ b/bugfix-exit-vmtop-when-arguments-are-invalid.patch @@ -1,7 +1,7 @@ From 92239c1b444cd3f2904e2b3d7c7eaada1e9693ec Mon Sep 17 00:00:00 2001 From: nocjj <1250062498@qq.com> Date: Sat, 19 Sep 2020 11:46:08 +0800 -Subject: [PATCH 3/4] bugfix: exit vmtop when arguments are invalid +Subject: [PATCH] bugfix: exit vmtop when arguments are invalid Currently if vmtop receive invalid args, vmtop will still run. It is a abnormal behavior, so exit vmtop when arguments are invalid. diff --git a/bugfix-fix-ST-GUE-HYP-formula.patch b/bugfix-fix-ST-GUE-HYP-formula.patch index b30e47b4dc17dcdc75163406b95676aa13399cd1..20965e1b0806b683aab4d6449e0aa47e63e0bdb4 100644 --- a/bugfix-fix-ST-GUE-HYP-formula.patch +++ b/bugfix-fix-ST-GUE-HYP-formula.patch @@ -1,7 +1,7 @@ From f4189eb5ddbebe0ddf58e7ea4bd25e8a5141930f Mon Sep 17 00:00:00 2001 From: nocjj <1250062498@qq.com> Date: Mon, 14 Sep 2020 20:02:23 +0800 -Subject: [PATCH 1/4] bugfix: fix %ST, %GUE, %HYP formula +Subject: [PATCH] bugfix: fix %ST, %GUE, %HYP formula Since the steal time, gtime, stime which are acquired from debugfs count in ns unit, the usage formula should be: diff --git a/display-expand-row-size-in-TEXT-mode.patch b/display-expand-row-size-in-TEXT-mode.patch index 3443be3f17fb5fdd8f78373ce1876172b87e1666..78a1bebb03564c16ed50872f1730587d1726b9d4 100644 --- a/display-expand-row-size-in-TEXT-mode.patch +++ b/display-expand-row-size-in-TEXT-mode.patch @@ -1,7 +1,7 @@ From bd91aa4d39611d838ca60f8c3f27473e6a6b0c59 Mon Sep 17 00:00:00 2001 From: nocjj <1250062498@qq.com> Date: Sat, 19 Sep 2020 11:36:36 +0800 -Subject: [PATCH 2/4] display: expand row size in TEXT mode +Subject: [PATCH] display: expand row size in TEXT mode Currently default row size = 1024, which means only 1024 row will show in TEXT mode. But in some case, there are more than 1024 tasks diff --git a/vmtop-add-h-and-v.patch b/vmtop-add-h-and-v.patch new file mode 100644 index 0000000000000000000000000000000000000000..81a8896dad7fd21097327ad58d651cb81a895ddd --- /dev/null +++ b/vmtop-add-h-and-v.patch @@ -0,0 +1,77 @@ +From 5ec77f193aaf69750c74e15a1da60b4404a757d1 Mon Sep 17 00:00:00 2001 +From: chenruyi 00589904 +Date: Mon, 21 Sep 2020 16:36:36 +0800 +Subject: [PATCH] vmtop: add -h and -v + +Signed-off-by: Ruyi Chen +--- + src/field.c | 10 ++++++++++ + src/field.h | 2 ++ + src/vmtop.c | 10 +++++++++- + 3 files changed, 21 insertions(+), 1 deletion(-) + +diff --git a/src/field.c b/src/field.c +index 21be4fd..6a07fcc 100644 +--- a/src/field.c ++++ b/src/field.c +@@ -20,6 +20,16 @@ const char *filter_help = "" + "field filter - select which field to be showed\n" + "Use up/down to navigate, use space to set whether chosen filed to be showed\n" + "'q' to quit to normal display\n"; ++const char *help_text = "" ++ "usage: vmtop [option] [arg]\n" ++ "-b :output as text, which can be used for redirections\n" ++ "-d sec :set the refresh interval to secs\n" ++ "-h :print this help message and exit\n" ++ "-H :displays VM thread information\n" ++ "-n num :set the number of refresh times before automatic quit\n" ++ "-v :show VMTOP version and exit\n"; ++const char *version_text = "" ++ "vmtop-%s\n"; + + FID fields[] = { + /* name . flag . align */ +diff --git a/src/field.h b/src/field.h +index 4744ab7..ff98ee4 100644 +--- a/src/field.h ++++ b/src/field.h +@@ -48,6 +48,8 @@ typedef struct _field { + extern FID fields[]; + extern const char *summary_text; + extern const char *filter_help; ++extern const char *help_text; ++extern const char *version_text; + + int get_show_field_num(void); + #endif +diff --git a/src/vmtop.c b/src/vmtop.c +index 7a1b19b..796c67f 100644 +--- a/src/vmtop.c ++++ b/src/vmtop.c +@@ -70,7 +70,7 @@ static void init_parameter(void) + static void parse_args(int argc, char *argv[]) + { + int opt; +- char *arg_ops = "Hd:n:b"; ++ char *arg_ops = "hvHd:n:b"; + while ((opt = getopt(argc, argv, arg_ops)) != -1) { + switch (opt) { + case 'd': { +@@ -84,6 +84,14 @@ static void parse_args(int argc, char *argv[]) + thread_mode = 1; + break; + } ++ case 'h': { ++ printf(help_text); ++ exit(0); ++ } ++ case 'v': { ++ printf(version_text, PACKAGE_VERSION); ++ exit(0); ++ } + case 'n': { + display_loop = atoi(optarg); + if (display_loop == 0) { +-- +2.23.0 + diff --git a/vmtop.spec b/vmtop.spec index 15a4f6872d1b5d78ce1892386495343e452574bd..7221f47f9364d19ebc6266814097405a52c09fc7 100644 --- a/vmtop.spec +++ b/vmtop.spec @@ -1,6 +1,6 @@ Name: vmtop Version: 1.0 -Release: 2 +Release: 3 Summary: A tool for collecting and analyzing data of virtual machine License: Mulan PSL V2 Group: Application/System @@ -12,6 +12,11 @@ Patch0001: bugfix-fix-ST-GUE-HYP-formula.patch Patch0002: display-expand-row-size-in-TEXT-mode.patch Patch0003: bugfix-exit-vmtop-when-arguments-are-invalid.patch Patch0004: bugfix-check-unsigned-number-flip-before-getting-del.patch +Patch0005: bugfix-fix-ST-GUE-HYP-formula.patch +Patch0006: display-expand-row-size-in-TEXT-mode.patch +Patch0007: bugfix-exit-vmtop-when-arguments-are-invalid.patch +Patch0008: bugfix-check-unsigned-number-flip-before-getting-del.patch +Patch0009: vmtop-add-h-and-v.patch Requires: libvirt, ncurses @@ -52,6 +57,15 @@ install -m 550 vmtop ${RPM_BUILD_ROOT}/usr/bin/%{name} %{_bindir}/vmtop %changelog +* Mon Sep 21 2020 chenruyi 00589904 +- vmtop: add -h and -v + +* Sat Sep 19 2020 nocjj <1250062498@qq.com> +- bugfix: fix %ST, %GUE, %HYP formula +- display: expand row size in TEXT mode +- bugfix: exit vmtop when arguments are invalid +- bugfix: check unsigned number flip before getting delta + * Mon Sep 21 2020 Jiajun Chen <1250062498@qq.com> - 1.0-2 - bugfix: fix %ST, %GUE, %HYP formula - display: expand row size in TEXT mode