[PATCH v1 1/5] mempool: remove internal tracepoints from version map

[Ankur Dwivedi <adwivedi@marvell.com>]

The file rte_mempool_trace.h contains tracepoints which are internal to the
mempool library. This file is renamed to mempool_trace.h, and is made an
internal header. The tracepoints in this file are removed from the
experimental section in version.map file.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
---
 .../{rte_mempool_trace.h => mempool_trace.h}       |  6 +++---
 lib/mempool/mempool_trace_points.c                 |  2 +-
 lib/mempool/meson.build                            |  4 +++-
 lib/mempool/rte_mempool.c                          |  2 +-
 lib/mempool/rte_mempool_ops.c                      |  2 +-
 lib/mempool/version.map                            | 14 --------------
 6 files changed, 9 insertions(+), 21 deletions(-)
 rename lib/mempool/{rte_mempool_trace.h => mempool_trace.h} (98%)

diff --git a/lib/mempool/rte_mempool_trace.h b/lib/mempool/mempool_trace.h
similarity index 98%
rename from lib/mempool/rte_mempool_trace.h
rename to lib/mempool/mempool_trace.h
index 087c913c8c..3e663c72e4 100644
--- a/lib/mempool/rte_mempool_trace.h
+++ b/lib/mempool/mempool_trace.h
@@ -2,8 +2,8 @@
  * Copyright(C) 2020 Marvell International Ltd.
  */
 
-#ifndef _RTE_MEMPOOL_TRACE_H_
-#define _RTE_MEMPOOL_TRACE_H_
+#ifndef _MEMPOOL_TRACE_H_
+#define _MEMPOOL_TRACE_H_
 
 /**
  * @file
@@ -172,4 +172,4 @@ RTE_TRACE_POINT(
 }
 #endif
 
-#endif /* _RTE_MEMPOOL_TRACE_H_ */
+#endif /* _MEMPOOL_TRACE_H_ */
diff --git a/lib/mempool/mempool_trace_points.c b/lib/mempool/mempool_trace_points.c
index 4ad76deb34..307018094d 100644
--- a/lib/mempool/mempool_trace_points.c
+++ b/lib/mempool/mempool_trace_points.c
@@ -4,7 +4,7 @@
 
 #include <rte_trace_point_register.h>
 
-#include "rte_mempool_trace.h"
+#include "mempool_trace.h"
 
 RTE_TRACE_POINT_REGISTER(rte_mempool_trace_ops_dequeue_bulk,
 	lib.mempool.ops.deq.bulk)
diff --git a/lib/mempool/meson.build b/lib/mempool/meson.build
index b8aaa00694..29ae6d21e5 100644
--- a/lib/mempool/meson.build
+++ b/lib/mempool/meson.build
@@ -17,7 +17,9 @@ sources = files(
 )
 headers = files(
         'rte_mempool.h',
-        'rte_mempool_trace.h',
         'rte_mempool_trace_fp.h',
 )
+driver_sdk_headers += files(
+        'mempool_trace.h',
+)
 deps += ['ring', 'telemetry']
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 45b5df6199..cf5dea2304 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -28,8 +28,8 @@
 #include <rte_eal_paging.h>
 #include <rte_telemetry.h>
 
+#include "mempool_trace.h"
 #include "rte_mempool.h"
-#include "rte_mempool_trace.h"
 
 TAILQ_HEAD(rte_mempool_list, rte_tailq_entry);
 
diff --git a/lib/mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c
index 3b43edc548..ae1d288f27 100644
--- a/lib/mempool/rte_mempool_ops.c
+++ b/lib/mempool/rte_mempool_ops.c
@@ -11,7 +11,7 @@
 #include <rte_errno.h>
 #include <dev_driver.h>
 
-#include "rte_mempool_trace.h"
+#include "mempool_trace.h"
 
 /* indirect jump table to support external memory pools. */
 struct rte_mempool_ops_table rte_mempool_ops_table = {
diff --git a/lib/mempool/version.map b/lib/mempool/version.map
index b67d7aace7..dff2d1cb55 100644
--- a/lib/mempool/version.map
+++ b/lib/mempool/version.map
@@ -47,22 +47,8 @@ EXPERIMENTAL {
 	__rte_mempool_trace_generic_get;
 	__rte_mempool_trace_get_bulk;
 	__rte_mempool_trace_get_contig_blocks;
-	__rte_mempool_trace_create;
-	__rte_mempool_trace_create_empty;
-	__rte_mempool_trace_free;
-	__rte_mempool_trace_populate_iova;
-	__rte_mempool_trace_populate_virt;
-	__rte_mempool_trace_populate_default;
-	__rte_mempool_trace_populate_anon;
-	__rte_mempool_trace_cache_create;
-	__rte_mempool_trace_cache_free;
 	__rte_mempool_trace_default_cache;
-	__rte_mempool_trace_get_page_size;
 	__rte_mempool_trace_cache_flush;
-	__rte_mempool_trace_ops_populate;
-	__rte_mempool_trace_ops_alloc;
-	__rte_mempool_trace_ops_free;
-	__rte_mempool_trace_set_ops_byname;
 };
 
 INTERNAL {
-- 
2.25.1