vlib: remove unused code

Type: refactor
Change-Id: Ia5f670541dd43a4f6d731dda84b2d898195643fc
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index 499a626..b02271b 100644 (file)
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -377,127 +377,6 @@ vl_msg_api_handler_no_free (void *v)
 {
 }
 
-/* Turned off, save as reference material... */
-#if 0
-static inline int
-vlib_frame_queue_dequeue_internal (int thread_id,
-                                  vlib_main_t * vm, vlib_node_main_t * nm)
-{
-  vlib_frame_queue_t *fq = vlib_frame_queues[thread_id];
-  vlib_frame_queue_elt_t *elt;
-  vlib_frame_t *f;
-  vlib_pending_frame_t *p;
-  vlib_node_runtime_t *r;
-  u32 node_runtime_index;
-  int msg_type;
-  u64 before;
-  int processed = 0;
-
-  ASSERT (vm == vlib_mains[thread_id]);
-
-  while (1)
-    {
-      if (fq->head == fq->tail)
-       return processed;
-
-      elt = fq->elts + ((fq->head + 1) & (fq->nelts - 1));
-
-      if (!elt->valid)
-       return processed;
-
-      before = clib_cpu_time_now ();
-
-      f = elt->frame;
-      node_runtime_index = elt->node_runtime_index;
-      msg_type = elt->msg_type;
-
-      switch (msg_type)
-       {
-       case VLIB_FRAME_QUEUE_ELT_FREE_BUFFERS:
-         vlib_buffer_free (vm, vlib_frame_vector_args (f), f->n_vectors);
-         /* note fallthrough... */
-       case VLIB_FRAME_QUEUE_ELT_FREE_FRAME:
-         r = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL],
-                               node_runtime_index);
-         vlib_frame_free (vm, r, f);
-         break;
-       case VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME:
-         vec_add2 (vm->node_main.pending_frames, p, 1);
-         f->flags |= (VLIB_FRAME_PENDING | VLIB_FRAME_FREE_AFTER_DISPATCH);
-         p->node_runtime_index = elt->node_runtime_index;
-         p->frame_index = vlib_frame_index (vm, f);
-         p->next_frame_index = VLIB_PENDING_FRAME_NO_NEXT_FRAME;
-         fq->dequeue_vectors += (u64) f->n_vectors;
-         break;
-       case VLIB_FRAME_QUEUE_ELT_API_MSG:
-         vl_msg_api_handler_no_free (f);
-         break;
-       default:
-         clib_warning ("bogus frame queue message, type %d", msg_type);
-         break;
-       }
-      elt->valid = 0;
-      fq->dequeues++;
-      fq->dequeue_ticks += clib_cpu_time_now () - before;
-      CLIB_MEMORY_BARRIER ();
-      fq->head++;
-      processed++;
-    }
-  ASSERT (0);
-  return processed;
-}
-
-int
-vlib_frame_queue_dequeue (int thread_id,
-                         vlib_main_t * vm, vlib_node_main_t * nm)
-{
-  return vlib_frame_queue_dequeue_internal (thread_id, vm, nm);
-}
-
-int
-vlib_frame_queue_enqueue (vlib_main_t * vm, u32 node_runtime_index,
-                         u32 frame_queue_index, vlib_frame_t * frame,
-                         vlib_frame_queue_msg_type_t type)
-{
-  vlib_frame_queue_t *fq = vlib_frame_queues[frame_queue_index];
-  vlib_frame_queue_elt_t *elt;
-  u32 save_count;
-  u64 new_tail;
-  u64 before = clib_cpu_time_now ();
-
-  ASSERT (fq);
-
-  new_tail = clib_atomic_add_fetch (&fq->tail, 1);
-
-  /* Wait until a ring slot is available */
-  while (new_tail >= fq->head + fq->nelts)
-    {
-      f64 b4 = vlib_time_now_ticks (vm, before);
-      vlib_worker_thread_barrier_check (vm, b4);
-      /* Bad idea. Dequeue -> enqueue -> dequeue -> trouble */
-      // vlib_frame_queue_dequeue (vm->thread_index, vm, nm);
-    }
-
-  elt = fq->elts + (new_tail & (fq->nelts - 1));
-
-  /* this would be very bad... */
-  while (elt->valid)
-    {
-    }
-
-  /* Once we enqueue the frame, frame->n_vectors is owned elsewhere... */
-  save_count = frame->n_vectors;
-
-  elt->frame = frame;
-  elt->node_runtime_index = node_runtime_index;
-  elt->msg_type = type;
-  CLIB_MEMORY_BARRIER ();
-  elt->valid = 1;
-
-  return save_count;
-}
-#endif /* 0 */
-
 /* To be called by vlib worker threads upon startup */
 void
 vlib_worker_thread_init (vlib_worker_thread_t * w)

diff --git a/src/vlib/threads.h b/src/vlib/threads.h
index 9d9d387..2dfb535 100644 (file)
--- a/src/vlib/threads.h
+++ b/src/vlib/threads.h
@@ -120,17 +120,11 @@ typedef struct
   /* enqueue side */
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   volatile u64 tail;
-  u64 enqueues;
-  u64 enqueue_ticks;
-  u64 enqueue_vectors;
   u32 enqueue_full_events;
 
   /* dequeue side */
     CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
   volatile u64 head;
-  u64 dequeues;
-  u64 dequeue_ticks;
-  u64 dequeue_vectors;
   u64 trace;
   u64 vector_threshold;