[PATCH 2/2] message printing cleanup for option --mem-usage

[Atsushi Kumagai]

Hello,

Thanks for your quick work.
I have a suggestion below.

>Hi,
>
>So the output is like below now:
>
>~$ ./makedumpfile --mem-usage /proc/kcore
>The kernel version is not supported.
>The makedumpfile operation may be incomplete.
>
>TYPE		PAGES			EXCLUDABLE	DESCRIPTION
>----------------------------------------------------------------------
>ZERO		28247           	yes		Pages filled
>with zero
>CACHE		240114          	yes		Cache pages
>CACHE_PRIVATE	17902           	yes		Cache pages +
>private
>USER		19713           	yes		User process
>pages
>FREE		3639969         	yes		Free pages
>KERN_DATA	103723          	no		Dumpable kernel
>data
>
>page size:		4096
>Total pages on system:	4049668

I think it's better for users to print the total size also in byte unit.
It's just a product of the page size and the number of pages, 
but it will be helpful since we generally count storage spaces in
byte unit.


Thanks 
Atsushi Kumagai

>
>That warning won't occur on kernel which makedumpfile declares to
>support,  Just notice user the kernel they are using is not tested
>yet on compatibility. So it should not be a problem.
>
>Thanks
>Baoquan
>
>
>On 09/03/14 at 05:13pm, Baoquan He wrote:
>> Adjust the message printing when specify option --mem-usage. Try to
>> avoid the unrelated printing.
>>
>> And add the page size info.
>>
>> Signed-off-by: Baoquan He <bhe at redhat.com>
>> ---
>>  makedumpfile.c | 19 +++++++++++--------
>>  1 file changed, 11 insertions(+), 8 deletions(-)
>>
>> diff --git a/makedumpfile.c b/makedumpfile.c
>> index c965745..f804079 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;
>> @@ -7960,9 +7963,8 @@ print_mem_usage(void)
>>  	shrinking = shrinking / 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,6 +7977,7 @@ print_mem_usage(void)
>>
>>  	MSG("\n");
>>
>> +	MSG("page size:		%-16ld\n", info->page_size);
>>  	MSG("Total pages on system:	%-16llu\n", pfn_original);
>>  }
>>
>> @@ -9614,10 +9617,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 at lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/kexec