#undef _
};
+enum
+{
+ SESSION_TX_NO_BUFFERS = -2,
+ SESSION_TX_NO_DATA,
+ SESSION_TX_OK
+};
+
+
static void
session_tx_trace_frame (vlib_main_t * vm, vlib_node_runtime_t * node,
u32 next_index, u32 * to_next, u16 n_segs,
{
if (rv < 2)
vec_add1 (smm->pending_event_vector[thread_index], *e);
- return 0;
+ return SESSION_TX_NO_DATA;
}
next_index = smm->session_type_to_next[s->session_type];
if (ctx->snd_space == 0 || ctx->snd_mss == 0)
{
vec_add1 (smm->pending_event_vector[thread_index], *e);
- return 0;
+ return SESSION_TX_NO_DATA;
}
/* Allow enqueuing of a new event */
peek_data);
if (PREDICT_FALSE (!ctx->max_len_to_snd))
- return 0;
+ return SESSION_TX_NO_DATA;
n_bufs = vec_len (smm->tx_buffers[thread_index]);
n_bufs_needed = ctx->n_segs_per_evt * ctx->n_bufs_per_seg;
if (PREDICT_FALSE (n_bufs < n_bufs_needed))
{
vec_add1 (smm->pending_event_vector[thread_index], *e);
- return -1;
+ return SESSION_TX_NO_BUFFERS;
}
}
if (svm_fifo_set_event (s->server_tx_fifo))
vec_add1 (smm->pending_event_vector[thread_index], *e);
}
- return 0;
+ return SESSION_TX_OK;
}
int
session_tx_fifo_peek_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node,
- session_fifo_event_t * e0,
- stream_session_t * s0, int *n_tx_pkts)
+ session_fifo_event_t * e,
+ stream_session_t * s, int *n_tx_pkts)
{
- return session_tx_fifo_read_and_snd_i (vm, node, e0, s0, n_tx_pkts, 1);
+ return session_tx_fifo_read_and_snd_i (vm, node, e, s, n_tx_pkts, 1);
}
int
session_tx_fifo_dequeue_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node,
- session_fifo_event_t * e0,
- stream_session_t * s0, int *n_tx_pkts)
+ session_fifo_event_t * e,
+ stream_session_t * s, int *n_tx_pkts)
{
- return session_tx_fifo_read_and_snd_i (vm, node, e0, s0, n_tx_pkts, 0);
+ return session_tx_fifo_read_and_snd_i (vm, node, e, s, n_tx_pkts, 0);
}
int
session_tx_fifo_dequeue_internal (vlib_main_t * vm,
vlib_node_runtime_t * node,
- session_fifo_event_t * e0,
- stream_session_t * s0, int *n_tx_pkts)
+ session_fifo_event_t * e,
+ stream_session_t * s, int *n_tx_pkts)
{
application_t *app;
- app = application_get (s0->opaque);
- svm_fifo_unset_event (s0->server_tx_fifo);
- return app->cb_fns.builtin_app_tx_callback (s0);
+ app = application_get (s->opaque);
+ svm_fifo_unset_event (s->server_tx_fifo);
+ return app->cb_fns.builtin_app_tx_callback (s);
}
always_inline stream_session_t *
return session_get_if_valid (e->fifo->master_session_index, thread_index);
}
-void
-dump_thread_0_event_queue (void)
-{
- session_manager_main_t *smm = vnet_get_session_manager_main ();
- vlib_main_t *vm = &vlib_global_main;
- u32 my_thread_index = vm->thread_index;
- session_fifo_event_t _e, *e = &_e;
- stream_session_t *s0;
- int i, index;
- i8 *headp;
-
- svm_queue_t *q;
- q = smm->vpp_event_queues[my_thread_index];
-
- index = q->head;
-
- for (i = 0; i < q->cursize; i++)
- {
- headp = (i8 *) (&q->data[0] + q->elsize * index);
- clib_memcpy (e, headp, q->elsize);
-
- switch (e->event_type)
- {
- case FIFO_EVENT_APP_TX:
- s0 = session_event_get_session (e, my_thread_index);
- fformat (stdout, "[%04d] TX session %d\n", i, s0->session_index);
- break;
-
- case FIFO_EVENT_DISCONNECT:
- s0 = session_get_from_handle (e->session_handle);
- fformat (stdout, "[%04d] disconnect session %d\n", i,
- s0->session_index);
- break;
-
- case FIFO_EVENT_BUILTIN_RX:
- s0 = session_event_get_session (e, my_thread_index);
- fformat (stdout, "[%04d] builtin_rx %d\n", i, s0->session_index);
- break;
-
- case FIFO_EVENT_RPC:
- fformat (stdout, "[%04d] RPC call %llx with %llx\n",
- i, (u64) (e->rpc_args.fp), (u64) (e->rpc_args.arg));
- break;
-
- default:
- fformat (stdout, "[%04d] unhandled event type %d\n",
- i, e->event_type);
- break;
- }
-
- index++;
-
- if (index == q->maxsize)
- index = 0;
- }
-}
-
-static u8
-session_node_cmp_event (session_fifo_event_t * e, svm_fifo_t * f)
-{
- stream_session_t *s;
- switch (e->event_type)
- {
- case FIFO_EVENT_APP_RX:
- case FIFO_EVENT_APP_TX:
- case FIFO_EVENT_BUILTIN_RX:
- if (e->fifo == f)
- return 1;
- break;
- case FIFO_EVENT_DISCONNECT:
- break;
- case FIFO_EVENT_RPC:
- s = session_get_from_handle (e->session_handle);
- if (!s)
- {
- clib_warning ("session has event but doesn't exist!");
- break;
- }
- if (s->server_rx_fifo == f || s->server_tx_fifo == f)
- return 1;
- break;
- default:
- break;
- }
- return 0;
-}
-
-u8
-session_node_lookup_fifo_event (svm_fifo_t * f, session_fifo_event_t * e)
-{
- session_manager_main_t *smm = vnet_get_session_manager_main ();
- svm_queue_t *q;
- session_fifo_event_t *pending_event_vector, *evt;
- int i, index, found = 0;
- i8 *headp;
- u8 thread_index;
-
- ASSERT (e);
- thread_index = f->master_thread_index;
- /*
- * Search evt queue
- */
- q = smm->vpp_event_queues[thread_index];
- index = q->head;
- for (i = 0; i < q->cursize; i++)
- {
- headp = (i8 *) (&q->data[0] + q->elsize * index);
- clib_memcpy (e, headp, q->elsize);
- found = session_node_cmp_event (e, f);
- if (found)
- return 1;
- if (++index == q->maxsize)
- index = 0;
- }
- /*
- * Search pending events vector
- */
- pending_event_vector = smm->pending_event_vector[thread_index];
- vec_foreach (evt, pending_event_vector)
- {
- found = session_node_cmp_event (evt, f);
- if (found)
- {
- clib_memcpy (e, evt, sizeof (*evt));
- break;
- }
- }
- return found;
-}
-
static uword
session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
session_manager_main_t *smm = vnet_get_session_manager_main ();
- session_fifo_event_t *my_pending_event_vector, *e;
- session_fifo_event_t *my_fifo_events;
+ session_fifo_event_t *pending_events, *e;
+ session_fifo_event_t *fifo_events;
u32 n_to_dequeue, n_events;
svm_queue_t *q;
application_t *app;
if (PREDICT_FALSE (q == 0))
return 0;
- my_fifo_events = smm->free_event_vector[thread_index];
+ fifo_events = smm->free_event_vector[thread_index];
/* min number of events we can dequeue without blocking */
n_to_dequeue = q->cursize;
- my_pending_event_vector = smm->pending_event_vector[thread_index];
+ pending_events = smm->pending_event_vector[thread_index];
- if (!n_to_dequeue && !vec_len (my_pending_event_vector)
+ if (!n_to_dequeue && !vec_len (pending_events)
&& !vec_len (smm->pending_disconnects[thread_index]))
return 0;
/*
* If we didn't manage to process previous events try going
* over them again without dequeuing new ones.
+ * XXX: Handle senders to sessions that can't keep up
*/
- /* XXX: Block senders to sessions that can't keep up */
- if (0 && vec_len (my_pending_event_vector) >= 100)
+ if (0 && vec_len (pending_events) >= 100)
{
clib_warning ("too many fifo events unsolved");
goto skip_dequeue;
}
- /* See you in the next life, don't be late */
+ /* See you in the next life, don't be late
+ * XXX: we may need priorities here
+ */
if (pthread_mutex_trylock (&q->mutex))
return 0;
for (i = 0; i < n_to_dequeue; i++)
{
- vec_add2 (my_fifo_events, e, 1);
+ vec_add2 (fifo_events, e, 1);
svm_queue_sub_raw (q, (u8 *) e);
}
(void) pthread_cond_broadcast (&q->condvar);
pthread_mutex_unlock (&q->mutex);
- vec_append (my_fifo_events, my_pending_event_vector);
- vec_append (my_fifo_events, smm->pending_disconnects[thread_index]);
+ vec_append (fifo_events, pending_events);
+ vec_append (fifo_events, smm->pending_disconnects[thread_index]);
- _vec_len (my_pending_event_vector) = 0;
- smm->pending_event_vector[thread_index] = my_pending_event_vector;
+ _vec_len (pending_events) = 0;
+ smm->pending_event_vector[thread_index] = pending_events;
_vec_len (smm->pending_disconnects[thread_index]) = 0;
skip_dequeue:
- n_events = vec_len (my_fifo_events);
+ n_events = vec_len (fifo_events);
for (i = 0; i < n_events; i++)
{
- stream_session_t *s0; /* $$$ prefetch 1 ahead maybe */
- session_fifo_event_t *e0;
+ stream_session_t *s; /* $$$ prefetch 1 ahead maybe */
+ session_fifo_event_t *e;
- e0 = &my_fifo_events[i];
- switch (e0->event_type)
+ e = &fifo_events[i];
+ switch (e->event_type)
{
case FIFO_EVENT_APP_TX:
+ /* Don't try to send more that one frame per dispatch cycle */
if (n_tx_packets == VLIB_FRAME_SIZE)
{
- vec_add1 (smm->pending_event_vector[thread_index], *e0);
+ vec_add1 (smm->pending_event_vector[thread_index], *e);
break;
}
- s0 = session_event_get_session (e0, thread_index);
- if (PREDICT_FALSE (!s0))
+ s = session_event_get_session (e, thread_index);
+ if (PREDICT_FALSE (!s))
{
clib_warning ("It's dead, Jim!");
continue;
/* Spray packets in per session type frames, since they go to
* different nodes */
- rv = (smm->session_tx_fns[s0->session_type]) (vm, node, e0, s0,
- &n_tx_packets);
- /* Out of buffers */
- if (PREDICT_FALSE (rv < 0))
+ rv = (smm->session_tx_fns[s->session_type]) (vm, node, e, s,
+ &n_tx_packets);
+ if (PREDICT_TRUE (rv == SESSION_TX_OK))
+ {
+ session_dequeue_notify (s);
+ }
+ else if (PREDICT_FALSE (rv == SESSION_TX_NO_BUFFERS))
{
vlib_node_increment_counter (vm, node->node_index,
SESSION_QUEUE_ERROR_NO_BUFFER, 1);
case FIFO_EVENT_DISCONNECT:
/* Make sure stream disconnects run after the pending list is
* drained */
- s0 = session_get_from_handle (e0->session_handle);
- if (!e0->postponed)
+ s = session_get_from_handle (e->session_handle);
+ if (!e->postponed)
{
- e0->postponed = 1;
- vec_add1 (smm->pending_disconnects[thread_index], *e0);
+ e->postponed = 1;
+ vec_add1 (smm->pending_disconnects[thread_index], *e);
continue;
}
/* If tx queue is still not empty, wait */
- if (svm_fifo_max_dequeue (s0->server_tx_fifo))
+ if (svm_fifo_max_dequeue (s->server_tx_fifo))
{
- vec_add1 (smm->pending_disconnects[thread_index], *e0);
+ vec_add1 (smm->pending_disconnects[thread_index], *e);
continue;
}
- stream_session_disconnect_transport (s0);
+ stream_session_disconnect_transport (s);
break;
case FIFO_EVENT_BUILTIN_RX:
- s0 = session_event_get_session (e0, thread_index);
- if (PREDICT_FALSE (!s0))
+ s = session_event_get_session (e, thread_index);
+ if (PREDICT_FALSE (!s))
continue;
- svm_fifo_unset_event (s0->server_rx_fifo);
- app = application_get (s0->app_index);
- app->cb_fns.builtin_app_rx_callback (s0);
+ svm_fifo_unset_event (s->server_rx_fifo);
+ app = application_get (s->app_index);
+ app->cb_fns.builtin_app_rx_callback (s);
break;
case FIFO_EVENT_RPC:
- fp = e0->rpc_args.fp;
- (*fp) (e0->rpc_args.arg);
+ fp = e->rpc_args.fp;
+ (*fp) (e->rpc_args.arg);
break;
default:
- clib_warning ("unhandled event type %d", e0->event_type);
+ clib_warning ("unhandled event type %d", e->event_type);
}
}
- _vec_len (my_fifo_events) = 0;
- smm->free_event_vector[thread_index] = my_fifo_events;
+ _vec_len (fifo_events) = 0;
+ smm->free_event_vector[thread_index] = fifo_events;
vlib_node_increment_counter (vm, session_queue_node.index,
SESSION_QUEUE_ERROR_TX, n_tx_packets);
};
/* *INDENT-ON* */
+void
+dump_thread_0_event_queue (void)
+{
+ session_manager_main_t *smm = vnet_get_session_manager_main ();
+ vlib_main_t *vm = &vlib_global_main;
+ u32 my_thread_index = vm->thread_index;
+ session_fifo_event_t _e, *e = &_e;
+ stream_session_t *s0;
+ int i, index;
+ i8 *headp;
+
+ svm_queue_t *q;
+ q = smm->vpp_event_queues[my_thread_index];
+
+ index = q->head;
+
+ for (i = 0; i < q->cursize; i++)
+ {
+ headp = (i8 *) (&q->data[0] + q->elsize * index);
+ clib_memcpy (e, headp, q->elsize);
+
+ switch (e->event_type)
+ {
+ case FIFO_EVENT_APP_TX:
+ s0 = session_event_get_session (e, my_thread_index);
+ fformat (stdout, "[%04d] TX session %d\n", i, s0->session_index);
+ break;
+
+ case FIFO_EVENT_DISCONNECT:
+ s0 = session_get_from_handle (e->session_handle);
+ fformat (stdout, "[%04d] disconnect session %d\n", i,
+ s0->session_index);
+ break;
+
+ case FIFO_EVENT_BUILTIN_RX:
+ s0 = session_event_get_session (e, my_thread_index);
+ fformat (stdout, "[%04d] builtin_rx %d\n", i, s0->session_index);
+ break;
+
+ case FIFO_EVENT_RPC:
+ fformat (stdout, "[%04d] RPC call %llx with %llx\n",
+ i, (u64) (e->rpc_args.fp), (u64) (e->rpc_args.arg));
+ break;
+
+ default:
+ fformat (stdout, "[%04d] unhandled event type %d\n",
+ i, e->event_type);
+ break;
+ }
+
+ index++;
+
+ if (index == q->maxsize)
+ index = 0;
+ }
+}
+
+static u8
+session_node_cmp_event (session_fifo_event_t * e, svm_fifo_t * f)
+{
+ stream_session_t *s;
+ switch (e->event_type)
+ {
+ case FIFO_EVENT_APP_RX:
+ case FIFO_EVENT_APP_TX:
+ case FIFO_EVENT_BUILTIN_RX:
+ if (e->fifo == f)
+ return 1;
+ break;
+ case FIFO_EVENT_DISCONNECT:
+ break;
+ case FIFO_EVENT_RPC:
+ s = session_get_from_handle (e->session_handle);
+ if (!s)
+ {
+ clib_warning ("session has event but doesn't exist!");
+ break;
+ }
+ if (s->server_rx_fifo == f || s->server_tx_fifo == f)
+ return 1;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+u8
+session_node_lookup_fifo_event (svm_fifo_t * f, session_fifo_event_t * e)
+{
+ session_manager_main_t *smm = vnet_get_session_manager_main ();
+ svm_queue_t *q;
+ session_fifo_event_t *pending_event_vector, *evt;
+ int i, index, found = 0;
+ i8 *headp;
+ u8 thread_index;
+
+ ASSERT (e);
+ thread_index = f->master_thread_index;
+ /*
+ * Search evt queue
+ */
+ q = smm->vpp_event_queues[thread_index];
+ index = q->head;
+ for (i = 0; i < q->cursize; i++)
+ {
+ headp = (i8 *) (&q->data[0] + q->elsize * index);
+ clib_memcpy (e, headp, q->elsize);
+ found = session_node_cmp_event (e, f);
+ if (found)
+ return 1;
+ if (++index == q->maxsize)
+ index = 0;
+ }
+ /*
+ * Search pending events vector
+ */
+ pending_event_vector = smm->pending_event_vector[thread_index];
+ vec_foreach (evt, pending_event_vector)
+ {
+ found = session_node_cmp_event (evt, f);
+ if (found)
+ {
+ clib_memcpy (e, evt, sizeof (*evt));
+ break;
+ }
+ }
+ return found;
+}
+
static clib_error_t *
session_queue_exit (vlib_main_t * vm)
{
Code Review / vpp.git / commitdiff