projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport: fd-tracker: log tracker capacity on creation
[lttng-tools.git]
/
src
/
common
/
compat
/
time.h
diff --git
a/src/common/compat/time.h
b/src/common/compat/time.h
index f51075dc39c3e35a3ebd13ad0fc9b61b0bb2a7e4..49f5039084a79083c63eab538d1486aeeedd594a 100644
(file)
--- a/
src/common/compat/time.h
+++ b/
src/common/compat/time.h
@@
-26,12
+26,23
@@
#include <time.h>
#ifdef __APPLE__
#include <time.h>
#ifdef __APPLE__
+
typedef uint64_t timer_t;
typedef uint64_t timer_t;
-typedef int clockid_t;
#include <mach/mach.h>
#include <mach/clock.h>
#include <mach/mach.h>
#include <mach/clock.h>
+#include <errno.h>
+
+#undef NSEC_PER_SEC
+#undef NSEC_PER_MSEC
+#undef NSEC_PER_USEC
+
+#endif /* __APPLE__ */
+
+/* macOS/OS X 10.12 (Sierra) and up provide clock_gettime() */
+#if defined(__APPLE__) && !defined(LTTNG_HAVE_CLOCK_GETTIME)
+typedef int clockid_t;
#define CLOCK_REALTIME CALENDAR_CLOCK
#define CLOCK_MONOTONIC SYSTEM_CLOCK
#define CLOCK_REALTIME CALENDAR_CLOCK
#define CLOCK_MONOTONIC SYSTEM_CLOCK
@@
-65,7
+76,7
@@
end:
return ret;
}
return ret;
}
-#else /* __APPLE__ */
+#else /* __APPLE__
&& !LTTNG_HAVE_CLOCK_GETTIME
*/
static inline
int lttng_clock_gettime(clockid_t clk_id, struct timespec *tp)
static inline
int lttng_clock_gettime(clockid_t clk_id, struct timespec *tp)
@@
-73,6
+84,6
@@
int lttng_clock_gettime(clockid_t clk_id, struct timespec *tp)
return clock_gettime(clk_id, tp);
}
return clock_gettime(clk_id, tp);
}
-#endif /* __APPLE__ */
+#endif /* __APPLE__
&& !LTTNG_HAVE_CLOCK_GETTIME
*/
#endif /* _COMPAT_TIME_H */
#endif /* _COMPAT_TIME_H */
This page took
0.024782 seconds
and
5
git commands to generate.