From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id BB79D3572 for ; Mon, 18 Mar 2019 12:56:56 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Mar 2019 04:56:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,493,1544515200"; d="scan'208";a="142963752" Received: from mhajkowx-mobl.ger.corp.intel.com ([10.104.12.180]) by orsmga002.jf.intel.com with ESMTP; 18 Mar 2019 04:56:54 -0700 From: Hajkowski To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Mon, 18 Mar 2019 12:56:47 +0100 Message-Id: <20190318115647.14784-4-marcinx.hajkowski@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 In-Reply-To: <20190318115647.14784-1-marcinx.hajkowski@intel.com> References: <20190318115647.14784-1-marcinx.hajkowski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 4/4] power: add UTs for all power env types X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Mar 2019 11:56:57 -0000 From: Marcin Hajkowski Test all existing power environment configuration to verify if related data is properly initialized and clean in set/unset scenarios. Signed-off-by: Marcin Hajkowski --- app/test/test_power.c | 156 ++++++++++++++++++++++++++++++++---------- 1 file changed, 121 insertions(+), 35 deletions(-) diff --git a/app/test/test_power.c b/app/test/test_power.c index a0ee21983..c236c88cf 100644 --- a/app/test/test_power.c +++ b/app/test/test_power.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "test.h" @@ -23,6 +24,86 @@ test_power(void) #include +static int +check_function_ptrs(void) +{ + enum power_management_env env = rte_power_get_env(); + + const bool not_null_expected = !(env == PM_ENV_NOT_SET); + + const char *inject_not_string1 = not_null_expected ? " not" : ""; + const char *inject_not_string2 = not_null_expected ? "" : " not"; + + if ((rte_power_freqs == NULL) == not_null_expected) { + printf("rte_power_freqs should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_get_freq == NULL) == not_null_expected) { + printf("rte_power_get_freq should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_set_freq == NULL) == not_null_expected) { + printf("rte_power_set_freq should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_up == NULL) == not_null_expected) { + printf("rte_power_freq_up should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_down == NULL) == not_null_expected) { + printf("rte_power_freq_down should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_max == NULL) == not_null_expected) { + printf("rte_power_freq_max should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_min == NULL) == not_null_expected) { + printf("rte_power_freq_min should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_turbo_status == NULL) == not_null_expected) { + printf("rte_power_turbo_status should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_enable_turbo == NULL) == not_null_expected) { + printf("rte_power_freq_enable_turbo should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_disable_turbo == NULL) == not_null_expected) { + printf("rte_power_freq_disable_turbo should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_get_capabilities == NULL) == not_null_expected) { + printf("rte_power_get_capabilities should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + + return 0; +} + static int test_power(void) { @@ -43,43 +124,48 @@ test_power(void) return -1; } - /* verify that function pointers are NULL */ - if (rte_power_freqs != NULL) { - printf("rte_power_freqs should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_get_freq != NULL) { - printf("rte_power_get_freq should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_set_freq != NULL) { - printf("rte_power_set_freq should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_freq_up != NULL) { - printf("rte_power_freq_up should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_freq_down != NULL) { - printf("rte_power_freq_down should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_freq_max != NULL) { - printf("rte_power_freq_max should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_freq_min != NULL) { - printf("rte_power_freq_min should be NULL, environment has not been " - "initialised\n"); + /* Verify that function pointers are NULL */ + if (check_function_ptrs() < 0) goto fail_all; - } + rte_power_unset_env(); + + /* Perform tests for valid environments.*/ + const enum power_management_env envs[] = {PM_ENV_ACPI_CPUFREQ, + PM_ENV_KVM_VM, + PM_ENV_PSTATE_CPUFREQ}; + + const int envs_size = sizeof(envs)/sizeof(enum power_management_env); + + int i; + for (i = 0; i < envs_size; ++i) { + + /* Test setting a valid environment */ + ret = rte_power_set_env(envs[i]); + if (ret != 0) { + printf("Unexpectedly unsucceeded on setting a valid environment\n"); + return -1; + } + + /* Test that the environment has been set */ + env = rte_power_get_env(); + if (env != envs[i]) { + printf("Not expected environment configuration\n"); + return -1; + } + + /* Verify that function pointers are NOT NULL */ + if (check_function_ptrs() < 0) + goto fail_all; + + rte_power_unset_env(); + + /* Verify that function pointers are NULL */ + if (check_function_ptrs() < 0) + goto fail_all; + + } + return 0; fail_all: rte_power_unset_env(); -- 2.17.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 4C545A05FE for ; Mon, 18 Mar 2019 12:57:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 638A94CA6; Mon, 18 Mar 2019 12:57:02 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id BB79D3572 for ; Mon, 18 Mar 2019 12:56:56 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Mar 2019 04:56:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,493,1544515200"; d="scan'208";a="142963752" Received: from mhajkowx-mobl.ger.corp.intel.com ([10.104.12.180]) by orsmga002.jf.intel.com with ESMTP; 18 Mar 2019 04:56:54 -0700 From: Hajkowski To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Mon, 18 Mar 2019 12:56:47 +0100 Message-Id: <20190318115647.14784-4-marcinx.hajkowski@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 In-Reply-To: <20190318115647.14784-1-marcinx.hajkowski@intel.com> References: <20190318115647.14784-1-marcinx.hajkowski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 4/4] power: add UTs for all power env types X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190318115647.f_IdEWm2Aywp2YkotideuS2M0tXRePycjWD7klxBXOU@z> From: Marcin Hajkowski Test all existing power environment configuration to verify if related data is properly initialized and clean in set/unset scenarios. Signed-off-by: Marcin Hajkowski --- app/test/test_power.c | 156 ++++++++++++++++++++++++++++++++---------- 1 file changed, 121 insertions(+), 35 deletions(-) diff --git a/app/test/test_power.c b/app/test/test_power.c index a0ee21983..c236c88cf 100644 --- a/app/test/test_power.c +++ b/app/test/test_power.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "test.h" @@ -23,6 +24,86 @@ test_power(void) #include +static int +check_function_ptrs(void) +{ + enum power_management_env env = rte_power_get_env(); + + const bool not_null_expected = !(env == PM_ENV_NOT_SET); + + const char *inject_not_string1 = not_null_expected ? " not" : ""; + const char *inject_not_string2 = not_null_expected ? "" : " not"; + + if ((rte_power_freqs == NULL) == not_null_expected) { + printf("rte_power_freqs should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_get_freq == NULL) == not_null_expected) { + printf("rte_power_get_freq should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_set_freq == NULL) == not_null_expected) { + printf("rte_power_set_freq should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_up == NULL) == not_null_expected) { + printf("rte_power_freq_up should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_down == NULL) == not_null_expected) { + printf("rte_power_freq_down should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_max == NULL) == not_null_expected) { + printf("rte_power_freq_max should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_min == NULL) == not_null_expected) { + printf("rte_power_freq_min should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_turbo_status == NULL) == not_null_expected) { + printf("rte_power_turbo_status should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_enable_turbo == NULL) == not_null_expected) { + printf("rte_power_freq_enable_turbo should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_freq_disable_turbo == NULL) == not_null_expected) { + printf("rte_power_freq_disable_turbo should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + if ((rte_power_get_capabilities == NULL) == not_null_expected) { + printf("rte_power_get_capabilities should%s be NULL, environment has%s been " + "initialised\n", inject_not_string1, + inject_not_string2); + return -1; + } + + return 0; +} + static int test_power(void) { @@ -43,43 +124,48 @@ test_power(void) return -1; } - /* verify that function pointers are NULL */ - if (rte_power_freqs != NULL) { - printf("rte_power_freqs should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_get_freq != NULL) { - printf("rte_power_get_freq should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_set_freq != NULL) { - printf("rte_power_set_freq should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_freq_up != NULL) { - printf("rte_power_freq_up should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_freq_down != NULL) { - printf("rte_power_freq_down should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_freq_max != NULL) { - printf("rte_power_freq_max should be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_freq_min != NULL) { - printf("rte_power_freq_min should be NULL, environment has not been " - "initialised\n"); + /* Verify that function pointers are NULL */ + if (check_function_ptrs() < 0) goto fail_all; - } + rte_power_unset_env(); + + /* Perform tests for valid environments.*/ + const enum power_management_env envs[] = {PM_ENV_ACPI_CPUFREQ, + PM_ENV_KVM_VM, + PM_ENV_PSTATE_CPUFREQ}; + + const int envs_size = sizeof(envs)/sizeof(enum power_management_env); + + int i; + for (i = 0; i < envs_size; ++i) { + + /* Test setting a valid environment */ + ret = rte_power_set_env(envs[i]); + if (ret != 0) { + printf("Unexpectedly unsucceeded on setting a valid environment\n"); + return -1; + } + + /* Test that the environment has been set */ + env = rte_power_get_env(); + if (env != envs[i]) { + printf("Not expected environment configuration\n"); + return -1; + } + + /* Verify that function pointers are NOT NULL */ + if (check_function_ptrs() < 0) + goto fail_all; + + rte_power_unset_env(); + + /* Verify that function pointers are NULL */ + if (check_function_ptrs() < 0) + goto fail_all; + + } + return 0; fail_all: rte_power_unset_env(); -- 2.17.2