From: Florin Coras <fcoras@cisco.com>
Date: Thu, 9 May 2019 02:57:24 +0000 (-0700)
Subject: bapi: separate init shm reply from fd exchange
X-Git-Tag: v20.01-rc0~649
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F19441%2F3;p=vpp.git

bapi: separate init shm reply from fd exchange

Wait for init shm reply to be consumed before sending fd over the
socket.

Change-Id: I5cd0246d8debcc3c8a163b7e2dd400ca0050a2fb
Signed-off-by: Florin Coras <fcoras@cisco.com>
---

diff --git a/src/vlibmemory/socket_api.c b/src/vlibmemory/socket_api.c
index a8a45a7e6bc..f0c7f1feeb1 100644
--- a/src/vlibmemory/socket_api.c
+++ b/src/vlibmemory/socket_api.c
@@ -591,7 +591,7 @@ vl_api_sock_init_shm_t_handler (vl_api_sock_init_shm_t * mp)
   clib_file_t *cf;
   vl_api_shm_elem_config_t *config = 0;
   vl_shmem_hdr_t *shmem_hdr;
-  int rv;
+  int rv, tries = 1000;
 
   regp = vl_api_client_index_to_registration (mp->client_index);
   if (regp == 0)
@@ -671,6 +671,22 @@ reply:
 
   /* Send the magic "here's your sign (aka fd)" socket message */
   cf = vl_api_registration_file (regp);
+
+  /* Wait for reply to be consumed before sending the fd */
+  while (tries-- > 0)
+    {
+      int bytes;
+      rv = ioctl (cf->file_descriptor, TIOCOUTQ, &bytes);
+      if (rv < 0)
+	{
+	  clib_unix_warning ("ioctl returned");
+	  break;
+	}
+      if (bytes == 0)
+	break;
+      usleep (1e3);
+    }
+
   vl_sock_api_send_fd_msg (cf->file_descriptor, &memfd->fd, 1);
 }