mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
26b6b1b2a2
BitKeeper/deleted/.del-factory.h~c1679505d3a6dd53: Delete: server-tools/instance-manager/factory.h BitKeeper/deleted/.del-factory.cc~6836cccd4cd35b4d: Delete: server-tools/instance-manager/factory.cc server-tools/instance-manager/Makefile.am: - remove Commands_factory: it'll be needed when we add support for NNTP/HTTP connections, currently it only adds unnecessary complexity. server-tools/instance-manager/commands.cc: - fix coding style: no else after return; fix comments, make one place a bit faster. server-tools/instance-manager/guardian.cc: - fix coding style and comments. - we must register the current thread in the thread registry before entering pthread_cond_timedwait, because at shutdown the thread registry will try to kick out of wait all blocked threads. Unregistered threads are not awakened by the registry. This fixes the failinig assert in Thread_registry::~Thread_registry at shutdown, when shutdown is requested and there is an instance monitored by Guardian. server-tools/instance-manager/guardian.h: - fix coding style: enums must start with enum_ server-tools/instance-manager/instance.h: - move comment to the variable it comments server-tools/instance-manager/instance_map.cc: - cleanup server-tools/instance-manager/instance_options.cc: - cleanup; no else after return (fix coding style). server-tools/instance-manager/manager.cc: - fix alignment; make some code easier to read. server-tools/instance-manager/mysql_connection.cc: - remove Commands_factory server-tools/instance-manager/options.cc: - fix a possible crash when the instance manager is started with --no-defaults --defaults-file=~/.my.cnf: if we return without cloning saved_argv by calling load_defaults, Options::cleanup will crash on attempt to free_defaults(saved_argv); server-tools/instance-manager/parse.cc: - get rid of Commands_factory server-tools/instance-manager/parse.h: - get rid of Commands_factory server-tools/instance-manager/parse_output.cc: - in parse_output_and_get_value return error also if the specified pattern was not found, or the command failed to execute. server-tools/instance-manager/portability.h: - fix coding style (// comments are allowed only at ends of lines) server-tools/instance-manager/thread_registry.cc: - implement Thread_registry::cond_timedwait server-tools/instance-manager/thread_registry.h: - implement Thread_registry::cond_timedwait; remove unused out parameter from Thread_registry::cond_wait. server-tools/instance-manager/user_map.cc: - safety: newline can take 2 bytes.
233 lines
6.7 KiB
C++
233 lines
6.7 KiB
C++
/* cOPYRIght (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifdef __GNUC__
|
|
#pragma implementation
|
|
#endif
|
|
|
|
#include "thread_registry.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include <assert.h>
|
|
#include <signal.h>
|
|
#include <thr_alarm.h>
|
|
|
|
|
|
#ifndef __WIN__
|
|
/* Kick-off signal handler */
|
|
|
|
enum { THREAD_KICK_OFF_SIGNAL= SIGUSR2 };
|
|
|
|
static void handle_signal(int __attribute__((unused)) sig_no)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
TODO: think about moving signal information (now it's shutdown_in_progress)
|
|
to Thread_info. It will reduce contention and allow signal deliverence to
|
|
a particular thread, not to the whole worker crew
|
|
*/
|
|
|
|
Thread_registry::Thread_registry() :
|
|
shutdown_in_progress(false)
|
|
,sigwait_thread_pid(pthread_self())
|
|
{
|
|
pthread_mutex_init(&LOCK_thread_registry, 0);
|
|
pthread_cond_init(&COND_thread_registry_is_empty, 0);
|
|
|
|
/* head is used by-value to simplify nodes inserting */
|
|
head.next= head.prev= &head;
|
|
}
|
|
|
|
|
|
Thread_registry::~Thread_registry()
|
|
{
|
|
/* Check that no one uses the repository. */
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
|
|
/* All threads must unregister */
|
|
DBUG_ASSERT(head.next == &head);
|
|
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
pthread_cond_destroy(&COND_thread_registry_is_empty);
|
|
pthread_mutex_destroy(&LOCK_thread_registry);
|
|
}
|
|
|
|
|
|
/*
|
|
Set signal handler for kick-off thread, and insert a thread info to the
|
|
repository. New node is appended to the end of the list; head.prev always
|
|
points to the last node.
|
|
*/
|
|
|
|
void Thread_registry::register_thread(Thread_info *info)
|
|
{
|
|
#ifndef __WIN__
|
|
struct sigaction sa;
|
|
sa.sa_handler= handle_signal;
|
|
sa.sa_flags= 0;
|
|
sigemptyset(&sa.sa_mask);
|
|
sigaction(THREAD_KICK_OFF_SIGNAL, &sa, 0);
|
|
#endif
|
|
info->current_cond= 0;
|
|
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
info->next= &head;
|
|
info->prev= head.prev;
|
|
head.prev->next= info;
|
|
head.prev= info;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
}
|
|
|
|
|
|
/*
|
|
Unregister a thread from the repository and free Thread_info structure.
|
|
Every registered thread must unregister. Unregistering should be the last
|
|
thing a thread is doing, otherwise it could have no time to finalize.
|
|
*/
|
|
|
|
void Thread_registry::unregister_thread(Thread_info *info)
|
|
{
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
info->prev->next= info->next;
|
|
info->next->prev= info->prev;
|
|
if (head.next == &head)
|
|
pthread_cond_signal(&COND_thread_registry_is_empty);
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
}
|
|
|
|
|
|
/*
|
|
Check whether shutdown is in progress, and if yes, return immediately.
|
|
Else set info->current_cond and call pthread_cond_wait. When
|
|
pthread_cond_wait returns, unregister current cond and check the shutdown
|
|
status again.
|
|
RETURN VALUE
|
|
return value from pthread_cond_wait
|
|
*/
|
|
|
|
int Thread_registry::cond_wait(Thread_info *info, pthread_cond_t *cond,
|
|
pthread_mutex_t *mutex)
|
|
{
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
if (shutdown_in_progress)
|
|
{
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
return 0;
|
|
}
|
|
info->current_cond= cond;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
/* sic: race condition here, cond can be signaled in deliver_shutdown */
|
|
int rc= pthread_cond_wait(cond, mutex);
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
info->current_cond= 0;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
return rc;
|
|
}
|
|
|
|
|
|
int Thread_registry::cond_timedwait(Thread_info *info, pthread_cond_t *cond,
|
|
pthread_mutex_t *mutex,
|
|
struct timespec *wait_time)
|
|
{
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
if (shutdown_in_progress)
|
|
{
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
return 0;
|
|
}
|
|
info->current_cond= cond;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
/* sic: race condition here, cond can be signaled in deliver_shutdown */
|
|
int rc= pthread_cond_timedwait(cond, mutex, wait_time);
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
info->current_cond= 0;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
return rc;
|
|
}
|
|
|
|
|
|
/*
|
|
Deliver shutdown message to the workers crew.
|
|
As it's impossible to avoid all race conditions, signal latecomers
|
|
again.
|
|
*/
|
|
|
|
void Thread_registry::deliver_shutdown()
|
|
{
|
|
Thread_info *info;
|
|
struct timespec shutdown_time;
|
|
set_timespec(shutdown_time, 1);
|
|
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
shutdown_in_progress= true;
|
|
|
|
#ifndef __WIN__
|
|
/* to stop reading from the network we need to flush alarm queue */
|
|
end_thr_alarm(0);
|
|
/*
|
|
We have to deliver final alarms this way, as the main thread has already
|
|
stopped alarm processing.
|
|
*/
|
|
process_alarm(THR_SERVER_ALARM);
|
|
#endif
|
|
|
|
for (info= head.next; info != &head; info= info->next)
|
|
{
|
|
pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL);
|
|
/*
|
|
sic: race condition here, the thread may not yet fall into
|
|
pthread_cond_wait.
|
|
*/
|
|
if (info->current_cond)
|
|
pthread_cond_signal(info->current_cond);
|
|
}
|
|
/*
|
|
The common practice is to test predicate before pthread_cond_wait.
|
|
I don't do that here because the predicate is practically always false
|
|
before wait - is_shutdown's been just set, and the lock's still not
|
|
released - the only case when the predicate is false is when no other
|
|
threads exist.
|
|
*/
|
|
while (pthread_cond_timedwait(&COND_thread_registry_is_empty,
|
|
&LOCK_thread_registry,
|
|
&shutdown_time) != ETIMEDOUT &&
|
|
head.next != &head)
|
|
;
|
|
/*
|
|
If previous signals did not reach some threads, they must be sleeping
|
|
in pthread_cond_wait or in a blocking syscall. Wake them up:
|
|
every thread shall check signal variables after each syscall/cond_wait,
|
|
so this time everybody should be informed (presumably each worker can
|
|
get CPU during shutdown_time.)
|
|
*/
|
|
for (info= head.next; info != &head; info= info->next)
|
|
{
|
|
pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL);
|
|
if (info->current_cond)
|
|
pthread_cond_signal(info->current_cond);
|
|
}
|
|
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
}
|
|
|
|
|
|
void Thread_registry::request_shutdown()
|
|
{
|
|
pthread_kill(sigwait_thread_pid, SIGTERM);
|
|
}
|