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 88F74430C3; Mon, 21 Aug 2023 18:11:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 84B6243279; Mon, 21 Aug 2023 18:10:11 +0200 (CEST) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mails.dpdk.org (Postfix) with ESMTP id 37C0343289 for ; Mon, 21 Aug 2023 18:10:07 +0200 (CEST) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1bf5c314a57so7959265ad.1 for ; Mon, 21 Aug 2023 09:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692634206; x=1693239006; 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=pZwcbwfHY6W6f1Eox8va4POCw+h6SuagpoVNXpyy8dc=; b=p+w5DbyBNHpO7VxjFf2wryo5QxFqPGwcI2wxs1xNtPLA/43KlOZTpJuoINudIrpWqC F6bB1/Ji+Jy6584LJiZVZEyKmgbt8uWixOIxkevi5oeG/2c+33dUj3riqTc+iAudYgxv KWusx3YH8c0meYsb0kRmXXSkv2KhuxAzH6wSRJvrqCUW3ANmnyDm8f7dXlyeo9aBnygD jzJ4QA/L0Gs57x/iswROWQP6RXS2DBaEuoMkhrC1B+rRui0LLB/RRKXQBeqW3w09dFF3 62O7enhFbXJl2/6FvEzqAVKb0z6bW3G5M4LHKX4QjkToffs90tbPvuWjAsP4IL7LGjQZ RQFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692634206; x=1693239006; 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=pZwcbwfHY6W6f1Eox8va4POCw+h6SuagpoVNXpyy8dc=; b=kZNbiI5HKd53p6lD27sbnU2j2pVJSYGmJv0b0BdRAmzMJgtcnmuIMs10Y3vHDSPzGi QG9ZC1ejGp8cBmcBwaj/VttYDggR9dW2Djqs60FS9OjbtSTKKqvMAZ6QJ47LpTjreAAH P/1gAJIoDwdNZJV4I/AeGCdJDmfHk8Vo2XYPE+Wz79+ZEbueezHEwcgXgA0xt+Eoegln FsxKS0I4lw/DK1bnMWIP9GYu7iCMOBZCNM1cLcehYPZOMwXvDSA3Nbi0nMimjQbxXy6B jtEJw6pWmG1zLTS7iivggnzHP7VUs3M/gJ02XcjRffyE/Op7JnLFkvnldca0pfjAzcj3 L1Qg== X-Gm-Message-State: AOJu0YxrIzpp6SMrfpsKGKrguTSi0UcTul9MKNaG2iiK/kByrMFU3Mpl 9SsABBWGYilV4Tyv0vaqKeH8gXUNIl+fa9/H6fCWMnb8 X-Google-Smtp-Source: AGHT+IG5IN2zMkP80ZUjVR2xAIHzkbUXX1hduxGi9YLYsJVMtiXgYHRJkWGl22eNVwQ0GXgYz6HXTQ== X-Received: by 2002:a17:902:dacb:b0:1c0:8bf3:eaf9 with SMTP id q11-20020a170902dacb00b001c08bf3eaf9mr340607plx.40.1692634206230; Mon, 21 Aug 2023 09:10:06 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id i1-20020a17090332c100b001bf2dcfe352sm7208159plr.234.2023.08.21.09.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 09:10:04 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH v13 13/21] sched: convert RTE_LOGTYPE_SCHED to dynamic type Date: Mon, 21 Aug 2023 09:09:13 -0700 Message-Id: <20230821160921.383832-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230821160921.383832-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20230821160921.383832-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/log/log.c | 2 -- lib/log/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/log/log.c b/lib/log/log.c index ab28edec11b8..dfaf6f13b007 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -354,8 +354,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/log/rte_log.h b/lib/log/rte_log.h index dc2454a0d9de..f185fcbc5a94 100644 --- a/lib/log/rte_log.h +++ b/lib/log/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 751f6cf84197..96cd863b5467 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 @@ -2999,3 +3002,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.2