[maemo-commits] [maemo-commits] r12753 - projects/haf/trunk/libosso/src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-07-17 10:23:12 +0300 (Tue, 17 Jul 2007)
New Revision: 12753

Modified:
   projects/haf/trunk/libosso/src/osso-init.c
Log:
using macros


Modified: projects/haf/trunk/libosso/src/osso-init.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-init.c	2007-07-17 07:14:18 UTC (rev 12752)
+++ projects/haf/trunk/libosso/src/osso-init.c	2007-07-17 07:23:12 UTC (rev 12753)
@@ -179,12 +179,9 @@
 /************************************************************************/
 void osso_deinitialize(osso_context_t *osso)
 {
-    if(osso == NULL) return;
+    if (osso == NULL) return;
     
-    if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return;
-    }
+    LOCK_OR_RETURN(osso->mutex, );
     _dbus_disconnect(osso, FALSE);
     _dbus_disconnect(osso, TRUE);
     
@@ -415,7 +412,7 @@
 	return;
     }
 
-    LOCK_OR_RETURN(osso->mutex, ());
+    LOCK_OR_RETURN(osso->mutex, );
 
     if (osso->uniq_hash != NULL) {
         g_hash_table_destroy(osso->uniq_hash);
@@ -625,10 +622,7 @@
 
     ULOG_DEBUG_F("key = '%s'", interface);
 
-    if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-    }
+    LOCK_OR_RETURN(osso->mutex, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 
     elem = g_hash_table_lookup(osso->if_hash, interface);
 
@@ -834,10 +828,7 @@
     }
     reply_to = dbus_message_get_reply_serial(msg);
 
-    if (pthread_mutex_lock(&muali->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-    }
+    LOCK_OR_RETURN(muali->mutex, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 
     muali->cur_conn = conn;
     elem_list = opm_match(muali, dbus_message_get_path(msg),
@@ -1086,10 +1077,7 @@
     handler->can_free_data = can_free_data;
     handler->handler_id = osso->next_handler_id++;
 
-    if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return 0;
-    }
+    LOCK_OR_RETURN(osso->mutex, 0);
 
     /* warn about the old element if it exists */
     old = g_hash_table_lookup(osso->uniq_hash, uniq_key);
@@ -1187,10 +1175,7 @@
     elem->call_once_per_handler_id = call_once_per_handler_id;
     /* other members are not used and left zero */
 
-    if (pthread_mutex_lock(&context->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return FALSE;
-    }
+    LOCK_OR_RETURN(context->mutex, FALSE);
 
     old = g_hash_table_lookup(context->id_hash, GINT_TO_POINTER(handler_id));
     if (old != NULL) {
@@ -1266,10 +1251,7 @@
 
     ULOG_DEBUG_F("context=%p", context);
 
-    if (pthread_mutex_lock(&context->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return FALSE;
-    }
+    LOCK_OR_RETURN(context->mutex, FALSE);
 
     elem = g_hash_table_lookup(context->id_hash, GINT_TO_POINTER(handler_id));
     if (elem == NULL) {
@@ -1396,10 +1378,7 @@
 
     compose_hash_key(service, object_path, interface, uniq_key);
 
-    if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return FALSE;
-    }
+    LOCK_OR_RETURN(osso->mutex, FALSE);
 
     elem = g_hash_table_lookup(osso->uniq_hash, uniq_key);
     if (elem != NULL) {