svn commit: r252820 - stable/9/usr.sbin/bsnmpd/modules/snmp_hast

[Mikolaj Golub]

Author: trociny
Date: Fri Jul  5 18:46:35 2013
New Revision: 252820
URL: http://svnweb.freebsd.org/changeset/base/252820

Log:
  MFC r252516, r252540:
  
  Add a mib for worker process ID.

Modified:
  stable/9/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt
  stable/9/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
  stable/9/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
Directory Properties:
  stable/9/usr.sbin/bsnmpd/   (props changed)

Modified: stable/9/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt
==============================================================================
--- stable/9/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt	Fri Jul  5 18:44:41 2013	(r252819)
+++ stable/9/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt	Fri Jul  5 18:46:35 2013	(r252820)
@@ -57,6 +57,9 @@ begemotHast MODULE-IDENTITY
     REVISION     "201304130000Z"
     DESCRIPTION
 	    "Initial revision."
+    REVISION     "201307010000Z"
+    DESCRIPTION
+	    "Added hastResourceWorkerPid."
     ::= { begemot 220 }
 
 begemotHastObjects	OBJECT IDENTIFIER ::= { begemotHast 1 }
@@ -116,7 +119,8 @@ HastResourceEntry ::= SEQUENCE {
     hastResourceReadErrors		Counter64,
     hastResourceWriteErrors		Counter64,
     hastResourceDeleteErrors		Counter64,
-    hastResourceFlushErrors		Counter64
+    hastResourceFlushErrors		Counter64,
+    hastResourceWorkerPid		INTEGER
 }
 
 hastResourceIndex OBJECT-TYPE
@@ -295,4 +299,12 @@ hastResourceFlushErrors OBJECT-TYPE
 	"Count of resource local flush operations that failed."
     ::= { hastResourceEntry 21 }
 
+hastResourceWorkerPid OBJECT-TYPE
+    SYNTAX	INTEGER
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+	"Worker process ID."
+    ::= { hastResourceEntry 22 }
+
 END

Modified: stable/9/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
==============================================================================
--- stable/9/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c	Fri Jul  5 18:44:41 2013	(r252819)
+++ stable/9/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c	Fri Jul  5 18:46:35 2013	(r252820)
@@ -78,6 +78,7 @@ struct hast_snmp_resource {
 	uint64_t	write_errors;
 	uint64_t	delete_errors;
 	uint64_t	flush_errors;
+	pid_t		workerpid;
 };
 
 static TAILQ_HEAD(, hast_snmp_resource) resources =
@@ -343,6 +344,7 @@ update_resources(void)
 		    nv_get_uint64(nvout, "stat_delete_error%u", i);
 		res->flush_errors =
 		    nv_get_uint64(nvout, "stat_flush_error%u", i);
+		res->workerpid = nv_get_int32(nvout, "workerpid%u", i);
 		TAILQ_INSERT_TAIL(&resources, res, link);
 	}
 	nv_free(nvout);
@@ -498,6 +500,9 @@ op_hastResourceTable(struct snmp_context
 	case LEAF_hastResourceFlushErrors:
 		value->v.counter64 = res->flush_errors;
 		break;
+	case LEAF_hastResourceWorkerPid:
+		value->v.integer = res->workerpid;
+		break;
 	default:
 		ret = SNMP_ERR_RES_UNAVAIL;
 		break;

Modified: stable/9/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
==============================================================================
--- stable/9/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def	Fri Jul  5 18:44:41 2013	(r252819)
+++ stable/9/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def	Fri Jul  5 18:46:35 2013	(r252820)
@@ -59,6 +59,7 @@
                   (19 hastResourceWriteErrors COUNTER64 GET)
                   (20 hastResourceDeleteErrors COUNTER64 GET)
                   (21 hastResourceFlushErrors COUNTER64 GET)
+                  (22 hastResourceWorkerPid INTEGER GET)
                 )
               )
             )