From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id B00291B974 for ; Wed, 11 Apr 2018 02:04:45 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id r82so572068wme.0 for ; Tue, 10 Apr 2018 17:04:45 -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=NPufiry684OzI/vgQzXTACseqrT/HTZF7J0f7O44D84aS6S0LSd3/68RDL/qilDTrb n+Lupl2nyzACJBVyWq/JxRBNuLs1PA4V/5uFuKC9ZOkCom4BEmQRgSD/iDzyAaVVfgGe Px5dgOQ8gtLTGn2Zjnr2fPLQi+cc+HYoB+PKgxIwpwT8AKhf3ANGCvmosHAQa+gZQKIE TgmaxPSo2Ux/oqAb2DhO0+h3AC74CuWP6xJFifmzjxZy5ujkMojSV6ER1j8rDssRfrLq /NcVUr9eWFBZ69E9Qanvmnm3KVlCOoPfUNlDg48WCHje0+A+U6zhv5nyYgo4hD5KYmN6 B2fw== 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=C7qOJ+PelyVuu6FSL+fp8jbqpWM7t8gUAkRL1xfb5Rrum8p+AfaHkPqTQY77Q0cPWr DSl7OEr7WQxdm+FtBGXVkcYkN58Qkwl0+Ly7kxbT7NfHVRXGyAySnNeGuqKE4xnAHKpv xEi4+pukx+YaGP95lUl1+/00Ry7psQQYlwY5LQm0aPHtHDARspFPtTAmpD2LCvkTK8EW ntBLLYie3yJQGI+XDYZjyoVhpS6Mpm/Iqbw/YkWjm5hwozbA/v/gT5TdU1zKynlhhbJy ryMTuqisJE/Yjzmt97LuGAwbmqVxkEYRcc679s6tTB1B+xSNK+UP23jsDm8CB77ExZ9Y ataA== X-Gm-Message-State: ALQs6tAaE1rwBkJaQ5c3EgL03NOOantPb9tdbifSN4BsqdURoH6P/Zcl T13rmtuSTny2IB/NrUJZbjtChh+U X-Google-Smtp-Source: AIpwx49DZPoHEGvNzRBAwVoZ4ytRPtJ2JfJ5jbLub5FYLMZEWo3+T4aFTP7LkTFi4XG4abLvdqOp1A== X-Received: by 10.28.213.209 with SMTP id m200mr905868wmg.83.1523405085024; Tue, 10 Apr 2018 17:04:45 -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 39sm7626563wry.89.2018.04.10.17.04.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 17:04:44 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 11 Apr 2018 02:04:03 +0200 Message-Id: <3c46c7947bec6462e07a6c33e39f680c8d9e688b.1523404469.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 v5 02/21] 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: Wed, 11 Apr 2018 00:04:46 -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