[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] engine/core/pub server_info.h,1.16,1.17
From:       dcollins () helixcommunity ! org
Date:       2009-11-20 20:55:59
Message-ID: 200911202208.nAKM821o025425 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/engine/core/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv9748/pub

Modified Files:
	server_info.h 
Log Message:
Synopsis
========
SNMP-related updates for HTTP/1.1

Branches: HEAD
Reviewer: Jamie


Description
===========

This updates server's SNMP support based on the HTTP/1.1 spec.
I added HTTP-related items (HTTPPersistentCount, HTTPSecureCount,
CloakedClientCount, and Last10SecondsNewHTTPClients).  I also added
RTMPClientCount.

Since I was adding Last10SecondsNewHTTPClients via SNMP it made sense
to also add the pre-existing more general Last10SecondsNewClients counter.

I added queries for the new ports as well: HTTPSPort, SecureAdminPort,
and RTMPPort.  Since I was in there, I added queries for several
pre-existing ports which were not in the MIB:  ChannelControlPort,
PlaylistControlPort and FileSystemControlPort.

I also removed some lingering references to PNA in both the MIB and 
the SNMP plugin source.

(Note, the RTMPClientCount variable is not actually in use yet.)


Files Affected
==============

server_rn/snmp/snmpplin/helixserver.my
server_rn/snmp/snmpplin/regkeys.h
server_rn/snmp/snmpplin/rssnmppln.cpp
server/engine/core/server_info.cpp
server/engine/core/pub/server_info.h


Testing Performed
=================

Unit Tests:
- N/A

Integration Tests:
- Used net-snmp to verify the various values were available via SNMP.

Leak Tests:
- N/A

Performance Tests:
- N/A

Platforms Tested: linux-rhel5-i686
Build verified: linux-rhel5-i686


QA Hints
========
* N/A


Index: server_info.h
===================================================================
RCS file: /cvsroot/server/engine/core/pub/server_info.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- server_info.h	18 Nov 2009 17:56:44 -0000	1.16
+++ server_info.h	20 Nov 2009 20:55:56 -0000	1.17
@@ -228,6 +228,7 @@
         SCHEDULER_ITEMS_10SECS,
         SCHEDULER_ITEMS_WITH_MUTEX_10SECS,
         TOTAL_CAS,
+        NEW_HTTP_CLIENTS_10SECS,
 	MAX_FIELDS
     };
 
@@ -260,6 +261,8 @@
     UINT32              m_ulNewClients;
     UINT32              m_ulLastNewClients;
     UINT32              m_ulLeavingClients;
+    UINT32              m_ulNewHTTPClients;
+    UINT32              m_ulLastNewHTTPClients;
 
 #if XXXAAKTESTRTSP
     UINT32		m_ulOptionsMsg;
@@ -458,6 +461,8 @@
 {
     pProc->pc->registry->ModifyInt(m_RegID[HTTP_CLNT_COUNT], 1,
                                    &m_HTTPClientCount, pProc);
+    HXAtomicIncUINT32(&m_ulNewHTTPClients);
+    HXAtomicIncUINT32(&m_ulNewClients);
 }
 
 inline void
@@ -465,6 +470,7 @@
 {
     pProc->pc->registry->ModifyInt(m_RegID[HTTP_CLNT_COUNT], -1,
                                    &m_HTTPClientCount, pProc);
+    HXAtomicIncUINT32(&m_ulLeavingClients);
 }
 
 inline void
@@ -520,6 +526,7 @@
 {
     pProc->pc->registry->ModifyInt(m_RegID[CLOAKED_COUNT], 1,
                                    &m_CloakedClientCount, pProc);
+    HXAtomicIncUINT32(&m_ulNewHTTPClients);
 }
 
 inline void


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]