[dpdk-dev,05/12] bus/vdev: change log type from EAL to PMD

Message ID 1503654052-84730-6-git-send-email-jianfeng.tan@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Yuanhan Liu
Headers

Checks

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

Commit Message

Jianfeng Tan Aug. 25, 2017, 9:40 a.m. UTC
  Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
---
 drivers/bus/vdev/vdev.c      | 10 ++++++----
 drivers/bus/vdev/vdev_logs.h | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 drivers/bus/vdev/vdev_logs.h
  

Comments

Gaëtan Rivet Aug. 29, 2017, 12:54 p.m. UTC | #1
On Fri, Aug 25, 2017 at 09:40:45AM +0000, Jianfeng Tan wrote:
> Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
> ---
>  drivers/bus/vdev/vdev.c      | 10 ++++++----
>  drivers/bus/vdev/vdev_logs.h | 40 ++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 46 insertions(+), 4 deletions(-)
>  create mode 100644 drivers/bus/vdev/vdev_logs.h
> 
> diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
> index f7e547a..cde2a3c 100644
> --- a/drivers/bus/vdev/vdev.c
> +++ b/drivers/bus/vdev/vdev.c
> @@ -47,6 +47,8 @@
>  #include <rte_memory.h>
>  #include <rte_errno.h>
>  
> +#include "vdev_logs.h"
> +
>  /* Forward declare to access virtual bus name */
>  static struct rte_bus rte_vdev_bus;
>  
> @@ -102,7 +104,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
>  
>  	name = rte_vdev_device_name(dev);
>  
> -	RTE_LOG(DEBUG, EAL, "Search driver %s to probe device %s\n", name,
> +	VDEV_LOG(DEBUG, "Search driver %s to probe device %s\n", name,
>  		rte_vdev_device_name(dev));
>  
>  	if (vdev_parse(name, &driver))
> @@ -188,7 +190,7 @@ rte_vdev_init(const char *name, const char *args)
>  	ret = vdev_probe_all_drivers(dev);
>  	if (ret) {
>  		if (ret > 0)
> -			RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
> +			VDEV_LOG(ERR, "no driver found for %s\n", name);
>  		goto fail;
>  	}
>  
> @@ -211,7 +213,7 @@ vdev_remove_driver(struct rte_vdev_device *dev)
>  	const struct rte_vdev_driver *driver;
>  
>  	if (!dev->device.driver) {
> -		RTE_LOG(DEBUG, EAL, "no driver attach to device %s\n", name);
> +		VDEV_LOG(DEBUG, "no driver attach to device %s\n", name);
>  		return 1;
>  	}
>  
> @@ -292,7 +294,7 @@ vdev_probe(void)
>  			continue;
>  
>  		if (vdev_probe_all_drivers(dev)) {
> -			RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
> +			VDEV_LOG(ERR, "failed to initialize %s device\n",
>  				rte_vdev_device_name(dev));
>  			return -1;
>  		}
> diff --git a/drivers/bus/vdev/vdev_logs.h b/drivers/bus/vdev/vdev_logs.h
> new file mode 100644
> index 0000000..7a2d811
> --- /dev/null
> +++ b/drivers/bus/vdev/vdev_logs.h
> @@ -0,0 +1,40 @@
> +/*-
> + *   BSD LICENSE
> + *
> + *   Copyright(c) 2017 Intel Corporation. All rights reserved.
> + *   All rights reserved.
> + *
> + *   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 Intel Corporation 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 _VDEV_LOGS_H_
> +#define _VDEV_LOGS_H_
> +
> +#define VDEV_LOG(level, fmt, args...) \
> +	RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args)

With the multiplication of bus implementations, wouldn't it be interesting
to introduce an RTE_LOGTYPE_BUS?

> +
> +#endif /* _VDEV_LOGS_H_ */
> -- 
> 2.7.4
>
  
Jianfeng Tan Aug. 29, 2017, 10:27 p.m. UTC | #2
On 8/29/2017 5:54 AM, Gaëtan Rivet wrote:
> On Fri, Aug 25, 2017 at 09:40:45AM +0000, Jianfeng Tan wrote:
>> Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
>> ---
>>   drivers/bus/vdev/vdev.c      | 10 ++++++----
>>   drivers/bus/vdev/vdev_logs.h | 40 ++++++++++++++++++++++++++++++++++++++++
>>   2 files changed, 46 insertions(+), 4 deletions(-)
>>   create mode 100644 drivers/bus/vdev/vdev_logs.h
[...]
>> +
>> +#ifndef _VDEV_LOGS_H_
>> +#define _VDEV_LOGS_H_
>> +
>> +#define VDEV_LOG(level, fmt, args...) \
>> +	RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args)
> With the multiplication of bus implementations, wouldn't it be interesting
> to introduce an RTE_LOGTYPE_BUS?

Interesting! Let me try to do that in the next version.

Thanks,
Jianfeng

>> +
>> +#endif /* _VDEV_LOGS_H_ */
>> -- 
>> 2.7.4
>>
  

Patch

diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index f7e547a..cde2a3c 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -47,6 +47,8 @@ 
 #include <rte_memory.h>
 #include <rte_errno.h>
 
+#include "vdev_logs.h"
+
 /* Forward declare to access virtual bus name */
 static struct rte_bus rte_vdev_bus;
 
@@ -102,7 +104,7 @@  vdev_probe_all_drivers(struct rte_vdev_device *dev)
 
 	name = rte_vdev_device_name(dev);
 
-	RTE_LOG(DEBUG, EAL, "Search driver %s to probe device %s\n", name,
+	VDEV_LOG(DEBUG, "Search driver %s to probe device %s\n", name,
 		rte_vdev_device_name(dev));
 
 	if (vdev_parse(name, &driver))
@@ -188,7 +190,7 @@  rte_vdev_init(const char *name, const char *args)
 	ret = vdev_probe_all_drivers(dev);
 	if (ret) {
 		if (ret > 0)
-			RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+			VDEV_LOG(ERR, "no driver found for %s\n", name);
 		goto fail;
 	}
 
@@ -211,7 +213,7 @@  vdev_remove_driver(struct rte_vdev_device *dev)
 	const struct rte_vdev_driver *driver;
 
 	if (!dev->device.driver) {
-		RTE_LOG(DEBUG, EAL, "no driver attach to device %s\n", name);
+		VDEV_LOG(DEBUG, "no driver attach to device %s\n", name);
 		return 1;
 	}
 
@@ -292,7 +294,7 @@  vdev_probe(void)
 			continue;
 
 		if (vdev_probe_all_drivers(dev)) {
-			RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
+			VDEV_LOG(ERR, "failed to initialize %s device\n",
 				rte_vdev_device_name(dev));
 			return -1;
 		}
diff --git a/drivers/bus/vdev/vdev_logs.h b/drivers/bus/vdev/vdev_logs.h
new file mode 100644
index 0000000..7a2d811
--- /dev/null
+++ b/drivers/bus/vdev/vdev_logs.h
@@ -0,0 +1,40 @@ 
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2017 Intel Corporation. All rights reserved.
+ *   All rights reserved.
+ *
+ *   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 Intel Corporation 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 _VDEV_LOGS_H_
+#define _VDEV_LOGS_H_
+
+#define VDEV_LOG(level, fmt, args...) \
+	RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args)
+
+#endif /* _VDEV_LOGS_H_ */