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

Add threading related asserts to AssetClient

Browse source
This commit is contained in:
Ryan Huffman 2016-04-21 16:39:57 -07:00
parent da5bbe51d1
commit 9e46b43489
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libraries/networking/src/AssetClient.cpp
View file

@ -99,6 +99,8 @@ void AssetClient::clearCache() {
} }
void AssetClient::handleAssetMappingOperationReply(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { void AssetClient::handleAssetMappingOperationReply(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
Q_ASSERT(QThread::currentThread() == thread());
MessageID messageID; MessageID messageID;
message->readPrimitive(&messageID); message->readPrimitive(&messageID);
@ -201,6 +203,8 @@ AssetUpload* AssetClient::createUpload(const QByteArray& data) {
MessageID AssetClient::getAsset(const QString& hash, DataOffset start, DataOffset end, MessageID AssetClient::getAsset(const QString& hash, DataOffset start, DataOffset end,
ReceivedAssetCallback callback, ProgressCallback progressCallback) { ReceivedAssetCallback callback, ProgressCallback progressCallback) {
Q_ASSERT(QThread::currentThread() == thread());
if (hash.length() != SHA256_HASH_HEX_LENGTH) { if (hash.length() != SHA256_HASH_HEX_LENGTH) {
qCWarning(asset_client) << "Invalid hash size"; qCWarning(asset_client) << "Invalid hash size";
return false; return false;
@ -239,6 +243,8 @@ MessageID AssetClient::getAsset(const QString& hash, DataOffset start, DataOffse
} }
MessageID AssetClient::getAssetInfo(const QString& hash, GetInfoCallback callback) { MessageID AssetClient::getAssetInfo(const QString& hash, GetInfoCallback callback) {
Q_ASSERT(QThread::currentThread() == thread());
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer); SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
@ -263,6 +269,8 @@ MessageID AssetClient::getAssetInfo(const QString& hash, GetInfoCallback callbac
} }
void AssetClient::handleAssetGetInfoReply(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { void AssetClient::handleAssetGetInfoReply(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
Q_ASSERT(QThread::currentThread() == thread());
MessageID messageID; MessageID messageID;
message->readPrimitive(&messageID); message->readPrimitive(&messageID);
auto assetHash = message->read(SHA256_HASH_LENGTH); auto assetHash = message->read(SHA256_HASH_LENGTH);
@ -297,6 +305,8 @@ void AssetClient::handleAssetGetInfoReply(QSharedPointer<ReceivedMessage> messag
} }
void AssetClient::handleAssetGetReply(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { void AssetClient::handleAssetGetReply(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
Q_ASSERT(QThread::currentThread() == thread());
auto assetHash = message->read(SHA256_HASH_LENGTH); auto assetHash = message->read(SHA256_HASH_LENGTH);
qCDebug(asset_client) << "Got reply for asset: " << assetHash.toHex(); qCDebug(asset_client) << "Got reply for asset: " << assetHash.toHex();
@ -357,6 +367,8 @@ void AssetClient::handleAssetGetReply(QSharedPointer<ReceivedMessage> message, S
} }
MessageID AssetClient::getAssetMapping(const AssetPath& path, MappingOperationCallback callback) { MessageID AssetClient::getAssetMapping(const AssetPath& path, MappingOperationCallback callback) {
Q_ASSERT(QThread::currentThread() == thread());
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer); SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
@ -382,6 +394,8 @@ MessageID AssetClient::getAssetMapping(const AssetPath& path, MappingOperationCa
} }
MessageID AssetClient::getAllAssetMappings(MappingOperationCallback callback) { MessageID AssetClient::getAllAssetMappings(MappingOperationCallback callback) {
Q_ASSERT(QThread::currentThread() == thread());
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer); SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
@ -434,6 +448,8 @@ MessageID AssetClient::deleteAssetMappings(const AssetPathList& paths, MappingOp
} }
MessageID AssetClient::setAssetMapping(const QString& path, const AssetHash& hash, MappingOperationCallback callback) { MessageID AssetClient::setAssetMapping(const QString& path, const AssetHash& hash, MappingOperationCallback callback) {
Q_ASSERT(QThread::currentThread() == thread());
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer); SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
@ -487,6 +503,8 @@ MessageID AssetClient::renameAssetMapping(const AssetPath& oldPath, const AssetP
} }
bool AssetClient::cancelMappingRequest(MessageID id) { bool AssetClient::cancelMappingRequest(MessageID id) {
Q_ASSERT(QThread::currentThread() == thread());
for (auto& kv : _pendingMappingRequests) { for (auto& kv : _pendingMappingRequests) {
if (kv.second.erase(id)) { if (kv.second.erase(id)) {
return true; return true;
@ -496,6 +514,8 @@ bool AssetClient::cancelMappingRequest(MessageID id) {
} }
bool AssetClient::cancelGetAssetInfoRequest(MessageID id) { bool AssetClient::cancelGetAssetInfoRequest(MessageID id) {
Q_ASSERT(QThread::currentThread() == thread());
for (auto& kv : _pendingInfoRequests) { for (auto& kv : _pendingInfoRequests) {
if (kv.second.erase(id)) { if (kv.second.erase(id)) {
return true; return true;
@ -505,6 +525,8 @@ bool AssetClient::cancelGetAssetInfoRequest(MessageID id) {
} }
bool AssetClient::cancelGetAssetRequest(MessageID id) { bool AssetClient::cancelGetAssetRequest(MessageID id) {
Q_ASSERT(QThread::currentThread() == thread());
// Search through each pending mapping request for id `id` // Search through each pending mapping request for id `id`
for (auto& kv : _pendingRequests) { for (auto& kv : _pendingRequests) {
auto& messageCallbackMap = kv.second; auto& messageCallbackMap = kv.second;
@ -526,6 +548,8 @@ bool AssetClient::cancelGetAssetRequest(MessageID id) {
} }
bool AssetClient::cancelUploadAssetRequest(MessageID id) { bool AssetClient::cancelUploadAssetRequest(MessageID id) {
Q_ASSERT(QThread::currentThread() == thread());
// Search through each pending mapping request for id `id` // Search through each pending mapping request for id `id`
for (auto& kv : _pendingUploads) { for (auto& kv : _pendingUploads) {
if (kv.second.erase(id)) { if (kv.second.erase(id)) {
@ -536,6 +560,8 @@ bool AssetClient::cancelUploadAssetRequest(MessageID id) {
} }
MessageID AssetClient::uploadAsset(const QByteArray& data, UploadResultCallback callback) { MessageID AssetClient::uploadAsset(const QByteArray& data, UploadResultCallback callback) {
Q_ASSERT(QThread::currentThread() == thread());
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer); SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
@ -561,6 +587,8 @@ MessageID AssetClient::uploadAsset(const QByteArray& data, UploadResultCallback
} }
void AssetClient::handleAssetUploadReply(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { void AssetClient::handleAssetUploadReply(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
Q_ASSERT(QThread::currentThread() == thread());
MessageID messageID; MessageID messageID;
message->readPrimitive(&messageID); message->readPrimitive(&messageID);
@ -599,6 +627,8 @@ void AssetClient::handleAssetUploadReply(QSharedPointer<ReceivedMessage> message
} }
void AssetClient::handleNodeKilled(SharedNodePointer node) { void AssetClient::handleNodeKilled(SharedNodePointer node) {
Q_ASSERT(QThread::currentThread() == thread());
if (node->getType() != NodeType::AssetServer) { if (node->getType() != NodeType::AssetServer) {
return; return;
} }