devargs: make device representation generic

[dpdk.git] / app / test-pmd / testpmd.c

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index b29328a..308c1b7 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -98,6 +98,7 @@ uint16_t verbose_level = 0; /**< Silent by default. */
 /* use master core for command line ? */
 uint8_t interactive = 0;
 uint8_t auto_start = 0;
+uint8_t tx_first;
 char cmdline_filename[PATH_MAX] = {0};
 
 /*
@@ -180,7 +181,7 @@ uint32_t burst_tx_retry_num = BURST_TX_RETRIES;
 uint16_t mbuf_data_size = DEFAULT_MBUF_DATA_SIZE; /**< Mbuf data space size. */
 uint32_t param_total_num_mbufs = 0;  /**< number of mbufs in all pools - if
                                       * specified on command-line. */
-
+uint16_t stats_period; /**< Period to show statistics (disabled by default) */
 /*
  * Configuration of packet segments used by the "txonly" processing engine.
  */
@@ -381,9 +382,9 @@ uint8_t bitrate_enabled;
 /* Forward function declarations */
 static void map_port_queue_stats_mapping_registers(uint8_t pi, struct rte_port *port);
 static void check_all_ports_link_status(uint32_t port_mask);
-static void eth_event_callback(uint8_t port_id,
-                              enum rte_eth_event_type type,
-                              void *param);
+static int eth_event_callback(uint8_t port_id,
+                             enum rte_eth_event_type type,
+                             void *param, void *ret_param);
 
 /*
  * Check if all the ports are started.
@@ -1809,28 +1810,22 @@ static void
 rmv_event_callback(void *arg)
 {
        struct rte_eth_dev *dev;
-       struct rte_devargs *da;
-       char name[32] = "";
        uint8_t port_id = (intptr_t)arg;
 
        RTE_ETH_VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
-       da = dev->device->devargs;
 
        stop_port(port_id);
        close_port(port_id);
-       if (da->type == RTE_DEVTYPE_VIRTUAL)
-               snprintf(name, sizeof(name), "%s", da->virt.drv_name);
-       else if (da->type == RTE_DEVTYPE_WHITELISTED_PCI)
-               rte_pci_device_name(&da->pci.addr, name, sizeof(name));
-       printf("removing device %s\n", name);
-       rte_eal_dev_detach(name);
+       printf("removing device %s\n", dev->device->name);
+       rte_eal_dev_detach(dev->device);
        dev->state = RTE_ETH_DEV_UNUSED;
 }
 
 /* This function is used by the interrupt thread */
-static void
-eth_event_callback(uint8_t port_id, enum rte_eth_event_type type, void *param)
+static int
+eth_event_callback(uint8_t port_id, enum rte_eth_event_type type, void *param,
+                 void *ret_param)
 {
        static const char * const event_desc[] = {
                [RTE_ETH_EVENT_UNKNOWN] = "Unknown",
@@ -1844,6 +1839,7 @@ eth_event_callback(uint8_t port_id, enum rte_eth_event_type type, void *param)
        };
 
        RTE_SET_USED(param);
+       RTE_SET_USED(ret_param);
 
        if (type >= RTE_ETH_EVENT_MAX) {
                fprintf(stderr, "\nPort %" PRIu8 ": %s called upon invalid event %d\n",
@@ -1864,6 +1860,7 @@ eth_event_callback(uint8_t port_id, enum rte_eth_event_type type, void *param)
        default:
                break;
        }
+       return 0;
 }
 
 static int
@@ -2231,6 +2228,21 @@ force_quit(void)
        prompt_exit();
 }
 
+static void
+print_stats(void)
+{
+       uint8_t i;
+       const char clr[] = { 27, '[', '2', 'J', '\0' };
+       const char top_left[] = { 27, '[', '1', ';', '1', 'H', '\0' };
+
+       /* Clear screen and move to top left */
+       printf("%s%s", clr, top_left);
+
+       printf("\nPort statistics ====================================");
+       for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++)
+               nic_stats_display(fwd_ports_ids[i]);
+}
+
 static void
 signal_handler(int signum)
 {
@@ -2294,6 +2306,9 @@ main(int argc, char** argv)
        if (argc > 1)
                launch_args_parse(argc, argv);
 
+       if (tx_first && interactive)
+               rte_exit(EXIT_FAILURE, "--tx-first cannot be used on "
+                               "interactive mode.\n");
        if (!nb_rxq && !nb_txq)
                printf("Warning: Either rx or tx queues should be non-zero\n");
 
@@ -2353,7 +2368,29 @@ main(int argc, char** argv)
                int rc;
 
                printf("No commandline core given, start packet forwarding\n");
-               start_packet_forwarding(0);
+               start_packet_forwarding(tx_first);
+               if (stats_period != 0) {
+                       uint64_t prev_time = 0, cur_time, diff_time = 0;
+                       uint64_t timer_period;
+
+                       /* Convert to number of cycles */
+                       timer_period = stats_period * rte_get_timer_hz();
+
+                       while (1) {
+                               cur_time = rte_get_timer_cycles();
+                               diff_time += cur_time - prev_time;
+
+                               if (diff_time >= timer_period) {
+                                       print_stats();
+                                       /* Reset the timer */
+                                       diff_time = 0;
+                               }
+                               /* Sleep to avoid unnecessary checks */
+                               prev_time = cur_time;
+                               sleep(1);
+                       }
+               }
+
                printf("Press enter to exit\n");
                rc = read(0, &c, 1);
                pmd_test_exit();