[Midnightbsd-cvs] src [11020] trunk/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3: sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jun 15 18:40:09 EDT 2018
Revision: 11020
http://svnweb.midnightbsd.org/src/?rev=11020
Author: laffer1
Date: 2018-06-15 18:40:09 -0400 (Fri, 15 Jun 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt
trunk/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
trunk/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
Property Changed:
----------------
trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt 2018-06-15 22:39:11 UTC (rev 11019)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt 2018-06-15 22:40:09 UTC (rev 11020)
@@ -23,8 +23,8 @@
-- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-- SUCH DAMAGE.
--
--- $FreeBSD$
---
+-- $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt 260412 2014-01-07 21:23:41Z trociny $
+-- $MidnightBSD$
BEGEMOT-HAST-MIB DEFINITIONS ::= BEGIN
@@ -57,6 +57,14 @@
REVISION "201304130000Z"
DESCRIPTION
"Initial revision."
+ REVISION "201307010000Z"
+ DESCRIPTION
+ "Added hastResourceWorkerPid."
+ REVISION "201312290000Z"
+ DESCRIPTION
+ "Added hastResourceLocalQueue, hastResourceSendQueue,
+ hastResourceRecvQueue, hastResourceDoneQueue,
+ hastResourceIdleQueue."
::= { begemot 220 }
begemotHastObjects OBJECT IDENTIFIER ::= { begemotHast 1 }
@@ -116,7 +124,13 @@
hastResourceReadErrors Counter64,
hastResourceWriteErrors Counter64,
hastResourceDeleteErrors Counter64,
- hastResourceFlushErrors Counter64
+ hastResourceFlushErrors Counter64,
+ hastResourceWorkerPid INTEGER,
+ hastResourceLocalQueue UNSIGNED32,
+ hastResourceSendQueue UNSIGNED32,
+ hastResourceRecvQueue UNSIGNED32,
+ hastResourceDoneQueue UNSIGNED32,
+ hastResourceIdleQueue UNSIGNED32
}
hastResourceIndex OBJECT-TYPE
@@ -295,4 +309,54 @@
"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 }
+
+hastResourceLocalQueue OBJECT-TYPE
+ SYNTAX UNSIGNED32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of outstanding I/O requests to the local component."
+ ::= { hastResourceEntry 23 }
+
+hastResourceSendQueue OBJECT-TYPE
+ SYNTAX UNSIGNED32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of outstanding I/O requests to send to the remote
+ component."
+ ::= { hastResourceEntry 24 }
+
+hastResourceRecvQueue OBJECT-TYPE
+ SYNTAX UNSIGNED32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of outstanding I/O requests waiting for response
+ from the remote component."
+ ::= { hastResourceEntry 25 }
+
+hastResourceDoneQueue OBJECT-TYPE
+ SYNTAX UNSIGNED32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of processed I/O requests to return to the kernel."
+ ::= { hastResourceEntry 26 }
+
+hastResourceIdleQueue OBJECT-TYPE
+ SYNTAX UNSIGNED32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of request objects in the free bucket."
+ ::= { hastResourceEntry 27 }
+
END
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_hast/Makefile 2018-06-15 22:39:11 UTC (rev 11019)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_hast/Makefile 2018-06-15 22:40:09 UTC (rev 11020)
@@ -1,9 +1,9 @@
# $MidnightBSD$
-# $FreeBSD: release/9.2.0/usr.sbin/bsnmpd/modules/snmp_hast/Makefile 251010 2013-05-26 18:54:05Z trociny $
+# $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_hast/Makefile 312055 2017-01-13 09:07:25Z ngie $
.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../../../sbin/hastd
+.PATH: ${SRCTOP}/sbin/hastd
MOD= hast
SRCS= ebuf.c
@@ -19,7 +19,7 @@
NO_WFORMAT=
NO_WCAST_ALIGN=
NO_WMISSING_VARIABLE_DECLARATIONS=
-CFLAGS+=-I${.CURDIR}/../../../../sbin/hastd
+CFLAGS+=-I${SRCTOP}/sbin/hastd
CFLAGS+=-DHAVE_CAPSICUM
CFLAGS+=-DINET
.if ${MK_INET6_SUPPORT} != "no"
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c 2018-06-15 22:39:11 UTC (rev 11019)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c 2018-06-15 22:40:09 UTC (rev 11020)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2013 Mikolaj Golub <trociny at FreeBSD.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c 260412 2014-01-07 21:23:41Z trociny $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -78,6 +79,12 @@
uint64_t write_errors;
uint64_t delete_errors;
uint64_t flush_errors;
+ pid_t workerpid;
+ uint32_t local_queue;
+ uint32_t send_queue;
+ uint32_t recv_queue;
+ uint32_t done_queue;
+ uint32_t idle_queue;
};
static TAILQ_HEAD(, hast_snmp_resource) resources =
@@ -343,6 +350,17 @@
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);
+ res->local_queue =
+ nv_get_uint64(nvout, "local_queue_size%u", i);
+ res->send_queue =
+ nv_get_uint64(nvout, "send_queue_size%u", i);
+ res->recv_queue =
+ nv_get_uint64(nvout, "recv_queue_size%u", i);
+ res->done_queue =
+ nv_get_uint64(nvout, "done_queue_size%u", i);
+ res->idle_queue =
+ nv_get_uint64(nvout, "idle_queue_size%u", i);
TAILQ_INSERT_TAIL(&resources, res, link);
}
nv_free(nvout);
@@ -498,6 +516,24 @@
case LEAF_hastResourceFlushErrors:
value->v.counter64 = res->flush_errors;
break;
+ case LEAF_hastResourceWorkerPid:
+ value->v.integer = res->workerpid;
+ break;
+ case LEAF_hastResourceLocalQueue:
+ value->v.uint32 = res->local_queue;
+ break;
+ case LEAF_hastResourceSendQueue:
+ value->v.uint32 = res->send_queue;
+ break;
+ case LEAF_hastResourceRecvQueue:
+ value->v.uint32 = res->recv_queue;
+ break;
+ case LEAF_hastResourceDoneQueue:
+ value->v.uint32 = res->done_queue;
+ break;
+ case LEAF_hastResourceIdleQueue:
+ value->v.uint32 = res->idle_queue;
+ break;
default:
ret = SNMP_ERR_RES_UNAVAIL;
break;
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def 2018-06-15 22:39:11 UTC (rev 11019)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def 2018-06-15 22:40:09 UTC (rev 11020)
@@ -23,8 +23,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
-#
+# $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def 260412 2014-01-07 21:23:41Z trociny $
+# $MidnightBSD$
(1 internet
(4 private
@@ -59,6 +59,12 @@
(19 hastResourceWriteErrors COUNTER64 GET)
(20 hastResourceDeleteErrors COUNTER64 GET)
(21 hastResourceFlushErrors COUNTER64 GET)
+ (22 hastResourceWorkerPid INTEGER GET)
+ (23 hastResourceLocalQueue UNSIGNED32 GET)
+ (24 hastResourceSendQueue UNSIGNED32 GET)
+ (25 hastResourceRecvQueue UNSIGNED32 GET)
+ (26 hastResourceDoneQueue UNSIGNED32 GET)
+ (27 hastResourceIdleQueue UNSIGNED32 GET)
)
)
)
Property changes on: trunk/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3 2018-06-15 22:39:11 UTC (rev 11019)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3 2018-06-15 22:40:09 UTC (rev 11020)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"-
.\" Copyright (c) 2013 Mikolaj Golub <trociny at FreeBSD.org>
.\" All rights reserved.
@@ -23,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3 267214 2014-06-07 19:12:43Z brueffer $
.\"
-.Dd May 9, 2013
+.Dd May 31, 2014
.Dt SNMP_HAST 3
.Os
.Sh NAME
@@ -40,11 +41,12 @@
module implements a private BEGEMOT-HAST-MIB, which allows
management of HAST resources.
.Pp
-The module uses
+The module uses the
.Xr hastd 8
control socket to communicate with the daemon.
+The
.Va hastConfigFile
-variable can be used to specify the location of
+variable can be used to specify the location of the
.Xr hast.conf 5
file to find the address of the control connection.
.Sh FILES
@@ -62,8 +64,8 @@
.Sh SEE ALSO
.Xr bsnmpd 1 ,
.Xr gensnmptree 1 ,
+.Xr snmpmod 3 ,
.Xr hastctl 8 ,
-.Xr hastd 8 ,
-.Xr snmpmod 3
+.Xr hastd 8
.Sh AUTHORS
.An Mikolaj Golub Aq trociny at FreeBSD.org
More information about the Midnightbsd-cvs
mailing list