[PATCH v4 3/3] telemetry: use standard logging

[Bruce Richardson]

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.richard...@intel.com>
Acked-by: Morten Brørup <m...@smartsharesystems.com>
Acked-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
 lib/eal/freebsd/eal.c              |  6 +-----
 lib/eal/linux/eal.c                |  6 +-----
 lib/telemetry/telemetry.c          | 11 +++--------
 lib/telemetry/telemetry_internal.h |  3 +--
 4 files changed, 6 insertions(+), 20 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 0df9f1f353..dec0041094 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..13a32f4279 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -54,11 +54,9 @@ 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;
 
-#define TMTY_LOG(l, ...) \
-        rte_log_ptr(RTE_LOG_ ## l, logtype, "TELEMETRY: " __VA_ARGS__)
+RTE_LOG_REGISTER_DEFAULT(logtype, WARNING);
+#define TMTY_LOG(l, ...) 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 +610,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)
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.37.2