ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-22 15:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: use monitor for sleep()

Browse Source 
Issue #3874
This commit is contained in:
Christian Helmuth 2020-09-01 14:14:00 +02:00 committed by Norman Feske
parent e9a3f0f095
commit d6f89b285d
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/libports/src/lib/libc/internal/init.h
View File

@ -101,7 +101,7 @@ namespace Libc {
/** /**
* Init timing facilities * Init timing facilities
*/ */
void init_sleep(Suspend &); void init_sleep(Monitor &);
void init_time(Current_time &, Current_real_time &); void init_time(Current_time &, Current_real_time &);
/** /**

40
repos/libports/src/lib/libc/sleep.cc
View File

@ -16,44 +16,44 @@
#include <sys/time.h> #include <sys/time.h>
/* libc-internal includes */ /* libc-internal includes */
#include <internal/suspend.h> #include <internal/monitor.h>
#include <internal/init.h> #include <internal/init.h>
using namespace Libc; using namespace Libc;
static Suspend *_suspend_ptr; static Libc::Monitor *_monitor_ptr;
void Libc::init_sleep(Suspend &suspend) void Libc::init_sleep(Monitor &monitor)
{ {
_suspend_ptr = &suspend; _monitor_ptr = &monitor;
} }
static void millisleep(Genode::uint64_t timeout_ms) static void millisleep(Genode::uint64_t timeout_ms)
{ {
Genode::uint64_t remaining_ms = timeout_ms; struct Missing_call_of_init_sleep : Genode::Exception { };
if (!_monitor_ptr)
struct Missing_call_of_init_sleep : Exception { };
if (!_suspend_ptr)
throw Missing_call_of_init_sleep(); throw Missing_call_of_init_sleep();
struct Check : Libc::Suspend_functor static Mutex mutex;
{
bool suspend() override { return true; }
} check; Mutex::Guard guard(mutex);
while (remaining_ms > 0) _monitor_ptr->monitor(mutex,
remaining_ms = _suspend_ptr->suspend(check, remaining_ms); [&] { return Libc::Monitor::Function_result::INCOMPLETE; },
timeout_ms);
} }
extern "C" __attribute__((weak)) extern "C" __attribute__((weak))
int nanosleep(const struct timespec *req, struct timespec *rem) int nanosleep(const struct timespec *req, struct timespec *rem)
{ {
/* XXX nanosleep({0,0}) may yield but is not required to do so */ /*
* According to POSIX nanosleep({0,0}) may yield but is not required to do
* so. We just return.
*/
if (!req->tv_sec && !req->tv_nsec) return 0; if (!req->tv_sec && !req->tv_nsec) return 0;
Genode::uint64_t sleep_ms = (Genode::uint64_t)req->tv_sec*1000; Genode::uint64_t sleep_ms = (Genode::uint64_t)req->tv_sec*1000;
@ -106,7 +106,10 @@ int __sys_clock_nanosleep(clockid_t clock_id, int flags,
extern "C" __attribute__((weak)) extern "C" __attribute__((weak))
unsigned int sleep(unsigned int seconds) unsigned int sleep(unsigned int seconds)
{ {
/* XXX sleep(0) may yield but is not required to do so */ /*
* According to POSIX usleep(0) may yield but is not required to do so.
* We just return.
*/
if (!seconds) return 0; if (!seconds) return 0;
Libc::uint64_t const sleep_ms = (Libc::uint64_t)seconds*1000; Libc::uint64_t const sleep_ms = (Libc::uint64_t)seconds*1000;
@ -120,7 +123,10 @@ unsigned int sleep(unsigned int seconds)
extern "C" __attribute__((weak)) extern "C" __attribute__((weak))
int usleep(useconds_t useconds) int usleep(useconds_t useconds)
{ {
/* XXX usleep(0) may yield but is not required to do so */ /*
* According to POSIX usleep(0) may yield but is not required to do so.
* We just return.
*/
if (!useconds) return 0; if (!useconds) return 0;
Libc::uint64_t const sleep_ms = (Libc::uint64_t)useconds/1000; Libc::uint64_t const sleep_ms = (Libc::uint64_t)useconds/1000;