Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: remove svm_segment_index from session struct
[vpp.git]
/
src
/
vnet
/
session
/
application_worker.c
diff --git
a/src/vnet/session/application_worker.c
b/src/vnet/session/application_worker.c
index
d02149d
..
9dfa3aa
100644
(file)
--- a/
src/vnet/session/application_worker.c
+++ b/
src/vnet/session/application_worker.c
@@
-165,7
+165,6
@@
app_worker_alloc_session_fifos (segment_manager_t * sm, session_t * s)
s->rx_fifo = rx_fifo;
s->tx_fifo = tx_fifo;
s->rx_fifo = rx_fifo;
s->tx_fifo = tx_fifo;
- s->svm_segment_index = fifo_segment_index;
return 0;
}
return 0;
}
@@
-362,7
+361,7
@@
app_worker_own_session (app_worker_t * app_wrk, session_t * s)
s->tx_fifo->cursize = txf->cursize;
}
s->tx_fifo->cursize = txf->cursize;
}
- segment_manager_dealloc_fifos (rxf
->segment_index, rxf
, txf);
+ segment_manager_dealloc_fifos (rxf, txf);
return 0;
}
return 0;
}
@@
-489,7
+488,7
@@
app_worker_del_segment_notify (app_worker_t * app_wrk, u64 segment_handle)
segment_handle);
}
segment_handle);
}
-u8
+
static inline
u8
app_worker_application_is_builtin (app_worker_t * app_wrk)
{
return app_wrk->app_is_builtin;
app_worker_application_is_builtin (app_worker_t * app_wrk)
{
return app_wrk->app_is_builtin;
@@
-564,7
+563,7
@@
app_send_io_evt_rx (app_worker_t * app_wrk, session_t * s, u8 lock)
evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg);
evt->fifo = s->rx_fifo;
evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg);
evt->fifo = s->rx_fifo;
- evt->event_type =
FIFO_EVENT_APP
_RX;
+ evt->event_type =
SESSION_IO_EVT
_RX;
(void) svm_fifo_set_event (s->rx_fifo);
(void) svm_fifo_set_event (s->rx_fifo);
@@
-599,7
+598,7
@@
app_send_io_evt_tx (app_worker_t * app_wrk, session_t * s, u8 lock)
ASSERT (!svm_msg_q_msg_is_invalid (&msg));
evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg);
ASSERT (!svm_msg_q_msg_is_invalid (&msg));
evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg);
- evt->event_type =
FIFO_EVENT_APP
_TX;
+ evt->event_type =
SESSION_IO_EVT
_TX;
evt->fifo = s->tx_fifo;
return app_enqueue_evt (mq, &msg, lock);
evt->fifo = s->tx_fifo;
return app_enqueue_evt (mq, &msg, lock);
@@
-625,7
+624,7
@@
static app_send_evt_handler_fn * const app_send_evt_handler_fns[3] = {
int
app_worker_send_event (app_worker_t * app, session_t * s, u8 evt_type)
{
int
app_worker_send_event (app_worker_t * app, session_t * s, u8 evt_type)
{
- ASSERT (app && evt_type <=
FIFO_EVENT_APP
_TX);
+ ASSERT (app && evt_type <=
SESSION_IO_EVT
_TX);
return app_send_evt_handler_fns[evt_type] (app, s, 0 /* lock */ );
}
return app_send_evt_handler_fns[evt_type] (app, s, 0 /* lock */ );
}
@@
-666,7
+665,7
@@
format_app_worker_listener (u8 * s, va_list * args)
app_name = application_name_from_index (app_wrk->app_index);
listener = listen_session_get_from_handle (handle);
app_name = application_name_from_index (app_wrk->app_index);
listener = listen_session_get_from_handle (handle);
- str = format (0, "%U", format_s
tream_s
ession, listener, verbose);
+ str = format (0, "%U", format_session, listener, verbose);
if (verbose)
{
if (verbose)
{
@@
-737,7
+736,7
@@
app_worker_format_connects (app_worker_t * app_wrk, int verbose)
thread_index = fifo->master_thread_index;
session = session_get (session_index, thread_index);
thread_index = fifo->master_thread_index;
session = session_get (session_index, thread_index);
- str = format (0, "%U", format_s
tream_s
ession, session, verbose);
+ str = format (0, "%U", format_session, session, verbose);
if (verbose)
s = format (s, "%-40s%-20s%-15u%-10u", str, app_name,
if (verbose)
s = format (s, "%-40s%-20s%-15u%-10u", str, app_name,