diff options
Diffstat (limited to 'src/thrd')
| -rw-r--r-- | src/thrd/CVS/Entries | 8 | ||||
| -rwxr-xr-x | src/thrd/pool.cpp | 293 | ||||
| -rwxr-xr-x | src/thrd/pool.h | 78 | ||||
| -rw-r--r-- | src/thrd/thro.cpp | 22 | ||||
| -rw-r--r-- | src/thrd/thro.h | 24 |
5 files changed, 213 insertions, 212 deletions
diff --git a/src/thrd/CVS/Entries b/src/thrd/CVS/Entries index cca2803..00f4a55 100644 --- a/src/thrd/CVS/Entries +++ b/src/thrd/CVS/Entries @@ -1,5 +1,5 @@ -/pool.cpp/1.13/Mon Feb 21 01:55:50 2005// -/pool.h/1.10/Mon Feb 21 01:55:50 2005// -/thro.cpp/1.6/Mon Feb 21 01:55:50 2005// -/thro.h/1.5/Mon Feb 21 01:55:50 2005// +/pool.cpp/1.12/Sun Feb 13 03:53:35 2005// +/pool.h/1.9/Sun Feb 13 00:49:29 2005// +/thro.cpp/1.5/Fri Jan 7 21:00:19 2005// +/thro.h/1.4/Fri Jan 7 21:00:19 2005// D diff --git a/src/thrd/pool.cpp b/src/thrd/pool.cpp index d25a873..ef7b0a3 100755 --- a/src/thrd/pool.cpp +++ b/src/thrd/pool.cpp @@ -9,212 +9,215 @@ int pool::i_thrd_used = 0; pool::pool() { - i_thrd_pool_size = tool::string2int( wrap::CONF->get_elem( "httpd.thread.initpoolsize" ) ); - 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); + i_thrd_pool_size = tool::string2int( wrap::CONF->get_elem( "httpd.thread.initpoolsize" ) ); + 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); } void pool::tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size) { - int i, rtn; - tpool_t tpool; - - // allocate a pool data structure - if (( tpool = (tpool_t) malloc( sizeof( struct tpool ) ) ) == 0 ) - { - wrap::system_message( POOLERR ); - exit(-1); - } - - // initialize th fields - tpool->num_threads = num_worker_threads; - tpool->max_queue_size = max_queue_size; - - if ( ( tpool->threads = (pthread_t*) malloc( sizeof(pthread_t)*num_worker_threads ) ) == 0 ) - { - wrap::system_message( POOLERR ); - exit(-1); - } - - tpool->cur_queue_size = 0; - tpool->queue_head = 0; - tpool->queue_tail = 0; - - if ( ( rtn = pthread_mutex_init( &(tpool->queue_lock), 0 ) ) != 0 ) - { - string s_err( "pthread_mutex_init " ); - s_err.append( strerror( rtn ) ); - - wrap::system_message( s_err ); - - exit(-1); - } - else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_empty), 0 ) ) != 0 ) - { - string s_err( "pthread_cond_init (1): " ); - s_err.append( strerror( rtn ) ); - - wrap::system_message( s_err ); - - exit(1); - } - else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_full), 0 ) ) != 0 ) - { - string s_err( "pthread_cond_init (2): " ); - s_err.append( strerror( rtn ) ); - - wrap::system_message( s_err ); - - exit(1); - } - else if ( ( rtn = pthread_cond_init( &(tpool->queue_empty), 0 ) ) != 0 ) - { - string s_err( "pthread_mutex_init " ); - s_err.append( strerror( rtn ) ); - - wrap::system_message( s_err ); - - exit(1); - } - - // create threads - for ( i = 0; i < num_worker_threads; ++i ) - pthread_create( &(tpool->threads[i]) , 0, tpool_thread, (void*)tpool ); - - *tpoolp = tpool; + int i, rtn; + tpool_t tpool; + + // allocate a pool data structure + if (( tpool = (tpool_t) malloc( sizeof( struct tpool ) ) ) == 0 ) + { + wrap::system_message( POOLERR ); + exit(-1); + } + + // initialize th fields + tpool->num_threads = num_worker_threads; + tpool->max_queue_size = max_queue_size; + + if ( ( tpool->threads = (pthread_t*) malloc( sizeof(pthread_t)*num_worker_threads ) ) == 0 ) + { + wrap::system_message( POOLERR ); + exit(-1); + } + + tpool->cur_queue_size = 0; + tpool->queue_head = 0; + tpool->queue_tail = 0; + + if ( ( rtn = pthread_mutex_init( &(tpool->queue_lock), 0 ) ) != 0 ) + { + string s_err( "pthread_mutex_init " ); + s_err.append( strerror( rtn ) ); + + wrap::system_message( s_err ); + + exit(-1); + } + + else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_empty), 0 ) ) != 0 ) + { + string s_err( "pthread_cond_init (1): " ); + s_err.append( strerror( rtn ) ); + + wrap::system_message( s_err ); + + exit(1); + } + + else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_full), 0 ) ) != 0 ) + { + string s_err( "pthread_cond_init (2): " ); + s_err.append( strerror( rtn ) ); + + wrap::system_message( s_err ); + + exit(1); + } + + else if ( ( rtn = pthread_cond_init( &(tpool->queue_empty), 0 ) ) != 0 ) + { + string s_err( "pthread_mutex_init " ); + s_err.append( strerror( rtn ) ); + + wrap::system_message( s_err ); + + exit(1); + } + + // create threads + for ( i = 0; i < num_worker_threads; ++i ) + pthread_create( &(tpool->threads[i]) , 0, tpool_thread, (void*)tpool ); + + *tpoolp = tpool; } void* pool::tpool_thread( void* p_void ) { - tpool_t tpool = (tpool_t) p_void; - tpool_work_t *my_workp; + tpool_t tpool = (tpool_t) p_void; + tpool_work_t *my_workp; - for( pthread_mutex_lock( &(tpool->queue_lock) );; - pthread_mutex_lock( &(tpool->queue_lock) ), --i_thrd_used ) - { + for( pthread_mutex_lock( &(tpool->queue_lock) );; + pthread_mutex_lock( &(tpool->queue_lock) ), --i_thrd_used ) + { #ifdef NCURSES - print_threads(i_thrd_used); + print_threads(i_thrd_used); #endif - while (tpool->cur_queue_size == 0) - 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) ); - my_workp = tpool->queue_head; - tpool->cur_queue_size--; + my_workp = tpool->queue_head; + tpool->cur_queue_size--; - if ( tpool->cur_queue_size == 0) - tpool->queue_head = tpool->queue_tail = 0; + if ( tpool->cur_queue_size == 0) + tpool->queue_head = tpool->queue_tail = 0; - else - tpool->queue_head = my_workp->next; + else + tpool->queue_head = my_workp->next; - if ( tpool->cur_queue_size == ( tpool->max_queue_size - 1 ) ) - pthread_cond_signal( &(tpool->queue_not_full) ); + if ( tpool->cur_queue_size == ( tpool->max_queue_size - 1 ) ) + pthread_cond_signal( &(tpool->queue_not_full) ); - if ( tpool->cur_queue_size == 0 ) - pthread_cond_signal( &(tpool->queue_empty) ); + if ( tpool->cur_queue_size == 0 ) + pthread_cond_signal( &(tpool->queue_empty) ); - pthread_mutex_unlock( &(tpool->queue_lock) ); + pthread_mutex_unlock( &(tpool->queue_lock) ); - (*(my_workp->routine))(my_workp->p_void); + (*(my_workp->routine))(my_workp->p_void); - free(my_workp); - } + free(my_workp); + } } void pool::run_func( void *p_void ) { - int* p_sock = (int*)p_void; - wrap::SOCK->read_write( p_sock ); - delete p_sock; + int* p_sock = (int*)p_void; + wrap::SOCK->read_write( p_sock ); + delete p_sock; } int pool::tpool_add_work( tpool_t tpool, void(*routine)(void*), void* p_void ) /// { - tpool_work_t *workp; - pthread_mutex_lock( &(tpool->queue_lock) ); + tpool_work_t *workp; + pthread_mutex_lock( &(tpool->queue_lock) ); - if ( ++i_thrd_used == tpool->num_threads ) - { - 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 + if ( ++i_thrd_used == tpool->num_threads ) { - int i_size = tpool->num_threads + 1; + 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)+")"); + } - wrap::system_message(POOLFLL+tool::int2string(i_size)+")"); + else + { + int i_size = tpool->num_threads + 1; - tpool->threads = (pthread_t*)realloc((void*)tpool->threads, sizeof(pthread_t)*tpool->num_threads); + wrap::system_message(POOLFLL+tool::int2string(i_size)+")"); - for ( int i = tpool->num_threads; i < i_size; ++i ) - pthread_create( &(tpool->threads[i]) , 0, tpool_thread, (void*)tpool ); + tpool->threads = (pthread_t*)realloc((void*)tpool->threads, sizeof(pthread_t)*tpool->num_threads); - i_thrd_pool_size = tpool->num_threads = i_size; -#ifdef NCURSES + for ( int i = tpool->num_threads; i < i_size; ++i ) + pthread_create( &(tpool->threads[i]) , 0, tpool_thread, (void*)tpool ); - print_pool_size(); + i_thrd_pool_size = tpool->num_threads = i_size; +#ifdef NCURSES + print_pool_size(); #endif - + } } - } #ifdef NCURSES - print_threads(i_thrd_used); + print_threads(i_thrd_used); #endif - while (tpool->cur_queue_size == tpool->max_queue_size) - pthread_cond_wait( &(tpool->queue_not_full), &(tpool->queue_lock) ); + while (tpool->cur_queue_size == tpool->max_queue_size) + pthread_cond_wait( &(tpool->queue_not_full), &(tpool->queue_lock) ); - // allocate work structure: - workp = (tpool_work_t*) malloc( sizeof( tpool_work_t ) ); + // allocate work structure: + workp = (tpool_work_t*) malloc( sizeof( tpool_work_t ) ); - workp->routine = routine; - workp->p_void = p_void; - workp->next = 0; + workp->routine = routine; + workp->p_void = p_void; + workp->next = 0; - if (tpool->cur_queue_size == 0 ) - { - tpool->queue_tail = tpool->queue_head = workp; - } - else - { - (tpool->queue_tail)->next = workp; - tpool->queue_tail = workp; - } + if (tpool->cur_queue_size == 0 ) + { + tpool->queue_tail = tpool->queue_head = workp; + } - tpool->cur_queue_size++; - pthread_cond_signal( &tpool->queue_not_empty ); - pthread_mutex_unlock( &(tpool->queue_lock) ); + else + { + (tpool->queue_tail)->next = workp; + tpool->queue_tail = workp; + } + + tpool->cur_queue_size++; + pthread_cond_signal( &tpool->queue_not_empty ); + pthread_mutex_unlock( &(tpool->queue_lock) ); - return 0; + return 0; } #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(); - } + 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() ) - { - mvprintw( NCUR_POOL_SIZE_X,NCUR_POOL_SIZE_Y, "Size: %d %d", i_thrd_pool_size, i_thrd_pool_queue ); - refresh(); - } + if ( wrap::NCUR->is_ready() ) + { + mvprintw( NCUR_POOL_SIZE_X,NCUR_POOL_SIZE_Y, "Size: %d %d", i_thrd_pool_size, i_thrd_pool_queue ); + refresh(); + } } #endif diff --git a/src/thrd/pool.h b/src/thrd/pool.h index 71ecaa9..cbd1e83 100755 --- a/src/thrd/pool.h +++ b/src/thrd/pool.h @@ -8,60 +8,58 @@ using namespace std; class pool { private: - static int i_thrd_used; + static int i_thrd_used; - typedef struct tpool_work - { - void (*routine)(void*); /// - void *p_void; - struct tpool_work *next; - } - tpool_work_t; + typedef struct tpool_work { + void (*routine)(void*); /// + void *p_void; + struct tpool_work *next; + } + tpool_work_t; - typedef struct tpool - { - // pool characteristics: - int num_threads; - int max_queue_size; + typedef struct tpool + { + // pool characteristics: + int num_threads; + int max_queue_size; - // pool state - pthread_t *threads; - int cur_queue_size; + // pool state + pthread_t *threads; + int cur_queue_size; - tpool_work_t *queue_head; - tpool_work_t *queue_tail; + 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; - } - *tpool_t; + pthread_mutex_t queue_lock; + pthread_cond_t queue_not_empty; + pthread_cond_t queue_not_full; + pthread_cond_t queue_empty; + } + *tpool_t; - int i_thrd_pool_size; - int i_thrd_pool_queue; + int i_thrd_pool_size; + int i_thrd_pool_queue; - tpool_t thread_pool; + 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 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 ); public: - pool(); + pool(); - // inline (speed)! - void run( void *p_void ) - { - tpool_add_work( thread_pool, run_func, p_void ); - } + // inline (speed)! + void run( void *p_void ) + { + tpool_add_work( thread_pool, run_func, p_void ); + } #ifdef NCURSES - void print_pool_size(); - static void print_threads(int i_thrd_used); + void print_pool_size(); + static void print_threads(int i_thrd_used); #endif - }; #endif diff --git a/src/thrd/thro.cpp b/src/thrd/thro.cpp index e35520c..739ba0e 100644 --- a/src/thrd/thro.cpp +++ b/src/thrd/thro.cpp @@ -6,37 +6,39 @@ using namespace std; thro::thro() -{} +{ +} thro::~thro() -{} +{ +} void thro::run() { - void *p_void; - run( p_void ); + void *p_void; + run( p_void ); } void thro::run( void *p_void ) { - elem.p_thro = this; - elem.p_void = p_void; - pthread_create( &pthread, NULL, start_, &elem ); + elem.p_thro = this; + elem.p_void = p_void; + pthread_create( &pthread, NULL, start_, &elem ); } void* thro::start_( void *p_void ) { - elements *e = (elements*) p_void; - e->p_thro->start( e->p_void ); + elements *e = (elements*) p_void; + e->p_thro->start( e->p_void ); } void thro::start( void *p_void ) { - wrap::system_message( THRDSTR ); + wrap::system_message( THRDSTR ); } #endif diff --git a/src/thrd/thro.h b/src/thrd/thro.h index 783cd0d..9ad1e3e 100644 --- a/src/thrd/thro.h +++ b/src/thrd/thro.h @@ -8,23 +8,21 @@ using namespace std; class thro { private: - pthread_t pthread; + pthread_t pthread; - struct elements - { - thro *p_thro; - void *p_void; - } - elem; + struct elements { + 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 ); + thro( ); + ~thro( ); + void run(); + void run( void *p_void ); + virtual void start( void *p_void ); }; #endif |