Changeset 3cf862f in mainline

Timestamp:

2012-08-17T10:41:54Z (13 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

Location:

uspace/srv/logger

Files:

• ctl.c (modified) (2 diffs)
• initlvl.c (modified) (1 diff)
• logger.h (modified) (2 diffs)
• logs.c (modified) (7 diffs)
• writer.c (modified) (4 diffs)

uspace/srv/logger/ctl.c ¶

@@ -51 +51 @@
         }
 
-        logger_log_t *log = find_log_by_name(full_name);
+        logger_log_t *log = find_log_by_name_and_acquire(full_name);
         free(full_name);
         if (log == NULL)
@@ -57 +57 @@
 
         log->logged_level = new_level;
+
+        log_release(log);
 
         return EOK;

uspace/srv/logger/initlvl.c ¶

@@ -61 +61 @@
                 return;
 
-        logger_log_t *log = find_or_create_log(key, 0);
+        logger_log_t *log = find_or_create_log_and_acquire(key, 0);
         if (log == NULL)
                 return;
 
         log->logged_level = level;
+
+        log_release(log);
 }
 

uspace/srv/logger/logger.h ¶

@@ -57 +57 @@
         link_t link;
 
+        fibril_mutex_t guard;
+
         char *name;
         char *full_name;
@@ -64 +66 @@
 };
 
-logger_log_t *find_log_by_name(const char *name);
-logger_log_t *find_or_create_log(const char *name, sysarg_t parent);
-logger_log_t *find_log_by_id(sysarg_t);
+logger_log_t *find_log_by_name_and_acquire(const char *name);
+logger_log_t *find_or_create_log_and_acquire(const char *name, sysarg_t parent);
+logger_log_t *find_log_by_id_and_acquire(sysarg_t);
 bool shall_log_message(logger_log_t *, log_level_t);
+void log_release(logger_log_t *);
 
 log_level_t get_default_logging_level(void);

uspace/srv/logger/logs.c ¶

@@ -62 +62 @@
 }
 
-logger_log_t *find_or_create_log(const char *name, sysarg_t parent_id)
+logger_log_t *find_or_create_log_and_acquire(const char *name, sysarg_t parent_id)
 {
         logger_log_t *result = NULL;
@@ -88 +88 @@
         }
         result->parent = parent;
+        fibril_mutex_initialize(&result->guard);
 
         link_initialize(&result->link);
 
+        fibril_mutex_lock(&result->guard);
+
         list_append(&result->link, &log_list);
-
 leave:
         fibril_mutex_unlock(&log_list_guard);
@@ -99 +101 @@
 }
 
-logger_log_t *find_log_by_name(const char *name)
+logger_log_t *find_log_by_name_and_acquire(const char *name)
 {
         logger_log_t *result = NULL;
@@ -107 +109 @@
                 logger_log_t *log = list_get_instance(it, logger_log_t, link);
                 if (str_cmp(log->full_name, name) == 0) {
+                        fibril_mutex_lock(&log->guard);
                         result = log;
                         break;
@@ -116 +119 @@
 }
 
-logger_log_t *find_log_by_id(sysarg_t id)
+logger_log_t *find_log_by_id_and_acquire(sysarg_t id)
 {
         logger_log_t *result = NULL;
@@ -124 +127 @@
                 logger_log_t *log = list_get_instance(it, logger_log_t, link);
                 if ((sysarg_t) log == id) {
+                        fibril_mutex_lock(&log->guard);
                         result = log;
                         break;
@@ -147 +151 @@
 bool shall_log_message(logger_log_t *log, log_level_t level)
 {
-        return level <= get_actual_log_level(log);
+        fibril_mutex_lock(&log_list_guard);
+        bool result = level <= get_actual_log_level(log);
+        fibril_mutex_unlock(&log_list_guard);
+        return result;
+}
+
+void log_release(logger_log_t *log)
+{
+        assert(fibril_mutex_is_locked(&log->guard));
+        fibril_mutex_unlock(&log->guard);
 }
 

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;