X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvlibmemory%2Fsocket_client.c;h=2fb6b8a0c4e9ac43c92f7e259f30ecfc99e40ccd;hp=c04b804eb218d51cfd404c6b534b2bf30cf581cc;hb=36217e3ca;hpb=2881dec8631629cf1fa415a1f63b8561590df275

diff --git a/src/vlibmemory/socket_client.c b/src/vlibmemory/socket_client.c
index c04b804eb21..2fb6b8a0c4e 100644
--- a/src/vlibmemory/socket_client.c
+++ b/src/vlibmemory/socket_client.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #define __USE_GNU
+#define _GNU_SOURCE
 #include <sys/socket.h>
 
 #include <svm/ssvm.h>
@@ -42,6 +43,7 @@
 #undef vl_printfun
 
 socket_client_main_t socket_client_main;
+__thread socket_client_main_t *socket_client_ctx = &socket_client_main;
 
 /* Debug aid */
 u32 vl (void *p) __attribute__ ((weak));
@@ -52,10 +54,23 @@ vl (void *p)
   return vec_len (p);
 }
 
-int
-vl_socket_client_read (int wait)
+static socket_client_main_t *
+vl_socket_client_ctx_push (socket_client_main_t * ctx)
+{
+  socket_client_main_t *old = socket_client_ctx;
+  socket_client_ctx = ctx;
+  return old;
+}
+
+static void
+vl_socket_client_ctx_pop (socket_client_main_t * old_ctx)
+{
+  socket_client_ctx = old_ctx;
+}
+
+static int
+vl_socket_client_read_internal (socket_client_main_t * scm, int wait)
 {
-  socket_client_main_t *scm = &socket_client_main;
   u32 data_len = 0, msg_size;
   int n, current_rx_index;
   msgbuf_t *mbp = 0;
@@ -79,6 +94,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 +121,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;
 	    }
@@ -133,9 +154,26 @@ vl_socket_client_read (int wait)
 }
 
 int
-vl_socket_client_write (void)
+vl_socket_client_read (int wait)
+{
+  return vl_socket_client_read_internal (socket_client_ctx, wait);
+}
+
+int
+vl_socket_client_read2 (socket_client_main_t * scm, int wait)
+{
+  socket_client_main_t *old_ctx;
+  int rv;
+
+  old_ctx = vl_socket_client_ctx_push (scm);
+  rv = vl_socket_client_read_internal (scm, wait);
+  vl_socket_client_ctx_pop (old_ctx);
+  return rv;
+}
+
+static int
+vl_socket_client_write_internal (socket_client_main_t * scm)
 {
-  socket_client_main_t *scm = &socket_client_main;
   int n;
 
   msgbuf_t msgbuf = {
@@ -161,18 +199,40 @@ vl_socket_client_write (void)
   return n;
 }
 
+int
+vl_socket_client_write (void)
+{
+  return vl_socket_client_write_internal (socket_client_ctx);
+}
+
+int
+vl_socket_client_write2 (socket_client_main_t * scm)
+{
+  socket_client_main_t *old_ctx;
+  int rv;
+
+  old_ctx = vl_socket_client_ctx_push (scm);
+  rv = vl_socket_client_write_internal (scm);
+  vl_socket_client_ctx_pop (old_ctx);
+  return rv;
+}
+
+void *
+vl_socket_client_msg_alloc2 (socket_client_main_t * scm, int nbytes)
+{
+  scm->socket_tx_nbytes = nbytes;
+  return ((void *) scm->socket_tx_buffer);
+}
+
 void *
 vl_socket_client_msg_alloc (int nbytes)
 {
-  socket_client_main.socket_tx_nbytes = nbytes;
-  return ((void *) socket_client_main.socket_tx_buffer);
+  return vl_socket_client_msg_alloc2 (socket_client_ctx, nbytes);
 }
 
 void
-vl_socket_client_disconnect (void)
+vl_socket_client_disconnect2 (socket_client_main_t * scm)
 {
-  socket_client_main_t *scm = &socket_client_main;
-
   if (vl_mem_client_is_connected ())
     {
       vl_client_disconnect_from_vlib_no_unmap ();
@@ -184,16 +244,27 @@ vl_socket_client_disconnect (void)
 }
 
 void
-vl_socket_client_enable_disable (int enable)
+vl_socket_client_disconnect (void)
+{
+  vl_socket_client_disconnect2 (socket_client_ctx);
+}
+
+void
+vl_socket_client_enable_disable2 (socket_client_main_t * scm, int enable)
 {
-  socket_client_main_t *scm = &socket_client_main;
   scm->socket_enable = enable;
 }
 
-clib_error_t *
-vl_sock_api_recv_fd_msg (int socket_fd, int fds[], int n_fds, u32 wait)
+void
+vl_socket_client_enable_disable (int enable)
+{
+  vl_socket_client_enable_disable2 (socket_client_ctx, enable);
+}
+
+static clib_error_t *
+vl_sock_api_recv_fd_msg_internal (socket_client_main_t * scm, int fds[],
+				  int n_fds, u32 wait)
 {
-  socket_client_main_t *scm = &socket_client_main;
   char msgbuf[16];
   char ctl[CMSG_SPACE (sizeof (int) * n_fds)
 	   + CMSG_SPACE (sizeof (struct ucred))];
@@ -205,8 +276,11 @@ vl_sock_api_recv_fd_msg (int socket_fd, int fds[], int n_fds, u32 wait)
   pid_t pid __attribute__ ((unused));
   uid_t uid __attribute__ ((unused));
   gid_t gid __attribute__ ((unused));
+  int socket_fd;
   f64 timeout;
 
+  socket_fd = scm->client_socket.fd;
+
   iov[0].iov_base = msgbuf;
   iov[0].iov_len = 5;
   mh.msg_iov = iov;
@@ -214,7 +288,7 @@ vl_sock_api_recv_fd_msg (int socket_fd, int fds[], int n_fds, u32 wait)
   mh.msg_control = ctl;
   mh.msg_controllen = sizeof (ctl);
 
-  memset (ctl, 0, sizeof (ctl));
+  clib_memset (ctl, 0, sizeof (ctl));
 
   if (wait != ~0)
     {
@@ -246,7 +320,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);
@@ -254,13 +328,33 @@ vl_sock_api_recv_fd_msg (int socket_fd, int fds[], int n_fds, u32 wait)
   return 0;
 }
 
+clib_error_t *
+vl_sock_api_recv_fd_msg (int socket_fd, int fds[], int n_fds, u32 wait)
+{
+  return vl_sock_api_recv_fd_msg_internal (socket_client_ctx, fds, n_fds,
+					   wait);
+}
+
+clib_error_t *
+vl_sock_api_recv_fd_msg2 (socket_client_main_t * scm, int socket_fd,
+			  int fds[], int n_fds, u32 wait)
+{
+  socket_client_main_t *old_ctx;
+  clib_error_t *error;
+
+  old_ctx = vl_socket_client_ctx_push (scm);
+  error = vl_sock_api_recv_fd_msg_internal (scm, fds, n_fds, wait);
+  vl_socket_client_ctx_pop (old_ctx);
+  return error;
+}
+
 static void vl_api_sock_init_shm_reply_t_handler
   (vl_api_sock_init_shm_reply_t * mp)
 {
-  socket_client_main_t *scm = &socket_client_main;
+  socket_client_main_t *scm = socket_client_ctx;
   ssvm_private_t *memfd = &scm->memfd_segment;
   i32 retval = ntohl (mp->retval);
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   clib_error_t *error;
   int my_fd = -1;
   u8 *new_name;
@@ -282,11 +376,11 @@ static void vl_api_sock_init_shm_reply_t_handler
       return;
     }
 
-  memset (memfd, 0, sizeof (*memfd));
+  clib_memset (memfd, 0, sizeof (*memfd));
   memfd->fd = my_fd;
 
   /* Note: this closes memfd.fd */
-  retval = ssvm_slave_init_memfd (memfd);
+  retval = ssvm_client_init_memfd (memfd);
   if (retval)
     clib_warning ("WARNING: segment map returned %d", retval);
 
@@ -298,8 +392,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);
 }
@@ -307,7 +411,7 @@ static void vl_api_sock_init_shm_reply_t_handler
 static void
 vl_api_sockclnt_create_reply_t_handler (vl_api_sockclnt_create_reply_t * mp)
 {
-  socket_client_main_t *scm = &socket_client_main;
+  socket_client_main_t *scm = socket_client_ctx;
   if (!mp->response)
     {
       scm->socket_enable = 1;
@@ -328,22 +432,21 @@ void
 vl_sock_client_install_message_handlers (void)
 {
 
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                            vl_api_##n##_t_handler,             \
-                            noop_handler,                       \
-                            vl_api_##n##_t_endian,              \
-                            vl_api_##n##_t_print,               \
-                            sizeof(vl_api_##n##_t), 1);
+#define _(N, n)                                                               \
+  vl_msg_api_set_handlers (VL_API_##N, #n, vl_api_##n##_t_handler,            \
+			   noop_handler, vl_api_##n##_t_endian,               \
+			   vl_api_##n##_t_print, sizeof (vl_api_##n##_t), 0,  \
+			   vl_api_##n##_t_print_json, vl_api_##n##_t_tojson,  \
+			   vl_api_##n##_t_fromjson);
   foreach_sock_client_api_msg;
 #undef _
 }
 
 int
-vl_socket_client_connect (char *socket_path, char *client_name,
-			  u32 socket_buffer_size)
+vl_socket_client_connect_internal (socket_client_main_t * scm,
+				   char *socket_path, char *client_name,
+				   u32 socket_buffer_size)
 {
-  socket_client_main_t *scm = &socket_client_main;
   vl_api_sockclnt_create_t *mp;
   clib_socket_t *sock;
   clib_error_t *error;
@@ -358,7 +461,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;
 
   if ((error = clib_socket_init (sock)))
     {
@@ -377,7 +480,7 @@ vl_socket_client_connect (char *socket_path, char *client_name,
   _vec_len (scm->socket_tx_buffer) = 0;
   scm->name = format (0, "%s", client_name);
 
-  mp = vl_socket_client_msg_alloc (sizeof (*mp));
+  mp = vl_socket_client_msg_alloc2 (scm, sizeof (*mp));
   mp->_vl_msg_id = htons (VL_API_SOCKCLNT_CREATE);
   strncpy ((char *) mp->name, client_name, sizeof (mp->name) - 1);
   mp->name[sizeof (mp->name) - 1] = 0;
@@ -385,26 +488,51 @@ vl_socket_client_connect (char *socket_path, char *client_name,
 
   clib_time_init (&scm->clib_time);
 
-  if (vl_socket_client_write () <= 0)
+  if (vl_socket_client_write_internal (scm) <= 0)
     return (-1);
 
-  if (vl_socket_client_read (5))
+  if (vl_socket_client_read_internal (scm, 5))
     return (-1);
 
   return (0);
 }
 
 int
-vl_socket_client_init_shm (vl_api_shm_elem_config_t * config)
+vl_socket_client_connect (char *socket_path, char *client_name,
+			  u32 socket_buffer_size)
+{
+  return vl_socket_client_connect_internal (socket_client_ctx, socket_path,
+					    client_name, socket_buffer_size);
+}
+
+int
+vl_socket_client_connect2 (socket_client_main_t * scm, char *socket_path,
+			   char *client_name, u32 socket_buffer_size)
+{
+  socket_client_main_t *old_ctx;
+  int rv;
+
+  old_ctx = vl_socket_client_ctx_push (scm);
+  rv = vl_socket_client_connect_internal (socket_client_ctx, socket_path,
+					  client_name, socket_buffer_size);
+  vl_socket_client_ctx_pop (old_ctx);
+  return rv;
+}
+
+int
+vl_socket_client_init_shm_internal (socket_client_main_t * scm,
+				    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;
 
-  mp = vl_socket_client_msg_alloc (sizeof (*mp) +
-				   vec_len (config) * sizeof (u64));
-  memset (mp, 0, sizeof (*mp));
+  scm->want_shm_pthread = want_pthread;
+
+  mp = vl_socket_client_msg_alloc2 (scm, sizeof (*mp) +
+				    vec_len (config) * sizeof (u64));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_SOCK_INIT_SHM);
   mp->client_index = clib_host_to_net_u32 (scm->client_index);
   mp->requested_size = 64 << 20;
@@ -418,23 +546,52 @@ vl_socket_client_init_shm (vl_api_shm_elem_config_t * config)
 	}
       mp->nitems = vec_len (config);
     }
-  rv = vl_socket_client_write ();
+  rv = vl_socket_client_write_internal (scm);
   if (rv <= 0)
     return rv;
 
-  if (vl_socket_client_read (1))
+  if (vl_socket_client_read_internal (scm, 1))
     return -1;
 
   return 0;
 }
 
+int
+vl_socket_client_init_shm (vl_api_shm_elem_config_t * config,
+			   int want_pthread)
+{
+  return vl_socket_client_init_shm_internal (socket_client_ctx, config,
+					     want_pthread);
+}
+
+int
+vl_socket_client_init_shm2 (socket_client_main_t * scm,
+			    vl_api_shm_elem_config_t * config,
+			    int want_pthread)
+{
+  socket_client_main_t *old_ctx;
+  int rv;
+
+  old_ctx = vl_socket_client_ctx_push (scm);
+  rv = vl_socket_client_init_shm_internal (socket_client_ctx, config,
+					   want_pthread);
+  vl_socket_client_ctx_pop (old_ctx);
+  return rv;
+}
+
 clib_error_t *
-vl_socket_client_recv_fd_msg (int fds[], int n_fds, u32 wait)
+vl_socket_client_recv_fd_msg2 (socket_client_main_t * scm, int fds[],
+			       int n_fds, u32 wait)
 {
-  socket_client_main_t *scm = &socket_client_main;
   if (!scm->socket_fd)
     return clib_error_return (0, "no socket");
-  return vl_sock_api_recv_fd_msg (scm->client_socket.fd, fds, n_fds, wait);
+  return vl_sock_api_recv_fd_msg_internal (scm, fds, n_fds, wait);
+}
+
+clib_error_t *
+vl_socket_client_recv_fd_msg (int fds[], int n_fds, u32 wait)
+{
+  return vl_socket_client_recv_fd_msg2 (socket_client_ctx, fds, n_fds, wait);
 }
 
 /*