RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 22:58:11 +00:00
Code Issues Activity Actions

Userland+LibCore: Update FileWatcher + its users for InodeWatcher 2.0

Browse source 
With the new InodeWatcher API, the old style of creating a watcher per
inode will no longer work.  Therefore the FileWatcher API has been
updated to support multiple watches, and its users have also been
refactored to the new style.  At the moment, all operations done on a
(Blocking)FileWatcher return Result objects, however, this may be
changed in the future if it becomes too obnoxious. :^)

Co-authored-by: Gunnar Beutner <gunnar@beutner.name>
This commit is contained in:
sin-ack 2021-05-09 17:09:30 +00:00 • committed by Andreas Kling
parent fe5ca6ca27
commit 2159f90e00
12 changed files with 403 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp
View file

@ -222,8 +222,12 @@ u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3)
return virt$set_thread_name(arg1, arg2, arg3);
case SC_setsid:
return virt$setsid();
case SC_watch_file:
return virt$watch_file(arg1, arg2);
case SC_create_inode_watcher:
return virt$create_inode_watcher(arg1);
case SC_inode_watcher_add_watch:
return virt$inode_watcher_add_watch(arg1);
case SC_inode_watcher_remove_watch:
return virt$inode_watcher_remove_watch(arg1, arg2);
case SC_clock_nanosleep:
return virt$clock_nanosleep(arg1);
case SC_readlink:
@ -1386,10 +1390,21 @@ pid_t Emulator::virt$setsid()
return syscall(SC_setsid);
}
int Emulator::virt$watch_file(FlatPtr user_path_addr, size_t path_length)
int Emulator::virt$create_inode_watcher(unsigned flags)
{
auto user_path = mmu().copy_buffer_from_vm(user_path_addr, path_length);
return syscall(SC_watch_file, user_path.data(), user_path.size());
return syscall(SC_create_inode_watcher, flags);
}
int Emulator::virt$inode_watcher_add_watch(FlatPtr params_addr)
{
Syscall::SC_inode_watcher_add_watch_params params;
mmu().copy_from_vm(&params, params_addr, sizeof(params));
return syscall(SC_inode_watcher_add_watch, &params);
}
int Emulator::virt$inode_watcher_remove_watch(int fd, int wd)
{
return syscall(SC_inode_watcher_add_watch, fd, wd);
}
int Emulator::virt$clock_nanosleep(FlatPtr params_addr)