Changeset 1071:6ca6cadf209c in freeDiameter for tests/testfifo.c

Timestamp:

May 2, 2013, 12:22:31 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Implement the fd_stat_getstats function; changed prototype of fd_fifo_length.

File:

• tests/testfifo.c (modified) (7 diffs)

tests/testfifo.c

@@ -217 +217 @@
         {
                 struct fifo * queue = NULL;
-                int count, max;
                 struct msg * msg  = NULL;
+                int max;
+                long long count;
                 
                 /* Create the queue */
@@ -224 +225 @@
                 
                 /* Check the count is 0 */
-                CHECK( 0, fd_fifo_length(queue, &count, &max) );
-                CHECK( 0, count);
-                CHECK( 0, max);
+                CHECK( 0, fd_fifo_length(queue) );
                 
                 /* Now enqueue */
@@ -237 +236 @@
                 
                 /* Check the count is 3 */
-                CHECK( 0, fd_fifo_length(queue, &count, &max) );
-                CHECK( 3, count);
-                CHECK( 0, max);
+                CHECK( 3, fd_fifo_length(queue) );
                 
                 /* Retrieve the first message using fd_fifo_get */
                 CHECK( 0, fd_fifo_get(queue, &msg) );
                 CHECK( msg1, msg);
-                CHECK( 0, fd_fifo_length(queue, &count, NULL) );
-                CHECK( 2, count);
+                CHECK( 2, fd_fifo_length(queue) );
                 
                 /* Retrieve the second message using fd_fifo_timedget */
@@ -252 +248 @@
                 CHECK( 0, fd_fifo_timedget(queue, &msg, &ts) );
                 CHECK( msg2, msg);
-                CHECK( 0, fd_fifo_length(queue, &count, NULL) );
-                CHECK( 1, count);
+                CHECK( 1, fd_fifo_length(queue) );
                 
                 /* Retrieve the third message using meq_tryget */
                 CHECK( 0, fd_fifo_tryget(queue, &msg) );
                 CHECK( msg3, msg);
-                CHECK( 0, fd_fifo_length(queue, &count, NULL) );
-                CHECK( 0, count);
+                CHECK( 0, fd_fifo_length(queue) );
                 
                 /* Check that another meq_tryget does not block */
                 CHECK( EWOULDBLOCK, fd_fifo_tryget(queue, &msg) );
-                CHECK( 0, fd_fifo_length(queue, &count, NULL) );
-                CHECK( 0, count);
+                CHECK( 0, fd_fifo_length(queue) );
                 
                 /* Check the timedget actually timesout */
@@ -274 +267 @@
                 }
                 CHECK( ETIMEDOUT, fd_fifo_timedget(queue, &msg, &ts) );
-                CHECK( 0, fd_fifo_length(queue, &count, NULL) );
-                CHECK( 0, count);
+                CHECK( 0, fd_fifo_length(queue) );
+                
+                /* Post & get another message */
+                msg = msg1;
+                CHECK( 0, fd_fifo_post(queue, &msg) );
+                CHECK( 0, fd_fifo_timedget(queue, &msg, &ts) );
+                CHECK( msg1, msg);              
+                
+                /* Check some statistics */
+                CHECK( 0, fd_fifo_getstats(queue, NULL, NULL, &max, &count, NULL, NULL, NULL) );
+                CHECK( 3, max );
+                CHECK( 4, count );      
                 
                 /* We're done for basic tests */
@@ -292 +295 @@
                 pthread_t                thr [NBR_THREADS * 2];
                 struct dict_object      *dwr_model = NULL;
-                int                      count;
                 int                      i;
                 int                      nbr_threads;
@@ -363 +365 @@
                 
                 /* Check the count of the queue is back to 0 */
-                CHECK( 0, fd_fifo_length(queue, &count, NULL) );
-                CHECK( 0, count);
+                CHECK( 0, fd_fifo_length(queue) );
                 
                 /* Destroy this queue and the messages */