AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNetworkAccessCache: Remove unused code

Browse Source 
The function was never called. As a consequence receiverQueue was
only ever read and never written.

Change-Id: I30905446452d9f263124d3af08c42e2e1b0cafbe
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Mårten Nordheim 2021-08-27 09:33:27 +02:00
parent ba8f9d8d92
commit 587d64507a
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/network/access/qnetworkaccesscache.cpp
View File

@ -64,7 +64,6 @@ namespace {
struct QNetworkAccessCache::Node struct QNetworkAccessCache::Node
{ {
QDateTime timestamp; QDateTime timestamp;
std::vector<Receiver> receiverQueue;
QByteArray key; QByteArray key;
Node *older, *newer; Node *older, *newer;
@ -305,30 +304,6 @@ bool QNetworkAccessCache::hasEntry(const QByteArray &key) const
return hash.contains(key); return hash.contains(key);
} }
bool QNetworkAccessCache::requestEntry(const QByteArray &key, QObject *target, const char *member)
{
Node *node = hash.value(key);
if (!node)
return false;
if (node->useCount > 0 && !node->object->shareable) {
// object is not shareable and is in use
// queue for later use
Q_ASSERT(node->older == nullptr && node->newer == nullptr);
node->receiverQueue.push_back({target, member});
// request queued
return true;
} else {
// node not in use or is shareable
if (unlinkEntry(key))
updateTimer();
++node->useCount;
return emitEntryReady(node, target, member);
}
}
QNetworkAccessCache::CacheableObject *QNetworkAccessCache::requestEntryNow(const QByteArray &key) QNetworkAccessCache::CacheableObject *QNetworkAccessCache::requestEntryNow(const QByteArray &key)
{ {
Node *node = hash.value(key); Node *node = hash.value(key);
@ -364,22 +339,6 @@ void QNetworkAccessCache::releaseEntry(const QByteArray &key)
Q_ASSERT(node->useCount > 0); Q_ASSERT(node->useCount > 0);
// are there other objects waiting?
const auto objectStillExists = [](const Receiver &r) { return !r.object.isNull(); };
auto &queue = node->receiverQueue;
auto qit = std::find_if(queue.begin(), queue.end(), objectStillExists);
const Receiver receiver = qit == queue.end() ? Receiver{} : std::move(*qit++) ;
queue.erase(queue.begin(), qit);
if (receiver.object) {
// queue another activation
emitEntryReady(node, receiver.object, receiver.member);
return;
}
if (!--node->useCount) { if (!--node->useCount) {
// no objects waiting; add it back to the expiry list // no objects waiting; add it back to the expiry list
if (node->object->expires) if (node->object->expires)

1
src/network/access/qnetworkaccesscache_p.h
View File

@ -98,7 +98,6 @@ public:
void addEntry(const QByteArray &key, CacheableObject *entry, qint64 connectionCacheExpiryTimeoutSeconds = -1); void addEntry(const QByteArray &key, CacheableObject *entry, qint64 connectionCacheExpiryTimeoutSeconds = -1);
bool hasEntry(const QByteArray &key) const; bool hasEntry(const QByteArray &key) const;
bool requestEntry(const QByteArray &key, QObject *target, const char *member);
CacheableObject *requestEntryNow(const QByteArray &key); CacheableObject *requestEntryNow(const QByteArray &key);
void releaseEntry(const QByteArray &key); void releaseEntry(const QByteArray &key);
void removeEntry(const QByteArray &key); void removeEntry(const QByteArray &key);