Keep MySQL connection open as long as possible. Implement new OIDs.

* src/MYSQL-STAT-MIB.txt: New OIDs: processTotalCount,
processActiveCount, and processSlaveCount
* src/mysqlstat.c (mysqlstat_connect): Keep connection open.
(mysqlstat_disconnect): Remove.
(get_process_list, process_first, process_next): New functions.
Keep a cached list of processes and iterate through it.
All functions updated.
(process_total_count,process_active_count)
(process_slave_count): New functions.
* src/mysqlstat.h (process_total_count,process_active_count)
(process_slave_count): New protos.
* src/mysqlstat_mib.mib2c (handle_$i): Update.

1 files changed, 28 insertions, 99 deletions

diff --git a/src/MYSQL-STAT-MIB.txt b/src/MYSQL-STAT-MIB.txt
index 8fbc0e6..3c05db2 100644
--- a/src/MYSQL-STAT-MIB.txt
+++ b/src/MYSQL-STAT-MIB.txt
@@ -18,12 +18,12 @@ IMPORTS
 		FROM INET-ADDRESS-MIB;
 
 mysql MODULE-IDENTITY
-        LAST-UPDATED "201606061638Z"
+        LAST-UPDATED "201606070800Z"
 	ORGANIZATION "Gray Software"
 	CONTACT-INFO "Sergey Poznyakoff <gray@gnu.org>"
 	DESCRIPTION
 	        "This MIB module defines objects for MySQL statistics."
-	REVISION "201606061638Z"
+	REVISION "201606070800Z"
 	DESCRIPTION
 	        "First revision."
 	::= { enterprises 9163 101 }
@@ -461,102 +461,6 @@ replMasterSSLVerifyServerCert	OBJECT-TYPE
 	::= { replSlaveStatusEntry 38 }
 
 --
--- Table of Replication Slave Servers
---
-
--- replSlaveCount	OBJECT-TYPE
--- 	SYNTAX	Counter32
--- 	MAX-ACCESS read-only
--- 	STATUS  current
--- 	DESCRIPTION
--- 		"Number of active replication slaves."
--- 	::= { replSlave 1 }
-
--- replSlaveTable	OBJECT-TYPE
--- 	SYNTAX	SEQUENCE OF ReplSlaveEntry
--- 	MAX-ACCESS	not-accessible
--- 	STATUS		current
--- 	DESCRIPTION
--- 		"A table of active replication slaves."
--- 	::= { replSlave 2 }
-
--- replSlaveEntry	OBJECT-TYPE
--- 	SYNTAX	ReplSlaveEntry
--- 	MAX-ACCESS	not-accessible
--- 	STATUS		current
--- 	DESCRIPTION
--- 		"An entry (conceptual row) describing a replication
--- 	         slave server."
--- 	INDEX	{ replSlaveIndex }
--- 	::= { replSlaveTable 1 }
-
--- ReplSlaveEntry	::= SEQUENCE {
--- 	replSlaveIndex		Integer32,
--- 	replSlaveHost		DisplayString,
--- 	replSlaveUser		DisplayString,
--- 	replSlaveCommand	DisplayString,
--- 	replSlaveState		DisplayString,
--- 	replSlaveTime		TimeStamp,
--- 	replSlaveInfo		DisplayString
--- }
-
--- replSlaveIndex	OBJECT-TYPE
--- 	SYNTAX  Integer32 (0..65535)
--- 	MAX-ACCESS not-accessible
--- 	STATUS  current
--- 	DESCRIPTION
--- 		"A number uniquely identifying each slave server."
--- 	::= { replSlaveEntry 1 }
-
--- replSlaveHost	OBJECT-TYPE
--- 	SYNTAX	DisplayString
--- 	MAX-ACCESS	read-only
--- 	STATUS		current
--- 	DESCRIPTION
--- 		"Hostname of the server."
--- 	::= { replSlaveEntry 2 }
-
--- replSlaveUser	OBJECT-TYPE
--- 	SYNTAX	DisplayString
--- 	MAX-ACCESS	read-only
--- 	STATUS		current
--- 	DESCRIPTION
--- 		"User name used by that server."
--- 	::= { replSlaveEntry 3 }
-
--- replSlaveCommand	OBJECT-TYPE
--- 	SYNTAX	DisplayString
--- 	MAX-ACCESS	read-only
--- 	STATUS		current
--- 	DESCRIPTION
--- 		"Command being run."
--- 	::= { replSlaveEntry 4 }
-
--- replSlaveState	OBJECT-TYPE
--- 	SYNTAX	DisplayString
--- 	MAX-ACCESS	read-only
--- 	STATUS		current
--- 	DESCRIPTION
--- 		"State of the connection."
--- 	::= { replSlaveEntry 5 }
-
--- replSlaveTime	OBJECT-TYPE
--- 	SYNTAX		TimeStamp
--- 	MAX-ACCESS	read-only
--- 	STATUS		current
--- 	DESCRIPTION
--- 		"Timestamp of the last status change."
--- 	::= { replSlaveEntry 6 }
-
--- replSlaveInfo	OBJECT-TYPE
--- 	SYNTAX		DisplayString
--- 	MAX-ACCESS	read-only
--- 	STATUS		current
--- 	DESCRIPTION
--- 		"Additional info about the connection."
--- 	::= { replSlaveEntry 7 }
-
---
 -- Process List
 --
 
@@ -566,7 +470,7 @@ processListTable	OBJECT-TYPE
 	STATUS		current
 	DESCRIPTION
 		"A table of active threads."
-	::= { processList 2 }
+	::= { processList 1 }
 
 processListEntry	OBJECT-TYPE
 	SYNTAX	ProcessListEntry
@@ -660,6 +564,31 @@ processInfo	OBJECT-TYPE
  	DESCRIPTION
 		"Information about the process."
 	::= { processListEntry 9 }
+
+processTotalCount	OBJECT-TYPE
+	SYNTAX  Counter32
+	MAX-ACCESS read-only
+	STATUS  current
+	DESCRIPTION
+		"Total number of processes (threads)."
+	::= { processList 2 }
+
+processActiveCount	OBJECT-TYPE
+	SYNTAX  Counter32
+	MAX-ACCESS read-only
+	STATUS  current
+	DESCRIPTION
+		"Number of active processes (threads)."
+	::= { processList 3 }	
+
+processSlaveCount	OBJECT-TYPE
+	SYNTAX  Counter32
+	MAX-ACCESS read-only
+	STATUS  current
+	DESCRIPTION
+		"Number of replication slaves"
+	::= { processList 4 }
+	
 END
 
 -- Local variables: