Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update AssetServer.cpp

Browse source
This commit is contained in:
utkarshgautamnyu 2017-09-28 11:23:20 -07:00 committed by GitHub
parent 463afd6be5
commit 32e319fedc
1 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
assignment-client/src/assets/AssetServer.cpp
View file

@ -50,9 +50,9 @@ static const int INTERFACE_RUNNING_CHECK_FREQUENCY_MS = 1000;
const QString ASSET_SERVER_LOGGING_TARGET_NAME = "asset-server"; const QString ASSET_SERVER_LOGGING_TARGET_NAME = "asset-server";
static const QStringList BAKEABLE_MODEL_EXTENSIONS = { "fbx" }; static const QStringList BAKEABLE_MODEL_EXTENSIONS = {"fbx"};
static QStringList BAKEABLE_TEXTURE_EXTENSIONS; static QStringList BAKEABLE_TEXTURE_EXTENSIONS;
static const QStringList BAKEABLE_SCRIPT_EXTENSIONS = { "js" }; static const QStringList BAKEABLE_SCRIPT_EXTENSIONS = {"js"};
static const QString BAKED_MODEL_SIMPLE_NAME = "asset.fbx"; static const QString BAKED_MODEL_SIMPLE_NAME = "asset.fbx";
static const QString BAKED_TEXTURE_SIMPLE_NAME = "texture.ktx"; static const QString BAKED_TEXTURE_SIMPLE_NAME = "texture.ktx";
static const QString BAKED_SCRIPT_SIMPLE_NAME = "asset.js"; static const QString BAKED_SCRIPT_SIMPLE_NAME = "asset.js";
@ -125,7 +125,7 @@ std::pair<BakingStatus, QString> AssetServer::getAssetStatus(const AssetPath& pa
return { Error, meta.lastBakeErrors }; return { Error, meta.lastBakeErrors };
} }
} }
return { Pending, "" }; return { Pending, "" };
} }
@ -147,8 +147,8 @@ void AssetServer::maybeBake(const AssetPath& path, const AssetHash& hash) {
void AssetServer::createEmptyMetaFile(const AssetHash& hash) { void AssetServer::createEmptyMetaFile(const AssetHash& hash) {
QString metaFilePath = "atp:/" + hash + "/meta.json"; QString metaFilePath = "atp:/" + hash + "/meta.json";
QFile metaFile{ metaFilePath }; QFile metaFile { metaFilePath };
if (!metaFile.exists()) { if (!metaFile.exists()) {
qDebug() << "Creating metafile for " << hash; qDebug() << "Creating metafile for " << hash;
if (metaFile.open(QFile::WriteOnly)) { if (metaFile.open(QFile::WriteOnly)) {
@ -205,7 +205,7 @@ bool interfaceRunning() {
bool result = false; bool result = false;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QSharedMemory sharedMemory{ getInterfaceSharedMemoryName() }; QSharedMemory sharedMemory { getInterfaceSharedMemoryName() };
result = sharedMemory.attach(QSharedMemory::ReadOnly); result = sharedMemory.attach(QSharedMemory::ReadOnly);
if (result) { if (result) {
sharedMemory.detach(); sharedMemory.detach();
@ -226,7 +226,7 @@ void updateConsumedCores() {
auto coreCount = std::thread::hardware_concurrency(); auto coreCount = std::thread::hardware_concurrency();
if (isInterfaceRunning) { if (isInterfaceRunning) {
coreCount = coreCount > MIN_CORES_FOR_MULTICORE ? CPU_AFFINITY_COUNT_HIGH : CPU_AFFINITY_COUNT_LOW; coreCount = coreCount > MIN_CORES_FOR_MULTICORE ? CPU_AFFINITY_COUNT_HIGH : CPU_AFFINITY_COUNT_LOW;
} }
qCDebug(asset_server) << "Setting max consumed cores to " << coreCount; qCDebug(asset_server) << "Setting max consumed cores to " << coreCount;
setMaxCores(coreCount); setMaxCores(coreCount);
} }
@ -235,7 +235,8 @@ void updateConsumedCores() {
AssetServer::AssetServer(ReceivedMessage& message) : AssetServer::AssetServer(ReceivedMessage& message) :
ThreadedAssignment(message), ThreadedAssignment(message),
_transferTaskPool(this), _transferTaskPool(this),
_bakingTaskPool(this) { _bakingTaskPool(this)
{
// store the current state of image compression so we can reset it when this assignment is complete // store the current state of image compression so we can reset it when this assignment is complete
_wasColorTextureCompressionEnabled = image::isColorTexturesCompressionEnabled(); _wasColorTextureCompressionEnabled = image::isColorTexturesCompressionEnabled();
_wasGrayscaleTextureCompressionEnabled = image::isGrayscaleTexturesCompressionEnabled(); _wasGrayscaleTextureCompressionEnabled = image::isGrayscaleTexturesCompressionEnabled();
@ -262,7 +263,7 @@ AssetServer::AssetServer(ReceivedMessage& message) :
packetReceiver.registerListener(PacketType::AssetGetInfo, this, "handleAssetGetInfo"); packetReceiver.registerListener(PacketType::AssetGetInfo, this, "handleAssetGetInfo");
packetReceiver.registerListener(PacketType::AssetUpload, this, "handleAssetUpload"); packetReceiver.registerListener(PacketType::AssetUpload, this, "handleAssetUpload");
packetReceiver.registerListener(PacketType::AssetMappingOperation, this, "handleAssetMappingOperation"); packetReceiver.registerListener(PacketType::AssetMappingOperation, this, "handleAssetMappingOperation");
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
updateConsumedCores(); updateConsumedCores();
QTimer* timer = new QTimer(this); QTimer* timer = new QTimer(this);
@ -286,7 +287,7 @@ void AssetServer::aboutToFinish() {
// abort each of our still running bake tasks, remove pending bakes that were never put on the thread pool // abort each of our still running bake tasks, remove pending bakes that were never put on the thread pool
auto it = _pendingBakes.begin(); auto it = _pendingBakes.begin();
while (it != _pendingBakes.end()) { while (it != _pendingBakes.end()) {
auto pendingRunnable = _bakingTaskPool.tryTake(it->get()); auto pendingRunnable = _bakingTaskPool.tryTake(it->get());
if (pendingRunnable) { if (pendingRunnable) {
it = _pendingBakes.erase(it); it = _pendingBakes.erase(it);
@ -347,7 +348,7 @@ void AssetServer::completeSetup() {
int maxBandwidth = maxBandwidthFloat * BITS_PER_MEGABITS; int maxBandwidth = maxBandwidthFloat * BITS_PER_MEGABITS;
nodeList->setConnectionMaxBandwidth(maxBandwidth); nodeList->setConnectionMaxBandwidth(maxBandwidth);
qCInfo(asset_server) << "Set maximum bandwith per connection to" << maxBandwidthFloat << "Mb/s." qCInfo(asset_server) << "Set maximum bandwith per connection to" << maxBandwidthFloat << "Mb/s."
" (" << maxBandwidth << "bits/s)"; " (" << maxBandwidth << "bits/s)";
} }
// get the path to the asset folder from the domain server settings // get the path to the asset folder from the domain server settings
@ -361,7 +362,7 @@ void AssetServer::completeSetup() {
} }
auto assetsPathString = assetsJSONValue.toString(); auto assetsPathString = assetsJSONValue.toString();
QDir assetsPath{ assetsPathString }; QDir assetsPath { assetsPathString };
QString absoluteFilePath = assetsPath.absolutePath(); QString absoluteFilePath = assetsPath.absolutePath();
if (assetsPath.isRelative()) { if (assetsPath.isRelative()) {
@ -389,7 +390,7 @@ void AssetServer::completeSetup() {
// Check the asset directory to output some information about what we have // Check the asset directory to output some information about what we have
auto files = _filesDirectory.entryList(QDir::Files); auto files = _filesDirectory.entryList(QDir::Files);
QRegExp hashFileRegex{ ASSET_HASH_REGEX_STRING }; QRegExp hashFileRegex { ASSET_HASH_REGEX_STRING };
auto hashedFiles = files.filter(hashFileRegex); auto hashedFiles = files.filter(hashFileRegex);
qCInfo(asset_server) << "There are" << hashedFiles.size() << "asset files in the asset directory."; qCInfo(asset_server) << "There are" << hashedFiles.size() << "asset files in the asset directory.";
@ -408,7 +409,7 @@ void AssetServer::completeSetup() {
} }
void AssetServer::cleanupUnmappedFiles() { void AssetServer::cleanupUnmappedFiles() {
QRegExp hashFileRegex{ "^[a-f0-9]{" + QString::number(SHA256_HASH_HEX_LENGTH) + "}" }; QRegExp hashFileRegex { "^[a-f0-9]{" + QString::number(SHA256_HASH_HEX_LENGTH) + "}" };
auto files = _filesDirectory.entryInfoList(QDir::Files); auto files = _filesDirectory.entryInfoList(QDir::Files);
@ -417,7 +418,7 @@ void AssetServer::cleanupUnmappedFiles() {
for (const auto& fileInfo : files) { for (const auto& fileInfo : files) {
auto filename = fileInfo.fileName(); auto filename = fileInfo.fileName();
if (hashFileRegex.exactMatch(filename)) { if (hashFileRegex.exactMatch(filename)) {
bool matched{ false }; bool matched { false };
for (auto& pair : _fileMappings) { for (auto& pair : _fileMappings) {
if (pair.second == filename) { if (pair.second == filename) {
matched = true; matched = true;
@ -426,7 +427,7 @@ void AssetServer::cleanupUnmappedFiles() {
} }
if (!matched) { if (!matched) {
// remove the unmapped file // remove the unmapped file
QFile removeableFile{ fileInfo.absoluteFilePath() }; QFile removeableFile { fileInfo.absoluteFilePath() };
if (removeableFile.remove()) { if (removeableFile.remove()) {
qCDebug(asset_server) << "\tDeleted" << filename << "from asset files directory since it is unmapped."; qCDebug(asset_server) << "\tDeleted" << filename << "from asset files directory since it is unmapped.";
@ -478,7 +479,7 @@ void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> me
void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) { void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
QString assetPath = message.readString(); QString assetPath = message.readString();
QUrl url{ assetPath }; QUrl url { assetPath };
assetPath = url.path(); assetPath = url.path();
auto it = _fileMappings.find(assetPath); auto it = _fileMappings.find(assetPath);
@ -497,7 +498,7 @@ void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNode
} else if (BAKEABLE_SCRIPT_EXTENSIONS.contains(assetPathExtension)) { } else if (BAKEABLE_SCRIPT_EXTENSIONS.contains(assetPathExtension)) {
bakedRootFile = BAKED_SCRIPT_SIMPLE_NAME; bakedRootFile = BAKED_SCRIPT_SIMPLE_NAME;
} }
auto originalAssetHash = it->second; auto originalAssetHash = it->second;
QString redirectedAssetHash; QString redirectedAssetHash;
QString bakedAssetPath; QString bakedAssetPath;
@ -561,7 +562,7 @@ void AssetServer::handleGetAllMappingOperation(ReceivedMessage& message, SharedN
replyPacket.writePrimitive(count); replyPacket.writePrimitive(count);
for (auto it = _fileMappings.cbegin(); it != _fileMappings.cend(); ++it) { for (auto it = _fileMappings.cbegin(); it != _fileMappings.cend(); ++ it) {
auto mapping = it->first; auto mapping = it->first;
auto hash = it->second; auto hash = it->second;
replyPacket.writeString(mapping); replyPacket.writeString(mapping);
@ -602,7 +603,7 @@ void AssetServer::handleSetMappingOperation(ReceivedMessage& message, SharedNode
void AssetServer::handleDeleteMappingsOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) { void AssetServer::handleDeleteMappingsOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
if (senderNode->getCanWriteToAssetServer()) { if (senderNode->getCanWriteToAssetServer()) {
int numberOfDeletedMappings{ 0 }; int numberOfDeletedMappings { 0 };
message.readPrimitive(&numberOfDeletedMappings); message.readPrimitive(&numberOfDeletedMappings);
QStringList mappingsToDelete; QStringList mappingsToDelete;
@ -652,7 +653,7 @@ void AssetServer::handleRenameMappingOperation(ReceivedMessage& message, SharedN
void AssetServer::handleSetBakingEnabledOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) { void AssetServer::handleSetBakingEnabledOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
if (senderNode->getCanWriteToAssetServer()) { if (senderNode->getCanWriteToAssetServer()) {
bool enabled{ true }; bool enabled { true };
message.readPrimitive(&enabled); message.readPrimitive(&enabled);
int numberOfMappings{ 0 }; int numberOfMappings{ 0 };
@ -695,7 +696,7 @@ void AssetServer::handleAssetGetInfo(QSharedPointer<ReceivedMessage> message, Sh
replyPacket->write(assetHash); replyPacket->write(assetHash);
QString fileName = QString(hexHash); QString fileName = QString(hexHash);
QFileInfo fileInfo{ _filesDirectory.filePath(fileName) }; QFileInfo fileInfo { _filesDirectory.filePath(fileName) };
if (fileInfo.exists() && fileInfo.isReadable()) { if (fileInfo.exists() && fileInfo.isReadable()) {
qCDebug(asset_server) << "Opening file: " << fileInfo.filePath(); qCDebug(asset_server) << "Opening file: " << fileInfo.filePath();
@ -826,7 +827,7 @@ bool AssetServer::loadMappingsFromFile() {
auto mapFilePath = _resourcesDirectory.absoluteFilePath(MAP_FILE_NAME); auto mapFilePath = _resourcesDirectory.absoluteFilePath(MAP_FILE_NAME);
QFile mapFile{ mapFilePath }; QFile mapFile { mapFilePath };
if (mapFile.exists()) { if (mapFile.exists()) {
if (mapFile.open(QIODevice::ReadOnly)) { if (mapFile.open(QIODevice::ReadOnly)) {
QJsonParseError error; QJsonParseError error;
@ -882,7 +883,7 @@ bool AssetServer::loadMappingsFromFile() {
bool AssetServer::writeMappingsToFile() { bool AssetServer::writeMappingsToFile() {
auto mapFilePath = _resourcesDirectory.absoluteFilePath(MAP_FILE_NAME); auto mapFilePath = _resourcesDirectory.absoluteFilePath(MAP_FILE_NAME);
QFile mapFile{ mapFilePath }; QFile mapFile { mapFilePath };
if (mapFile.open(QIODevice::WriteOnly)) { if (mapFile.open(QIODevice::WriteOnly)) {
QJsonObject root; QJsonObject root;
@ -890,7 +891,7 @@ bool AssetServer::writeMappingsToFile() {
root[it.first] = it.second; root[it.first] = it.second;
} }
QJsonDocument jsonDocument{ root }; QJsonDocument jsonDocument { root };
if (mapFile.write(jsonDocument.toJson()) != -1) { if (mapFile.write(jsonDocument.toJson()) != -1) {
qCDebug(asset_server) << "Wrote JSON mappings to file at" << mapFilePath; qCDebug(asset_server) << "Wrote JSON mappings to file at" << mapFilePath;
@ -954,7 +955,7 @@ void AssetServer::removeBakedPathsForDeletedAsset(AssetHash hash) {
// check if we had baked content for that file that should also now be removed // check if we had baked content for that file that should also now be removed
// by calling deleteMappings for the hidden baked content folder for this hash // by calling deleteMappings for the hidden baked content folder for this hash
AssetPathList hiddenBakedFolder{ HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" }; AssetPathList hiddenBakedFolder { HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" };
qCDebug(asset_server) << "Deleting baked content below" << hiddenBakedFolder << "since" << hash << "was deleted"; qCDebug(asset_server) << "Deleting baked content below" << hiddenBakedFolder << "since" << hash << "was deleted";
@ -1002,7 +1003,7 @@ bool AssetServer::deleteMappings(const AssetPathList& paths) {
hashesToCheckForDeletion << it->second; hashesToCheckForDeletion << it->second;
qCDebug(asset_server) << "Deleted a mapping:" << path << "=>" << it->second; qCDebug(asset_server) << "Deleted a mapping:" << path << "=>" << it->second;
_fileMappings.erase(it); _fileMappings.erase(it);
} else { } else {
qCDebug(asset_server) << "Unable to delete a mapping that was not found:" << path; qCDebug(asset_server) << "Unable to delete a mapping that was not found:" << path;
@ -1025,7 +1026,7 @@ bool AssetServer::deleteMappings(const AssetPathList& paths) {
// we now have a set of hashes that are unmapped - we will delete those asset files // we now have a set of hashes that are unmapped - we will delete those asset files
for (auto& hash : hashesToCheckForDeletion) { for (auto& hash : hashesToCheckForDeletion) {
// remove the unmapped file // remove the unmapped file
QFile removeableFile{ _filesDirectory.absoluteFilePath(hash) }; QFile removeableFile { _filesDirectory.absoluteFilePath(hash) };
if (removeableFile.remove()) { if (removeableFile.remove()) {
qCDebug(asset_server) << "\tDeleted" << hash << "from asset files directory since it is now unmapped."; qCDebug(asset_server) << "\tDeleted" << hash << "from asset files directory since it is now unmapped.";
@ -1172,7 +1173,7 @@ void AssetServer::handleFailedBake(QString originalAssetHash, QString assetPath,
} }
void AssetServer::handleCompletedBake(QString originalAssetHash, QString originalAssetPath, QVector<QString> bakedFilePaths) { void AssetServer::handleCompletedBake(QString originalAssetHash, QString originalAssetPath, QVector<QString> bakedFilePaths) {
bool errorCompletingBake{ false }; bool errorCompletingBake { false };
QString errorReason; QString errorReason;
qDebug() << "Completing bake for " << originalAssetHash; qDebug() << "Completing bake for " << originalAssetHash;
@ -1271,7 +1272,7 @@ std::pair<bool, AssetMeta> AssetServer::readMetaFile(AssetHash hash) {
auto it = _fileMappings.find(metaFilePath); auto it = _fileMappings.find(metaFilePath);
if (it == _fileMappings.end()) { if (it == _fileMappings.end()) {
return { false,{} }; return { false, {} };
} }
auto metaFileHash = it->second; auto metaFileHash = it->second;
@ -1308,7 +1309,7 @@ std::pair<bool, AssetMeta> AssetServer::readMetaFile(AssetHash hash) {
} }
} }
return { false,{} }; return { false, {} };
} }
bool AssetServer::writeMetaFile(AssetHash originalAssetHash, const AssetMeta& meta) { bool AssetServer::writeMetaFile(AssetHash originalAssetHash, const AssetMeta& meta) {
@ -1357,7 +1358,7 @@ bool AssetServer::setBakingEnabled(const AssetPathList& paths, bool enabled) {
auto extension = path.mid(dotIndex + 1); auto extension = path.mid(dotIndex + 1);
QString bakedFilename; QString bakedFilename;
if (BAKEABLE_MODEL_EXTENSIONS.contains(extension)) { if (BAKEABLE_MODEL_EXTENSIONS.contains(extension)) {
bakedFilename = BAKED_MODEL_SIMPLE_NAME; bakedFilename = BAKED_MODEL_SIMPLE_NAME;
} else if (BAKEABLE_TEXTURE_EXTENSIONS.contains(extension.toLocal8Bit()) && hasMetaFile(hash)) { } else if (BAKEABLE_TEXTURE_EXTENSIONS.contains(extension.toLocal8Bit()) && hasMetaFile(hash)) {