WIP

MatrixAI · Apr 1, 2022 · 1d67c83 · 1d67c83
1 parent 3c1b288
commit 1d67c83
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/src/Lock.ts b/src/Lock.ts
@@ -2,7 +2,7 @@ import type { MutexInterface } from 'async-mutex';
 import type { ResourceAcquire } from '@matrixai/resources';
 import { Mutex, withTimeout } from 'async-mutex';
 import { withF, withG } from '@matrixai/resources';
-import { sleep } from './utils';
+import { yieldMicro } from './utils';
 import { ErrorAsyncLocksTimeout } from './errors';
 
 class Lock {
@@ -28,7 +28,7 @@ class Lock {
           --this._count;
           release();
           // Allow semaphore to settle https://github.com/DirtyHairy/async-mutex/issues/54
-          await sleep(0);
+          await yieldMicro();
         },
         this,
       ];

diff --git a/src/RWLockReader.ts b/src/RWLockReader.ts
@@ -2,7 +2,7 @@ import type { MutexInterface } from 'async-mutex';
 import type { ResourceAcquire } from '@matrixai/resources';
 import { Mutex, withTimeout } from 'async-mutex';
 import { withF, withG } from '@matrixai/resources';
-import { sleep } from './utils';
+import { yieldMicro } from './utils';
 import { ErrorAsyncLocksTimeout } from './errors';
 
 /**
@@ -38,7 +38,7 @@ class RWLockReader {
             this.release();
           }
           // Allow semaphore to settle https://github.com/DirtyHairy/async-mutex/issues/54
-          await sleep(0);
+          await yieldMicro();
         },
         this,
       ];
@@ -64,7 +64,7 @@ class RWLockReader {
           release();
           --this._writerCount;
           // Allow semaphore to settle https://github.com/DirtyHairy/async-mutex/issues/54
-          await sleep(0);
+          await yieldMicro();
         },
         this,
       ];

diff --git a/src/RWLockWriter.ts b/src/RWLockWriter.ts
@@ -3,7 +3,7 @@ import type { ResourceAcquire } from '@matrixai/resources';
 import { performance } from 'perf_hooks';
 import { Mutex, withTimeout } from 'async-mutex';
 import { withF, withG } from '@matrixai/resources';
-import { sleep } from './utils';
+import { sleep, yieldMicro } from './utils';
 import { ErrorAsyncLocksTimeout } from './errors';
 
 /**
@@ -24,15 +24,9 @@ class RWLockWriter {
         ++this.readerCountBlocked;
         if (timeout != null) {
           let timedOut = false;
-          const timedOutP = new Promise<void>((resolve) => {
-            setTimeout(() => {
-              timedOut = true;
-              resolve();
-            }, timeout);
-          });
           await Promise.race([
             this.writersLock.waitForUnlock(),
-            timedOutP
+            sleep(timeout).then(() => { timedOut = true; })
           ]);
           if (timedOut) {
             --this.readerCountBlocked;
@@ -69,7 +63,7 @@ class RWLockWriter {
           if (readerCount === 0) {
             this.readersRelease();
             // Allow semaphore to settle https://github.com/DirtyHairy/async-mutex/issues/54
-            await sleep(0);
+            await yieldMicro();
           }
         },
         this,
@@ -103,7 +97,7 @@ class RWLockWriter {
         writersRelease();
         --this._writerCount;
         // Allow semaphore to settle https://github.com/DirtyHairy/async-mutex/issues/54
-        await sleep(0);
+        await yieldMicro();
         throw e;
       }
       return [
@@ -112,7 +106,7 @@ class RWLockWriter {
           writersRelease();
           --this._writerCount;
           // Allow semaphore to settle https://github.com/DirtyHairy/async-mutex/issues/54
-          await sleep(0);
+          await yieldMicro();
         },
         this,
       ];

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,5 +1,9 @@
-async function sleep(ms: number) {
-  return await new Promise((r) => setTimeout(r, ms));
+async function sleep(ms: number): Promise<void> {
+  return await new Promise<void>((r) => setTimeout(r, ms));
 }
 
-export { sleep };
+async function yieldMicro(): Promise<void> {
+  return await new Promise<void>((r) => queueMicrotask(r));
+}
+
+export { sleep, yieldMicro };