Fix crash in barrier sync when vlib_worker_threads is zero

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

diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index 4368a74..e2f7d26 100644 (file)
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -1380,7 +1380,7 @@ vlib_worker_thread_fork_fixup (vlib_fork_fixup_t which)
 #endif
 
 void
-vlib_worker_thread_barrier_sync_int (vlib_main_t * vm)
+vlib_worker_thread_barrier_sync_int (vlib_main_t * vm, const char *func_name)
 {
   f64 deadline;
   f64 now;
@@ -1394,6 +1394,7 @@ vlib_worker_thread_barrier_sync_int (vlib_main_t * vm)
 
   ASSERT (vlib_get_thread_index () == 0);
 
+  vlib_worker_threads[0].barrier_caller = func_name;
   count = vec_len (vlib_mains) - 1;
 
   /* Record entry relative to last close */

diff --git a/src/vlib/threads.h b/src/vlib/threads.h
index 95fcf3d..5a295e0 100644 (file)
--- a/src/vlib/threads.h
+++ b/src/vlib/threads.h
@@ -201,9 +201,10 @@ u32 vlib_frame_queue_main_init (u32 node_index, u32 frame_queue_nelts);
 #define BARRIER_SYNC_TIMEOUT (1.0)
 #endif
 
-#define vlib_worker_thread_barrier_sync(X) {vlib_worker_threads[0].barrier_caller=__FUNCTION__;vlib_worker_thread_barrier_sync_int(X);}
+#define vlib_worker_thread_barrier_sync(X) {vlib_worker_thread_barrier_sync_int(X, __FUNCTION__);}
 
-void vlib_worker_thread_barrier_sync_int (vlib_main_t * vm);
+void vlib_worker_thread_barrier_sync_int (vlib_main_t * vm,
+                                         const char *func_name);
 void vlib_worker_thread_barrier_release (vlib_main_t * vm);
 void vlib_worker_thread_node_refork (void);