On 1/23/2020 6:20 PM, Alexander Kozyrev wrote:
> Define a new MLX4_DEBUG compilation flag to get rid of dependency
> on the NDEBUG definition. This is a preparation step to switch
> from standard assert clauses to DPDK RTE_ASSERT ones in MLX4 driver.
>
> Signed-off-by: Alexander Kozyrev <akozy...@mellanox.com>
> Acked-by: Viacheslav Ovsiienko <viachesl...@mellanox.com>
> ---
> drivers/net/mlx4/Makefile | 4 ++--
> drivers/net/mlx4/meson.build | 4 ++--
> drivers/net/mlx4/mlx4.c | 4 ++--
> drivers/net/mlx4/mlx4_mr.c | 8 ++++----
> drivers/net/mlx4/mlx4_rxtx.c | 10 +++++-----
> drivers/net/mlx4/mlx4_utils.h | 8 ++++----
> 6 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
> index 329569d..043e72f 100644
> --- a/drivers/net/mlx4/Makefile
> +++ b/drivers/net/mlx4/Makefile
> @@ -65,13 +65,13 @@ endif
>
> # User-defined CFLAGS.
> ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y)
> -CFLAGS += -pedantic -UNDEBUG
> +CFLAGS += -pedantic -DMLX4_DEBUG
Can't use 'RTE_LIBRTE_MLX4_DEBUG' directly in the .c files, instead of interim
'MLX4_DEBUG', many other config options used that way.
> ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
> CFLAGS += -DPEDANTIC
> endif
> AUTO_CONFIG_CFLAGS += -Wno-pedantic
> else
> -CFLAGS += -DNDEBUG -UPEDANTIC
> +CFLAGS += -UMLX4_DEBUG -UPEDANTIC
> endif
>
> include $(RTE_SDK)/mk/rte.lib.mk
> diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
> index 9eb4988..a15a301 100644
> --- a/drivers/net/mlx4/meson.build
> +++ b/drivers/net/mlx4/meson.build
> @@ -67,9 +67,9 @@ if build
> endif
> endforeach
> if get_option('buildtype').contains('debug')
> - cflags += [ '-pedantic', '-UNDEBUG', '-DPEDANTIC' ]
> + cflags += [ '-pedantic', '-DMLX4_DEBUG', '-DPEDANTIC' ]
> else
> - cflags += [ '-DNDEBUG', '-UPEDANTIC' ]
> + cflags += [ '-UMLX4_DEBUG', '-UPEDANTIC' ]
Right now there is no way in meson to enable/disable compile time (datapath)
debug options in module granularity, it would be good to have them.
