david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We don't actually use clock_gettime here. Which is fortunate, because its arrival in OSX 10.12 would pose a slightly tricky code target consistency question

Browse Source
This commit is contained in:
Chris Cannam
2018-02-02 09:12:07 +00:00
parent 63e59043b3
commit b68f500e2d
2 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/system/sysutils.cpp
View File

@@ -164,27 +164,6 @@ void gettimeofday(struct timeval *tv, void *tz)
tv->tv_sec = (long)((now.ns100 - 116444736000000000LL) / 10000000LL); tv->tv_sec = (long)((now.ns100 - 116444736000000000LL) / 10000000LL);
} }
void clock_gettime(int, struct timespec *ts)
{
static LARGE_INTEGER cps;
static bool haveCps = false;
if (!haveCps) {
QueryPerformanceFrequency(&cps);
haveCps = true;
}
LARGE_INTEGER counter;
QueryPerformanceCounter(&counter);
//!!! check this
ts->tv_sec = counter.QuadPart / cps.QuadPart;
double sub = counter.QuadPart % cps.QuadPart;
sub = sub / cps.QuadPart;
sub = sub * 1000000000.;
ts->tv_nsec = long(sub) ;
}
void usleep(unsigned long usec) void usleep(unsigned long usec)
{ {
::Sleep(usec == 0 ? 0 : usec < 1000 ? 1 : usec / 1000); ::Sleep(usec == 0 ? 0 : usec < 1000 ? 1 : usec / 1000);
@@ -192,20 +171,6 @@ void usleep(unsigned long usec)
#endif #endif
#ifdef __APPLE__
void clock_gettime(int, struct timespec *ts)
{
uint64_t t = mach_absolute_time();
static mach_timebase_info_data_t sTimebaseInfo;
if (sTimebaseInfo.denom == 0) (void)mach_timebase_info(&sTimebaseInfo);
uint64_t n = t * sTimebaseInfo.numer / sTimebaseInfo.denom;
ts->tv_sec = n / 1000000000;
ts->tv_nsec = n % 1000000000;
}
#endif
void system_specific_initialise() void system_specific_initialise()
{ {
#if defined HAVE_IPP #if defined HAVE_IPP

13
src/system/sysutils.h
View File

@@ -81,24 +81,11 @@ extern void system_specific_application_initialise();
enum ProcessStatus { ProcessRunning, ProcessNotRunning, UnknownProcessStatus }; enum ProcessStatus { ProcessRunning, ProcessNotRunning, UnknownProcessStatus };
extern ProcessStatus system_get_process_status(int pid); extern ProcessStatus system_get_process_status(int pid);
#ifdef __APPLE__
struct timespec { long tv_sec; long tv_nsec; };
void clock_gettime(int clk_id, struct timespec *p);
#define CLOCK_MONOTONIC 1
#define CLOCK_REALTIME 2
#endif
#ifdef _WIN32 #ifdef _WIN32
struct timeval { long tv_sec; long tv_usec; }; struct timeval { long tv_sec; long tv_usec; };
void gettimeofday(struct timeval *p, void *tz); void gettimeofday(struct timeval *p, void *tz);
struct timespec { long tv_sec; long tv_nsec; };
// always uses GetPerformanceCounter, does not check whether it's valid or not:
void clock_gettime(int clk_id, struct timespec *p);
#define CLOCK_MONOTONIC 1
#define CLOCK_REALTIME 2
#endif #endif
#ifdef __MSVC__ #ifdef __MSVC__