tcp: cleanup connection/session fixes

[vpp.git] / src / svm / svm_fifo.c

diff --git a/src/svm/svm_fifo.c b/src/svm/svm_fifo.c
index 3552192..47df225 100644 (file)
--- a/src/svm/svm_fifo.c
+++ b/src/svm/svm_fifo.c
@@ -174,7 +174,8 @@ format_svm_fifo (u8 * s, va_list * args)
 
   s = format (s, "cursize %u nitems %u has_event %d\n",
              f->cursize, f->nitems, f->has_event);
-  s = format (s, " head %d tail %d\n", f->head, f->tail);
+  s = format (s, " head %d tail %d segment manager %u\n", f->head, f->tail,
+             f->segment_manager);
 
   if (verbose > 1)
     s = format
@@ -622,14 +623,14 @@ void
 svm_fifo_overwrite_head (svm_fifo_t * f, u8 * data, u32 len)
 {
   u32 first_chunk;
+  first_chunk = f->nitems - f->head;
   ASSERT (len <= f->nitems);
-  if (len < f->nitems - f->head)
+  if (len <= first_chunk)
     clib_memcpy (&f->data[f->head], data, len);
   else
     {
-      first_chunk = len - (f->nitems - f->head);
       clib_memcpy (&f->data[f->head], data, first_chunk);
-      clib_memcpy (f->data, data + first_chunk, len - first_chunk);
+      clib_memcpy (&f->data[0], data + first_chunk, len - first_chunk);
     }
 }
 
@@ -827,6 +828,13 @@ svm_fifo_dequeue_drop (svm_fifo_t * f, u32 max_bytes)
   return total_drop_bytes;
 }
 
+void
+svm_fifo_dequeue_drop_all (svm_fifo_t * f)
+{
+  f->head = f->tail;
+  __sync_fetch_and_sub (&f->cursize, f->cursize);
+}
+
 u32
 svm_fifo_number_ooo_segments (svm_fifo_t * f)
 {