Changeset 01b8c2e4 in mainline

Timestamp:

2012-07-16T15:43:27Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

be73793

Parents:

ceafd1b

Message:

Fix deadlock (recursive mutex locking)

File:

• uspace/srv/logger/namespace.c (modified) (5 diffs)

uspace/srv/logger/namespace.c

@@ -90 +90 @@
 }
 
-logging_namespace_t *namespace_create(const char *name)
-{
-        fibril_mutex_lock(&namespace_list_guard);
+static logging_namespace_t *namespace_create_no_lock(const char *name)
+{
         logging_namespace_t *existing = namespace_find_no_lock(name);
         if (existing != NULL) {
-                fibril_mutex_unlock(&namespace_list_guard);
                 return NULL;
         }
@@ -101 +99 @@
         logging_namespace_t *namespace = malloc(sizeof(logging_namespace_t));
         if (namespace == NULL) {
-                fibril_mutex_unlock(&namespace_list_guard);
                 return NULL;
         }
@@ -107 +104 @@
         namespace->name = str_dup(name);
         if (namespace->name == NULL) {
-                fibril_mutex_unlock(&namespace_list_guard);
                 free(namespace);
                 return NULL;
@@ -119 +115 @@
 
         list_append(&namespace->link, &namespace_list);
-        fibril_mutex_unlock(&namespace_list_guard);
 
         return namespace;
+}
+
+
+logging_namespace_t *namespace_create(const char *name)
+{
+        fibril_mutex_lock(&namespace_list_guard);
+        logging_namespace_t *result = namespace_create_no_lock(name);
+        fibril_mutex_unlock(&namespace_list_guard);
+        return result;
 }
 
@@ -186 +190 @@
 
         if (namespace == NULL) {
-                namespace = namespace_create(name);
+                namespace = namespace_create_no_lock(name);
         }