1 files changed, 25 insertions, 13 deletions

diff --git a/src/thrd/pool.h b/src/thrd/pool.h
index cbd1e83..a744133 100755
--- a/src/thrd/pool.h
+++ b/src/thrd/pool.h
@@ -8,11 +8,10 @@ using namespace std;
 class pool
 {
 private:
-    static int i_thrd_used;
-
-    typedef struct tpool_work {
+    typedef struct tpool_work
+    {
         void (*routine)(void*); ///
-        void *p_void;
+        void *arg;
         struct tpool_work *next;
     }
     tpool_work_t;
@@ -22,6 +21,7 @@ private:
         // pool characteristics:
         int num_threads;
         int max_queue_size;
+        int do_not_block_when_full;
 
         // pool state
         pthread_t *threads;
@@ -34,6 +34,9 @@ private:
         pthread_cond_t  queue_not_empty;
         pthread_cond_t  queue_not_full;
         pthread_cond_t  queue_empty;
+
+        int queue_closed;
+        int shutdown;
     }
     *tpool_t;
 
@@ -42,23 +45,32 @@ private:
 
     tpool_t thread_pool;
 
-    void tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size); 
-    int tpool_add_work( tpool_t tpool, void(*routine)(void*), void* p_void );
-    static void* tpool_thread( void *p_void);
-    static void run_func( void *p_void );
+    void
+    tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size, int do_not_block_when_full );
+
+    int
+    tpool_add_work( tpool_t tpool, void(*routine)(void*), void* arg );
 
+    // virtual void
+    // tpool_destroy( tpool_t tpoolp, int finish );
+
+    static void*
+    tpool_thread( void* arg);
+
+    static void
+    run_func( void *v_pointer );
+
+    // public methods:
 public:
-    pool();
+    pool( );
 
     // inline (speed)!
-    void run( void *p_void )
+    void run( void *arg )
     {
-        tpool_add_work( thread_pool, run_func, p_void );
+        tpool_add_work( thread_pool, run_func, arg );
     }
-
 #ifdef NCURSES
     void print_pool_size();
-    static void print_threads(int i_thrd_used);
 #endif
 };