Some private log functions had a wrong "rte_" prefix.
All private log functions are moved from eal_private.h
to the new file eal_log.h:
rte_eal_log_init -> eal_log_init
rte_log_save_regexp -> eal_log_save_regexp
rte_log_save_pattern -> eal_log_save_pattern
eal_log_set_default
The static functions in the file eal_common_log.c are renamed:
rte_log_save_level -> log_save_level
rte_log_init -> log_init
Signed-off-by: Thomas Monjalon <tho...@monjalon.net>
---
lib/librte_eal/common/eal_common_log.c | 18 ++++++++------
lib/librte_eal/common/eal_common_options.c | 5 ++--
lib/librte_eal/common/eal_log.h | 27 ++++++++++++++++++++
lib/librte_eal/common/eal_private.h | 29 ----------------------
lib/librte_eal/linux/eal.c | 3 ++-
lib/librte_eal/linux/eal_log.c | 4 +--
lib/librte_eal/windows/eal.c | 3 ++-
lib/librte_eal/windows/eal_log.c | 6 +++--
8 files changed, 50 insertions(+), 45 deletions(-)
create mode 100644 lib/librte_eal/common/eal_log.h
diff --git a/lib/librte_eal/common/eal_common_log.c
b/lib/librte_eal/common/eal_common_log.c
index c5554badb2..aee7c44c6a 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -15,7 +15,7 @@
#include <rte_log.h>
#include <rte_per_lcore.h>
-#include "eal_private.h"
+#include "eal_log.h"
struct rte_log_dynamic_type {
const char *name;
@@ -178,8 +178,8 @@ rte_log_set_level_regexp(const char *regex, uint32_t level)
* Save the type string and the loglevel for later dynamic
* logtypes which may register later.
*/
-static int rte_log_save_level(int priority,
- const char *regex, const char *pattern)
+static int
+log_save_level(uint32_t priority, const char *regex, const char *pattern)
{
struct rte_eal_opt_loglevel *opt_ll = NULL;
@@ -207,9 +207,10 @@ static int rte_log_save_level(int priority,
return -1;
}
-int rte_log_save_regexp(const char *regex, int tmp)
+int
+eal_log_save_regexp(const char *regex, uint32_t level)
{
- return rte_log_save_level(tmp, regex, NULL);
+ return log_save_level(level, regex, NULL);
}
/* set log level based on globbing pattern */
@@ -232,9 +233,10 @@ rte_log_set_level_pattern(const char *pattern, uint32_t
level)
return 0;
}
-int rte_log_save_pattern(const char *pattern, int priority)
+int
+eal_log_save_pattern(const char *pattern, uint32_t level)
{
- return rte_log_save_level(priority, NULL, pattern);
+ return log_save_level(level, NULL, pattern);
}
/* get the current loglevel for the message being processed */
@@ -376,7 +378,7 @@ static const struct logtype logtype_strings[] = {
};
/* Logging should be first initializer (before drivers and bus) */
-RTE_INIT_PRIO(rte_log_init, LOG)
+RTE_INIT_PRIO(log_init, LOG)
{
uint32_t i;
diff --git a/lib/librte_eal/common/eal_common_options.c
b/lib/librte_eal/common/eal_common_options.c
index 52fedb81e5..02374ee09e 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -41,6 +41,7 @@
#include "eal_options.h"
#include "eal_filesystem.h"
#include "eal_private.h"
+#include "eal_log.h"
#ifndef RTE_EXEC_ENV_WINDOWS
#include "eal_trace.h"
#endif
@@ -1299,7 +1300,7 @@ eal_parse_log_level(const char *arg)
regex, priority);
goto fail;
}
- if (rte_log_save_regexp(regex, priority) < 0)
+ if (eal_log_save_regexp(regex, priority) < 0)
goto fail;
} else if (pattern) {
if (rte_log_set_level_pattern(pattern, priority) < 0) {
@@ -1307,7 +1308,7 @@ eal_parse_log_level(const char *arg)
pattern, priority);
goto fail;
}
- if (rte_log_save_pattern(pattern, priority) < 0)
+ if (eal_log_save_pattern(pattern, priority) < 0)
goto fail;
} else {
rte_log_set_global_level(priority);
diff --git a/lib/librte_eal/common/eal_log.h b/lib/librte_eal/common/eal_log.h
new file mode 100644
index 0000000000..684650a17b
--- /dev/null
+++ b/lib/librte_eal/common/eal_log.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2021 Mellanox Technologies, Ltd
+ */
+
+#ifndef EAL_LOG_H
+#define EAL_LOG_H
+
+#include <stdio.h>
+#include <stdint.h>
+
+/*
+ * Initialize the default log stream.
+ */
+int eal_log_init(const char *id, int facility);
+
+/*
+ * Determine where log data is written when no call to rte_openlog_stream.
+ */
+void eal_log_set_default(FILE *default_log);
+
+/*
+ * Save a log option for later.
+ */
+int eal_log_save_regexp(const char *regexp, uint32_t level);
+int eal_log_save_pattern(const char *pattern, uint32_t level);
+
+#endif /* EAL_LOG_H */
diff --git a/lib/librte_eal/common/eal_private.h
b/lib/librte_eal/common/eal_private.h
index b8a0d20021..e3512111d9 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -79,19 +79,6 @@ struct rte_config *rte_eal_get_configuration(void);
*/
int rte_eal_memzone_init(void);
-/**
- * Common log initialization function (private to eal). Determines
- * where log data is written when no call to rte_openlog_stream is
- * in effect.
- *
- * @param default_log
- * The default log stream to be used.
- * @return
- * - 0 on success
- * - Negative on error
- */
-void eal_log_set_default(FILE *default_log);
-
/**
* Fill configuration with number of physical and logical processors
*
@@ -143,22 +130,6 @@ int rte_eal_memory_init(void);
*/
int rte_eal_timer_init(void);
-/**
- * Init the default log stream
- *
- * This function is private to EAL.
- *
- * @return
- * 0 on success, negative on error
- */
-int rte_eal_log_init(const char *id, int facility);
-
-/**
- * Save the log regexp for later
- */
-int rte_log_save_regexp(const char *type, int priority);
-int rte_log_save_pattern(const char *pattern, int priority);
-
/**
* Init tail queues for non-EAL library structures. This is to allow
* the rings, mempools, etc. lists to be shared among multiple processes
diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c
index 6f73616f86..e4feeb2b0e 100644
--- a/lib/librte_eal/linux/eal.c
+++ b/lib/librte_eal/linux/eal.c
@@ -58,6 +58,7 @@
#include "eal_hugepages.h"
#include "eal_memcfg.h"
#include "eal_trace.h"
+#include "eal_log.h"
#include "eal_options.h"
#include "eal_vfio.h"
#include "hotplug_mp.h"
@@ -1160,7 +1161,7 @@ rte_eal_init(int argc, char **argv)
#endif
}
- if (rte_eal_log_init(logid, internal_conf->syslog_facility) < 0) {
+ if (eal_log_init(logid, internal_conf->syslog_facility) < 0) {
rte_eal_init_alert("Cannot init logging.");
rte_errno = ENOMEM;
__atomic_store_n(&run_once, 0, __ATOMIC_RELAXED);
diff --git a/lib/librte_eal/linux/eal_log.c b/lib/librte_eal/linux/eal_log.c
index 43c8460bfb..1a08139eb5 100644
--- a/lib/librte_eal/linux/eal_log.c
+++ b/lib/librte_eal/linux/eal_log.c
@@ -17,7 +17,7 @@
#include <rte_spinlock.h>
#include <rte_log.h>
-#include "eal_private.h"
+#include "eal_log.h"
/*
* default log function
@@ -46,7 +46,7 @@ static cookie_io_functions_t console_log_func = {
* once memzones are available.
*/
int
-rte_eal_log_init(const char *id, int facility)
+eal_log_init(const char *id, int facility)
{
FILE *log_stream;
diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c
index 4dd2fc1403..5bca3ace1c 100644
--- a/lib/librte_eal/windows/eal.c
+++ b/lib/librte_eal/windows/eal.c
@@ -22,6 +22,7 @@
#include "eal_hugepages.h"
#include "eal_trace.h"
+#include "eal_log.h"
#include "eal_windows.h"
#define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
@@ -265,7 +266,7 @@ rte_eal_init(int argc, char **argv)
eal_get_internal_configuration();
int ret;
- rte_eal_log_init(NULL, 0);
+ eal_log_init(NULL, 0);
eal_log_level_parse(argc, argv);
diff --git a/lib/librte_eal/windows/eal_log.c b/lib/librte_eal/windows/eal_log.c
index 875981f139..d4ea47f1c8 100644
--- a/lib/librte_eal/windows/eal_log.c
+++ b/lib/librte_eal/windows/eal_log.c
@@ -2,11 +2,13 @@
* Copyright(c) 2017-2018 Intel Corporation
*/
-#include "eal_private.h"
+#include <rte_common.h>
+#include <rte_log.h>
+#include "eal_log.h"
/* set the log to default function, called during eal init process. */
int
-rte_eal_log_init(__rte_unused const char *id, __rte_unused int facility)
+eal_log_init(__rte_unused const char *id, __rte_unused int facility)
{
rte_openlog_stream(stderr);
--
2.30.1
