1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

IM mostly fixed according to Brian's directions. Will need to do some additional option handling and cleanups

server-tools/instance-manager/Makefile.am:
  New file added
server-tools/instance-manager/client_func.c:
  typo fixed
server-tools/instance-manager/commands.cc:
  there are no admin-user snd admin-password fields anymore, so no need to show their values
server-tools/instance-manager/guardian.cc:
  Syncronization added -- now guardian wakes up whenever SIGCLD has been catched
server-tools/instance-manager/guardian.h:
  Condition variable declared
server-tools/instance-manager/instance.cc:
  Persistent connection to the instance removed. Now we use SIGTERM instead of com_shutdown for STOP. We also
  manage SIGCHLD ourselves now (therefore no double fork).
server-tools/instance-manager/instance.h:
  Pointer to the instance_map added, MySQL connection structures removed
server-tools/instance-manager/instance_map.cc:
  More syncronization added (to make proper STOP)
server-tools/instance-manager/instance_map.h:
  added condition variable and mutex for connection threads to wait for SIGCHLD
server-tools/instance-manager/instance_options.cc:
  defaults-handling methods have been added.
server-tools/instance-manager/instance_options.h:
  New functions and constants declared
server-tools/instance-manager/listener.cc:
  No changes here (bk bug?)
server-tools/instance-manager/manager.cc:
  SIGCHLD handling added
This commit is contained in:
unknown
2005-01-25 13:54:56 +03:00
parent 28f86d8ff1
commit fb3d6c39a0
14 changed files with 380 additions and 107 deletions

View File

@ -0,0 +1,82 @@
/* Copyright (C) 2004 MySQL 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 */
#include <stdio.h>
#include <my_global.h>
#include <my_sys.h>
#include <string.h>
/* buf should be of appropriate size. Otherwise the word will be truncated */
static int get_word(FILE *file, char *buf, size_t size)
{
int currchar;
currchar= getc(file);
/* skip space */
while (my_isspace(default_charset_info, (char) currchar) &&
currchar != EOF && size > 1)
{
currchar= getc(file);
}
while (!my_isspace(default_charset_info, (char) currchar) &&
currchar != EOF && size > 1)
{
*buf++= (char) currchar;
currchar= getc(file);
size--;
}
*buf= '\0';
return 0;
}
int parse_output_and_get_value(const char *command, const char *word,
char *result, size_t result_len)
{
FILE *output;
int wordlen;
wordlen= strlen(word);
output= popen(command, "r");
/*
We want fully buffered stream. We also want system to
allocate appropriate buffer.
*/
setvbuf(output, NULL, _IOFBF, 0);
get_word(output, result, result_len);
while (strncmp(word, result, wordlen) && *result != '\0')
{
get_word(output, result, result_len);
}
/*
If we have found the word, return the next one. This is usually
an option value.
*/
if (*result != '\0')
get_word(output, result, result_len);
if (pclose(output))
return 1;
return 0;
}