From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 150DB41C99; Tue, 14 Feb 2023 23:49:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 140A543032; Tue, 14 Feb 2023 23:48:15 +0100 (CET) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mails.dpdk.org (Postfix) with ESMTP id 3F74B42FE8 for ; Tue, 14 Feb 2023 23:48:04 +0100 (CET) Received: by mail-pj1-f47.google.com with SMTP id fu4-20020a17090ad18400b002341fadc370so270582pjb.1 for ; Tue, 14 Feb 2023 14:48:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EBXd7hlidEUeOKZgcvWvewq4rKwneIJHCAR/EMsgr2w=; b=nQFg+/+mF/C85nHAKO2QvJ6z9rZhir/dmmMR/EacFZXU4YDp7hPllw0mN2LMSyk+No aIyVRd84gkEMm0CZ3WFI0bbtW4WGqcFQ1ZHvdJJj2poy3SQNqRYwPUHzx0bth8oiPoZp SnIJ5wY4E9st4/JdT1ctqTfStN6R0HxwC3OX+ndnNEhnOzsqTUxKcXyJc4NQa7OeE/ZH jU3LIVlzdDricg62a0H71y5ngCyX/s5qBk48OpTEK6NPAuFwjfFxHZuBwzBszM/exJTU OSHwt5gGkpFpT3yYOGcRRuZ1c/DV4WMPZnOOEVGrhapqie8tsbwTaw7jaQUrgeVctchs MGXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EBXd7hlidEUeOKZgcvWvewq4rKwneIJHCAR/EMsgr2w=; b=Jpw/OZpliZrxO4wxBkJjqlKsiLFzQ872vu/V8vwTXX8Qs2vsXaVjVWuIdnOx7TXjsm xowS2pBLOByqCCFREUMJOdPgRcGC9JQpXrGfPejEVvB8UCkLTMBPLU1BzklkhJWGuhvu paLfcivZnqPIoDB4og8nFA93s+sf7R4gypJAR8DXcOcHNcNagGgO5QvNms8lVOFV1ctF gQxYMRez6+DWj/CeGSSeilUKyGXZgQgi+6F8mIPnnT4nhjlnKwcNjXUIJUfgd2+/uix3 /LY+for2wLvKMmRzqBYGkk1S2HuhZxPT8hNssMm+FLQEhJNjvfCN6y+ObeuzeF+BbB+K g7cg== X-Gm-Message-State: AO0yUKWqd29zlLwTbIDsXSpjr9RK9QjB8yPIjct8628wh6HIIpTSf9vR 3A4PviHXbafWkyLcW4NLXAh4cZA100AcCtts16A= X-Google-Smtp-Source: AK7set88g0DnebhL9XxDsWKgB7yaN8k6a9gdB8OgokBYezKeL1IG1xAeZBKd8BM69pkcDAvyyqNkHQ== X-Received: by 2002:a17:902:fb46:b0:19a:96f0:b13 with SMTP id lf6-20020a170902fb4600b0019a96f00b13mr232848plb.31.1676414883233; Tue, 14 Feb 2023 14:48:03 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id u9-20020a17090341c900b0019607984a5esm10735785ple.95.2023.02.14.14.48.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 14:48:02 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH v6 14/22] sched: replace RTE_LOGTYPE_SCHED with dynamic type Date: Tue, 14 Feb 2023 14:47:27 -0800 Message-Id: <20230214224735.1404326-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214224735.1404326-1-stephen@networkplumber.org> References: <20230207204151.1503491-1-stephen@networkplumber.org> <20230214224735.1404326-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Also can remove unused RTE_LOGTYPE_METER Signed-off-by: Stephen Hemminger --- lib/eal/common/eal_common_log.c | 2 -- lib/eal/include/rte_log.h | 4 ++-- lib/sched/rte_pie.c | 1 + lib/sched/rte_sched.c | 5 +++++ lib/sched/rte_sched_log.h | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 lib/sched/rte_sched_log.h diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c index 70d5bb7b1951..d4b7088b5cbb 100644 --- a/lib/eal/common/eal_common_log.c +++ b/lib/eal/common/eal_common_log.c @@ -351,8 +351,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, - {RTE_LOGTYPE_METER, "lib.meter"}, - {RTE_LOGTYPE_SCHED, "lib.sched"}, {RTE_LOGTYPE_PORT, "lib.port"}, {RTE_LOGTYPE_TABLE, "lib.table"}, {RTE_LOGTYPE_PIPELINE, "lib.pipeline"}, diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h index dc2454a0d9de..f185fcbc5a94 100644 --- a/lib/eal/include/rte_log.h +++ b/lib/eal/include/rte_log.h @@ -37,8 +37,8 @@ extern "C" { /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */ /* was RTE_LOGTYPE_POWER */ -#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */ -#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */ + /* was RTE_LOGTYPE_METER */ + /* was RTE_LOGTYPE_SCHED */ #define RTE_LOGTYPE_PORT 13 /**< Log related to port. */ #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */ #define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */ diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c index 947e2a059f6f..cce0ce762da8 100644 --- a/lib/sched/rte_pie.c +++ b/lib/sched/rte_pie.c @@ -6,6 +6,7 @@ #include #include +#include "rte_sched_log.h" #include "rte_pie.h" #ifdef __INTEL_COMPILER diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c index c91697131d3e..c2bd8c785fcd 100644 --- a/lib/sched/rte_sched.c +++ b/lib/sched/rte_sched.c @@ -16,9 +16,12 @@ #include #include "rte_sched.h" +#include "rte_sched_log.h" #include "rte_sched_common.h" + #include "rte_approx.h" + #ifdef __INTEL_COMPILER #pragma warning(disable:2259) /* conversion may lose significant bits */ #endif @@ -3002,3 +3005,5 @@ rte_sched_port_dequeue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint return count; } + +RTE_LOG_REGISTER_DEFAULT(sched_logtype, INFO); diff --git a/lib/sched/rte_sched_log.h b/lib/sched/rte_sched_log.h new file mode 100644 index 000000000000..fde051f49d62 --- /dev/null +++ b/lib/sched/rte_sched_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int sched_logtype; +#define RTE_LOGTYPE_SCHED sched_logtype -- 2.39.1