From: Baoquan He <bhe@redhat.com>
To: kexec@lists.infradead.org
Cc: kumagai-atsushi@mxc.nes.nec.co.jp, vgoyal@redhat.com
Subject: [PATCH v2 2/2] message printing cleanup for option --mem-usage
Date: Tue, 9 Sep 2014 11:26:24 +0800 [thread overview]
Message-ID: <20140909032624.GA1229@dhcp-16-105.nay.redhat.com> (raw)
In-Reply-To: <1409735588-2430-2-git-send-email-bhe@redhat.com>
Adjust the message printing when specify option --mem-usage. Try to
avoid the unrelated printing.
And add the page size info and the total size of system memory on byte.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
makedumpfile.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/makedumpfile.c b/makedumpfile.c
index c965745..8667791 100644
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -4939,7 +4939,8 @@ exclude_unnecessary_pages_cyclic(struct cycle *cycle)
for (mm = 0; mm < info->num_mem_map; mm++) {
- print_progress(PROGRESS_UNN_PAGES, mm, info->num_mem_map);
+ if (!info->flag_mem_usage)
+ print_progress(PROGRESS_UNN_PAGES, mm, info->num_mem_map);
mmd = &info->mem_map_data[mm];
@@ -4957,8 +4958,10 @@ exclude_unnecessary_pages_cyclic(struct cycle *cycle)
/*
* print [100 %]
*/
- print_progress(PROGRESS_UNN_PAGES, info->num_mem_map, info->num_mem_map);
- print_execution_time(PROGRESS_UNN_PAGES, &tv_start);
+ if (!info->flag_mem_usage) {
+ print_progress(PROGRESS_UNN_PAGES, info->num_mem_map, info->num_mem_map);
+ print_execution_time(PROGRESS_UNN_PAGES, &tv_start);
+ }
}
return TRUE;
@@ -7948,6 +7951,7 @@ static void
print_mem_usage(void)
{
mdf_pfn_t pfn_original, pfn_excluded, shrinking;
+ unsigned long long total_size;
/*
* /proc/vmcore doesn't contain the memory hole area.
@@ -7958,11 +7962,11 @@ print_mem_usage(void)
+ pfn_user + pfn_free + pfn_hwpoison;
shrinking = (pfn_original - pfn_excluded) * 100;
shrinking = shrinking / pfn_original;
+ total_size = info->page_size * pfn_original;
MSG("\n");
- MSG("\n");
- MSG("----------------------------------------------------------------------\n");
MSG("TYPE PAGES EXCLUDABLE DESCRIPTION\n");
+ MSG("----------------------------------------------------------------------\n");
MSG("ZERO %-16llu yes Pages filled with zero\n", pfn_zero);
MSG("CACHE %-16llu yes Cache pages\n", pfn_cache);
@@ -7975,7 +7979,9 @@ print_mem_usage(void)
MSG("\n");
+ MSG("page size: %-16ld\n", info->page_size);
MSG("Total pages on system: %-16llu\n", pfn_original);
+ MSG("Total size on system: %-16llu Byte\n", total_size);
}
int
@@ -9614,10 +9620,10 @@ main(int argc, char *argv[])
retcd = COMPLETED;
out:
MSG("\n");
- if (retcd == COMPLETED)
- MSG("makedumpfile Completed.\n");
- else
+ if (retcd != COMPLETED)
MSG("makedumpfile Failed.\n");
+ else if (!info->flag_mem_usage)
+ MSG("makedumpfile Completed.\n");
if (info) {
if (info->dh_memory)
--
1.8.5.3
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2014-09-09 3:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 9:13 [PATCH 1/2] supplement the description of option --mem-usage Baoquan He
2014-09-03 9:13 ` [PATCH 2/2] message printing cleanup for " Baoquan He
2014-09-03 9:20 ` Baoquan He
2014-09-08 5:51 ` Atsushi Kumagai
2014-09-09 3:02 ` bhe
2014-09-09 3:26 ` Baoquan He [this message]
2014-09-10 8:16 ` [PATCH v2 " Atsushi Kumagai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140909032624.GA1229@dhcp-16-105.nay.redhat.com \
--to=bhe@redhat.com \
--cc=kexec@lists.infradead.org \
--cc=kumagai-atsushi@mxc.nes.nec.co.jp \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.