[1/5] mempool: disable tracing for Windows
diff mbox series

Message ID 20200531124151.16848-2-fady@mellanox.com
State Superseded
Headers show
Series
  • build mempool on Windows
Related show

Checks

Context Check Description
ci/Intel-compilation fail apply issues
ci/checkpatch success coding style OK

Commit Message

Fady Bader May 31, 2020, 12:41 p.m. UTC
Tracing is not supported for Windows.
Disabled all trace calls in for Windows.

Signed-off-by: Fady Bader <fady@mellanox.com>
---
 lib/librte_mempool/mempool_trace_points.c |  4 ++++
 lib/librte_mempool/rte_mempool.c          | 20 ++++++++++++++++++++
 lib/librte_mempool/rte_mempool.h          | 22 ++++++++++++++++++++++
 lib/librte_mempool/rte_mempool_ops.c      |  8 ++++++++
 lib/librte_mempool/rte_mempool_trace_fp.h |  3 +++
 5 files changed, 57 insertions(+)

Comments

Andrew Rybchenko May 31, 2020, 1:02 p.m. UTC | #1
On 5/31/20 3:41 PM, Fady Bader wrote:
> Tracing is not supported for Windows.
> Disabled all trace calls in for Windows.
> 
> Signed-off-by: Fady Bader <fady@mellanox.com>
> ---
>  lib/librte_mempool/mempool_trace_points.c |  4 ++++
>  lib/librte_mempool/rte_mempool.c          | 20 ++++++++++++++++++++
>  lib/librte_mempool/rte_mempool.h          | 22 ++++++++++++++++++++++
>  lib/librte_mempool/rte_mempool_ops.c      |  8 ++++++++
>  lib/librte_mempool/rte_mempool_trace_fp.h |  3 +++
>  5 files changed, 57 insertions(+)
> 
> diff --git a/lib/librte_mempool/mempool_trace_points.c b/lib/librte_mempool/mempool_trace_points.c
> index df4368b17..51f0d1705 100644
> --- a/lib/librte_mempool/mempool_trace_points.c
> +++ b/lib/librte_mempool/mempool_trace_points.c
> @@ -2,7 +2,9 @@
>   * Copyright(C) 2020 Marvell International Ltd.
>   */
>  
> +#ifndef RTE_EXEC_ENV_WINDOWS
>  #include <rte_trace_point_register.h>
> +#endif

I really dislike the approach. It adds too many conditional
compilation statements which make code harder to read.

You can have dummy implementation of these functions on
Windows to avoid the conditional compilation.

...
Jerin Jacob May 31, 2020, 1:49 p.m. UTC | #2
On Sun, May 31, 2020 at 6:12 PM Fady Bader <fady@mellanox.com> wrote:
>
> Tracing is not supported for Windows.
> Disabled all trace calls in for Windows.

What is the current major issue to enable Trace for windows?.
Trace does not need to rte_malloc support, it can work with malloc as
well incase rte_malloc is not available.
If there is not a major issue in enabling trace for windows, we should
enable trace instead of introducing
conditional compilation stuff.

>
> Signed-off-by: Fady Bader <fady@mellanox.com>
> ---
>  lib/librte_mempool/mempool_trace_points.c |  4 ++++
>  lib/librte_mempool/rte_mempool.c          | 20 ++++++++++++++++++++
>  lib/librte_mempool/rte_mempool.h          | 22 ++++++++++++++++++++++
>  lib/librte_mempool/rte_mempool_ops.c      |  8 ++++++++
>  lib/librte_mempool/rte_mempool_trace_fp.h |  3 +++
>  5 files changed, 57 insertions(+)
>
Dmitry Kozlyuk June 1, 2020, 1:54 a.m. UTC | #3
On Sun, 31 May 2020 16:02:21 +0300
Andrew Rybchenko <arybchenko@solarflare.com> wrote:

[snip]
> >  
> > +#ifndef RTE_EXEC_ENV_WINDOWS
> >  #include <rte_trace_point_register.h>
> > +#endif  
> 
> I really dislike the approach. It adds too many conditional
> compilation statements which make code harder to read.
> 
> You can have dummy implementation of these functions on
> Windows to avoid the conditional compilation.

Memory management series, on which this patchset depends, does have such
wrappers: http://patchwork.dpdk.org/patch/70565/.

Patch
diff mbox series

diff --git a/lib/librte_mempool/mempool_trace_points.c b/lib/librte_mempool/mempool_trace_points.c
index df4368b17..51f0d1705 100644
--- a/lib/librte_mempool/mempool_trace_points.c
+++ b/lib/librte_mempool/mempool_trace_points.c
@@ -2,7 +2,9 @@ 
  * Copyright(C) 2020 Marvell International Ltd.
  */
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 #include <rte_trace_point_register.h>
+#endif
 
 #include "rte_mempool_trace.h"
 
@@ -31,6 +33,7 @@  RTE_TRACE_POINT_DEFINE(rte_mempool_trace_ops_alloc);
 RTE_TRACE_POINT_DEFINE(rte_mempool_trace_ops_free);
 RTE_TRACE_POINT_DEFINE(rte_mempool_trace_set_ops_byname);
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 RTE_INIT(mempool_trace_init)
 {
 	RTE_TRACE_POINT_REGISTER(rte_mempool_trace_ops_dequeue_bulk,
@@ -105,3 +108,4 @@  RTE_INIT(mempool_trace_init)
 	RTE_TRACE_POINT_REGISTER(rte_mempool_trace_set_ops_byname,
 		lib.mempool.set.ops.byname);
 }
+#endif
diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index 0bde995b5..bee082424 100644
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -366,7 +366,9 @@  rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr,
 	STAILQ_INSERT_TAIL(&mp->mem_list, memhdr, next);
 	mp->nb_mem_chunks++;
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_populate_iova(mp, vaddr, iova, len, free_cb, opaque);
+#endif
 	return i;
 
 fail:
@@ -469,7 +471,9 @@  rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
 		cnt += ret;
 	}
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_populate_virt(mp, addr, len, pg_sz, free_cb, opaque);
+#endif
 	return cnt;
 
  fail:
@@ -528,7 +532,9 @@  rte_mempool_get_page_size(struct rte_mempool *mp, size_t *pg_sz)
 	else
 		*pg_sz = getpagesize();
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_get_page_size(mp, *pg_sz);
+#endif
 	return 0;
 }
 
@@ -669,7 +675,9 @@  rte_mempool_populate_default(struct rte_mempool *mp)
 		}
 	}
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_populate_default(mp);
+#endif
 	return mp->size;
 
  fail:
@@ -762,7 +770,9 @@  rte_mempool_populate_anon(struct rte_mempool *mp)
 		goto fail;
 	}
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_populate_anon(mp);
+#endif
 	return mp->populated_size;
 
  fail:
@@ -794,7 +804,9 @@  rte_mempool_free(struct rte_mempool *mp)
 	}
 	rte_mcfg_tailq_write_unlock();
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_free(mp);
+#endif
 	rte_mempool_free_memchunks(mp);
 	rte_mempool_ops_free(mp);
 	rte_memzone_free(mp->mz);
@@ -833,7 +845,9 @@  rte_mempool_cache_create(uint32_t size, int socket_id)
 
 	mempool_cache_init(cache, size);
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_cache_create(size, socket_id, cache);
+#endif
 	return cache;
 }
 
@@ -845,7 +859,9 @@  rte_mempool_cache_create(uint32_t size, int socket_id)
 void
 rte_mempool_cache_free(struct rte_mempool_cache *cache)
 {
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_cache_free(cache);
+#endif
 	rte_free(cache);
 }
 
@@ -976,8 +992,10 @@  rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
 	rte_mcfg_tailq_write_unlock();
 	rte_mcfg_mempool_write_unlock();
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_create_empty(name, n, elt_size, cache_size,
 		private_data_size, flags, mp);
+#endif
 	return mp;
 
 exit_unlock:
@@ -1030,9 +1048,11 @@  rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
 	if (obj_init)
 		rte_mempool_obj_iter(mp, obj_init, obj_init_arg);
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_create(name, n, elt_size, cache_size,
 		private_data_size, mp_init, mp_init_arg, obj_init,
 		obj_init_arg, flags, mp);
+#endif
 	return mp;
 
  fail:
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 652d19f9f..2f358a7c3 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -738,7 +738,9 @@  rte_mempool_ops_dequeue_bulk(struct rte_mempool *mp,
 {
 	struct rte_mempool_ops *ops;
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_ops_dequeue_bulk(mp, obj_table, n);
+#endif
 	ops = rte_mempool_get_ops(mp->ops_index);
 	return ops->dequeue(mp, obj_table, n);
 }
@@ -764,7 +766,10 @@  rte_mempool_ops_dequeue_contig_blocks(struct rte_mempool *mp,
 
 	ops = rte_mempool_get_ops(mp->ops_index);
 	RTE_ASSERT(ops->dequeue_contig_blocks != NULL);
+
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_ops_dequeue_contig_blocks(mp, first_obj_table, n);
+#endif
 	return ops->dequeue_contig_blocks(mp, first_obj_table, n);
 }
 
@@ -787,7 +792,9 @@  rte_mempool_ops_enqueue_bulk(struct rte_mempool *mp, void * const *obj_table,
 {
 	struct rte_mempool_ops *ops;
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_ops_enqueue_bulk(mp, obj_table, n);
+#endif
 	ops = rte_mempool_get_ops(mp->ops_index);
 	return ops->enqueue(mp, obj_table, n);
 }
@@ -1275,8 +1282,10 @@  rte_mempool_default_cache(struct rte_mempool *mp, unsigned lcore_id)
 	if (lcore_id >= RTE_MAX_LCORE)
 		return NULL;
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_default_cache(mp, lcore_id,
 		&mp->local_cache[lcore_id]);
+#endif
 	return &mp->local_cache[lcore_id];
 }
 
@@ -1296,7 +1305,10 @@  rte_mempool_cache_flush(struct rte_mempool_cache *cache,
 		cache = rte_mempool_default_cache(mp, rte_lcore_id());
 	if (cache == NULL || cache->len == 0)
 		return;
+
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_cache_flush(cache, mp);
+#endif
 	rte_mempool_ops_enqueue_bulk(mp, cache->objs, cache->len);
 	cache->len = 0;
 }
@@ -1376,7 +1388,9 @@  static __rte_always_inline void
 rte_mempool_generic_put(struct rte_mempool *mp, void * const *obj_table,
 			unsigned int n, struct rte_mempool_cache *cache)
 {
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_generic_put(mp, obj_table, n, cache);
+#endif
 	__mempool_check_cookies(mp, obj_table, n, 0);
 	__mempool_generic_put(mp, obj_table, n, cache);
 }
@@ -1401,7 +1415,9 @@  rte_mempool_put_bulk(struct rte_mempool *mp, void * const *obj_table,
 {
 	struct rte_mempool_cache *cache;
 	cache = rte_mempool_default_cache(mp, rte_lcore_id());
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_put_bulk(mp, obj_table, n, cache);
+#endif
 	rte_mempool_generic_put(mp, obj_table, n, cache);
 }
 
@@ -1523,7 +1539,9 @@  rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table,
 	ret = __mempool_generic_get(mp, obj_table, n, cache);
 	if (ret == 0)
 		__mempool_check_cookies(mp, obj_table, n, 1);
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_generic_get(mp, obj_table, n, cache);
+#endif
 	return ret;
 }
 
@@ -1554,7 +1572,9 @@  rte_mempool_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned int n)
 {
 	struct rte_mempool_cache *cache;
 	cache = rte_mempool_default_cache(mp, rte_lcore_id());
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_get_bulk(mp, obj_table, n, cache);
+#endif
 	return rte_mempool_generic_get(mp, obj_table, n, cache);
 }
 
@@ -1624,7 +1644,9 @@  rte_mempool_get_contig_blocks(struct rte_mempool *mp,
 		__MEMPOOL_CONTIG_BLOCKS_STAT_ADD(mp, get_fail, n);
 	}
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_get_contig_blocks(mp, first_obj_table, n);
+#endif
 	return ret;
 }
 
diff --git a/lib/librte_mempool/rte_mempool_ops.c b/lib/librte_mempool/rte_mempool_ops.c
index 5e2266778..0cf375470 100644
--- a/lib/librte_mempool/rte_mempool_ops.c
+++ b/lib/librte_mempool/rte_mempool_ops.c
@@ -76,7 +76,9 @@  rte_mempool_ops_alloc(struct rte_mempool *mp)
 {
 	struct rte_mempool_ops *ops;
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_ops_alloc(mp);
+#endif
 	ops = rte_mempool_get_ops(mp->ops_index);
 	return ops->alloc(mp);
 }
@@ -87,7 +89,9 @@  rte_mempool_ops_free(struct rte_mempool *mp)
 {
 	struct rte_mempool_ops *ops;
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_ops_free(mp);
+#endif
 	ops = rte_mempool_get_ops(mp->ops_index);
 	if (ops->free == NULL)
 		return;
@@ -134,8 +138,10 @@  rte_mempool_ops_populate(struct rte_mempool *mp, unsigned int max_objs,
 
 	ops = rte_mempool_get_ops(mp->ops_index);
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_ops_populate(mp, max_objs, vaddr, iova, len, obj_cb,
 		obj_cb_arg);
+#endif
 	if (ops->populate == NULL)
 		return rte_mempool_op_populate_default(mp, max_objs, vaddr,
 						       iova, len, obj_cb,
@@ -184,6 +190,8 @@  rte_mempool_set_ops_byname(struct rte_mempool *mp, const char *name,
 
 	mp->ops_index = i;
 	mp->pool_config = pool_config;
+#ifndef RTE_EXEC_ENV_WINDOWS
 	rte_mempool_trace_set_ops_byname(mp, name, pool_config);
+#endif
 	return 0;
 }
diff --git a/lib/librte_mempool/rte_mempool_trace_fp.h b/lib/librte_mempool/rte_mempool_trace_fp.h
index ed060e887..6d1f51309 100644
--- a/lib/librte_mempool/rte_mempool_trace_fp.h
+++ b/lib/librte_mempool/rte_mempool_trace_fp.h
@@ -5,6 +5,7 @@ 
 #ifndef _RTE_MEMPOOL_TRACE_FP_H_
 #define _RTE_MEMPOOL_TRACE_FP_H_
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 /**
  * @file
  *
@@ -113,4 +114,6 @@  RTE_TRACE_POINT_FP(
 }
 #endif
 
+#endif
+
 #endif /* _RTE_MEMPOOL_TRACE_FP_H_ */