Changes in libfdproto/fifo.c [1067:23989d6c8390:1073:f8cffccb8f29] in freeDiameter

File:

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

libfdproto/fifo.c

@@ -152 +152 @@
                 for (li = queue->list.next; li != &queue->list; li = li->next) {
                         struct fifo_item * fi = (struct fifo_item *)li;
-                        fd_log_debug("  [%i] item %p in fifo %p, posted:ld.%06ld", 
+                        fd_log_debug("  [%i] item %p in fifo %p, posted:%ld.%06ld", 
                                 i++, fi->item.o, queue, (long)fi->posted_on.tv_sec,(long)(fi->posted_on.tv_nsec/1000));
                         (*dump_item)(level, fi->item.o);
@@ -284 +284 @@
 }
 
-/* Get the length of the queue */
-int fd_fifo_length ( struct fifo * queue, int * length, int * max )
-{
-        TRACE_ENTRY( "%p %p %p", queue, length, max );
+/* Get the information on the queue */
+int fd_fifo_getstats( struct fifo * queue, int * current_count, int * limit_count, int * highest_count, long long * total_count, 
+                                           struct timespec * total, struct timespec * blocking, struct timespec * last)
+{
+        TRACE_ENTRY( "%p %p %p %p %p %p %p %p", queue, current_count, limit_count, highest_count, total_count, total, blocking, last);
         
         /* Check the parameters */
-        CHECK_PARAMS( CHECK_FIFO( queue ) && length );
+        CHECK_PARAMS( CHECK_FIFO( queue ) );
         
         /* lock the queue */
         CHECK_POSIX(  pthread_mutex_lock( &queue->mtx )  );
         
-        /* Retrieve the count */
-        *length = queue->count;
-        
-        if (max)
-                *max = queue->max;
+        if (current_count)
+                *current_count = queue->count;
+        
+        if (limit_count)
+                *limit_count = queue->max;
+        
+        if (highest_count)
+                *highest_count = queue->highest_ever;
+        
+        if (total_count)
+                *total_count = queue->total_items;
+        
+        if (total)
+                memcpy(total, &queue->total_time, sizeof(struct timespec));
+        
+        if (blocking)
+                memcpy(blocking, &queue->blocking_time, sizeof(struct timespec));
+        
+        if (last)
+                memcpy(last, &queue->last_time, sizeof(struct timespec));
         
         /* Unlock */
@@ -308 +324 @@
 }
 
-/* Get the timings */
-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 */
-        CHECK_PARAMS( CHECK_FIFO( queue ) );
-        
-        /* lock the queue */
-        CHECK_POSIX(  pthread_mutex_lock( &queue->mtx )  );
-        
-        if (items)
-                *items = queue->total_items;
-        
-        if (total)
-                memcpy(total, &queue->total_time, sizeof(struct timespec));
-        
-        if (blocking)
-                memcpy(blocking, &queue->blocking_time, sizeof(struct timespec));
-        
-        if (last)
-                memcpy(last, &queue->last_time, sizeof(struct timespec));
-        
-        /* Unlock */
-        CHECK_POSIX(  pthread_mutex_unlock( &queue->mtx )  );
-        
-        /* Done */
-        return 0;
-}
-
 
 /* alternate version with no error checking */
-int fd_fifo_length_noerr ( struct fifo * queue )
+int fd_fifo_length ( struct fifo * queue )
 {
         if ( !CHECK_FIFO( queue ) )