d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sched: drop credit check debug

Browse Source 
Drop conditional code which was for debugging credit checks.
It is hard to maintain code with any additional #ifdef baggage.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2015-11-13 09:58:30 -08:00 committed by Thomas Monjalon
parent a11d923aa8
commit 9450a3b444
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/librte_sched/rte_sched.c
View File

@ -62,16 +62,6 @@
#define RTE_SCHED_ENQUEUE 1 #define RTE_SCHED_ENQUEUE 1
#define RTE_SCHED_TS 1
#if RTE_SCHED_TS == 0 /* Infinite credits. Traffic shaping disabled. */
#define RTE_SCHED_TS_CREDITS_UPDATE 0
#define RTE_SCHED_TS_CREDITS_CHECK 0
#else /* Real Credits. Full traffic shaping implemented. */
#define RTE_SCHED_TS_CREDITS_UPDATE 1
#define RTE_SCHED_TS_CREDITS_CHECK 1
#endif
#ifndef RTE_SCHED_TB_RATE_CONFIG_ERR #ifndef RTE_SCHED_TB_RATE_CONFIG_ERR
#define RTE_SCHED_TB_RATE_CONFIG_ERR (1e-7) #define RTE_SCHED_TB_RATE_CONFIG_ERR (1e-7)
#endif #endif
@ -1478,11 +1468,7 @@ rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint
#endif /* RTE_SCHED_ENQUEUE */ #endif /* RTE_SCHED_ENQUEUE */
#if RTE_SCHED_TS_CREDITS_UPDATE == 0 #if !defined(RTE_SCHED_SUBPORT_TC_OV)
#define grinder_credits_update(port, pos)
#elif !defined(RTE_SCHED_SUBPORT_TC_OV)
static inline void static inline void
grinder_credits_update(struct rte_sched_port *port, uint32_t pos) grinder_credits_update(struct rte_sched_port *port, uint32_t pos)
@ -1615,7 +1601,6 @@ grinder_credits_update(struct rte_sched_port *port, uint32_t pos)
#endif /* RTE_SCHED_TS_CREDITS_UPDATE, RTE_SCHED_SUBPORT_TC_OV */ #endif /* RTE_SCHED_TS_CREDITS_UPDATE, RTE_SCHED_SUBPORT_TC_OV */
#if RTE_SCHED_TS_CREDITS_CHECK
#ifndef RTE_SCHED_SUBPORT_TC_OV #ifndef RTE_SCHED_SUBPORT_TC_OV
@ -1696,7 +1681,6 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos)
#endif /* RTE_SCHED_SUBPORT_TC_OV */ #endif /* RTE_SCHED_SUBPORT_TC_OV */
#endif /* RTE_SCHED_TS_CREDITS_CHECK */
static inline int static inline int
grinder_schedule(struct rte_sched_port *port, uint32_t pos) grinder_schedule(struct rte_sched_port *port, uint32_t pos)
@ -1706,11 +1690,9 @@ grinder_schedule(struct rte_sched_port *port, uint32_t pos)
struct rte_mbuf *pkt = grinder->pkt; struct rte_mbuf *pkt = grinder->pkt;
uint32_t pkt_len = pkt->pkt_len + port->frame_overhead; uint32_t pkt_len = pkt->pkt_len + port->frame_overhead;
#if RTE_SCHED_TS_CREDITS_CHECK
if (!grinder_credits_check(port, pos)) { if (!grinder_credits_check(port, pos)) {
return 0; return 0;
} }
#endif
/* Advance port time */ /* Advance port time */
port->time += pkt_len; port->time += pkt_len;