#include <vnet/vnet.h>
#include <svm/svm_fifo_segment.h>
-#include <svm/queue.h>
+#include <svm/message_queue.h>
#include <vlibmemory/api.h>
#include <vppinfra/lock.h>
#include <vppinfra/valloc.h>
typedef struct _segment_manager_properties
{
- /** Session fifo sizes. */
- u32 rx_fifo_size;
- u32 tx_fifo_size;
- u32 evt_q_size;
-
- /** Configured additional segment size */
- u32 add_segment_size;
-
- /** Flag that indicates if additional segments should be created */
- u8 add_segment;
-
- /** Segment type: if set to SSVM_N_TYPES, private segments are used */
- ssvm_segment_type_t segment_type;
-
+ u32 rx_fifo_size; /**< receive fifo size */
+ u32 tx_fifo_size; /**< transmit fifo size */
+ u32 evt_q_size; /**< event queue length */
+ u32 segment_size; /**< first segment size */
+ u32 prealloc_fifos; /**< preallocated fifo pairs */
+ u32 add_segment_size; /**< additional segment size */
+ u8 add_segment:1; /**< can add new segments flag */
+ u8 use_mq_eventfd:1; /**< use eventfds for mqs flag */
+ u8 reserved:6; /**< reserved flags */
+ ssvm_segment_type_t segment_type; /**< seg type: if set to SSVM_N_TYPES,
+ private segments are used */
} segment_manager_properties_t;
typedef struct _segment_manager
/** rwlock that protects the segments pool */
clib_rwlock_t segments_rwlock;
- /** Owner app index */
- u32 app_index;
+ /** Owner app worker index */
+ u32 app_wrk_index;
/**
* First segment should not be deleted unless segment manger is deleted.
/**
* App event queue allocated in first segment
*/
- svm_queue_t *event_queue;
+ svm_msg_q_t *event_queue;
} segment_manager_t;
#define segment_manager_foreach_segment_w_lock(VAR, SM, BODY) \
return sm - segment_manager_main.segment_managers;
}
-always_inline svm_queue_t *
+always_inline svm_msg_q_t *
segment_manager_event_queue (segment_manager_t * sm)
{
return sm->event_queue;
}
+always_inline u64
+segment_manager_make_segment_handle (u32 segment_manager_index,
+ u32 segment_index)
+{
+ return (((u64) segment_manager_index << 32) | segment_index);
+}
+
+u64 segment_manager_segment_handle (segment_manager_t * sm,
+ svm_fifo_segment_private_t * segment);
+
segment_manager_t *segment_manager_new ();
int segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
u32 prealloc_fifo_pairs);
-svm_fifo_segment_private_t *segment_manager_get_segment (segment_manager_t *
- sm,
+svm_fifo_segment_private_t *segment_manager_get_segment (segment_manager_t *,
u32 segment_index);
+svm_fifo_segment_private_t *segment_manager_get_segment_w_handle (u64);
svm_fifo_segment_private_t
* segment_manager_get_segment_w_lock (segment_manager_t * sm,
u32 segment_index);
svm_fifo_t ** tx_fifo);
void segment_manager_dealloc_fifos (u32 segment_index, svm_fifo_t * rx_fifo,
svm_fifo_t * tx_fifo);
-svm_queue_t *segment_manager_alloc_queue (svm_fifo_segment_private_t * fs,
- u32 queue_size);
+u32 segment_manager_evt_q_expected_size (u32 q_size);
+svm_msg_q_t *segment_manager_alloc_queue (svm_fifo_segment_private_t * fs,
+ segment_manager_properties_t *
+ props);
void segment_manager_dealloc_queue (segment_manager_t * sm, svm_queue_t * q);
void segment_manager_app_detach (segment_manager_t * sm);