lib9p: Adjust _lib9p_{validate,unmarshal,marshal} to be macros, not functions

1 files changed, 23 insertions, 39 deletions

diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py
index f9dfe40..1fb0355 100644
--- a/build-aux/measurestack/app_plugins.py
+++ b/build-aux/measurestack/app_plugins.py
@@ -255,13 +255,7 @@ class LibCRIPCPlugin:
 
 
 class Lib9PPlugin:
-    re_lib9p_msg_entry = re.compile(r"^\s*_MSG_(?:[A-Z]+)\((?P<typ>\S+)\),$")
-    re_lib9p_caller = re.compile(
-        r"^lib9p_(?P<grp>[TR])msg_(?P<meth>validate|unmarshal|marshal)$"
-    )
-    re_lib9p_callee = re.compile(
-        r"^(?P<meth>validate|unmarshal|marshal)_(?P<msg>(?P<grp>[TR]).*)$"
-    )
+    re_lib9p_msg_entry = re.compile(r"^\s*_MSG\((?P<typ>\S+)\),$")
 
     lib9p_msgs: set[str]
     _CONFIG_9P_MAX_CONNS: int | None
@@ -297,7 +291,7 @@ class Lib9PPlugin:
         )
 
         lib9p_generated_c_fname = util.get_zero_or_one(
-            lambda fname: fname.endswith("lib9p/_core_generated.c"), arg_c_fnames
+            lambda fname: fname.endswith("lib9p/core_generated.c"), arg_c_fnames
         )
 
         # Read config ##########################################################
@@ -350,45 +344,35 @@ class Lib9PPlugin:
     def extra_nodes(self) -> typing.Collection[Node]:
         return []
 
+    re_table_call = re.compile(
+        r"\s*_lib9p_(?P<meth>validate|unmarshal|marshal)\(.*(?P<grp>[RT])msg.*\);\s*"
+    )
+    re_print_call = re.compile(r".*lib9p_table_msg.*\.box_as_fmt_formatter\(.*")
+
     def indirect_callees(
         self, loc: str, line: str
     ) -> tuple[typing.Collection[QName], bool] | None:
         if "/3rd-party/" in loc:
             return None
-        if self.lib9p_msgs and "/9p.c:" in loc:
-            for meth in ["validate", "unmarshal", "marshal"]:
-                if line.startswith(f"tentry.{meth}("):
-                    # Functions for disabled protocol extensions will be missing.
-                    return [QName(f"{meth}_{msg}") for msg in self.lib9p_msgs], True
+        if self.lib9p_msgs and "lib9p/core.c:" in loc:
+            if m := self.re_table_call.fullmatch(line):
+                meth = m.group("meth")
+                grp = m.group("grp")
+                # Functions for disabled protocol extensions will be missing.
+                return [
+                    QName(f"{meth}_{msg}")
+                    for msg in self.lib9p_msgs
+                    if msg.startswith(grp)
+                ], True
+            if self.re_print_call.fullmatch(line):
+                # Functions for disabled protocol extensions will be missing.
+                return [
+                    QName(f"lib9p_msg_{msg}_format") for msg in self.lib9p_msgs
+                ], True
         return None
 
     def skipmodels(self) -> dict[BaseName, analyze.SkipModel]:
-        ret: dict[BaseName, analyze.SkipModel] = {
-            BaseName("_lib9p_validate"): analyze.SkipModel(
-                1,
-                self._skipmodel__lib9p_validate_unmarshal_marshal,
-            ),
-            BaseName("_lib9p_unmarshal"): analyze.SkipModel(
-                1,
-                self._skipmodel__lib9p_validate_unmarshal_marshal,
-            ),
-            BaseName("_lib9p_marshal"): analyze.SkipModel(
-                1,
-                self._skipmodel__lib9p_validate_unmarshal_marshal,
-            ),
-        }
-        return ret
-
-    def _skipmodel__lib9p_validate_unmarshal_marshal(
-        self, chain: typing.Sequence[QName], node: Node, call: QName
-    ) -> bool:
-        m_caller = self.re_lib9p_caller.fullmatch(str(chain[-1].base()))
-        assert m_caller
-
-        m_callee = self.re_lib9p_callee.fullmatch(str(call.base()))
-        if not m_callee:
-            return False
-        return m_caller.group("grp") != m_callee.group("grp")
+        return {}
 
 
 class PicoFmtPlugin: