ham-ref/flrig
1
0
Fork 0
mirror of https://git.code.sf.net/p/fldigi/flrig synced 2026-08-13 17:28:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

clockid_t

Browse source 
* remove all references to clock_gettime
This commit is contained in:
David Freese 2020-07-12 05:57:04 -05:00
parent 63b1e96d32
commit 7f6c96aa30
2 changed files with 0 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/include/timeops.h
View file

@ -30,50 +30,6 @@
# include <pthread.h>
#endif
#ifdef __APPLE__
# if __DARWIN_C_LEVEL < 199309L
# if!HAVE_CLOCK_GETTIME
// enum clockid_t { CLOCK_REALTIME, CLOCK_MONOTONIC };
# ifndef __clockid_t_defined
typedef int clockid_t;
#define __clockid_t_defined 1
# endif /* __clockid_t_defined */
# ifndef CLOCK_REALTIME
# define CLOCK_REALTIME 0
# endif
# ifndef CLOCK_MONOTONIC
# define CLOCK_MONOTONIC 1
# endif
int clock_gettime(clockid_t clock_id, struct timespec* tp);
# endif /* !HAVE_CLOCK_GETTIME */
# endif /* __DARWIN_C_LEVEL */
#else
# if !HAVE_CLOCK_GETTIME
// enum clockid_t { CLOCK_REALTIME, CLOCK_MONOTONIC };
# ifndef __clockid_t_defined
typedef int clockid_t;
#define __clockid_t_defined 1
# endif /* __clockid_t_defined */
# ifndef CLOCK_REALTIME
# define CLOCK_REALTIME 0
# endif
# ifndef CLOCK_MONOTONIC
# define CLOCK_MONOTONIC 1
# endif
int clock_gettime(clockid_t clock_id, struct timespec* tp);
# endif /* !HAVE_CLOCK_GETTIME */
#endif /* __APPLE__ */
struct timespec operator+(const struct timespec &t0, const double &t);
struct timespec operator-(const struct timespec &t0, const struct timespec &t1);
struct timespec& operator-=(struct timespec &t0, const struct timespec &t1);

42
src/support/timeops.cxx
View file

@ -31,48 +31,6 @@
# include "util.h"
#endif
#if !HAVE_CLOCK_GETTIME
# ifdef __APPLE__
# include <mach/mach_time.h>
# define CLOCK_REALTIME 0
# define CLOCK_MONOTONIC 6
# endif
# if TIME_WITH_SYS_TIME
# include <sys/time.h>
# endif
# include <errno.h>
int clock_gettime(clock_id_t clock_id, struct timespec* tp)
{
if (clock_id == CLOCK_REALTIME) {
struct timeval t;
if (unlikely(gettimeofday(&t, NULL) != 0))
return -1;
tp->tv_sec = t.tv_sec;
tp->tv_nsec = t.tv_usec * 1000;
}
else if (clock_id == CLOCK_MONOTONIC) {
#if defined(__WOE32__)
int msec = GetTickCount();
tp->tv_sec = msec / 1000;
tp->tv_nsec = (msec % 1000) * 1000000;
#elif defined(__APPLE__)
static mach_timebase_info_data_t info = { 0, 0 };
if (unlikely(info.denom == 0))
mach_timebase_info(&info);
uint64_t t = mach_absolute_time() * info.numer / info.denom;
tp->tv_sec = t / 1000000000;
tp->tv_nsec = t % 1000000000;
#endif
}
else {
errno = EINVAL;
return -1;
}
return 0;
}
#endif // !HAVE_CLOCK_GETTIME
struct timespec operator+(const struct timespec &t0, const double &t)
{
struct timespec r;