From patchwork Fri Oct 26 12:38:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 47473 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3CAE62B8C; Fri, 26 Oct 2018 14:38:47 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id DDB582965 for ; Fri, 26 Oct 2018 14:38:45 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Oct 2018 05:38:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,427,1534834800"; d="scan'208";a="84356670" Received: from silpixa00399952.ir.intel.com (HELO silpixa00399952.ger.corp.intel.com) ([10.237.223.64]) by orsmga007.jf.intel.com with ESMTP; 26 Oct 2018 05:38:43 -0700 From: David Hunt To: dev@dpdk.org, david.hunt@intel.com Cc: liang.j.ma@intel.com Date: Fri, 26 Oct 2018 13:38:24 +0100 Message-Id: <20181026123824.56349-1-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] power: fix traffic aware compilation errors 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" 1. %ld to PRId64 for 32-bit builds 2. Fix dependency on librte_timer Fixes: 450f0791312c ("power: add traffic pattern aware power control") Signed-off-by: David Hunt Tested-by: Ferruh Yigit --- lib/Makefile | 2 +- lib/librte_power/rte_power_empty_poll.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 8c839425d..9ad10e0b6 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -71,7 +71,7 @@ DEPDIRS-librte_bitratestats := librte_eal librte_metrics librte_ethdev DIRS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += librte_latencystats DEPDIRS-librte_latencystats := librte_eal librte_metrics librte_ethdev librte_mbuf DIRS-$(CONFIG_RTE_LIBRTE_POWER) += librte_power -DEPDIRS-librte_power := librte_eal +DEPDIRS-librte_power := librte_eal librte_timer DIRS-$(CONFIG_RTE_LIBRTE_METER) += librte_meter DEPDIRS-librte_meter := librte_eal DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += librte_flow_classify diff --git a/lib/librte_power/rte_power_empty_poll.c b/lib/librte_power/rte_power_empty_poll.c index c1e10e02d..e6145462f 100644 --- a/lib/librte_power/rte_power_empty_poll.c +++ b/lib/librte_power/rte_power_empty_poll.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "rte_power.h" #include "rte_power_empty_poll.h" @@ -226,8 +227,8 @@ update_stats(struct priority_worker *poll_stats) /* edpi mean empty poll counter difference per interval */ RTE_LOG(DEBUG, POWER, "cur_edpi is too large " - "cur edpi %ld " - "base edpi %ld\n", + "cur edpi %"PRId64" " + "base edpi %"PRId64"\n", cur_edpi, s->thresh[s->cur_freq].base_edpi); /* Value to make us fail need debug log*/ @@ -261,7 +262,7 @@ update_stats_normal(struct priority_worker *poll_stats) enum freq_val cur_freq = poll_stats->cur_freq; /* edpi mean empty poll counter difference per interval */ - RTE_LOG(DEBUG, POWER, "cure freq is %d, edpi is %lu\n", + RTE_LOG(DEBUG, POWER, "cure freq is %d, edpi is %"PRIu64"\n", cur_freq, poll_stats->thresh[cur_freq].base_edpi); return; @@ -346,14 +347,14 @@ empty_poll_training(struct priority_worker *poll_stats, set_state(poll_stats, MED_NORMAL); - RTE_LOG(INFO, POWER, "LOW threshold is %lu\n", + RTE_LOG(INFO, POWER, "LOW threshold is %"PRIu64"\n", poll_stats->thresh[LOW].base_edpi); - RTE_LOG(INFO, POWER, "MED threshold is %lu\n", + RTE_LOG(INFO, POWER, "MED threshold is %"PRIu64"\n", poll_stats->thresh[MED].base_edpi); - RTE_LOG(INFO, POWER, "HIGH threshold is %lu\n", + RTE_LOG(INFO, POWER, "HIGH threshold is %"PRIu64"\n", poll_stats->thresh[HGH].base_edpi); RTE_LOG(INFO, POWER, "Training is Complete for %d\n",