Send the AnnotationStorage-data to the worker-thread as a Map
#13001
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rather than converting the `AnnotationStorage`-data to an Object, before sending it to the worker-thread, we should be able to simply send the internal `Map` directly. The "structured clone algorithm" doesn't have a problem with `Map`s, however the `LoopbackPort` used when workers are *disabled* (e.g. in Node.js environments) didn't use to support them. With PR 12997 having lifted that restriction, we should now be able to simply send the `AnnotationStorage`-data as-is rather than having to iterate through it to first create an Object. *Please note:* The changes in `src/core/annotation.js` could have been a lot more compact if we were able to use optional chaining in the `src/core` folder. Unfortunately that's still not possible, since SystemJS is being used in the development viewer (i.g. `gulp server`) and fixing that is *still* blocked by [bug 1247687](https://bugzilla.mozilla.org/show_bug.cgi?id=1247687).
Snuffleupagus
changed the title
AnnotationStorage-data to the worker-tread as a MapAnnotationStorage-data to the worker-thread as a Map
Snuffleupagus
force-pushed
the
AnnotationStorage-serializable
branch
from
181bda3 to
e9038cc
Compare
|
/botio test |
From: Bot.io (Linux m4)ReceivedCommand cmd_test from @timvandermeij received. Current queue size: 0 Live output at: http://54.67.70.0:8877/32ce877f8172b16/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_test from @timvandermeij received. Current queue size: 0 Live output at: http://3.101.106.178:8877/92d74328e298a83/output.txt |
From: Bot.io (Linux m4)FailedFull output at http://54.67.70.0:8877/32ce877f8172b16/output.txt Total script time: 23.83 mins
Image differences available at: http://54.67.70.0:8877/32ce877f8172b16/reftest-analyzer.html#web=eq.log |
From: Bot.io (Windows)FailedFull output at http://3.101.106.178:8877/92d74328e298a83/output.txt Total script time: 29.43 mins
Image differences available at: http://3.101.106.178:8877/92d74328e298a83/reftest-analyzer.html#web=eq.log |
timvandermeij
approved these changes
Feb 18, 2021
|
Nice work; thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rather than converting the
AnnotationStorage-data to an Object, before sending it to the worker-thread, we should be able to simply send the internalMapdirectly.The "structured clone algorithm" doesn't have a problem with
Maps, however theLoopbackPortused when workers are disabled (e.g. in Node.js environments) didn't use to support them. With PR #12997 having lifted that restriction, we should now be able to simply send theAnnotationStorage-data as-is rather than having to iterate through it to first create an Object.Please note: The changes in
src/core/annotation.jscould have been a lot more compact if we were able to use optional chaining in thesrc/corefolder. Unfortunately that's still not possible, since SystemJS is being used in the development viewer (i.g.gulp server) and fixing that is still blocked by bug 1247687.