measurestack: Fix+test printf measurement

1 files changed, 9 insertions, 9 deletions

diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py
index a7d4647..8eda36c 100644
--- a/build-aux/measurestack/app_plugins.py
+++ b/build-aux/measurestack/app_plugins.py
@@ -136,11 +136,11 @@ class LibMiscPlugin:
         }
 
     def _skipmodel___assert_msg_fail(
-        self, chain: typing.Sequence[QName], call: QName
+        self, chain: typing.Sequence[QName], node: Node, call: QName
     ) -> bool:
         if call.base() in [BaseName("__lm_printf"), BaseName("__lm_light_printf")]:
             return any(
-                c.base() == BaseName("__assert_msg_fail") for c in reversed(chain[:-1])
+                c.base() == BaseName("__assert_msg_fail") for c in reversed(chain)
             )
         return False
 
@@ -399,15 +399,15 @@ class Lib9PPlugin:
     def skipmodels(self) -> dict[BaseName, analyze.SkipModel]:
         ret: dict[BaseName, analyze.SkipModel] = {
             BaseName("_lib9p_validate"): analyze.SkipModel(
-                2,
+                1,
                 self._skipmodel__lib9p_validate_unmarshal_marshal,
             ),
             BaseName("_lib9p_unmarshal"): analyze.SkipModel(
-                2,
+                1,
                 self._skipmodel__lib9p_validate_unmarshal_marshal,
             ),
             BaseName("_lib9p_marshal"): analyze.SkipModel(
-                2,
+                1,
                 self._skipmodel__lib9p_validate_unmarshal_marshal,
             ),
             BaseName("_vfctprintf"): analyze.SkipModel(
@@ -417,9 +417,9 @@ class Lib9PPlugin:
         return ret
 
     def _skipmodel__lib9p_validate_unmarshal_marshal(
-        self, chain: typing.Sequence[QName], call: QName
+        self, chain: typing.Sequence[QName], node: Node, call: QName
     ) -> bool:
-        m_caller = self.re_lib9p_caller.fullmatch(str(chain[-2].base()))
+        m_caller = self.re_lib9p_caller.fullmatch(str(chain[-1].base()))
         assert m_caller
 
         m_callee = self.re_lib9p_callee.fullmatch(str(call.base()))
@@ -428,7 +428,7 @@ class Lib9PPlugin:
         return m_caller.group("grp") != m_callee.group("grp")
 
     def _skipmodel__vfctprintf(
-        self, chain: typing.Sequence[QName], call: QName
+        self, chain: typing.Sequence[QName], node: Node, call: QName
     ) -> bool:
         if call.base() == BaseName("libfmt_conv_formatter"):
             return any(c.base() in self.formatters for c in chain)
@@ -510,7 +510,7 @@ class PicoFmtPlugin:
         return ret
 
     def _skipmodel_fmt_state_putchar(
-        self, chain: typing.Sequence[QName], call: QName
+        self, chain: typing.Sequence[QName], node: Node, call: QName
     ) -> bool:
         if call.base() in self.known_fct.values():
             fct: BaseName | None = None