Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
svm: refactor fifo
[vpp.git]
/
src
/
vnet
/
session
/
session.h
diff --git
a/src/vnet/session/session.h
b/src/vnet/session/session.h
index
f738f39
..
e856372
100644
(file)
--- a/
src/vnet/session/session.h
+++ b/
src/vnet/session/session.h
@@
-84,7
+84,10
@@
typedef struct session_worker_
svm_msg_q_t *vpp_event_queue;
/** vlib_time_now last time around the track */
svm_msg_q_t *vpp_event_queue;
/** vlib_time_now last time around the track */
- f64 last_vlib_time;
+ clib_time_type_t last_vlib_time;
+
+ /** vlib_time_now rounded to us precision and as u64 */
+ clib_us_time_t last_vlib_us_time;
/** Convenience pointer to this worker's vlib_main */
vlib_main_t *vm;
/** Convenience pointer to this worker's vlib_main */
vlib_main_t *vm;
@@
-124,7
+127,7
@@
typedef struct session_worker_
#if SESSION_DEBUG
/** last event poll time by thread */
#if SESSION_DEBUG
/** last event poll time by thread */
-
f64
last_event_poll;
+
clib_time_type_t
last_event_poll;
#endif
} session_worker_t;
#endif
} session_worker_t;
@@
-163,6
+166,8
@@
typedef struct session_main_
/** Session manager is enabled */
u8 is_enabled;
/** Session manager is enabled */
u8 is_enabled;
+ /** Enable session manager at startup */
+ u8 session_enable_asap;
/** vpp fifo event queue configured length */
u32 configured_event_queue_length;
/** vpp fifo event queue configured length */
u32 configured_event_queue_length;
@@
-221,6
+226,14
@@
session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt)
pool_elt_at_index (wrk->event_elts, wrk->old_head));
}
pool_elt_at_index (wrk->event_elts, wrk->old_head));
}
+static inline void
+session_evt_add_head_old (session_worker_t * wrk, session_evt_elt_t * elt)
+{
+ clib_llist_add (wrk->event_elts, evt_list, elt,
+ pool_elt_at_index (wrk->event_elts, wrk->old_head));
+}
+
+
static inline u32
session_evt_ctrl_data_alloc (session_worker_t * wrk)
{
static inline u32
session_evt_ctrl_data_alloc (session_worker_t * wrk)
{
@@
-273,22
+286,10
@@
session_evt_alloc_old (session_worker_t * wrk)
return elt;
}
return elt;
}
-always_inline u8
-session_is_valid (u32 si, u8 thread_index)
-{
- session_t *s;
- s = pool_elt_at_index (session_main.wrk[thread_index].sessions, si);
- if (s->session_state == SESSION_STATE_CLOSED)
- return 1;
-
- if (s->thread_index != thread_index || s->session_index != si)
- return 0;
- return 1;
-}
-
session_t *session_alloc (u32 thread_index);
void session_free (session_t * s);
void session_free_w_fifos (session_t * s);
session_t *session_alloc (u32 thread_index);
void session_free (session_t * s);
void session_free_w_fifos (session_t * s);
+u8 session_is_valid (u32 si, u8 thread_index);
always_inline session_t *
session_get (u32 si, u32 thread_index)
always_inline session_t *
session_get (u32 si, u32 thread_index)
@@
-491,14
+492,14
@@
always_inline u32
transport_rx_fifo_size (transport_connection_t * tc)
{
session_t *s = session_get (tc->s_index, tc->thread_index);
transport_rx_fifo_size (transport_connection_t * tc)
{
session_t *s = session_get (tc->s_index, tc->thread_index);
- return s
->rx_fifo->nitems
;
+ return s
vm_fifo_size (s->rx_fifo)
;
}
always_inline u32
transport_tx_fifo_size (transport_connection_t * tc)
{
session_t *s = session_get (tc->s_index, tc->thread_index);
}
always_inline u32
transport_tx_fifo_size (transport_connection_t * tc)
{
session_t *s = session_get (tc->s_index, tc->thread_index);
- return s
->tx_fifo->nitems
;
+ return s
vm_fifo_size (s->tx_fifo)
;
}
always_inline u8
}
always_inline u8
@@
-508,12
+509,18
@@
transport_rx_fifo_has_ooo_data (transport_connection_t * tc)
return svm_fifo_has_ooo_data (s->rx_fifo);
}
return svm_fifo_has_ooo_data (s->rx_fifo);
}
-always_inline
f64
+always_inline
clib_time_type_t
transport_time_now (u32 thread_index)
{
return session_main.wrk[thread_index].last_vlib_time;
}
transport_time_now (u32 thread_index)
{
return session_main.wrk[thread_index].last_vlib_time;
}
+always_inline clib_us_time_t
+transport_us_time_now (u32 thread_index)
+{
+ return session_main.wrk[thread_index].last_vlib_us_time;
+}
+
always_inline void
transport_add_tx_event (transport_connection_t * tc)
{
always_inline void
transport_add_tx_event (transport_connection_t * tc)
{
@@
-591,7
+598,7
@@
session_main_get_worker (u32 thread_index)
static inline session_worker_t *
session_main_get_worker_if_valid (u32 thread_index)
{
static inline session_worker_t *
session_main_get_worker_if_valid (u32 thread_index)
{
- if (
pool_is_free_index (session_main.wrk, thread_index
))
+ if (
thread_index > vec_len (session_main.wrk
))
return 0;
return &session_main.wrk[thread_index];
}
return 0;
return &session_main.wrk[thread_index];
}