Changeset 90dc458 in mainline

Timestamp:

2012-08-17T11:38:08Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ae2c925

Parents:

5239e17

Message:

Create log files lazily

Location:

uspace/srv/logger

Files:

• initlvl.c (modified) (2 diffs)
• logger.h (modified) (2 diffs)
• logs.c (modified) (7 diffs)
• writer.c (modified) (2 diffs)

uspace/srv/logger/initlvl.c

@@ -35 +35 @@
  */
 #include <errno.h>
+#include <str_error.h>
 #include <sysinfo.h>
 #include <str.h>
@@ -61 +62 @@
                 return;
 
-        logger_log_t *log = find_or_create_log_and_acquire(key, 0);
-        if (log == NULL)
+        logger_log_t *log;
+        rc = find_or_create_log_and_acquire(key, 0, &log);
+        if (rc != EOK)
                 return;
 

uspace/srv/logger/logger.h

@@ -51 +51 @@
 
 typedef struct {
+        fibril_mutex_t guard;
+        char *filename;
         FILE *logfile;
 } logger_dest_t;
@@ -67 +69 @@
 
 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);
+int find_or_create_log_and_acquire(const char *, sysarg_t, logger_log_t **);
 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 *);
+void write_to_log(logger_log_t *, log_level_t, const char *);
 
 log_level_t get_default_logging_level(void);

uspace/srv/logger/logs.c

@@ -42 +42 @@
 
 
-static logger_log_t *find_log_by_name_and_parent_no_lock(const char *name, logger_log_t *parent)
+static logger_log_t *find_log_by_name_and_parent_no_list_lock_and_acquire(const char *name, logger_log_t *parent)
 {
         list_foreach(log_list, it) {
                 logger_log_t *log = list_get_instance(it, logger_log_t, link);
-                if ((parent == log->parent) && (str_cmp(log->name, name) == 0))
+                if ((parent == log->parent) && (str_cmp(log->name, name) == 0)) {
+                        fibril_mutex_lock(&log->guard);
                         return log;
+                }
         }
 
@@ -58 +60 @@
         if (result == NULL)
                 return ENOMEM;
-        char *logfilename;
-        int rc = asprintf(&logfilename, "/log/%s", name);
+        int rc = asprintf(&result->filename, "/log/%s", name);
         if (rc < 0) {
                 free(result);
                 return ENOMEM;
         }
-        result->logfile = fopen(logfilename, "a");
-        free(logfilename);
-        if (result->logfile == NULL) {
-                free(result);
-                return ENOMEM;
-        }
+        result->logfile = NULL;
+        fibril_mutex_initialize(&result->guard);
         *dest = result;
         return EOK;
 }
 
-logger_log_t *find_or_create_log_and_acquire(const char *name, sysarg_t parent_id)
-{
+int find_or_create_log_and_acquire(const char *name, sysarg_t parent_id, logger_log_t **log_out)
+{
+        int rc;
         logger_log_t *result = NULL;
         logger_log_t *parent = (logger_log_t *) parent_id;
@@ -81 +79 @@
         fibril_mutex_lock(&log_list_guard);
 
-        result = find_log_by_name_and_parent_no_lock(name, parent);
-        if (result != NULL)
+        result = find_log_by_name_and_parent_no_list_lock_and_acquire(name, parent);
+        if (result != NULL) {
+                rc = EOK;
                 goto leave;
+        }
 
         result = calloc(1, sizeof(logger_log_t));
-        if (result == NULL)
+        if (result == NULL) {
+                rc = ENOMEM;
                 goto leave;
+        }
 
         result->logged_level = LOG_LEVEL_USE_DEFAULT;
@@ -93 +95 @@
         if (parent == NULL) {
                 result->full_name = str_dup(name);
-                int rc = create_dest(name, &result->dest);
+                rc = create_dest(name, &result->dest);
                 if (rc != EOK)
                         goto error_result_allocated;
         } else {
-                int rc = asprintf(&result->full_name, "%s/%s",
+                rc = asprintf(&result->full_name, "%s/%s",
                     parent->full_name, name);
                 if (rc < 0)
@@ -116 +118 @@
         fibril_mutex_unlock(&log_list_guard);
 
-        return result;
+        if (rc == EOK) {
+                assert(fibril_mutex_is_locked(&result->guard));
+                *log_out = result;
+        }
+
+        return rc;
 
 error_result_allocated:
@@ -125 +132 @@
         fibril_mutex_unlock(&log_list_guard);
 
-        return NULL;
+        return rc;
 }
 
@@ -190 +197 @@
 }
 
+void write_to_log(logger_log_t *log, log_level_t level, const char *message)
+{
+        assert(fibril_mutex_is_locked(&log->guard));
+        assert(log->dest != NULL);
+        fibril_mutex_lock(&log->dest->guard);
+        if (log->dest->logfile == NULL)
+                log->dest->logfile = fopen(log->dest->filename, "a");
+
+        if (log->dest->logfile != NULL) {
+                fprintf(log->dest->logfile, "[%s] %s: %s\n",
+                    log->full_name, log_level_str(level),
+                    (const char *) message);
+                fflush(log->dest->logfile);
+        }
+
+        fibril_mutex_unlock(&log->dest->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 = NULL;
+        rc = find_or_create_log_and_acquire(name, parent, &log);
+        if (rc)
 
         free(name);
@@ -82 +84 @@
             log->full_name, log_level_str(level),
             (const char *) message);
-        fprintf(log->dest->logfile, "[%s] %s: %s\n",
-            log->full_name, log_level_str(level),
-            (const char *) message);
-        fflush(log->dest->logfile);
+        write_to_log(log, level, message);
 
         rc = EOK;