3 files changed, 0 insertions, 151 deletions
diff --git a/cpp/src_apr/qpid/concurrent/ThreadPool.cpp b/cpp/src_apr/qpid/concurrent/ThreadPool.cpp
deleted file mode 100644
index 5da19745a7..0000000000
--- a/cpp/src_apr/qpid/concurrent/ThreadPool.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include "qpid/concurrent/ThreadFactory.h"
-#include "qpid/concurrent/ThreadPool.h"
-#include "qpid/QpidError.h"
-#include <iostream>
-
-using namespace qpid::concurrent;
-
-ThreadPool::ThreadPool(int _size) : deleteFactory(true), size(_size), factory(new ThreadFactory()), running(false){
-    worker = new Worker(this);
-}
-
-ThreadPool::ThreadPool(int _size, ThreadFactory* _factory) :     deleteFactory(false), size(_size), factory(_factory), running(false){
-    worker = new Worker(this);
-}
-
-ThreadPool::~ThreadPool(){
-    if(deleteFactory) delete factory;
-}
-
-void ThreadPool::addTask(Runnable* task){
-    lock.acquire();
-    tasks.push(task);
-    lock.notifyAll();
-    lock.release();
-}
-
-void ThreadPool::runTask(){
-    lock.acquire();
-    while(tasks.empty()){
-        lock.wait();
-    }
-    Runnable* task = tasks.front();
-    tasks.pop();
-    lock.release();
-    try{
-        task->run();
-    }catch(qpid::QpidError error){
-	std::cout << "Error [" << error.code << "] " << error.msg << " (" << error.file << ":" << error.line << ")" << std::endl;
-    }
-}
-
-void ThreadPool::start(){
-    if(!running){
-        running = true;
-        for(int i = 0; i < size; i++){
-            Thread* t = factory->create(worker);
-            t->start();
-            threads.push_back(t);
-        }
-    }
-}
-
-void ThreadPool::stop(){
-    if(!running){
-        running = false;
-        lock.acquire();
-        lock.notifyAll();
-        lock.release();
-        for(int i = 0; i < size; i++){
-            threads[i]->join();
-            delete threads[i];
-        }
-    }
-}
-
-
diff --git a/cpp/src_apr/qpid/concurrent/ThreadPool.h b/cpp/src_apr/qpid/concurrent/ThreadPool.h
deleted file mode 100644
index 11f0cc364f..0000000000
--- a/cpp/src_apr/qpid/concurrent/ThreadPool.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#ifndef _ThreadPool_
-#define _ThreadPool_
-
-#include <queue>
-#include <vector>
-#include "qpid/concurrent/Monitor.h"
-#include "qpid/concurrent/Thread.h"
-#include "qpid/concurrent/ThreadFactory.h"
-#include "qpid/concurrent/ThreadPool.h"
-#include "qpid/concurrent/Runnable.h"
-
-namespace qpid {
-namespace concurrent {
-
-    class ThreadPool
-    {
-        class Worker : public virtual Runnable{
-            ThreadPool* pool;
-        public:
-            inline Worker(ThreadPool* _pool) : pool(_pool){}
-            inline virtual void run(){
-                while(pool->running){
-                    pool->runTask();
-                }
-            }
-        };
-        const bool deleteFactory;
-        const int size;
-        ThreadFactory* factory;
-        Monitor lock; 
-        std::vector<Thread*> threads;
-        std::queue<Runnable*> tasks;
-        Worker* worker;
-        volatile bool running;
-
-        void runTask();
-    public:
-        ThreadPool(int size);
-        ThreadPool(int size, ThreadFactory* factory);
-        virtual void start();
-        virtual void stop();
-	virtual void addTask(Runnable* task);
-        virtual ~ThreadPool();
-    };
-
-}
-}
-
-
-#endif
diff --git a/cpp/src_apr/qpid/io/Acceptor.h b/cpp/src_apr/qpid/io/Acceptor.h
index bc189f7f6e..384fb9beaf 100644
--- a/cpp/src_apr/qpid/io/Acceptor.h
+++ b/cpp/src_apr/qpid/io/Acceptor.h
@@ -25,7 +25,6 @@
 #include "qpid/io/Acceptor.h"
 #include "qpid/concurrent/Monitor.h"
 #include "qpid/concurrent/ThreadFactory.h"
-#include "qpid/concurrent/ThreadPool.h"
 #include "qpid/io/LFProcessor.h"
 #include "qpid/io/LFSessionContext.h"
 #include "qpid/concurrent/Runnable.h"