Changeset 1dec7cb in mainline

Timestamp:

2012-08-23T18:25:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

92e963f

Parents:

4b640a2

Message:

Use lock/unlock naming

Location:

uspace/srv/logger

Files:

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

uspace/srv/logger/ctl.c

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

uspace/srv/logger/initlvl.c

@@ -62 +62 @@
                 return;
 
-        logger_log_t *log = find_or_create_log_and_acquire(key, 0);
+        logger_log_t *log = find_or_create_log_and_lock(key, 0);
         if (log == NULL)
                 return;
@@ -68 +68 @@
         log->logged_level = level;
 
-        log_release(log);
+        log_unlock(log);
 }
 

uspace/srv/logger/logger.h

@@ -68 +68 @@
 };
 
-logger_log_t *find_log_by_name_and_acquire(const char *name);
-logger_log_t *find_or_create_log_and_acquire(const char *, sysarg_t);
-logger_log_t *find_log_by_id_and_acquire(sysarg_t);
+logger_log_t *find_log_by_name_and_lock(const char *name);
+logger_log_t *find_or_create_log_and_lock(const char *, sysarg_t);
+logger_log_t *find_log_by_id_and_lock(sysarg_t);
 bool shall_log_message(logger_log_t *, log_level_t);
-void log_release(logger_log_t *);
+void log_unlock(logger_log_t *);
 void write_to_log(logger_log_t *, log_level_t, const char *);
 

uspace/srv/logger/logs.c

@@ -115 +115 @@
 }
 
-logger_log_t *find_or_create_log_and_acquire(const char *name, sysarg_t parent_id)
+logger_log_t *find_or_create_log_and_lock(const char *name, sysarg_t parent_id)
 {
         logger_log_t *result = NULL;
@@ -139 +139 @@
 }
 
-logger_log_t *find_log_by_name_and_acquire(const char *name)
+logger_log_t *find_log_by_name_and_lock(const char *name)
 {
         logger_log_t *result = NULL;
@@ -157 +157 @@
 }
 
-logger_log_t *find_log_by_id_and_acquire(sysarg_t id)
+logger_log_t *find_log_by_id_and_lock(sysarg_t id)
 {
         logger_log_t *result = NULL;
@@ -195 +195 @@
 }
 
-void log_release(logger_log_t *log)
+void log_unlock(logger_log_t *log)
 {
         assert(fibril_mutex_is_locked(&log->guard));

uspace/srv/logger/writer.c

@@ -56 +56 @@
                 return NULL;
 
-        logger_log_t *log = find_or_create_log_and_acquire(name, parent);
+        logger_log_t *log = find_or_create_log_and_lock(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_and_acquire(log_id);
+        logger_log_t *log = find_log_by_id_and_lock(log_id);
         if (log == NULL)
                 return ENOENT;
@@ -87 +87 @@
 
 leave:
-        log_release(log);
+        log_unlock(log);
         free(message);
 
@@ -114 +114 @@
                                 break;
                         }
-                        log_release(log);
+                        log_unlock(log);
                         async_answer_1(callid, EOK, (sysarg_t) log);
                         break;