RasterTile / mailbox fix (#2443)

This commit is contained in:
Tim Sylvester
2024-05-30 10:08:53 -07:00
committed by GitHub
parent 38caf8bdd3
commit 2a09100cb7
13 changed files with 124 additions and 40 deletions

View File

@@ -17,10 +17,18 @@ namespace mbgl {
RasterTile::RasterTile(const OverscaledTileID& id_, const TileParameters& parameters, const Tileset& tileset)
: Tile(Kind::Raster, id_),
loader(*this, id_, parameters, tileset),
threadPool(Scheduler::GetBackground()),
mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())),
worker(Scheduler::GetBackground(), ActorRef<RasterTile>(*this, mailbox)) {}
RasterTile::~RasterTile() = default;
RasterTile::~RasterTile() {
markObsolete();
// The bucket has resources that need to be released on the render thread.
if (bucket) {
threadPool->runOnRenderThread([bucket_{std::move(bucket)}]() {});
}
}
std::unique_ptr<TileRenderData> RasterTile::createRenderData() {
return std::make_unique<SharedBucketTileRenderData<RasterBucket>>(bucket);
@@ -37,19 +45,23 @@ void RasterTile::setMetadata(std::optional<Timestamp> modified_, std::optional<T
}
void RasterTile::setData(const std::shared_ptr<const std::string>& data) {
pending = true;
++correlationID;
worker.self().invoke(&RasterTileWorker::parse, data, correlationID);
if (!obsolete) {
pending = true;
++correlationID;
worker.self().invoke(&RasterTileWorker::parse, data, correlationID);
}
}
void RasterTile::onParsed(std::unique_ptr<RasterBucket> result, const uint64_t resultCorrelationID) {
bucket = std::move(result);
loaded = true;
if (resultCorrelationID == correlationID) {
pending = false;
if (!obsolete) {
bucket = std::move(result);
loaded = true;
if (resultCorrelationID == correlationID) {
pending = false;
}
renderable = static_cast<bool>(bucket);
observer->onTileChanged(*this);
}
renderable = static_cast<bool>(bucket);
observer->onTileChanged(*this);
}
void RasterTile::onError(std::exception_ptr err, const uint64_t resultCorrelationID) {
@@ -78,4 +90,14 @@ void RasterTile::setUpdateParameters(const TileUpdateParameters& params) {
loader.setUpdateParameters(params);
}
void RasterTile::cancel() {
markObsolete();
}
void RasterTile::markObsolete() {
obsolete = true;
pending = false;
mailbox->abandon();
}
} // namespace mbgl