summaryrefslogtreecommitdiff
path: root/src/thrd/pool.cpp
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2013-04-06 13:14:48 +0200
committerPaul Buetow <paul@buetow.org>2013-04-06 13:14:48 +0200
commit4ecbf33fae730bc79c4a47e6efda615b104754ad (patch)
treedd59412b6d8bea88995211f60b786728ac30acc4 /src/thrd/pool.cpp
parentbf5fc4cc4a15e8e57db58c2e065e0f5adbd8e800 (diff)
tagging ychat-0.7.8ychat-0.7.8
Diffstat (limited to 'src/thrd/pool.cpp')
-rwxr-xr-xsrc/thrd/pool.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/thrd/pool.cpp b/src/thrd/pool.cpp
index dd29d6a..1f4ace6 100755
--- a/src/thrd/pool.cpp
+++ b/src/thrd/pool.cpp
@@ -14,7 +14,7 @@ pool::pool()
i_num_total_threads = 0;
i_num_avail_threads = tool::string2int( wrap::CONF->get_elem( "httpd.thread.initpoolsize" ) );
- increase_pool(i_num_avail_threads);
+ increase_pool(i_num_avail_threads);
}
pool::~pool()
@@ -91,10 +91,10 @@ pool::wait_for_task( void* p_void )
}
pthread_mutex_unlock(&p_pool->mut_num_avail_threads);
- pthread_mutex_lock(&p_pool->mut_queue_tasks);
+ pthread_mutex_lock(&p_pool->mut_queue_tasks);
task* p_task = p_pool->queue_tasks.front();
p_pool->queue_tasks.pop();
- pthread_mutex_unlock(&p_pool->mut_queue_tasks);
+ pthread_mutex_unlock(&p_pool->mut_queue_tasks);
pthread_mutex_unlock(&p_pool->mut_threads);
@@ -118,8 +118,9 @@ pool::run(void* p_void)
void
pool::run_func(void *p_void)
{
- socketcontainer* p_sock = static_cast<socketcontainer*>(p_void);
+ int* p_sock = static_cast<int*>(p_void);
wrap::SOCK->read_write(p_sock);
+ delete p_sock;
}
bool