rosotacom-dev 2.5.dev73__py3-none-any.whl → 2.5.dev74__py3-none-any.whl

rosotacom/cli_benchmark.py

@@ -5614,22 +5614,40 @@ def _make_live_run_point(args: argparse.Namespace, session_name: str) -> RunPoin
                     dist_installs = required_dist_installs(profile_obj)
                     if dist_installs:
                         # Custom delay-distribution tables must exist inside the
-                        # shaping netns before netem references them by name.
+                        # shaping netns before netem references them by name, and
+                        # in the directory this image's `tc` was compiled to read
+                        # -- see tc_lib_dir_probe for why that is not a constant.
+                        from .network_profiles import tc_lib_dir_probe
+
                         for dist_container in (a_container, b_container):
                             if not dist_container:
                                 continue
+                            probe = subprocess.run(
+                                ["docker", "exec", "-u", "root", dist_container, "sh", "-c", tc_lib_dir_probe()],
+                                capture_output=True,
+                                text=True,
+                                check=False,
+                            )
+                            tc_lib_dir = probe.stdout.strip()
+                            if probe.returncode != 0 or not tc_lib_dir.startswith("/"):
+                                raise RuntimeError(
+                                    f"could not locate the tc library directory in {dist_container}: "
+                                    f"{probe.stderr or probe.stdout}"
+                                )
                             for table_name, file_path in dist_installs:
-                                dist_target = f"/usr/lib/tc/{table_name}.dist"
-                                for install_cmd in (
-                                    ["docker", "exec", "-u", "root", dist_container, "mkdir", "-p", "/usr/lib/tc"],
+                                dist_target = f"{tc_lib_dir}/{table_name}.dist"
+                                res = subprocess.run(
                                     ["docker", "cp", file_path, f"{dist_container}:{dist_target}"],
-                                ):
-                                    res = subprocess.run(install_cmd, capture_output=True, text=True, check=False)
-                                    if res.returncode != 0:
-                                        raise RuntimeError(
-                                            f"failed to install netem distribution table {table_name!r} in "
-                                            f"{dist_container}: {' '.join(install_cmd)} -> {res.stderr or res.stdout}"
-                                        )
+                                    capture_output=True,
+                                    text=True,
+                                    check=False,
+                                )
+                                if res.returncode != 0:
+                                    raise RuntimeError(
+                                        f"failed to install netem distribution table {table_name!r} in "
+                                        f"{dist_container}: {file_path} -> {dist_target}: "
+                                        f"{res.stderr or res.stdout}"
+                                    )
                                 print(
                                     f"  netem distribution {table_name!r} installed in {dist_container}: {dist_target}"
                                 )

rosotacom/network_profiles.py

@@ -440,9 +440,46 @@ def _resolve_distribution_files(profile: Profile, base: Path) -> Profile:
     return replace(profile, uplink=fix(profile.uplink), downlink=fix(profile.downlink))
 
 
+#: Where `tc` looks for a delay-distribution table, in the order to try.
+#: iproute2 compiles the directory in (``LIBDIR "/tc"``), so on a multiarch
+#: Debian or Ubuntu build it is ``/usr/lib/<triplet>/tc`` and ``/usr/lib/tc``
+#: does not exist at all. A table written to the latter is then invisible with
+#: no error of its own: netem answers ``No distribution data for <name>`` and
+#: the run dies at arming time, which is what every profile carrying a fitted
+#: table did until this was found. The directory holding iproute2's own tables
+#: is the one it reads, so that is the evidence to look for rather than a
+#: guessed triplet.
+TC_LIB_DIR_CANDIDATES = ("/usr/lib/*-linux-gnu*/tc", "/usr/lib/tc")
+
+#: A table iproute2 ships, used as the marker for "this is the directory".
+TC_LIB_DIR_MARKERS = ("normal.dist", "pareto.dist")
+
+
+def tc_lib_dir_probe(root: str = "") -> str:
+    """A ``sh -c`` program that prints the directory ``tc`` reads tables from.
+
+    Three rungs, in order: a candidate that already holds one of iproute2's own
+    tables (proof, not inference); a candidate that merely exists; and finally
+    ``/usr/lib/tc``, created, for an image that has neither. `root` exists so
+    the rungs are testable without a container.
+    """
+    cands = " ".join(f"{root}{c}" for c in TC_LIB_DIR_CANDIDATES)
+    marker = " || ".join(f'[ -f "$d/{m}" ]' for m in TC_LIB_DIR_MARKERS)
+    fallback = f"{root}/usr/lib/tc"
+    return (
+        f"for d in {cands}; do "
+        f'  if {marker}; then printf %s "$d"; exit 0; fi; '
+        f"done; "
+        f"for d in {cands}; do "
+        f'  if [ -d "$d" ]; then printf %s "$d"; exit 0; fi; '
+        f"done; "
+        f"mkdir -p {fallback} && printf %s {fallback}"
+    )
+
+
 def required_dist_installs(profile: Profile) -> list[tuple[str, str]]:
     """``(table_name, file_path)`` pairs a runner must install as
-    ``/usr/lib/tc/<table_name>.dist`` inside the shaping netns before arming.
+    ``<tc lib dir>/<table_name>.dist`` inside the shaping netns before arming.
 
     Builtin distributions need nothing; duplicates collapse; conflicting files
     for one name are an error (two segments must mean the same table).

{rosotacom_dev-2.5.dev73.dist-info → rosotacom_dev-2.5.dev74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rosotacom-dev
-Version: 2.5.dev73
+Version: 2.5.dev74
 Summary: Host CLI for ROS OTA communication sessions.
 Author: develNor
 License-Expression: BSD-3-Clause

{rosotacom_dev-2.5.dev73.dist-info → rosotacom_dev-2.5.dev74.dist-info}/RECORD

@@ -7,7 +7,7 @@ rosotacom/benchmark.py,sha256=3QoXJtWUGQPwvDWyQT_fOjx6K9G2pmvtnVurA21G2QY,76612
 rosotacom/benchmark_delta.py,sha256=qXzriBkbXOeJdlLKM4ziov1F-JfwlseYHE48S9hjFsQ,10005
 rosotacom/bundle_check.py,sha256=l_3BSuYk6juXQmsNU6jkxRbH8ayH2GkiW9ONKMQ1oJY,18270
 rosotacom/cli.py,sha256=WOl0PLl-tEu28ahHh9HIpu-hmNlD4WcH2b45HzoqMJg,438036
-rosotacom/cli_benchmark.py,sha256=yL5izp7_Y_ngGsx5R8yN2lSUe_Y5qxBYiMArDx4ms5I,355085
+rosotacom/cli_benchmark.py,sha256=IhxiKMl3C7k7zXJAselrjTjcjKAsWGlc16Z_36AVuc0,356021
 rosotacom/deployment.py,sha256=XVhB8JjxhAsglSEEPtiVSeV6fCG0rgGmDRulh14oIYQ,7318
 rosotacom/ffmpeg_packet.py,sha256=zB1BHgY1kexr5sETVMkm4bkVnRytj9k2t0uOYiHUZ6M,4267
 rosotacom/forensics.py,sha256=fxpjuRq3pA1wCf2ERai4SlVnNhJBqZbDh6ETRKODNd0,53576
@@ -15,7 +15,7 @@ rosotacom/geomap.py,sha256=_85kWI-twzS3rf9KxamnFuhlw8Rp_fRk7n7xI-rUMFc,30292
 rosotacom/image_cache.py,sha256=71wC291j8rRMgF1D5pt2gTQdplmiIwnUDXk0BZoQNNQ,7185
 rosotacom/netem_dist.py,sha256=OWtc8asx-ow1wCxDoQuuJwJsFLl7F_lthLWsp-nlK-M,4642
 rosotacom/network_preflight.py,sha256=mQsjVnHP3CPDfHyLsOdobtymcYhcvJbmJRbXm9EgGDs,5532
-rosotacom/network_profiles.py,sha256=GAyVL794zQ3HnGlr1d6GoG5_qDaF5BsXwN9WRGF7kLE,31530
+rosotacom/network_profiles.py,sha256=lUGAAXkJSIwpw7CWGoznKme7b6bC7b73lB56PxgMRAA,33258
 rosotacom/network_shaper.py,sha256=kjn9ZtiO1SMm8UHKIjmn92JBu_hE5TJF6vaNF1XKtNU,5463
 rosotacom/plots.py,sha256=YRGRxuGHSHDZmtL0sv1JS7cPVSL9VzjGYuvMxeHAj54,22674
 rosotacom/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -205,9 +205,9 @@ rosotacom/resources/ws/session/creation/generate_session_files.py,sha256=3Sx4xTS
 rosotacom/resources/ws/session/creation/run_session.py,sha256=G2hJhrmLp11gm3JZ6_C-zZcqu_reXlE_wmobB7BiCfU,16849
 rosotacom/resources/ws/session/creation/run_session_in_external_terminal.py,sha256=Ub_5f-ttUUc-rAPrZmg_Op34s8Z4C91hTyEn8fgyt-E,2633
 rosotacom/resources/ws/session/creation/strip_ansi.py,sha256=vNjpemcq4xHr0VG4x0bZqvgwEBEfOgN-b4PzbrM5nfM,851
-rosotacom_dev-2.5.dev73.dist-info/licenses/LICENSE.txt,sha256=FDB3-fao3lqZ94wsJHKAH7U88kAnfvZhZC8Hm5rN__g,1459
-rosotacom_dev-2.5.dev73.dist-info/METADATA,sha256=Waeqm5ydlo3j0N--3kXVQXNF1QHPikSLYu3Y_dnQ9k0,58884
-rosotacom_dev-2.5.dev73.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-rosotacom_dev-2.5.dev73.dist-info/entry_points.txt,sha256=im11ZWqBbgjQUBz2Ik2RNfMu54wlMwgiVpsBKeI7dCI,49
-rosotacom_dev-2.5.dev73.dist-info/top_level.txt,sha256=BZrtQcIVDWn_pQZR3Mlssqy5SaRXHjOa6B-1D9Fy4Ao,10
-rosotacom_dev-2.5.dev73.dist-info/RECORD,,
+rosotacom_dev-2.5.dev74.dist-info/licenses/LICENSE.txt,sha256=FDB3-fao3lqZ94wsJHKAH7U88kAnfvZhZC8Hm5rN__g,1459
+rosotacom_dev-2.5.dev74.dist-info/METADATA,sha256=nI3Vclf3YkUxefYLlVuE65wu80J6WBxdf_FStvBe-kw,58884
+rosotacom_dev-2.5.dev74.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+rosotacom_dev-2.5.dev74.dist-info/entry_points.txt,sha256=im11ZWqBbgjQUBz2Ik2RNfMu54wlMwgiVpsBKeI7dCI,49
+rosotacom_dev-2.5.dev74.dist-info/top_level.txt,sha256=BZrtQcIVDWn_pQZR3Mlssqy5SaRXHjOa6B-1D9Fy4Ao,10
+rosotacom_dev-2.5.dev74.dist-info/RECORD,,