@cryptotaxi247 / netdata-1 / commits / 559231383

Replace OS conditional prctl.h include with file presence

Lennart Weller committed Feb 8, 2017 at 17:25 UTC 559231383489be9111e3f24800709f529d4cc6a6
4 files changed +9 -6
configure.ac
+1
@@ -143,6 +143,7 @@ AC_CHECK_SIZEOF([void *])
143 AC_CANONICAL_HOST
144 AC_HEADER_MAJOR
145 AC_HEADER_RESOLV
146 +AC_CHECK_HEADERS_ONCE([sys/prctl.h])
147
148 AC_CHECK_LIB([cap], [cap_get_proc, cap_set_proc],
149 [AC_CHECK_HEADER(
src/apps_plugin.c
+2
@@ -3109,7 +3109,9 @@ int main(int argc, char **argv) {
3109 struct rlimit rl = { RLIM_INFINITY, RLIM_INFINITY };
3110 if(setrlimit(RLIMIT_CORE, &rl) != 0)
3111 info("Cannot request unlimited core dumps for debugging... Proceeding anyway...");
3112 +#ifdef HAVE_SYS_PRCTL_H
3113 prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
3114 +#endif
3115 }
3116 #endif /* NETDATA_INTERNAL_CHECKS */
3117
src/common.h
+2 -2
@@ -67,9 +67,9 @@
67 #include <syslog.h>
68 #include <sys/mman.h>
69
70 -#if !(defined(__FreeBSD__) || defined(__APPLE__))
70 +#ifdef HAVE_SYS_PRCTL_H
71 #include <sys/prctl.h>
72 -#endif /* __FreeBSD__ || __APPLE__*/
72 +#endif
73
74 #include <sys/resource.h>
75 #include <sys/socket.h>
src/main.c
+4 -4
@@ -571,9 +571,9 @@ int main(int argc, char **argv)
571 if(setrlimit(RLIMIT_CORE, &rl) != 0)
572 error("Cannot request unlimited core dumps for debugging... Proceeding anyway...");
573
574 -#if !(defined(__FreeBSD__) || defined(__APPLE__))
574 +#ifdef HAVE_SYS_PRCTL_H
575 prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
576 -#endif /* __FreeBSD__ || __APPLE__*/
576 +#endif
577 }
578
579 // --------------------------------------------------------------------
@@ -748,9 +748,9 @@ int main(int argc, char **argv)
748 struct rlimit rl = { RLIM_INFINITY, RLIM_INFINITY };
749 if(setrlimit(RLIMIT_CORE, &rl) != 0)
750 error("Cannot request unlimited core dumps for debugging... Proceeding anyway...");
751 -#if !(defined(__FreeBSD__) || defined(__APPLE__))
751 +#ifdef HAVE_SYS_PRCTL_H
752 prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
753 -#endif /* __FreeBSD__ || __APPLE__*/
753 +#endif
754 }
755 #endif /* NETDATA_INTERNAL_CHECKS */
756