Replaced ACE_Task_Base based LogWorker with ProducerConsumerQueue

This commit is contained in:
leak committed 2014-06-30 14:44:52 +02:00
1 parent a5c742dafe
commit eb36acd152
7 files changed
+141 -34

No files matched your search

+1 -1
View File
@@ -273,7 +273,7 @@ void Log::write(LogMessage* msg) const
msg->text.append("\n");
if (worker)
worker->enqueue(new LogOperation(logger, msg));
worker->Enqueue(new LogOperation(logger, msg));
else
{
logger->write(*msg);
+1
View File
@@ -23,6 +23,7 @@
#include "Appender.h"
#include "Logger.h"
#include "LogWorker.h"
#include <stdarg.h>
#include <unordered_map>
#include <string>
+20 -14
View File
@@ -16,35 +16,41 @@
*/
#include "LogWorker.h"
#include <thread>
LogWorker::LogWorker()
: m_queue(HIGH_WATERMARK, LOW_WATERMARK)
{
ACE_Task_Base::activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED, 1);
_cancelationToken = false;
_workerThread = std::thread(&LogWorker::WorkerThread, this);
}
LogWorker::~LogWorker()
{
m_queue.deactivate();
wait();
_cancelationToken = true;
_queue.Cancel();
_workerThread.join();
}
int LogWorker::enqueue(LogOperation* op)
void LogWorker::Enqueue(LogOperation* op)
{
return m_queue.enqueue(op);
return _queue.Push(op);
}
int LogWorker::svc()
void LogWorker::WorkerThread()
{
while (1)
{
LogOperation* request;
if (m_queue.dequeue(request) == -1)
break;
LogOperation* operation = nullptr;
_queue.WaitAndPop(operation);
request->call();
delete request;
if (_cancelationToken)
return;
operation->call();
delete operation;
}
return 0;
}
+14 -15
View File
@@ -18,30 +18,29 @@
#ifndef LOGWORKER_H
#define LOGWORKER_H
#include <atomic>
#include <thread>
#include "LogOperation.h"
#include "ProducerConsumerQueue.h"
#include <ace/Task.h>
#include <ace/Activation_Queue.h>
class LogWorker: protected ACE_Task_Base
class LogWorker
{
public:
LogWorker();
~LogWorker();
typedef ACE_Message_Queue_Ex<LogOperation, ACE_MT_SYNCH> LogMessageQueueType;
enum
{
HIGH_WATERMARK = 8 * 1024 * 1024,
LOW_WATERMARK = 8 * 1024 * 1024
};
int enqueue(LogOperation *op);
void Enqueue(LogOperation *op);
private:
virtual int svc();
LogMessageQueueType m_queue;
ProducerConsumerQueue<LogOperation*> _queue;
void WorkerThread();
std::thread _workerThread;
std::atomic_bool _cancelationToken;
};
#endif