Changeset 8e9b2534 in mainline

Timestamp:

2017-03-26T10:28:44Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f644472

Parents:

58898d1d

Message:

Set logger's VFS root

As an init task, logger starts with no VFS root, which effectively
disables logging to /log/*. In this commit we add a way to set logger's
root after the root is mounted in init to fix this. Note that some log
entries might be still missing as file-based logging kicks in quite
late.

Location:

uspace

Files:

• app/init/init.c (modified) (2 diffs)
• lib/c/generic/io/logctl.c (modified) (2 diffs)
• lib/c/include/io/logctl.h (modified) (1 diff)
• lib/c/include/ipc/logger.h (modified) (1 diff)
• srv/logger/ctl.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -50 +50 @@
 #include <str_error.h>
 #include <config.h>
+#include <io/logctl.h>
 #include "init.h"
 
@@ -129 +130 @@
         int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
             IPC_FLAG_BLOCKING, 0);
+        if (rc == EOK)
+                logctl_set_root();
         return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
             ROOT_DEVICE, rc);

uspace/lib/c/generic/io/logctl.c

@@ -39 +39 @@
 #include <ns.h>
 #include <str.h>
+#include <vfs/vfs.h>
 
 /** IPC session with the logger service. */
@@ -122 +123 @@
 }
 
+/** Set logger's VFS root.
+ *
+ * @return Error code or EOK on success.
+ */
+int logctl_set_root(void)
+{
+        async_exch_t *exchange = NULL;
+        int rc = start_logger_exchange(&exchange);
+        if (rc != EOK)
+                return rc;
+
+        aid_t reg_msg = async_send_0(exchange, LOGGER_CONTROL_SET_ROOT, NULL);
+        async_exch_t *vfs_exch = vfs_exchange_begin();
+        rc = vfs_pass_handle(vfs_exch, vfs_root(), exchange);
+        vfs_exchange_end(vfs_exch);
+        sysarg_t reg_msg_rc;
+        async_wait_for(reg_msg, &reg_msg_rc);
+
+        async_exchange_end(exchange);
+
+        if (rc != EOK)
+                return rc;
+
+        return (int) reg_msg_rc;
+}
+
 /** @}
  */

uspace/lib/c/include/io/logctl.h

@@ -38 +38 @@
 extern int logctl_set_default_level(log_level_t);
 extern int logctl_set_log_level(const char *, log_level_t);
+extern int logctl_set_root(void);
 
 #endif

uspace/lib/c/include/ipc/logger.h

@@ -49 +49 @@
          * Followed by: string with full log name.
          */
-        LOGGER_CONTROL_SET_LOG_LEVEL
+        LOGGER_CONTROL_SET_LOG_LEVEL,
+        /** Set VFS root.
+         *
+         * Returns: error code
+         * Followed by: vfs_pass_handle() request.
+         */ 
+        LOGGER_CONTROL_SET_ROOT
 } logger_control_request_t;
 

uspace/srv/logger/ctl.c

@@ -41 +41 @@
 #include <io/logctl.h>
 #include <ipc/logger.h>
+#include <vfs/vfs.h>
 #include "logger.h"
 
@@ -86 +87 @@
                         break;
                 }
+                case LOGGER_CONTROL_SET_ROOT: {
+                        int fd = vfs_receive_handle(true);
+                        vfs_root_set(fd);
+                        async_answer_0(callid, fd >= 0 ? EOK : fd);
+                        break;
+                }
                 default:
                         async_answer_0(callid, EINVAL);