Changeset f6bc83a in mainline

Timestamp:

2012-07-04T13:21:52Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ef5be68

Parents:

e1eda1e9

Message:

Send log messages only when they are read

Location:

uspace

Files:

• lib/c/generic/io/log.c (modified) (1 diff)
• srv/logger/logger.h (modified) (1 diff)
• srv/logger/main.c (modified) (1 diff)
• srv/logger/namespace.c (modified) (1 diff)

uspace/lib/c/generic/io/log.c

@@ -87 +87 @@
         async_exchange_end(exchange);
 
+        /*
+         * Getting ENAK means no-one wants our message. That is not an
+         * error at all.
+         */
+        if (rc == ENAK)
+                rc = EOK;
+
         if (rc != EOK) {
                 return rc;

uspace/srv/logger/logger.h

@@ -65 +65 @@
 void namespace_writer_detach(logging_namespace_t *);
 
+bool namespace_has_reader(logging_namespace_t *);
 void namespace_add_message(logging_namespace_t *, const char *, log_level_t);
 log_message_t *namespace_get_next_message(logging_namespace_t *);

uspace/srv/logger/main.c

@@ -74 +74 @@
 static int handle_receive_message(logging_namespace_t *namespace, int level)
 {
+        bool skip_message = (level > DEFAULT_LOGGING_LEVEL) || !namespace_has_reader(namespace);
+        if (skip_message) {
+                /* Abort the actual message buffer transfer. */
+                ipc_callid_t callid;
+                size_t size;
+                int rc = ENAK;
+                if (!async_data_write_receive(&callid, &size))
+                        rc = EINVAL;
+
+                async_answer_0(callid, rc);
+                return rc;
+        }
+
         void *message;
         int rc = async_data_write_accept(&message, true, 0, 0, 0, NULL);

uspace/srv/logger/namespace.c

@@ -193 +193 @@
 }
 
+bool namespace_has_reader(logging_namespace_t *namespace)
+{
+        fibril_mutex_lock(&namespace->guard);
+        bool has_reader = namespace->has_reader;
+        fibril_mutex_unlock(&namespace->guard);
+        return has_reader;
+}