4 files changed, 107 insertions, 110 deletions

diff --git a/src/thrd/pool.cpp b/src/thrd/pool.cpp
index ef7b0a3..1db639d 100755
--- a/src/thrd/pool.cpp
+++ b/src/thrd/pool.cpp
@@ -2,26 +2,25 @@
 #define POOL_CPP
 
 #include "pool.h"
+#include "thrd.h"
 
 using namespace std;
 
-int pool::i_thrd_used = 0;
-
 pool::pool()
 {
-    i_thrd_pool_size  = tool::string2int( wrap::CONF->get_elem( "httpd.thread.initpoolsize" ) );
+    i_thrd_pool_size  = tool::string2int( wrap::CONF->get_elem( "httpd.thread.poolsize" ) );
     i_thrd_pool_queue = tool::string2int( wrap::CONF->get_elem( "httpd.thread.queuesize" ) );
-    tpool_init( &thread_pool, i_thrd_pool_size, i_thrd_pool_queue);
+    tpool_init( &thread_pool, i_thrd_pool_size, i_thrd_pool_queue, 0 );
 }
 
 void
-pool::tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size)
+pool::tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size, int do_not_block_when_full )
 {
     int i, rtn;
     tpool_t tpool;
 
     // allocate a pool data structure
-    if (( tpool = (tpool_t) malloc( sizeof( struct tpool ) ) ) == 0 )
+    if (( tpool = (tpool_t) malloc( sizeof( struct tpool ) ) ) == NULL )
     {
      wrap::system_message( POOLERR );
      exit(-1);
@@ -30,18 +29,21 @@ pool::tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size)
     // initialize th fields
     tpool->num_threads    = num_worker_threads;
     tpool->max_queue_size = max_queue_size;
+    tpool->do_not_block_when_full = do_not_block_when_full;
 
-    if ( ( tpool->threads = (pthread_t*) malloc( sizeof(pthread_t)*num_worker_threads ) ) == 0 )
+    if ( ( tpool->threads = (pthread_t*) malloc( sizeof( pthread_t ) *num_worker_threads ) ) == NULL )
     {
         wrap::system_message( POOLERR );
         exit(-1);
     }
 
     tpool->cur_queue_size = 0;
-    tpool->queue_head     = 0;
-    tpool->queue_tail     = 0;
+    tpool->queue_head     = NULL;
+    tpool->queue_tail     = NULL;
+    tpool->queue_closed   = 0;
+    tpool->shutdown       = 0;
 
-    if ( ( rtn = pthread_mutex_init( &(tpool->queue_lock), 0 ) ) != 0 )
+    if ( ( rtn = pthread_mutex_init( &(tpool->queue_lock), NULL ) ) != 0 )
     {
         string s_err( "pthread_mutex_init " );
         s_err.append( strerror( rtn ) );
@@ -50,167 +52,147 @@ pool::tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size)
 
         exit(-1);
     }
-
-    else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_empty), 0 ) ) != 0 )
+    else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_empty), NULL ) ) != 0 )
     {
-        string s_err( "pthread_cond_init (1): " );
+        string s_err( "pthread_mutex_init " );
         s_err.append( strerror( rtn ) );
 
         wrap::system_message( s_err );
 
-        exit(1);
+        exit(-1);
     }
-
-    else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_full), 0 ) ) != 0 )
+    else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_full), NULL ) ) != 0 )
     {
-        string s_err( "pthread_cond_init (2): " );
+        string s_err( "pthread_mutex_init " );
         s_err.append( strerror( rtn ) );
 
         wrap::system_message( s_err );
 
-        exit(1);
+        exit(-1);
     }
-
-    else if ( ( rtn = pthread_cond_init( &(tpool->queue_empty), 0 ) ) != 0 )
+    else if ( ( rtn = pthread_cond_init( &(tpool->queue_empty), NULL ) ) != 0 )
     {
         string s_err( "pthread_mutex_init " );
         s_err.append( strerror( rtn ) );
 
         wrap::system_message( s_err );
 
-        exit(1);
+        exit(-1);
     }
-
     // create threads
-    for ( i = 0; i < num_worker_threads; ++i )
-        pthread_create( &(tpool->threads[i]) , 0, tpool_thread, (void*)tpool );
+    for ( i = 0; i < num_worker_threads; i++ )
+        pthread_create( &(tpool->threads[i]) , NULL, tpool_thread, (void*)tpool );
 
     *tpoolp = tpool;
 }
 
 void*
-pool::tpool_thread( void* p_void )
+pool::tpool_thread( void* arg )
 {
-    tpool_t tpool = (tpool_t) p_void;
+    tpool_t tpool = (tpool_t) arg;
     tpool_work_t *my_workp;
 
-    	for( pthread_mutex_lock( &(tpool->queue_lock) );;
-	     pthread_mutex_lock( &(tpool->queue_lock) ), --i_thrd_used )
- 	{
+    while( true )
+    {
+        pthread_mutex_lock( &(tpool->queue_lock) );
 
-#ifdef NCURSES
-        print_threads(i_thrd_used);
-#endif
+        while ( (tpool->cur_queue_size == 0) && (!tpool->shutdown) )
+            pthread_cond_wait( &(tpool->queue_not_empty), &(tpool->queue_lock) );
 
-        while (tpool->cur_queue_size == 0) 
-           pthread_cond_wait( &(tpool->queue_not_empty), &(tpool->queue_lock) );
+        if (tpool->shutdown)
+        {
+            pthread_mutex_unlock( &(tpool->queue_lock) );
+            pthread_exit( NULL );
+        }
 
         my_workp = tpool->queue_head;
         tpool->cur_queue_size--;
 
         if ( tpool->cur_queue_size == 0)
-            tpool->queue_head = tpool->queue_tail = 0;
+            tpool->queue_head = tpool->queue_tail = NULL;
 
         else
             tpool->queue_head = my_workp->next;
 
-        if ( tpool->cur_queue_size == ( tpool->max_queue_size - 1 ) )
+        if ( ( ! tpool->do_not_block_when_full ) &&
+                (   tpool->cur_queue_size == ( tpool->max_queue_size - 1 ) ) )
             pthread_cond_signal( &(tpool->queue_not_full) );
 
-        if ( tpool->cur_queue_size == 0 ) 
+        if ( tpool->cur_queue_size == 0 )
             pthread_cond_signal( &(tpool->queue_empty) );
 
         pthread_mutex_unlock( &(tpool->queue_lock) );
-
-        (*(my_workp->routine))(my_workp->p_void);
-
-        free(my_workp);
+        (*(my_workp->routine))(my_workp->arg);
+        free((void*)my_workp);
     }
 }
 
-void pool::run_func( void *p_void )
+void pool::run_func( void *v_pointer )
 {
-    int* p_sock = (int*)p_void;
-    wrap::SOCK->read_write( p_sock );
-    delete p_sock;
+    wrap::SOCK->increase_num_threads();
+
+    // recasting the client thread object.
+    thrd *t = (thrd*) v_pointer;
+
+    // start parsing the client request and sending response's back.
+    t-> run ();
+
+    // close the client socket.
+    t->~thrd();
+
+    wrap::SOCK->decrease_num_threads();
+
+    free(v_pointer);
 }
 
 int
-pool::tpool_add_work( tpool_t tpool, void(*routine)(void*), void* p_void ) ///
+pool::tpool_add_work( tpool_t tpool, void(*routine)(void*), void* arg ) ///
 {
     tpool_work_t *workp;
     pthread_mutex_lock( &(tpool->queue_lock) );
 
-    if ( ++i_thrd_used == tpool->num_threads ) 
+    if( ( tpool->cur_queue_size == tpool->max_queue_size ) &&
+            tpool->do_not_block_when_full )
     {
-      int i_max_pool_size = tool::string2int( wrap::CONF->get_elem( "httpd.thread.maxpoolsize" ) );
-      if ( i_max_pool_size != 0 && i_thrd_used > i_max_pool_size )
-      {
-        wrap::system_message(POOLER2+tool::int2string(i_thrd_used)+")");
-      }
-
-      else
-      {
-        int i_size = tpool->num_threads + 1;
-
-        wrap::system_message(POOLFLL+tool::int2string(i_size)+")");
-
-        tpool->threads = (pthread_t*)realloc((void*)tpool->threads, sizeof(pthread_t)*tpool->num_threads);
-
-        for ( int i = tpool->num_threads; i < i_size; ++i )
-          pthread_create( &(tpool->threads[i]) , 0, tpool_thread, (void*)tpool );
-
-        i_thrd_pool_size = tpool->num_threads = i_size;
-#ifdef NCURSES
-        print_pool_size();
-#endif
-      }
+        pthread_mutex_unlock( &(tpool->queue_lock) );
+        return -1;
     }
 
-#ifdef NCURSES
-    print_threads(i_thrd_used);
-#endif
-
-    while (tpool->cur_queue_size == tpool->max_queue_size) 
+    while( (     tpool->cur_queue_size == tpool->max_queue_size ) &&
+            ( ! ( tpool->shutdown       || tpool->queue_closed   ) ) )
         pthread_cond_wait( &(tpool->queue_not_full), &(tpool->queue_lock) );
 
+    if( tpool->shutdown || tpool->queue_closed )
+    {
+        pthread_mutex_unlock( &tpool->queue_lock );
+        return -1;
+    }
+
     // allocate work structure:
     workp = (tpool_work_t*) malloc( sizeof( tpool_work_t ) );
 
     workp->routine = routine;
-    workp->p_void  = p_void;
-    workp->next    = 0;
+    workp->arg     = arg;
+    workp->next    = NULL;
 
-    if (tpool->cur_queue_size == 0 )
+    if( tpool->cur_queue_size == 0 )
     {
         tpool->queue_tail = tpool->queue_head = workp;
     }
-
     else
     {
         (tpool->queue_tail)->next = workp;
         tpool->queue_tail         = workp;
     }
 
-    tpool->cur_queue_size++;
     pthread_cond_signal( &tpool->queue_not_empty );
+    tpool->cur_queue_size++;
     pthread_mutex_unlock( &(tpool->queue_lock) );
-
-    return 0;
+    return 1;
 }
 
 #ifdef NCURSES
 void
-pool::print_threads(int i_thrd_used)
-{
-    if ( wrap::NCUR->is_ready() )
-    {
-     mvprintw( NCUR_POOL_RUNNING_X,NCUR_POOL_RUNNING_Y, "In use: %d ", i_thrd_used);
-     refresh();
-   }
-}
-
-void
 pool::print_pool_size()
 {
     if ( wrap::NCUR->is_ready() )
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
 };
 
diff --git a/src/thrd/thro.cpp b/src/thrd/thro.cpp
index 739ba0e..f6acf53 100644
--- a/src/thrd/thro.cpp
+++ b/src/thrd/thro.cpp
@@ -16,7 +16,7 @@ thro::~thro()
 void
 thro::run()
 {
- void *p_void;
+ void* p_void;
  run( p_void );
 }
 
@@ -41,4 +41,5 @@ thro::start( void *p_void )
  wrap::system_message( THRDSTR );
 }
 
+
 #endif
diff --git a/src/thrd/thro.h b/src/thrd/thro.h
index 9ad1e3e..ef38793 100644
--- a/src/thrd/thro.h
+++ b/src/thrd/thro.h
@@ -1,3 +1,5 @@
+// Threaded Object (thro)
+
 #include "../incl.h"
 
 #ifndef THRO_H
@@ -11,18 +13,18 @@ private:
  pthread_t pthread;
 
  struct elements {
-  thro *p_thro;
-  void *p_void;
+  thro* p_thro;
+  void* p_void;
  } elem;  
 
- static void* start_( void *p_void );
+ static void* start_( void* p_void );
 
 public:
  thro( );
  ~thro( );
  void run();
- void run( void *p_void );
- virtual void start( void *p_void );
+ void run( void* p_void );
+ virtual void start( void* p_void );
 };
 
 #endif