Explorar el Código

Stop mirroring compositor stats to the netconsole

The WM wrote /share/wmstats every two seconds and mirrored the same line
into the netlog ring, which flooded make netmon with t=... lines on an
otherwise idle board.

Keep the file for on-demand measurements; drop the netconsole copy and the
docs that described it.
Johannes Zellner hace 1 semana
padre
commit
52b120546f
Se han modificado 4 ficheros con 3 adiciones y 10 borrados
  1. 1 2
      AGENTS.md
  2. 1 1
      docs/development.html
  3. 1 2
      docs/graphics.html
  4. 0 5
      ucmd_wm.c

+ 1 - 2
AGENTS.md

@@ -295,8 +295,7 @@ it to `0x7E00`.  The kernel region itself only has one wall (`_end` below
   and presents only those; `uwm_lib.c` uses row-based RGB565 conversion,
   and presents only those; `uwm_lib.c` uses row-based RGB565 conversion,
   `rep stos`/`rep movs` fills and copies, and counts composited pixels in
   `rep stos`/`rep movs` fills and copies, and counts composited pixels in
   `usurf_pixels`.  The WM writes the last two-second interval to
   `usurf_pixels`.  The WM writes the last two-second interval to
-  `/share/wmstats` (`frames`, `ms`, `max`, `px`) and mirrors the line to the
-  non-blocking netconsole ring (UDP 19290) for on-target measurement.
+  `/share/wmstats` (`frames`, `ms`, `max`, `px`) for on-target measurement.
   `SYS_WIN_INFO`, `SYS_WIN_ACK_RESIZE`, `SYS_WIN_POINTER`, `SYS_WIN_EVENT`,
   `SYS_WIN_INFO`, `SYS_WIN_ACK_RESIZE`, `SYS_WIN_POINTER`, `SYS_WIN_EVENT`,
   `SYS_WIN_KEY_WAIT` and the generic `SYS_KEY_POLL` handle input.  The WM
   `SYS_WIN_KEY_WAIT` and the generic `SYS_KEY_POLL` handle input.  The WM
   composites the front canvas; presented frames carry monotonic seq
   composites the front canvas; presented frames carry monotonic seq

+ 1 - 1
docs/development.html

@@ -253,7 +253,7 @@ make net-cmds                   # replace /ramfs only</code></pre>
 			<li><strong>Image library.</strong> <code>make test-images</code> decodes a corpus of PNG/JPEG/GIF/BMP/TGA/PNM/ICO/PAM files and checks blits; the ASan variant catches memory errors.</li>
 			<li><strong>Image library.</strong> <code>make test-images</code> decodes a corpus of PNG/JPEG/GIF/BMP/TGA/PNM/ICO/PAM files and checks blits; the ASan variant catches memory errors.</li>
 			<li><strong>Crypto.</strong> <code>make test-crypto</code> runs host vectors for the freestanding crypto code.</li>
 			<li><strong>Crypto.</strong> <code>make test-crypto</code> runs host vectors for the freestanding crypto code.</li>
 			<li><strong>UEFI.</strong> <code>make test-uefi</code> boots the dual image under OVMF headless and greps the serial log for the boot line.</li>
 			<li><strong>UEFI.</strong> <code>make test-uefi</code> boots the dual image under OVMF headless and greps the serial log for the boot line.</li>
-			<li><strong>Compositor stats.</strong> The ring-3 WM overwrites <code>/share/wmstats</code> every two seconds with <code>frames</code>, total and worst compositing time in milliseconds, and the pixels drawn in the interval. It also mirrors the line to the non-blocking netconsole ring (UDP 19290), so <code>make netmon</code> shows it on a serial-less board. Read it in a terminal or fetch it over WebDAV to measure a target.</li>
+			<li><strong>Compositor stats.</strong> The ring-3 WM overwrites <code>/share/wmstats</code> every two seconds with <code>frames</code>, total and worst compositing time in milliseconds, and the pixels drawn in the interval. Read it in a terminal or fetch it over WebDAV to measure a target.</li>
 		</ul>
 		</ul>
 	</section>
 	</section>
 
 

+ 1 - 2
docs/graphics.html

@@ -206,8 +206,7 @@
 			canvas. The WM overwrites <code>/share/wmstats</code> every two
 			canvas. The WM overwrites <code>/share/wmstats</code> every two
 			seconds with the interval's frame count, compositing time, worst
 			seconds with the interval's frame count, compositing time, worst
 			frame and pixels drawn (<code>usurf_pixels</code>), which is the
 			frame and pixels drawn (<code>usurf_pixels</code>), which is the
-			on-target compositor measurement; the same line is mirrored to
-			the non-blocking netconsole ring (UDP 19290).
+			on-target compositor measurement.
 		</p>
 		</p>
 	</section>
 	</section>
 
 

+ 0 - 5
ucmd_wm.c

@@ -1017,11 +1017,6 @@ static void write_stats(void)
 	p = put_str(p, "\n");
 	p = put_str(p, "\n");
 	u_syscall3(SYS_WRITE_FILE, (int)"/share/wmstats", (int)b,
 	u_syscall3(SYS_WRITE_FILE, (int)"/share/wmstats", (int)b,
 		   (int)(p - b));
 		   (int)(p - b));
-	/* Also mirror the line to the non-blocking netconsole ring (UDP 19290)
-	 * so a serial-less board can be measured from the host.  Do not use
-	 * SYS_NETLOG here: a direct NIC send can block while the WM holds the
-	 * BKL and would make the whole board unresponsive. */
-	u_puts(b);
 }
 }
 
 
 void _start(const char *arg)
 void _start(const char *arg)