Re: [PATCH v2 2/2] tr2: shows scope unconditionally in addition to key-value pair
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 12, 2022, 21:16 UTC
- Message-ID
- <xmqqo7wp9n7a.fsf@gitster.g>
- In-Reply-To
- <9856058df68d61557b11dc2fc7179acae24f5d8e.1660272404.git.dyroneteng@gmail.com>
Teng Long <dyroneteng@gmail.com> writes:
Show 17 quoted lines
> diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
> index c5c8cfbbaa..37a3163be1 100644
> --- a/trace2/tr2_tgt_event.c
> +++ b/trace2/tr2_tgt_event.c
> @@ -479,9 +479,12 @@ static void fn_param_fl(const char *file, int line, const char *param,
> {
> const char *event_name = "def_param";
> struct json_writer jw = JSON_WRITER_INIT;
> + enum config_scope scope = current_config_scope();
> + const char *scope_name = config_scope_name(scope);
>
> jw_object_begin(&jw, 0);
> event_fmt_prepare(event_name, file, line, NULL, &jw);
> + jw_object_string(&jw, "scope", scope_name);
> jw_object_string(&jw, "param", param);
> jw_object_string(&jw, "value", value);
> jw_end(&jw);OK, that is quite straight-forward.
Show 17 quoted lines
> diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
> index c42fbade7f..69f8033077 100644
> --- a/trace2/tr2_tgt_normal.c
> +++ b/trace2/tr2_tgt_normal.c
> @@ -298,8 +298,11 @@ static void fn_param_fl(const char *file, int line, const char *param,
> const char *value)
> {
> struct strbuf buf_payload = STRBUF_INIT;
> + enum config_scope scope = current_config_scope();
> + const char *scope_name = config_scope_name(scope);
>
> - strbuf_addf(&buf_payload, "def_param %s=%s", param, value);
> + strbuf_addf(&buf_payload, "def_param scope:%s %s=%s", scope_name, param,
> + value);
> normal_io_write_fl(file, line, &buf_payload);
> strbuf_release(&buf_payload);
> }So is this one. Quite nice.
Is everybody happy with the choice of ":" colon here, though? The one in tgt_perf below uses the same delimiter that is used between <param, value> to delimit <"scope", scome_name>. I am wondering if this one should use "=", the delimiter used between <param, value> in this output stream, to match. I do not care at all either way, but I am mentioning it because I happened have noticed it, and because somebody else may care.
Thanks, will queue.
Show 24 quoted lines
> diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
> index a1eff8bea3..8cb792488c 100644
> --- a/trace2/tr2_tgt_perf.c
> +++ b/trace2/tr2_tgt_perf.c
> @@ -441,12 +441,17 @@ static void fn_param_fl(const char *file, int line, const char *param,
> {
> const char *event_name = "def_param";
> struct strbuf buf_payload = STRBUF_INIT;
> + struct strbuf scope_payload = STRBUF_INIT;
> + enum config_scope scope = current_config_scope();
> + const char *scope_name = config_scope_name(scope);
>
> strbuf_addf(&buf_payload, "%s:%s", param, value);
> + strbuf_addf(&scope_payload, "%s:%s", "scope", scope_name);
>
> - perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
> - &buf_payload);
> + perf_io_write_fl(file, line, event_name, NULL, NULL, NULL,
> + scope_payload.buf, &buf_payload);
> strbuf_release(&buf_payload);
> + strbuf_release(&scope_payload);
> }
>
> static void fn_repo_fl(const char *file, int line,