On 4/22/2020 12:27 AM, tal...@mellanox.com wrote:
From: Tal Shnaiderman <tal...@mellanox.com>
Move common functions between Unix and Windows to eal_config.c.
Like other files in common, we should call this eal_common_config.c
Those simple functions are getter functions for IOVA, configuration,
Multi-process.
Move rte_config and runtime_dir to be defined in a common file.
Signed-off-by: Tal Shnaiderman <tal...@mellanox.com>
---
lib/librte_eal/common/eal_config.c | 34 ++++++++++++++++++++++++++++++++++
lib/librte_eal/common/eal_private.h | 11 +++++++++++
lib/librte_eal/common/meson.build | 2 ++
lib/librte_eal/freebsd/eal.c | 34 ----------------------------------
lib/librte_eal/linux/eal.c | 33 ---------------------------------
lib/librte_eal/windows/eal.c | 36 ------------------------------------
6 files changed, 47 insertions(+), 103 deletions(-)
create mode 100644 lib/librte_eal/common/eal_config.c
diff --git a/lib/librte_eal/common/eal_config.c
b/lib/librte_eal/common/eal_config.c
new file mode 100644
index 000000000..c28080a76
--- /dev/null
+++ b/lib/librte_eal/common/eal_config.c
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Mellanox Technologies, Ltd
+ */
+#include <eal_private.h>
+
+#include <rte_os.h>
+
+/* platform-specific runtime dir */
+static char runtime_dir[PATH_MAX];
+
+const char *
+rte_eal_get_runtime_dir(void)
+{
+ return runtime_dir;
+}
+
+/* Return a pointer to the configuration structure */
+struct rte_config *
+rte_eal_get_configuration(void)
+{
+ return &rte_config;
+}
+
+enum rte_iova_mode
+rte_eal_iova_mode(void)
+{
+ return rte_eal_get_configuration()->iova_mode;
+}
+
+enum rte_proc_type_t
+rte_eal_process_type(void)
+{
+ return rte_config.process_type;
+}
\ No newline at end of file
diff --git a/lib/librte_eal/common/eal_private.h
b/lib/librte_eal/common/eal_private.h
index 735813d0c..dab9cac1d 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -13,6 +13,8 @@
#include <rte_lcore.h>
#include <rte_memory.h>
+#include <eal_memcfg.h>
+
/**
* Structure storing internal configuration (per-lcore)
*/
@@ -60,6 +62,15 @@ struct rte_config {
struct rte_mem_config *mem_config;
} __rte_packed;
+
+/* early configuration structure, when memory config is not mmapped */
+static struct rte_mem_config early_mem_config;
+
+/* Address of global and public configuration */
+static struct rte_config rte_config = {
+ .mem_config = &early_mem_config,
+};
+
/**
* Get the global configuration structure.
*
diff --git a/lib/librte_eal/common/meson.build
b/lib/librte_eal/common/meson.build
index 6dcdcc890..f53a35d0e 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -20,6 +20,7 @@ if is_windows
'eal_common_options.c',
'eal_common_tailqs.c',
'eal_common_thread.c',
+ 'eal_config.c',
'malloc_elem.c',
'malloc_heap.c',
'rte_malloc.c',
@@ -52,6 +53,7 @@ sources += files(
'eal_common_thread.c',
'eal_common_timer.c',
'eal_common_uuid.c',
+ 'eal_common.c',
Typo. But, better to rename to eal_common_config.c
'hotplug_mp.c',
'malloc_elem.c',
'malloc_heap.c',
ranjit m.
