* [PATCHv2 1/3] Bluetooth: Move scope of state_to_string
2012-02-17 9:40 [PATCHv2 0/3] Ease debugging patches Emeltchenko Andrei
@ 2012-02-17 9:40 ` Emeltchenko Andrei
2012-02-17 9:49 ` Marcel Holtmann
2012-02-17 9:40 ` [PATCHv2 2/3] Bluetooth: Use symbolic names for state in debug Emeltchenko Andrei
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Emeltchenko Andrei @ 2012-02-17 9:40 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Function state_to_string will be used in other files in debug
statements.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/bluetooth.h | 27 +++++++++++++++++++++++++++
net/bluetooth/l2cap_core.c | 26 --------------------------
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 4a82ca0..0a47c20 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -129,6 +129,33 @@ enum {
BT_CLOSED
};
+/* If unused will be removed by compiler */
+static inline char *state_to_string(int state)
+{
+ switch (state) {
+ case BT_CONNECTED:
+ return "BT_CONNECTED";
+ case BT_OPEN:
+ return "BT_OPEN";
+ case BT_BOUND:
+ return "BT_BOUND";
+ case BT_LISTEN:
+ return "BT_LISTEN";
+ case BT_CONNECT:
+ return "BT_CONNECT";
+ case BT_CONNECT2:
+ return "BT_CONNECT2";
+ case BT_CONFIG:
+ return "BT_CONFIG";
+ case BT_DISCONN:
+ return "BT_DISCONN";
+ case BT_CLOSED:
+ return "BT_CLOSED";
+ }
+
+ return "invalid state";
+}
+
/* BD Address */
typedef struct {
__u8 b[6];
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 8efac78..252a96e 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -215,32 +215,6 @@ static u16 l2cap_alloc_cid(struct l2cap_conn *conn)
return 0;
}
-static char *state_to_string(int state)
-{
- switch(state) {
- case BT_CONNECTED:
- return "BT_CONNECTED";
- case BT_OPEN:
- return "BT_OPEN";
- case BT_BOUND:
- return "BT_BOUND";
- case BT_LISTEN:
- return "BT_LISTEN";
- case BT_CONNECT:
- return "BT_CONNECT";
- case BT_CONNECT2:
- return "BT_CONNECT2";
- case BT_CONFIG:
- return "BT_CONFIG";
- case BT_DISCONN:
- return "BT_DISCONN";
- case BT_CLOSED:
- return "BT_CLOSED";
- }
-
- return "invalid state";
-}
-
static void l2cap_state_change(struct l2cap_chan *chan, int state)
{
BT_DBG("%p %s -> %s", chan, state_to_string(chan->state),
--
1.7.9
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCHv2 1/3] Bluetooth: Move scope of state_to_string
2012-02-17 9:40 ` [PATCHv2 1/3] Bluetooth: Move scope of state_to_string Emeltchenko Andrei
@ 2012-02-17 9:49 ` Marcel Holtmann
0 siblings, 0 replies; 8+ messages in thread
From: Marcel Holtmann @ 2012-02-17 9:49 UTC (permalink / raw)
To: Emeltchenko Andrei; +Cc: linux-bluetooth
Hi Andrei,
> Function state_to_string will be used in other files in debug
> statements.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> include/net/bluetooth/bluetooth.h | 27 +++++++++++++++++++++++++++
> net/bluetooth/l2cap_core.c | 26 --------------------------
> 2 files changed, 27 insertions(+), 26 deletions(-)
>
> diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
> index 4a82ca0..0a47c20 100644
> --- a/include/net/bluetooth/bluetooth.h
> +++ b/include/net/bluetooth/bluetooth.h
> @@ -129,6 +129,33 @@ enum {
> BT_CLOSED
> };
>
> +/* If unused will be removed by compiler */
> +static inline char *state_to_string(int state)
> +{
actually const char * please.
> + switch (state) {
> + case BT_CONNECTED:
> + return "BT_CONNECTED";
> + case BT_OPEN:
> + return "BT_OPEN";
> + case BT_BOUND:
> + return "BT_BOUND";
> + case BT_LISTEN:
> + return "BT_LISTEN";
> + case BT_CONNECT:
> + return "BT_CONNECT";
> + case BT_CONNECT2:
> + return "BT_CONNECT2";
> + case BT_CONFIG:
> + return "BT_CONFIG";
> + case BT_DISCONN:
> + return "BT_DISCONN";
> + case BT_CLOSED:
> + return "BT_CLOSED";
> + }
> +
> + return "invalid state";
> +}
> +
Otherwise it is fine.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Regards
Marcel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCHv2 2/3] Bluetooth: Use symbolic names for state in debug
2012-02-17 9:40 [PATCHv2 0/3] Ease debugging patches Emeltchenko Andrei
2012-02-17 9:40 ` [PATCHv2 1/3] Bluetooth: Move scope of state_to_string Emeltchenko Andrei
@ 2012-02-17 9:40 ` Emeltchenko Andrei
2012-02-17 9:50 ` Marcel Holtmann
2012-02-17 9:40 ` [PATCHv2 3/3] Bluetooth: Prefix hex numbers with object name Emeltchenko Andrei
2012-02-17 11:03 ` [PATCHv2 0/3] Ease debugging patches Johan Hedberg
3 siblings, 1 reply; 8+ messages in thread
From: Emeltchenko Andrei @ 2012-02-17 9:40 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Use state_to_string function in debug statements.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/l2cap.h | 3 ++-
net/bluetooth/hci_conn.c | 2 +-
net/bluetooth/l2cap_core.c | 5 +++--
net/bluetooth/l2cap_sock.c | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 42fdbb8..bbb0e21 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -612,7 +612,8 @@ static inline void l2cap_chan_put(struct l2cap_chan *c)
static inline void l2cap_set_timer(struct l2cap_chan *chan,
struct delayed_work *work, long timeout)
{
- BT_DBG("chan %p state %d timeout %ld", chan, chan->state, timeout);
+ BT_DBG("chan %p state %s timeout %ld", chan,
+ state_to_string(chan->state), timeout);
if (!cancel_delayed_work(work))
l2cap_chan_hold(chan);
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 6d15cba..f7a090c 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -282,7 +282,7 @@ static void hci_conn_timeout(struct work_struct *work)
disc_work.work);
__u8 reason;
- BT_DBG("conn %p state %d", conn, conn->state);
+ BT_DBG("conn %p state %s", conn, state_to_string(conn->state));
if (atomic_read(&conn->refcnt))
return;
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 252a96e..88968e7 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -231,7 +231,7 @@ static void l2cap_chan_timeout(struct work_struct *work)
struct sock *sk = chan->sk;
int reason;
- BT_DBG("chan %p state %d", chan, chan->state);
+ BT_DBG("chan %p state %s", chan, state_to_string(chan->state));
lock_sock(sk);
@@ -413,7 +413,8 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
struct l2cap_conn *conn = chan->conn;
struct sock *sk = chan->sk;
- BT_DBG("chan %p state %d socket %p", chan, chan->state, sk->sk_socket);
+ BT_DBG("chan %p state %s sk %p", chan,
+ state_to_string(chan->state), sk);
switch (chan->state) {
case BT_LISTEN:
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 138fe34..b48d6c1 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -783,7 +783,7 @@ static void l2cap_sock_kill(struct sock *sk)
if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket)
return;
- BT_DBG("sk %p state %d", sk, sk->sk_state);
+ BT_DBG("sk %p state %s", sk, state_to_string(sk->sk_state));
/* Kill poor orphan */
--
1.7.9
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCHv2 3/3] Bluetooth: Prefix hex numbers with object name
2012-02-17 9:40 [PATCHv2 0/3] Ease debugging patches Emeltchenko Andrei
2012-02-17 9:40 ` [PATCHv2 1/3] Bluetooth: Move scope of state_to_string Emeltchenko Andrei
2012-02-17 9:40 ` [PATCHv2 2/3] Bluetooth: Use symbolic names for state in debug Emeltchenko Andrei
@ 2012-02-17 9:40 ` Emeltchenko Andrei
2012-02-17 9:48 ` Marcel Holtmann
2012-02-17 11:03 ` [PATCHv2 0/3] Ease debugging patches Johan Hedberg
3 siblings, 1 reply; 8+ messages in thread
From: Emeltchenko Andrei @ 2012-02-17 9:40 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Several hex numbers were printed without object name which
complicates debugging.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/hci_conn.c | 2 +-
net/bluetooth/l2cap_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index f7a090c..5c712ae 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -80,7 +80,7 @@ void hci_acl_connect(struct hci_conn *conn)
struct inquiry_entry *ie;
struct hci_cp_create_conn cp;
- BT_DBG("%p", conn);
+ BT_DBG("hcon %p", conn);
conn->state = BT_CONNECT;
conn->out = true;
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 88968e7..37736c6 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -217,7 +217,7 @@ static u16 l2cap_alloc_cid(struct l2cap_conn *conn)
static void l2cap_state_change(struct l2cap_chan *chan, int state)
{
- BT_DBG("%p %s -> %s", chan, state_to_string(chan->state),
+ BT_DBG("chan %p %s -> %s", chan, state_to_string(chan->state),
state_to_string(state));
chan->state = state;
--
1.7.9
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCHv2 0/3] Ease debugging patches
2012-02-17 9:40 [PATCHv2 0/3] Ease debugging patches Emeltchenko Andrei
` (2 preceding siblings ...)
2012-02-17 9:40 ` [PATCHv2 3/3] Bluetooth: Prefix hex numbers with object name Emeltchenko Andrei
@ 2012-02-17 11:03 ` Johan Hedberg
3 siblings, 0 replies; 8+ messages in thread
From: Johan Hedberg @ 2012-02-17 11:03 UTC (permalink / raw)
To: Emeltchenko Andrei; +Cc: linux-bluetooth
Hi Andrei,
On Fri, Feb 17, 2012, Emeltchenko Andrei wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Increase isage of state_to_string and prefix hex numbers
> with object names.
>
> Changes:
> v2: added 3rd patch, prefixing couple of hex with obj name
>
> Andrei Emeltchenko (3):
> Bluetooth: Move scope of state_to_string
> Bluetooth: Use symbolic names for state in debug
> Bluetooth: Prefix hex numbers with object name
>
> include/net/bluetooth/bluetooth.h | 27 +++++++++++++++++++++++++++
> include/net/bluetooth/l2cap.h | 3 ++-
> net/bluetooth/hci_conn.c | 4 ++--
> net/bluetooth/l2cap_core.c | 33 ++++-----------------------------
> net/bluetooth/l2cap_sock.c | 2 +-
> 5 files changed, 36 insertions(+), 33 deletions(-)
All three patches have been applied to my bluetooth-next tree. Thanks.
Johan
^ permalink raw reply [flat|nested] 8+ messages in thread