From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF06910E0C2 for ; Wed, 6 Dec 2023 11:02:26 +0000 (UTC) Date: Wed, 6 Dec 2023 12:02:22 +0100 From: Mauro Carvalho Chehab To: Kamil Konieczny Message-ID: <20231206120222.3c34a552@maurocar-mobl2> In-Reply-To: <20231130150923.17707-1-kamil.konieczny@linux.intel.com> References: <20231130150923.17707-1-kamil.konieczny@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [igt-dev] [PATCH i-g-t] runner/resultgen: Fix subtest runtimes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org, Piotr Kira Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Thu, 30 Nov 2023 16:09:23 +0100 Kamil Konieczny wrote: > From: Piotr Kira > > Runtimes for single subtest are not included in results json object > after switching to socket communication. Make times for both subtests > and dynamic subtests when using comms. > > v2: added GitLab issue number, added Petri to Cc (Kamil) > reformat so it could be applied (Kamil) > > Cc: Petri Latvala > Fixes: 9d889fa6b8f0 ("runner: Use socket communications") > Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/132 > Signed-off-by: Piotr Kira > Signed-off-by: Kamil Konieczny Didn't test it, but LGTM. Reviewed-by: Mauro Carvalho Chehab > --- > runner/resultgen.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/runner/resultgen.c b/runner/resultgen.c > index b00bb6ba5..63f5b26d7 100644 > --- a/runner/resultgen.c > +++ b/runner/resultgen.c > @@ -1262,6 +1262,9 @@ struct comms_context > char *subtestresult; > char *dynamicsubtestresult; > > + double subtest_execution_time; > + double dynamic_subtest_execution_time; > + > char *cmdline; > int exitcode; > > @@ -1321,6 +1324,7 @@ static void comms_finish_subtest(struct comms_context *context) > if (context->subtestresult == NULL) > context->subtestresult = strdup("incomplete"); > set_result(context->current_test, context->subtestresult); > + add_runtime(context->current_test, context->subtest_execution_time); > > free(context->subtestresult); > context->subtestresult = NULL; > @@ -1343,6 +1347,7 @@ static void comms_finish_dynamic_subtest(struct comms_context *context) > if (context->dynamicsubtestresult == NULL) > context->dynamicsubtestresult = strdup("incomplete"); > set_result(context->current_dynamic_subtest, context->dynamicsubtestresult); > + add_runtime(context->current_dynamic_subtest, context->dynamic_subtest_execution_time); > > free(context->dynamicsubtestresult); > context->dynamicsubtestresult = NULL; > @@ -1617,6 +1622,7 @@ static bool comms_handle_subtest_result(const struct runnerpacket *packet, > strlen(helper.subtestresult.result), > &mappedresult, NULL); > context->subtestresult = strdup(mappedresult); > + context->subtest_execution_time = strtod(helper.subtestresult.timeused, NULL); > } > > context->state = STATE_BETWEEN_SUBTESTS; > @@ -1757,6 +1763,7 @@ static bool comms_handle_dynamic_subtest_result(const struct runnerpacket *packe > strlen(helper.dynamicsubtestresult.result), > &mappedresult, NULL); > context->dynamicsubtestresult = strdup(mappedresult); > + context->dynamic_subtest_execution_time = strtod(helper.dynamicsubtestresult.timeused, NULL); > } > > context->state = STATE_BETWEEN_DYNAMIC_SUBTESTS;