diff options
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/proton.cpp | 5 | ||||
| -rw-r--r-- | vespamalloc/src/tests/stacktrace/stacktrace.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index d8b5eccb788..7ab6b70cd6d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -764,7 +764,12 @@ Proton::updateMetrics(const metrics::MetricLockGuard &) metrics.resourceUsage.memoryMappings.set(usageFilter.getMemoryStats().getMappingsCount()); metrics.resourceUsage.openFileDescriptors.set(FastOS_File::count_open_files()); metrics.resourceUsage.feedingBlocked.set((usageFilter.acceptWriteOperation() ? 0.0 : 1.0)); +#pragma GCC diagnostic push +#if __GLIBC_PREREQ(2, 33) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif struct mallinfo mallocInfo = mallinfo(); +#pragma GCC diagnostic pop // Vespamalloc reports arena in 1M blocks as an 'int' is too small. // If we use something else than vespamalloc this must be changed. metrics.resourceUsage.mallocArena.set(uint64_t(mallocInfo.arena) * 1_Mi); diff --git a/vespamalloc/src/tests/stacktrace/stacktrace.cpp b/vespamalloc/src/tests/stacktrace/stacktrace.cpp index 0fd722e095a..f30e3c20f55 100644 --- a/vespamalloc/src/tests/stacktrace/stacktrace.cpp +++ b/vespamalloc/src/tests/stacktrace/stacktrace.cpp @@ -17,7 +17,12 @@ void * run(void * arg) } void verify_that_vespamalloc_datasegment_size_exists() { +#pragma GCC diagnostic push +#if __GNUC_PREREQ(2, 33) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif struct mallinfo info = mallinfo(); +#pragma GCC diagnostic push printf("Malloc used %dm of memory\n",info.arena); assert(info.arena >= 10); assert(info.arena < 10000); |