Skip to content

Lightpanda: the headless browser designed for AI and automation

fix test-only tsan issue

Karl Seguin63924548927f
diff --git a/src/Metrics.zig b/src/Metrics.zig
index 55f0942d3..38f77323f 100644
--- a/src/Metrics.zig
+++ b/src/Metrics.zig
@@ -203,7 +203,11 @@ const Gauge = struct {
fn write(self: *const Gauge, comptime name: []const u8, comptime help_text: []const u8, writer: *std.Io.Writer) !void {
try writer.writeAll("# HELP " ++ name ++ " " ++ help_text ++ "\n" ++ "# TYPE " ++ name ++ " gauge\n");
- try writer.print(name ++ " {d}\n", .{@atomicLoad(isize, &self.value, .monotonic)});
+ try writer.print(name ++ " {d}\n", .{self.get()});
+ }
+
+ fn get(self: *const Gauge) isize {
+ return @atomicLoad(isize, &self.value, .monotonic);
}
};
@@ -228,11 +232,14 @@ fn GaugeEnum(comptime label: []const u8, comptime T: type) type {
self.values.getPtr(tag).add(n);
}
+ pub fn get(self: *const Self, tag: T) isize {
+ return self.values.getPtrConst(tag).get();
+ }
+
fn write(self: *const Self, comptime name: []const u8, comptime help_text: []const u8, writer: *std.Io.Writer) !void {
try writer.writeAll("# HELP " ++ name ++ " " ++ help_text ++ "\n" ++ "# TYPE " ++ name ++ " gauge\n");
inline for (comptime std.enums.values(Tag)) |tag| {
- const value = @atomicLoad(isize, &self.values.getPtrConst(tag).value, .monotonic);
- try writer.print(name ++ "{{" ++ label ++ "=\"" ++ @tagName(tag) ++ "\"}} {d}\n", .{value});
+ try writer.print(name ++ "{{" ++ label ++ "=\"" ++ @tagName(tag) ++ "\"}} {d}\n", .{self.get(tag)});
}
}
};
diff --git a/src/server/Server.zig b/src/server/Server.zig
index 506178a7e..7ebeabc88 100644
--- a/src/server/Server.zig
+++ b/src/server/Server.zig
@@ -1841,15 +1841,16 @@ test "server: HTTP session idle timeout" {
test "server: HTTP session ended before its worker attached" {
// The mailbox is alive from spawn: a DELETE that lands while the worker
// is still starting up is a plain push, drained on its first tick.
- const server = testing.test_cdp_server.?;
- const live = server.worker_pool.live;
+ // worker_pool.live is the loop's; the gauge is the cross-thread view of it
+ const gauge = &lp.metrics.serve_active_connections;
+ const live = gauge.get(.bidi);
const session_id = try createHTTPSession("{\"capabilities\":{}}", false);
try deleteHTTPSession(&session_id, true);
// the worker exited and gave its slot back
var attempts: usize = 0;
- while (server.worker_pool.live != live) : (attempts += 1) {
+ while (gauge.get(.bidi) != live) : (attempts += 1) {
try testing.expect(attempts < 200);
lp.io.sleep(.fromMilliseconds(10), .awake) catch {};
}