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

use library rw lock

Browse Source
This commit is contained in:
Akash Mozumdar 2019-02-16 00:25:19 -05:00
parent 9ed3900512
commit c7ff5f637a
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
GUI/extenwindow.cpp
View File

@ -4,6 +4,7 @@
#include "text.h" #include "text.h"
#include "types.h" #include "types.h"
#include "misc.h" #include "misc.h"
#include <concrt.h>
#include <QDragEnterEvent> #include <QDragEnterEvent>
#include <QDropEvent> #include <QDropEvent>
#include <QMimeData> #include <QMimeData>
@ -19,17 +20,7 @@ namespace
wchar_t*(*callback)(wchar_t*, const InfoForExtension*); wchar_t*(*callback)(wchar_t*, const InfoForExtension*);
}; };
class : std::shared_mutex concurrency::reader_writer_lock extenMutex;
{
public:
void lock() { ++queuedWrites; shared_mutex::lock(); }
void unlock() { --queuedWrites; shared_mutex::unlock(); }
void lock_shared() { while (queuedWrites) Sleep(100); shared_mutex::lock_shared(); }
void unlock_shared() { shared_mutex::unlock_shared(); }
private:
std::atomic<int> queuedWrites = 0;
} extenMutex;
std::vector<Extension> extensions; std::vector<Extension> extensions;
void Load(QString extenName) void Load(QString extenName)
@ -65,7 +56,7 @@ bool DispatchSentenceToExtensions(std::wstring& sentence, const InfoForExtension
wchar_t* sentenceBuffer = (wchar_t*)HeapAlloc(GetProcessHeap(), 0, (sentence.size() + 1) * sizeof(wchar_t)); wchar_t* sentenceBuffer = (wchar_t*)HeapAlloc(GetProcessHeap(), 0, (sentence.size() + 1) * sizeof(wchar_t));
wcscpy_s(sentenceBuffer, sentence.size() + 1, sentence.c_str()); wcscpy_s(sentenceBuffer, sentence.size() + 1, sentence.c_str());
std::shared_lock readLock(extenMutex); concurrency::reader_writer_lock::scoped_lock_read readLock(extenMutex);
for (const auto& extension : extensions) for (const auto& extension : extensions)
{ {
wchar_t* nextBuffer = extension.callback(sentenceBuffer, miscInfo); wchar_t* nextBuffer = extension.callback(sentenceBuffer, miscInfo);
@ -104,7 +95,7 @@ void ExtenWindow::Sync()
{ {
ui->extenList->clear(); ui->extenList->clear();
QTextFile extenSaveFile(EXTEN_SAVE_FILE, QIODevice::WriteOnly | QIODevice::Truncate); QTextFile extenSaveFile(EXTEN_SAVE_FILE, QIODevice::WriteOnly | QIODevice::Truncate);
std::shared_lock readLock(extenMutex); concurrency::reader_writer_lock::scoped_lock_read readLock(extenMutex);
for (auto extension : extensions) for (auto extension : extensions)
{ {
ui->extenList->addItem(S(extension.name)); ui->extenList->addItem(S(extension.name));