Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
STL traffic: Use the sleep+stop logic
[csit.git]
/
GPL
/
tools
/
trex
/
trex_stl_profile.py
diff --git
a/GPL/tools/trex/trex_stl_profile.py
b/GPL/tools/trex/trex_stl_profile.py
index
8dbc046
..
4eedc80
100644
(file)
--- a/
GPL/tools/trex/trex_stl_profile.py
+++ b/
GPL/tools/trex/trex_stl_profile.py
@@
-80,6
+80,7
@@
def simple_burst(
async_start=False,
traffic_directions=2,
force=False,
async_start=False,
traffic_directions=2,
force=False,
+ delay=0.0,
):
"""Send traffic and measure packet loss and latency.
):
"""Send traffic and measure packet loss and latency.
@@
-108,6
+109,7
@@
def simple_burst(
:param async_start: Start the traffic and exit.
:param traffic_directions: Bidirectional (2) or unidirectional (1) traffic.
:param force: Force start regardless of ports state.
:param async_start: Start the traffic and exit.
:param traffic_directions: Bidirectional (2) or unidirectional (1) traffic.
:param force: Force start regardless of ports state.
+ :param delay: Sleep overhead [s].
:type profile_file: str
:type framesize: int or str
:type duration: float
:type profile_file: str
:type framesize: int or str
:type duration: float
@@
-118,6
+120,7
@@
def simple_burst(
:type async_start: bool
:type traffic_directions: int
:type force: bool
:type async_start: bool
:type traffic_directions: int
:type force: bool
+ :type delay: float
"""
client = None
total_rcvd = 0
"""
client = None
total_rcvd = 0
@@
-201,18
+204,20
@@
def simple_burst(
xsnap1 = client.ports[1].get_xstats().reference_stats
print(f"Xstats snapshot 1: {xsnap1!r}")
else:
xsnap1 = client.ports[1].get_xstats().reference_stats
print(f"Xstats snapshot 1: {xsnap1!r}")
else:
- # Block until done:
time_start = time.monotonic()
time_start = time.monotonic()
- client.wait_on_traffic(ports=ports, timeout=duration+30)
+ # wait_on_traffic fails if duration stretches by 30 seconds or more.
+ # TRex has some overhead, wait some more.
+ time.sleep(duration + delay)
+ client.stop()
time_stop = time.monotonic()
time_stop = time.monotonic()
- approximated_duration = time_stop - time_start
-
+ approximated_duration = time_stop - time_start - delay
+ # Read the stats after the traffic stopped (or time up).
+ stats = client.get_stats()
if client.get_warnings():
for warning in client.get_warnings():
print(warning)
if client.get_warnings():
for warning in client.get_warnings():
print(warning)
-
- # Read the stats after the test
- stats = client.get_stats()
+ # Now finish the complete reset.
+ client.reset()
print(u"##### Statistics #####")
print(json.dumps(stats, indent=4, separators=(u",", u": ")))
print(u"##### Statistics #####")
print(json.dumps(stats, indent=4, separators=(u",", u": ")))
@@
-314,6
+319,10
@@
def main():
u"--force", action=u"store_true", default=False,
help=u"Force start regardless of ports state."
)
u"--force", action=u"store_true", default=False,
help=u"Force start regardless of ports state."
)
+ parser.add_argument(
+ u"--delay", required=True, type=float, default=0.0,
+ help=u"Delay assumed for traffic, sleep time is increased by this [s]."
+ )
args = parser.parse_args()
args = parser.parse_args()
@@
-333,6
+342,7
@@
def main():
async_start=args.async_start,
traffic_directions=args.traffic_directions,
force=args.force,
async_start=args.async_start,
traffic_directions=args.traffic_directions,
force=args.force,
+ delay=args.delay,
)
)