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 A171041D43; Wed, 22 Feb 2023 22:57:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E991143208; Wed, 22 Feb 2023 22:56:25 +0100 (CET) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id 93D794319C for ; Wed, 22 Feb 2023 22:56:03 +0100 (CET) Received: by mail-pj1-f41.google.com with SMTP id il18-20020a17090b165200b0023127b2d602so9891697pjb.2 for ; Wed, 22 Feb 2023 13:56:03 -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=38clejXfJuiXXR5k8fRZkUW6o5I6TZkkStD3/fBvD1g8iJU4n44a2748BHUK5AVXKp q+/0lkUlLhSL7nWKNucbWdr16Wme4I1JCRtndxy1q+ZoYlq9D0qRsDTMMKOTDQAyHijm IJ+0QigwCSeTLajsy6E9VokP14uz6Si1Dh/ToRmP/OEblSWoT7gn+SjipWmL6bxAZ00a BCrcs8KNmVkec9IG5WOo8aQBxYbrPF1CBG8AUThTVa2LZ7EsFSBJ5/CrPBjvbB4BYp3c cChQuC3r4tBk5mMbqtmrV+Zj8k4tVWCGlWaaoCc/6OqYtDZIPcBhL/GBNISJBdMCD1d8 9WIg== 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=4pcgZCx0yG1DyCfssp9pkuLV3Ff3Dyy6mzsvLhTrlfgxQGbyrHxm0pDLO3lii2WXsC zppipw2ppVkDdFdeTNjoLWcQpByG1xFdX/PJ+6Dmpd0FLQ4xBoPwdyjxoGzO1cM2VQdm mm3yjGvOjAKrtmUTnJfV9Iq9sSZay+afyAeURx5zGaZDAvu/1JB9CPLhIectQbLz1LmH oJNbOn7YA1wz9CC7dPHr86HjkO2QUBiMjahbqzz8RKSkkH6nwEZ6u2BFKADKWK4YyhM5 qnceiXyQC1SkMxA9S+ui6HJ+SGx9iFmTXeBtgMgI+s4cxIAUB541kRUysyxfj319vBzj UI9Q== X-Gm-Message-State: AO0yUKWksGlJua+qE8wBpddNSlutcTNHSsmby6a+sdw93Lkt1eXIFefv wHDTv99nV7oPG8Iz6zgE+MVEFdd2flnCGRDXSg8= X-Google-Smtp-Source: AK7set/XXS8junejl7yQLqqKD+hu2kzA3tlhtJaOY6KraGP0m5jhHzgtklpTf40gmyVmHL6MokeFUg== X-Received: by 2002:a05:6a20:734f:b0:bf:ca3:6896 with SMTP id v15-20020a056a20734f00b000bf0ca36896mr10236607pzc.2.1677102962497; Wed, 22 Feb 2023 13:56:02 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id d7-20020aa78147000000b00571cdbd0771sm6400722pfn.102.2023.02.22.13.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 13:56:02 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH v11 14/22] sched: replace RTE_LOGTYPE_SCHED with dynamic type Date: Wed, 22 Feb 2023 13:55:33 -0800 Message-Id: <20230222215541.158205-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230222215541.158205-1-stephen@networkplumber.org> References: <20230207204151.1503491-1-stephen@networkplumber.org> <20230222215541.158205-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