Changeset ef5be68 in mainline

Timestamp:

2012-07-14T11:42:41Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2e39656

Parents:

f6bc83a

Message:

Logger: namespace can have more writers

Location:

uspace/srv/logger

Files:

• logger.h (modified) (1 diff)
• main.c (modified) (3 diffs)
• namespace.c (modified) (5 diffs)

uspace/srv/logger/logger.h

@@ -62 +62 @@
 void namespace_destroy(logging_namespace_t *);
 logging_namespace_t *namespace_reader_attach(const char *);
+logging_namespace_t *namespace_writer_attach(const char *);
 void namespace_reader_detach(logging_namespace_t *);
 void namespace_writer_detach(logging_namespace_t *);

uspace/srv/logger/main.c

@@ -47 +47 @@
 #include "logger.h"
 
-static logging_namespace_t *register_namespace(void)
+static logging_namespace_t *find_namespace_and_attach_writer(void)
 {
         ipc_call_t call;
@@ -65 +65 @@
         }
 
-        logging_namespace_t *result = namespace_create((const char *) name);
+        logging_namespace_t *result = namespace_writer_attach((const char *) name);
 
         free(name);
@@ -224 +224 @@
                 /* First call has to be the registration. */
                 async_answer_0(iid, EOK);
-                namespace = register_namespace();
+                namespace = find_namespace_and_attach_writer();
                 if (namespace == NULL) {
                         fprintf(stderr, NAME ": failed to register namespace.\n");

uspace/srv/logger/namespace.c

@@ -42 +42 @@
 struct logging_namespace {
         fibril_mutex_t guard;
-        bool has_writer;
+        size_t writers_count;
         bool has_reader;
         const char *name;
@@ -114 +114 @@
         prodcons_initialize(&namespace->messages);
         namespace->has_reader = false;
-        namespace->has_writer = true;
+        namespace->writers_count = 0;
         link_initialize(&namespace->link);
 
@@ -135 +135 @@
 
         fibril_mutex_lock(&namespace->guard);
-        if (namespace->has_reader || namespace->has_writer) {
+        if (namespace->has_reader || (namespace->writers_count > 0)) {
                 fibril_mutex_unlock(&namespace->guard);
                 fibril_mutex_unlock(&namespace_list_guard);
@@ -175 +175 @@
 }
 
+logging_namespace_t *namespace_writer_attach(const char *name)
+{
+        logging_namespace_t *namespace = NULL;
+
+        fibril_mutex_lock(&namespace_list_guard);
+
+        namespace = namespace_find_no_lock(name);
+
+        if (namespace == NULL) {
+                namespace = namespace_create(name);
+        }
+
+        fibril_mutex_lock(&namespace->guard);
+        namespace->writers_count++;
+        fibril_mutex_unlock(&namespace->guard);
+
+        fibril_mutex_unlock(&namespace_list_guard);
+
+        return namespace;
+}
+
 void namespace_reader_detach(logging_namespace_t *namespace)
 {
@@ -187 +208 @@
 {
         fibril_mutex_lock(&namespace->guard);
-        namespace->has_writer = false;
+        assert(namespace->writers_count > 0);
+        namespace->writers_count--;
         fibril_mutex_unlock(&namespace->guard);