From 16101f834064d73eff9d56010e3f4bbd3ae15bd2 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 20 Feb 2019 10:40:11 +0100
Subject: [PATCH] Add new objects to OBJECT-GROUP; use "self" instead of
 getpid()

---
 pdns/dnsdistdist/DNSDIST-MIB.txt   | 1 +
 pdns/misc.cc                       | 4 ++--
 pdns/recursordist/RECURSOR-MIB.txt | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pdns/dnsdistdist/DNSDIST-MIB.txt b/pdns/dnsdistdist/DNSDIST-MIB.txt
index f2c8b7e15c..4f1f0bc293 100644
--- a/pdns/dnsdistdist/DNSDIST-MIB.txt
+++ b/pdns/dnsdistdist/DNSDIST-MIB.txt
@@ -675,6 +675,7 @@ dnsdistGroup OBJECT-GROUP
         latencyAVG1000000,
         uptime,
         realMemoryUsage,
+        specialMemoryUsage,
         nonCompliantQueries,
         nonCompliantResponses,
         rdQueries,
diff --git a/pdns/misc.cc b/pdns/misc.cc
index 05191dd11c..b9863ed966 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -1241,7 +1241,7 @@ uint64_t getOpenFileDescriptors(const std::string&)
 uint64_t getRealMemoryUsage(const std::string&)
 {
 #ifdef __linux__
-  ifstream ifs("/proc/"+std::to_string(getpid())+"/statm");
+  ifstream ifs("/proc/self/statm");
   if(!ifs)
     return 0;
 
@@ -1261,7 +1261,7 @@ uint64_t getRealMemoryUsage(const std::string&)
 uint64_t getSpecialMemoryUsage(const std::string&)
 {
 #ifdef __linux__
-  ifstream ifs("/proc/"+std::to_string(getpid())+"/smaps");
+  ifstream ifs("/proc/self/smaps");
   if(!ifs)
     return 0;
   string line;
diff --git a/pdns/recursordist/RECURSOR-MIB.txt b/pdns/recursordist/RECURSOR-MIB.txt
index 625f8f4fc0..2af4621d08 100644
--- a/pdns/recursordist/RECURSOR-MIB.txt
+++ b/pdns/recursordist/RECURSOR-MIB.txt
@@ -935,6 +935,7 @@ recGroup OBJECT-GROUP
         noednsOutqueries,
         uptime,
         realMemoryUsage,
+        specialMemoryUsage,
         fdUsage,
         userMsec,
         sysMsec,
-- 
2.47.2