linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Gustavo F. Padovan" <gustavo@padovan.org>
To: linux-bluetooth@vger.kernel.org
Cc: gustavo@padovan.org
Subject: [PATCH 6/8] log: Add function to get/set debug_string
Date: Tue,  8 Jun 2010 04:11:52 -0300	[thread overview]
Message-ID: <1275981114-18019-6-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1275981114-18019-5-git-send-email-gustavo@padovan.org>

---
 src/log.c |   56 +++++++++++++++++++++++++++++++++++++++++---------------
 src/log.h |    2 ++
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/log.c b/src/log.c
index 4043ee3..f0f2465 100644
--- a/src/log.c
+++ b/src/log.c
@@ -72,6 +72,7 @@ extern struct btd_debug_desc __stop___debug[];
 static gchar **enabled = NULL;
 
 int debug_enabled = FALSE;
+static char *debug_string = NULL;
 
 static gboolean is_enabled(struct btd_debug_desc *desc)
 {
@@ -92,6 +93,44 @@ static gboolean is_enabled(struct btd_debug_desc *desc)
         return 0;
 }
 
+static void debug_on()
+{
+	struct btd_debug_desc *desc;
+	const char *name = NULL, *file = NULL;
+
+	enabled = g_strsplit_set(debug_string, ":, ", 0);
+
+	for (desc = __start___debug; desc < __stop___debug; desc++) {
+		if (file != NULL || name != NULL) {
+			if (g_strcmp0(desc->file, file) == 0) {
+				if (desc->name == NULL)
+					desc->name = name;
+			} else
+				file = NULL;
+		}
+
+		if (is_enabled(desc))
+			desc->flags |= BTD_DEBUG_FLAG_PRINT;
+		else
+			desc->flags &= ~BTD_DEBUG_FLAG_PRINT;
+	}
+}
+
+char *__btd_get_debug_string()
+{
+	return debug_string;
+}
+
+char *__btd_set_debug_string(char *str)
+{
+	g_free(debug_string);
+	debug_string = g_strdup(str);
+
+	debug_on();
+
+	return debug_string;
+}
+
 void __btd_toggle_debug()
 {
 	debug_enabled = !debug_enabled;
@@ -105,8 +144,6 @@ int __btd_debug_enabled()
 void __btd_log_init(const char *debug, int detach)
 {
 	int option = LOG_NDELAY | LOG_PID;
-	struct btd_debug_desc *desc;
-	const char *name = NULL, *file = NULL;
 
 	if (debug != NULL) {
 		debug_enabled = TRUE;
@@ -115,20 +152,9 @@ void __btd_log_init(const char *debug, int detach)
 		debug_enabled = FALSE;
 	}
 
-	enabled = g_strsplit_set(debug, ":, ", 0);
-
-	for (desc = __start___debug; desc < __stop___debug; desc++) {
-		if (file != NULL || name != NULL) {
-			if (g_strcmp0(desc->file, file) == 0) {
-				if (desc->name == NULL)
-					desc->name = name;
-			} else
-				file = NULL;
-		}
+	debug_string = (char *)debug;
 
-		if (is_enabled(desc))
-			desc->flags |= BTD_DEBUG_FLAG_PRINT;
-	}
+	debug_on();
 
 	if (!detach)
 		option |= LOG_PERROR;
diff --git a/src/log.h b/src/log.h
index 5d1db48..81c53df 100644
--- a/src/log.h
+++ b/src/log.h
@@ -27,6 +27,8 @@ void debug(const char *format, ...) __attribute__((format(printf, 1, 2)));
 
 void __btd_log_init(const char *debug, int detach);
 void __btd_log_cleanup(void);
+char *__btd_get_debug_string();
+char *__btd_set_debug_string(char *str);
 void __btd_toggle_debug();
 int __btd_debug_enabled();
 
-- 
1.7.1


  reply	other threads:[~2010-06-08  7:11 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-08  7:11 [PATCH 1/8] Remove ifndef barrier from log.h and btio.h Gustavo F. Padovan
2010-06-08  7:11 ` [PATCH 2/8] log: Remove vinfo function Gustavo F. Padovan
2010-06-08  7:11   ` [PATCH 3/8] Fix regression with debug via SIGUSR2 Gustavo F. Padovan
2010-06-08  7:11     ` [PATCH 4/8] Add Debug property to Manager interface Gustavo F. Padovan
2010-06-08  7:11       ` [PATCH 5/8] Add SetProperty method and Debug read/write property Gustavo F. Padovan
2010-06-08  7:11         ` Gustavo F. Padovan [this message]
2010-06-08  7:11           ` [PATCH 7/8] Add DebugString Property to Manager Gustavo F. Padovan
2010-06-08  7:11             ` [PATCH 8/8] Document the new Debug and DebugString property Gustavo F. Padovan
2010-06-08  8:05     ` [PATCH 3/8] Fix regression with debug via SIGUSR2 Johan Hedberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1275981114-18019-6-git-send-email-gustavo@padovan.org \
    --to=gustavo@padovan.org \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).