Cleanup: manually port the polishing parts from Alik's changeset for

BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned


mysql-test/t/im_options.imtest:
  Update test for new framework.
server-tools/instance-manager/IMService.cpp:
  Use Manager class instead of manager().
  Reformat comments.
server-tools/instance-manager/Makefile.am:
  Treat warnings as errors.
server-tools/instance-manager/command.cc:
  Store references to Guardian_thread and Instance_map in Command attributes.
server-tools/instance-manager/command.h:
  Store references to Guardian_thread and Instance_map in Command 
  attributes.
server-tools/instance-manager/commands.cc:
  Remove Instance_map argument from command constructors.
server-tools/instance-manager/commands.h:
  Remove Instance_map argument from command constructors.
server-tools/instance-manager/guardian.cc:
  Rename: Guardian_thread -> Guardian
server-tools/instance-manager/guardian.h:
  Rename: Guardian_thread -> Guardian
server-tools/instance-manager/instance_map.cc:
  Rename: Guardian_thread -> Guardian.
server-tools/instance-manager/instance_map.h:
  Rename: Guardian_thread -> Guardian.
server-tools/instance-manager/manager.cc:
  Use Manager class instead of manager() function.
server-tools/instance-manager/manager.h:
  Transfer manager() function into Manager class (singleton).
server-tools/instance-manager/mysql_connection.cc:
  Polishing.
server-tools/instance-manager/mysqlmanager.cc:
  Use Manager class instead of manager() function.
server-tools/instance-manager/parse.cc:
  Rename: Guardian_thread -> Guardian
server-tools/instance-manager/parse.h:
  Rename: Guardian_thread -> Guardian
server-tools/instance-manager/priv.cc:
  Move create_pid_file() out of manager.cc.
server-tools/instance-manager/priv.h:
  Move create_pid_file() out of manager.cc.
server-tools/instance-manager/thread_registry.h:
  Prevent copying.
server-tools/instance-manager/user_map.cc:
  Fix alignment.

1 files changed, 8 insertions, 8 deletions

diff --git a/server-tools/instance-manager/guardian.h b/server-tools/instance-manager/guardian.h
index 27ca155fd67..4c518dddf23 100644
--- a/server-tools/instance-manager/guardian.h
+++ b/server-tools/instance-manager/guardian.h
@@ -31,15 +31,15 @@ class Instance_map;
 class Thread_registry;
 struct GUARD_NODE;
 
-pthread_handler_t guardian(void *arg);
+pthread_handler_t guardian_thread_func(void *arg);
 
-struct Guardian_thread_args
+struct Guardian_args
 {
   Thread_registry &thread_registry;
   Instance_map *instance_map;
   int monitoring_interval;
 
-  Guardian_thread_args(Thread_registry &thread_registry_arg,
+  Guardian_args(Thread_registry &thread_registry_arg,
                        Instance_map *instance_map_arg,
                        uint monitoring_interval_arg) :
     thread_registry(thread_registry_arg),
@@ -54,7 +54,7 @@ struct Guardian_thread_args
   instances.
 */
 
-class Guardian_thread: public Guardian_thread_args
+class Guardian: public Guardian_args
 {
 public:
   /* states of an instance */
@@ -82,10 +82,10 @@ public:
   /* Return client state name. */
   static const char *get_instance_state_name(enum_instance_state state);
 
-  Guardian_thread(Thread_registry &thread_registry_arg,
+  Guardian(Thread_registry &thread_registry_arg,
                   Instance_map *instance_map_arg,
                   uint monitoring_interval_arg);
-  ~Guardian_thread();
+  ~Guardian();
   /* Main funtion of the thread */
   void run();
   /* Initialize or refresh the list of guarded instances */
@@ -140,8 +140,8 @@ private:
 };
 
 
-inline Guardian_thread::enum_instance_state
-Guardian_thread::get_instance_state(LIST *instance_node)
+inline Guardian::enum_instance_state
+Guardian::get_instance_state(LIST *instance_node)
 {
   return ((GUARD_NODE *) instance_node->data)->state;
 }