Lightpanda: the headless browser designed for AI and automation
fire lock request callback in scheduler
Muki Kiboigo18ba4b924177
diff --git a/src/browser/tests/weblocks.html b/src/browser/tests/weblocks.htmlindex 1c30208fd..56c07c1ad 100644--- a/src/browser/tests/weblocks.html+++ b/src/browser/tests/weblocks.html@@ -24,6 +24,16 @@}</script>+<script id=requestCallbackRunsAsynchronously>+{+ // Per spec (and Chrome), request() must return before the callback runs -+ // granting happens as a separate task, never synchronously inline.+ let x = 0;+ navigator.locks.request('callback-async', () => { x = 1 });+ testing.expectEqual(0, x);+}+</script>+<script id=requestAdoptsAsyncCallback type=module>{const state = await testing.async();@@ -67,8 +77,7 @@});// give the first request a tick to be granted before releasing it- await Promise.resolve();- await Promise.resolve();+ await new Promise((r) => setTimeout(r, 0));release1();await Promise.all([first, second]);@@ -110,8 +119,7 @@order.push('exclusive-start');});- await Promise.resolve();- await Promise.resolve();+ await new Promise((r) => setTimeout(r, 0));releaseShared();await Promise.all([shared, exclusive]);@@ -130,8 +138,7 @@releaseHeld = resolve;}));- await Promise.resolve();- await Promise.resolve();+ await new Promise((r) => setTimeout(r, 0));const result = await navigator.locks.request('avail', { ifAvailable: true }, (lock) => {return lock === null ? 'unavailable' : 'should-not-happen';@@ -158,8 +165,7 @@// never resolves on its own - it should be aborted by the steal})).catch((e) => { heldRejection = e.name; });- await Promise.resolve();- await Promise.resolve();+ await new Promise((r) => setTimeout(r, 0));const stolen = await navigator.locks.request('steal-me', { steal: true }, (lock) => {order.push('stolen-start');@@ -190,8 +196,7 @@releaseStolen = resolve;}));- await Promise.resolve();- await Promise.resolve();+ await new Promise((r) => setTimeout(r, 0));// queued behind the current holderconst waiter = navigator.locks.request('steal-queue', (lock) => {@@ -199,7 +204,7 @@return 'waiter-done';});- await Promise.resolve();+ await new Promise((r) => setTimeout(r, 0));// someone else steals the lock out from under the holderconst stealer = navigator.locks.request('steal-queue', { steal: true }, (lock) => {@@ -282,8 +287,7 @@release = resolve;}));- await Promise.resolve();- await Promise.resolve();+ await new Promise((r) => setTimeout(r, 0));const pending = navigator.locks.request('query-test', () => {});diff --git a/src/browser/webapi/LockManager.zig b/src/browser/webapi/LockManager.zigindex d8119035b..7f9de09ad 100644--- a/src/browser/webapi/LockManager.zig+++ b/src/browser/webapi/LockManager.zig@@ -96,6 +96,7 @@ const LockRequest = struct {}fn fireCallbackWith(self: *LockRequest, lock: ?Lock) void {+ if (self.finished) return;self.granted = lock != null;const exec = self.exec;@@ -156,6 +157,39 @@ const LockRequest = struct {._name = self.name,});}++ fn scheduleFireCallback(self: *LockRequest) void {+ self.exec.js.scheduler.add(self, runFireCallback, 0, .{+ .name = "weblocks.fireCallback",+ .finalizer = cancelled,+ }) catch self.fireCallback();+ }++ fn runFireCallback(ctx: *anyopaque) anyerror!?u32 {+ const self: *LockRequest = @ptrCast(@alignCast(ctx));+ self.fireCallback();+ return null;+ }++ fn scheduleFireCallbackWithNull(self: *LockRequest) void {+ self.exec.js.scheduler.add(self, runFireCallbackWithNull, 0, .{+ .name = "weblocks.fireCallbackWithNull",+ .finalizer = cancelled,+ }) catch self.fireCallbackWith(null);+ }++ fn runFireCallbackWithNull(ctx: *anyopaque) anyerror!?u32 {+ const self: *LockRequest = @ptrCast(@alignCast(ctx));+ self.fireCallbackWith(null);+ return null;+ }++ fn cancelled(ctx: *anyopaque) void {+ const self: *LockRequest = @ptrCast(@alignCast(ctx));+ if (self.finished) return;+ self.finished = true;+ self.deinit();+ }};fn heldConflicts(self: *const LockManager, name: lp.String, mode: Lock.LockMode) bool {@@ -274,7 +308,7 @@ pub fn request(lock_request.state = .held;try self._locks.append(exec.arena, lock_request);- lock_request.fireCallback();+ lock_request.scheduleFireCallback();return promise;}@@ -282,7 +316,7 @@ pub fn request(// ifAvailable and held means we fire the callback with null.if (options.ifAvailable and must_queue_request) {- lock_request.fireCallbackWith(null);+ lock_request.scheduleFireCallbackWithNull();return promise;}@@ -293,7 +327,7 @@ pub fn request(lock_request.state = .held;try self._locks.append(exec.arena, lock_request);- lock_request.fireCallback();+ lock_request.scheduleFireCallback();return promise;}@@ -357,7 +391,7 @@ fn releaseLock(self: *LockManager, lock_request: *LockRequest) void {}for (to_grant.items) |lr| {- lr.fireCallback();+ lr.scheduleFireCallback();}}