Move queue map and held lock set to lock manager (#90)

Replace lock set and request queue associations with an origin with a lock manager instead.

This doesn't change normative behavior, just moves conceptual ownership off the origin. This paves the way for future work towards #74 to enable partitioning, and coincidentally matches implementations.

Author: saschanaz

index.bs

@@ -208,7 +208,7 @@ A [=lock-concept|lock=] has an <dfn>agent</dfn> which is an [=/agent=].
 
 A [=lock-concept|lock=] has a <dfn>clientId</dfn> which is an opaque string.
 
-A [=lock-concept|lock=] has an <dfn>origin</dfn> which is an [=/origin=].
+A [=lock-concept|lock=] has a <dfn>manager</dfn> which is a [=/lock manager=].
 
 A [=lock-concept|lock=] has a <dfn>name</dfn> which is a [=resource name=].
 
@@ -246,7 +246,7 @@ The [=lock-concept/waiting promise=] is not named in the above code, but is stil
 Further note that if the callback is not `async` and returns a non-promise, the return value is wrapped in a promise that is immediately resolved; the lock will be released in an upcoming microtask, and the [=lock-concept/released promise=] will also resolve in a subsequent microtask.
 </aside>
 
-Each origin has a <dfn>held lock set</dfn> which is a [=/set=] of [=lock-concept|locks=].
+Each [=/lock manager=] has a <dfn for="lock manager">held lock set</dfn> which is a [=/set=] of [=lock-concept|locks=].
 
 <div algorithm="waiting promise settles">
 
@@ -267,17 +267,17 @@ A <dfn>lock request</dfn> represents a pending request for a [=lock-concept|lock
 
 <div dfn-for="lock request">
 
-A [=lock request=] is a [=/struct=] with [=struct/items=] <dfn>agent</dfn>, <dfn>clientId</dfn>, <dfn>origin</dfn>, <dfn>name</dfn>, <dfn>mode</dfn>, <dfn>callback</dfn>, <dfn>promise</dfn>, and <dfn>signal</dfn>.
+A [=lock request=] is a [=/struct=] with [=struct/items=] <dfn>agent</dfn>, <dfn>clientId</dfn>, <dfn>manager</dfn>, <dfn>name</dfn>, <dfn>mode</dfn>, <dfn>callback</dfn>, <dfn>promise</dfn>, and <dfn>signal</dfn>.
 
 </div>
 
 A <dfn>lock request queue</dfn> is a [=/queue=] of [=/lock requests=].
 
-Each origin has a <dfn>lock request queue map</dfn>, which is a [=map=] of [=resource names=] to [=/lock request queues=].
+Each [=/lock manager=] has a <dfn for="lock manager">lock request queue map</dfn>, which is a [=map=] of [=resource names=] to [=/lock request queues=].
 
 <div algorithm>
 
-To <dfn>get the lock request queue</dfn> from [=/lock request queue map=] |queueMap| from [=/resource name=] |name|, run these steps:
+To <dfn>get the lock request queue</dfn> from [=lock manager/lock request queue map=] |queueMap| from [=/resource name=] |name|, run these steps:
 
 1. If |queueMap|[|name|] does not [=map/exist=], [=map/set=] |queueMap|[|name|] to a new empty [=/lock request queue=].
 1. Return |queueMap|[|name|].
@@ -289,11 +289,11 @@ To <dfn>get the lock request queue</dfn> from [=/lock request queue map=] |queue
 
 A [=lock request=] |request| is said to be <dfn>grantable</dfn> if the following steps return true:
 
-1. Let |origin| be |request|'s [=lock request/origin=].
-1. Let |queueMap| be |origin|'s [=lock request queue map=].
+1. Let |manager| be |request|'s [=lock request/manager=].
+1. Let |queueMap| be |manager|'s [=lock manager/lock request queue map=].
 1. Let |name| be |request|'s [=lock request/name=].
 1. Let |queue| be the result of [=/getting the lock request queue=] from |queueMap| for |name|.
-1. Let |held| be |origin|'s [=held lock set=]
+1. Let |held| be |manager|'s [=lock manager/held lock set=]
 1. Let |mode| be |request|'s [=lock request/mode=]
 1. If |queue| [=queue/is empty|is not empty=] and |request| is not the first [=queue/item=] in |queue|, then return false.
 1. If |mode| is "{{exclusive}}", then return true if no [=lock-concept|lock=] in |held| has [=lock-concept/name=] equal to |name|, and false otherwise.
@@ -495,7 +495,7 @@ The <dfn method for=LockManager>request(|name|, |callback|)</dfn> and
 <dfn method for=LockManager>request(|name|, |options|, |callback|)</dfn> method steps are:
 
 1. If |options| was not passed, then let |options| be a new {{LockOptions}} dictionary with default members.
-1. Let |environment| be [=/this=]'s [=relevant settings object=].
+1. Let |environment| be [=/this=]'s [=/relevant settings object=].
 1. If |environment|'s [=responsible document=] is not [=fully active=], then return [=a promise rejected with=] a "{{InvalidStateError}}" {{DOMException}}.
 1. Let |origin| be |environment|'s [=/origin=].
 1. If |origin| is an [=opaque origin=], then return [=a promise rejected with=] a "{{SecurityError}}" {{DOMException}}.
@@ -505,7 +505,7 @@ The <dfn method for=LockManager>request(|name|, |callback|)</dfn> and
 1. If |options|["`signal`"] [=map/exists=], and either of |options|["`steal`"] or |options|["`ifAvailable`"] is true, then return [=a promise rejected with=] a "{{NotSupportedError}}" {{DOMException}}.
 1. If |options|["`signal`"] [=map/exists=] and its [=AbortSignal/aborted flag=] is set, then return [=a promise rejected with=] an "{{AbortError}}" {{DOMException}.
 1. Let |promise| be [=a new promise=].
-1. [=Request a lock=] with |promise|, the current [=/agent=], |environment|'s [=environment/id=], |origin|, |callback|, |name|, |options|["`mode`"], |options|["`ifAvailable`"], |options|["`steal`"], and |options|["`signal`"].
+1. [=Request a lock=] with |promise|, the current [=/agent=], |environment|'s [=environment/id=], |origin|'s [=/lock manager=], |callback|, |name|, |options|["`mode`"], |options|["`ifAvailable`"], |options|["`steal`"], and |options|["`signal`"].
 1. Return |promise|.
 
 </div>
@@ -559,7 +559,7 @@ The <dfn method for=LockManager>query()</dfn> method steps are:
 1. Let |origin| be |environment|'s [=/origin=].
 1. If |origin| is an [=opaque origin=], then return [=a promise rejected with=] a "{{SecurityError}}" {{DOMException}}.
 1. Let |promise| be [=a new promise=].
-1. [=enqueue the following steps|Enqueue the steps=] to [=snapshot the lock state=] for |origin| with |promise| to the [=lock task queue=].
+1. [=enqueue the following steps|Enqueue the steps=] to [=snapshot the lock state=] for |origin|'s [=/lock manager=] with |promise| to the [=lock task queue=].
 1. Return |promise|.
 
 </div>
@@ -591,14 +591,14 @@ The <dfn attribute for=Lock>mode</dfn> getter's steps are to return the associat
 <!-- ====================================================================== -->
 
 <div algorithm>
-To <dfn>request a lock</dfn> with |promise|, |agent|, |clientId|, |origin|, |callback|, |name|, |mode|, |ifAvailable|, |steal|, and |signal|:
+To <dfn>request a lock</dfn> with |promise|, |agent|, |clientId|, |manager|, |callback|, |name|, |mode|, |ifAvailable|, |steal|, and |signal|:
 
-1. Let |request| be a new [=lock request=] (|agent|, |clientId|, |origin|, |name|, |mode|, |callback|, |promise|, |signal|).
+1. Let |request| be a new [=lock request=] (|agent|, |clientId|, |manager|, |name|, |mode|, |callback|, |promise|, |signal|).
 1. If |signal| is present, then [=AbortSignal/add=] the algorithm [=signal to abort the request=] |request| to |signal|.
 1. [=Enqueue the following steps=] to the [=lock task queue=]:
-    1. Let |queueMap| be |origin|'s [=lock request queue map=].
+    1. Let |queueMap| be |manager|'s [=lock manager/lock request queue map=].
     1. Let |queue| be the result of [=/getting the lock request queue=] from |queueMap| for |name|.
-    1. Let |held| be |origin|'s [=held lock set=].
+    1. Let |held| be |manager|'s [=lock manager/held lock set=].
     1. If |steal| is true, then run these steps:
         1. [=list/For each=] |lock| of |held|:
             1. If |lock|'s [=lock-concept/name=] is |name|, then run these steps:
@@ -624,11 +624,11 @@ To <dfn>request a lock</dfn> with |promise|, |agent|, |clientId|, |origin|, |cal
 To <dfn>release the lock</dfn> |lock|:
 
 1. [=Assert=]: these steps are running on the [=lock task queue=].
-1. Let |origin| be |lock|'s [=lock-concept/origin=].
-1. Let |queueMap| be |origin|'s [=lock request queue map=].
+1. Let |manager| be |lock|'s [=lock-concept/manager=].
+1. Let |queueMap| be |manager|'s [=lock manager/lock request queue map=].
 1. Let |name| be |lock|'s [=resource name=].
 1. Let |queue| be the result of [=/getting the lock request queue=] from |queueMap| for |name|.
-1. [=list/Remove=] [=lock-concept|lock=] from the |origin|'s [=held lock set=].
+1. [=list/Remove=] [=lock-concept|lock=] from the |manager|'s [=lock manager/held lock set=].
 1. [=Process the lock request queue=] |queue|.
 
 </div>
@@ -641,9 +641,9 @@ To <dfn>release the lock</dfn> |lock|:
 To <dfn>abort the request</dfn> |request|:
 
 1. [=Assert=]: these steps are running on the [=lock task queue=].
-1. Let |origin| be |request|'s [=lock request/origin=].
+1. Let |manager| be |request|'s [=lock request/manager=].
 1. Let |name| be |request|'s [=lock request/name=].
-1. Let |queueMap| be |origin|'s [=lock request queue map=].
+1. Let |queueMap| be |manager|'s [=lock manager/lock request queue map=].
 1. Let |queue| be the result of [=/getting the lock request queue=] from |queueMap| for |name|.
 1. [=list/Remove=] |request| from |queue|.
 1. [=Process the lock request queue=] |queue|.
@@ -672,16 +672,17 @@ To <dfn>process the lock request queue</dfn> |queue|:
         Note: Only the first item in a queue is grantable. Therefore, if something is not grantable then all the following items are automatically not grantable.
 
     1. [=list/Remove=] |request| from |queue|.
-    1. Let |agent| be |request|'s [=lock-concept/agent=]
+    1. Let |agent| be |request|'s [=lock-concept/agent=].
+    1. Let |manager| be |request|'s [=lock request/manager=].
     1. Let |clientId| be |request|'s [=lock request/clientId=].
     1. Let |name| be |request|'s [=lock request/name=].
     1. Let |mode| be |request|'s [=lock request/mode=].
     1. Let |callback| be |request|'s [=lock request/callback=].
     1. Let |p| be |request|'s [=lock request/promise=].
     1. Let |signal| be |request|'s [=lock request/signal=].
     1. Let |waiting| be [=a new promise=].
-    1. Let |lock| be a new [=lock-concept|lock=] with [=lock-concept/agent=] |agent|, [=lock-concept/clientId=] |clientId|, [=lock-concept/origin=] |origin|, [=lock-concept/mode=] |mode|, [=lock-concept/name=] |name|, [=lock-concept/released promise=] |p|, and [=lock-concept/waiting promise=] |waiting|.
-    1. [=set/Append=] |lock| to |origin|'s [=held lock set=].
+    1. Let |lock| be a new [=lock-concept|lock=] with [=lock-concept/agent=] |agent|, [=lock-concept/clientId=] |clientId|, [=lock-concept/manager=] |manager|, [=lock-concept/mode=] |mode|, [=lock-concept/name=] |name|, [=lock-concept/released promise=] |p|, and [=lock-concept/waiting promise=] |waiting|.
+    1. [=set/Append=] |lock| to |manager|'s [=lock manager/held lock set=].
     1. [=Enqueue the following steps=] on |callback|'s [=relevant settings object=]'s [=responsible event loop=]:
         1. If |signal| is present, then run these steps:
             1. If |signal|'s [=AbortSignal/aborted flag=] is set, then run these steps:
@@ -699,15 +700,15 @@ To <dfn>process the lock request queue</dfn> |queue|:
 <!-- ====================================================================== -->
 
 <div algorithm>
-To <dfn>snapshot the lock state</dfn> for |origin| with |promise|:
+To <dfn>snapshot the lock state</dfn> for |manager| with |promise|:
 
 1. [=Assert=]: these steps are running on the [=lock task queue=].
 1. Let |pending| be a new [=/list=].
-1. [=map/For each=] |queue| of |origin|'s [=lock request queue map=]'s [=map/values=]:
+1. [=map/For each=] |queue| of |manager|'s [=lock manager/lock request queue map=]'s [=map/values=]:
     1. [=list/For each=] |request| of |queue|:
         1. [=list/Append=] «[ "name" → |request|'s [=lock request/name=], "mode" → |request|'s [=lock request/mode=], "clientId" → |request|'s [=lock request/clientId=] ]» to |pending|.
 1. Let |held| be a new [=/list=].
-1. [=list/For each=] |lock| of |origin|'s [=held lock set=]:
+1. [=list/For each=] |lock| of |manager|'s [=lock manager/held lock set=]:
     1. [=list/Append=] «[ "name" → |lock|'s [=lock-concept/name=], "mode" → |lock|'s [=lock-concept/mode=], "clientId" → |lock|'s [=lock-concept/clientId=] ]» to |held|.
 1. [=/Resolve=] |promise| with «[ "held" → |held|, "pending" → |pending| ]».