Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put back setitimer based code for the have-nots: (OS/X Lion)

This commit is contained in:
christos 2011-12-19 21:59:46 +00:00
parent e48fd3a0e7
commit 84b663d32f
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
external/bsd/atf/dist/atf-run/timer.cpp vendored
View File

@ -44,11 +44,25 @@ namespace impl = atf::atf_run;
// Auxiliary functions. // Auxiliary functions.
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#ifdef SIGEV_NONE
#define HAVE_POSIX_TIMER
#endif
#ifndef HAVE_POSIX_TIMER
static void *handle;
#endif
static static
void void
handler(int signo, siginfo_t *si, void *uc) handler(int signo, siginfo_t *si, void *uc)
{ {
impl::timer *timer = static_cast<impl::timer *>(si->si_value.sival_ptr); impl::timer *timer = static_cast<impl::timer *>(
#ifndef HAVE_POSIX_TIMER
handle
#else
si->si_value.sival_ptr
#endif
);
timer->setfired(); timer->setfired();
timer->timeout_callback(); timer->timeout_callback();
@ -68,7 +82,7 @@ impl::timer::timer(const unsigned int seconds) : m_fired(false)
throw system_error(IMPL_NAME "::timer::timer", throw system_error(IMPL_NAME "::timer::timer",
"Failed to set signal handler", errno); "Failed to set signal handler", errno);
#ifndef HAVE_POSIX_TIMER
::sigevent se; ::sigevent se;
se.sigev_notify = SIGEV_SIGNAL; se.sigev_notify = SIGEV_SIGNAL;
se.sigev_signo = SIGALRM; se.sigev_signo = SIGALRM;
@ -92,11 +106,32 @@ impl::timer::timer(const unsigned int seconds) : m_fired(false)
throw system_error(IMPL_NAME "::timer::timer", throw system_error(IMPL_NAME "::timer::timer",
"Failed to program timer", errno); "Failed to program timer", errno);
} }
#else
::itimerval it, oit;
it.it_interval.tv_sec = 0;
it.it_interval.tv_usec = 0;
it.it_value.tv_sec = seconds;
it.it_value.tv_usec = 0;
if (::setitimer(ITIMER_REAL, &it, &oit) == -1)
::sigaction(SIGALRM, &m_old_sa, NULL);
throw system_error(IMPL_NAME "::timer::timer",
"Failed to program timer", errno);
}
TIMEVAL_TO_TIMESPEC(&m_old_it, &oit);
handle = static_cast<void *>(this);
#endif
} }
impl::timer::~timer(void) impl::timer::~timer(void)
{ {
int ret = ::timer_delete(m_timer); int ret;
#ifdef HAVE_POSIX_TIMER
::itimerval oit;
TIMESPEC_TO_TIMEVAL(&oit, &m_old_it);
ret = ::setitimer(ITIMER_REAL, &oit, NULL);
#else
ret = ::timer_delete(m_timer);
#endif
INV(ret != -1); INV(ret != -1);
ret = ::sigaction(SIGALRM, &m_old_sa, NULL); ret = ::sigaction(SIGALRM, &m_old_sa, NULL);
INV(ret != -1); INV(ret != -1);