-
Notifications
You must be signed in to change notification settings - Fork 2.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
WIP - share workers across Map instance with a global worker pool #2917
Closed
Closed
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2cc58b4
Unify node/browser dispatcher code
02614e7
Add a mapInstanceId param to inter-thread methods
50b4c08
WIP - share workers across Map instances
fb0b68d
Add comment re: geojson worker key
48a173f
s/map/mapId/
3ce8ceb
Add comment re: tile uid change
01ca9f7
Add some documentation to worker pool
069871b
Add comments about worker "styles" interface
e07e77f
Fix old workerID reference
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,11 +58,11 @@ VectorTileSource.prototype = util.inherit(Evented, { | |
showCollisionBoxes: this.map.showCollisionBoxes | ||
}; | ||
|
||
if (tile.workerID) { | ||
if (tile.state === 'loaded') { | ||
params.rawTileData = tile.rawTileData; | ||
this.dispatcher.send('reload tile', params, done.bind(this), tile.workerID); | ||
this.dispatcher.send('reload tile', params, done.bind(this), tile.uid); | ||
} else { | ||
tile.workerID = this.dispatcher.send('load tile', params, done.bind(this)); | ||
this.dispatcher.send('load tile', params, done.bind(this), tile.uid); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note the change to Dispatcher (using the new WorkerPool), wherein to send multiple requests to the same worker, dispatcher.send() accepts a 'key' ( |
||
} | ||
|
||
function done(err, data) { | ||
|
@@ -85,11 +85,11 @@ VectorTileSource.prototype = util.inherit(Evented, { | |
}, | ||
|
||
abortTile: function(tile) { | ||
this.dispatcher.send('abort tile', { uid: tile.uid, source: this.id }, null, tile.workerID); | ||
this.dispatcher.send('abort tile', { uid: tile.uid, source: this.id }, null, tile.uid); | ||
}, | ||
|
||
unloadTile: function(tile) { | ||
tile.unloadVectorData(this.map.painter); | ||
this.dispatcher.send('remove tile', { uid: tile.uid, source: this.id }, null, tile.workerID); | ||
this.dispatcher.send('remove tile', { uid: tile.uid, source: this.id }, null, tile.uid); | ||
} | ||
}); |
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like we reference this
workerKey
against a map. Will this work ofoptions.data
is an object?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the line 138 above ensures that this won't happen -- but now that I'm looking at this again, I do think it's not especially clear; I'll make it clearer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah! I forgot that we stringified it. LGTM 👍