2003-01-09 10:11:06 +01:00
|
|
|
/* Copyright (C) 2003 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 */
|
|
|
|
|
|
|
|
/* Wait until a program dies */
|
|
|
|
|
2003-02-17 01:14:37 +01:00
|
|
|
#ifndef __NETWARE__
|
|
|
|
|
2003-01-07 18:04:41 +01:00
|
|
|
#include <my_global.h>
|
2003-01-09 10:11:06 +01:00
|
|
|
#include <m_string.h>
|
2003-01-07 18:04:41 +01:00
|
|
|
#include <my_getopt.h>
|
2003-01-09 10:11:06 +01:00
|
|
|
#include <signal.h>
|
|
|
|
#include <errno.h>
|
2003-01-07 18:04:41 +01:00
|
|
|
|
2003-01-08 14:43:56 +01:00
|
|
|
static const char *VER= "1.1";
|
2003-01-07 18:04:41 +01:00
|
|
|
static char *progname;
|
2003-01-08 14:43:56 +01:00
|
|
|
static my_bool verbose;
|
2003-01-07 18:04:41 +01:00
|
|
|
|
|
|
|
void usage(void);
|
|
|
|
|
|
|
|
static struct my_option my_long_options[] =
|
|
|
|
{
|
|
|
|
{"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
|
|
|
|
0, 0, 0, 0, 0},
|
|
|
|
{"help", 'I', "Synonym for -?.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
|
|
|
|
0, 0, 0, 0, 0},
|
|
|
|
{"verbose", 'v',
|
2003-01-08 14:43:56 +01:00
|
|
|
"Be more verbose. Give a warning, if kill can't handle signal 0.",
|
|
|
|
(gptr*) &verbose, (gptr*) &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
2003-01-07 18:04:41 +01:00
|
|
|
{"version", 'V', "Print version information and exit.", 0, 0, 0,
|
|
|
|
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
|
|
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
|
|
|
|
};
|
|
|
|
|
|
|
|
static my_bool
|
|
|
|
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|
|
|
char *argument __attribute__((unused)))
|
|
|
|
{
|
|
|
|
switch(optid) {
|
|
|
|
case 'V':
|
|
|
|
printf("%s version %s by Jani Tolonen\n", progname, VER);
|
|
|
|
exit(-1);
|
|
|
|
case 'I':
|
|
|
|
case '?':
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int pid= 0, t= 0, sig= 0;
|
|
|
|
|
|
|
|
progname= argv[0];
|
|
|
|
|
mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
Added NULL error reporting parameter to handle_options
log.cc:
Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did.
mysqld.cc:
Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
Added NULL as error reporter arg to the end of handle_options
Many files:
Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback
mysqld.dsp:
Added custom build step for compiling message file and added message resource file (output of mc)
VC++Files/sql/mysqld.dsp:
Added custom build step for compiling message file and added message resource file (output of mc)
client/mysqladmin.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlcheck.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqldump.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlimport.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanager-pwgen.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanagerc.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlbinlog.cc:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlshow.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqltest.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/my_print_defaults.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_install.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_waitpid.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/perror.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/resolve_stack_dump.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/resolveip.c:
Added NULL error reporter parameter as the last paramter to handle_options
isam/isamchk.c:
Added NULL error reporter parameter as the last paramter to handle_options
isam/pack_isam.c:
Added NULL error reporter parameter as the last paramter to handle_options
myisam/mi_test1.c:
Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisam_ftdump.c:
Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisamchk.c:
Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisampack.c:
Added NULL error reporter parameter as the last paramter to handle_options
include/my_getopt.h:
Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback
mysys/my_getopt.c:
Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
tools/mysqlmanager.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysql.cc:
Added NULL as error reporter arg to the end of handle_options
sql/mysqld.cc:
Added option_error_reporter callback function and pass that into handle_options
sql/log.cc:
Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did.
sql/gen_lex_hash.cc:
Added NULL error reporting parameter to handle_options
sql/mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2004-08-14 03:38:37 +02:00
|
|
|
if (handle_options(&argc, &argv, my_long_options, get_one_option, NULL))
|
2003-01-07 18:04:41 +01:00
|
|
|
exit(-1);
|
|
|
|
if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 ||
|
|
|
|
(t= atoi(argv[1])) <= 0)
|
|
|
|
usage();
|
2003-01-08 14:43:56 +01:00
|
|
|
for (; t > 0; t--)
|
2003-01-07 18:04:41 +01:00
|
|
|
{
|
|
|
|
if (kill((pid_t) pid, sig))
|
|
|
|
{
|
|
|
|
if (errno == EINVAL)
|
|
|
|
{
|
|
|
|
if (verbose)
|
|
|
|
printf("WARNING: kill couldn't handle signal 0, using signal 1.\n");
|
|
|
|
sig= 1;
|
|
|
|
t++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
sleep(1);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void usage(void)
|
|
|
|
{
|
|
|
|
printf("%s version %s by Jani Tolonen\n\n", progname, VER);
|
|
|
|
printf("usage: %s [options] #pid #time\n\n", progname);
|
|
|
|
printf("Description: Waits for a program, which program id is #pid, to\n");
|
|
|
|
printf("terminate within #time seconds. If the program terminates within\n");
|
|
|
|
printf("this time, or if the #pid no longer exists, value 0 is returned.\n");
|
|
|
|
printf("Otherwise 1 is returned. Both #pid and #time must be positive\n");
|
|
|
|
printf("integer arguments.\n\n");
|
|
|
|
printf("Options:\n");
|
|
|
|
my_print_help(my_long_options);
|
|
|
|
exit(-1);
|
|
|
|
}
|
2003-02-17 01:14:37 +01:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
main()
|
|
|
|
{
|
|
|
|
fprintf(stderr,"This tool has not been ported to NetWare\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* __NETWARE__ */
|