tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix hangs caused by redoPlacement

Browse Source 
After parsing a tile, it redoes placement for that tile if the angle has
changed since it started parsing. These redo calls were accidentally
done from the worker thread. Assigning the new work to `workRequest`
caused it to cancel itself.

Fix the problem by calling redoPlacement from the map thread.
This commit is contained in:
Ansis Brammanis
2015-06-02 17:06:24 -04:00
parent 3dfa317cf9
commit 1f5fb1db4a
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mbgl/map/source.cpp
View File

@@ -290,7 +290,7 @@ TileData::State Source::addTile(MapData& data,
}
if (!new_tile.data) {
auto callback = std::bind(&Source::tileLoadingCompleteCallback, this, normalized_id);
auto callback = std::bind(&Source::tileLoadingCompleteCallback, this, normalized_id, transformState, data.getCollisionDebug());
// If we don't find working tile data, we're just going to load it.
if (info.type == SourceType::Vector) {
@@ -513,7 +513,9 @@ bool Source::update(MapData& data,
updateTilePtrs();
redoPlacement(transformState, data.getCollisionDebug());
for (auto& tilePtr : tilePtrs) {
tilePtr->data->redoPlacement(transformState.getAngle(), data.getCollisionDebug());
}
updated = data.getAnimationTime();
@@ -536,12 +538,6 @@ void Source::updateTilePtrs() {
}
}
void Source::redoPlacement(const TransformState& transformState, bool collisionDebug) {
for (auto& tilePtr : tilePtrs) {
tilePtr->data->redoPlacement(transformState.getAngle(), collisionDebug);
}
}
void Source::setCacheSize(size_t size) {
cache.setSize(size);
}
@@ -554,7 +550,7 @@ void Source::setObserver(Observer* observer) {
observer_ = observer;
}
void Source::tileLoadingCompleteCallback(const TileID& normalized_id) {
void Source::tileLoadingCompleteCallback(const TileID& normalized_id, const TransformState& transformState, bool collisionDebug) {
auto it = tile_data.find(normalized_id);
if (it == tile_data.end()) {
return;
@@ -571,6 +567,8 @@ void Source::tileLoadingCompleteCallback(const TileID& normalized_id) {
}
emitTileLoaded(true);
data->redoPlacement(transformState.getAngle(), collisionDebug);
}
void Source::emitSourceLoaded() {