git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
metrics: fix variable declaration in header
[dpdk.git]
/
app
/
test-pmd
/
flowgen.c
diff --git
a/app/test-pmd/flowgen.c
b/app/test-pmd/flowgen.c
index
4bd351e
..
cabfc68
100644
(file)
--- a/
app/test-pmd/flowgen.c
+++ b/
app/test-pmd/flowgen.c
@@
-53,8
+53,11
@@
static struct rte_ether_addr cfg_ether_dst =
#define IP_DEFTTL 64 /* from RFC 1340. */
#define IP_DEFTTL 64 /* from RFC 1340. */
+/* Use this type to inform GCC that ip_sum violates aliasing rules. */
+typedef unaligned_uint16_t alias_int16_t __attribute__((__may_alias__));
+
static inline uint16_t
static inline uint16_t
-ip_sum(const
unaligned_u
int16_t *hdr, int hdr_len)
+ip_sum(const
alias_
int16_t *hdr, int hdr_len)
{
uint32_t sum = 0;
{
uint32_t sum = 0;
@@
-97,16
+100,10
@@
pkt_burst_flow_gen(struct fwd_stream *fs)
uint16_t i;
uint32_t retry;
uint64_t tx_offloads;
uint16_t i;
uint32_t retry;
uint64_t tx_offloads;
-#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
- uint64_t start_tsc;
- uint64_t end_tsc;
- uint64_t core_cycles;
-#endif
+ uint64_t start_tsc = 0;
static int next_flow = 0;
static int next_flow = 0;
-#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
- start_tsc = rte_rdtsc();
-#endif
+ get_start_cycles(&start_tsc);
/* Receive a burst of packets and discard them. */
nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst,
/* Receive a burst of packets and discard them. */
nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst,
@@
-156,7
+153,7
@@
pkt_burst_flow_gen(struct fwd_stream *fs)
next_flow);
ip_hdr->total_length = RTE_CPU_TO_BE_16(pkt_size -
sizeof(*eth_hdr));
next_flow);
ip_hdr->total_length = RTE_CPU_TO_BE_16(pkt_size -
sizeof(*eth_hdr));
- ip_hdr->hdr_checksum = ip_sum((
unaligned_u
int16_t *)ip_hdr,
+ ip_hdr->hdr_checksum = ip_sum((
const alias_
int16_t *)ip_hdr,
sizeof(*ip_hdr));
/* Initialize UDP header. */
sizeof(*ip_hdr));
/* Initialize UDP header. */
@@
-194,9
+191,7
@@
pkt_burst_flow_gen(struct fwd_stream *fs)
}
fs->tx_packets += nb_tx;
}
fs->tx_packets += nb_tx;
-#ifdef RTE_TEST_PMD_RECORD_BURST_STATS
- fs->tx_burst_stats.pkt_burst_spread[nb_tx]++;
-#endif
+ inc_tx_burst_stats(fs, nb_tx);
if (unlikely(nb_tx < nb_pkt)) {
/* Back out the flow counter. */
next_flow -= (nb_pkt - nb_tx);
if (unlikely(nb_tx < nb_pkt)) {
/* Back out the flow counter. */
next_flow -= (nb_pkt - nb_tx);
@@
-207,11
+202,8
@@
pkt_burst_flow_gen(struct fwd_stream *fs)
rte_pktmbuf_free(pkts_burst[nb_tx]);
} while (++nb_tx < nb_pkt);
}
rte_pktmbuf_free(pkts_burst[nb_tx]);
} while (++nb_tx < nb_pkt);
}
-#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
- end_tsc = rte_rdtsc();
- core_cycles = (end_tsc - start_tsc);
- fs->core_cycles = (uint64_t) (fs->core_cycles + core_cycles);
-#endif
+
+ get_end_cycles(fs, start_tsc);
}
struct fwd_engine flow_gen_engine = {
}
struct fwd_engine flow_gen_engine = {