chenx221/Textractor
1
0
Fork 0
forked from Public-Mirror/Textractor
Code Pull Requests Activity

fix race condition

Browse Source
This commit is contained in:
Akash Mozumdar 2019-02-28 01:40:40 -05:00
parent 0345181484
commit 7e8dfc0332
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/replacer.cpp
View File

@ -9,6 +9,7 @@ extern const wchar_t* REPLACER_INSTRUCTIONS;
constexpr auto REPLACE_SAVE_FILE = u8"SavedReplacements.txt"; constexpr auto REPLACE_SAVE_FILE = u8"SavedReplacements.txt";
std::atomic<std::filesystem::file_time_type> replaceFileLastWrite; std::atomic<std::filesystem::file_time_type> replaceFileLastWrite;
std::shared_mutex m;
struct struct
{ {
@ -34,8 +35,9 @@ public:
{ {
length += 1; length += 1;
} }
else if (auto& next = current->next[ch]) else if (current->next.count(ch) != 0)
{ {
auto& next = current->next.at(ch);
length += 1; length += 1;
current = next.get(); current = next.get();
if (current->value) result = { length, current->value }; if (current->value) result = { length, current->value };
@ -60,6 +62,7 @@ private:
int Parse(const std::wstring& file) int Parse(const std::wstring& file)
{ {
std::lock_guard l(m);
replacementTrie = {}; replacementTrie = {};
int count = 0; int count = 0;
size_t end = 0; size_t end = 0;
@ -76,6 +79,7 @@ int Parse(const std::wstring& file)
bool Replace(std::wstring& sentence) bool Replace(std::wstring& sentence)
{ {
std::shared_lock l(m);
for (int i = 0; i < sentence.size(); ++i) for (int i = 0; i < sentence.size(); ++i)
{ {
auto[length, replacement] = replacementTrie.Lookup(sentence.substr(i)); auto[length, replacement] = replacementTrie.Lookup(sentence.substr(i));
@ -116,21 +120,17 @@ BOOL WINAPI DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved
bool ProcessSentence(std::wstring& sentence, SentenceInfo) bool ProcessSentence(std::wstring& sentence, SentenceInfo)
{ {
static std::shared_mutex m;
static_assert(std::has_unique_object_representations_v<decltype(replaceFileLastWrite)::value_type>); static_assert(std::has_unique_object_representations_v<decltype(replaceFileLastWrite)::value_type>);
if (!replaceFileLastWrite.compare_exchange_strong(std::filesystem::last_write_time(REPLACE_SAVE_FILE), std::filesystem::last_write_time(REPLACE_SAVE_FILE))) if (!replaceFileLastWrite.compare_exchange_strong(std::filesystem::last_write_time(REPLACE_SAVE_FILE), std::filesystem::last_write_time(REPLACE_SAVE_FILE)))
{ {
std::lock_guard l(m);
std::vector<BYTE> file(std::istreambuf_iterator<char>(std::ifstream(REPLACE_SAVE_FILE, std::ios::in | std::ios::binary)), {}); std::vector<BYTE> file(std::istreambuf_iterator<char>(std::ifstream(REPLACE_SAVE_FILE, std::ios::in | std::ios::binary)), {});
Parse(std::wstring((wchar_t*)file.data(), file.size() / sizeof(wchar_t))); Parse(std::wstring((wchar_t*)file.data(), file.size() / sizeof(wchar_t)));
} }
std::shared_lock l(m);
return Replace(sentence); return Replace(sentence);
} }
TEST( TEST_SYNC(
{ {
assert(Parse(LR"(|ORIG| さよなら|BECOMES|goodbye|END| assert(Parse(LR"(|ORIG| さよなら|BECOMES|goodbye|END|
|ORIG|バカ|BECOMES|idiot|END| |ORIG|バカ|BECOMES|idiot|END|

6
include/common.h
View File

@ -69,3 +69,9 @@ private:
#else #else
#define TEST(...) #define TEST(...)
#endif #endif
#ifdef _DEBUG
#define TEST_SYNC(...) inline auto TEST__RUNNER__DUMMY = std::invoke([] { __VA_ARGS__; return 0UL; });
#else
#define TEST_SYNC(...)
#endif