tests: iperf with profiling

tests/common/util.py

@@ -283,7 +283,7 @@ def line_rate_to_pps(args, l1_rate, ipmtu, iptfs_mtu):
     return pps
 
 
-async def start_profile(unet, hostname, tval):
+def start_profile(unet, hostname, tval):
     perfargs = [
         "perf",
         "record",
@@ -298,24 +298,22 @@ async def start_profile(unet, hostname, tval):
         tval,
     ]
     host = unet.hosts[hostname]
-    await host.async_cmd_raises("sysctl -w kernel.perf_cpu_time_max_percent=75")
+    host.cmd_raises("sysctl -w kernel.perf_cpu_time_max_percent=75")
     logging.info("Starting perf-profile on %s for %s", hostname, tval)
 
-    p = await host.async_popen(perfargs, use_pty=True, start_new_session=True)
+    p = host.popen(perfargs, use_pty=True, start_new_session=True)
     p.host = host
     return p
 
 
-async def stop_profile(p, filebase="perf.data"):
+def stop_profile(p, filebase="perf.data"):
     try:
         try:
             # logging.info("signaling perf to exit")
             # p.send_signal(signal.SIGTERM)
             logging.info("waiting for perf to exit")
-            o, e = await asyncio.wait_for(p.communicate(), timeout=5.0)
-            o = o.decode("utf-8")
+            o, e = p.communicate(timeout=5.0)
             o = "\nerror:\n" + o if o else ""
-            e = e.decode("utf-8")
             e = "\nerror:\n" + e if e else ""
             logging.info(
                 "perf rc: %s%s%s",
@@ -338,7 +336,7 @@ async def stop_profile(p, filebase="perf.data"):
             logging.info("terminating perf")
             p.terminate()
             try:
-                _, e = await asyncio.wait_for(p.communicate(), timeout=2.0)
+                _, e = p.communicate(timeout=2.0)
                 logging.warning("perf rc: %s error: %s", p.returncode, e)
             except TimeoutError:
                 logging.warning(

tests/iperf/iperf.py

@@ -128,8 +128,8 @@ async def _test_iperf(
 
     iperfs = h2.popen(sargs)
 
-    tracing = True
-    leakcheck = True
+    tracing = False
+    leakcheck = False
     # watch "awk '/^kmalloc-128/{print \$2}'" /proc/slabinfo
     # perfs = None
     try:
@@ -187,7 +187,7 @@ async def _test_iperf(
                 if ipv6:
                     cargs.append("-V")
 
-        tval = 3
+        tval = 10
 
         if use_iperf3:
             args = [
@@ -227,7 +227,7 @@ async def _test_iperf(
             ]
 
         # Start profiling if enabled
-        perfc = await start_profile(unet, "r1", tval + 1) if profile else None
+        perfc = start_profile(unet, "r1", tval + 1) if profile else None
 
         logging.info("Starting iperf client on h1 for %s", tval)
         # logging.info("Starting iperf3 client on h1 at %s for %s", brate, tval)
@@ -328,13 +328,13 @@ async def _test_iperf(
                     ).strip(), f"leaks found on {rname}"
 
             if perfc:
-                await stop_profile(perfc, filebase=f"perf-{profcount}.data")
+                stop_profile(perfc, filebase=f"perf-{profcount}.data")
                 perfc = None
             # result = json.loads(o)
             # logging.info("Results: %s", json.dumps(result, sort_keys=True, indent=2))
         finally:
             if perfc:
-                await stop_profile(perfc, filebase=f"perf-{profcount}.data")
+                stop_profile(perfc, filebase=f"perf-{profcount}.data")
                 perfc = None
             if tracing:
                 # disable tracing

tests/iperf/test_iperf.py

@@ -126,8 +126,9 @@ async def _unet(rundir_module, pytestconfig):
 # pktsize == 2916 works, 2917+ doesn't
 
 
-@pytest.mark.parametrize("iptfs_opts", ["", "dont-frag"])
-@pytest.mark.parametrize("pktsize", [None, 64, 536, 1442])
+# @pytest.mark.parametrize("iptfs_opts", ["init-delay 500"], scope="function")
+@pytest.mark.parametrize("iptfs_opts", [""], scope="function")
+@pytest.mark.parametrize("pktsize", [None, 88, 536, 1442])
 @pytest.mark.parametrize("ipv6", [False, True])
 @pytest.mark.parametrize("tun_ipv6", [False, True])
 @pytest.mark.parametrize("routed", [False, True])
@@ -180,7 +181,8 @@ async def test_iperf(
     )
     assert result, "No result from test!"
 
-    fname = unet.rundir.joinpath("../speed.csv")
+    rundir = str(unet.rundir)
+    fname = rundir[: rundir.rindex("/")] + "/speed.csv"
     fmode = "w+" if test_iperf.count == 0 else "a+"
     tunstr = "routed" if routed else "policy"
     vstr = "IPv6" if tun_ipv6 else "IPv4"

tests/iperf/test_iperf_phy.py

@@ -110,6 +110,9 @@ async def test_tun_up(lcl_unet, astepf):
 # @pytest.mark.parametrize("routed", [False, True], scope="function")
 
 
+# @pytest.mark.parametrize("iptfs_opts", ["init-delay 1000"], scope="function")
+
+
 @pytest.mark.parametrize("iptfs_opts", [""], scope="function")
 @pytest.mark.parametrize("pktsize", [None, 88, 536, 1442], scope="function")
 @pytest.mark.parametrize("ipv6", [False, True], scope="function")
@@ -153,7 +156,7 @@ async def test_iperf(
     )
     assert result, "No result from test!"
 
-    fname = os.path.join(rundir, "../speed-phy.csv")
+    fname = rundir[: rundir.rindex("/")] + "/speed-phy.csv"
     fmode = "w+" if test_iperf.count == 0 else "a+"
     tunstr = "routed" if routed else "policy"
     vstr = "IPv6" if tun_ipv6 else "IPv4"