Replaced ACE_Task_Base based DatabaseWorker with PCQ

Note: Not exactly sure how shutdown should be handled, currently the queue clears itself out before shutting down
This might need to be changed if the queue should be fully processed before being deleted
This commit is contained in:
leak committed 2014-06-30 18:37:23 +02:00
1 parent 9588c1d92b
commit d39a013b6b
10 files changed
+68 -57

No files matched your search

+27 -17
View File
@@ -20,32 +20,42 @@
#include "SQLOperation.h"
#include "MySQLConnection.h"
#include "MySQLThreading.h"
#include "ProducerConsumerQueue.h"
DatabaseWorker::DatabaseWorker(ACE_Activation_Queue* new_queue, MySQLConnection* con) :
m_queue(new_queue),
m_conn(con)
DatabaseWorker::DatabaseWorker(ProducerConsumerQueue<SQLOperation*>* newQueue, MySQLConnection* connection)
{
/// Assign thread to task
activate();
_connection = connection;
_queue = newQueue;
_cancelationToken = false;
_workerThread = std::thread(&DatabaseWorker::WorkerThread, this);
}
int DatabaseWorker::svc()
DatabaseWorker::~DatabaseWorker()
{
if (!m_queue)
return -1;
_cancelationToken = true;
_queue->Cancel();
_workerThread.join();
}
void DatabaseWorker::WorkerThread()
{
if (!_queue)
return;
SQLOperation *request = NULL;
while (1)
{
request = (SQLOperation*)(m_queue->dequeue());
if (!request)
break;
SQLOperation* operation = nullptr;
request->SetConnection(m_conn);
request->call();
_queue->WaitAndPop(operation);
delete request;
if (_cancelationToken)
return;
operation->SetConnection(_connection);
operation->call();
delete operation;
}
return 0;
}