backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-05 19:36:16 +08:00
Code Issues Projects Releases Wiki Activity

Made buffer thread wait until there is a GUI client #4721

Browse Source 
Conflicts:
	src/lib/ipc/IpcLogOutputter.cpp
This commit is contained in:
Xinyu Hou
2015-07-13 11:00:10 +01:00
committed by Jerry (Xinyu Hou)
parent cc3dc315f9
commit afdcb9cefe
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/ipc/IpcLogOutputter.cpp
View File

@@ -37,7 +37,7 @@ enum EIpcLogOutputter {
kBufferRateTimeLimit = 1 // seconds
};
IpcLogOutputter::IpcLogOutputter(IpcServer& ipcServer, bool useThread) :
IpcLogOutputter::IpcLogOutputter(IpcServer& ipcServer, EIpcClientType clientType, bool useThread) :
m_ipcServer(ipcServer),
m_bufferMutex(ARCH->newMutex()),
m_sending(false),
@@ -50,7 +50,8 @@ IpcLogOutputter::IpcLogOutputter(IpcServer& ipcServer, bool useThread) :
m_bufferRateWriteLimit(kBufferRateWriteLimit),
m_bufferRateTimeLimit(kBufferRateTimeLimit),
m_bufferWriteCount(0),
m_bufferRateStart(ARCH->time())
m_bufferRateStart(ARCH->time()),
m_clientType(clientType)
{
if (useThread) {
m_bufferThread = new Thread(new TMethodJob<IpcLogOutputter>(
@@ -102,7 +103,9 @@ IpcLogOutputter::write(ELevel, const char* text)
}
appendBuffer(text);
notifyBuffer();
if (m_ipcServer.hasClients(m_clientType)) {
notifyBuffer();
}
return true;
}
@@ -141,7 +144,7 @@ IpcLogOutputter::bufferThread(void*)
try {
while (m_running) {
if (m_buffer.empty()) {
if (m_buffer.empty() || !m_ipcServer.hasClients(m_clientType)) {
ArchMutexLock lock(m_notifyMutex);
ARCH->waitCondVar(m_notifyCond, m_notifyMutex, -1);
}
@@ -184,10 +187,7 @@ IpcLogOutputter::getChunk(size_t count)
void
IpcLogOutputter::sendBuffer()
{
if (m_buffer.empty() || !m_ipcServer.hasClients(kIpcClientGui)) {
if (!m_buffer.empty()) {
m_buffer.clear();
}
if (m_buffer.empty() || !m_ipcServer.hasClients(m_clientType)) {
return;
}