From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 9B7B01B3FE for ; Sun, 15 Apr 2018 17:08:13 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id v60so15399448wrc.7 for ; Sun, 15 Apr 2018 08:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=2xCwL7hBcveMFexebCeC56/mZlcIWIEEjoKHQ1LdqNM=; b=y/yjnXv9yIm8ztN+1ika6UPpXWVC41HegoL5CTXfQZi1/3PmRZtq+WDjSpyiCtOk6j +6KYEAUOKrtV1634Hs5qQ7uwQiDOl3fkiHbIqMiUGDe1NuwkXwk0WZHKRMVpG9sTSP+J sfSmnk6CKYwBcStuqvf4YNt8oXjr0BtC8BJWcNEz6McrFgn2TpQOdlrpBjGGOghH+8H2 Ahr8sendXK0aEh8fegn5fw4oYOHettvLRSPOrtGIWAyUGunGwGYFHmcccRVVte3NU3oO fzc/tSE182nUIlgD4kzJ6FQRJoG5oVTWix2C+lD66UTsY+yYujvm6Txzyf588jxeNprN 1A/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=2xCwL7hBcveMFexebCeC56/mZlcIWIEEjoKHQ1LdqNM=; b=VSdpm+lfMf2Cm07pVCoV/Kv5vYo+oJULtN9MDqEnvsdGvgmOmVGpI3NQTePkY6qwsj qHnsf350hrI1UmzvBrf3q64JRNY38w3+jKxGoQOY2s+nHtly6MIWhI6qwL8PTmVcuBzC fNjyp56ruGCE3fl7CpztJMcpHu5v5u0ixgxhu1rmtRMmmqgb1AZtuP+TxbHrLfcgIIKH btoMV/t7P9oWEwmSENW/APeoxwFqp7uLqaCSMYLtzdUdiauwjlbh+MWa/bz+Pka88ewz G/gSHESLqXiFok8x7+LESLKY8Ckk/KWbzM2QzLylUzLxu4+wk4ruF2s7UKXJfPtmZd2d Dvqg== X-Gm-Message-State: ALQs6tDfIBIBK13KgEs+Wa20dGWlDnRobxZfL1KsNgxmPaLNPHxKvVTa T47pIBAkrazX/zs9GkaUk7qcyn2S X-Google-Smtp-Source: AIpwx48Z590XNleszkgo7HiWgBA4h9H2++czKQE+YrMRi9HMfpioB6zVnP8RVeFnFBO6xLFvf0GAPQ== X-Received: by 10.28.147.83 with SMTP id v80mr3494019wmd.91.1523804892841; Sun, 15 Apr 2018 08:08:12 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id r200sm13673438wmb.39.2018.04.15.08.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 08:08:11 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Sun, 15 Apr 2018 17:07:31 +0200 Message-Id: <878ee309af1cb80aa4ce6287bfbbbfecf68ddc82.1523804657.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v7 02/22] eal: list acceptable init priorities 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: Sun, 15 Apr 2018 15:08:14 -0000 Build a central list to quickly see each used priorities for constructors, allowing to verify that they are both above 100 and in the proper order. Signed-off-by: Gaetan Rivet Acked-by: Neil Horman Acked-by: Shreyansh Jain --- lib/librte_eal/common/eal_common_log.c | 2 +- lib/librte_eal/common/include/rte_bus.h | 2 +- lib/librte_eal/common/include/rte_common.h | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index a27192620..36b9d6e08 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -260,7 +260,7 @@ static const struct logtype logtype_strings[] = { }; /* Logging should be first initializer (before drivers and bus) */ -RTE_INIT_PRIO(rte_log_init, 101); +RTE_INIT_PRIO(rte_log_init, LOG); static void rte_log_init(void) { diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h index 6fb08341a..eb9eded4e 100644 --- a/lib/librte_eal/common/include/rte_bus.h +++ b/lib/librte_eal/common/include/rte_bus.h @@ -325,7 +325,7 @@ enum rte_iova_mode rte_bus_get_iommu_class(void); * The constructor has higher priority than PMD constructors. */ #define RTE_REGISTER_BUS(nm, bus) \ -RTE_INIT_PRIO(businitfn_ ##nm, 110); \ +RTE_INIT_PRIO(businitfn_ ##nm, BUS); \ static void businitfn_ ##nm(void) \ {\ (bus).name = RTE_STR(nm);\ diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index 6c5bc5a76..8f04518f7 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -81,6 +81,12 @@ typedef uint16_t unaligned_uint16_t; */ #define RTE_SET_USED(x) (void)(x) +#define RTE_PRIORITY_LOG 101 +#define RTE_PRIORITY_BUS 110 + +#define RTE_PRIO(prio) \ + RTE_PRIORITY_ ## prio + /** * Run function before main() with low priority. * @@ -102,7 +108,7 @@ static void __attribute__((constructor, used)) func(void) * Lowest number is the first to run. */ #define RTE_INIT_PRIO(func, prio) \ -static void __attribute__((constructor(prio), used)) func(void) +static void __attribute__((constructor(RTE_PRIO(prio)), used)) func(void) /** * Force a function to be inlined -- 2.11.0