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 6D024433FD; Tue, 5 Dec 2023 03:15:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A27F42DE2; Tue, 5 Dec 2023 03:14:06 +0100 (CET) Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by mails.dpdk.org (Postfix) with ESMTP id B757B42DC9 for ; Tue, 5 Dec 2023 03:14:00 +0100 (CET) Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3b844e3e817so2890200b6e.0 for ; Mon, 04 Dec 2023 18:14:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742440; x=1702347240; darn=dpdk.org; 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=BTcAiREUy8P9cMnej7TK5Visaj8wZSzk7HjwDnP2Zkc=; b=CEboHLjFsrTFLGdP6Zf+jphLiRziPaha+80PKzRDvo0xiB19ejjZmXp7qwGQbcM6bF B1+banvva+veluWYqHeFamy28kVugxyxfHVm8xg7LIHZoAo7A7V3Kh3fq4RXw2shZcCd s7+M/rl/uvScpVvILiwx+n4KXcKajHTr3zFm5FZyEV9QC4QWMcB/uw7dsk/Zyluut++z KoqySvS6gw3zY6d08VDqZ1Lk3RlXqHIb3Cfqitbw7ILzKYcmBw+MP/a3RimDqWpvQpZl 9kvTp5tsCgccXescwqKtGSKd9sJIbCE1sOld6QyMVsG0IHqE9f3uyGdAq0p/22KLh+5Z 1VJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742440; x=1702347240; 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=BTcAiREUy8P9cMnej7TK5Visaj8wZSzk7HjwDnP2Zkc=; b=tA5ptnAyucEOKzzRjWxq0qw+tzo6SLFwkGaR8L+yprrRqvnsDi3ygTH2jujOjkXx/6 NMrXBtZ+NHcqaQ4QpywLOChq2vbUiYHLQZZPt+ylw1juwhYRONqaJJ6lnYFh/ilAy3Pw 9W5SZzkfdLuTGhw6seAwoIVqg8ICDi+xn75CpJYxjLV5pjpMc+1ru8dByr4H3ExPYKzS BebUtMv4e3Ppo1sK0If+XS+yJKcwlPCTPkBTk/M4QHJ16se+324nv9TLdAtoPAjx2XzL W6PP79qFrKywokE29162k0b0JEHUj/LsZYTg+JYB88ACAi4b5sg0VCpVDqo7LKrwl38p RwNg== X-Gm-Message-State: AOJu0YzmVfuMAQmLbyiJpc7+mRfYAAXlw44iPK9dcml11MRYsInCE7X3 /Jjus7HJqUvvJcHjiTuDZoAUh6pwsVeE2X6d+bY= X-Google-Smtp-Source: AGHT+IHUZEXQzrw3lbmtcuYR2/LXVk90C4QN4x60GaUYaK3FrAclA6+jh4vGWe6cjfORuip7Ofb8YA== X-Received: by 2002:a05:6808:1795:b0:3b8:b2c0:e317 with SMTP id bg21-20020a056808179500b003b8b2c0e317mr5674130oib.77.1701742440166; Mon, 04 Dec 2023 18:14:00 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:59 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH 13/18] sched: convert RTE_LOGTYPE_SCHED to dynamic type Date: Mon, 4 Dec 2023 18:09:51 -0800 Message-ID: <20231205021330.260017-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-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 95e0ba1c6b51..56877d42e6b9 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 8d34ac902b39..189ad2bbd2cf 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 1a6beb14f4ab..76dd8dd7388c 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.42.0