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

performance improvement. or maybe not idk my benchmarks make no sense but i think it's better

Browse Source
This commit is contained in:
Akash Mozumdar 2019-06-02 23:05:01 -04:00
parent 02f127e80c
commit 494fcd24c3
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GUI/host/textthread.cpp
View File

@ -23,7 +23,7 @@ void TextThread::Stop()
void TextThread::AddSentence(std::wstring&& sentence) void TextThread::AddSentence(std::wstring&& sentence)
{ {
queuedSentences->emplace_back(std::move(sentence)); queuedSentences.push(std::move(sentence));
} }
void TextThread::Push(BYTE* data, int length) void TextThread::Push(BYTE* data, int length)
@ -51,15 +51,20 @@ void TextThread::Push(BYTE* data, int length)
buffer.clear(); buffer.clear();
} }
} }
if (flushDelay == 0 && hp.type & USING_STRING)
{
AddSentence(std::move(buffer));
buffer.clear();
}
} }
void TextThread::Flush() void TextThread::Flush()
{ {
if (storage->size() > 10'000'000) storage->erase(0, 8'000'000); // https://github.com/Artikash/Textractor/issues/127#issuecomment-486882983 if (storage->size() > 10'000'000) storage->erase(0, 8'000'000); // https://github.com/Artikash/Textractor/issues/127#issuecomment-486882983
std::vector<std::wstring> sentences; std::wstring sentence;
queuedSentences->swap(sentences); while (queuedSentences.try_pop(sentence))
for (auto& sentence : sentences)
{ {
sentence.erase(std::remove(sentence.begin(), sentence.end(), L'\0')); sentence.erase(std::remove(sentence.begin(), sentence.end(), L'\0'));
if (Output(*this, sentence)) storage->append(sentence); if (Output(*this, sentence)) storage->append(sentence);

3
GUI/host/textthread.h
View File

@ -2,6 +2,7 @@
#include "common.h" #include "common.h"
#include "types.h" #include "types.h"
#include <concurrent_queue.h>
class TextThread class TextThread
{ {
@ -36,7 +37,7 @@ private:
std::unordered_set<wchar_t> repeatingChars; std::unordered_set<wchar_t> repeatingChars;
std::mutex bufferMutex; std::mutex bufferMutex;
DWORD lastPushTime = 0; DWORD lastPushTime = 0;
ThreadSafe<std::vector<std::wstring>> queuedSentences; concurrency::concurrent_queue<std::wstring> queuedSentences;
struct TimerDeleter { void operator()(HANDLE h) { DeleteTimerQueueTimer(NULL, h, INVALID_HANDLE_VALUE); } }; struct TimerDeleter { void operator()(HANDLE h) { DeleteTimerQueueTimer(NULL, h, INVALID_HANDLE_VALUE); } };
AutoHandle<TimerDeleter> timer = NULL; AutoHandle<TimerDeleter> timer = NULL;
}; };