RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 17:27:35 +00:00
Code Issues Activity Actions

Kernel+LibC+UE: Implement usleep() via sys$clock_nanosleep()

Browse source 
This doesn't need to be its own syscall. Thanks @BenWiederhake for
the idea. :^)
This commit is contained in:
Andreas Kling 2020-08-30 10:43:15 +02:00
parent 95ed363b15
commit f857f3ce4c
5 changed files with 4 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
DevTools/UserspaceEmulator/Emulator.cpp
View file

@ -272,8 +272,6 @@ u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3)
return virt$ioctl(arg1, arg2, arg3); return virt$ioctl(arg1, arg2, arg3);
case SC_get_dir_entries: case SC_get_dir_entries:
return virt$get_dir_entries(arg1, arg2, arg3); return virt$get_dir_entries(arg1, arg2, arg3);
case SC_usleep:
return virt$usleep(arg1);
case SC_shbuf_create: case SC_shbuf_create:
return virt$shbuf_create(arg1, arg2); return virt$shbuf_create(arg1, arg2);
case SC_shbuf_allow_pid: case SC_shbuf_allow_pid:
@ -384,11 +382,6 @@ u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3)
} }
} }
int Emulator::virt$usleep(useconds_t us)
{
return syscall(SC_usleep, us);
}
int Emulator::virt$shbuf_create(int size, FlatPtr buffer) int Emulator::virt$shbuf_create(int size, FlatPtr buffer)
{ {
u8* host_data = nullptr; u8* host_data = nullptr;

1
DevTools/UserspaceEmulator/Emulator.h
View file

@ -85,7 +85,6 @@ private:
int virt$stat(FlatPtr); int virt$stat(FlatPtr);
int virt$realpath(FlatPtr); int virt$realpath(FlatPtr);
int virt$gethostname(FlatPtr, ssize_t); int virt$gethostname(FlatPtr, ssize_t);
int virt$usleep(useconds_t);
int virt$shbuf_create(int size, FlatPtr buffer); int virt$shbuf_create(int size, FlatPtr buffer);
int virt$shbuf_allow_pid(int, pid_t peer_pid); int virt$shbuf_allow_pid(int, pid_t peer_pid);
int virt$shbuf_allow_all(int); int virt$shbuf_allow_all(int);

3
Kernel/API/Syscall.h
View file

@ -117,7 +117,6 @@ namespace Kernel {
S(poll) \ S(poll) \
S(rmdir) \ S(rmdir) \
S(chmod) \ S(chmod) \
S(usleep) \
S(socket) \ S(socket) \
S(bind) \ S(bind) \
S(accept) \ S(accept) \
@ -241,7 +240,7 @@ struct ImmutableBufferArgument {
}; };
struct StringListArgument { struct StringListArgument {
Userspace<StringArgument*> strings { }; Userspace<StringArgument*> strings {};
size_t length { 0 }; size_t length { 0 };
}; };

11
Kernel/Syscalls/sleep.cpp
View file

@ -29,17 +29,6 @@
namespace Kernel { namespace Kernel {
int Process::sys$usleep(useconds_t usec)
{
REQUIRE_PROMISE(stdio);
if (!usec)
return 0;
u64 wakeup_time = Thread::current()->sleep(usec * TimeManagement::the().ticks_per_second() / 1000000);
if (wakeup_time > g_uptime)
return -EINTR;
return 0;
}
int Process::sys$sleep(unsigned seconds) int Process::sys$sleep(unsigned seconds)
{ {
REQUIRE_PROMISE(stdio); REQUIRE_PROMISE(stdio);

4
Libraries/LibC/unistd.cpp
View file

@ -42,6 +42,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/types.h> #include <sys/types.h>
#include <termios.h> #include <termios.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
extern "C" { extern "C" {
@ -336,7 +337,8 @@ int sleep(unsigned seconds)
int usleep(useconds_t usec) int usleep(useconds_t usec)
{ {
return syscall(SC_usleep, usec); struct timespec ts = { (long)(usec / 1000000), (long)(usec % 1000000) * 1000 };
return clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, nullptr);
} }
int gethostname(char* buffer, size_t size) int gethostname(char* buffer, size_t size)