ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-07 11:50:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: construct 'Timeout' object on-demand for pthreads

Browse Source 
Fixes #2502
This commit is contained in:
Christian Prochaska 2017-08-20 17:23:22 +02:00 committed by Christian Helmuth
parent f5afd28d1f
commit 2e62d2d4be
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
repos/libports/src/lib/libc/task.cc
View File

@ -267,13 +267,28 @@ struct Libc::Pthreads
Genode::Lock lock { Genode::Lock::LOCKED }; Genode::Lock lock { Genode::Lock::LOCKED };
Pthread *next { nullptr }; Pthread *next { nullptr };
Timeout _timeout; Timer_accessor &_timer_accessor;
Constructible<Timeout> _timeout;
void _construct_timeout_once()
{
if (!_timeout.constructed())
_timeout.construct(_timer_accessor, *this);
}
Pthread(Timer_accessor &timer_accessor, unsigned long timeout_ms) Pthread(Timer_accessor &timer_accessor, unsigned long timeout_ms)
: _timeout(timer_accessor, *this) : _timer_accessor(timer_accessor)
{ {
if (timeout_ms > 0) if (timeout_ms > 0) {
_timeout.start(timeout_ms); _construct_timeout_once();
_timeout->start(timeout_ms);
}
}
unsigned long duration_left()
{
_construct_timeout_once();
return _timeout->duration_left();
} }
void handle_timeout() override void handle_timeout() override
@ -323,7 +338,7 @@ struct Libc::Pthreads
} }
} }
return timeout_ms > 0 ? myself._timeout.duration_left() : 0; return timeout_ms > 0 ? myself.duration_left() : 0;
} }
}; };