07e99ad336
I changed the code in this commit:
c2a5f6acb0
To make kit send a tilecombine message even if it does not
send actual tile data so we can track that the rendering was
done and so we can update the clients' _tilesBeingRendered
list. The issue is that tileBeingRendered object
belongs to not only one client, but more and so we don't
know which client gets the actual empty tile response.
So revert this method and rather use a smaller timeout for "waiting" the
arrival of the rendered tile.
Change-Id: I2dbbab1a62b81cbbb5314f2f37fdbc3415c69130
611 lines
20 KiB
C++
611 lines
20 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "TileCache.hpp"
|
|
|
|
#include <cassert>
|
|
#include <climits>
|
|
#include <cstdio>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <memory>
|
|
#include <sstream>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <Poco/DigestEngine.h>
|
|
#include <Poco/DirectoryIterator.h>
|
|
#include <Poco/Exception.h>
|
|
#include <Poco/File.h>
|
|
#include <Poco/Path.h>
|
|
#include <Poco/StringTokenizer.h>
|
|
#include <Poco/Timestamp.h>
|
|
#include <Poco/URI.h>
|
|
|
|
#include "ClientSession.hpp"
|
|
#include <Common.hpp>
|
|
#include <Protocol.hpp>
|
|
#include "SenderQueue.hpp"
|
|
#include <Unit.hpp>
|
|
#include <Util.hpp>
|
|
#include <common/FileUtil.hpp>
|
|
|
|
using namespace LOOLProtocol;
|
|
|
|
using Poco::DirectoryIterator;
|
|
using Poco::File;
|
|
using Poco::StringTokenizer;
|
|
using Poco::Timestamp;
|
|
|
|
TileCache::TileCache(const std::string& docURL,
|
|
const Timestamp& modifiedTime,
|
|
const std::string& cacheDir) :
|
|
_docURL(docURL),
|
|
_cacheDir(cacheDir)
|
|
{
|
|
LOG_INF("TileCache ctor for uri [" << _docURL <<
|
|
"], cacheDir: [" << _cacheDir <<
|
|
"], modifiedTime=" << (modifiedTime.raw()/1000000) <<
|
|
" getLastModified()=" << (getLastModified().raw()/1000000));
|
|
File directory(_cacheDir);
|
|
std::string unsaved;
|
|
if (directory.exists() &&
|
|
(getLastModified() < modifiedTime ||
|
|
getTextFile("unsaved.txt", unsaved)))
|
|
{
|
|
// Document changed externally or modifications were not saved after all. Cache not useful.
|
|
completeCleanup();
|
|
}
|
|
|
|
File(_cacheDir).createDirectories();
|
|
|
|
saveLastModified(modifiedTime);
|
|
}
|
|
|
|
TileCache::~TileCache()
|
|
{
|
|
_owner = std::thread::id();
|
|
LOG_INF("~TileCache dtor for uri [" << _docURL << "].");
|
|
}
|
|
|
|
void TileCache::completeCleanup() const
|
|
{
|
|
FileUtil::removeFile(_cacheDir, true);
|
|
LOG_INF("Completely cleared tile cache: " << _cacheDir);
|
|
}
|
|
|
|
/// Tracks the rendering of a given tile
|
|
/// to avoid duplication and help clock
|
|
/// rendering latency.
|
|
struct TileCache::TileBeingRendered
|
|
{
|
|
std::vector<std::weak_ptr<ClientSession>> _subscribers;
|
|
|
|
TileBeingRendered(const std::string& cachedName, const TileDesc& tile)
|
|
: _startTime(std::chrono::steady_clock::now()),
|
|
_tile(tile),
|
|
_cachedName(cachedName)
|
|
{
|
|
}
|
|
|
|
const TileDesc& getTile() const { return _tile; }
|
|
const std::string& getCacheName() const { return _cachedName; }
|
|
int getVersion() const { return _tile.getVersion(); }
|
|
void setVersion(int version) { _tile.setVersion(version); }
|
|
|
|
std::chrono::steady_clock::time_point getStartTime() const { return _startTime; }
|
|
double getElapsedTimeMs() const { return std::chrono::duration_cast<std::chrono::milliseconds>
|
|
(std::chrono::steady_clock::now() - _startTime).count(); }
|
|
private:
|
|
std::chrono::steady_clock::time_point _startTime;
|
|
TileDesc _tile;
|
|
std::string _cachedName;
|
|
};
|
|
|
|
std::shared_ptr<TileCache::TileBeingRendered> TileCache::findTileBeingRendered(const TileDesc& tileDesc)
|
|
{
|
|
const std::string cachedName = cacheFileName(tileDesc);
|
|
|
|
assertCorrectThread();
|
|
|
|
const auto tile = _tilesBeingRendered.find(cachedName);
|
|
return tile != _tilesBeingRendered.end() ? tile->second : nullptr;
|
|
}
|
|
|
|
void TileCache::forgetTileBeingRendered(const std::shared_ptr<TileCache::TileBeingRendered>& tileBeingRendered, const TileDesc& tile)
|
|
{
|
|
assertCorrectThread();
|
|
assert(tileBeingRendered);
|
|
assert(_tilesBeingRendered.find(tileBeingRendered->getCacheName()) != _tilesBeingRendered.end());
|
|
|
|
for(auto& subscriber : tileBeingRendered->_subscribers)
|
|
{
|
|
std::shared_ptr<ClientSession> session = subscriber.lock();
|
|
if(session && tile.getId() == -1)
|
|
session->traceUnSubscribeToTile(tileBeingRendered->getCacheName());
|
|
}
|
|
|
|
_tilesBeingRendered.erase(tileBeingRendered->getCacheName());
|
|
}
|
|
|
|
double TileCache::getTileBeingRenderedElapsedTimeMs(const std::string& tileCacheName) const
|
|
{
|
|
auto iterator = _tilesBeingRendered.find(tileCacheName);
|
|
if(iterator == _tilesBeingRendered.end())
|
|
return -1.0; // Negativ value means that we did not find tileBeingRendered object
|
|
|
|
return iterator->second->getElapsedTimeMs();
|
|
}
|
|
|
|
bool TileCache::hasTileBeingRendered(const TileDesc& tile)
|
|
{
|
|
return (findTileBeingRendered(tile) != nullptr);
|
|
}
|
|
|
|
int TileCache::getTileBeingRenderedVersion(const TileDesc& tile)
|
|
{
|
|
std::shared_ptr<TileBeingRendered> tileBeingRendered = findTileBeingRendered(tile);
|
|
if (tileBeingRendered)
|
|
return tileBeingRendered->getVersion();
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
std::unique_ptr<std::fstream> TileCache::lookupTile(const TileDesc& tile)
|
|
{
|
|
const std::string fileName = _cacheDir + "/" + cacheFileName(tile);
|
|
|
|
std::unique_ptr<std::fstream> result(new std::fstream(fileName, std::ios::in));
|
|
|
|
UnitWSD::get().lookupTile(tile.getPart(), tile.getWidth(), tile.getHeight(),
|
|
tile.getTilePosX(), tile.getTilePosY(),
|
|
tile.getTileWidth(), tile.getTileHeight(), result);
|
|
if (result && result->is_open())
|
|
{
|
|
LOG_TRC("Found cache tile: " << fileName);
|
|
return result;
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
void TileCache::saveTileAndNotify(const TileDesc& tile, const char *data, const size_t size)
|
|
{
|
|
assertCorrectThread();
|
|
|
|
std::shared_ptr<TileBeingRendered> tileBeingRendered = findTileBeingRendered(tile);
|
|
|
|
// Save to disk.
|
|
const std::string cachedName = (tileBeingRendered ? tileBeingRendered->getCacheName()
|
|
: cacheFileName(tile));
|
|
|
|
// Ignore if we can't save the tile, things will work anyway, but slower.
|
|
// An error indication is supposed to be sent to all users in that case.
|
|
const auto fileName = _cacheDir + "/" + cachedName;
|
|
if (FileUtil::saveDataToFileSafely(fileName, data, size))
|
|
{
|
|
LOG_TRC("Saved cache tile: " << fileName);
|
|
}
|
|
|
|
// Notify subscribers, if any.
|
|
if (tileBeingRendered)
|
|
{
|
|
const size_t subscriberCount = tileBeingRendered->_subscribers.size();
|
|
if (subscriberCount > 0)
|
|
{
|
|
std::string response = tile.serialize("tile:");
|
|
LOG_DBG("Sending tile message to " << subscriberCount << " subscribers: " << response);
|
|
|
|
// Send to first subscriber as-is (without cache marker).
|
|
auto payload = std::make_shared<Message>(response,
|
|
Message::Dir::Out,
|
|
response.size() + 1 + size);
|
|
payload->append("\n", 1);
|
|
payload->append(data, size);
|
|
|
|
auto& firstSubscriber = tileBeingRendered->_subscribers[0];
|
|
std::shared_ptr<ClientSession> firstSession = firstSubscriber.lock();
|
|
if (firstSession)
|
|
{
|
|
firstSession->enqueueSendMessage(payload);
|
|
}
|
|
|
|
if (subscriberCount > 1)
|
|
{
|
|
// All others must get served from the cache.
|
|
response += " renderid=cached\n";
|
|
|
|
// Create a new Payload.
|
|
payload.reset();
|
|
payload = std::make_shared<Message>(response,
|
|
Message::Dir::Out,
|
|
response.size() + size);
|
|
payload->append(data, size);
|
|
|
|
for (size_t i = 1; i < subscriberCount; ++i)
|
|
{
|
|
auto& subscriber = tileBeingRendered->_subscribers[i];
|
|
std::shared_ptr<ClientSession> session = subscriber.lock();
|
|
if (session)
|
|
{
|
|
session->enqueueSendMessage(payload);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
LOG_DBG("No subscribers for: " << cachedName);
|
|
}
|
|
|
|
// Remove subscriptions.
|
|
if (tileBeingRendered->getVersion() <= tile.getVersion())
|
|
{
|
|
LOG_DBG("STATISTICS: tile " << tile.getVersion() << " internal roundtrip " <<
|
|
tileBeingRendered->getElapsedTimeMs() << " ms.");
|
|
forgetTileBeingRendered(tileBeingRendered, tile);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
LOG_DBG("No subscribers for: " << cachedName);
|
|
}
|
|
}
|
|
|
|
bool TileCache::getTextFile(const std::string& fileName, std::string& content)
|
|
{
|
|
const std::string fullFileName = _cacheDir + "/" + fileName;
|
|
|
|
std::fstream textStream(fullFileName, std::ios::in);
|
|
if (!textStream.is_open())
|
|
{
|
|
LOG_INF("Could not open " << fullFileName);
|
|
return false;
|
|
}
|
|
|
|
std::vector<char> buffer;
|
|
textStream.seekg(0, std::ios_base::end);
|
|
std::streamsize size = textStream.tellg();
|
|
buffer.resize(size);
|
|
textStream.seekg(0, std::ios_base::beg);
|
|
textStream.read(buffer.data(), size);
|
|
textStream.close();
|
|
|
|
if (buffer.size() > 0 && buffer.back() == '\n')
|
|
buffer.pop_back();
|
|
|
|
content = std::string(buffer.data(), buffer.size());
|
|
LOG_INF("Read '" << LOOLProtocol::getAbbreviatedMessage(content.c_str(), content.size()) <<
|
|
"' from " << fullFileName);
|
|
|
|
return true;
|
|
}
|
|
|
|
void TileCache::saveTextFile(const std::string& text, const std::string& fileName)
|
|
{
|
|
const std::string fullFileName = _cacheDir + "/" + fileName;
|
|
std::fstream textStream(fullFileName, std::ios::out);
|
|
|
|
if (!textStream.is_open())
|
|
{
|
|
LOG_ERR("Could not save '" << text << "' to " << fullFileName);
|
|
return;
|
|
}
|
|
else
|
|
{
|
|
LOG_INF("Saving '" << LOOLProtocol::getAbbreviatedMessage(text.c_str(), text.size()) <<
|
|
"' to " << fullFileName);
|
|
}
|
|
|
|
textStream << text << std::endl;
|
|
textStream.close();
|
|
}
|
|
|
|
void TileCache::setUnsavedChanges(bool state)
|
|
{
|
|
if (state)
|
|
saveTextFile("1", "unsaved.txt");
|
|
else
|
|
removeFile("unsaved.txt");
|
|
}
|
|
|
|
void TileCache::saveRendering(const std::string& name, const std::string& dir, const char *data, size_t size)
|
|
{
|
|
// can fonts be invalidated?
|
|
const std::string dirName = _cacheDir + "/" + dir;
|
|
|
|
File(dirName).createDirectories();
|
|
|
|
const std::string fileName = dirName + "/" + name;
|
|
|
|
FileUtil::saveDataToFileSafely(fileName, data, size);
|
|
}
|
|
|
|
std::unique_ptr<std::fstream> TileCache::lookupCachedFile(const std::string& name, const std::string& dir)
|
|
{
|
|
const std::string dirName = _cacheDir + "/" + dir;
|
|
const std::string fileName = dirName + "/" + name;
|
|
File directory(dirName);
|
|
|
|
if (directory.exists() && directory.isDirectory() && File(fileName).exists())
|
|
{
|
|
std::unique_ptr<std::fstream> result(new std::fstream(fileName, std::ios::in));
|
|
return result;
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
void TileCache::invalidateTiles(int part, int x, int y, int width, int height)
|
|
{
|
|
LOG_TRC("Removing invalidated tiles: part: " << part <<
|
|
", x: " << x << ", y: " << y <<
|
|
", width: " << width <<
|
|
", height: " << height);
|
|
|
|
File dir(_cacheDir);
|
|
|
|
assertCorrectThread();
|
|
|
|
if (dir.exists() && dir.isDirectory())
|
|
{
|
|
for (auto tileIterator = DirectoryIterator(dir); tileIterator != DirectoryIterator(); ++tileIterator)
|
|
{
|
|
const std::string fileName = tileIterator.path().getFileName();
|
|
if (intersectsTile(fileName, part, x, y, width, height))
|
|
{
|
|
LOG_DBG("Removing tile: " << tileIterator.path().toString());
|
|
FileUtil::removeFile(tileIterator.path());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void TileCache::invalidateTiles(const std::string& tiles)
|
|
{
|
|
std::pair<int, Util::Rectangle> result = TileCache::parseInvalidateMsg(tiles);
|
|
Util::Rectangle& invalidateRect = result.second;
|
|
invalidateTiles(result.first, invalidateRect.getLeft(), invalidateRect.getTop(), invalidateRect.getWidth(), invalidateRect.getHeight());
|
|
}
|
|
|
|
std::pair<int, Util::Rectangle> TileCache::parseInvalidateMsg(const std::string& tiles)
|
|
{
|
|
StringTokenizer tokens(tiles, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
|
|
|
|
assert(tokens[0] == "invalidatetiles:");
|
|
|
|
if (tokens.count() == 2 && tokens[1] == "EMPTY")
|
|
{
|
|
return std::pair<int, Util::Rectangle>(-1, Util::Rectangle(0, 0, INT_MAX, INT_MAX));
|
|
}
|
|
else if (tokens.count() == 3 && tokens[1] == "EMPTY,")
|
|
{
|
|
int part = 0;
|
|
if (stringToInteger(tokens[2], part))
|
|
{
|
|
return std::pair<int, Util::Rectangle>(part, Util::Rectangle(0, 0, INT_MAX, INT_MAX));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
int part, x, y, width, height;
|
|
if (tokens.count() == 6 &&
|
|
getTokenInteger(tokens[1], "part", part) &&
|
|
getTokenInteger(tokens[2], "x", x) &&
|
|
getTokenInteger(tokens[3], "y", y) &&
|
|
getTokenInteger(tokens[4], "width", width) &&
|
|
getTokenInteger(tokens[5], "height", height))
|
|
{
|
|
|
|
return std::pair<int, Util::Rectangle>(part, Util::Rectangle(x, y, width, height));
|
|
}
|
|
}
|
|
|
|
LOG_ERR("Unexpected invalidatetiles request [" << tiles << "].");
|
|
return std::pair<int, Util::Rectangle>(-1, Util::Rectangle(0, 0, 0, 0));
|
|
}
|
|
|
|
void TileCache::removeFile(const std::string& fileName)
|
|
{
|
|
const std::string fullFileName = _cacheDir + "/" + fileName;
|
|
|
|
if (std::remove(fullFileName.c_str()) == 0)
|
|
LOG_INF("Removed file: " << fullFileName);
|
|
}
|
|
|
|
std::string TileCache::cacheFileName(const TileDesc& tile)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << tile.getPart() << '_' << tile.getWidth() << 'x' << tile.getHeight() << '.'
|
|
<< tile.getTilePosX() << ',' << tile.getTilePosY() << '.'
|
|
<< tile.getTileWidth() << 'x' << tile.getTileHeight() << ".png";
|
|
return oss.str();
|
|
}
|
|
|
|
bool TileCache::parseCacheFileName(const std::string& fileName, int& part, int& width, int& height, int& tilePosX, int& tilePosY, int& tileWidth, int& tileHeight)
|
|
{
|
|
return std::sscanf(fileName.c_str(), "%d_%dx%d.%d,%d.%dx%d.png", &part, &width, &height, &tilePosX, &tilePosY, &tileWidth, &tileHeight) == 7;
|
|
}
|
|
|
|
bool TileCache::intersectsTile(const std::string& fileName, int part, int x, int y, int width, int height)
|
|
{
|
|
int tilePart, tilePixelWidth, tilePixelHeight, tilePosX, tilePosY, tileWidth, tileHeight;
|
|
if (parseCacheFileName(fileName, tilePart, tilePixelWidth, tilePixelHeight, tilePosX, tilePosY, tileWidth, tileHeight))
|
|
{
|
|
if (part != -1 && tilePart != part)
|
|
return false;
|
|
|
|
const int left = std::max(x, tilePosX);
|
|
const int right = std::min(x + width, tilePosX + tileWidth);
|
|
const int top = std::max(y, tilePosY);
|
|
const int bottom = std::min(y + height, tilePosY + tileHeight);
|
|
|
|
if (left <= right && top <= bottom)
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
Timestamp TileCache::getLastModified()
|
|
{
|
|
std::fstream modTimeFile(_cacheDir + "/modtime.txt", std::ios::in);
|
|
|
|
if (!modTimeFile.is_open())
|
|
return 0;
|
|
|
|
Timestamp::TimeVal result;
|
|
modTimeFile >> result;
|
|
|
|
modTimeFile.close();
|
|
return result;
|
|
}
|
|
|
|
void TileCache::saveLastModified(const Timestamp& timestamp)
|
|
{
|
|
std::fstream modTimeFile(_cacheDir + "/modtime.txt", std::ios::out);
|
|
modTimeFile << timestamp.raw() << std::endl;
|
|
modTimeFile.close();
|
|
}
|
|
|
|
// FIXME: to be further simplified when we centralize tile messages.
|
|
void TileCache::subscribeToTileRendering(const TileDesc& tile, const std::shared_ptr<ClientSession>& subscriber)
|
|
{
|
|
std::ostringstream oss;
|
|
oss << '(' << tile.getPart() << ',' << tile.getTilePosX() << ',' << tile.getTilePosY() << ')';
|
|
const std::string name = oss.str();
|
|
|
|
assertCorrectThread();
|
|
|
|
std::shared_ptr<TileBeingRendered> tileBeingRendered = findTileBeingRendered(tile);
|
|
|
|
if (tileBeingRendered)
|
|
{
|
|
for (const auto &s : tileBeingRendered->_subscribers)
|
|
{
|
|
if (s.lock().get() == subscriber.get())
|
|
{
|
|
LOG_DBG("Redundant request to subscribe on tile " << name);
|
|
tileBeingRendered->setVersion(tile.getVersion());
|
|
return;
|
|
}
|
|
}
|
|
|
|
LOG_DBG("Subscribing " << subscriber->getName() << " to tile " << name << " which has " <<
|
|
tileBeingRendered->_subscribers.size() << " subscribers already.");
|
|
tileBeingRendered->_subscribers.push_back(subscriber);
|
|
if(tile.getId() == -1)
|
|
subscriber->traceSubscribeToTile(tileBeingRendered->getCacheName());
|
|
|
|
const auto duration = (std::chrono::steady_clock::now() - tileBeingRendered->getStartTime());
|
|
if (std::chrono::duration_cast<std::chrono::milliseconds>(duration).count() > COMMAND_TIMEOUT_MS)
|
|
{
|
|
// Tile painting has stalled. Reissue.
|
|
tileBeingRendered->setVersion(tile.getVersion());
|
|
}
|
|
}
|
|
else
|
|
{
|
|
LOG_DBG("Subscribing " << subscriber->getName() << " to tile " << name <<
|
|
" ver=" << tile.getVersion() << " which has no subscribers.");
|
|
|
|
const std::string cachedName = cacheFileName(tile);
|
|
|
|
assert(_tilesBeingRendered.find(cachedName) == _tilesBeingRendered.end());
|
|
|
|
tileBeingRendered = std::make_shared<TileBeingRendered>(cachedName, tile);
|
|
tileBeingRendered->_subscribers.push_back(subscriber);
|
|
if(tile.getId() == -1)
|
|
subscriber->traceSubscribeToTile(tileBeingRendered->getCacheName());
|
|
_tilesBeingRendered[cachedName] = tileBeingRendered;
|
|
}
|
|
}
|
|
|
|
void TileCache::registerTileBeingRendered(const TileDesc& tile)
|
|
{
|
|
std::shared_ptr<TileBeingRendered> tileBeingRendered = findTileBeingRendered(tile);
|
|
if (tileBeingRendered)
|
|
{
|
|
const auto duration = (std::chrono::steady_clock::now() - tileBeingRendered->getStartTime());
|
|
if (std::chrono::duration_cast<std::chrono::milliseconds>(duration).count() > COMMAND_TIMEOUT_MS)
|
|
{
|
|
// Tile painting has stalled. Reissue.
|
|
tileBeingRendered->setVersion(tile.getVersion());
|
|
}
|
|
}
|
|
else
|
|
{
|
|
const std::string cachedName = cacheFileName(tile);
|
|
|
|
assert(_tilesBeingRendered.find(cachedName) == _tilesBeingRendered.end());
|
|
|
|
tileBeingRendered = std::make_shared<TileBeingRendered>(cachedName, tile);
|
|
_tilesBeingRendered[cachedName] = tileBeingRendered;
|
|
}
|
|
}
|
|
|
|
std::string TileCache::cancelTiles(const std::shared_ptr<ClientSession> &subscriber)
|
|
{
|
|
assert(subscriber && "cancelTiles expects valid subscriber");
|
|
LOG_TRC("Cancelling tiles for " << subscriber->getName());
|
|
|
|
assertCorrectThread();
|
|
|
|
const ClientSession* sub = subscriber.get();
|
|
|
|
std::ostringstream oss;
|
|
|
|
for (auto it = _tilesBeingRendered.begin(); it != _tilesBeingRendered.end(); )
|
|
{
|
|
if (it->second->getTile().getId() >= 0)
|
|
{
|
|
// Tile is for a thumbnail, don't cancel it
|
|
++it;
|
|
continue;
|
|
}
|
|
|
|
auto& subscribers = it->second->_subscribers;
|
|
LOG_TRC("Tile " << it->first << " has " << subscribers.size() << " subscribers.");
|
|
|
|
const auto itRem = std::find_if(subscribers.begin(), subscribers.end(),
|
|
[sub](std::weak_ptr<ClientSession>& ptr){ return ptr.lock().get() == sub; });
|
|
if (itRem != subscribers.end())
|
|
{
|
|
LOG_TRC("Tile " << it->first << " has " << subscribers.size() <<
|
|
" subscribers. Removing " << subscriber->getName() << ".");
|
|
subscribers.erase(itRem, itRem + 1);
|
|
if (subscribers.empty())
|
|
{
|
|
// No other subscriber, remove it from the render queue.
|
|
oss << it->second->getVersion() << ',';
|
|
it = _tilesBeingRendered.erase(it);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
++it;
|
|
}
|
|
|
|
const std::string canceltiles = oss.str();
|
|
return canceltiles.empty() ? canceltiles : "canceltiles " + canceltiles;
|
|
}
|
|
|
|
void TileCache::assertCorrectThread()
|
|
{
|
|
const bool correctThread = _owner == std::thread::id() || std::this_thread::get_id() == _owner;
|
|
if (!correctThread)
|
|
LOG_ERR("TileCache method invoked from foreign thread. Expected: " <<
|
|
Log::to_string(_owner) << " but called from " <<
|
|
std::this_thread::get_id() << " (" << Util::getThreadId() << ").");
|
|
assert (correctThread);
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|