Переглянути джерело

modules:ims_qos: separated stat aar_replies_received into media_aar_replies_received and registration_aar_replies_received

Richard Good 10 роки тому
батько
коміт
51578d8381

+ 2 - 1
modules/ims_qos/ims_qos_stats.c

@@ -66,6 +66,7 @@ counter_def_t ims_qos_cnt_defs[] = {
     {&ims_qos_cnts_h.asrs,				    "asrs",					0, 0, 0,	    "total number of registration ASRs"},
     {&ims_qos_cnts_h.asrs,				    "asrs",					0, 0, 0,	    "total number of registration ASRs"},
     {&ims_qos_cnts_h.successful_registration_aars,	    "successful_registration_aars",		0, 0, 0,	    "total number of successful registration AARs"},
     {&ims_qos_cnts_h.successful_registration_aars,	    "successful_registration_aars",		0, 0, 0,	    "total number of successful registration AARs"},
     {&ims_qos_cnts_h.registration_aar_response_time,	    "registration_aar_response_time",		0, 0, 0,	    "total number of seconds waiting for registration AAR responses"},
     {&ims_qos_cnts_h.registration_aar_response_time,	    "registration_aar_response_time",		0, 0, 0,	    "total number of seconds waiting for registration AAR responses"},
+    {&ims_qos_cnts_h.registration_aar_replies_received,	    "registration_aar_replies_received",	0, 0, 0,                    "total number of media AAR replies received"},
 
 
     {&ims_qos_cnts_h.active_media_rx_sessions,		    "active_media_rx_sessions",		0, 0, 0,		    "number of currently active media Rx sessions"},
     {&ims_qos_cnts_h.active_media_rx_sessions,		    "active_media_rx_sessions",		0, 0, 0,		    "number of currently active media Rx sessions"},
     {&ims_qos_cnts_h.media_aar_avg_response_time,	    "media_aar_avg_response_time",	0, ims_qos_internal_stats, (void*) (long) IMS_QOS_MEDIA_AAR_AVG_RSP,	"avg response time for media AARs"},
     {&ims_qos_cnts_h.media_aar_avg_response_time,	    "media_aar_avg_response_time",	0, ims_qos_internal_stats, (void*) (long) IMS_QOS_MEDIA_AAR_AVG_RSP,	"avg response time for media AARs"},
@@ -74,7 +75,7 @@ counter_def_t ims_qos_cnt_defs[] = {
     {&ims_qos_cnts_h.media_aars,			    "media_aars",			0, 0, 0,		    "total number of media AARs"},
     {&ims_qos_cnts_h.media_aars,			    "media_aars",			0, 0, 0,		    "total number of media AARs"},
     {&ims_qos_cnts_h.successful_media_aars,		    "successful_media_aars",		0, 0, 0,		    "total number of successful media AARs"},
     {&ims_qos_cnts_h.successful_media_aars,		    "successful_media_aars",		0, 0, 0,		    "total number of successful media AARs"},
     {&ims_qos_cnts_h.media_aar_response_time,		    "media_aar_response_time",		0, 0, 0,		    "total number of seconds waiting for media AAR responses"},
     {&ims_qos_cnts_h.media_aar_response_time,		    "media_aar_response_time",		0, 0, 0,		    "total number of seconds waiting for media AAR responses"},
-    {&ims_qos_cnts_h.aar_replies_received,		    "aar_replies_received",		0, 0, 0,                    "total number of AAR replies received"},
+    {&ims_qos_cnts_h.media_aar_replies_received,	    "media_aar_replies_received",	0, 0, 0,                    "total number of media AAR replies received"},
     {0, 0, 0, 0, 0, 0}
     {0, 0, 0, 0, 0, 0}
 };
 };
 
 

+ 2 - 1
modules/ims_qos/ims_qos_stats.h

@@ -26,7 +26,8 @@ struct ims_qos_counters_h {
     counter_handle_t media_aars;
     counter_handle_t media_aars;
     counter_handle_t successful_media_aars;
     counter_handle_t successful_media_aars;
     counter_handle_t active_media_rx_sessions;
     counter_handle_t active_media_rx_sessions;
-    counter_handle_t aar_replies_received;
+    counter_handle_t media_aar_replies_received;
+    counter_handle_t registration_aar_replies_received;
 };
 };
 
 
 int ims_qos_init_counters();
 int ims_qos_init_counters();

+ 2 - 2
modules/ims_qos/rx_aar.c

@@ -130,7 +130,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps
 
 
     counter_inc(ims_qos_cnts_h.media_aars);
     counter_inc(ims_qos_cnts_h.media_aars);
     counter_add(ims_qos_cnts_h.media_aar_response_time, elapsed_msecs);
     counter_add(ims_qos_cnts_h.media_aar_response_time, elapsed_msecs);
-    counter_inc(ims_qos_cnts_h.aar_replies_received);
+    counter_inc(ims_qos_cnts_h.media_aar_replies_received);
 
 
     /* Process the response to AAR, retrieving result code and associated Rx session ID */
     /* Process the response to AAR, retrieving result code and associated Rx session ID */
     if (rx_process_aaa(aaa, &cdp_result) < 0) {
     if (rx_process_aaa(aaa, &cdp_result) < 0) {
@@ -242,7 +242,7 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e
 
 
     counter_inc(ims_qos_cnts_h.registration_aars);
     counter_inc(ims_qos_cnts_h.registration_aars);
     counter_add(ims_qos_cnts_h.registration_aar_response_time, elapsed_msecs);
     counter_add(ims_qos_cnts_h.registration_aar_response_time, elapsed_msecs);
-    counter_inc(ims_qos_cnts_h.aar_replies_received);
+    counter_inc(ims_qos_cnts_h.registration_aar_replies_received);
 
 
     /* Process the response to AAR, retrieving result code and associated Rx session ID */
     /* Process the response to AAR, retrieving result code and associated Rx session ID */
     if (rx_process_aaa(aaa, &cdp_result) < 0) {
     if (rx_process_aaa(aaa, &cdp_result) < 0) {