From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4733FD5AE65 for ; Thu, 7 Nov 2024 05:53:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D1C610E7B2; Thu, 7 Nov 2024 05:53:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="HZYrnK23"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6BC510E305 for ; Thu, 7 Nov 2024 05:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1730958798; x=1762494798; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VkeH7W3TcB7YZUbdjHbYEOLlfy3LptB6E2Dqx2iQAIA=; b=HZYrnK23oX3hSXTIqq1IpYtU1fKf1Al3vn+5L3M39CMh5fnvHWJd800z rW9r03K/gTu+jovdqrdTK2psoEHQHmV1FpERZpLxCG3xNbrKGsIy/aLaS ZNseendZ4zL7MzIyd789E3flVZ9fAx9HvQBRb7b5Mv9wxZ5Mti7e9iq+o S+bY75t2ahi3irFe63Ct/BIcmx6ePu5lluujD+66ho3gc0TZqzpZT0cZy fF4do+37Df3DaA4JdQdmi3oCbUdXo8I7FON7XWSc59v24dK+Z/1Qo9h5U mGMf0MzKHz2O9N63Zwc14D2n9KoP04u2mUrpg7enytGaEUfw+aCCf4Xxm A==; X-CSE-ConnectionGUID: /3whL19IScGjPrhGoHssxg== X-CSE-MsgGUID: JGjPrSUtQ92etcJD4mXc8A== X-IronPort-AV: E=McAfee;i="6700,10204,11248"; a="41381730" X-IronPort-AV: E=Sophos;i="6.11,265,1725346800"; d="scan'208";a="41381730" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2024 21:53:13 -0800 X-CSE-ConnectionGUID: uH4yOAwyRneZ9SN8p8Khpg== X-CSE-MsgGUID: m1XfX4haTIeYTbPqb56L0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,265,1725346800"; d="scan'208";a="84879396" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2024 21:53:12 -0800 From: Lucas De Marchi To: igt-dev@lists.freedesktop.org Cc: Janusz Krzysztofik , Lucas De Marchi Subject: [PATCH i-g-t v3 4/6] lib/igt_kmod: Stop passing ktap around Date: Wed, 6 Nov 2024 21:52:52 -0800 Message-ID: <20241107055254.3129207-5-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241107055254.3129207-1-lucas.demarchi@intel.com> References: <20241107055254.3129207-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Just allocate and free in the only function it's needed. Signed-off-by: Lucas De Marchi --- lib/igt_kmod.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c index 36578aa68..fd79e8739 100644 --- a/lib/igt_kmod.c +++ b/lib/igt_kmod.c @@ -995,8 +995,9 @@ static void kunit_results_free(struct igt_list_head *results, } static int kunit_get_results(struct igt_list_head *results, const char *debugfs_path, - const char *suite, struct igt_ktap_results **ktap) + const char *suite) { + struct igt_ktap_results *ktap; char results_path[PATH_MAX]; FILE *results_stream; char *buf = NULL; @@ -1012,21 +1013,21 @@ static int kunit_get_results(struct igt_list_head *results, const char *debugfs_ if (igt_debug_on(!results_stream)) return -errno; - *ktap = igt_ktap_alloc(results); - if (igt_debug_on(!*ktap)) { + ktap = igt_ktap_alloc(results); + if (igt_debug_on(!ktap)) { err = -ENOMEM; goto out_fclose; } while (len = getline(&buf, &size, results_stream), len > 0) { - err = igt_ktap_parse(buf, *ktap); + err = igt_ktap_parse(buf, ktap); if (err != -EINPROGRESS) break; } free(buf); + igt_ktap_free(&ktap); - igt_ktap_free(ktap); out_fclose: fclose(results_stream); @@ -1037,8 +1038,7 @@ static void kunit_get_tests(struct igt_list_head *tests, struct igt_ktest *tst, const char *suite, const char *opts, - const char *debugfs_path, - struct igt_ktap_results **ktap) + const char *debugfs_path) { struct igt_ktap_result *r, *rn; struct dirent *subdir; @@ -1083,7 +1083,7 @@ static void kunit_get_tests(struct igt_list_head *tests, if (suite && strcmp(subdir->d_name, suite)) continue; - igt_warn_on_f(kunit_get_results(tests, debugfs_path, subdir->d_name, ktap), + igt_warn_on_f(kunit_get_results(tests, debugfs_path, subdir->d_name), "parsing KTAP report from test suite \"%s\" failed\n", subdir->d_name); @@ -1102,8 +1102,7 @@ static void __igt_kunit(struct igt_ktest *tst, const char *subtest, const char *opts, const char *debugfs_path, - struct igt_list_head *tests, - struct igt_ktap_results **ktap) + struct igt_list_head *tests) { struct igt_ktap_result *t; @@ -1133,7 +1132,7 @@ static void __igt_kunit(struct igt_ktest *tst, igt_assert_eq(igt_kernel_tainted(&taints), 0); igt_assert_eq(kunit_get_results(&results, debugfs_path, - t->suite_name, ktap), 0); + t->suite_name), 0); for (i = 0; i < 2; i++) { kunit_result_free(&r, &suite_name, &case_name); @@ -1197,7 +1196,6 @@ void igt_kunit(const char *module_name, const char *suite, const char *opts) { char debugfs_path[PATH_MAX] = { '\0', }; struct igt_ktest tst = { .kmsg = -1, }; - struct igt_ktap_results *ktap = NULL; char *subtest; IGT_LIST_HEAD(tests); @@ -1243,16 +1241,13 @@ void igt_kunit(const char *module_name, const char *suite, const char *opts) * and for documentation. */ igt_subtest_with_dynamic(subtest) { - kunit_get_tests(&tests, &tst, suite, opts, - debugfs_path, &ktap); - __igt_kunit(&tst, subtest, opts, debugfs_path, &tests, &ktap); + kunit_get_tests(&tests, &tst, suite, opts, debugfs_path); + __igt_kunit(&tst, subtest, opts, debugfs_path, &tests); } igt_fixture { char *suite_name = NULL, *case_name = NULL; - igt_ktap_free(&ktap); - kunit_results_free(&tests, &suite_name, &case_name); igt_ktest_end(&tst); -- 2.47.0