From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>,
Tvrtko Ursulin <tursulin@ursulin.net>,
Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH i-g-t v3 03/13] fixup! lib/igt_drm_fdinfo: Allow any number of spaces before unit
Date: Fri, 3 May 2024 23:46:33 -0700 [thread overview]
Message-ID: <20240504064643.25863-4-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240504064643.25863-1-lucas.demarchi@intel.com>
---
lib/igt_drm_fdinfo.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/lib/igt_drm_fdinfo.c b/lib/igt_drm_fdinfo.c
index 3b2778eee..3b8e79a35 100644
--- a/lib/igt_drm_fdinfo.c
+++ b/lib/igt_drm_fdinfo.c
@@ -134,8 +134,7 @@ static int parse_region(char *line, struct drm_client_fdinfo *info,
const char **region_map, unsigned int region_entries,
uint64_t *val)
{
- const char *name, *p, *unit = NULL;
- char *end_ptr;
+ char *name, *p;
ssize_t name_len;
int found = -1;
unsigned int i;
@@ -181,18 +180,16 @@ static int parse_region(char *line, struct drm_client_fdinfo *info,
goto out;
p++;
- *val = strtoull(p, &end_ptr, 10);
-
- p = ignore_space(end_ptr);
- if (!p)
+ *val = strtoull(p, &p, 10);
+ p = (char *)ignore_space(p);
+ if (!*p)
goto out;
- unit = ++p;
- if (!strcmp(unit, "KiB")) {
+ if (!strcmp(p, "KiB")) {
*val *= 1024;
- } else if (!strcmp(unit, "MiB")) {
+ } else if (!strcmp(p, "MiB")) {
*val *= 1024 * 1024;
- } else if (!strcmp(unit, "GiB")) {
+ } else if (!strcmp(p, "GiB")) {
*val *= 1024 * 1024 * 1024;
}
--
2.43.0
next prev parent reply other threads:[~2024-05-04 6:46 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 6:46 [PATCH i-g-t v3 00/12] gputop: Add support for xe Lucas De Marchi
2024-05-04 6:46 ` [PATCH i-g-t v3 01/13] lib/igt_drm_fdinfo: Extract ignore_space() Lucas De Marchi
2024-05-06 20:21 ` Umesh Nerlige Ramappa
2024-05-04 6:46 ` [PATCH i-g-t v3 02/13] lib/igt_drm_fdinfo: Allow any number of spaces before unit Lucas De Marchi
2024-05-06 20:28 ` Umesh Nerlige Ramappa
2024-05-06 20:32 ` Umesh Nerlige Ramappa
2024-05-06 20:38 ` Lucas De Marchi
2024-05-04 6:46 ` Lucas De Marchi [this message]
2024-05-06 20:33 ` [PATCH i-g-t v3 03/13] fixup! " Umesh Nerlige Ramappa
2024-05-04 6:46 ` [PATCH i-g-t v3 04/13] lib/igt_drm_fdinfo: Stop passing key twice Lucas De Marchi
2024-05-04 6:46 ` [PATCH i-g-t v3 05/13] lib/igt_drm_fdinfo: Remove prefix arg from parse functions Lucas De Marchi
2024-05-04 6:46 ` [PATCH i-g-t v3 06/13] lib/igt_drm_fdinfo: Parse drm-cycles Lucas De Marchi
2024-05-07 1:11 ` Umesh Nerlige Ramappa
2024-05-04 6:46 ` [PATCH i-g-t v3 07/13] lib/igt_drm_fdinfo: Start tracking available engine keys Lucas De Marchi
2024-05-07 1:14 ` Umesh Nerlige Ramappa
2024-05-04 6:46 ` [PATCH i-g-t v3 08/13] treewide: Rename engine busyness variables Lucas De Marchi
2024-05-08 18:45 ` Umesh Nerlige Ramappa
2024-05-21 13:47 ` Lucas De Marchi
2024-05-04 6:46 ` [PATCH i-g-t v3 09/13] lib/igt_drm_clients: Move engine fields to substruct Lucas De Marchi
2024-05-08 18:45 ` Umesh Nerlige Ramappa
2024-05-04 6:46 ` [PATCH i-g-t v3 10/13] lib/igt_drm_clients: Record drm-cycles Lucas De Marchi
2024-05-08 18:48 ` Umesh Nerlige Ramappa
2024-05-04 6:46 ` [PATCH i-g-t v3 11/13] lib/igt_drm_fdinfo: Parse drm-total-cycles Lucas De Marchi
2024-05-08 18:49 ` Umesh Nerlige Ramappa
2024-05-04 6:46 ` [PATCH i-g-t v3 12/13] lib/igt_drm_clients: Record total cycles Lucas De Marchi
2024-05-08 19:01 ` Umesh Nerlige Ramappa
2024-05-08 19:07 ` Umesh Nerlige Ramappa
2024-05-04 6:46 ` [PATCH i-g-t v3 13/13] gputop: Add support to drm-cycles/drm-total-cycles Lucas De Marchi
2024-05-08 19:11 ` Umesh Nerlige Ramappa
2024-05-04 7:31 ` ✓ Fi.CI.BAT: success for gputop: Add support for xe (rev4) Patchwork
2024-05-04 7:36 ` ✓ CI.xeBAT: " Patchwork
2024-05-04 8:33 ` ✗ CI.xeFULL: failure " Patchwork
2024-05-04 12:50 ` ✗ Fi.CI.IGT: " Patchwork
2024-05-06 10:37 ` [PATCH i-g-t v3 00/12] gputop: Add support for xe Tvrtko Ursulin
2024-05-06 20:40 ` Lucas De Marchi
2024-05-08 16:25 ` (subset) " Lucas De Marchi
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=20240504064643.25863-4-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=tursulin@ursulin.net \
--cc=umesh.nerlige.ramappa@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox