From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 8F56B423C5;
Fri, 13 Jan 2023 17:20:37 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id C051442E1C;
Fri, 13 Jan 2023 17:20:23 +0100 (CET)
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
by mails.dpdk.org (Postfix) with ESMTP id C3F6A42E12
for <dev@dpdk.org>; Fri, 13 Jan 2023 17:20:21 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1673626821; x=1705162821;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=xJp2o9EKbnW3zzSlD2e/Qh06aT2NTsNtZVm+hxeFSio=;
b=d/bFsdiLtZRKKmIRU5KhTqeaedK+0D2RLhafIDRZSj+8B0bVHfDPvj9/
UnNVwF2EqkiX+vFcfEq5+3iy1p1g7E6yxDpLhepUWAuxZgdzMKvEdD7ol
F3rkamZjOdZX5e6a04JujfBVE/Wi96Ct0N4OjyaYWR3+P7Ckw1ttThl5/
uZSobHSTM0RwM6n6OovLJCIOg1ZdmnO/kRGHp9IlvYF2rR7gnvNEnHU5Z
5BdTDpLzFiX2+t8f9NAOkWioc9ZaMkImDHHZUM3wv6fRVxlfNRkwdtfLC
sk9OaOaLoBB+oXKD52Q49SiRv4TqYccIlOXZKHgNLt4QXeMHpIGNtAQZV w==;
X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="307575057"
X-IronPort-AV: E=Sophos;i="5.97,214,1669104000"; d="scan'208";a="307575057"
Received: from fmsmga004.fm.intel.com ([10.253.24.48])
by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
13 Jan 2023 08:20:15 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="726757504"
X-IronPort-AV: E=Sophos;i="5.97,214,1669104000"; d="scan'208";a="726757504"
Received: from silpixa00401459.ir.intel.com (HELO
silpixa00401459.ger.corp.intel.com) ([10.237.223.90])
by fmsmga004.fm.intel.com with ESMTP; 13 Jan 2023 08:20:14 -0800
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: mb@smartsharesystems.com, david.marchand@redhat.com,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [RFC PATCH v2 3/3] telemetry: use standard logging
Date: Fri, 13 Jan 2023 16:20:01 +0000
Message-Id: <20230113162001.519534-4-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20230113162001.519534-1-bruce.richardson@intel.com>
References: <20220829151901.376754-1-bruce.richardson@intel.com>
<20230113162001.519534-1-bruce.richardson@intel.com>
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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Now that logging is moved out of EAL, we don't need injection of the
logtype and logging function from EAL to telemetry library, simplifying
things.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/eal/freebsd/eal.c | 6 +-----
lib/eal/linux/eal.c | 6 +-----
lib/telemetry/telemetry.c | 12 +++++-------
lib/telemetry/telemetry_internal.h | 3 +--
4 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index 607684c1a3..820c4524e5 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -871,13 +871,9 @@ rte_eal_init(int argc, char **argv)
return -1;
}
if (rte_eal_process_type() == RTE_PROC_PRIMARY && !internal_conf->no_telemetry) {
- int tlog = rte_log_register_type_and_pick_level(
- "lib.telemetry", RTE_LOG_WARNING);
- if (tlog < 0)
- tlog = RTE_LOGTYPE_EAL;
if (rte_telemetry_init(rte_eal_get_runtime_dir(),
rte_version(),
- &internal_conf->ctrl_cpuset, rte_log, tlog) != 0)
+ &internal_conf->ctrl_cpuset) != 0)
return -1;
}
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 8c118d0d9f..56ebca302e 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -1319,13 +1319,9 @@ rte_eal_init(int argc, char **argv)
return -1;
}
if (rte_eal_process_type() == RTE_PROC_PRIMARY && !internal_conf->no_telemetry) {
- int tlog = rte_log_register_type_and_pick_level(
- "lib.telemetry", RTE_LOG_WARNING);
- if (tlog < 0)
- tlog = RTE_LOGTYPE_EAL;
if (rte_telemetry_init(rte_eal_get_runtime_dir(),
rte_version(),
- &internal_conf->ctrl_cpuset, rte_log, tlog) != 0)
+ &internal_conf->ctrl_cpuset) != 0)
return -1;
}
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 8fbb4f3060..46afc5c4ac 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -54,11 +54,10 @@ static struct socket v1_socket; /* socket for v1 telemetry */
static const char *telemetry_version; /* save rte_version */
static const char *socket_dir; /* runtime directory */
static rte_cpuset_t *thread_cpuset;
-static rte_log_fn rte_log_ptr;
-static uint32_t logtype;
+extern int logtype;
#define TMTY_LOG(l, ...) \
- rte_log_ptr(RTE_LOG_ ## l, logtype, "TELEMETRY: " __VA_ARGS__)
+ rte_log(RTE_LOG_ ## l, logtype, "TELEMETRY: " __VA_ARGS__)
/* list of command callbacks, with one command registered by default */
static struct cmd_callback *callbacks;
@@ -612,14 +611,11 @@ telemetry_v2_init(void)
#endif /* !RTE_EXEC_ENV_WINDOWS */
int32_t
-rte_telemetry_init(const char *runtime_dir, const char *rte_version, rte_cpuset_t *cpuset,
- rte_log_fn log_fn, uint32_t registered_logtype)
+rte_telemetry_init(const char *runtime_dir, const char *rte_version, rte_cpuset_t *cpuset)
{
telemetry_version = rte_version;
socket_dir = runtime_dir;
thread_cpuset = cpuset;
- rte_log_ptr = log_fn;
- logtype = registered_logtype;
#ifndef RTE_EXEC_ENV_WINDOWS
if (telemetry_v2_init() != 0)
@@ -630,3 +626,5 @@ rte_telemetry_init(const char *runtime_dir, const char *rte_version, rte_cpuset_
return 0;
}
+
+RTE_LOG_REGISTER_DEFAULT(logtype, WARNING);
diff --git a/lib/telemetry/telemetry_internal.h b/lib/telemetry/telemetry_internal.h
index d085c492dc..5c75d73183 100644
--- a/lib/telemetry/telemetry_internal.h
+++ b/lib/telemetry/telemetry_internal.h
@@ -109,7 +109,6 @@ typedef int (*rte_log_fn)(uint32_t level, uint32_t logtype, const char *format,
*/
__rte_internal
int
-rte_telemetry_init(const char *runtime_dir, const char *rte_version, rte_cpuset_t *cpuset,
- rte_log_fn log_fn, uint32_t registered_logtype);
+rte_telemetry_init(const char *runtime_dir, const char *rte_version, rte_cpuset_t *cpuset);
#endif
--
2.34.1