From aec982dd40922a207a5f7458a5a3e8ca8591b5c4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 25 Apr 2018 08:56:41 -0700 Subject: [PATCH] net/softnic: convert to dynamic logging Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/softnic/rte_eth_softnic.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c index 1fb010e295..b1f2780c74 100644 --- a/drivers/net/softnic/rte_eth_softnic.c +++ b/drivers/net/softnic/rte_eth_softnic.c @@ -67,6 +67,12 @@ static const struct rte_eth_dev_info pmd_dev_info = { }, }; +static int pmd_softnic_logtype; + +#define PMD_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, pmd_softnic_logtype, \ + "%s(): " fmt "\n", __func__, ##args) + static void pmd_dev_infos_get(struct rte_eth_dev *dev __rte_unused, struct rte_eth_dev_info *dev_info) @@ -728,7 +734,7 @@ pmd_probe(struct rte_vdev_device *vdev) struct rte_eth_dev *eth_dev; const char *name = rte_vdev_device_name(vdev); - RTE_LOG(INFO, PMD, "Probing device \"%s\"\n", name); + PMD_LOG(INFO, "Probing device \"%s\"", name); /* Parse input arguments */ params = rte_vdev_device_args(vdev); @@ -737,7 +743,7 @@ pmd_probe(struct rte_vdev_device *vdev) strlen(params) == 0) { eth_dev = rte_eth_dev_attach_secondary(name); if (!eth_dev) { - RTE_LOG(ERR, PMD, "Failed to probe %s\n", name); + PMD_LOG(ERR, "Failed to probe %s", name); return -1; } /* TODO: request info from primary to set up Rx and Tx */ @@ -776,8 +782,8 @@ pmd_probe(struct rte_vdev_device *vdev) return -ENOMEM; /* Register soft ethdev */ - RTE_LOG(INFO, PMD, - "Creating soft ethdev \"%s\" for hard ethdev \"%s\"\n", + PMD_LOG(INFO, + "Creating soft ethdev \"%s\" for hard ethdev \"%s\"", p.soft.name, p.hard.name); status = pmd_ethdev_register(vdev, &p, dev_private); @@ -798,7 +804,7 @@ pmd_remove(struct rte_vdev_device *vdev) if (!vdev) return -EINVAL; - RTE_LOG(INFO, PMD, "Removing device \"%s\"\n", + PMD_LOG(INFO, "Removing device \"%s\"", rte_vdev_device_name(vdev)); /* Find the ethdev entry */ @@ -833,3 +839,12 @@ RTE_PMD_REGISTER_PARAM_STRING(net_softnic, PMD_PARAM_SOFT_TM_DEQ_BSZ "= " PMD_PARAM_HARD_NAME "= " PMD_PARAM_HARD_TX_QUEUE_ID "="); + +RTE_INIT(pmd_softnic_init_log); +static void +pmd_softnic_init_log(void) +{ + pmd_softnic_logtype = rte_log_register("pmd.net.softnic"); + if (pmd_softnic_logtype >= 0) + rte_log_set_level(pmd_softnic_logtype, RTE_LOG_NOTICE); +} -- 2.20.1