Changeset 481 for trunk/src/sh_fifo.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_fifo.c (modified) (8 diffs)

trunk/src/sh_fifo.c

@@ -180 +180 @@
               memset(getit->data, 0, len);
               if (NULL != sl_strstr (getit->data, _("LOGKEY")))
-                {
-                  MUNLOCK(getit->data, (len+1));
-                  ;
-                }
+                MUNLOCK(getit->data, (len+1));
               if (getit->s_xtra)
                 SH_FREE(getit->s_xtra);
@@ -197 +194 @@
 /* push an item on the head of the list
  */
-int push_list (SH_FIFO * fifo, char * indat, int in_i, const char * in_str)
+int push_list (SH_FIFO * fifo, const char * indat, int in_i, const char * in_str)
 {
   struct dlist * item;
@@ -224 +221 @@
   
   if (NULL != sl_strstr (indat, _("LOGKEY")))
-    {
-      MLOCK(item->data, (len+1));
-      ;
-    }
+    MLOCK(item->data, (len+1));
 
   sl_strlcpy (item->data, indat, len+1);
@@ -260 +254 @@
 /* push an item on the tail of the list
  */
-int push_tail_list (SH_FIFO * fifo, char * indat, int in_i, const char * in_str)
+int push_tail_list (SH_FIFO * fifo, const char * indat, int in_i, const char * in_str)
 {
   struct dlist * item;
@@ -287 +281 @@
 
   if (NULL != sl_strstr (indat, _("LOGKEY")))
-    {
-      MLOCK(item->data, (len+1));
-      ;
-    }
+    MLOCK(item->data, (len+1));
 
   sl_strlcpy (item->data, indat, len+1);
@@ -318 +309 @@
   ++(fifo->fifo_cts);
 
-  SL_RETURN((0), _("push_tail_list"));
+  SL_RETURN((fifo->fifo_cts), _("push_tail_list"));
 }
 
@@ -356 +347 @@
 
   if (NULL != sl_strstr (retval, _("LOGKEY")))
-    {
-      MUNLOCK(getit->data, (len+1));
-      ;
-    }
+    MUNLOCK(getit->data, (len+1));
 
   if (getit->s_xtra)
@@ -372 +360 @@
 
 
-
-
+#ifdef SH_CUTEST
+#include "CuTest.h"
+
+void Test_fifo (CuTest *tc) {
+
+  SH_FIFO ff;
+  int ret;
+  char * p;
+
+  fifo_init(&ff);
+
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrEquals(tc, NULL, p);
+
+  /* first sequence */
+  ret = sh_fifo_push(&ff, "one");
+  CuAssertIntEquals(tc,1,ret);
+  ret = sh_fifo_push(&ff, "two");
+  CuAssertIntEquals(tc,2,ret);
+  ret = sh_fifo_push(&ff, "three");
+  CuAssertIntEquals(tc,3,ret);
+
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"one", p);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"two", p);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"three", p);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrEquals(tc, NULL, p);
+
+  /* second sequence */
+  ret = sh_fifo_push(&ff, "one");
+  CuAssertIntEquals(tc,1,ret);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"one", p);
+  ret = sh_fifo_push_tail(&ff, "one");
+  CuAssertIntEquals(tc,1,ret);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"one", p);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrEquals(tc, NULL, p);
+
+  /* third sequence */
+  ret = sh_fifo_push(&ff, "one");
+  CuAssertIntEquals(tc,1,ret);
+  ret = sh_fifo_push(&ff, "two");
+  CuAssertIntEquals(tc,2,ret);
+  ret = sh_fifo_push(&ff, "three");
+  CuAssertIntEquals(tc,3,ret);
+
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"one", p);
+  ret = sh_fifo_push_tail(&ff, p);
+  CuAssertIntEquals(tc,3,ret);
+
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"one", p);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"two", p);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrNotNull(tc, p);
+  CuAssertStrEquals(tc,"three", p);
+  p = sh_fifo_pop(&ff);
+  CuAssertPtrEquals(tc, NULL, p);
+}
+
+#endif
+
+
+
+