- vnet_device_input_runtime_t *rt;
- vnet_device_and_queue_t *dq;
- vlib_node_t *pn = vlib_get_node_by_name (vm, (u8 *) "device-input");
- uword si;
- int index = 0;
-
- /* *INDENT-OFF* */
- foreach_vlib_main (({
- clib_bitmap_foreach (si, pn->sibling_bitmap)
- {
- rt = vlib_node_get_runtime_data (this_vlib_main, si);
-
- if (vec_len (rt->devices_and_queues))
- s = format (s, " node %U:\n", format_vlib_node_name, vm, si);
-
- vec_foreach (dq, rt->devices_and_queues)
- {
- vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm,
- dq->hw_if_index);
- s = format (s, " %U queue %u (%U)\n",
- format_vnet_sw_if_index_name, vnm, hi->sw_if_index,
- dq->queue_id,
- format_vnet_hw_if_rx_mode, dq->mode);
- }
- }
- if (vec_len (s) > 0)
- {
- vlib_cli_output(vm, "Thread %u (%s):\n%v", index,
- vlib_worker_threads[index].name, s);
- vec_reset_length (s);
- }
- index++;
- }));
- /* *INDENT-ON* */
-
+ vnet_hw_if_rx_queue_t **all_queues = 0;
+ vnet_hw_if_rx_queue_t **qptr;
+ vnet_hw_if_rx_queue_t *q;
+ vec_foreach (q, vnm->interface_main.hw_if_rx_queues)
+ vec_add1 (all_queues, q);
+ vec_sort_with_function (all_queues, vnet_hw_if_rxq_cmp_cli_api);
+ u32 prev_node = ~0;
+
+ vec_foreach (qptr, all_queues)
+ {
+ u32 current_thread = qptr[0]->thread_index;
+ u32 hw_if_index = qptr[0]->hw_if_index;
+ vnet_hw_interface_t *hw_if = vnet_get_hw_interface (vnm, hw_if_index);
+ u32 current_node = hw_if->input_node_index;
+ if (current_node != prev_node)
+ s = format (s, " node %U:\n", format_vlib_node_name, vm, current_node);
+ s = format (s, " %U queue %u (%U)\n", format_vnet_sw_if_index_name,
+ vnm, hw_if->sw_if_index, qptr[0]->queue_id,
+ format_vnet_hw_if_rx_mode, qptr[0]->mode);
+ if (qptr == all_queues + vec_len (all_queues) - 1 ||
+ current_thread != qptr[1]->thread_index)
+ {
+ vlib_cli_output (vm, "Thread %u (%s):\n%v", current_thread,
+ vlib_worker_threads[current_thread].name, s);
+ vec_reset_length (s);
+ }
+ prev_node = current_node;
+ }