-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#58: introduce ResolveMapCache and trigger force cook on RPK change
* allowing the pldAssign params to have values other than in the dropdowns (easier to debug the values when the RPK changes) * the RPK change detection can be triggered by toggling a pldAssign parameter or by clicking on the parameter dropdowns of start rule, style or rule file.
- Loading branch information
Showing
10 changed files
with
161 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #pragma once | ||
|
|
||
| constexpr const char* OP_PLD_ASSIGN = "pldAssign"; | ||
| constexpr const char* OP_PLD_GENERATE = "pldGenerate"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // | ||
| // Created by shaegler on 3/3/18. | ||
| // | ||
|
|
||
| #include "ResolveMapCache.h" | ||
| #include "LogHandler.h" | ||
|
|
||
|
|
||
| namespace { | ||
|
|
||
| const ResolveMapUPtr RESOLVE_MAP_NONE; | ||
| const timespec NO_MODIFICATION_TIME{0, 0}; | ||
|
|
||
| timespec getFileModificationTime(const boost::filesystem::path& p) { | ||
| struct stat result; | ||
| if (stat(p.c_str(), &result) == 0) { | ||
| return result.st_mtim; | ||
| } | ||
| else | ||
| return NO_MODIFICATION_TIME; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
|
|
||
| ResolveMapCache::~ResolveMapCache() { | ||
| boost::filesystem::remove_all(mRPKUnpackPath); | ||
| LOG_INF << "Removed RPK unpack directory"; | ||
| } | ||
|
|
||
| ResolveMapCache::LookupResult ResolveMapCache::get(const boost::filesystem::path& rpk) { | ||
| if (rpk.empty()) | ||
| return { RESOLVE_MAP_NONE, CacheStatus::MISS }; | ||
|
|
||
| if (!boost::filesystem::exists(rpk)) | ||
| return { RESOLVE_MAP_NONE, CacheStatus::MISS }; | ||
|
|
||
| const auto timeStamp = getFileModificationTime(rpk); | ||
| LOG_DBG << "rpk: current timestamp: " << timeStamp.tv_sec << "s " << timeStamp.tv_nsec << "ns"; | ||
|
|
||
| CacheStatus cs = CacheStatus::HIT; | ||
| auto it = mCache.find(rpk); | ||
| if (it != mCache.end()) { | ||
| LOG_DBG << "rpk: cache timestamp: " << it->second.mTimeStamp.tv_sec << "s " << it->second.mTimeStamp.tv_nsec << "ns"; | ||
| if (it->second.mTimeStamp.tv_sec != timeStamp.tv_sec || it->second.mTimeStamp.tv_nsec != timeStamp.tv_nsec) { | ||
| mCache.erase(it); | ||
| const auto cnt = boost::filesystem::remove_all(mRPKUnpackPath / rpk.leaf()); | ||
| LOG_INF << "RPK change detected, forcing reload and clearing cache for " << rpk << " (removed " << cnt << " files)"; | ||
| cs = CacheStatus::MISS; | ||
| } | ||
| } | ||
| else | ||
| cs = CacheStatus::MISS; | ||
|
|
||
| if (cs == CacheStatus::MISS) { | ||
| const auto rpkURI = toFileURI(rpk); | ||
|
|
||
| ResolveMapCacheEntry rmce; | ||
| rmce.mTimeStamp = timeStamp; | ||
|
|
||
| prt::Status status = prt::STATUS_UNSPECIFIED_ERROR; | ||
| rmce.mResolveMap.reset(prt::createResolveMap(rpkURI.c_str(), mRPKUnpackPath.wstring().c_str(), &status)); | ||
| if (status != prt::STATUS_OK) | ||
| return { RESOLVE_MAP_NONE, CacheStatus::MISS }; | ||
|
|
||
| it = mCache.emplace(rpk, std::move(rmce)).first; | ||
| LOG_INF << "Upacked RPK " << rpk << " to " << mRPKUnpackPath; | ||
| } | ||
|
|
||
| return { it->second.mResolveMap, cs }; | ||
|
|
||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| #pragma once | ||
|
|
||
| #include "Utils.h" | ||
|
|
||
| #include "boost/filesystem.hpp" | ||
|
|
||
| #include <sys/types.h> | ||
| #include <sys/stat.h> | ||
| #ifndef WIN32 | ||
| # include <unistd.h> | ||
| #endif | ||
|
|
||
|
|
||
| class ResolveMapCache { | ||
| public: | ||
| ResolveMapCache(const boost::filesystem::path& unpackPath) : mRPKUnpackPath{unpackPath} { } | ||
| ResolveMapCache(const ResolveMapCache&) = delete; | ||
| ResolveMapCache(ResolveMapCache&&) = delete; | ||
| ResolveMapCache& operator=(ResolveMapCache&) = delete; | ||
| ~ResolveMapCache(); | ||
|
|
||
| enum class CacheStatus { HIT, MISS }; | ||
| using LookupResult = std::pair<const ResolveMapUPtr&, CacheStatus>; | ||
| LookupResult get(const boost::filesystem::path& rpk); | ||
|
|
||
| private: | ||
| struct ResolveMapCacheEntry { | ||
| ResolveMapUPtr mResolveMap; | ||
| timespec mTimeStamp; | ||
| }; | ||
| using Cache = std::map<boost::filesystem::path, ResolveMapCacheEntry>; | ||
| Cache mCache; | ||
|
|
||
| const boost::filesystem::path mRPKUnpackPath; | ||
| }; | ||
|
|
||
| using ResolveMapCacheUPtr = std::unique_ptr<ResolveMapCache>; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters