peak sessions step 1

diff --git a/src/include/private/switch_core_pvt.h b/src/include/private/switch_core_pvt.h
index 2b9cf628e739c98943af763d4e488c58d75cc92c..dd83e7052d2dbbd232ae171152c3818aa0aaac49 100644 (file)
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@@ -242,6 +242,8 @@ struct switch_runtime {
        int32_t sps_last;
        int32_t sps_peak;
        int32_t sps_peak_fivemin;
+       int32_t sessions_peak;
+       int32_t sessions_peak_fivemin;
        switch_log_level_t hard_log_level;
        char *mailer_app;
        char *mailer_app_args;

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 3554d213c090da28f8f143234570ed6875497da6..a847006e094a055a39fc42f21d22effae27d54bf 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -1889,7 +1889,9 @@ typedef enum {
        SCSC_API_EXPANSION,
        SCSC_RECOVER,
        SCSC_SPS_PEAK,
-       SCSC_SPS_PEAK_FIVEMIN
+       SCSC_SPS_PEAK_FIVEMIN,
+       SCSC_SESSIONS_PEAK,
+       SCSC_SESSIONS_PEAK_FIVEMIN
 } switch_session_ctl_t;
 
 typedef enum {

diff --git a/src/mod/event_handlers/mod_snmp/FREESWITCH-MIB b/src/mod/event_handlers/mod_snmp/FREESWITCH-MIB
index 6b5aeace950390c9d7f6f4113c6b88ffc1a0ee13..82fdf4bbed41c22f035c0d47a2942c5b3121b201 100644 (file)
--- a/src/mod/event_handlers/mod_snmp/FREESWITCH-MIB
+++ b/src/mod/event_handlers/mod_snmp/FREESWITCH-MIB
@@ -149,7 +149,7 @@ peakSessionsPerSecond OBJECT-TYPE
         "Peak sessions per second"
     ::= { systemStats 8 }
 
-peakSessionsPerSecond OBJECT-TYPE
+peakSessionsPerSecondFiveMin OBJECT-TYPE
     SYNTAX      Gauge32
     MAX-ACCESS  read-only
     STATUS      current
@@ -157,6 +157,21 @@ peakSessionsPerSecond OBJECT-TYPE
         "Peak sessions per second last 5 minutes"
     ::= { systemStats 9 }
 
+peakSessions OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Peak sessions"
+    ::= { systemStats 10 }
+
+peakSessionsFiveMin OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Peak sessions last 5 minutes"
+    ::= { systemStats 11 }
 
 ChannelEntry ::= SEQUENCE {
     chanIndex           Integer32,

diff --git a/src/mod/event_handlers/mod_snmp/subagent.c b/src/mod/event_handlers/mod_snmp/subagent.c
index f9bd4610d65671f7b8402191bb8dac26d57d7776..e5921b7381a081dabd4c8a90633aa545e35d7f29 100644 (file)
--- a/src/mod/event_handlers/mod_snmp/subagent.c
+++ b/src/mod/event_handlers/mod_snmp/subagent.c
@@ -158,7 +158,7 @@ void init_subagent(switch_memory_pool_t *pool)
        DEBUGMSGTL(("init_subagent", "mod_snmp subagent initializing\n"));
 
        netsnmp_register_scalar_group(netsnmp_create_handler_registration("identity", handle_identity, identity_oid, OID_LENGTH(identity_oid), HANDLER_CAN_RONLY), 1, 2);
-       netsnmp_register_scalar_group(netsnmp_create_handler_registration("systemStats", handle_systemStats, systemStats_oid, OID_LENGTH(systemStats_oid), HANDLER_CAN_RONLY), 1, 9);
+       netsnmp_register_scalar_group(netsnmp_create_handler_registration("systemStats", handle_systemStats, systemStats_oid, OID_LENGTH(systemStats_oid), HANDLER_CAN_RONLY), 1, 11);
 
        ch_table_info = switch_core_alloc(pool, sizeof(netsnmp_table_registration_info));
        netsnmp_table_helper_add_indexes(ch_table_info, ASN_INTEGER, 0);
@@ -266,6 +266,14 @@ int handle_systemStats(netsnmp_mib_handler *handler, netsnmp_handler_registratio
                        switch_core_session_ctl(SCSC_SPS_PEAK_FIVEMIN, &int_val);
                        snmp_set_var_typed_integer(requests->requestvb, ASN_GAUGE, int_val);
                        break;
+               case SS_PEAK_SESSIONS:
+                       switch_core_session_ctl(SCSC_SESSIONS_PEAK, &int_val);
+                       snmp_set_var_typed_integer(requests->requestvb, ASN_GAUGE, int_val);
+                       break;
+               case SS_PEAK_SESSIONS_FIVEMIN:
+                       switch_core_session_ctl(SCSC_SESSIONS_PEAK_FIVEMIN, &int_val);
+                       snmp_set_var_typed_integer(requests->requestvb, ASN_GAUGE, int_val);
+                       break;
                default:
                        snmp_log(LOG_WARNING, "Unregistered OID-suffix requested (%d)\n", (int) subid);
                        netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHOBJECT);

diff --git a/src/mod/event_handlers/mod_snmp/subagent.h b/src/mod/event_handlers/mod_snmp/subagent.h
index 2cf5d3f964840272cb0fcb251f8fcf777446f56a..2b7974fd86667dee3bc3edcefeab375fb41a95a6 100644 (file)
--- a/src/mod/event_handlers/mod_snmp/subagent.h
+++ b/src/mod/event_handlers/mod_snmp/subagent.h
@@ -48,6 +48,8 @@
 #define SS_MAX_SESSIONS_PER_SECOND     7
 #define SS_PEAK_SESSIONS_PER_SECOND    8
 #define SS_PEAK_SESSIONS_PER_FIVEMIN   9
+#define SS_PEAK_SESSIONS               10
+#define SS_PEAK_SESSIONS_FIVEMIN       11
 
 /* .1.3.6.1.4.1.27880.1.9 */
 #define CH_INDEX                       1

diff --git a/src/switch_core.c b/src/switch_core.c
index 5964fa3019b4e0c235665ed047ca1afc2506abd9..b2dc5dc2ab2456b0944267bd79c77ba970fb9e56 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -91,6 +91,8 @@ static void send_heartbeat(void)
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Per-Sec-Max", "%u", runtime.sps_peak);
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Per-Sec-FiveMin", "%u", runtime.sps_peak_fivemin);
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Since-Startup", "%" SWITCH_SIZE_T_FMT, switch_core_session_id() - 1);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Peak-Max", "%u", runtime.sessions_peak);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Peak-FiveMin", "%u", runtime.sessions_peak_fivemin);
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Idle-CPU", "%f", switch_core_idle_cpu());
                switch_event_fire(&event);
        }
@@ -2488,6 +2490,12 @@ SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, void *
        case SCSC_SPS_PEAK_FIVEMIN:
                newintval = runtime.sps_peak_fivemin;
                break;
+       case SCSC_SESSIONS_PEAK:
+               newintval = runtime.sessions_peak;
+               break;
+       case SCSC_SESSIONS_PEAK_FIVEMIN:
+               newintval = runtime.sessions_peak_fivemin;
+               break;
        case SCSC_MAX_DTMF_DURATION:
                newintval = switch_core_max_dtmf_duration(oldintval);
                break;

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index 90dbac3f5f56ddb731eadf94f72602500000a3de..20409396324d19b2c57d76cc7ba8120a81b7e934 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -2300,6 +2300,14 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(switch_
        switch_core_hash_insert(session_manager.session_table, session->uuid_str, session);
        session->id = session_manager.session_id++;
        session_manager.session_count++;
+
+       if (session_manager.session_count > runtime.sessions_peak) {
+               runtime.sessions_peak = session_manager.session_count;
+       }
+       if (session_manager.session_count > runtime.sessions_peak_fivemin) {
+               runtime.sessions_peak_fivemin = session_manager.session_count;
+       }
+
        switch_mutex_unlock(runtime.session_hash_mutex);
 
        switch_channel_set_variable_printf(session->channel, "session_id", "%u", session->id);

diff --git a/src/switch_time.c b/src/switch_time.c
index d1c5926c8c8ba74dd1279c7bc99b5bf3a82be5a0..2a67a56b5e80f0eac583ee01dda84342d8b3cee2 100644 (file)
--- a/src/switch_time.c
+++ b/src/switch_time.c
@@ -1012,7 +1012,11 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
                        if (sps_interval_ticks >= 300) {
                                runtime.sps_peak_fivemin = 0;
                                sps_interval_ticks = 0;
+                               switch_mutex_lock(runtime.session_hash_mutex);
+                               runtime.sessions_peak_fivemin = session_manager.session_count;
+                               switch_mutex_unlock(runtime.session_hash_mutex);
                        }
+
                        sps_interval_ticks++;
                        
                        if (runtime.sps_last > runtime.sps_peak_fivemin) {