Changeset 1067:23989d6c8390 in freeDiameter for libfdproto

Timestamp:

Apr 30, 2013, 10:51:09 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Add total count in the statistics of the queues, thanks for the feedback :)

File:

• libfdproto/fifo.c (modified) (6 diffs)

libfdproto/fifo.c

@@ -71 +71 @@
         int             highest_ever; /* The max count value this queue has reached (for tweaking) */
         
+        long long       total_items;   /* Cumulated number of items that went through this fifo (excluding current count), always increasing. */
         struct timespec total_time;    /* Cumulated time all items spent in this queue, including blocking time (always growing, use deltas for monitoring) */
         struct timespec blocking_time; /* Cumulated time threads trying to post new items were blocked (queue full). */
@@ -140 +141 @@
                         queue->h_cb, queue->l_cb, queue->data,
                         queue->highest_ever);
-        fd_log_debug("   timings: total:%ld.%06ld, blocking:%ld.%06ld, last:%ld.%06ld",
-                        (long)queue->total_time.tv_sec,(long)(queue->total_time.tv_nsec/1000),
+        fd_log_debug("   stats: total:%lld in %ld.%06ld, blocking:%ld.%06ld, last:%ld.%06ld",
+                        queue->total_items,
+                        (long)queue->total_time.tv_sec,(long)(queue->total_time.tv_nsec/1000), 
                         (long)queue->blocking_time.tv_sec,(long)(queue->blocking_time.tv_nsec/1000),
                         (long)queue->last_time.tv_sec,(long)(queue->last_time.tv_nsec/1000) );
@@ -259 +261 @@
         old->eyec = FIFO_EYEC;
         
+        /* Merge the stats in the new queue */
+        new->total_items += old->total_items;
+        old->total_items = 0;
+        
+        new->total_time.tv_nsec += old->total_time.tv_nsec;
+        new->total_time.tv_sec += old->total_time.tv_sec + (new->total_time.tv_nsec / 1000000000);
+        new->total_time.tv_nsec %= 1000000000;
+        old->total_time.tv_nsec = 0;
+        old->total_time.tv_sec = 0;
+        
+        new->blocking_time.tv_nsec += old->blocking_time.tv_nsec;
+        new->blocking_time.tv_sec += old->blocking_time.tv_sec + (new->blocking_time.tv_nsec / 1000000000);
+        new->blocking_time.tv_nsec %= 1000000000;
+        old->blocking_time.tv_nsec = 0;
+        old->blocking_time.tv_sec = 0;
+        
         /* Unlock, we're done */
         CHECK_POSIX(  pthread_mutex_unlock( &new->mtx )  );
@@ -291 +309 @@
 
 /* Get the timings */
-int fd_fifo_getstats( struct fifo * queue, struct timespec * total, struct timespec * blocking, struct timespec * last)
-{
-        TRACE_ENTRY( "%p %p %p %p", queue, total, blocking, last);
+int fd_fifo_getstats( struct fifo * queue, long long *items, struct timespec * total, struct timespec * blocking, struct timespec * last)
+{
+        TRACE_ENTRY( "%p %p %p %p %p", queue, items, total, blocking, last);
         
         /* Check the parameters */
@@ -300 +318 @@
         /* lock the queue */
         CHECK_POSIX(  pthread_mutex_lock( &queue->mtx )  );
+        
+        if (items)
+                *items = queue->total_items;
         
         if (total)
@@ -467 +488 @@
         fd_list_unlink(&fi->item);
         queue->count--;
+        queue->total_items++;
         ret = fi->item.o;