aboutsummaryrefslogtreecommitdiff
path: root/CacheDataHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'CacheDataHandler.cpp')
-rw-r--r--CacheDataHandler.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/CacheDataHandler.cpp b/CacheDataHandler.cpp
index 36881629..5f3a3076 100644
--- a/CacheDataHandler.cpp
+++ b/CacheDataHandler.cpp
@@ -18,19 +18,22 @@ CacheDataHandler& CacheDataHandlerInstance()
void CacheDataHandler::Register(const HidlToken token, const size_t hashValue, const size_t cacheSize)
{
- if (m_CacheDataMap.find(hashValue) != m_CacheDataMap.end())
+ if (m_CacheDataMap.find(hashValue) != m_CacheDataMap.end()
+ && m_CacheDataMap.at(hashValue).GetToken() == token
+ && m_CacheDataMap.at(hashValue).GetCacheSize() == cacheSize)
{
- ALOGV("CacheHandler::Register() Token has been already registered.");
+ ALOGV("CacheHandler::Register() Hash value has already registered.");
return;
}
CacheHandle cacheHandle(token, cacheSize);
m_CacheDataMap.insert({hashValue, cacheHandle});
}
-bool CacheDataHandler::Validate(const HidlToken token, const size_t hashValue) const
+bool CacheDataHandler::Validate(const HidlToken token, const size_t hashValue, const size_t cacheSize) const
{
return (m_CacheDataMap.find(hashValue) != m_CacheDataMap.end()
- && m_CacheDataMap.at(hashValue).GetToken() == token);
+ && m_CacheDataMap.at(hashValue).GetToken() == token
+ && m_CacheDataMap.at(hashValue).GetCacheSize() == cacheSize);
}
size_t CacheDataHandler::Hash(std::vector<uint8_t>& cacheData)
@@ -38,7 +41,7 @@ size_t CacheDataHandler::Hash(std::vector<uint8_t>& cacheData)
std::size_t hash = cacheData.size();
for (auto& i : cacheData)
{
- hash ^= std::hash<unsigned int>{}(i);
+ hash = ((hash << 5) - hash) + i;
}
return hash;
}