aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2021-06-29 00:26:53 +0200
committerTor Egge <Tor.Egge@online.no>2021-06-29 00:26:53 +0200
commitbeca2e37ede72f55a72c2739e92adcfe9f6eb76a (patch)
tree903efa92a24e53341e25cde6744154e058984fc0 /searchcore
parent9b7582100d7752185dd94a1dceea5b625c26044c (diff)
mallinfo() is deprecated in glibc 2.33.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp5
1 files changed, 5 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);