updates

ilobilo · ilobilo · commit 4fbb4e3711a1 · 2026-05-12T18:01:27.000+04:00
diff --git a/kernel/interfaces/lib/time.cppm b/kernel/interfaces/lib/time.cppm
@@ -12,6 +12,16 @@ export
     {
         time_t tv_sec;
         suseconds_t tv_usec;
+
+        constexpr std::uint64_t to_ns() const
+        {
+            return tv_sec * 1'000'000'000ul + tv_usec * 1'000;
+        }
+
+        constexpr std::uint64_t to_ms() const
+        {
+            return tv_sec * 1000ul + tv_usec / 1'000;
+        }
     };
 
     struct itimerval
diff --git a/kernel/interfaces/system/proc/mutex.cppm b/kernel/interfaces/system/proc/mutex.cppm
@@ -67,7 +67,7 @@ export namespace sched
                         lib::panic("mutex deadlock");
                 }
 
-                if (_waiters.wait())
+                if (_waiters.wait().interrupted)
                     return false;
             }
         }
@@ -121,7 +121,7 @@ export namespace sched
                 if (now >= deadline)
                     return false;
 
-                if (_waiters.wait(deadline - now))
+                if (_waiters.wait(deadline - now).interrupted)
                     return false;
             }
         }
@@ -200,7 +200,7 @@ export namespace sched
                     }
                 }
 
-                if (_waiters.wait())
+                if (_waiters.wait().interrupted)
                     return false;
             }
         }
@@ -281,7 +281,7 @@ export namespace sched
                 if (now >= deadline)
                     return false;
 
-                if (_waiters.wait(deadline - now))
+                if (_waiters.wait(deadline - now).interrupted)
                     return false;
             }
         }
diff --git a/kernel/interfaces/system/proc/wait_queue.cppm b/kernel/interfaces/system/proc/wait_queue.cppm
@@ -47,11 +47,17 @@ export namespace sched
             std::atomic<wait_queue_entry_t *> &entry_ref
         );
 
-        bool wait(std::uint64_t ns = 0);
-        void wait_unint(std::uint64_t ns = 0);
+        struct wait_result_t
+        {
+            bool interrupted;
+            bool expired;
+        };
+
+        wait_result_t wait(std::uint64_t ns = 0);
+        wait_result_t wait_unint(std::uint64_t ns = 0);
 
         std::size_t snapshot_gen() const;
-        bool wait_prepared(std::size_t gen, std::uint64_t ns = 0);
+        wait_result_t wait_prepared(std::size_t gen, std::uint64_t ns = 0);
 
         void wake_one(bool drop = false);
         void wake_all();
diff --git a/kernel/interfaces/system/vfs/vfs.cppm b/kernel/interfaces/system/vfs/vfs.cppm
@@ -394,10 +394,16 @@ export namespace vfs
         lib::locked_ptr<filesystem::instance, sched::mutex> fs;
         std::shared_ptr<dentry> root;
         std::optional<path> mounted_on;
+
+        std::size_t id;
+        std::size_t parent_id;
         std::uint64_t flags = 0;
 
         std::string fstype;
         std::string source;
+
+        mount(lib::locked_ptr<filesystem::instance, sched::mutex> fs, std::shared_ptr<dentry> root)
+            : fs { std::move(fs) }, root { std::move(root) } { }
     };
 
     struct inode
@@ -710,6 +716,7 @@ export namespace vfs
     };
 
     path get_root(bool absolute);
+    std::shared_ptr<mount> get_mount(std::size_t id);
 
     bool register_fs(std::unique_ptr<filesystem> fs);
     auto find_fs(std::string_view name)
diff --git a/kernel/source/drivers/fs/dev/tty.cpp b/kernel/source/drivers/fs/dev/tty.cpp
@@ -868,12 +868,15 @@ namespace fs::dev::tty
                             return progress;
 
                         in_locked.unlock();
-                        bool interrupted = in_wq.wait(ms * 1'000'000);
+                        const auto [interrupted, expired] = in_wq.wait(ms * 1'000'000);
                         in_locked.lock();
 
                         available = get_available(in_locked);
                         if (!interrupted && available == 0) // expired
+                        {
+                            lib::bug_on(!expired);
                             return progress;
+                        }
                     }
                 }
                 return progress;
diff --git a/kernel/source/drivers/fs/devpts.cpp b/kernel/source/drivers/fs/devpts.cpp
@@ -26,7 +26,7 @@ namespace fs::devpts
         {
             lib::unused(src, data);
 
-            auto mount = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);
+            auto mount = std::make_shared<struct vfs::mount>(instance, root);
             mounts.push_back(mount);
             return mount;
         }
@@ -48,7 +48,7 @@ namespace fs::devpts
             );
             root->parent = root;
 
-            internal_mnt = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);
+            internal_mnt = std::make_shared<struct vfs::mount>(instance, root);
         }
     };
 
diff --git a/kernel/source/drivers/fs/devtmpfs.cpp b/kernel/source/drivers/fs/devtmpfs.cpp
@@ -24,7 +24,7 @@ namespace fs::devtmpfs
         {
             lib::unused(src, data);
 
-            auto mount = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);
+            auto mount = std::make_shared<struct vfs::mount>(instance, root);
             mounts.push_back(mount);
             return mount;
         }
@@ -46,7 +46,7 @@ namespace fs::devtmpfs
             );
             root->parent = root;
 
-            internal_mnt = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);
+            internal_mnt = std::make_shared<struct vfs::mount>(instance, root);
         }
     };
 
diff --git a/kernel/source/drivers/fs/procfs.cpp b/kernel/source/drivers/fs/procfs.cpp
@@ -725,7 +725,7 @@ namespace fs::procfs
         {
             lib::unused(src, data);
 
-            auto mount = std::make_shared<struct vfs::mount>(inst, root, std::nullopt);
+            auto mount = std::make_shared<struct vfs::mount>(inst, root);
             mounts.lock()->push_back(mount);
             return mount;
         }
@@ -741,7 +741,7 @@ namespace fs::procfs
             root->inode = locked->mkroot();
             root->parent = root;
 
-            internal_mnt = std::make_shared<struct vfs::mount>(inst, root, std::nullopt);
+            internal_mnt = std::make_shared<struct vfs::mount>(inst, root);
         }
     };
 
diff --git a/kernel/source/drivers/fs/stubs.cpp b/kernel/source/drivers/fs/stubs.cpp
@@ -39,7 +39,7 @@ namespace fs::stubs
             {
                 lib::unused(src, data);
 
-                auto mount = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);
+                auto mount = std::make_shared<struct vfs::mount>(instance, root);
                 mounts.push_back(mount);
                 return mount;
             }
diff --git a/kernel/source/drivers/fs/tmpfs.cpp b/kernel/source/drivers/fs/tmpfs.cpp
@@ -418,7 +418,7 @@ namespace fs::tmpfs
         root->inode->stat.st_gid = locked->opt_gid;
         root->parent = root;
 
-        auto mount = std::make_shared<struct vfs::mount>(std::move(instance), root, std::nullopt);
+        auto mount = std::make_shared<struct vfs::mount>(std::move(instance), root);
         mounts.push_back(mount);
         return mount;
     }
diff --git a/kernel/source/system/proc/scheduler.cpp b/kernel/source/system/proc/scheduler.cpp
@@ -1948,7 +1948,7 @@ namespace sched
             if (no_hang)
                 return 0;
 
-            if (proc->wait_child.wait())
+            if (proc->wait_child.wait().interrupted)
                 return -EINTR;
         }
     }
diff --git a/kernel/source/system/proc/wait_queue.cpp b/kernel/source/system/proc/wait_queue.cpp
@@ -62,15 +62,15 @@ namespace sched
         return generation.load(std::memory_order_acquire);
     }
 
-    bool wait_queue_t::wait(std::uint64_t ns)
+    auto wait_queue_t::wait(std::uint64_t ns) -> wait_result_t
     {
         return wait_prepared(snapshot_gen(), ns);
     }
 
-    bool wait_queue_t::wait_prepared(std::size_t gen, std::uint64_t ns)
+    auto wait_queue_t::wait_prepared(std::size_t gen, std::uint64_t ns) -> wait_result_t
     {
         if (try_dec_pending())
-            return false;
+            return { false, false };
 
         wait_queue_entry_t entry { };
 
@@ -79,13 +79,13 @@ namespace sched
         {
             pending.fetch_sub(1, std::memory_order_release);
             lock.unlock();
-            return false;
+            return { false, false };
         }
 
         if (generation.load(std::memory_order_acquire) != gen)
         {
             lock.unlock();
-            return false;
+            return { false, false };
         }
 
         entries.push_back(&entry);
@@ -108,7 +108,7 @@ namespace sched
             if (entries.find(&entry) != entries.end())
                 entries.remove(&entry);
             lock.unlock();
-            return interrupted;
+            return { interrupted, false };
         }
 
         sleep_entry_t timeout {
@@ -133,15 +133,15 @@ namespace sched
             entries.remove(&entry);
         lock.unlock();
 
-        return interrupted;
+        return { interrupted, timeout.expired };
     }
 
-    void wait_queue_t::wait_unint(std::uint64_t ns)
+    auto wait_queue_t::wait_unint(std::uint64_t ns) -> wait_result_t
     {
         const auto gen = generation.load(std::memory_order_acquire);
 
         if (try_dec_pending())
-            return;
+            return { false, false };
 
         wait_queue_entry_t entry { };
 
@@ -150,13 +150,13 @@ namespace sched
         {
             pending.fetch_sub(1, std::memory_order_release);
             lock.unlock();
-            return;
+            return { false, false };
         }
 
         if (generation.load(std::memory_order_acquire) != gen)
         {
             lock.unlock();
-            return;
+            return { false, false };
         }
 
         entries.push_back(&entry);
@@ -178,7 +178,7 @@ namespace sched
             if (entries.find(&entry) != entries.end())
                 entries.remove(&entry);
             lock.unlock();
-            return;
+            return { false, false };
         }
 
         sleep_entry_t timeout {
@@ -201,6 +201,8 @@ namespace sched
         if (entries.find(&entry) != entries.end())
             entries.remove(&entry);
         lock.unlock();
+
+        return { false, timeout.expired };
     }
 
     void wait_queue_t::wake_one(bool drop)
diff --git a/kernel/source/system/syscall/vfs/open.cpp b/kernel/source/system/syscall/vfs/open.cpp
@@ -110,14 +110,14 @@ namespace syscall::vfs
         if (needs_write && (mflags & ms_rdonly))
             return -EROFS;
 
-        if (stat.type() == stat::type::s_ifdir && (write || trunc) && !is_tmpfile)
+        if (stat.type() == stat::s_ifdir && (write || trunc) && !is_tmpfile)
             return -EISDIR;
 
         if (stat.type() != stat::s_ifdir && (flags & o_directory))
             return -ENOTDIR;
 
         if ((mflags & ms_nodev) &&
-            (stat.type() == stat::type::s_ifchr || stat.type() == stat::type::s_ifblk))
+            (stat.type() == stat::s_ifchr || stat.type() == stat::s_ifblk))
             return -EACCES;
 
         if ((flags & o_noatime) &&
diff --git a/kernel/source/system/vfs/pipe.cpp b/kernel/source/system/vfs/pipe.cpp
@@ -134,7 +134,7 @@ namespace vfs::pipe
                 if (nonblock)
                     return { };
 
-                if (pdata->open_wait.wait_prepared(gen))
+                if (pdata->open_wait.wait_prepared(gen).interrupted)
                 {
                     const std::unique_lock _ { pdata->lock };
                     pdata->readers--;
@@ -161,7 +161,7 @@ namespace vfs::pipe
                     gen = pdata->open_wait.snapshot_gen();
                 }
 
-                if (pdata->open_wait.wait_prepared(gen))
+                if (pdata->open_wait.wait_prepared(gen).interrupted)
                 {
                     const std::unique_lock _ { pdata->lock };
                     pdata->writers--;
@@ -286,7 +286,7 @@ namespace vfs::pipe
                     if (nonblock)
                         return std::unexpected { lib::err::try_again };
 
-                    if (pdata->read_wait.wait_prepared(gen))
+                    if (pdata->read_wait.wait_prepared(gen).interrupted)
                         return std::unexpected { lib::err::interrupted };
                 }
             }
@@ -379,7 +379,7 @@ namespace vfs::pipe
                         return std::unexpected { lib::err::try_again };
                     }
 
-                    if (pdata->write_wait.wait_prepared(gen))
+                    if (pdata->write_wait.wait_prepared(gen).interrupted)
                     {
                         if (written > 0)
                             return written;
diff --git a/kernel/source/system/vfs/socket/unix.cpp b/kernel/source/system/vfs/socket/unix.cpp
diff --git a/kernel/source/system/vfs/vfs.cpp b/kernel/source/system/vfs/vfs.cpp

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export namespace sched`
`67`	`67`	`lib::panic("mutex deadlock");`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (_waiters.wait())`
	`70`	`+ if (_waiters.wait().interrupted)`
`71`	`71`	`return false;`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -121,7 +121,7 @@ export namespace sched`
`121`	`121`	`if (now >= deadline)`
`122`	`122`	`return false;`
`123`	`123`
`124`		`- if (_waiters.wait(deadline - now))`
	`124`	`+ if (_waiters.wait(deadline - now).interrupted)`
`125`	`125`	`return false;`
`126`	`126`	`}`
`127`	`127`	`}`
`@@ -200,7 +200,7 @@ export namespace sched`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`203`		`- if (_waiters.wait())`
	`203`	`+ if (_waiters.wait().interrupted)`
`204`	`204`	`return false;`
`205`	`205`	`}`
`206`	`206`	`}`
`@@ -281,7 +281,7 @@ export namespace sched`
`281`	`281`	`if (now >= deadline)`
`282`	`282`	`return false;`
`283`	`283`
`284`		`- if (_waiters.wait(deadline - now))`
	`284`	`+ if (_waiters.wait(deadline - now).interrupted)`
`285`	`285`	`return false;`
`286`	`286`	`}`
`287`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace fs::devpts`
`26`	`26`	`{`
`27`	`27`	`lib::unused(src, data);`
`28`	`28`
`29`		`- auto mount = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);`
	`29`	`+ auto mount = std::make_shared<struct vfs::mount>(instance, root);`
`30`	`30`	`mounts.push_back(mount);`
`31`	`31`	`return mount;`
`32`	`32`	`}`
`@@ -48,7 +48,7 @@ namespace fs::devpts`
`48`	`48`	`);`
`49`	`49`	`root->parent = root;`
`50`	`50`
`51`		`- internal_mnt = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);`
	`51`	`+ internal_mnt = std::make_shared<struct vfs::mount>(instance, root);`
`52`	`52`	`}`
`53`	`53`	`};`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace fs::devtmpfs`
`24`	`24`	`{`
`25`	`25`	`lib::unused(src, data);`
`26`	`26`
`27`		`- auto mount = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);`
	`27`	`+ auto mount = std::make_shared<struct vfs::mount>(instance, root);`
`28`	`28`	`mounts.push_back(mount);`
`29`	`29`	`return mount;`
`30`	`30`	`}`
`@@ -46,7 +46,7 @@ namespace fs::devtmpfs`
`46`	`46`	`);`
`47`	`47`	`root->parent = root;`
`48`	`48`
`49`		`- internal_mnt = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);`
	`49`	`+ internal_mnt = std::make_shared<struct vfs::mount>(instance, root);`
`50`	`50`	`}`
`51`	`51`	`};`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ namespace fs::procfs`
`725`	`725`	`{`
`726`	`726`	`lib::unused(src, data);`
`727`	`727`
`728`		`- auto mount = std::make_shared<struct vfs::mount>(inst, root, std::nullopt);`
	`728`	`+ auto mount = std::make_shared<struct vfs::mount>(inst, root);`
`729`	`729`	`mounts.lock()->push_back(mount);`
`730`	`730`	`return mount;`
`731`	`731`	`}`
`@@ -741,7 +741,7 @@ namespace fs::procfs`
`741`	`741`	`root->inode = locked->mkroot();`
`742`	`742`	`root->parent = root;`
`743`	`743`
`744`		`- internal_mnt = std::make_shared<struct vfs::mount>(inst, root, std::nullopt);`
	`744`	`+ internal_mnt = std::make_shared<struct vfs::mount>(inst, root);`
`745`	`745`	`}`
`746`	`746`	`};`
`747`	`747`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ namespace fs::stubs`
`39`	`39`	`{`
`40`	`40`	`lib::unused(src, data);`
`41`	`41`
`42`		`- auto mount = std::make_shared<struct vfs::mount>(instance, root, std::nullopt);`
	`42`	`+ auto mount = std::make_shared<struct vfs::mount>(instance, root);`
`43`	`43`	`mounts.push_back(mount);`
`44`	`44`	`return mount;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ namespace fs::tmpfs`
`418`	`418`	`root->inode->stat.st_gid = locked->opt_gid;`
`419`	`419`	`root->parent = root;`
`420`	`420`
`421`		`- auto mount = std::make_shared<struct vfs::mount>(std::move(instance), root, std::nullopt);`
	`421`	`+ auto mount = std::make_shared<struct vfs::mount>(std::move(instance), root);`
`422`	`422`	`mounts.push_back(mount);`
`423`	`423`	`return mount;`
`424`	`424`	`}`