All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/6]Add DUN emulator in oFono
@ 2010-09-13  5:21 Zhenhua Zhang
  2010-09-13  5:21 ` [PATCH 1/6] bluetooth: Add reference count for bluetooth utils Zhenhua Zhang
                   ` (5 more replies)
  0 siblings, 6 replies; 10+ messages in thread
From: Zhenhua Zhang @ 2010-09-13  5:21 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

Hi,

I rebased the 1st series of DUN server patches with latest git tree and use bio library for BT RFCOMM connection. The btio library is exactly the same as the copies in bluez and obex. Comments are welcome!

Regards,
Zhenhua

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH 1/6] bluetooth: Add reference count for bluetooth utils
@ 2010-08-05  1:51 Zhenhua Zhang
  2010-08-05  1:51 ` [PATCH 5/6] dun_gw: Add DUN server plugin for oFono Zhenhua Zhang
  0 siblings, 1 reply; 10+ messages in thread
From: Zhenhua Zhang @ 2010-08-05  1:51 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 3249 bytes --]

Add bluetooth_ref()/bluetooth_unref() to support reference count in
bluetooth utils.
---
 plugins/bluetooth.c |   62 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 5a85eaa..10cc49d 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -39,6 +39,7 @@
 static DBusConnection *connection;
 static GHashTable *uuid_hash = NULL;
 static GHashTable *adapter_address_hash = NULL;
+static gint ref_count;
 
 void bluetooth_create_path(const char *dev_addr, const char *adapter_addr,
 				char *buf, int size)
@@ -503,13 +504,10 @@ static guint adapter_added_watch;
 static guint adapter_removed_watch;
 static guint property_watch;
 
-int bluetooth_register_uuid(const char *uuid, struct bluetooth_profile *profile)
+static int bluetooth_init()
 {
 	int err;
 
-	if (uuid_hash)
-		goto done;
-
 	connection = ofono_dbus_get_connection();
 
 	bluetooth_watch = g_dbus_add_service_watch(connection, BLUEZ_SERVICE,
@@ -542,13 +540,6 @@ int bluetooth_register_uuid(const char *uuid, struct bluetooth_profile *profile)
 	adapter_address_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
 						g_free, g_free);
 
-done:
-	g_hash_table_insert(uuid_hash, g_strdup(uuid), profile);
-
-	bluetooth_send_with_reply("/", BLUEZ_MANAGER_INTERFACE, "GetProperties",
-				manager_properties_cb, NULL, NULL, -1,
-				DBUS_TYPE_INVALID);
-
 	return 0;
 
 remove:
@@ -556,14 +547,27 @@ remove:
 	g_dbus_remove_watch(connection, adapter_added_watch);
 	g_dbus_remove_watch(connection, adapter_removed_watch);
 	g_dbus_remove_watch(connection, property_watch);
+
 	return err;
 }
 
-void bluetooth_unregister_uuid(const char *uuid)
+static int bluetooth_ref()
 {
-	g_hash_table_remove(uuid_hash, uuid);
+	g_atomic_int_inc(&ref_count);
+
+	if (ref_count > 1)
+		return 0;
+
+	return bluetooth_init();
+}
+
+static void bluetooth_unref()
+{
+	gboolean is_zero;
+
+	is_zero = g_atomic_int_dec_and_test(&ref_count);
 
-	if (g_hash_table_size(uuid_hash))
+	if (is_zero == FALSE)
 		return;
 
 	g_dbus_remove_watch(connection, bluetooth_watch);
@@ -571,9 +575,33 @@ void bluetooth_unregister_uuid(const char *uuid)
 	g_dbus_remove_watch(connection, adapter_removed_watch);
 	g_dbus_remove_watch(connection, property_watch);
 
-	g_hash_table_destroy(uuid_hash);
-	g_hash_table_destroy(adapter_address_hash);
-	uuid_hash = NULL;
+	if (uuid_hash)
+		g_hash_table_destroy(uuid_hash);
+
+	if (adapter_address_hash)
+		g_hash_table_destroy(adapter_address_hash);
+}
+
+int bluetooth_register_uuid(const char *uuid, struct bluetooth_profile *profile)
+{
+	int err = bluetooth_ref();
+
+	if (err != 0)
+		return err;
+
+	g_hash_table_insert(uuid_hash, g_strdup(uuid), profile);
+
+	bluetooth_send_with_reply("/", BLUEZ_MANAGER_INTERFACE, "GetProperties",
+				manager_properties_cb, NULL, NULL, -1,
+				DBUS_TYPE_INVALID);
+	return 0;
+}
+
+void bluetooth_unregister_uuid(const char *uuid)
+{
+	g_hash_table_remove(uuid_hash, uuid);
+
+	bluetooth_unref();
 }
 
 OFONO_PLUGIN_DEFINE(bluetooth, "Bluetooth Utils Plugins", VERSION,
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 0/6] oFono patches for BT DUN server
@ 2010-07-29  7:18 Zhenhua Zhang
  2010-07-29  7:18 ` [PATCH 5/6] dun_gw: Add DUN server plugin for oFono Zhenhua Zhang
  0 siblings, 1 reply; 10+ messages in thread
From: Zhenhua Zhang @ 2010-07-29  7:18 UTC (permalink / raw)
  To: linux-bluetooth

Hi Johan and Luiz,

This series of patches are for BT DUN server support in oFono. Could
you please to review them especially the btio.[ch] changes in patch
2/6.

oFono git: git://git.kernel.org/pub/scm/network/ofono/ofono.git

Thanks.
Zhenhua


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2010-09-13 18:18 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-13  5:21 [PATCH 0/6]Add DUN emulator in oFono Zhenhua Zhang
2010-09-13  5:21 ` [PATCH 1/6] bluetooth: Add reference count for bluetooth utils Zhenhua Zhang
2010-09-13  5:21 ` [PATCH 2/6] bluetooth: Add Btio library for DUN Zhenhua Zhang
2010-09-13  5:21 ` [PATCH 3/6] bluetooth: Add bluetooth server support " Zhenhua Zhang
2010-09-13  5:21 ` [PATCH 4/6] modem: Add method to get modem by path Zhenhua Zhang
2010-09-13  5:21 ` [PATCH 5/6] dun_gw: Add DUN server plugin for oFono Zhenhua Zhang
2010-09-13 18:18   ` Denis Kenzior
2010-09-13  5:21 ` [PATCH 6/6] emulator: Add emulator atom in oFono Zhenhua Zhang
  -- strict thread matches above, loose matches on Subject: below --
2010-08-05  1:51 [PATCH 1/6] bluetooth: Add reference count for bluetooth utils Zhenhua Zhang
2010-08-05  1:51 ` [PATCH 5/6] dun_gw: Add DUN server plugin for oFono Zhenhua Zhang
2010-07-29  7:18 [PATCH 0/6] oFono patches for BT DUN server Zhenhua Zhang
2010-07-29  7:18 ` [PATCH 5/6] dun_gw: Add DUN server plugin for oFono Zhenhua Zhang

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.