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 7190041CF1; Tue, 21 Feb 2023 00:37:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A01443166; Tue, 21 Feb 2023 00:36:29 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id 2693C43137 for ; Tue, 21 Feb 2023 00:36:12 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id e5so4191315plg.8 for ; Mon, 20 Feb 2023 15:36:12 -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=h8xeCiYAn70XfFwWvsKqKNUeO1NKeHChTpCpY1GleV4=; b=N5ywaz2yV+ySClKjdcjIWUWJkb/yoDbTxdLpVKHcxt4mxN+KmkugVGEk5kuASwWw3N uLbrjiy5XCZsu53iXPMwsFOeidb72dOj0qlZTPPes+7HfkxDU5Dy4bn1TeSAZxav9X4+ S/8u/cMiw1HpJzXhrvkravmyFDgt+l+L23gNPNZv70w6PoNwlqwjWhRQXea+eE6Zx99O aQtUNx0m/W4hTlZiYHPYcTFCYwOTa3ARCO9wWggxD6QTssVC8UtTzw50qYw7r5Qt8kh2 /tv/lDgZ3lN5aoR6gHgf6pbzT2gFpiG2HcmFEWOdwHisnTcWBCeZCEijR8yizEMg4zVd bLfQ== 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=h8xeCiYAn70XfFwWvsKqKNUeO1NKeHChTpCpY1GleV4=; b=pv79EHukiR0V7bXJqD664Ig9tzP3HV+Qb5fQzvIkI69IiWbQIGKvEG20CTGHvb0kJ5 wPS93lsM4kw9unHAwfpCZlnanRLMJoOcanLJw0t8+5/Zvh0q6TOhXYHMrhBEPaQdxpl/ SaNkBMy/Pg53/a1s4PJGfCLndSi/zZxVbQHB8GZL71get8qjR9z5x1WPMHqUlHUADhSx ZFBIAMsovoD0kqMVUynQQJng8SbIsMp2N7Lhc73Gee1wg5QxYQSTi23pn8OU6AFvfA2U pjTapikSUGdKkzd9bJorkhUOhRONHZI2gzu2XNvbRrDkKQtPVUP9+1Zk56Mf4AbTUtem oITg== X-Gm-Message-State: AO0yUKVfOw4vEvf618L+haLMoSduyuw2TJpC+iJia6AZqAO1I5HKliyq ATtupZ45wx4ooDRwtp35jNrI7DbcpeP6qkzZeCw= X-Google-Smtp-Source: AK7set+JWpVnZT4BwrwDiiYMdIul9zl7KmTWGaMEyW4qO4iPQn7Cjq1oRPztZAwcDkQbsNdNGZAfiw== X-Received: by 2002:a05:6a20:4426:b0:bf:c0e8:fbc5 with SMTP id ce38-20020a056a20442600b000bfc0e8fbc5mr2977701pzb.54.1676936171045; Mon, 20 Feb 2023 15:36:11 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id q19-20020a62e113000000b005a8dc935ec1sm8215908pfh.62.2023.02.20.15.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 15:36:10 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v8 14/22] sched: replace RTE_LOGTYPE_SCHED with dynamic type Date: Mon, 20 Feb 2023 15:35:48 -0800 Message-Id: <20230220233556.168553-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230220233556.168553-1-stephen@networkplumber.org> References: <20230207204151.1503491-1-stephen@networkplumber.org> <20230220233556.168553-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 19768d8c38b0..27e98e46df7a 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