Session layer refactoring

Major refactoring of the session layer api
- Add attatch api for application binding to the the session layer
- Simplify listen/connect calls
- Update application CLI
- Add transport endpoint to accept callback
- Associate segment manager to application and allow for multiple
  binds/connects per app

Additional:
- svm fifo cleanup
- add fifo free, format fns
- add fifo offset enqueue unit test

Change-Id: Id93a65047de61afc2bf3d58c9b544339c02065af
Signed-off-by: Florin Coras <fcoras@cisco.com>
Signed-off-by: Dave Barach <dave@barachs.net>

3 files changed, 60 insertions, 52 deletions

diff --git a/src/svm/svm_fifo.c b/src/svm/svm_fifo.c
index cc84feb9..097bab77 100644
--- a/src/svm/svm_fifo.c
+++ b/src/svm/svm_fifo.c
@@ -20,8 +20,6 @@ svm_fifo_t *
 svm_fifo_create (u32 data_size_in_bytes)
 {
   svm_fifo_t *f;
-  pthread_mutexattr_t attr;
-  pthread_condattr_t cattr;
 
   f = clib_mem_alloc_aligned_or_null (sizeof (*f) + data_size_in_bytes,
 				      CLIB_CACHE_LINE_BYTES);
@@ -32,29 +30,16 @@ svm_fifo_create (u32 data_size_in_bytes)
   f->nitems = data_size_in_bytes;
   f->ooos_list_head = OOO_SEGMENT_INVALID_INDEX;
 
-  memset (&attr, 0, sizeof (attr));
-  memset (&cattr, 0, sizeof (cattr));
-
-  if (pthread_mutexattr_init (&attr))
-    clib_unix_warning ("mutexattr_init");
-  if (pthread_mutexattr_setpshared (&attr, PTHREAD_PROCESS_SHARED))
-    clib_unix_warning ("pthread_mutexattr_setpshared");
-  if (pthread_mutex_init (&f->mutex, &attr))
-    clib_unix_warning ("mutex_init");
-  if (pthread_mutexattr_destroy (&attr))
-    clib_unix_warning ("mutexattr_destroy");
-  if (pthread_condattr_init (&cattr))
-    clib_unix_warning ("condattr_init");
-  if (pthread_condattr_setpshared (&cattr, PTHREAD_PROCESS_SHARED))
-    clib_unix_warning ("condattr_setpshared");
-  if (pthread_cond_init (&f->condvar, &cattr))
-    clib_unix_warning ("cond_init1");
-  if (pthread_condattr_destroy (&cattr))
-    clib_unix_warning ("cond_init2");
-
   return (f);
 }
 
+void
+svm_fifo_free (svm_fifo_t * f)
+{
+  pool_free (f->ooo_segments);
+  clib_mem_free (f);
+}
+
 always_inline ooo_segment_t *
 ooo_segment_new (svm_fifo_t * f, u32 start, u32 length)
 {
@@ -567,6 +552,43 @@ svm_fifo_dequeue_drop (svm_fifo_t * f, int pid, u32 max_bytes)
   return total_drop_bytes;
 }
 
+u8 *
+format_svm_fifo (u8 * s, va_list * args)
+{
+  svm_fifo_t *f = va_arg (*args, svm_fifo_t *);
+  int verbose = va_arg (*args, int);
+
+  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);
+
+  if (verbose > 1)
+    s = format
+      (s, "server session %d thread %d client session %d thread %d\n",
+       f->server_session_index, f->server_thread_index,
+       f->client_session_index, f->client_thread_index);
+
+  if (verbose)
+    {
+      ooo_segment_t *seg;
+      u32 seg_index;
+
+      s =
+	format (s, "ooo pool %d active elts\n", pool_elts (f->ooo_segments));
+
+      seg_index = f->ooos_list_head;
+
+      while (seg_index != OOO_SEGMENT_INVALID_INDEX)
+	{
+	  seg = pool_elt_at_index (f->ooo_segments, seg_index);
+	  s = format (s, "  pos %u, len %u next %d\n",
+		      seg->fifo_position, seg->length, seg->next);
+	  seg_index = seg->next;
+	}
+    }
+  return s;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *
diff --git a/src/svm/svm_fifo.h b/src/svm/svm_fifo.h
index 80e5b0f2..9beb63f5 100644
--- a/src/svm/svm_fifo.h
+++ b/src/svm/svm_fifo.h
@@ -48,10 +48,6 @@ typedef struct
   u32 nitems;
     CLIB_CACHE_LINE_ALIGN_MARK (end_cursize);
 
-  pthread_mutex_t mutex;	/* 8 bytes */
-  pthread_cond_t condvar;	/* 8 bytes */
-  svm_lock_tag_t tag;
-
   volatile u8 has_event;	/**< non-zero if deq event exists */
   u32 owner_pid;
 
@@ -60,6 +56,7 @@ typedef struct
   u32 client_session_index;
   u8 server_thread_index;
   u8 client_thread_index;
+  u32 segment_manager;
     CLIB_CACHE_LINE_ALIGN_MARK (end_shared);
   u32 head;
     CLIB_CACHE_LINE_ALIGN_MARK (end_consumer);
@@ -74,30 +71,6 @@ typedef struct
     CLIB_CACHE_LINE_ALIGN_MARK (data);
 } svm_fifo_t;
 
-static inline int
-svm_fifo_lock (svm_fifo_t * f, u32 pid, u32 tag, int nowait)
-{
-  if (PREDICT_TRUE (nowait == 0))
-    pthread_mutex_lock (&f->mutex);
-  else
-    {
-      if (pthread_mutex_trylock (&f->mutex))
-	return -1;
-    }
-  f->owner_pid = pid;
-  f->tag = tag;
-  return 0;
-}
-
-static inline void
-svm_fifo_unlock (svm_fifo_t * f)
-{
-  f->owner_pid = 0;
-  f->tag = 0;
-  CLIB_MEMORY_BARRIER ();
-  pthread_mutex_unlock (&f->mutex);
-}
-
 static inline u32
 svm_fifo_max_dequeue (svm_fifo_t * f)
 {
@@ -139,6 +112,7 @@ svm_fifo_unset_event (svm_fifo_t * f)
 }
 
 svm_fifo_t *svm_fifo_create (u32 data_size_in_bytes);
+void svm_fifo_free (svm_fifo_t * f);
 
 int svm_fifo_enqueue_nowait (svm_fifo_t * f, int pid, u32 max_bytes,
 			     u8 * copy_from_here);
@@ -154,6 +128,8 @@ int svm_fifo_peek (svm_fifo_t * f, int pid, u32 offset, u32 max_bytes,
 		   u8 * copy_here);
 int svm_fifo_dequeue_drop (svm_fifo_t * f, int pid, u32 max_bytes);
 
+format_function_t format_svm_fifo;
+
 always_inline ooo_segment_t *
 svm_fifo_newest_ooo_segment (svm_fifo_t * f)
 {
diff --git a/src/svm/svm_fifo_segment.h b/src/svm/svm_fifo_segment.h
index ecb5653a..9ab47a4c 100644
--- a/src/svm/svm_fifo_segment.h
+++ b/src/svm/svm_fifo_segment.h
@@ -55,6 +55,18 @@ svm_fifo_get_segment (u32 segment_index)
   return vec_elt_at_index (ssm->segments, segment_index);
 }
 
+static inline u8
+svm_fifo_segment_has_fifos (svm_fifo_segment_private_t * fifo_segment)
+{
+  return vec_len ((svm_fifo_t **) fifo_segment->h->fifos) != 0;
+}
+
+static inline svm_fifo_t **
+svm_fifo_segment_get_fifos (svm_fifo_segment_private_t * fifo_segment)
+{
+  return (svm_fifo_t **) fifo_segment->h->fifos;
+}
+
 #define foreach_ssvm_fifo_segment_api_error             \
 _(OUT_OF_SPACE, "Out of space in segment", -200)
 
@@ -73,9 +85,7 @@ svm_fifo_t *svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * s,
 					 u32 data_size_in_bytes);
 void svm_fifo_segment_free_fifo (svm_fifo_segment_private_t * s,
 				 svm_fifo_t * f);
-
 void svm_fifo_segment_init (u64 baseva, u32 timeout_in_seconds);
-
 u32 svm_fifo_segment_index (svm_fifo_segment_private_t * s);
 
 #endif /* __included_ssvm_fifo_segment_h__ */