1 files changed, 57 insertions, 32 deletions
diff --git a/pool.h b/pool.h
index 27f093f..358b79f 100644..100755
--- a/pool.h
+++ b/pool.h
@@ -1,52 +1,77 @@
-#include "incl.h"
-#include "thrd.h"
-#include "s_tool.h"
-#include "s_conf.h"
-#include "s_mutx.h"
+// class pool declaration.
 
 #ifndef POOL_H
 #define POOL_H
 
-#include <queue>
+#include "incl.h"
 
 using namespace std;
 
-class pool
+class pool 
 {
 private:
-  struct task
-  {
-    void(*p_func)(void*);
-    void *p_void;
+ typedef struct tpool_work
+ {
+  void (*routine)(void*); ///
+  void *arg;
+  struct tpool_work *next;
+ } 
+ tpool_work_t;
+
+ typedef struct tpool
+ {
+  // pool characteristics:
+  int num_threads;
+  int max_queue_size;
+  int do_not_block_when_full;
+
+  // pool state
+  pthread_t *threads;
+  int cur_queue_size;
+
+  tpool_work_t *queue_head;
+  tpool_work_t *queue_tail;
+
+  pthread_mutex_t queue_lock;
+  pthread_cond_t  queue_not_empty;
+  pthread_cond_t  queue_not_full;
+  pthread_cond_t  queue_empty;
+
+  int queue_closed;
+  int shutdown;
+ } 
+ *tpool_t;
+
+ int i_thrd_pool_size;
+ int i_thrd_pool_queue;
+
+ tpool_t thread_pool;
 
-    task(void(*p_func)(void*), void *p_void)
-    {
-      this->p_func = p_func;
-      this->p_void = p_void;
-    }
-  };
+ virtual void
+ tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size, int do_not_block_when_full );
 
-  pthread_mutex_t mut_threads;
-  pthread_mutex_t mut_queue_tasks;
-  pthread_mutex_t mut_num_avail_threads;
-  pthread_cond_t cond_new_task;
+ virtual int
+ tpool_add_work( tpool_t tpool, void(*routine)(void*), void* arg );
 
-  int i_num_avail_threads;
-  int i_num_total_threads;
+// virtual void
+// tpool_destroy( tpool_t tpoolp, int finish );
 
-  queue<task*> queue_tasks;
+ static void*
+ tpool_thread( void* arg);
 
-  int increase_pool(int i_num);
-  void add_task( void(*p_func)(void*), void* p_void );
-  static void* wait_for_task(void *p_void);
-  static void run_func(void *p_void);
+ static void
+ run_func( void *v_pointer );
 
+ // public methods: 
 public:
-  pool();
-  ~pool();
+ explicit pool( );     
+ ~pool();
 
-  void run(void* p_void);
-  bool allow_user_login();
+ // inline (speed)!
+ void run( void *arg )
+ {
+  tpool_add_work( thread_pool, run_func, arg ); 
+ }
 };
 
 #endif