render: label the component method; drop it from the leak rows

A component's method names a technique category, and five of that
vocabulary's six words -- parsed, inferred, heuristic, timing, brute -- are
also rungs of the confidence ladder, which grades an individual record's
trust instead. Printed bare, the token is read as the second thing. The
verbose block header carried it that way over components that produced
nothing, where it states a verdict on values none were emitted, and over
kernfs_ns_hash, whose header read "parsed" three lines above a record
graded heuristic.

The header now labels it. The label's width is taken from the string
itself, so the rule's column accounting cannot drift from it.

The leak rows drop it. A technique category is a property of the component
that produced a record, not of the record: every contributor states its own
in its block header, and the group's consensus line states the one behind
the pick, now labelled there too. Listed per record it repeated that in a
comma list of component names, as a lowercase token indistinguishable in
form from the names beside it -- and identically on 106 of the 107 rows a
live run produces.

kasld_method_set_str loses its last caller and goes with them. json is
unchanged: it publishes method and methods per record structurally, where
the key names the field. The documented samples follow the rows.

Author: bcoles

docs/usage.md

@@ -305,75 +305,75 @@ Components: 94 total, 24 succeeded, 26 unavailable, 44 no result
 ========================================
 
 Kernel text (virtual) / kernel_text [2]:
-  0xffffffff8fe00000  kernel_text:_stext [base] (proc_kallsyms, parsed)
-  0xffffffff900a9fc9  kernel_text [interior] (perf_event_open, parsed)
-  ==> 0xffffffff8fe00000  (parsed, 1 source, 1 conflict)
+  0xffffffff8fe00000  kernel_text:_stext [base] (proc_kallsyms)
+  0xffffffff900a9fc9  kernel_text [interior] (perf_event_open)
+  ==> 0xffffffff8fe00000  (method: parsed, 1 source, 1 conflict)
       range: 0xffffffff8fe00000 - 0xffffffff900a9fc9  (2.7 MiB)
 
 Kernel text (virtual) / kernel_image [3]:
-  0xffffffff8fe00000  kernel_image:_text [base] (proc_kallsyms, parsed)
-  0xffffffff8fe00000  kernel_image [base] (prefetch, timing)
-  0xffffffff90000000  kernel_image [base] (perf_event_open, parsed)
-  ==> 0xffffffff8fe00000  (parsed, 2 sources, 1 conflict)
+  0xffffffff8fe00000  kernel_image:_text [base] (proc_kallsyms)
+  0xffffffff8fe00000  kernel_image [base] (prefetch)
+  0xffffffff90000000  kernel_image [base] (perf_event_open)
+  ==> 0xffffffff8fe00000  (method: parsed, 2 sources, 1 conflict)
       range: 0xffffffff8fe00000 - 0xffffffff90000000  (2.0 MiB)
 
 ----------------------------------------
 Kernel text (physical) / kernel_image [1]:
-  0x0000000034600000  kernel_image:kernel_code [base] (proc_iomem_kernel, parsed)
-  ==> 0x0000000034600000  (parsed, 1 source)
+  0x0000000034600000  kernel_image:kernel_code [base] (proc_iomem_kernel)
+  ==> 0x0000000034600000  (method: parsed, 1 source)
 
 ----------------------------------------
 Kernel data (physical) / kernel_data [1]:
-  0x0000000036000000  kernel_data:kernel_data [base] (proc_iomem_kernel, parsed)
-  ==> 0x0000000036000000  (parsed, 1 source)
+  0x0000000036000000  kernel_data:kernel_data [base] (proc_iomem_kernel)
+  ==> 0x0000000036000000  (method: parsed, 1 source)
 
 ----------------------------------------
 Kernel BSS (physical) / kernel_bss [1]:
-  0x0000000036b34000  kernel_bss:kernel_bss [base] (proc_iomem_kernel, parsed)
-  ==> 0x0000000036b34000  (parsed, 1 source)
+  0x0000000036b34000  kernel_bss:kernel_bss [base] (proc_iomem_kernel)
+  ==> 0x0000000036b34000  (method: parsed, 1 source)
 
 ----------------------------------------
 Physical DRAM / ram [6]:
-  0x0000000000000000  ram (boot_params_e820, parsed)
-  0x0000000000000000  ram (firmware_memmap, parsed)
-  0x0000000000001000  ram [interior] (dmesg_free_area_init_node, proc_zoneinfo, parsed)
-  0x0000000000100000  ram [base] (boot_params_e820, dmesg_e820_memory_map, dmesg_free_area_init_node, dmesg_last_pfn, proc_zoneinfo, sysfs_firmware_memmap, parsed)
-  0x0000000000100000  ram (firmware_memmap, parsed)
-  0x0000000000100000  ram (boot_params_e820, parsed)
-  ==> 0x0000000000100000  (parsed, 3 sources, 3 conflicts)
+  0x0000000000000000  ram (boot_params_e820)
+  0x0000000000000000  ram (firmware_memmap)
+  0x0000000000001000  ram [interior] (dmesg_free_area_init_node, proc_zoneinfo)
+  0x0000000000100000  ram [base] (boot_params_e820, dmesg_e820_memory_map, dmesg_free_area_init_node, dmesg_last_pfn, proc_zoneinfo, sysfs_firmware_memmap)
+  0x0000000000100000  ram (firmware_memmap)
+  0x0000000000100000  ram (boot_params_e820)
+  ==> 0x0000000000100000  (method: parsed, 3 sources, 3 conflicts)
       range: 0x0000000000000000 - 0x0000000000100000  (1.0 MiB)
 
 ----------------------------------------
 Physical DRAM / initrd [1]:
-  0x000000003efc2000  initrd [base] (boot_params_e820, dmesg_ramdisk, parsed)
-  ==> 0x000000003efc2000  (parsed, 1 source)
+  0x000000003efc2000  initrd [base] (boot_params_e820, dmesg_ramdisk)
+  ==> 0x000000003efc2000  (method: parsed, 1 source)
 
 ----------------------------------------
 Physical DRAM / cmdline [1]:
-  0x0000000000020000  cmdline [base] (cmdline_region, parsed)
-  ==> 0x0000000000020000  (parsed, 1 source)
+  0x0000000000020000  cmdline [base] (cmdline_region)
+  ==> 0x0000000000020000  (method: parsed, 1 source)
 
 ----------------------------------------
 Physical DRAM / numa_node [1]:
-  0x000000003ffdefff  numa_node [interior] (dmesg_node_data, parsed)
-  ==> 0x000000003ffdefff  (parsed, 1 source)
+  0x000000003ffdefff  numa_node [interior] (dmesg_node_data)
+  ==> 0x000000003ffdefff  (method: parsed, 1 source)
 
 ----------------------------------------
 Physical DRAM / vmcoreinfo [1]:
-  0x00000000011ee000  vmcoreinfo [interior] (sysfs_vmcoreinfo, parsed)
-  ==> 0x00000000011ee000  (parsed, 1 source)
+  0x00000000011ee000  vmcoreinfo [interior] (sysfs_vmcoreinfo)
+  ==> 0x00000000011ee000  (method: parsed, 1 source)
 
 ----------------------------------------
 Physical MMIO / pci_mmio [8]:
-  0x00000000000c0000  pci_mmio:0000:00:01.0 [base] (sysfs_pci_resource, parsed)
-  0x00000000fd000000  pci_mmio:0000:00:01.0 [base] (sysfs_pci_resource, parsed)
-  0x00000000feb40000  pci_mmio:0000:00:02.0 [base] (sysfs_pci_resource, parsed)
-  0x00000000feb80000  pci_mmio:0000:00:02.0 [base] (sysfs_pci_resource, parsed)
-  0x00000000feba0000  pci_mmio:0000:00:02.0 [base] (sysfs_pci_resource, parsed)
-  0x00000000febd0000  pci_mmio:0000:00:02.0 [base] (sysfs_pci_resource, parsed)
-  0x00000000febd4000  pci_mmio:0000:00:01.0 [base] (sysfs_pci_resource, parsed)
-  0x00000000febd5000  pci_mmio:0000:00:1f.2 [base] (sysfs_pci_resource, parsed)
-  ==> 0x00000000000c0000  (parsed, 1 source, 7 conflicts)
+  0x00000000000c0000  pci_mmio:0000:00:01.0 [base] (sysfs_pci_resource)
+  0x00000000fd000000  pci_mmio:0000:00:01.0 [base] (sysfs_pci_resource)
+  0x00000000feb40000  pci_mmio:0000:00:02.0 [base] (sysfs_pci_resource)
+  0x00000000feb80000  pci_mmio:0000:00:02.0 [base] (sysfs_pci_resource)
+  0x00000000feba0000  pci_mmio:0000:00:02.0 [base] (sysfs_pci_resource)
+  0x00000000febd0000  pci_mmio:0000:00:02.0 [base] (sysfs_pci_resource)
+  0x00000000febd4000  pci_mmio:0000:00:01.0 [base] (sysfs_pci_resource)
+  0x00000000febd5000  pci_mmio:0000:00:1f.2 [base] (sysfs_pci_resource)
+  ==> 0x00000000000c0000  (method: parsed, 1 source, 7 conflicts)
       range: 0x00000000000c0000 - 0x00000000febd5000  (4.0 GiB)
 
 ----------------------------------------

src/include/kasld/internal.h

@@ -314,26 +314,6 @@ static inline const char *kasld_method_set_strongest(uint16_t set) {
   return "unknown";
 }
 
-/* Format a method set strongest-first as "parsed+timing" into buf ("unknown" if
- * empty). Surfaces method diversity where a single line has room (verbose). */
-static inline void kasld_method_set_str(uint16_t set, char *buf, size_t sz) {
-  if (sz == 0)
-    return;
-  buf[0] = '\0';
-  size_t o = 0;
-  for (int m = KM_COUNT - 1; m >= 0; m--) {
-    if (!(set & (1u << m)))
-      continue;
-    int w = snprintf(buf + o, sz - o, "%s%s", o ? "+" : "",
-                     kasld_method_name((enum kasld_method)m));
-    if (w < 0 || (size_t)w >= sz - o)
-      break;
-    o += (size_t)w;
-  }
-  if (o == 0)
-    snprintf(buf, sz, "unknown");
-}
-
 /* Provenance: which components contributed a record.
  *
  * A component's identity is its slot in the discovery table, assigned once

src/orchestrator.c

@@ -1814,9 +1814,20 @@ static void print_component_banner(const char *name, const char *method) {
   printf("\n%s%s%s %s%s%s", c(C_DIM), bar2, c(C_RESET), c(C_BOLD), name,
          c(C_RESET));
   if (method && *method) {
-    printf(" %s%s%s %s%s%s", c(C_DIM), dot, c(C_RESET), c(C_DIM), method,
-           c(C_RESET));
-    cols += 3 + (int)strlen(method); /* " . " + method */
+    /* Labelled, because the value alone does not say which vocabulary it comes
+     * from. It names a technique category, and five of that vocabulary's six
+     * words -- parsed, inferred, heuristic, timing, brute -- are also rungs of
+     * the confidence ladder, which grades an individual record's trust instead.
+     * A bare word heading a block that produced nothing therefore reads as a
+     * verdict on values the component never emitted, and a component whose
+     * technique parses a file can carry records grading lower than the word
+     * above them. The label is what keeps the two apart. */
+    static const char label[] = "method: ";
+    printf(" %s%s%s %s%s%s%s", c(C_DIM), dot, c(C_RESET), c(C_DIM), label,
+           method, c(C_RESET));
+    /* " . " + label + value; the label's width is taken from the string itself
+     * so the two cannot drift apart. */
+    cols += 3 + (int)(sizeof(label) - 1) + (int)strlen(method);
   }
   putchar(' ');
   cols += 1;

src/render/text.c

@@ -129,9 +129,17 @@ static void print_group(enum kasld_addr_type type, const char *section,
   for (int k = 0; k < n_indices; k++) {
     struct result *r = &results[indices[k]];
 
-    /* Compact form shows region (and ":name" when known); verbose adds
-     * origin and method in parentheses. region+name tells the reader
-     * what the address is; origin tells them which component found it. */
+    /* Compact form shows region (and ":name" when known); verbose adds the
+     * contributing components in parentheses. region+name tells the reader what
+     * the address is; the components tell them who found it.
+     *
+     * The parenthetical carries component names and nothing else. A technique
+     * category is a property of a component, not of a record: every contributor
+     * states its own in its block header, and the group's consensus line states
+     * the one behind the pick. Listed here it would repeat that per record, in
+     * a vocabulary sharing five of six words with the confidence ladder, as a
+     * bare lowercase token indistinguishable in form from the component names
+     * beside it. */
     char rn[64 + NAME_LEN + 2];
     if (r->name[0])
       snprintf(rn, sizeof(rn), "%s:%s", kasld_region_wire(r->region), r->name);
@@ -142,29 +150,25 @@ static void print_group(enum kasld_addr_type type, const char *section,
 
     if (!in_bounds(r)) {
       if (verbose) {
-        char mbuf[64];
-        kasld_method_set_str(r->method_set, mbuf, sizeof mbuf);
         printf("  %s0x%016lx%s  %s%s %s(", c(C_RED), a, c(C_RESET), rn,
                pos_note(r), c(C_DIM));
         for (int j = origin_set_next(&r->origins, 0), oi = 0; j >= 0;
              j = origin_set_next(&r->origins, j + 1), oi++)
           printf("%s%s", oi ? ", " : "", kasld_origin_name(j));
-        printf(", %s, stale)%s\n", mbuf, c(C_RESET));
+        printf(", stale)%s\n", c(C_RESET));
       } else
         printf("  %s0x%016lx%s  %s%s %s(stale)%s\n", c(C_RED), a, c(C_RESET),
                rn, pos_note(r), c(C_DIM), c(C_RESET));
       continue;
     }
 
     if (verbose) {
-      char mbuf[64];
-      kasld_method_set_str(r->method_set, mbuf, sizeof mbuf);
       printf("  %s0x%016lx%s  %s%s %s(", c(C_GREEN), a, c(C_RESET), rn,
              pos_note(r), c(C_DIM));
       for (int j = origin_set_next(&r->origins, 0), oi = 0; j >= 0;
            j = origin_set_next(&r->origins, j + 1), oi++)
         printf("%s%s", oi ? ", " : "", kasld_origin_name(j));
-      printf(", %s)%s\n", mbuf, c(C_RESET));
+      printf(")%s\n", c(C_RESET));
     } else
       printf("  %s0x%016lx%s  %s%s\n", c(C_GREEN), a, c(C_RESET), rn,
              pos_note(r));
@@ -186,7 +190,7 @@ static void print_group(enum kasld_addr_type type, const char *section,
     section_consensus_info(type, section, region_filter, &bm, &ns, &nc, &io);
     /* A lone interior sample is a point inside the region, not its base — say
      * so, rather than presenting it as the resolved address. */
-    printf("  %s==>%s 0x%016lx  %s(%s, %s%d source%s)%s\n", c(C_CYAN),
+    printf("  %s==>%s 0x%016lx  %s(method: %s, %s%d source%s)%s\n", c(C_CYAN),
            c(C_RESET), addrs[0], c(C_DIM), bm, io ? "interior sample; " : "",
            ns, ns == 1 ? "" : "s", c(C_RESET));
   } else if (n_addrs > 1) {
@@ -201,8 +205,8 @@ static void print_group(enum kasld_addr_type type, const char *section,
        * no single base to pick, and the samples corroborate rather than
        * conflict, so the count is "N samples from M sources", never conflicts.
        */
-      printf("  %s==>%s spans 0x%016lx - 0x%016lx  %s(%s; %d samples, %d "
-             "source%s; %s)%s\n",
+      printf("  %s==>%s spans 0x%016lx - 0x%016lx  %s(method: %s; %d "
+             "samples, %d source%s; %s)%s\n",
              c(C_CYAN), c(C_RESET), addrs[0], addrs[n_addrs - 1], c(C_DIM), bm,
              n_addrs, ns, ns == 1 ? "" : "s",
              human_size(span, hbuf, sizeof(hbuf)), c(C_RESET));
@@ -212,11 +216,12 @@ static void print_group(enum kasld_addr_type type, const char *section,
        * coverings and for corroborating interior/top records), so it is printed
        * only when a real disagreement exists. */
       if (nc > 0)
-        printf("  %s==>%s 0x%016lx  %s(%s, %d source%s, %d conflict%s)%s\n",
+        printf("  %s==>%s 0x%016lx  %s(method: %s, %d source%s, %d "
+               "conflict%s)%s\n",
                c(C_CYAN), c(C_RESET), consensus, c(C_DIM), bm, ns,
                ns == 1 ? "" : "s", nc, nc == 1 ? "" : "s", c(C_RESET));
       else
-        printf("  %s==>%s 0x%016lx  %s(%s, %d source%s)%s\n", c(C_CYAN),
+        printf("  %s==>%s 0x%016lx  %s(method: %s, %d source%s)%s\n", c(C_CYAN),
                c(C_RESET), consensus, c(C_DIM), bm, ns, ns == 1 ? "" : "s",
                c(C_RESET));
       printf("  %s   %s range: 0x%016lx - 0x%016lx  (%s)\n", c(C_CYAN),