diff mbox series

[BlueZ,v4,4/9] adapter: Don't use DBG in mgmt_debug

Message ID 20220323224003.3736525-5-luiz.dentz@gmail.com
State Superseded
Headers show
Series [BlueZ,v4,1/9] log: Don't log __FILE__ and __func__ with DBG_IDX | expand

Commit Message

Luiz Augusto von Dentz March 23, 2022, 10:39 p.m. UTC
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

mgmt_debug callback is used to print debug strings from mgmt instances
which includes the file and function names so using DBG would add yet
another set of file and function prefixes which makes the logs
confusing.
---
 src/adapter.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Marcel Holtmann March 25, 2022, 3:04 p.m. UTC | #1
Hi Luiz,

> mgmt_debug callback is used to print debug strings from mgmt instances
> which includes the file and function names so using DBG would add yet
> another set of file and function prefixes which makes the logs
> confusing.
> ---
> src/adapter.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/src/adapter.c b/src/adapter.c
> index 97ce26f8e..9f003346d 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -10327,9 +10327,7 @@ static void read_version_complete(uint8_t status, uint16_t length,
> 
> static void mgmt_debug(const char *str, void *user_data)
> {
> -	const char *prefix = user_data;
> -
> -	info("%s%s", prefix, str);
> +	DBG_IDX(0xffff, "%s", str);
> }
> 
> int adapter_init(void)
> @@ -10342,8 +10340,7 @@ int adapter_init(void)
> 		return -EIO;
> 	}
> 
> -	if (getenv("MGMT_DEBUG"))
> -		mgmt_set_debug(mgmt_primary, mgmt_debug, "mgmt: ", NULL);
> +	mgmt_set_debug(mgmt_primary, mgmt_debug, NULL, NULL);
> 
> 	DBG("sending read version command");

oh what now. If you touch this, then please do it in a way that you print it properly to the btmon traces as well with the correct index.

Look, the MGMT_DEBUG thing is meant for debugging aid. That is why it enabled tracing. If you want to print errors or warning that otherwise are hidden, just print them. And make sure they end up in btmon as well. This is all hacking around the real solution. It is a bandaid for a bandaid.

Regards

Marcel
diff mbox series

Patch

diff --git a/src/adapter.c b/src/adapter.c
index 97ce26f8e..9f003346d 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -10327,9 +10327,7 @@  static void read_version_complete(uint8_t status, uint16_t length,
 
 static void mgmt_debug(const char *str, void *user_data)
 {
-	const char *prefix = user_data;
-
-	info("%s%s", prefix, str);
+	DBG_IDX(0xffff, "%s", str);
 }
 
 int adapter_init(void)
@@ -10342,8 +10340,7 @@  int adapter_init(void)
 		return -EIO;
 	}
 
-	if (getenv("MGMT_DEBUG"))
-		mgmt_set_debug(mgmt_primary, mgmt_debug, "mgmt: ", NULL);
+	mgmt_set_debug(mgmt_primary, mgmt_debug, NULL, NULL);
 
 	DBG("sending read version command");