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

Remove unnecessary use of weak_ptr

Browse Source 
The request callback runs in the same thread as ~TileData, and is not run
if the request is cancelled. So either ~TileData runs first and cancels
the request, or the callback runs first, before TileData is destructed.
Therefore the weak pointer and lock() check is unnecessary; `this` can
be used instead.
This commit is contained in:
John Firebaugh
2015-04-09 11:10:51 -07:00
parent 691756d7dd
commit 0b779eaa8b
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mbgl/map/tile_data.cpp
View File

@@ -20,9 +20,7 @@ TileData::TileData(const TileID& id_, const SourceInfo& source_)
}
TileData::~TileData() {
if (req) {
env.cancelRequest(req);
}
cancel();
}
const std::string TileData::toString() const {
@@ -33,28 +31,19 @@ void TileData::request(uv::worker &worker, float pixelRatio, std::function<void(
std::string url = source.tileURL(id, pixelRatio);
state = State::loading;
std::weak_ptr<TileData> weak_tile = shared_from_this();
req = env.request({ Resource::Kind::Tile, url }, [weak_tile, url, callback, &worker](const Response &res) {
util::ptr<TileData> tile = weak_tile.lock();
if (!tile || tile->state == State::obsolete) {
// noop. Tile is obsolete and we're now just waiting for the refcount
// to drop to zero for destruction.
req = env.request({ Resource::Kind::Tile, url }, [url, callback, &worker, this](const Response &res) {
req = nullptr;
if (res.status != Response::Successful) {
Log::Error(Event::HttpRequest, "[%s] tile loading failed: %s", url.c_str(), res.message.c_str());
return;
}
// Clear the request object.
tile->req = nullptr;
state = State::loaded;
data = res.data;
if (res.status == Response::Successful) {
tile->state = State::loaded;
tile->data = res.data;
// Schedule tile parsing in another thread
tile->reparse(worker, callback);
} else {
Log::Error(Event::HttpRequest, "[%s] tile loading failed: %s", url.c_str(), res.message.c_str());
}
// Schedule tile parsing in another thread
reparse(worker, callback);
});
}