From e3cb084f316cda87810d1289b57fd5d8240abb6c Mon Sep 17 00:00:00 2001 From: HATAYAMA Daisuke Date: Fri, 23 Mar 2012 10:27:35 +0900 Subject: [PATCH 1/2] [PATCH v3 3/4] Add help and manual messages about LZO compression support. Signed-off-by: HATAYAMA Daisuke Signed-off-by: Atsushi Kumagai --- makedumpfile.8 | 8 ++++---- print_info.c | 21 ++++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/makedumpfile.8 b/makedumpfile.8 index db0705c..42e36b6 100644 --- a/makedumpfile.8 +++ b/makedumpfile.8 @@ -121,8 +121,8 @@ configuration, you need to use --diskset option. .SH OPTIONS .TP -\fB\-c\fR -Compress dump data by each page. +\fB\-c,\-l\fR +Compress dump data by each page using zlib for -c option or lzo for -l option. .br A user cannot specify this option with \-E option, because the ELF format does not support compressed data. @@ -196,7 +196,7 @@ by dump_level 11, makedumpfile retries it by dump_level 31. \fB\-E\fR Create \fIDUMPFILE\fR in the ELF format. .br -This option cannot be specified with \-c option, because the ELF format does not +This option cannot be specified with either of \-c option or \-l option, because the ELF format does not support compressed data. .br .B Example: @@ -491,7 +491,7 @@ Print debugging message. .TP \fB\-h\fR -Show help message. +Show help message and LZO support status (enabled/disabled). .TP \fB\-v\fR diff --git a/print_info.c b/print_info.c index 31460b7..580741a 100644 --- a/print_info.c +++ b/print_info.c @@ -33,17 +33,20 @@ void print_usage(void) { MSG("\n"); + MSG("LZO support:\n"); + MSG(" enabled\n"); + MSG("\n"); MSG("Usage:\n"); MSG(" Creating DUMPFILE:\n"); - MSG(" # makedumpfile [-c|-E] [-d DL] [-x VMLINUX|-i VMCOREINFO] VMCORE DUMPFILE\n"); + MSG(" # makedumpfile [-c|-l|-E] [-d DL] [-x VMLINUX|-i VMCOREINFO] VMCORE DUMPFILE\n"); MSG("\n"); MSG(" Creating DUMPFILE with filtered kernel data specified through filter config\n"); MSG(" file:\n"); - MSG(" # makedumpfile [-c|-E] [-d DL] -x VMLINUX --config FILTERCONFIGFILE VMCORE\n"); + MSG(" # makedumpfile [-c|-l|-E] [-d DL] -x VMLINUX --config FILTERCONFIGFILE VMCORE\n"); MSG(" DUMPFILE\n"); MSG("\n"); MSG(" Outputting the dump data in the flattened format to the standard output:\n"); - MSG(" # makedumpfile -F [-c|-E] [-d DL] [-x VMLINUX|-i VMCOREINFO] VMCORE\n"); + MSG(" # makedumpfile -F [-c|-l|-E] [-d DL] [-x VMLINUX|-i VMCOREINFO] VMCORE\n"); MSG("\n"); MSG(" Rearranging the dump data in the flattened format to a readable DUMPFILE:\n"); MSG(" # makedumpfile -R DUMPFILE\n"); @@ -70,14 +73,14 @@ print_usage(void) MSG("\n"); MSG("\n"); MSG(" Creating DUMPFILE from multiple VMCOREs generated on sadump diskset configuration:\n"); - MSG(" # makedumpfile [-c] [-d DL] -x VMLINUX --diskset=VMCORE1 --diskset=VMCORE2\n"); + MSG(" # makedumpfile [-c|-l] [-d DL] -x VMLINUX --diskset=VMCORE1 --diskset=VMCORE2\n"); MSG(" [--diskset=VMCORE3 ..] DUMPFILE\n"); MSG("\n"); MSG("\n"); MSG("Available options:\n"); - MSG(" [-c]:\n"); - MSG(" Compress dump data by each page.\n"); - MSG(" A user cannot specify this option with -E option, because the ELF format\n"); + MSG(" [-c|-l]:\n"); + MSG(" Compress dump data by each page using zlib for -c option and lzo for -l option.\n"); + MSG(" A user cannot specify either of these options with -E option, because the ELF format\n"); MSG(" does not support compressed data.\n"); MSG(" THIS IS ONLY FOR THE CRASH UTILITY.\n"); MSG("\n"); @@ -103,7 +106,7 @@ print_usage(void) MSG("\n"); MSG(" [-E]:\n"); MSG(" Create DUMPFILE in the ELF format.\n"); - MSG(" This option cannot be specified with -c option, because the ELF\n"); + MSG(" This option cannot be specified with either of -c option or -l option, because the ELF\n"); MSG(" format does not support compressed data.\n"); MSG("\n"); MSG(" [-x VMLINUX]:\n"); @@ -214,7 +217,7 @@ print_usage(void) MSG(" Overwrite DUMPFILE even if it already exists.\n"); MSG("\n"); MSG(" [-h]:\n"); - MSG(" Show help message.\n"); + MSG(" Show help message and LZO support status (enabled/disabled).\n"); MSG("\n"); MSG(" [-b ]\n"); MSG(" Specify the cache 2^order pages in ram when generating vmcore info\n"); -- 1.7.9.2