X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fsocket_client.c;h=96330ce481ad4c55f747f51c0038867024cee121;hb=233e4681830bc2a9cd40deb4b5909b4e310d1a2a;hp=febb737ac2d51083fec939ecc5bf2c95218a162c;hpb=b7b929931a07fbb27b43d5cd105f366c3e29807e;p=vpp.git

diff --git a/src/vlibmemory/socket_client.c b/src/vlibmemory/socket_client.c
index febb737ac2d..96330ce481a 100644
--- a/src/vlibmemory/socket_client.c
+++ b/src/vlibmemory/socket_client.c
@@ -79,6 +79,9 @@ vl_socket_client_read (int wait)
 		    scm->socket_buffer_size);
 	  if (n < 0)
 	    {
+	      if (errno == EAGAIN)
+		continue;
+
 	      clib_unix_warning ("socket_read");
 	      return -1;
 	    }
@@ -103,8 +106,11 @@ vl_socket_client_read (int wait)
 	  n = read (scm->socket_fd,
 		    scm->socket_rx_buffer + vec_len (scm->socket_rx_buffer),
 		    msg_size - vec_len (scm->socket_rx_buffer));
-	  if (n < 0 && errno != EAGAIN)
+	  if (n < 0)
 	    {
+	      if (errno == EAGAIN)
+		continue;
+
 	      clib_unix_warning ("socket_read");
 	      return -1;
 	    }
@@ -246,7 +252,7 @@ vl_sock_api_recv_fd_msg (int socket_fd, int fds[], int n_fds, u32 wait)
 	    }
 	  else if (cmsg->cmsg_type == SCM_RIGHTS)
 	    {
-	      clib_memcpy (fds, CMSG_DATA (cmsg), sizeof (int) * n_fds);
+	      clib_memcpy_fast (fds, CMSG_DATA (cmsg), sizeof (int) * n_fds);
 	    }
 	}
       cmsg = CMSG_NXTHDR (&mh, cmsg);
@@ -298,8 +304,18 @@ static void vl_api_sock_init_shm_reply_t_handler
 
   new_name = format (0, "%v[shm]%c", scm->name, 0);
   vl_client_install_client_message_handlers ();
-  vl_client_connect_to_vlib_no_map ("pvt", (char *) new_name,
-				    32 /* input_queue_length */ );
+  if (scm->want_shm_pthread)
+    {
+      vl_client_connect_to_vlib_no_map ("pvt", (char *) new_name,
+					32 /* input_queue_length */ );
+    }
+  else
+    {
+      vl_client_connect_to_vlib_no_rx_pthread_no_map ("pvt",
+						      (char *) new_name, 32
+						      /* input_queue_length */
+	);
+    }
   vl_socket_client_enable_disable (0);
   vec_free (new_name);
 }
@@ -358,7 +374,7 @@ vl_socket_client_connect (char *socket_path, char *client_name,
 
   sock = &scm->client_socket;
   sock->config = socket_path;
-  sock->flags = CLIB_SOCKET_F_IS_CLIENT | CLIB_SOCKET_F_SEQPACKET;
+  sock->flags = CLIB_SOCKET_F_IS_CLIENT | CLIB_SOCKET_F_NON_BLOCKING_CONNECT;
 
   if ((error = clib_socket_init (sock)))
     {
@@ -395,13 +411,16 @@ vl_socket_client_connect (char *socket_path, char *client_name,
 }
 
 int
-vl_socket_client_init_shm (vl_api_shm_elem_config_t * config)
+vl_socket_client_init_shm (vl_api_shm_elem_config_t * config,
+			   int want_pthread)
 {
   socket_client_main_t *scm = &socket_client_main;
   vl_api_sock_init_shm_t *mp;
   int rv, i;
   u64 *cfg;
 
+  scm->want_shm_pthread = want_pthread;
+
   mp = vl_socket_client_msg_alloc (sizeof (*mp) +
 				   vec_len (config) * sizeof (u64));
   clib_memset (mp, 0, sizeof (*mp));