chore: a bit of cleanup

Author: moodyhunter

docs/internals/startup/index.md

@@ -6,9 +6,20 @@ description: >-
   This section  describes the startup process of MOS, from the bootloader to the creation of the first user process.
 ---
 
-This section describes the startup process of MOS, from the bootloader to the creation of the first user process.
+## 1. Bootloader
 
-## 1. Command Line Parsing
+The very first stage of startup is the phase of bootloader, which is **limine** only for now, the bootloader will:
+
+- Map correct ELF segments into memory and setup correct permissions
+- Read and sanitise the memory layout provided by the firmware
+- Map initrd, load cmdlines
+- Setup direct mapping, which maps the entire physical memory space to a specific range of virtual memory.
+- Potentially:
+  - Start secondary CPUs (APs)
+  - Find ACPI tables
+  - Find firmware-provided device tree
+
+## 2. Command Line Parsing
 
 `cmdline` is important for the kernel, as it allows the user to pass arguments to the kernel at runtime. The kernel parses the command line and uses the arguments to configure itself.
 

kernel/include/private/mos/filesystem/vfs.h

@@ -99,7 +99,7 @@ file_t *vfs_openat(int fd, const char *path, open_flags flags);
  *     If the path is relative, the fd will be used as the directory to resolve the path from.
  * If FSTATAT_NOFOLLOW is set, when the path is used, symlinks will not be followed.
  */
-long vfs_fstatat(fd_t fd, const char *path, file_stat_t *restrict stat, fstatat_flags flags);
+long vfs_fstatat(fd_t fd, const char *path, file_stat_t *stat, fstatat_flags flags);
 
 /**
  * @brief Read a symbolic link

kernel/include/private/mos/ipc/ipc_io.h

@@ -4,7 +4,6 @@
 
 #include "mos/io/io.h"
 #include "mos/ipc/ipc.h"
-#include "mos/platform/platform.h"
 
 typedef struct
 {

kernel/include/private/mos/syslog/printk.h

@@ -13,8 +13,8 @@
 #define pr_fmt(fmt) fmt // default format string
 #endif
 
-#define emit_syslog(level, feat, fmt, ...)  do_syslog(level, current_thread, __FILE_NAME__, __func__, __LINE__, &mos_debug_info.feat, fmt, ##__VA_ARGS__)
-#define emit_syslog_nofeat(level, fmt, ...) do_syslog(level, current_thread, __FILE_NAME__, __func__, __LINE__, NULL, fmt, ##__VA_ARGS__)
+#define emit_syslog(level, feat, fmt, ...)  do_syslog(level, __FILE_NAME__, __func__, __LINE__, &mos_debug_info.feat, fmt, ##__VA_ARGS__)
+#define emit_syslog_nofeat(level, fmt, ...) do_syslog(level, __FILE_NAME__, __func__, __LINE__, NULL, fmt, ##__VA_ARGS__)
 
 #define lprintk_debug_wrapper(feat, level, fmt, ...)                                                                                                                     \
     do                                                                                                                                                                   \

kernel/include/private/mos/syslog/syslog.h

@@ -16,4 +16,4 @@ typedef enum
     MOS_LOG_UNSET = 0,
 } loglevel_t;
 
-long do_syslog(loglevel_t level, thread_t *thread, const char *file, const char *func, int line, debug_info_entry *feat, const char *fmt, ...);
+long do_syslog(loglevel_t level, const char *file, const char *func, int line, const debug_info_entry *feat, const char *fmt, ...);

kernel/io/io.c

@@ -31,7 +31,7 @@ static io_t io_null_impl = {
     .type = IO_NULL,
     .flags = IO_READABLE | IO_WRITABLE,
     .ops =
-        &(io_op_t){
+        &(io_op_t) {
             .read = _null_read,
             .write = _null_write,
             .seek = NULL,

kernel/ipc/ipc_io.c

@@ -6,7 +6,6 @@
 #include "mos/io/io.h"
 #include "mos/ipc/ipc.h"
 #include "mos/mm/slab_autoinit.h"
-#include "mos/platform/platform.h"
 
 #include <mos_stdlib.h>
 

kernel/syslog/syslog.c

@@ -13,32 +13,9 @@
 
 static spinlock_t global_syslog_lock = SPINLOCK_INIT;
 
-long do_syslog(loglevel_t level, thread_t *thread, const char *file, const char *func, int line, debug_info_entry *feat, const char *fmt, ...)
+static void do_print_syslog(const pb_syslog_message *msg, const debug_info_entry *feat)
 {
-    pb_syslog_message msg = {
-        .timestamp = platform_get_timestamp(),
-        .cpu_id = platform_current_cpu_id(),
-    };
-
-    msg.info.level = (syslog_level) level;
-    msg.info.featid = feat ? feat->id : 0;
-    msg.info.source_location.line = line;
-    strncpy(msg.info.source_location.filename, file, sizeof(msg.info.source_location.filename));
-    strncpy(msg.info.source_location.function, func, sizeof(msg.info.source_location.function));
-
-    if (thread)
-    {
-        msg.thread.tid = thread->tid;
-        msg.process.pid = thread->owner->pid;
-        strncpy(msg.thread.name, thread->name, sizeof(msg.thread.name));
-        strncpy(msg.process.name, thread->owner->name, sizeof(msg.process.name));
-    }
-
-    va_list args;
-    va_start(args, fmt);
-    vsnprintf(msg.message, sizeof(msg.message), fmt, args);
-    va_end(args);
-
+    const loglevel_t level = (loglevel_t) msg->info.level;
     spinlock_acquire(&global_syslog_lock);
 
     if (level != MOS_LOG_UNSET)
@@ -48,29 +25,58 @@ long do_syslog(loglevel_t level, thread_t *thread, const char *file, const char
             lprintk(level, "%-10s | ", feat->name);
 
 #if MOS_CONFIG(MOS_PRINTK_WITH_TIMESTAMP)
-        lprintk(level, "%-16llu | ", platform_get_timestamp());
+        lprintk(level, "%-16lu | ", msg->timestamp);
 #endif
 
 #if MOS_CONFIG(MOS_PRINTK_WITH_DATETIME)
         lprintk(level, "%s | ", (const char *) platform_get_datetime_str());
 #endif
 
 #if MOS_CONFIG(MOS_PRINTK_WITH_CPU_ID)
-        lprintk(level, "cpu %2d | ", msg.cpu_id);
+        lprintk(level, "cpu %2d | ", msg->cpu_id);
 #endif
 
 #if MOS_CONFIG(MOS_PRINTK_WITH_FILENAME)
-        lprintk(level, "%-15s | ", msg.info.source_location.filename);
+        lprintk(level, "%-15s | ", msg->info.source_location.filename);
 #endif
 
 #if MOS_CONFIG(MOS_PRINTK_WITH_THREAD_ID)
-        lprintk(level, "%pt\t| ", ((void *) thread));
+        lprintk(level, "tid:%d,%s\t| ", msg->thread.tid, msg->thread.name);
 #endif
     }
 
-    lprintk(level, "%s", msg.message);
+    lprintk(level, "%s", msg->message);
 
     spinlock_release(&global_syslog_lock);
+}
+
+long do_syslog(loglevel_t level, const char *file, const char *func, int line, const debug_info_entry *feat, const char *fmt, ...)
+{
+    auto const thread = current_thread;
+    pb_syslog_message msg = {
+        .timestamp = platform_get_timestamp(),
+        .cpu_id = platform_current_cpu_id(),
+    };
+
+    msg.info.level = (syslog_level) level;
+    msg.info.featid = feat ? feat->id : 0;
+    msg.info.source_location.line = line;
+    strncpy(msg.info.source_location.filename, file, sizeof(msg.info.source_location.filename));
+    strncpy(msg.info.source_location.function, func, sizeof(msg.info.source_location.function));
+
+    if (thread)
+    {
+        msg.thread.tid = thread->tid;
+        msg.process.pid = thread->owner->pid;
+        strncpy(msg.thread.name, thread->name, sizeof(msg.thread.name));
+        strncpy(msg.process.name, thread->owner->name, sizeof(msg.process.name));
+    }
+
+    va_list args;
+    va_start(args, fmt);
+    vsnprintf(msg.message, sizeof(msg.message), fmt, args);
+    va_end(args);
 
+    do_print_syslog(&msg, feat);
     return 0;
 }