database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity

ensure that lock is held, whenever active thread counter changes.

Browse Source 
It was not the case inside listener routine.
This commit is contained in:
Vladislav Vaintroub
2012-01-18 21:12:04 +01:00
parent 6909311028
commit c492296127
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/threadpool_unix.cc
View File

@@ -591,9 +591,7 @@ static connection_t * listener(worker_thread_t *current_thread,
if (thread_group->shutdown) if (thread_group->shutdown)
break; break;
thread_group->active_thread_count--;
cnt = io_poll_wait(thread_group->pollfd, ev, MAX_EVENTS, -1); cnt = io_poll_wait(thread_group->pollfd, ev, MAX_EVENTS, -1);
thread_group->active_thread_count++;
if (cnt <=0) if (cnt <=0)
{ {
@@ -1015,11 +1013,13 @@ connection_t *get_event(worker_thread_t *current_thread,
if(!thread_group->listener) if(!thread_group->listener)
{ {
thread_group->listener= current_thread; thread_group->listener= current_thread;
thread_group->active_thread_count--;
mysql_mutex_unlock(&thread_group->mutex); mysql_mutex_unlock(&thread_group->mutex);
connection = listener(current_thread, thread_group); connection = listener(current_thread, thread_group);
mysql_mutex_lock(&thread_group->mutex); mysql_mutex_lock(&thread_group->mutex);
thread_group->active_thread_count++;
/* There is no listener anymore, it just returned. */ /* There is no listener anymore, it just returned. */
thread_group->listener= NULL; thread_group->listener= NULL;
break; break;