Cleanup the instance manager code.

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.

1 files changed, 29 insertions, 36 deletions

diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc
index ed3bfd6bba0..d83af2b9cf0 100644
--- a/server-tools/instance-manager/parse.cc
+++ b/server-tools/instance-manager/parse.cc
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "parse.h"
-#include "factory.h"
+#include "commands.h"
 
 #include <string.h>
 
@@ -114,7 +114,7 @@ int get_text_id(const char **text, uint *word_len, const char **id)
 }
 
 
-Command *parse_command(Command_factory *factory, const char *text)
+Command *parse_command(Instance_map *map, const char *text)
 {
   uint word_len;
   const char *instance_name;
@@ -147,10 +147,10 @@ Command *parse_command(Command_factory *factory, const char *text)
     if (word_len)
       goto syntax_error;
 
-    command= (tok1 == TOK_START) ? (Command *)
-              factory->new_Start_instance(instance_name, instance_name_len):
-              (Command *)
-              factory->new_Stop_instance(instance_name, instance_name_len);
+    if (tok1 == TOK_START)
+      command= new Start_instance(map, instance_name, instance_name_len);
+    else
+      command= new Stop_instance(map, instance_name, instance_name_len);
     break;
   case TOK_FLUSH:
     if (shift_token(&text, &word_len) != TOK_INSTANCES)
@@ -160,7 +160,7 @@ Command *parse_command(Command_factory *factory, const char *text)
     if (word_len)
       goto syntax_error;
 
-    command= factory->new_Flush_instances();
+    command= new Flush_instances(map);
     break;
   case TOK_UNSET:
     skip= true;
@@ -201,13 +201,13 @@ Command *parse_command(Command_factory *factory, const char *text)
       goto syntax_error;
 
     if (skip)
-      command= factory->new_Unset_option(instance_name, instance_name_len,
-                                         option, option_len, option_value,
-                                         option_value_len);
+      command= new  Unset_option(map, instance_name, instance_name_len,
+                                 option, option_len, option_value,
+                                 option_value_len);
     else
-      command= factory->new_Set_option(instance_name, instance_name_len,
-                                       option, option_len, option_value,
-                                       option_value_len);
+      command= new Set_option(map, instance_name, instance_name_len,
+                              option, option_len, option_value,
+                              option_value_len);
     break;
   case TOK_SHOW:
     switch (shift_token(&text, &word_len)) {
@@ -215,7 +215,7 @@ Command *parse_command(Command_factory *factory, const char *text)
       get_word(&text, &word_len);
       if (word_len)
         goto syntax_error;
-      command= factory->new_Show_instances();
+      command= new Show_instances(map);
       break;
     case TOK_INSTANCE:
       switch (Token tok2= shift_token(&text, &word_len)) {
@@ -227,12 +227,12 @@ Command *parse_command(Command_factory *factory, const char *text)
         get_word(&text, &word_len);
         if (word_len)
           goto syntax_error;
-        command= (tok2 == TOK_STATUS) ? (Command *)
-                  factory->new_Show_instance_status(instance_name,
-                                                    instance_name_len):
-                  (Command *)
-                  factory->new_Show_instance_options(instance_name,
-                                                     instance_name_len);
+        if (tok2 == TOK_STATUS)
+          command= new Show_instance_status(map, instance_name,
+                                            instance_name_len);
+        else
+          command= new Show_instance_options(map, instance_name,
+                                            instance_name_len);
         break;
       default:
         goto syntax_error;
@@ -252,9 +252,8 @@ Command *parse_command(Command_factory *factory, const char *text)
             /* check that this is the end of the command */
             if (word_len)
               goto syntax_error;
-            command=  (Command *)
-                      factory->new_Show_instance_log_files(instance_name,
-                                                           instance_name_len);
+            command= new Show_instance_log_files(map, instance_name,
+                                                 instance_name_len);
             break;
           case TOK_ERROR:
           case TOK_GENERAL:
@@ -288,22 +287,16 @@ Command *parse_command(Command_factory *factory, const char *text)
                 get_word(&text, &word_len);
                 if (!word_len)
                   goto syntax_error;
-                command= (Command *)
-                      factory->new_Show_instance_log(instance_name,
-                                                     instance_name_len,
-                                                     log_type,
-                                                     log_size,
-                                                     text);
+                command= new Show_instance_log(map, instance_name,
+                                               instance_name_len, log_type,
+                                               log_size, text);
 
                 //get_text_id(&text, &log_size_len, &log_size);
                 break;
               case '\0':
-                command= (Command *)
-                      factory->new_Show_instance_log(instance_name,
-                                                     instance_name_len,
-                                                     log_type,
-                                                     log_size,
-                                                     NULL);
+                command= new Show_instance_log(map, instance_name,
+                                               instance_name_len, log_type,
+                                               log_size, NULL);
                 break; /* this is ok */
               default:
               goto syntax_error;
@@ -324,7 +317,7 @@ Command *parse_command(Command_factory *factory, const char *text)
     break;
   default:
 syntax_error:
-    command= factory->new_Syntax_error();
+    command= new Syntax_error();
   }
   return command;
 }