svm: allow mq attachments at random offsets

[vpp.git] / src / plugins / hs_apps / sapi / vpp_echo_common.h

diff --git a/src/plugins/hs_apps/sapi/vpp_echo_common.h b/src/plugins/hs_apps/sapi/vpp_echo_common.h
index 0c85b49..dc5f7df 100644 (file)
--- a/src/plugins/hs_apps/sapi/vpp_echo_common.h
+++ b/src/plugins/hs_apps/sapi/vpp_echo_common.h
@@ -38,6 +38,7 @@
 #define TIMEOUT 10.0
 #define LOGGING_BATCH (100)
 #define LOG_EVERY_N_IDLE_CYCLES (1e8)
+#define ECHO_MQ_SEG_HANDLE     ((u64) ~0 - 1)
 
 #define foreach_echo_fail_code                                          \
   _(ECHO_FAIL_NONE, "ECHO_FAIL_NONE")                                   \
@@ -146,12 +147,13 @@ do {                                                                    \
          clib_warning (_fmt, ##_args);  \
   }
 
-#define ECHO_REGISTER_PROTO(proto, vft)         \
-  static void __clib_constructor                \
-  vpp_echo_init_##proto ()                      \
-  {                                             \
-    echo_main_t *em = &echo_main;               \
-    em->available_proto_cb_vft[proto] = &vft;   \
+#define ECHO_REGISTER_PROTO(proto, vft)                \
+  static void __clib_constructor                       \
+  vpp_echo_init_##proto ()                             \
+  {                                                    \
+    echo_main_t *em = &echo_main;                      \
+    vec_validate (em->available_proto_cb_vft, proto);  \
+    em->available_proto_cb_vft[proto] = &vft;          \
   }
 
 typedef struct
@@ -231,7 +233,6 @@ typedef enum echo_test_evt_
 typedef union session_connected_bundled_msg_
 {
   session_connected_msg_t *mp;
-  vl_api_connect_uri_reply_t *bmp;
 } session_connected_bundled_msg_t;
 
 typedef struct echo_proto_cb_vft_
@@ -300,7 +301,7 @@ typedef struct
   uword *shared_segment_handles;       /* Hash table : segment_names -> 1 */
   clib_spinlock_t segment_handles_lock;        /* Hash table lock */
   echo_proto_cb_vft_t *proto_cb_vft;
-  svm_msg_q_t *rpc_msq_queue;  /* MQ between quic_echo threads */
+  svm_msg_q_t rpc_msq_queue; /* MQ between quic_echo threads */
   fifo_segment_main_t segment_main;
 
   /* State of the connection, shared between msg RX thread and main thread */
@@ -324,7 +325,7 @@ typedef struct
   u32 prealloc_fifo_pairs;
   u64 rx_buf_size;
   u64 tx_buf_size;
-  data_source_t data_source;   /* Use no/dummy/mirrored data */
+  data_source_t data_source;   /* Use no/placeholder/mirrored data */
   u8 send_stream_disconnects;  /* actively send disconnect */
   u8 output_json;              /* Output stats as JSON */
   volatile u8 wait_for_gdb;    /* Wait for gdb to attach */
@@ -356,7 +357,7 @@ typedef struct
 
   /* VNET_API_ERROR_FOO -> "Foo" hash table */
   uword *error_string_by_error_number;
-  echo_proto_cb_vft_t *available_proto_cb_vft[TRANSPORT_N_PROTO];
+  echo_proto_cb_vft_t **available_proto_cb_vft;
 
   echo_stats_t stats;
   echo_stats_t last_stat_sampling;     /* copy of stats at last sampling */
@@ -439,9 +440,14 @@ void echo_session_print_stats (echo_main_t * em, echo_session_t * session);
 u8 *echo_format_crypto_engine (u8 * s, va_list * args);
 uword echo_unformat_crypto_engine (unformat_input_t * input, va_list * args);
 u8 *echo_format_bytes_per_sec (u8 * s, va_list * args);
-int echo_ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd);
-void echo_segment_handle_add_del (echo_main_t * em, u64 segment_handle,
-                                 u8 add);
+int echo_segment_attach (u64 segment_handle, char *name,
+                        ssvm_segment_type_t type, int fd);
+u32 echo_segment_lookup (u64 segment_handle);
+void echo_segment_detach (u64 segment_handle);
+int echo_attach_session (uword segment_handle, uword rxf_offset,
+                        uword mq_offset, uword txf_offset, echo_session_t *s);
+int echo_segment_attach_mq (uword segment_handle, uword mq_offset,
+                           u32 mq_index, svm_msg_q_t **mq);
 
 /* Binary API */