tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed unused ThreadPool class.

This commit is contained in:
Gunnar Beutner 2012-09-14 14:43:56 +02:00
parent 063d69ed96
commit d79a7fca0d
4 changed files with 0 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/Makefile.am
View File

@ -50,8 +50,6 @@ libbase_la_SOURCES = \
tcpserver.h \ tcpserver.h \
tcpsocket.cpp \ tcpsocket.cpp \
tcpsocket.h \ tcpsocket.h \
threadpool.cpp \
threadpool.h \
timer.cpp \ timer.cpp \
timer.h \ timer.h \
tlsclient.cpp \ tlsclient.cpp \

1
lib/base/i2-base.h
View File

@ -189,7 +189,6 @@ namespace tuples = boost::tuples;
#include "logger.h" #include "logger.h"
#include "application.h" #include "application.h"
#include "component.h" #include "component.h"
#include "threadpool.h"
#include "streamlogger.h" #include "streamlogger.h"
#include "sysloglogger.h" #include "sysloglogger.h"

114
lib/base/threadpool.cpp
View File

@ -1,114 +0,0 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "i2-base.h"
using namespace icinga;
ThreadPool::ThreadPool(long numThreads)
: m_Alive(true)
{
for (long i = 0; i < numThreads; i++)
m_Threads.create_thread(boost::bind(&ThreadPool::WorkerThreadProc, this));
}
ThreadPool::~ThreadPool(void)
{
{
boost::mutex::scoped_lock lock(m_Lock);
m_Tasks.clear();
/* notify worker threads to exit */
m_Alive = false;
m_CV.notify_all();
}
m_Threads.join_all();
}
void ThreadPool::EnqueueTasks(list<ThreadPoolTask::Ptr>& tasks)
{
{
boost::mutex::scoped_lock lock(m_Lock);
m_Tasks.splice(m_Tasks.end(), tasks, tasks.begin(), tasks.end());
}
m_CV.notify_all();
}
void ThreadPool::EnqueueTask(const ThreadPoolTask::Ptr& task)
{
{
boost::mutex::scoped_lock lock(m_Lock);
m_Tasks.push_back(task);
}
m_CV.notify_one();
}
ThreadPoolTask::Ptr ThreadPool::DequeueTask(void)
{
boost::mutex::scoped_lock lock(m_Lock);
while (m_Tasks.empty()) {
if (!m_Alive)
return ThreadPoolTask::Ptr();
m_CV.wait(lock);
}
ThreadPoolTask::Ptr task = m_Tasks.front();
m_Tasks.pop_front();
return task;
}
void ThreadPool::WaitForTasks(void)
{
boost::mutex::scoped_lock lock(m_Lock);
/* wait for all pending tasks */
while (!m_Tasks.empty())
m_CV.wait(lock);
}
void ThreadPool::WorkerThreadProc(void)
{
while (true) {
ThreadPoolTask::Ptr task = DequeueTask();
if (!task)
break;
task->Execute();
}
}
ThreadPool::Ptr ThreadPool::GetDefaultPool(void)
{
static ThreadPool::Ptr threadPool;
if (!threadPool)
threadPool = boost::make_shared<ThreadPool>();
return threadPool;
}

64
lib/base/threadpool.h
View File

@ -1,64 +0,0 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#ifndef THREADPOOL_H
#define THREADPOOL_H
namespace icinga
{
struct ThreadPoolTask
{
typedef shared_ptr<ThreadPoolTask> Ptr;
typedef weak_ptr<ThreadPoolTask> WeakPtr;
virtual void Execute(void) = 0;
};
class I2_BASE_API ThreadPool : public Object
{
public:
typedef shared_ptr<ThreadPool> Ptr;
typedef weak_ptr<ThreadPool> WeakPtr;
ThreadPool(long maxThreads = 128);
~ThreadPool(void);
static ThreadPool::Ptr GetDefaultPool(void);
void EnqueueTasks(list<ThreadPoolTask::Ptr>& tasks);
void EnqueueTask(const ThreadPoolTask::Ptr& task);
void WaitForTasks(void);
private:
mutable boost::mutex m_Lock;
condition_variable m_CV;
list<ThreadPoolTask::Ptr> m_Tasks;
thread_group m_Threads;
bool m_Alive;
ThreadPoolTask::Ptr DequeueTask(void);
void WorkerThreadProc(void);
};
}
#endif /* THREADPOOL_H */