[v3] lib: add size unit t/p/e to memparse
diff mbox

Message ID 1396428877-24089-1-git-send-email-guihc.fnst@cn.fujitsu.com
State Not Applicable
Headers show

Commit Message

Gui Hecheng April 2, 2014, 8:54 a.m. UTC
For modern filesystems such as btrfs, t/p/e size level operations
are common.
add size unit t/p/e parsing to memparse

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
---
changelog
	v1->v2: replace kilobyte with kibibyte, and others
	v2->v3: add missing unit "bytes" in comment
---
 lib/cmdline.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

Comments

Gui Hecheng May 15, 2014, 1:39 a.m. UTC | #1
On Wed, 2014-04-02 at 16:54 +0800, Gui Hecheng wrote:
> For modern filesystems such as btrfs, t/p/e size level operations
> are common.
> add size unit t/p/e parsing to memparse
> 
> Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
> ---
> changelog
> 	v1->v2: replace kilobyte with kibibyte, and others
> 	v2->v3: add missing unit "bytes" in comment
> ---
>  lib/cmdline.c | 25 ++++++++++++++++++++-----
>  1 file changed, 20 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/cmdline.c b/lib/cmdline.c
> index eb67911..511b9be 100644
> --- a/lib/cmdline.c
> +++ b/lib/cmdline.c
> @@ -119,11 +119,17 @@ char *get_options(const char *str, int nints, int *ints)
>   *	@retptr: (output) Optional pointer to next char after parse completes
>   *
>   *	Parses a string into a number.  The number stored at @ptr is
> - *	potentially suffixed with %K (for kilobytes, or 1024 bytes),
> - *	%M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
> - *	1073741824).  If the number is suffixed with K, M, or G, then
> - *	the return value is the number multiplied by one kilobyte, one
> - *	megabyte, or one gigabyte, respectively.
> + *	potentially suffixed with
> + *	%K (for kibibytes, or 1024 bytes),
> + *	%M (for mebibytes, or 1048576 bytes),
> + *	%G (for gibibytes, or 1073741824 bytes),
> + *	%T (for tebibytes, or 1099511627776 bytes),
> + *	%P (for pebibytes, or 1125899906842624 bytes),
> + *	%E (for exbibytes, or 1152921504606846976 bytes).
> + *	If the number is suffixed with K, M, G, T, P, E, then
> + *	the return value is the number multiplied by one kibibyte, one
> + *	mebibyte, one gibibyte, one tebibyte, one pebibyte, one exbibyte,
> + *	respectively.
>   */
>  
>  unsigned long long memparse(const char *ptr, char **retptr)
> @@ -133,6 +139,15 @@ unsigned long long memparse(const char *ptr, char **retptr)
>  	unsigned long long ret = simple_strtoull(ptr, &endptr, 0);
>  
>  	switch (*endptr) {
> +	case 'E':
> +	case 'e':
> +		ret <<= 10;
> +	case 'P':
> +	case 'p':
> +		ret <<= 10;
> +	case 'T':
> +	case 't':
> +		ret <<= 10;
>  	case 'G':
>  	case 'g':
>  		ret <<= 10;


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Gui Hecheng June 5, 2014, 9:03 a.m. UTC | #2
On Wed, 2014-04-02 at 16:54 +0800, Gui Hecheng wrote:
> For modern filesystems such as btrfs, t/p/e size level operations
> are common.
> add size unit t/p/e parsing to memparse
> 
> Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
> ---
> changelog
> 	v1->v2: replace kilobyte with kibibyte, and others
> 	v2->v3: add missing unit "bytes" in comment
> ---
>  lib/cmdline.c | 25 ++++++++++++++++++++-----
>  1 file changed, 20 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/cmdline.c b/lib/cmdline.c
> index eb67911..511b9be 100644
> --- a/lib/cmdline.c
> +++ b/lib/cmdline.c
> @@ -119,11 +119,17 @@ char *get_options(const char *str, int nints, int *ints)
>   *	@retptr: (output) Optional pointer to next char after parse completes
>   *
>   *	Parses a string into a number.  The number stored at @ptr is
> - *	potentially suffixed with %K (for kilobytes, or 1024 bytes),
> - *	%M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
> - *	1073741824).  If the number is suffixed with K, M, or G, then
> - *	the return value is the number multiplied by one kilobyte, one
> - *	megabyte, or one gigabyte, respectively.
> + *	potentially suffixed with
> + *	%K (for kibibytes, or 1024 bytes),
> + *	%M (for mebibytes, or 1048576 bytes),
> + *	%G (for gibibytes, or 1073741824 bytes),
> + *	%T (for tebibytes, or 1099511627776 bytes),
> + *	%P (for pebibytes, or 1125899906842624 bytes),
> + *	%E (for exbibytes, or 1152921504606846976 bytes).
> + *	If the number is suffixed with K, M, G, T, P, E, then
> + *	the return value is the number multiplied by one kibibyte, one
> + *	mebibyte, one gibibyte, one tebibyte, one pebibyte, one exbibyte,
> + *	respectively.
>   */
>  
>  unsigned long long memparse(const char *ptr, char **retptr)
> @@ -133,6 +139,15 @@ unsigned long long memparse(const char *ptr, char **retptr)
>  	unsigned long long ret = simple_strtoull(ptr, &endptr, 0);
>  
>  	switch (*endptr) {
> +	case 'E':
> +	case 'e':
> +		ret <<= 10;
> +	case 'P':
> +	case 'p':
> +		ret <<= 10;
> +	case 'T':
> +	case 't':
> +		ret <<= 10;
>  	case 'G':
>  	case 'g':
>  		ret <<= 10;


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andrew Morton June 12, 2014, 9:15 p.m. UTC | #3
On Wed, 2 Apr 2014 16:54:37 +0800 Gui Hecheng <guihc.fnst@cn.fujitsu.com> wrote:

> For modern filesystems such as btrfs, t/p/e size level operations
> are common.
> add size unit t/p/e parsing to memparse
> 
> Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
> ---
> changelog
> 	v1->v2: replace kilobyte with kibibyte, and others
> 	v2->v3: add missing unit "bytes" in comment
> ---
>  lib/cmdline.c | 25 ++++++++++++++++++++-----
>  1 file changed, 20 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/cmdline.c b/lib/cmdline.c
> index eb67911..511b9be 100644
> --- a/lib/cmdline.c
> +++ b/lib/cmdline.c
> @@ -119,11 +119,17 @@ char *get_options(const char *str, int nints, int *ints)
>   *	@retptr: (output) Optional pointer to next char after parse completes
>   *
>   *	Parses a string into a number.  The number stored at @ptr is
> - *	potentially suffixed with %K (for kilobytes, or 1024 bytes),
> - *	%M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
> - *	1073741824).  If the number is suffixed with K, M, or G, then
> - *	the return value is the number multiplied by one kilobyte, one
> - *	megabyte, or one gigabyte, respectively.
> + *	potentially suffixed with
> + *	%K (for kibibytes, or 1024 bytes),
> + *	%M (for mebibytes, or 1048576 bytes),
> + *	%G (for gibibytes, or 1073741824 bytes),
> + *	%T (for tebibytes, or 1099511627776 bytes),
> + *	%P (for pebibytes, or 1125899906842624 bytes),
> + *	%E (for exbibytes, or 1152921504606846976 bytes).

I'm afraid I find these names quite idiotic - we all know what the
traditional terms mean so why go and muck with it.

Also, kibibytes sounds like cat food.

> @@ -133,6 +139,15 @@ unsigned long long memparse(const char *ptr, char **retptr)
>  	unsigned long long ret = simple_strtoull(ptr, &endptr, 0);
>  
>  	switch (*endptr) {
> +	case 'E':
> +	case 'e':
> +		ret <<= 10;
> +	case 'P':
> +	case 'p':
> +		ret <<= 10;
> +	case 'T':
> +	case 't':
> +		ret <<= 10;
>  	case 'G':
>  	case 'g':
>  		ret <<= 10;

That bit makes sense.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Gui Hecheng June 13, 2014, 1:33 a.m. UTC | #4
On Thu, 2014-06-12 at 14:15 -0700, Andrew Morton wrote:
> On Wed, 2 Apr 2014 16:54:37 +0800 Gui Hecheng <guihc.fnst@cn.fujitsu.com> wrote:
> 
> > For modern filesystems such as btrfs, t/p/e size level operations
> > are common.
> > add size unit t/p/e parsing to memparse
> > 
> > Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
> > ---
> > changelog
> > 	v1->v2: replace kilobyte with kibibyte, and others
> > 	v2->v3: add missing unit "bytes" in comment
> > ---
> >  lib/cmdline.c | 25 ++++++++++++++++++++-----
> >  1 file changed, 20 insertions(+), 5 deletions(-)
> > 
> > diff --git a/lib/cmdline.c b/lib/cmdline.c
> > index eb67911..511b9be 100644
> > --- a/lib/cmdline.c
> > +++ b/lib/cmdline.c
> > @@ -119,11 +119,17 @@ char *get_options(const char *str, int nints, int *ints)
> >   *	@retptr: (output) Optional pointer to next char after parse completes
> >   *
> >   *	Parses a string into a number.  The number stored at @ptr is
> > - *	potentially suffixed with %K (for kilobytes, or 1024 bytes),
> > - *	%M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
> > - *	1073741824).  If the number is suffixed with K, M, or G, then
> > - *	the return value is the number multiplied by one kilobyte, one
> > - *	megabyte, or one gigabyte, respectively.
> > + *	potentially suffixed with
> > + *	%K (for kibibytes, or 1024 bytes),
> > + *	%M (for mebibytes, or 1048576 bytes),
> > + *	%G (for gibibytes, or 1073741824 bytes),
> > + *	%T (for tebibytes, or 1099511627776 bytes),
> > + *	%P (for pebibytes, or 1125899906842624 bytes),
> > + *	%E (for exbibytes, or 1152921504606846976 bytes).
> 
> I'm afraid I find these names quite idiotic - we all know what the
> traditional terms mean so why go and muck with it.
> 
> Also, kibibytes sounds like cat food.

Yes, I will cleanup this part, Thanks very much.

-Gui

> > @@ -133,6 +139,15 @@ unsigned long long memparse(const char *ptr, char **retptr)
> >  	unsigned long long ret = simple_strtoull(ptr, &endptr, 0);
> >  
> >  	switch (*endptr) {
> > +	case 'E':
> > +	case 'e':
> > +		ret <<= 10;
> > +	case 'P':
> > +	case 'p':
> > +		ret <<= 10;
> > +	case 'T':
> > +	case 't':
> > +		ret <<= 10;
> >  	case 'G':
> >  	case 'g':
> >  		ret <<= 10;
> 
> That bit makes sense.


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Brendan Hide June 13, 2014, 5:54 a.m. UTC | #5
On 12/06/14 23:15, Andrew Morton wrote:
> On Wed, 2 Apr 2014 16:54:37 +0800 Gui Hecheng <guihc.fnst@cn.fujitsu.com> wrote:
>
>> For modern filesystems such as btrfs, t/p/e size level operations
>> are common.
>> add size unit t/p/e parsing to memparse
>>
>> Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
>> ---
>> changelog
>> 	v1->v2: replace kilobyte with kibibyte, and others
>> 	v2->v3: add missing unit "bytes" in comment
>> ---
>>   lib/cmdline.c | 25 ++++++++++++++++++++-----
>>   1 file changed, 20 insertions(+), 5 deletions(-)
>>
>> diff --git a/lib/cmdline.c b/lib/cmdline.c
>> index eb67911..511b9be 100644
>> --- a/lib/cmdline.c
>> +++ b/lib/cmdline.c
>> @@ -119,11 +119,17 @@ char *get_options(const char *str, int nints, int *ints)
>>    *	@retptr: (output) Optional pointer to next char after parse completes
>>    *
>>    *	Parses a string into a number.  The number stored at @ptr is
>> - *	potentially suffixed with %K (for kilobytes, or 1024 bytes),
>> - *	%M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
>> - *	1073741824).  If the number is suffixed with K, M, or G, then
>> - *	the return value is the number multiplied by one kilobyte, one
>> - *	megabyte, or one gigabyte, respectively.
>> + *	potentially suffixed with
>> + *	%K (for kibibytes, or 1024 bytes),
>> + *	%M (for mebibytes, or 1048576 bytes),
>> + *	%G (for gibibytes, or 1073741824 bytes),
>> + *	%T (for tebibytes, or 1099511627776 bytes),
>> + *	%P (for pebibytes, or 1125899906842624 bytes),
>> + *	%E (for exbibytes, or 1152921504606846976 bytes).
> I'm afraid I find these names quite idiotic - we all know what the
> traditional terms mean so why go and muck with it.
>
> Also, kibibytes sounds like cat food.
Hi, Andrew

While I agree it sounds like cat food, it seemed like a good opportunity 
to fix a minor issue that is otherwise unlikely to be fixed for a very 
long time. Should we feel uncomfortable with the patch, as is, because 
of language/correctness friction? Pedantry included, the patch is 
correct. ;)

Thanks
Hugo Mills June 13, 2014, 6:56 a.m. UTC | #6
On Fri, Jun 13, 2014 at 07:54:44AM +0200, Brendan Hide wrote:
> On 12/06/14 23:15, Andrew Morton wrote:
> >On Wed, 2 Apr 2014 16:54:37 +0800 Gui Hecheng <guihc.fnst@cn.fujitsu.com> wrote:
> >>+ *	%K (for kibibytes, or 1024 bytes),
> >>+ *	%M (for mebibytes, or 1048576 bytes),
> >>+ *	%G (for gibibytes, or 1073741824 bytes),
> >>+ *	%T (for tebibytes, or 1099511627776 bytes),
> >>+ *	%P (for pebibytes, or 1125899906842624 bytes),
> >>+ *	%E (for exbibytes, or 1152921504606846976 bytes).
> >I'm afraid I find these names quite idiotic - we all know what the
> >traditional terms mean so why go and muck with it.
> >
> >Also, kibibytes sounds like cat food.
> Hi, Andrew
> 
> While I agree it sounds like cat food, it seemed like a good opportunity to
> fix a minor issue that is otherwise unlikely to be fixed for a very long
> time. Should we feel uncomfortable with the patch, as is, because of
> language/correctness friction? Pedantry included, the patch is correct. ;)

   Last night, I wrote a very grumpy reply to Andrew. I'm glad I
didn't send it, because Brendan has managed to cover at least one of
my points much more politely than I did.

   My other comment is that TB vs TiB is a 10% difference in the
magnitude of the number, and so the accumulated error is now no longer
small enough to be brushed under the carpet as we all did in days
past. By Andrew's thinking, a 4 TB disk is 3.638 TB in size. I'd say a
4 TB disk is 3.638 TiB in size, and I can be precise (±1GB in the
latter case) with both values.

   Hugo.

PS. Let's just not talk about 1.44 "MB" floppy disks.

Patch
diff mbox

diff --git a/lib/cmdline.c b/lib/cmdline.c
index eb67911..511b9be 100644
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -119,11 +119,17 @@  char *get_options(const char *str, int nints, int *ints)
  *	@retptr: (output) Optional pointer to next char after parse completes
  *
  *	Parses a string into a number.  The number stored at @ptr is
- *	potentially suffixed with %K (for kilobytes, or 1024 bytes),
- *	%M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
- *	1073741824).  If the number is suffixed with K, M, or G, then
- *	the return value is the number multiplied by one kilobyte, one
- *	megabyte, or one gigabyte, respectively.
+ *	potentially suffixed with
+ *	%K (for kibibytes, or 1024 bytes),
+ *	%M (for mebibytes, or 1048576 bytes),
+ *	%G (for gibibytes, or 1073741824 bytes),
+ *	%T (for tebibytes, or 1099511627776 bytes),
+ *	%P (for pebibytes, or 1125899906842624 bytes),
+ *	%E (for exbibytes, or 1152921504606846976 bytes).
+ *	If the number is suffixed with K, M, G, T, P, E, then
+ *	the return value is the number multiplied by one kibibyte, one
+ *	mebibyte, one gibibyte, one tebibyte, one pebibyte, one exbibyte,
+ *	respectively.
  */
 
 unsigned long long memparse(const char *ptr, char **retptr)
@@ -133,6 +139,15 @@  unsigned long long memparse(const char *ptr, char **retptr)
 	unsigned long long ret = simple_strtoull(ptr, &endptr, 0);
 
 	switch (*endptr) {
+	case 'E':
+	case 'e':
+		ret <<= 10;
+	case 'P':
+	case 'p':
+		ret <<= 10;
+	case 'T':
+	case 't':
+		ret <<= 10;
 	case 'G':
 	case 'g':
 		ret <<= 10;