net/sfc: support API to negotiate delivery of Rx metadata

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

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index d61a055..e9d9db0 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -268,7 +268,7 @@ struct fwd_lcore {
  *     Forwards packets unchanged on the same port.
  *     Check that sent IEEE1588 PTP packets are timestamped by the hardware.
  */
-typedef void (*port_fwd_begin_t)(portid_t pi);
+typedef int (*port_fwd_begin_t)(portid_t pi);
 typedef void (*port_fwd_end_t)(portid_t pi);
 typedef void (*packet_fwd_t)(struct fwd_stream *fs);
 
@@ -479,6 +479,7 @@ extern uint8_t txonly_multi_flow;
 
 extern uint16_t nb_pkt_per_burst;
 extern uint16_t nb_pkt_flowgen_clones;
+extern int nb_flows_flowgen;
 extern uint16_t mb_mempool_cache;
 extern int8_t rx_pthresh;
 extern int8_t rx_hthresh;
@@ -632,6 +633,15 @@ extern enum rte_eth_rx_mq_mode rx_mq_mode;
 
 extern struct rte_flow_action_conntrack conntrack_context;
 
+extern int proc_id;
+extern unsigned int num_procs;
+
+static inline bool
+is_proc_primary(void)
+{
+       return rte_eal_process_type() == RTE_PROC_PRIMARY;
+}
+
 static inline unsigned int
 lcore_num(void)
 {
@@ -687,7 +697,7 @@ port_pci_reg_read(struct rte_port *port, uint32_t reg_off)
        uint32_t reg_v;
 
        if (!port->dev_info.device) {
-               printf("Invalid device\n");
+               fprintf(stderr, "Invalid device\n");
                return 0;
        }
 
@@ -695,7 +705,7 @@ port_pci_reg_read(struct rte_port *port, uint32_t reg_off)
        if (bus && !strcmp(bus->name, "pci")) {
                pci_dev = RTE_DEV_TO_PCI(port->dev_info.device);
        } else {
-               printf("Not a PCI device\n");
+               fprintf(stderr, "Not a PCI device\n");
                return 0;
        }
 
@@ -715,7 +725,7 @@ port_pci_reg_write(struct rte_port *port, uint32_t reg_off, uint32_t reg_v)
        void *reg_addr;
 
        if (!port->dev_info.device) {
-               printf("Invalid device\n");
+               fprintf(stderr, "Invalid device\n");
                return;
        }
 
@@ -723,7 +733,7 @@ port_pci_reg_write(struct rte_port *port, uint32_t reg_off, uint32_t reg_v)
        if (bus && !strcmp(bus->name, "pci")) {
                pci_dev = RTE_DEV_TO_PCI(port->dev_info.device);
        } else {
-               printf("Not a PCI device\n");
+               fprintf(stderr, "Not a PCI device\n");
                return;
        }