Remove jailResidentSize which was inaccurate

5 files changed, 2 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 259cb6f..8205d3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 0.7
  - Use new allocated OID from begemot
+ - Remove innaccurate jailResidentSize
 
 0.6
  - Use allocated OID from begemot
diff --git a/doc/JAILS-MIB.txt b/doc/JAILS-MIB.txt
index 0b07843..26eb92f 100644
--- a/doc/JAILS-MIB.txt
+++ b/doc/JAILS-MIB.txt
@@ -75,8 +75,7 @@ JailEntry ::=
 	jailThreads Integer32,
 	jailCpuTime TimeTicks,
 	jailDiskSpace Counter64,
-	jailDiskFiles Counter64,
-	jailResidentSize Counter64
+	jailDiskFiles Counter64
     }
 
 jailIndex OBJECT-TYPE
@@ -156,12 +155,4 @@ jailDiskFiles OBJECT-TYPE
     DESCRIPTION "Number of files (inodes) in this jail. Zero means unknown."
     ::= { jailEntry 31 }
 
-jailResidentSize OBJECT-TYPE
-    SYNTAX Counter64
-    MAX-ACCESS read-only
-    STATUS current
-    DESCRIPTION "The sum of the resident set size (RSS) of all processes in jail. An inaccurate representation of memory usage of the jail."
-    ::= { jailEntry 40 }
-
-
 END
diff --git a/doc/bsnmp-jails.8 b/doc/bsnmp-jails.8
index ac3a4e1..0faea63 100644
--- a/doc/bsnmp-jails.8
+++ b/doc/bsnmp-jails.8
@@ -84,8 +84,6 @@ The amount of CPU time (in SNMP time ticks) the jail has used.
 Amount of disk space taken by this jail. Zero means unknown.
 .It Ar jails.jailTable.jailEntry.jailDiskFiles.X
 Number of files (inodes) in this jail. Zero means unknown.
-.It Ar jails.jailTable.jailEntry.jailResidentSize.X
-The sum of the resident set size (RSS) of all processes in jail. In bytes. An inaccurate representation of memory usage of the jail.
 .It Ar jails.jailNetworkFilter
 A tcpdump style filter for the network traffic. Only matched traffic
 is counted in the jail statistics.
diff --git a/module/bsnmp-jails.c b/module/bsnmp-jails.c
index 075ee50..31b3848 100644
--- a/module/bsnmp-jails.c
+++ b/module/bsnmp-jails.c
@@ -169,7 +169,6 @@ struct jaildat {
 	uint32_t		cpu_time_offset;
 	uint32_t                n_processes;
 	uint32_t		n_threads;
-	uint64_t		rss_memory;
 
 	/* Top process information */
 	uint32_t		n_ptops;
@@ -911,7 +910,6 @@ process_refresh_all (void)
 
 		jail->n_processes = 0;
 		jail->n_threads = 0;
-		jail->rss_memory = 0;
 		jail->cpu_time_total = jail->cpu_time_offset;
 	}
 
@@ -930,7 +928,6 @@ process_refresh_all (void)
 
 		jail->n_processes += 1;
 		jail->n_threads += kp[i].ki_numthreads;
-		jail->rss_memory += (kp[i].ki_rssize * pagesize);
 
 
 		/* Find the top level process within jail to account to */
@@ -1462,9 +1459,6 @@ op_jailentry (struct snmp_context *ctx, struct snmp_value *value,
 	case LEAF_jailDiskFiles:
 		value->v.counter64 = jail->disk_files;
 		return SNMP_ERR_NOERROR;
-	case LEAF_jailResidentSize:
-		value->v.counter64 = jail->rss_memory;
-		return SNMP_ERR_NOERROR;
 	default:
 		ASSERT (0);
 		return SNMP_ERR_NOSUCHNAME;
diff --git a/module/jails-tree.def b/module/jails-tree.def
index c89e07f..8cb8a25 100644
--- a/module/jails-tree.def
+++ b/module/jails-tree.def
@@ -58,8 +58,6 @@
 		
                 (30 jailDiskSpace COUNTER64 GET)
                 (31 jailDiskFiles COUNTER64 GET)
-
-                (40 jailResidentSize COUNTER64 GET)
               )
             )