Hello Jianfeng,

On Monday 09 October 2017 04:57 PM, Jianfeng Tan wrote:
Introduce a new log type, RTE_LOGTYPE_BUS, for bus drivers. And
change fslmc to use this type for logging.

Suggested-by: Gaetan Rivet <gaetan.ri...@6wind.com>
Signed-off-by: Jianfeng Tan <jianfeng....@intel.com>
---
  drivers/bus/fslmc/fslmc_bus.c           |  9 +++----
  drivers/bus/fslmc/fslmc_logs.h          | 42 ++++-----------------------------
  drivers/bus/fslmc/fslmc_vfio.c          |  4 +---
  lib/librte_eal/common/eal_common_log.c  |  1 +
  lib/librte_eal/common/include/rte_log.h |  1 +
  5 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index 0a8229f..236ec3a 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -34,7 +34,6 @@
  #include <dirent.h>
  #include <stdbool.h>
-#include <rte_log.h>
  #include <rte_bus.h>
  #include <rte_eal_memconfig.h>
  #include <rte_malloc.h>
@@ -42,11 +41,9 @@
  #include <rte_memcpy.h>
  #include <rte_ethdev.h>
-#include <rte_fslmc.h>
-#include <fslmc_vfio.h>
-
-#define FSLMC_BUS_LOG(level, fmt, args...) \
-       RTE_LOG(level, EAL, fmt "\n", ##args)
+#include "rte_fslmc.h"
+#include "fslmc_vfio.h"
+#include "fslmc_logs.h"
#define VFIO_IOMMU_GROUP_PATH "/sys/kernel/iommu_groups" diff --git a/drivers/bus/fslmc/fslmc_logs.h b/drivers/bus/fslmc/fslmc_logs.h
index 1f7c24b..dbf2281 100644
--- a/drivers/bus/fslmc/fslmc_logs.h
+++ b/drivers/bus/fslmc/fslmc_logs.h
@@ -33,44 +33,12 @@
  #ifndef _FSLMC_LOGS_H_
  #define _FSLMC_LOGS_H_
-#define PMD_INIT_LOG(level, fmt, args...) \
-       RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args)
+#include <rte_log.h>
-#ifdef RTE_LIBRTE_DPAA2_DEBUG_INIT
-#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
-#else
-#define PMD_INIT_FUNC_TRACE() do { } while (0)
-#endif
+#define FSLMC_BUS_LOG(level, fmt, args...) \
+       RTE_LOG(level, BUS, "%s(): " fmt "\n", __func__, ##args)
-#ifdef RTE_LIBRTE_DPAA2_DEBUG_RX
-#define PMD_RX_LOG(level, fmt, args...) \
-       RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
-#else
-#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
-#endif
-
-#ifdef RTE_LIBRTE_DPAA2_DEBUG_TX
-#define PMD_TX_LOG(level, fmt, args...) \
-       RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
-#else
-#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
-#endif
-
-#ifdef RTE_LIBRTE_DPAA2_DEBUG_TX_FREE
-#define PMD_TX_FREE_LOG(level, fmt, args...) \
-       RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
-#else
-#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0)
-#endif
-
-#ifdef RTE_LIBRTE_DPAA2_DEBUG_DRIVER
-#define PMD_DRV_LOG_RAW(level, fmt, args...) \
-       RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args)
-#else
-#define PMD_DRV_LOG_RAW(level, fmt, args...) do { } while (0)
-#endif
-
-#define PMD_DRV_LOG(level, fmt, args...) \
-       PMD_DRV_LOG_RAW(level, fmt "\n", ## args)
+#define FSLMC_VFIO_LOG(level, fmt, args...) \
+       RTE_LOG(level, EAL, "%s(): " fmt "\n", __func__, ##args)

This change breaks the FSLMC bus driver. There are macros like PMD_DRV_LOG which are still in use in the code.
Before removing the above, those would have to be restructured.

I am already working on converting this logging into dynamic logging.
Can you skip this work until then? Does it block your work?

#endif /* _FSLMC_LOGS_H_ */

<snip>

Reply via email to