Changeset 930:64d8ba7976d0 in freeDiameter

Timestamp:

Mar 3, 2013, 5:15:11 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Include client stats in non-benchmark mode in test_app

File:

• extensions/test_app/ta_cli.c (modified) (7 diffs)

extensions/test_app/ta_cli.c

@@ -59 +59 @@
         struct avp * avp;
         struct avp_hdr * hdr;
+        unsigned long dur;
+        int error = 0;
         
         CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &ts), return );
@@ -80 +82 @@
         if (avp) {
                 CHECK_FCT_DO( fd_msg_avp_hdr( avp, &hdr ), return );
-                fprintf(stderr, "%x (%s) ", hdr->avp_value->i32, (hdr->avp_value->i32 == mi->randval) ? "Ok" : "PROBLEM");
+                if (hdr->avp_value->i32 == mi->randval) {
+                        fprintf(stderr, "%x (%s) ", hdr->avp_value->i32, "Ok");
+                } else {
+                        fprintf(stderr, "%x (%s) ", hdr->avp_value->i32, "PROBLEM");
+                        error++;
+                }
         } else {
                 fprintf(stderr, "no_Test-AVP ");
+                error++;
         }
         
@@ -90 +98 @@
                 CHECK_FCT_DO( fd_msg_avp_hdr( avp, &hdr ), return );
                 fprintf(stderr, "Status: %d ", hdr->avp_value->i32);
+                if (hdr->avp_value->i32 != 2001)
+                        error++;
         } else {
                 fprintf(stderr, "no_Result-Code ");
+                error++;
         }
         
@@ -101 +112 @@
         } else {
                 fprintf(stderr, "no_Origin-Host ");
+                error++;
         }
         
@@ -110 +122 @@
         } else {
                 fprintf(stderr, "no_Origin-Realm ");
-        }
-        
-        /* Now compute how long it took */
+                error++;
+        }
+        
+        CHECK_POSIX_DO( pthread_mutex_lock(&ta_conf->stats_lock), );
+        dur = ((ts.tv_sec - mi->ts.tv_sec) * 1000000) + ((ts.tv_nsec - mi->ts.tv_nsec) / 1000);
+        if (ta_conf->stats.nb_recv) {
+                /* Ponderate in the avg */
+                ta_conf->stats.avg = (ta_conf->stats.avg * ta_conf->stats.nb_recv + dur) / (ta_conf->stats.nb_recv + 1);
+                /* Min, max */
+                if (dur < ta_conf->stats.shortest)
+                        ta_conf->stats.shortest = dur;
+                if (dur > ta_conf->stats.longest)
+                        ta_conf->stats.longest = dur;
+        } else {
+                ta_conf->stats.shortest = dur;
+                ta_conf->stats.longest = dur;
+                ta_conf->stats.avg = dur;
+        }
+        
+        if (error)
+                ta_conf->stats.nb_errs++;
+        else 
+                ta_conf->stats.nb_recv++;
+        
+        
+        CHECK_POSIX_DO( pthread_mutex_unlock(&ta_conf->stats_lock), );
+        
+        /* Display how long it took */
         if (ts.tv_nsec > mi->ts.tv_nsec) {
                 fprintf(stderr, "in %d.%06ld sec", 
@@ -122 +159 @@
                                 (long)(1000000000 + ts.tv_nsec - mi->ts.tv_nsec) / 1000);
         }
-        
         fprintf(stderr, "\n");
         fflush(stderr);
@@ -218 +254 @@
         CHECK_FCT_DO( fd_msg_send( &req, ta_cb_ans, svg ), goto out );
 
+        /* Increment the counter */
+        CHECK_POSIX_DO( pthread_mutex_lock(&ta_conf->stats_lock), );
+        ta_conf->stats.nb_sent++;
+        CHECK_POSIX_DO( pthread_mutex_unlock(&ta_conf->stats_lock), );
+
 out:
         return;