Skip to contentSkip to conversation

perf tools: substitute yet another strtoull()

PATCH RESEND Applied Andy Shevchenko 4 participants 5 messages Jan 29, 2018 – Feb 16, 2018 perf events

lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH RESEND v2 1/1 perf tools: substitute yet another strtoull()

Instead of home grown function let's use what library provides us.

Signed-off-by Andy Shevchenko <[email protected]>

---
- recend after couple of years of silence
- hopefully it will be commented / accepted now

 tools/perf/util/util.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)
tools/perf/util/util.c +2 -22
index 443892dabedb..1019bbc5dbd8 100644
@@ -340,35 +340,15 @@ size_t hex_width(u64 v)
 	return n;
 }
 
-static int hex(char ch)
-{
-	if ((ch >= '0') && (ch <= '9'))
-		return ch - '0';
-	if ((ch >= 'a') && (ch <= 'f'))
-		return ch - 'a' + 10;
-	if ((ch >= 'A') && (ch <= 'F'))
-		return ch - 'A' + 10;
-	return -1;
-}
-
 /*
  * While we find nice hex chars, build a long_val.
  * Return number of chars processed.
  */
 int hex2u64(const char *ptr, u64 *long_val)
 {
-	const char *p = ptr;
-	*long_val = 0;
-
-	while (*p) {
-		const int hex_val = hex(*p);
+	char *p;
 
-		if (hex_val < 0)
-			break;
-
-		*long_val = (*long_val << 4) | hex_val;
-		p++;
-	}
+	*long_val = strtoull(ptr, &p, 16);
 
 	return p - ptr;
 }
Signature · 1 line
2.15.1
Acked-by on v2 1/1
#1 lore raw
Quoted 3 lines · Andy Shevchenko

Instead of home grown function let's use what library provides us.

Signed-off-by Andy Shevchenko <[email protected]>
Acked-by Jiri Olsa <[email protected]>

thanks,
jirka

Quoted 51 lines

---
- recend after couple of years of silence
- hopefully it will be commented / accepted now

 tools/perf/util/util.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)
tools/perf/util/util.c +2 -22
index 443892dabedb..1019bbc5dbd8 100644
@@ -340,35 +340,15 @@ size_t hex_width(u64 v)
 	return n;
 }
 
-static int hex(char ch)
-{
-	if ((ch >= '0') && (ch <= '9'))
-		return ch - '0';
-	if ((ch >= 'a') && (ch <= 'f'))
-		return ch - 'a' + 10;
-	if ((ch >= 'A') && (ch <= 'F'))
-		return ch - 'A' + 10;
-	return -1;
-}
-
 /*
  * While we find nice hex chars, build a long_val.
  * Return number of chars processed.
  */
 int hex2u64(const char *ptr, u64 *long_val)
 {
-	const char *p = ptr;
-	*long_val = 0;
-
-	while (*p) {
-		const int hex_val = hex(*p);
+	char *p;
 
-		if (hex_val < 0)
-			break;
-
-		*long_val = (*long_val << 4) | hex_val;
-		p++;
-	}
+	*long_val = strtoull(ptr, &p, 16);
 
 	return p - ptr;
 }
Signature · 1 line
2.15.1
merge bot
#3 lore raw

[tip:perf/urgent] perf tools: Substitute yet another strtoull()

In reply to Andy Shevchenko
perf tools: Substitute yet another strtoull()
Commit-ID:  a70770d9b64ab4a36008d64542fb3bb6600c7b07
Gitweb:     https://git.kernel.org/tip/a70770d9b64ab4a36008d64542fb3bb6600c7b07
Author:     Andy Shevchenko <[email protected]>
AuthorDate: Mon, 29 Jan 2018 15:03:59 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 6 Feb 2018 10:11:52 -0300

perf tools: Substitute yet another strtoull()

Instead of home grown function let's use what library provides us.

Signed-off-by Andriy Shevchenko <[email protected]>
Acked-by Jiri Olsa <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/util.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)
tools/perf/util/util.c +2 -22
index 443892d..1019bbc 100644
@@ -340,35 +340,15 @@ size_t hex_width(u64 v)
 	return n;
 }
 
-static int hex(char ch)
-{
-	if ((ch >= '0') && (ch <= '9'))
-		return ch - '0';
-	if ((ch >= 'a') && (ch <= 'f'))
-		return ch - 'a' + 10;
-	if ((ch >= 'A') && (ch <= 'F'))
-		return ch - 'A' + 10;
-	return -1;
-}
-
 /*
  * While we find nice hex chars, build a long_val.
  * Return number of chars processed.
  */
 int hex2u64(const char *ptr, u64 *long_val)
 {
-	const char *p = ptr;
-	*long_val = 0;
-
-	while (*p) {
-		const int hex_val = hex(*p);
+	char *p;
 
-		if (hex_val < 0)
-			break;
-
-		*long_val = (*long_val << 4) | hex_val;
-		p++;
-	}
+	*long_val = strtoull(ptr, &p, 16);
 
 	return p - ptr;
 }
merge bot
#4 lore raw

[tip:perf/urgent] perf tools: Substitute yet another strtoull()

In reply to Andy Shevchenko
perf tools: Substitute yet another strtoull()
Commit-ID:  6677d26c8befa462eab9be6c5335a939011e7e65
Gitweb:     https://git.kernel.org/tip/6677d26c8befa462eab9be6c5335a939011e7e65
Author:     Andy Shevchenko <[email protected]>
AuthorDate: Mon, 29 Jan 2018 15:03:59 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 15 Feb 2018 09:57:19 -0300

perf tools: Substitute yet another strtoull()

Instead of home grown function let's use what library provides us.

Signed-off-by Andriy Shevchenko <[email protected]>
Acked-by Jiri Olsa <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/util.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)
tools/perf/util/util.c +2 -22
index 443892d..1019bbc 100644
@@ -340,35 +340,15 @@ size_t hex_width(u64 v)
 	return n;
 }
 
-static int hex(char ch)
-{
-	if ((ch >= '0') && (ch <= '9'))
-		return ch - '0';
-	if ((ch >= 'a') && (ch <= 'f'))
-		return ch - 'a' + 10;
-	if ((ch >= 'A') && (ch <= 'F'))
-		return ch - 'A' + 10;
-	return -1;
-}
-
 /*
  * While we find nice hex chars, build a long_val.
  * Return number of chars processed.
  */
 int hex2u64(const char *ptr, u64 *long_val)
 {
-	const char *p = ptr;
-	*long_val = 0;
-
-	while (*p) {
-		const int hex_val = hex(*p);
+	char *p;
 
-		if (hex_val < 0)
-			break;
-
-		*long_val = (*long_val << 4) | hex_val;
-		p++;
-	}
+	*long_val = strtoull(ptr, &p, 16);
 
 	return p - ptr;
 }