chenx221/Textractor_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor to use shared_lock

Browse Source
This commit is contained in:
Akash Mozumdar 2018-10-02 14:10:25 -04:00
parent f4c068fa29
commit 257e617eb6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GUI/extensions.cpp
View File

@ -20,20 +20,20 @@ std::map<int, QString> LoadExtensions()
file.chop(sizeof("dll")); file.chop(sizeof("dll"));
extensionNames[extensionNumber] = file.split("_")[1]; extensionNames[extensionNumber] = file.split("_")[1];
} }
extenMutex.lock(); std::shared_lock<std::shared_mutex> extenLock(extenMutex);
extensions = newExtensions; extensions = newExtensions;
extenMutex.unlock();
return extensionNames; return extensionNames;
} }
bool DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std::string, int64_t> miscInfo) bool DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std::string, int64_t> miscInfo)
{ {
bool success = true;
wchar_t* sentenceBuffer = (wchar_t*)malloc((sentence.size() + 1) * sizeof(wchar_t)); wchar_t* sentenceBuffer = (wchar_t*)malloc((sentence.size() + 1) * sizeof(wchar_t));
wcscpy_s(sentenceBuffer, sentence.size() + 1, sentence.c_str()); wcscpy_s(sentenceBuffer, sentence.size() + 1, sentence.c_str());
InfoForExtension* miscInfoLinkedList = new InfoForExtension; InfoForExtension* miscInfoLinkedList = new InfoForExtension;
InfoForExtension* miscInfoTraverser = miscInfoLinkedList; InfoForExtension* miscInfoTraverser = miscInfoLinkedList;
for (auto& i : miscInfo) miscInfoTraverser = miscInfoTraverser->nextProperty = new InfoForExtension{ i.first.c_str(), i.second, nullptr }; for (auto& i : miscInfo) miscInfoTraverser = miscInfoTraverser->nextProperty = new InfoForExtension{ i.first.c_str(), i.second, nullptr };
extenMutex.lock_shared(); std::shared_lock<std::shared_mutex> extenLock(extenMutex);
try try
{ {
for (auto i : extensions) for (auto i : extensions)
@ -43,10 +43,9 @@ bool DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std
if (sentenceBuffer != prev) free((void*)prev); if (sentenceBuffer != prev) free((void*)prev);
} }
} }
catch (...) { sentenceBuffer[0] = 0; } catch (...) { success = false; }
extenMutex.unlock_shared();
delete miscInfoLinkedList;
sentence = std::wstring(sentenceBuffer); sentence = std::wstring(sentenceBuffer);
free((void*)sentenceBuffer); free((void*)sentenceBuffer);
return sentence.size() > 0; delete miscInfoLinkedList;
return success;
} }