ring: guarantee load/load order in enqueue and dequeue

[dpdk.git] / examples / qos_sched / main.h

diff --git a/examples/qos_sched/main.h b/examples/qos_sched/main.h
index 971ec27..77b6e3e 100644 (file)
--- a/examples/qos_sched/main.h
+++ b/examples/qos_sched/main.h
@@ -50,7 +50,6 @@ extern "C" {
 #define APP_RX_DESC_DEFAULT 128
 #define APP_TX_DESC_DEFAULT 256
 
-#define MBUF_SIZE (1528 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 #define APP_RING_SIZE (8*1024)
 #define NB_MBUF   (2*1024*1024)
 
@@ -69,9 +68,17 @@ extern "C" {
 
 #define BURST_TX_DRAIN_US 100
 
-#define MAX_DATA_STREAMS (RTE_MAX_LCORE/2)
+#ifndef APP_MAX_LCORE
+#if (RTE_MAX_LCORE > 64)
+#define APP_MAX_LCORE 64
+#else
+#define APP_MAX_LCORE RTE_MAX_LCORE
+#endif
+#endif
+
+#define MAX_DATA_STREAMS (APP_MAX_LCORE/2)
 #define MAX_SCHED_SUBPORTS             8
-#define MAX_SCHED_PIPES                4096
+#define MAX_SCHED_PIPES                4096
 
 #ifndef APP_COLLECT_STAT
 #define APP_COLLECT_STAT               1
@@ -99,8 +106,8 @@ struct thread_conf
        uint32_t n_mbufs;
        struct rte_mbuf **m_table;
 
-       uint8_t rx_port;
-       uint8_t tx_port;
+       uint16_t rx_port;
+       uint16_t tx_port;
        uint16_t rx_queue;
        uint16_t tx_queue;
        struct rte_ring *rx_ring;
@@ -118,8 +125,8 @@ struct flow_conf
        uint32_t rx_core;
        uint32_t wt_core;
        uint32_t tx_core;
-       uint8_t rx_port;
-       uint8_t tx_port;
+       uint16_t rx_port;
+       uint16_t tx_port;
        uint16_t rx_queue;
        uint16_t tx_queue;
        struct rte_ring *rx_ring;
@@ -181,13 +188,15 @@ void app_worker_thread(struct thread_conf **qconf);
 void app_mixed_thread(struct thread_conf **qconf);
 
 void app_stat(void);
-int subport_stat(uint8_t port_id, uint32_t subport_id);
-int pipe_stat(uint8_t port_id, uint32_t subport_id, uint32_t pipe_id);
-int qavg_q(uint8_t port_id, uint32_t subport_id, uint32_t pipe_id, uint8_t tc, uint8_t q);
-int qavg_tcpipe(uint8_t port_id, uint32_t subport_id, uint32_t pipe_id, uint8_t tc);
-int qavg_pipe(uint8_t port_id, uint32_t subport_id, uint32_t pipe_id);
-int qavg_tcsubport(uint8_t port_id, uint32_t subport_id, uint8_t tc);
-int qavg_subport(uint8_t port_id, uint32_t subport_id);
+int subport_stat(uint16_t port_id, uint32_t subport_id);
+int pipe_stat(uint16_t port_id, uint32_t subport_id, uint32_t pipe_id);
+int qavg_q(uint16_t port_id, uint32_t subport_id, uint32_t pipe_id,
+          uint8_t tc, uint8_t q);
+int qavg_tcpipe(uint16_t port_id, uint32_t subport_id, uint32_t pipe_id,
+               uint8_t tc);
+int qavg_pipe(uint16_t port_id, uint32_t subport_id, uint32_t pipe_id);
+int qavg_tcsubport(uint16_t port_id, uint32_t subport_id, uint8_t tc);
+int qavg_subport(uint16_t port_id, uint32_t subport_id);
 
 #ifdef __cplusplus
 }