signal slave thread to stop during shutdown
This commit is contained in:
parent
02285d80de
commit
f024c2e9d3
@ -191,8 +191,16 @@ static void free_string_array(DYNAMIC_ARRAY *a)
|
|||||||
void end_slave()
|
void end_slave()
|
||||||
{
|
{
|
||||||
pthread_mutex_lock(&LOCK_slave);
|
pthread_mutex_lock(&LOCK_slave);
|
||||||
|
if (slave_running)
|
||||||
|
{
|
||||||
|
abort_slave = 1;
|
||||||
|
thr_alarm_kill(slave_real_id);
|
||||||
|
#ifdef SIGNAL_WITH_VIO_CLOSE
|
||||||
|
slave_thd->close_active_vio();
|
||||||
|
#endif
|
||||||
while (slave_running)
|
while (slave_running)
|
||||||
pthread_cond_wait(&COND_slave_stopped, &LOCK_slave);
|
pthread_cond_wait(&COND_slave_stopped, &LOCK_slave);
|
||||||
|
}
|
||||||
pthread_mutex_unlock(&LOCK_slave);
|
pthread_mutex_unlock(&LOCK_slave);
|
||||||
|
|
||||||
end_master_info(&glob_mi);
|
end_master_info(&glob_mi);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user