From: Gustavo Sousa <gustavo.sousa@intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>,
<igt-dev@lists.freedesktop.org>
Cc: Peter Senna Tschudin <peter.senna@linux.intel.com>,
Kamil Konieczny <kamil.konieczny@linux.intel.com>,
Petri Latvala <adrinael@adrinael.net>,
Lucas De Marchi <lucas.demarchi@intel.com>
Subject: Re: [PATCH i-g-t v3 08/10] runner/settings: Add helpers to serialize/parse array
Date: Fri, 7 Feb 2025 17:26:48 -0300 [thread overview]
Message-ID: <173896000827.1963.1702569933886933016@intel.com> (raw)
In-Reply-To: <20250130172149.3657144-9-lucas.demarchi@intel.com>
Quoting Lucas De Marchi (2025-01-30 14:21:47-03:00)
>Prepare parser/serialize to handle arrays.
>
>Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
>---
> runner/settings.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
>diff --git a/runner/settings.c b/runner/settings.c
>index b527c01d9..62afd3534 100644
>--- a/runner/settings.c
>+++ b/runner/settings.c
>@@ -1125,6 +1125,15 @@ static size_t unescape_str(char *buf, size_t *n_src)
> escape_str(s->name, f); \
> fputc('\n', f); \
> } while (0)
>+#define SERIALIZE_STR_ARRAY(f, s, name, name_len) \
>+ do { \
>+ SERIALIZE_INT(f, s, name_len); \
>+ for (int _i = 0; _i < s->name_len; _i++) { \
>+ fprintf(f, #name "[%d] : ", _i); \
>+ escape_str(s->name[_i], f); \
>+ fputc('\n', f); \
>+ } \
>+ } while (0)
> bool serialize_settings(struct settings *settings)
> {
> FILE *f;
>@@ -1221,6 +1230,7 @@ bool serialize_settings(struct settings *settings)
> close(dirfd);
> return true;
> }
>+#undef SERIALIZE_STR_ARRAY
> #undef SERIALIZE_STR
> #undef SERIALIZE_UL
> #undef SERIALIZE_INT
>@@ -1256,9 +1266,25 @@ static char *parse_str(char **val)
> s->field = _f(val); \
> goto cleanup; \
> }
>+#define PARSE_LINE_ARRAY(s, name, val, field, field_len, _f) \
>+ do { \
>+ int idx; \
>+ if (!strcmp(name, #field_len)) { \
>+ s->field_len = parse_int(val); \
>+ s->field = calloc(s->field_len, \
>+ sizeof(*s->field)); \
>+ goto cleanup; \
>+ } else if (sscanf(name, #field "[%u]", &idx) == 1 && \
>+ idx < s->field_len) { \
>+ s->field[idx] = _f(val); \
>+ goto cleanup; \
>+ } \
>+ } while (0)
> #define PARSE_INT(s, name, val, field) PARSE_LINE(s, name, &val, field, parse_int)
> #define PARSE_UL(s, name, val, field) PARSE_LINE(s, name, &val, field, parse_ul)
> #define PARSE_STR(s, name, val, field) PARSE_LINE(s, name, &val, field, parse_str)
>+#define PARSE_STR_ARRAY(s, name, val, field, field_len) \
>+ PARSE_LINE_ARRAY(s, name, &val, field, field_len, parse_str)
> bool read_settings_from_file(struct settings *settings, FILE *f)
> {
> char *name = NULL, *val = NULL;
>@@ -1311,9 +1337,11 @@ cleanup:
>
> return true;
> }
>+#undef PARSE_STR_ARRAY
> #undef PARSE_STR
> #undef PARSE_UL
> #undef PARSE_INT
>+#undef PARSE_LINE_ARRAY
> #undef PARSE_LINE
>
> /**
>--
>2.48.0
>
next prev parent reply other threads:[~2025-02-07 20:27 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-30 17:21 [PATCH i-g-t v3 00/10] Add igt_runner's cmdline to results Lucas De Marchi
2025-01-30 17:21 ` [PATCH i-g-t v3 01/10] runner/settings: Fix code_coverage_script leak Lucas De Marchi
2025-01-30 17:21 ` [PATCH i-g-t v3 02/10] runner: Free settings at the end Lucas De Marchi
2025-01-30 17:21 ` [PATCH i-g-t v3 03/10] runner/settings: Deduplicate cleanup Lucas De Marchi
2025-01-30 17:21 ` [PATCH i-g-t v3 04/10] runner/settings: Use wrapper macros for each type Lucas De Marchi
2025-02-07 18:34 ` Gustavo Sousa
2025-01-30 17:21 ` [PATCH i-g-t v3 05/10] runner/settings: Match serialization to parse Lucas De Marchi
2025-02-07 19:13 ` Gustavo Sousa
2025-01-30 17:21 ` [PATCH i-g-t v3 06/10] runner/settings: Drop extra strdup Lucas De Marchi
2025-01-30 17:21 ` [PATCH i-g-t v3 07/10] runner: Fix use of newline on arguments Lucas De Marchi
2025-01-31 9:21 ` Peter Senna Tschudin
2025-01-31 15:58 ` Lucas De Marchi
2025-02-03 18:09 ` Lucas De Marchi
2025-02-07 20:15 ` Gustavo Sousa
2025-01-30 17:21 ` [PATCH i-g-t v3 08/10] runner/settings: Add helpers to serialize/parse array Lucas De Marchi
2025-02-07 20:26 ` Gustavo Sousa [this message]
2025-01-30 17:21 ` [PATCH i-g-t v3 09/10] runner/settings: Serialize command line Lucas De Marchi
2025-02-07 20:36 ` Gustavo Sousa
2025-02-07 20:41 ` Gustavo Sousa
2025-01-30 17:21 ` [PATCH i-g-t v3 10/10] runner/resultgen: Add cmdline to results.json Lucas De Marchi
2025-01-30 19:00 ` Kamil Konieczny
2025-01-30 19:17 ` Lucas De Marchi
2025-01-31 9:31 ` Peter Senna Tschudin
2025-01-31 12:16 ` Kamil Konieczny
2025-01-31 15:39 ` Lucas De Marchi
2025-01-30 19:12 ` ✓ Xe.CI.BAT: success for Add igt_runner's cmdline to results (rev3) Patchwork
2025-01-30 19:12 ` ✓ i915.CI.BAT: " Patchwork
2025-01-30 21:21 ` ✗ i915.CI.Full: failure " Patchwork
2025-01-30 22:06 ` ✓ Xe.CI.Full: success " Patchwork
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=173896000827.1963.1702569933886933016@intel.com \
--to=gustavo.sousa@intel.com \
--cc=adrinael@adrinael.net \
--cc=igt-dev@lists.freedesktop.org \
--cc=kamil.konieczny@linux.intel.com \
--cc=lucas.demarchi@intel.com \
--cc=peter.senna@linux.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