Fix macOS versions for #ifdefs
Vladimir Kobal committed
Oct 13, 2017 at 16:51 UTC
28fe0f119e48ca7adf2323af3befa9327d4396aa
2 files changed
+12
-8
src/common.c
+5
-1
@@ -1119,10 +1119,14 @@ pid_t gettid(void) {
1119
#ifdef __FreeBSD__
1120
return (pid_t)pthread_getthreadid_np();
1121
#elif defined(__APPLE__)
1122
+#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
1123
uint64_t curthreadid;
1124
pthread_threadid_np(NULL, &curthreadid);
1125
return (pid_t)curthreadid;
1125
-#else
1126
+#else /* __MAC_OS_X_VERSION_MIN_REQUIRED */
1127
+ return (pid_t)pthread_self;
1128
+#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED */
1129
+#else /* __APPLE__*/
1130
return (pid_t)syscall(SYS_gettid);
1131
#endif /* __FreeBSD__, __APPLE__*/
1132
}
src/macos_mach_smi.c
+7
-7
@@ -25,7 +25,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
25
natural_t cp_time[CPU_STATE_MAX];
26
27
// NEEDED BY: do_ram, do_swapio, do_pgfaults
28
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED > 1050)
28
+#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
29
vm_statistics64_data_t vm_statistics;
30
#else
31
vm_statistics_data_t vm_statistics;
@@ -77,7 +77,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
77
// --------------------------------------------------------------------
78
79
if (likely(do_ram || do_swapio || do_pgfaults)) {
80
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED > 1050)
80
+#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
81
count = sizeof(vm_statistics64_data_t);
82
kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_statistics, &count);
83
#else
@@ -101,7 +101,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
101
102
rrddim_add(st, "active", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
103
rrddim_add(st, "wired", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
104
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
104
+#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
105
rrddim_add(st, "throttled", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
106
rrddim_add(st, "compressor", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
107
#endif
@@ -114,7 +114,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
114
115
rrddim_set(st, "active", vm_statistics.active_count);
116
rrddim_set(st, "wired", vm_statistics.wire_count);
117
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
117
+#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
118
rrddim_set(st, "throttled", vm_statistics.throttled_count);
119
rrddim_set(st, "compressor", vm_statistics.compressor_page_count);
120
#endif
@@ -125,7 +125,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
125
rrdset_done(st);
126
}
127
128
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
128
+#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
129
// --------------------------------------------------------------------
130
131
if (likely(do_swapio)) {
@@ -158,7 +158,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
158
rrddim_add(st, "cow", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
159
rrddim_add(st, "pagein", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
160
rrddim_add(st, "pageout", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
161
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
161
+#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
162
rrddim_add(st, "compress", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
163
rrddim_add(st, "decompress", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
164
#endif
@@ -172,7 +172,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
172
rrddim_set(st, "cow", vm_statistics.cow_faults);
173
rrddim_set(st, "pagein", vm_statistics.pageins);
174
rrddim_set(st, "pageout", vm_statistics.pageouts);
175
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
175
+#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
176
rrddim_set(st, "compress", vm_statistics.compressions);
177
rrddim_set(st, "decompress", vm_statistics.decompressions);
178
#endif