vcl: reduce iperf tests output

[vpp.git] / src / vcl / vcl_bapi.c

diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c
index 7d24162..2300783 100644 (file)
--- a/src/vcl/vcl_bapi.c
+++ b/src/vcl/vcl_bapi.c
@@ -100,11 +100,6 @@ vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp)
                                fds[n_fds++]))
          goto failed;
 
-      vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0),
-                            mp->vpp_ctrl_mq, mp->vpp_ctrl_mq_thread,
-                            &wrk->ctrl_mq);
-      vcm->ctrl_mq = wrk->ctrl_mq;
-
       if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT)
        {
          segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name);
@@ -121,11 +116,18 @@ vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp)
 
       if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD)
        {
-         svm_msg_q_set_consumer_eventfd (wrk->app_event_queue, fds[n_fds]);
+         svm_msg_q_set_eventfd (wrk->app_event_queue, fds[n_fds]);
          vcl_mq_epoll_add_evfd (wrk, wrk->app_event_queue);
          n_fds++;
        }
 
+      vcl_segment_discover_mqs (vcl_vpp_worker_segment_handle (0), fds + n_fds,
+                               mp->n_fds - n_fds);
+      vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0),
+                            mp->vpp_ctrl_mq, mp->vpp_ctrl_mq_thread,
+                            &wrk->ctrl_mq);
+      vcm->ctrl_mq = wrk->ctrl_mq;
+
       vec_free (fds);
     }
   else
@@ -215,7 +217,7 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t *
 
       if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD)
        {
-         svm_msg_q_set_consumer_eventfd (wrk->app_event_queue, fds[n_fds]);
+         svm_msg_q_set_eventfd (wrk->app_event_queue, fds[n_fds]);
          vcl_mq_epoll_add_evfd (wrk, wrk->app_event_queue);
          n_fds++;
        }
@@ -493,6 +495,7 @@ vcl_bapi_connect_to_vpp (void)
   vcl_bapi_cleanup ();
 
   vlibapi_set_main (&wrk->bapi_api_ctx);
+  vlibapi_set_memory_client_main (&wrk->bapi_mem_ctx);
   vcl_bapi_hookup ();
 
   if (!vcl_cfg->vpp_bapi_socket_name)