Changeset 3cf862f in mainline for uspace/srv/logger/writer.c

Timestamp:

2012-08-17T10:41:54Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f5da671

Parents:

bf9ac4e8

Message:

Add basic locking to logger

File:

• uspace/srv/logger/writer.c (modified) (4 diffs)

uspace/srv/logger/writer.c

@@ -56 +56 @@
                 return NULL;
 
-        logger_log_t *log = find_or_create_log(name, parent);
+        logger_log_t *log = find_or_create_log_and_acquire(name, parent);
 
         free(name);
@@ -65 +65 @@
 static int handle_receive_message(sysarg_t log_id, sysarg_t level)
 {
-        logger_log_t *log = find_log_by_id(log_id);
+        logger_log_t *log = find_log_by_id_and_acquire(log_id);
         if (log == NULL)
                 return ENOENT;
 
-        void *message;
+        void *message = NULL;
         int rc = async_data_write_accept(&message, true, 1, 0, 0, NULL);
         if (rc != EOK)
-                return rc;
+                goto leave;
 
         if (!shall_log_message(log, level)) {
-                free(message);
-                return EOK;
+                rc = EOK;
+                goto leave;
         }
 
@@ -83 +83 @@
             (const char *) message);
 
+        rc = EOK;
+
+leave:
+        log_release(log);
         free(message);
 
-        return EOK;
+        return rc;
 }
 
@@ -109 +113 @@
                                 break;
                         }
+                        log_release(log);
                         async_answer_1(callid, EOK, (sysarg_t) log);
                         break;