IO refactor phase 1. Reduced dependencies, removed redundant classes.

Renamed pricipal APR classes in preparation for move to apr namespace.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@469625 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 4 deletions

diff --git a/cpp/src/qpid/concurrent/Thread.h b/cpp/src/qpid/concurrent/Thread.h
index 6bd2a379ce..d18bc153bf 100644
--- a/cpp/src/qpid/concurrent/Thread.h
+++ b/cpp/src/qpid/concurrent/Thread.h
@@ -18,16 +18,27 @@
 #ifndef _Thread_
 #define _Thread_
 
+#include "apr-1/apr_thread_proc.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/concurrent/Thread.h"
+
 namespace qpid {
 namespace concurrent {
 
     class Thread
     {
+	const Runnable* runnable;
+	apr_pool_t* pool;
+	apr_thread_t* runner;
+
     public:
-        virtual ~Thread(){}
-	virtual void start() = 0;
-	virtual void join() = 0;
-	virtual void interrupt() = 0;
+	Thread(apr_pool_t* pool, Runnable* runnable);
+	virtual ~Thread();
+	virtual void start();
+	virtual void join();
+	virtual void interrupt();
+        static unsigned int currentThread();
     };
 
 }