From: Damjan Marion <damarion@cisco.com>
Date: Tue, 28 Mar 2017 13:11:20 +0000 (+0200)
Subject: vlib: inline dispatch_node(...) (again)
X-Git-Tag: v17.07-rc1~412
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9a332e1639fbfb4eb4ddf47b1681e05493ae6da3;p=vpp.git

vlib: inline dispatch_node(...) (again)

Worker main loop is now shared code with main thread
main loop so no need to export functions anymore.

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

diff --git a/src/vlib/main.c b/src/vlib/main.c
index 50f0b1626c0..55a731f16c6 100644
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -917,7 +917,7 @@ vlib_dump_context_trace (vlib_main_t * vm, u32 bi)
 }
 
 
-/* static_always_inline */ u64
+static_always_inline u64
 dispatch_node (vlib_main_t * vm,
 	       vlib_node_runtime_t * node,
 	       vlib_node_type_t type,
@@ -1093,7 +1093,7 @@ dispatch_node (vlib_main_t * vm,
   return t;
 }
 
-/* static */ u64
+static u64
 dispatch_pending_node (vlib_main_t * vm,
 		       vlib_pending_frame_t * p, u64 last_time_stamp)
 {
diff --git a/src/vlib/threads.h b/src/vlib/threads.h
index fc1633f610e..39f64e1dca0 100644
--- a/src/vlib/threads.h
+++ b/src/vlib/threads.h
@@ -162,15 +162,6 @@ int vlib_frame_queue_enqueue (vlib_main_t * vm, u32 node_runtime_index,
 int
 vlib_frame_queue_dequeue (vlib_main_t * vm, vlib_frame_queue_main_t * fqm);
 
-u64 dispatch_node (vlib_main_t * vm,
-		   vlib_node_runtime_t * node,
-		   vlib_node_type_t type,
-		   vlib_node_state_t dispatch_state,
-		   vlib_frame_t * frame, u64 last_time_stamp);
-
-u64 dispatch_pending_node (vlib_main_t * vm,
-			   vlib_pending_frame_t * p, u64 last_time_stamp);
-
 void vlib_worker_thread_node_runtime_update (void);
 
 void vlib_create_worker_threads (vlib_main_t * vm, int n,