X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fsocket_client.h;h=a4b8bc7d6beebd3db1e10555239c54f99a97b1cb;hb=e8ea6be8dfb626b5bb4ff3355ce8037724ce1d83;hp=5612a9809a55b51501c1f0319b1f298b57bd8033;hpb=466f289c27f290a2764a82f57f5c20d080227ead;p=vpp.git

diff --git a/src/vlibmemory/socket_client.h b/src/vlibmemory/socket_client.h
index 5612a9809a5..a4b8bc7d6be 100644
--- a/src/vlibmemory/socket_client.h
+++ b/src/vlibmemory/socket_client.h
@@ -20,25 +20,27 @@
 
 #include <vppinfra/file.h>
 #include <vppinfra/time.h>
-#include <vlibmemory/memory_shared.h>
+#include <vlibapi/memory_shared.h>
 
 typedef struct
 {
   int socket_fd;
-  /* Temporarily disable the connection, so we can keep it around... */
-  int socket_enable;
+  int socket_enable;		/**< Can temporarily disable the connection
+				     but still can keep it around... */
+  u32 client_index;		/**< Client index allocated by VPP */
 
   clib_socket_t client_socket;
 
   u32 socket_buffer_size;
   u8 *socket_tx_buffer;
   u8 *socket_rx_buffer;
-  u32 socket_tx_nbytes;
   int control_pings_outstanding;
 
   u8 *name;
   clib_time_t clib_time;
   ssvm_private_t memfd_segment;
+
+  int want_shm_pthread;
 } socket_client_main_t;
 
 extern socket_client_main_t socket_client_main;
@@ -48,13 +50,32 @@ extern socket_client_main_t socket_client_main;
 int vl_socket_client_connect (char *socket_path, char *client_name,
 			      u32 socket_buffer_size);
 void vl_socket_client_disconnect (void);
+void vl_socket_client_enable_disable (int enable);
 int vl_socket_client_read (int wait);
 int vl_socket_client_write (void);
-void vl_socket_client_enable_disable (int enable);
 void *vl_socket_client_msg_alloc (int nbytes);
-int vl_socket_client_init_shm (vl_api_shm_elem_config_t * config);
+int vl_socket_client_init_shm (vl_api_shm_elem_config_t * config,
+			       int want_pthread);
 clib_error_t *vl_socket_client_recv_fd_msg (int fds[], int n_fds, u32 wait);
 
+/*
+ * Socket client apis that explicitly pass socket main as an argument
+ */
+
+int vl_socket_client_connect2 (socket_client_main_t * scm, char *socket_path,
+			       char *client_name, u32 socket_buffer_size);
+void vl_socket_client_disconnect2 (socket_client_main_t * scm);
+void vl_socket_client_enable_disable2 (socket_client_main_t * scm,
+				       int enable);
+int vl_socket_client_read2 (socket_client_main_t * scm, int wait);
+int vl_socket_client_write2 (socket_client_main_t * scm);
+void *vl_socket_client_msg_alloc2 (socket_client_main_t * scm, int nbytes);
+int vl_socket_client_init_shm2 (socket_client_main_t * scm,
+				vl_api_shm_elem_config_t * config,
+				int want_pthread);
+clib_error_t *vl_socket_client_recv_fd_msg2 (socket_client_main_t * scm,
+					     int fds[], int n_fds, u32 wait);
+
 #endif /* SRC_VLIBMEMORY_SOCKET_CLIENT_H_ */
 
 /*