mirror/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-08-02 10:47:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

dedupe check and centralize it in HttpClient's tickSync

Browse Source
This commit is contained in:
Karl Seguin
2026-07-22 16:41:33 +08:00
parent a12032cd0e
commit 0cb9c3aebb
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/browser/ScriptManager.zig
View File

@@ -171,7 +171,6 @@ fn waitForPreload(self: *ScriptManager, url: [:0]const u8) ?*Script {
const entry = self.preloaded_scripts.getPtr(url) orelse return null;
switch (entry.state) {
.loading => {
if (client.hasPendingTeardown()) return null;
_ = client.tickSync(200) catch return null;
continue;
},

1
src/browser/ScriptManagerBase.zig
View File

@@ -354,7 +354,6 @@ pub fn waitForImport(self: *ScriptManagerBase, url: [:0]const u8) !ModuleSource
};
switch (entry.value_ptr.state) {
.loading => {
if (client.hasPendingTeardown()) return error.SyncWaitInterrupted;
_ = try client.tickSync(200);
continue;
},

26
src/network/HttpClient.zig
View File

@@ -568,10 +568,13 @@ pub fn tick(self: *Client, timeout_ms: u32) !void {
}
pub fn tickSync(self: *Client, timeout_ms: u32) !void {
if (self.hasPendingTeardown()) {
return error.SyncWaitInterrupted;
}
return self._tick(timeout_ms, .sync_wait);
}
pub fn hasPendingTeardown(self: *Client) bool {
fn hasPendingTeardown(self: *Client) bool {
return self.inbox.contains(isSyncWaitInterrupt);
}
@@ -1035,8 +1038,8 @@ pub fn syncRequest(self: *Client, allocator: Allocator, req: Request, owner: *Ow
return error.ClientDisconnected;
}
// A parser can start another blocking script/style fetch while unwinding
// the previous interrupted fetch. Don't pay one sync-poll interval per
// resource when teardown is already queued.
// a previous interrupted fetch. The first tickSync below would fail
// anyway; bail before creating the transfer and notifying CDP.
if (self.hasPendingTeardown()) {
req.deinit();
return error.SyncWaitInterrupted;
@@ -1067,21 +1070,16 @@ pub fn syncRequest(self: *Client, allocator: Allocator, req: Request, owner: *Ow
while (sync_ctx.completion == .in_progress) {
self.tickSync(200) catch |err| {
if (sync_ctx.completion == .in_progress) {
// tick failed for a reason unrelated to our transfer (likely OOM or
// client disconnect). transfer.req.ctx points at &sync_ctx on this
// stack — abort to sever that reference before we return
// tick failed for a reason unrelated to our transfer: OOM,
// client disconnect, or a queued teardown command (which
// sync_wait can't dispatch mid-parse — it would free the
// Page/Frame this stack holds). transfer.req.ctx points at
// &sync_ctx on this stack — abort to sever that reference
// before we return
transfer.abort(err);
}
return err;
};
if (sync_ctx.completion == .in_progress and self.hasPendingTeardown()) {
// A teardown/close command is queued but sync_wait can't dispatch
// it mid-parse (it would free the Page/Frame this stack holds).
// Abort the blocking fetch so the parser unwinds to the next safe
// drain and the command runs there, instead of stalling for the
// full per-request timeout per blocking script.
transfer.abort(error.SyncWaitInterrupted);
}
}
switch (sync_ctx.completion) {