net/mlx4: separate debugging macros

The new definitions also rely on the existing DPDK logging subsystem
instead of using fprintf() directly.

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
This commit is contained in:
Adrien Mazarguil 2017-09-01 10:06:49 +02:00 committed by Ferruh Yigit
parent 4e7367d831
commit 76df01ff62
4 changed files with 100 additions and 53 deletions

View File

@ -59,7 +59,6 @@
#include <rte_mempool.h> #include <rte_mempool.h>
#include <rte_prefetch.h> #include <rte_prefetch.h>
#include <rte_malloc.h> #include <rte_malloc.h>
#include <rte_log.h>
#include <rte_alarm.h> #include <rte_alarm.h>
#include <rte_memory.h> #include <rte_memory.h>
#include <rte_flow.h> #include <rte_flow.h>
@ -74,6 +73,7 @@
/* PMD headers. */ /* PMD headers. */
#include "mlx4.h" #include "mlx4.h"
#include "mlx4_flow.h" #include "mlx4_flow.h"
#include "mlx4_utils.h"
/** Configuration structure for device arguments. */ /** Configuration structure for device arguments. */
struct mlx4_conf { struct mlx4_conf {

View File

@ -36,23 +36,6 @@
#include <stdint.h> #include <stdint.h>
/*
* Runtime logging through RTE_LOG() is enabled when not in debugging mode.
* Intermediate LOG_*() macros add the required end-of-line characters.
*/
#ifndef NDEBUG
#define INFO(...) DEBUG(__VA_ARGS__)
#define WARN(...) DEBUG(__VA_ARGS__)
#define ERROR(...) DEBUG(__VA_ARGS__)
#else
#define LOG__(level, m, ...) \
RTE_LOG(level, PMD, MLX4_DRIVER_NAME ": " m "%c", __VA_ARGS__)
#define LOG_(level, ...) LOG__(level, __VA_ARGS__, '\n')
#define INFO(...) LOG_(INFO, __VA_ARGS__)
#define WARN(...) LOG_(WARNING, __VA_ARGS__)
#define ERROR(...) LOG_(ERR, __VA_ARGS__)
#endif
/* Verbs header. */ /* Verbs header. */
/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ /* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
#ifdef PEDANTIC #ifdef PEDANTIC
@ -98,41 +81,6 @@ enum {
#define MLX4_DRIVER_NAME "net_mlx4" #define MLX4_DRIVER_NAME "net_mlx4"
/* Debugging */
#ifndef NDEBUG
#include <stdio.h>
#define DEBUG__(m, ...) \
(fprintf(stderr, "%s:%d: %s(): " m "%c", \
__FILE__, __LINE__, __func__, __VA_ARGS__), \
fflush(stderr), \
(void)0)
/*
* Save/restore errno around DEBUG__().
* XXX somewhat undefined behavior, but works.
*/
#define DEBUG_(...) \
(errno = ((int []){ \
*(volatile int *)&errno, \
(DEBUG__(__VA_ARGS__), 0) \
})[0])
#define DEBUG(...) DEBUG_(__VA_ARGS__, '\n')
#ifndef MLX4_PMD_DEBUG_BROKEN_VERBS
#define claim_zero(...) assert((__VA_ARGS__) == 0)
#else /* MLX4_PMD_DEBUG_BROKEN_VERBS */
#define claim_zero(...) \
(void)(((__VA_ARGS__) == 0) || \
DEBUG("Assertion `(" # __VA_ARGS__ ") == 0' failed (IGNORED)."))
#endif /* MLX4_PMD_DEBUG_BROKEN_VERBS */
#define claim_nonzero(...) assert((__VA_ARGS__) != 0)
#define claim_positive(...) assert((__VA_ARGS__) >= 0)
#else /* NDEBUG */
/* No-ops. */
#define DEBUG(...) (void)0
#define claim_zero(...) (__VA_ARGS__)
#define claim_nonzero(...) (__VA_ARGS__)
#define claim_positive(...) (__VA_ARGS__)
#endif /* NDEBUG */
struct mlx4_rxq_stats { struct mlx4_rxq_stats {
unsigned int idx; /**< Mapping index. */ unsigned int idx; /**< Mapping index. */
uint64_t ipackets; /**< Total of successfully received packets. */ uint64_t ipackets; /**< Total of successfully received packets. */

View File

@ -40,6 +40,7 @@
/* PMD headers. */ /* PMD headers. */
#include "mlx4.h" #include "mlx4.h"
#include "mlx4_flow.h" #include "mlx4_flow.h"
#include "mlx4_utils.h"
/** Static initializer for items. */ /** Static initializer for items. */
#define ITEMS(...) \ #define ITEMS(...) \

View File

@ -0,0 +1,98 @@
/*-
* BSD LICENSE
*
* Copyright 2017 6WIND S.A.
* Copyright 2017 Mellanox
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of 6WIND S.A. nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef MLX4_UTILS_H_
#define MLX4_UTILS_H_
#include <rte_common.h>
#include <rte_log.h>
#include "mlx4.h"
#ifndef NDEBUG
/*
* When debugging is enabled (NDEBUG not defined), file, line and function
* information replace the driver name (MLX4_DRIVER_NAME) in log messages.
*/
/* Return the file name part of a path. */
static inline const char *
pmd_drv_log_basename(const char *s)
{
const char *n = s;
while (*n)
if (*(n++) == '/')
s = n;
return s;
}
#define PMD_DRV_LOG(level, ...) \
RTE_LOG(level, PMD, \
RTE_FMT("%s:%u: %s(): " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
pmd_drv_log_basename(__FILE__), \
__LINE__, \
__func__, \
RTE_FMT_TAIL(__VA_ARGS__,)))
#define DEBUG(...) PMD_DRV_LOG(DEBUG, __VA_ARGS__)
#ifndef MLX4_PMD_DEBUG_BROKEN_VERBS
#define claim_zero(...) assert((__VA_ARGS__) == 0)
#else /* MLX4_PMD_DEBUG_BROKEN_VERBS */
#define claim_zero(...) \
(void)(((__VA_ARGS__) == 0) || \
DEBUG("Assertion `(" # __VA_ARGS__ ") == 0' failed (IGNORED)."))
#endif /* MLX4_PMD_DEBUG_BROKEN_VERBS */
#else /* NDEBUG */
/*
* Like assert(), DEBUG() becomes a no-op and claim_zero() does not perform
* any check when debugging is disabled.
*/
#define PMD_DRV_LOG(level, ...) \
RTE_LOG(level, PMD, \
RTE_FMT(MLX4_DRIVER_NAME ": " \
RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
RTE_FMT_TAIL(__VA_ARGS__,)))
#define DEBUG(...) (void)0
#define claim_zero(...) (__VA_ARGS__)
#endif /* NDEBUG */
#define INFO(...) PMD_DRV_LOG(INFO, __VA_ARGS__)
#define WARN(...) PMD_DRV_LOG(WARNING, __VA_ARGS__)
#define ERROR(...) PMD_DRV_LOG(ERR, __VA_ARGS__)
#endif /* MLX4_UTILS_H_ */