Changeset 3cf862f in mainline for uspace/srv/logger/logs.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/logs.c (modified) (7 diffs)

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);
 }