diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-01-23 09:21:30 -0800 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-01-24 21:23:42 +0000 |
| commit | 5f45e01f5c3ce239eccd9546e2d04fa3141ca5cb (patch) | |
| tree | e0dbd1254a4e7c325dca5f2738845a9b1aaedcc4 /src/vcl/vppcom.c | |
| parent | 8704097b9bd1e2ca717116fa1e7d61b4736c3fbd (diff) | |
session/vcl: support worker ownership change for listeners
Change-Id: I2ad54b20b96f10b009c3e651b2a2f885577ca5b6
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vcl/vppcom.c')
| -rw-r--r-- | src/vcl/vppcom.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index c91d0f4b8b6..d9012cdaed6 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -30,7 +30,7 @@ vcl_wait_for_segment (u64 segment_handle) f64 timeout; if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) - return 1; + return 0; timeout = clib_time_now (&wrk->clib_time) + wait_for_seconds; while (clib_time_now (&wrk->clib_time) < timeout) @@ -505,6 +505,10 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) vcl_session_table_add_listener (wrk, mp->handle, sid); session->session_state = STATE_LISTEN; + session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); + vec_validate (wrk->vpp_event_queues, 0); + wrk->vpp_event_queues[0] = session->vpp_evt_q; + if (session->is_dgram) { svm_fifo_t *rx_fifo, *tx_fifo; @@ -607,13 +611,16 @@ vcl_session_worker_update_reply_handler (vcl_worker_t * wrk, void *data) s->session_index); return; } - s->rx_fifo = uword_to_pointer (msg->rx_fifo, svm_fifo_t *); - s->tx_fifo = uword_to_pointer (msg->tx_fifo, svm_fifo_t *); - s->rx_fifo->client_session_index = s->session_index; - s->tx_fifo->client_session_index = s->session_index; - s->rx_fifo->client_thread_index = wrk->wrk_index; - s->tx_fifo->client_thread_index = wrk->wrk_index; + if (s->rx_fifo) + { + s->rx_fifo = uword_to_pointer (msg->rx_fifo, svm_fifo_t *); + s->tx_fifo = uword_to_pointer (msg->tx_fifo, svm_fifo_t *); + s->rx_fifo->client_session_index = s->session_index; + s->tx_fifo->client_session_index = s->session_index; + s->rx_fifo->client_thread_index = wrk->wrk_index; + s->tx_fifo->client_thread_index = wrk->wrk_index; + } s->session_state = STATE_UPDATED; VDBG (0, "session %u[0x%llx] moved to worker %u", s->session_index, |