Merge branch 'master' into get_logs_and_version

3 files changed, 15 insertions, 1 deletions

diff --git a/src/pal/linux/mbuf.cpp b/src/pal/linux/mbuf.cpp
index 7eca8fd5..26a54fe9 100755
--- a/src/pal/linux/mbuf.cpp
+++ b/src/pal/linux/mbuf.cpp
@@ -78,6 +78,13 @@ rte_mempool_t * utl_rte_mempool_create(const char  *name,
     return p;
 }
 
+void utl_rte_mempool_delete(rte_mempool_t * & pool){
+    if (pool) {
+        delete pool;
+        pool=0;
+    }
+}
+
 
 uint16_t rte_mbuf_refcnt_update(rte_mbuf_t *m, int16_t value)
 {
diff --git a/src/pal/linux/mbuf.h b/src/pal/linux/mbuf.h
index 693b095a..4132f842 100755
--- a/src/pal/linux/mbuf.h
+++ b/src/pal/linux/mbuf.h
@@ -65,6 +65,8 @@ typedef struct rte_mempool rte_mempool_t;
 
 #define RTE_PKTMBUF_HEADROOM  0
 
+void utl_rte_mempool_delete(rte_mempool_t  * &pool);
+
 rte_mempool_t * utl_rte_mempool_create(const char  *name,
                                       unsigned n, 
                                       unsigned elt_size,
@@ -185,8 +187,9 @@ static inline void utl_rte_pktmbuf_add_last(rte_mbuf_t *m,rte_mbuf_t *m_last){
 
 #define __rte_cache_aligned 
 
-#define CACHE_LINE_SIZE 64
 
+#define CACHE_LINE_SIZE 64
+#define RTE_CACHE_LINE_SIZE 64
 #define SOCKET_ID_ANY 0
 
 #endif
diff --git a/src/pal/linux_dpdk/mbuf.h b/src/pal/linux_dpdk/mbuf.h
index cde01077..339c0909 100755
--- a/src/pal/linux_dpdk/mbuf.h
+++ b/src/pal/linux_dpdk/mbuf.h
@@ -30,6 +30,10 @@ typedef struct rte_mbuf  rte_mbuf_t;
 
 typedef struct rte_mempool rte_mempool_t;
 
+inline void utl_rte_mempool_delete(rte_mempool_t * & pool){
+}
+
+
 rte_mempool_t * utl_rte_mempool_create(const char  *name,
                                       unsigned n, 
                                       unsigned elt_size,