tagging ychat-0.5.2ychat-0.5.2

1 files changed, 32 insertions, 57 deletions

diff --git a/pool.h b/pool.h
index 358b79f..27f093f 100755..100644
--- a/pool.h
+++ b/pool.h
@@ -1,77 +1,52 @@
-// class pool declaration.
+#include "incl.h"
+#include "thrd.h"
+#include "s_tool.h"
+#include "s_conf.h"
+#include "s_mutx.h"
 
 #ifndef POOL_H
 #define POOL_H
 
-#include "incl.h"
+#include <queue>
 
 using namespace std;
 
-class pool 
+class pool
 {
 private:
- 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;
+  struct task
+  {
+    void(*p_func)(void*);
+    void *p_void;
 
- virtual void
- tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size, int do_not_block_when_full );
+    task(void(*p_func)(void*), void *p_void)
+    {
+      this->p_func = p_func;
+      this->p_void = p_void;
+    }
+  };
 
- virtual int
- tpool_add_work( tpool_t tpool, void(*routine)(void*), void* arg );
+  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 void
-// tpool_destroy( tpool_t tpoolp, int finish );
+  int i_num_avail_threads;
+  int i_num_total_threads;
 
- static void*
- tpool_thread( void* arg);
+  queue<task*> queue_tasks;
 
- static void
- run_func( void *v_pointer );
+  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);
 
- // public methods: 
 public:
- explicit pool( );     
- ~pool();
+  pool();
+  ~pool();
 
- // inline (speed)!
- void run( void *arg )
- {
-  tpool_add_work( thread_pool, run_func, arg ); 
- }
+  void run(void* p_void);
+  bool allow_user_login();
 };
 
 #endif