mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
1370500c0d
- dynamic configuration support - safe process - cleanups - create new suite for fedarated BitKeeper/deleted/.del-basic.test: Rename: mysql-test/ndb/basic.test -> BitKeeper/deleted/.del-basic.test BitKeeper/deleted/.del-basic_log.result: Rename: mysql-test/ndb/basic_log.result -> BitKeeper/deleted/.del-basic_log.result mysql-test/suite/federated/federated_transactions.result: Rename: mysql-test/r/federated_transactions.result -> mysql-test/suite/federated/federated_transactions.result BitKeeper/deleted/.del-have_bug25714.require: Rename: mysql-test/r/have_bug25714.require -> BitKeeper/deleted/.del-have_bug25714.require BitKeeper/deleted/.del-kill_master.sh: Rename: mysql-test/misc/kill_master.sh -> BitKeeper/deleted/.del-kill_master.sh BitKeeper/deleted/.del-ndb_config_4_node.ini~d8e572e9b68f933a: Rename: mysql-test/ndb/ndb_config_4_node.ini -> BitKeeper/deleted/.del-ndb_config_4_node.ini~d8e572e9b68f933a BitKeeper/deleted/.del-restart.result: Rename: mysql-test/ndb/restart.result -> BitKeeper/deleted/.del-restart.result mysql-test/suite/federated/federated_cleanup.inc: Rename: mysql-test/include/federated_cleanup.inc -> mysql-test/suite/federated/federated_cleanup.inc mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt: Rename: mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi -> mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt BitKeeper/deleted/.del-install_test_db.sh: Rename: mysql-test/install_test_db.sh -> BitKeeper/deleted/.del-install_test_db.sh BitKeeper/deleted/.del-ndb_config_1_node.ini~7ec640ed25570e16: Rename: mysql-test/ndb/ndb_config_1_node.ini -> BitKeeper/deleted/.del-ndb_config_1_node.ini~7ec640ed25570e16 BitKeeper/deleted/.del-mtr_timer.pl: Rename: mysql-test/lib/mtr_timer.pl -> BitKeeper/deleted/.del-mtr_timer.pl BitKeeper/deleted/.del-create-test-result: Rename: mysql-test/create-test-result -> BitKeeper/deleted/.del-create-test-result BitKeeper/deleted/.del-fix-result: Rename: mysql-test/fix-result -> BitKeeper/deleted/.del-fix-result BitKeeper/deleted/.del-mysql-test-run-shell.sh: Rename: mysql-test/mysql-test-run-shell.sh -> BitKeeper/deleted/.del-mysql-test-run-shell.sh BitKeeper/deleted/.del-mysql-test_V1.9.pl: Rename: mysql-test/misc/mysql-test_V1.9.pl -> BitKeeper/deleted/.del-mysql-test_V1.9.pl BitKeeper/deleted/.del-resolve-stack: Rename: mysql-test/resolve-stack -> BitKeeper/deleted/.del-resolve-stack BitKeeper/deleted/.del-restart_log.result: Rename: mysql-test/ndb/restart_log.result -> BitKeeper/deleted/.del-restart_log.result mysql-test/suite/rpl/t/rpl_000015-slave.opt: Rename: mysql-test/suite/rpl/t/rpl_000015.slave-mi -> mysql-test/suite/rpl/t/rpl_000015-slave.opt BitKeeper/deleted/.del-ndb_config_2_node.ini: Rename: mysql-test/ndb/ndb_config_2_node.ini -> BitKeeper/deleted/.del-ndb_config_2_node.ini BitKeeper/deleted/.del-ndbcluster.sh: Rename: mysql-test/ndb/ndbcluster.sh -> BitKeeper/deleted/.del-ndbcluster.sh BitKeeper/deleted/.del-basic.result: Rename: mysql-test/ndb/basic.result -> BitKeeper/deleted/.del-basic.result BitKeeper/deleted/.del-restart.test: Rename: mysql-test/ndb/restart.test -> BitKeeper/deleted/.del-restart.test BitKeeper/deleted/.del-have_bug25714.inc: Rename: mysql-test/include/have_bug25714.inc -> BitKeeper/deleted/.del-have_bug25714.inc BitKeeper/deleted/.del-mtr_diff.pl: Rename: mysql-test/lib/mtr_diff.pl -> BitKeeper/deleted/.del-mtr_diff.pl mysql-test/suite/federated/federated_transactions-slave.opt: Rename: mysql-test/t/federated_transactions-slave.opt -> mysql-test/suite/federated/federated_transactions-slave.opt BitKeeper/deleted/.del-Makefile.am~343467da4d0f211b: Rename: mysql-test/ndb/Makefile.am -> BitKeeper/deleted/.del-Makefile.am~343467da4d0f211b BitKeeper/deleted/.del-mtr_im.pl~9762b0336c28949: Rename: mysql-test/lib/mtr_im.pl -> BitKeeper/deleted/.del-mtr_im.pl~9762b0336c28949 mysql-test/suite/federated/federated_innodb-slave.opt: Rename: mysql-test/t/federated_innodb-slave.opt -> mysql-test/suite/federated/federated_innodb-slave.opt client/mysqltest.c: Use current files path first when looking for include file configure.in: Remove mysql-test/nbd mysql-test/Makefile.am: Cleanup mysql-test/Makefile.am mysql-test/extra/binlog_tests/blackhole.test: Use new paths mysql-test/extra/binlog_tests/ctype_ucs_binlog.test: Use new paths mysql-test/mysql-test-run.pl: Dynamic configuration support Safe process mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test: Use new paths mysql-test/extra/rpl_tests/rpl_EE_err.test: Use new paths mysql-test/extra/rpl_tests/rpl_loaddata.test: Use new paths mysql-test/extra/rpl_tests/rpl_log.test: Use new paths mysql-test/extra/rpl_tests/rpl_row_001.test: Use new paths mysql-test/extra/rpl_tests/rpl_row_charset.test: Use new paths mysql-test/extra/rpl_tests/rpl_stm_000001.test: Use new paths mysql-test/extra/rpl_tests/rpl_stm_charset.test: Use new paths mysql-test/include/have_blackhole.inc: Use new paths mysql-test/include/have_ndbapi_examples.inc: Use new paths mysql-test/include/loaddata_autocom.inc: Use new paths mysql-test/include/mix1.inc: Use new paths mysql-test/include/ndb_backup.inc: Use new paths mysql-test/include/ndb_restore_master.inc: Use new paths mysql-test/include/ndb_restore_slave_eoption.inc: Use new paths mysql-test/include/testdb_only.inc: Use new paths mysql-test/lib/My/Config.pm: dynamic configuration safe process cleanups mysql-test/lib/mtr_cases.pm: dynamic configuration safe process cleanups mysql-test/lib/mtr_io.pl: dynamic configuration safe process cleanups mysql-test/lib/mtr_misc.pl: dynamic configuration safe process cleanups mysql-test/lib/mtr_process.pl: dynamic configuration safe process cleanups mysql-test/lib/mtr_report.pl: dynamic configuration safe process cleanups mysql-test/lib/mtr_stress.pl: dynamic configuration safe process cleanups mysql-test/r/backup.result: Use new paths mysql-test/r/ctype_big5.result: Use new paths mysql-test/r/gis.result: Use new paths mysql-test/r/loaddata.result: Use new paths mysql-test/r/loaddata_autocom_innodb.result: Use new paths mysql-test/r/mysqlbinlog.result: Use new paths mysql-test/r/mysqlbinlog_base64.result: Use new paths mysql-test/r/outfile.result: Use new paths mysql-test/r/partition_error.result: Use new paths mysql-test/r/partition_not_windows.result: Use new paths mysql-test/r/partition_symlink.result: Use new paths mysql-test/r/query_cache.result: Use new paths mysql-test/r/sp.result: Use new paths mysql-test/r/symlink.result: Use new paths mysql-test/r/system_mysql_db.result: Use new paths mysql-test/r/trigger.result: Use new paths mysql-test/r/type_blob.result: Use new paths mysql-test/r/view.result: Use new paths mysql-test/r/warnings.result: Use new paths mysql-test/suite/binlog/r/binlog_killed_simulate.result: Use new paths mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Use new paths mysql-test/suite/binlog/r/binlog_stm_blackhole.result: Use new paths mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Use new paths mysql-test/suite/binlog/t/binlog_killed.test: Use new paths mysql-test/suite/binlog/t/binlog_killed_simulate.test: Use new paths mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test: Use new paths mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test: Use new paths mysql-test/suite/federated/federated.inc: Use new paths mysql-test/suite/federated/federated.result: Use new paths mysql-test/suite/federated/federated.test: Use new paths mysql-test/suite/federated/federated_archive.result: Use new paths mysql-test/suite/federated/federated_archive.test: Use new paths mysql-test/suite/federated/federated_bug_13118.result: Use new paths mysql-test/suite/federated/federated_bug_13118.test: Use new paths mysql-test/suite/federated/federated_bug_25714.result: Use new paths mysql-test/suite/federated/federated_bug_25714.test: Use new paths mysql-test/suite/federated/federated_innodb.result: Use new paths mysql-test/suite/federated/federated_innodb.test: Use new paths mysql-test/suite/federated/federated_server.result: Use new paths mysql-test/suite/federated/federated_server.test: Use new paths mysql-test/suite/federated/federated_transactions.test: Use new paths mysql-test/suite/federated/have_federated_db.inc: Use new paths mysql-test/suite/ndb/r/loaddata_autocom_ndb.result: Use new paths mysql-test/suite/ndb/r/ndb_config.result: Use new paths mysql-test/suite/ndb/r/ndb_dd_backuprestore.result: Use new paths mysql-test/suite/ndb/r/ndb_load.result: Use new paths mysql-test/suite/ndb/r/ndb_loaddatalocal.result: Use new paths mysql-test/suite/ndb/r/ndb_replace.result: Use new paths mysql-test/suite/ndb/r/ndb_restore.result: Use new paths mysql-test/suite/ndb/r/ndb_restore_partition.result: Use new paths mysql-test/suite/ndb/r/ndb_restore_print.result: Use new paths mysql-test/suite/ndb/r/ndb_trigger.result: Use new paths mysql-test/suite/ndb/t/ndb_alter_table.test: Use new paths mysql-test/suite/ndb/t/ndb_config.test: Use new paths mysql-test/suite/ndb/t/ndb_load.test: Use new paths mysql-test/suite/ndb/t/ndb_loaddatalocal.test: Use new paths mysql-test/suite/ndb/t/ndb_replace.test: Use new paths mysql-test/suite/ndb/t/ndb_restore.test: Use new paths mysql-test/suite/ndb/t/ndb_single_user.test: Use new paths mysql-test/suite/ndb/t/ndb_trigger.test: Use new paths mysql-test/suite/ndb/t/ndbapi.test: Use new paths mysql-test/suite/rpl/include/rpl_mixed_dml.inc: Use new paths mysql-test/suite/rpl/r/rpl_LD_INFILE.result: Use new paths mysql-test/suite/rpl/r/rpl_flushlog_loop.result: Use new paths mysql-test/suite/rpl/r/rpl_innodb.result: Use new paths mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Use new paths mysql-test/suite/rpl/r/rpl_load_table_from_master.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_charset.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_fatal.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_m.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_s.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_simple.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddatalocal.result: Use new paths mysql-test/suite/rpl/r/rpl_loadfile.result: Use new paths mysql-test/suite/rpl/r/rpl_misc_functions.result: Use new paths mysql-test/suite/rpl/r/rpl_replicate_do.result: Use new paths mysql-test/suite/rpl/r/rpl_rewrt_db.result: Use new paths mysql-test/suite/rpl/r/rpl_row_001.result: Use new paths mysql-test/suite/rpl/r/rpl_row_loaddata_m.result: Use new paths mysql-test/suite/rpl/r/rpl_row_log.result: Use new paths mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Use new paths mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result: Use new paths mysql-test/suite/rpl/r/rpl_stm_000001.result: Use new paths mysql-test/suite/rpl/r/rpl_stm_log.result: Use new paths mysql-test/suite/rpl/r/rpl_timezone.result: Use new paths mysql-test/suite/rpl/t/disabled.def: Use new paths mysql-test/suite/rpl/t/rpl000017-slave.sh: Use new paths mysql-test/suite/rpl/t/rpl_LD_INFILE.test: Use new paths mysql-test/suite/rpl/t/rpl_drop_db.test: Use new paths mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt: Use new paths mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt: Use new paths mysql-test/suite/rpl/t/rpl_flushlog_loop.test: Use new paths mysql-test/suite/rpl/t/rpl_innodb.test: Use new paths mysql-test/suite/rpl/t/rpl_innodb_bug30919.test: Use new paths mysql-test/suite/rpl/t/rpl_load_from_master.test: Use new paths mysql-test/suite/rpl/t/rpl_load_table_from_master.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_charset.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_fatal.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_m.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_s.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_simple.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddatalocal.test: Use new paths mysql-test/suite/rpl/t/rpl_loadfile.test: Use new paths mysql-test/suite/rpl/t/rpl_misc_functions.test: Use new paths mysql-test/suite/rpl/t/rpl_replicate_do.test: Use new paths mysql-test/suite/rpl/t/rpl_rewrt_db.test: Use new paths mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt: Use new paths mysql-test/suite/rpl/t/rpl_rotate_logs.test: Use new paths mysql-test/suite/rpl/t/rpl_row_charset_innodb.test: Use new paths mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Use new paths mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test: Use new paths mysql-test/suite/rpl/t/rpl_timezone.test: Use new paths mysql-test/suite/rpl/t/rpl_trigger.test: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test: Use new paths mysql-test/t/backup.test: Use new paths mysql-test/t/bootstrap.test: Use new paths mysql-test/t/crash_commit_before.test: Use new paths mysql-test/t/create_not_windows.test: Use new paths mysql-test/t/csv.test: Use new paths mysql-test/t/ctype_big5.test: Use new paths mysql-test/t/disabled.def: Use new paths mysql-test/t/distinct.test: Use new paths mysql-test/t/gis.test: Use new paths mysql-test/t/grant_cache_no_prot.test: Use new paths mysql-test/t/grant_cache_ps_prot.test: Use new paths mysql-test/t/information_schema_chmod.test: Use new paths mysql-test/t/loaddata.test: Use new paths mysql-test/t/log_state.test: Use new paths mysql-test/t/myisam-system.test: Use new paths mysql-test/t/mysql_upgrade.test: Use new paths mysql-test/t/mysqlbinlog-cp932.test: Use new paths mysql-test/t/mysqlbinlog.test: Use new paths mysql-test/t/mysqlbinlog2.test: Use new paths mysql-test/t/mysqlbinlog_base64.test: Use new paths mysql-test/t/mysqldump.test: Use new paths mysql-test/t/outfile.test: Use new paths mysql-test/t/partition.test: Use new paths mysql-test/t/partition_error.test: Use new paths mysql-test/t/partition_federated.test: Use new paths mysql-test/t/partition_mgm.test: Use new paths mysql-test/t/partition_not_windows.test: Use new paths mysql-test/t/partition_symlink.test: Use new paths mysql-test/t/query_cache.test: Use new paths mysql-test/t/repair.test: Use new paths mysql-test/t/show_check.test: Use new paths mysql-test/t/sp-destruct.test: Use new paths mysql-test/t/sp.test: Use new paths mysql-test/t/symlink.test: Use new paths mysql-test/t/system_mysql_db.test: Use new paths mysql-test/t/system_mysql_db_fix30020.test: Use new paths mysql-test/t/system_mysql_db_fix40123.test: Use new paths mysql-test/t/system_mysql_db_fix50030.test: Use new paths mysql-test/t/system_mysql_db_fix50117.test: Use new paths mysql-test/t/trigger-compat.test: Use new paths mysql-test/t/trigger-grant.test: Use new paths mysql-test/t/trigger.test: Use new paths mysql-test/t/type_blob.test: Use new paths mysql-test/t/type_varchar.test: Use new paths mysql-test/t/upgrade.test: Use new paths mysql-test/t/user_var-binlog.test: Use new paths mysql-test/t/varbinary.test: Use new paths mysql-test/t/view.test: Use new paths mysql-test/t/warnings.test: Use new paths mysql-test/lib/My/ConfigFactory.pm: Initial version mysql-test/lib/My/Find.pm: Initial version mysql-test/lib/My/SafeProcess.pm: Initial version mysql-test/std_data/ndb_config_config.ini: Add "old" style config.ini for ndb mysql-test/suite/federated/disabled.def: Move disabled federated to it's new suite mysql-test/suite/federated/my.cnf: Add config for federated mysql-test/suite/ndb/my.cnf: Add config for ndb mysql-test/suite/rpl/my.cnf: Add config for rpl mysql-test/suite/rpl/rpl_1slave_base.cnf: Add base config for rpl mysql-test/suite/rpl/t/rpl_000015-master.opt: Use new paths mysql-test/suite/rpl_ndb/my.cnf: Add config for rpl_ndb mysql-test/lib/My/File/Path.pm: Initial version mysql-test/lib/My/SafeProcess/Base.pm: Initial version mysql-test/lib/My/SafeProcess/safe_kill_win.cc: Initial version mysql-test/lib/My/SafeProcess/safe_process.pl: Initial version mysql-test/lib/My/SafeProcess/safe_process_win.cc: Initial version mysql-test/lib/t/Base.t: Initial version mysql-test/lib/t/Find.t: Initial version mysql-test/lib/t/SafeProcess.t: Initial version mysql-test/lib/t/SafeProcessStress.pl: Initial version mysql-test/lib/t/copytree.t: Initial version mysql-test/lib/t/dummyd.pl: Initial version mysql-test/lib/t/rmtree.t: Initial version mysql-test/lib/t/testMyConfig.t: Initial version mysql-test/lib/t/testMyConfigFactory.t: Initial version mysql-test/lib/t/test_child.pl: Initial version mysql-test/include/default_my.cnf: Add default config file used when no suite specific file is found mysql-test/include/default_mysqld.cnf: New BitKeeper file ``mysql-test/include/default_mysqld.cnf'' mysql-test/include/default_ndbd.cnf: Add default settings for all ndbds mysql-test/lib/mtr_settings.pl: Initial version
502 lines
11 KiB
Perl
502 lines
11 KiB
Perl
# -*- cperl -*-
|
|
# Copyright (C) 2004-2006 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; version 2 of the License.
|
|
#
|
|
# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
package My::SafeProcess;
|
|
|
|
#
|
|
# Class that encapsulates process creation, monitoring and cleanup
|
|
#
|
|
# Spawns a monitor process which spawns a new process locally or
|
|
# remote using subclasses My::Process::Local or My::Process::Remote etc.
|
|
#
|
|
# The monitor process runs a simple event loop more or less just
|
|
# waiting for a reason to zap the process it monitors. Thus the user
|
|
# of this class does not need to care about process cleanup, it's
|
|
# handled automatically.
|
|
#
|
|
# The monitor process wait for:
|
|
# - the parent process to close the pipe, in that case it
|
|
# will zap the "monitored process" and exit
|
|
# - the "monitored process" to exit, in which case it will exit
|
|
# itself with same exit code as the "monitored process"
|
|
# - the parent process to send the "shutdown" signal in wich case
|
|
# monitor will kill the "monitored process" hard and exit
|
|
#
|
|
#
|
|
# When used it will look something like this:
|
|
# $> ps
|
|
# [script.pl]
|
|
# - [monitor for `mysqld`]
|
|
# - [mysqld]
|
|
# - [monitor for `mysqld`]
|
|
# - [mysqld]
|
|
# - [monitor for `mysqld`]
|
|
# - [mysqld]
|
|
#
|
|
#
|
|
|
|
use strict;
|
|
|
|
use POSIX qw(WNOHANG);
|
|
|
|
use My::SafeProcess::Base;
|
|
use base 'My::SafeProcess::Base';
|
|
|
|
use My::Find;
|
|
|
|
my %running;
|
|
|
|
BEGIN {
|
|
if ($^O eq "MSWin32") {
|
|
eval 'sub IS_WIN32PERL () { 1 }';
|
|
}
|
|
else {
|
|
eval 'sub IS_WIN32PERL () { 0 }';
|
|
}
|
|
if ($^O eq "cygwin") {
|
|
eval 'sub IS_CYGWIN () { 1 }';
|
|
# Make sure cygpath works
|
|
if ((system("cygpath > /dev/null 2>&1") >> 8) != 1){
|
|
die "Could not execute 'cygpath': $!";
|
|
}
|
|
eval 'sub fixpath {
|
|
my ($path)= @_;
|
|
return unless defined $path;
|
|
$path= `cygpath -w $path`;
|
|
chomp $path;
|
|
return $path;
|
|
}';
|
|
}
|
|
else {
|
|
eval 'sub IS_CYGWIN () { 0 }';
|
|
}
|
|
}
|
|
|
|
# Find the safe process binary or script
|
|
my $safe_path= $^X; # Path to perl binary
|
|
my $safe_script;
|
|
my $safe_kill;
|
|
if (IS_WIN32PERL or IS_CYGWIN){
|
|
# Use my_safe_process.exe
|
|
$safe_path= my_find_bin(("extra","bin"), "my_safe_process.exe");
|
|
die "Could not find my_safe_process.exe" unless $safe_path;
|
|
|
|
# Use my_safe_kill.exe
|
|
$safe_path= my_find_bin(("extra","bin"), "my_safe_kill");
|
|
die "Could not find my_safe_kill.exe" unless $safe_kill;
|
|
}
|
|
else {
|
|
# Use safe_process.pl
|
|
$safe_script= "lib/My/SafeProcess/safe_process.pl";
|
|
$safe_script= "../$safe_script" unless -f $safe_script;
|
|
die "Could not find safe_process.pl" unless -f $safe_script;
|
|
}
|
|
|
|
|
|
sub new {
|
|
my $class= shift;
|
|
|
|
my %opts=
|
|
(
|
|
verbose => 0,
|
|
@_
|
|
);
|
|
|
|
my $path = delete($opts{'path'}) or die "path required";
|
|
my $args = delete($opts{'args'}) or die "args required";
|
|
my $input = delete($opts{'input'});
|
|
my $output = delete($opts{'output'});
|
|
my $error = delete($opts{'error'});
|
|
my $verbose = delete($opts{'verbose'});
|
|
my $host = delete($opts{'host'});
|
|
my $shutdown = delete($opts{'shutdown'});
|
|
|
|
if (defined $host) {
|
|
$safe_script= "lib/My/SafeProcess/safe_process_cpcd.pl";
|
|
}
|
|
|
|
if (IS_CYGWIN){
|
|
# safe_procss is a windows program and need
|
|
# windows paths
|
|
$path= fixpath($path);
|
|
$input= fixpath($input);
|
|
$output= fixpath($output);
|
|
$error= fixpath($error);
|
|
}
|
|
|
|
my @safe_args;
|
|
push(@safe_args, $safe_script) if defined $safe_script;
|
|
|
|
push(@safe_args, "--verbose") if $verbose > 0;
|
|
|
|
# Point the safe_process at the right parent if running on cygwin
|
|
push(@safe_args, "--parent-pid=".Cygwin::pid_to_winpid($$)) if IS_CYGWIN;
|
|
|
|
push(@safe_args, "--");
|
|
push(@safe_args, $path); # The program safe_process should execute
|
|
push(@safe_args, @$$args);
|
|
|
|
print "### safe_path: ", $safe_path, " ", join(" ", @safe_args), "\n"
|
|
if $verbose > 1;
|
|
|
|
my ($pid, $winpid)= create_process(
|
|
path => $safe_path,
|
|
input => $input,
|
|
output => $output,
|
|
error => $error,
|
|
append => $opts{append},
|
|
args => \@safe_args,
|
|
);
|
|
|
|
my $name = delete($opts{'name'}) || "SafeProcess$pid";
|
|
my $proc= bless
|
|
({
|
|
SAFE_PID => $pid,
|
|
SAFE_WINPID => $winpid,
|
|
SAFE_NAME => $name,
|
|
SAFE_SHUTDOWN => $shutdown,
|
|
}, $class);
|
|
|
|
# Put the new process in list of running
|
|
$running{$pid}= $proc;
|
|
return $proc;
|
|
|
|
}
|
|
|
|
|
|
sub run {
|
|
my $proc= new(@_);
|
|
$proc->wait_one();
|
|
return $proc->exit_status();
|
|
}
|
|
|
|
#
|
|
# Start a process that returns after "duration" seconds
|
|
# or when it's parent process does not exist anymore
|
|
#
|
|
sub timer {
|
|
my $class= shift;
|
|
my $duration= shift or die "duration required";
|
|
my $parent_pid= $$;
|
|
|
|
my $pid= My::SafeProcess::Base::_safe_fork();
|
|
if ($pid){
|
|
# Parent
|
|
my $proc= bless
|
|
({
|
|
SAFE_PID => $pid,
|
|
SAFE_NAME => "timer",
|
|
}, $class);
|
|
|
|
# Put the new process in list of running
|
|
$running{$pid}= $proc;
|
|
return $proc;
|
|
}
|
|
|
|
# Child, install signal handlers and sleep for "duration"
|
|
$SIG{INT}= 'DEFAULT';
|
|
|
|
$SIG{TERM}= sub {
|
|
#print STDERR "timer $$: woken up, exiting!\n";
|
|
exit(0);
|
|
};
|
|
|
|
$0= "safe_timer($duration)";
|
|
my $count_down= $duration;
|
|
while($count_down--){
|
|
|
|
# Check that parent is still alive
|
|
if (kill(0, $parent_pid) == 0){
|
|
#print STDERR "timer $$: parent gone, exiting!\n";
|
|
exit(0);
|
|
}
|
|
|
|
sleep(1);
|
|
}
|
|
print STDERR "timer $$: expired after $duration seconds\n";
|
|
exit(0);
|
|
}
|
|
|
|
|
|
#
|
|
# Shutdown process nicely, and wait for shutdown_timeout seconds
|
|
# If processes hasn't shutdown, kill them hard and wait for return
|
|
#
|
|
sub shutdown {
|
|
my $shutdown_timeout= shift;
|
|
my @processes= @_;
|
|
|
|
return if (@processes == 0);
|
|
|
|
#print "shutdown: @processes\n";
|
|
|
|
# Call shutdown function if process has one, else
|
|
# use kill
|
|
foreach my $proc (@processes){
|
|
my $shutdown= $proc->{SAFE_SHUTDOWN};
|
|
if ($shutdown_timeout > 0 and defined $shutdown){
|
|
$shutdown->();
|
|
}
|
|
else {
|
|
$proc->start_kill();
|
|
}
|
|
}
|
|
|
|
my @kill_processes= ();
|
|
|
|
# Wait for shutdown_timeout for processes to exit
|
|
foreach my $proc (@processes){
|
|
my $ret= $proc->wait_one($shutdown_timeout);
|
|
if ($ret != 0) {
|
|
push(@kill_processes, $proc);
|
|
}
|
|
# Only wait for the first process with shutdown timeout
|
|
$shutdown_timeout= 0;
|
|
}
|
|
|
|
# Return if all servers has exited
|
|
return if (@kill_processes == 0);
|
|
|
|
foreach my $proc (@kill_processes){
|
|
$proc->start_kill();
|
|
}
|
|
|
|
foreach my $proc (@kill_processes){
|
|
$proc->wait_one();
|
|
}
|
|
return;
|
|
}
|
|
|
|
|
|
#
|
|
# Tell the process to die as fast as possible
|
|
#
|
|
sub start_kill {
|
|
my ($self)= @_;
|
|
die "usage: \$safe_proc->start_kill()" unless (@_ == 1 and ref $self);
|
|
#print "start_kill $self\n";
|
|
|
|
if (defined $safe_kill and $self->{SAFE_WINPID}){
|
|
# Use my_safe_kill to tell my_safe_process
|
|
# it's time to kill it's child and return
|
|
my $pid= $self->{SAFE_WINPID};
|
|
my $ret= system($safe_kill, $pid);
|
|
#print STDERR "start_kill, safe_killed $pid, ret: $ret\n";
|
|
} else {
|
|
my $pid= $self->{SAFE_PID};
|
|
die "Can't kill not started process" unless defined $pid;
|
|
my $ret= kill(15, $pid);
|
|
#print STDERR "start_kill, sent signal 15 to $pid, ret: $ret\n";
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
|
|
#
|
|
# Kill the process as fast as possible
|
|
# and wait for it to return
|
|
#
|
|
sub kill {
|
|
my ($self)= @_;
|
|
die "usage: \$safe_proc->kill()" unless (@_ == 1 and ref $self);
|
|
|
|
$self->start_kill();
|
|
$self->wait_one();
|
|
return 1;
|
|
}
|
|
|
|
|
|
sub _collect {
|
|
my ($self)= @_;
|
|
|
|
#print "_collect\n";
|
|
$self->{EXIT_STATUS}= $?;
|
|
|
|
# Take the process out of running list
|
|
my $pid= $self->{SAFE_PID};
|
|
die unless delete($running{$pid});
|
|
}
|
|
|
|
|
|
# Wait for process to exit
|
|
# optionally with a timeout
|
|
#
|
|
# timeout
|
|
# undef -> wait blocking infinitely
|
|
# 0 -> just poll with WNOHANG
|
|
# >0 -> wait blocking for max timeout seconds
|
|
#
|
|
# RETURN VALUES
|
|
# 0 Not running
|
|
# 1 Still running
|
|
#
|
|
sub wait_one {
|
|
my ($self, $timeout)= @_;
|
|
die "usage: \$safe_proc->wait_one([timeout])" unless ref $self;
|
|
|
|
#print "wait_one $self, $timeout\n";
|
|
|
|
if ( ! defined($self->{SAFE_PID}) ) {
|
|
# No pid => not running
|
|
return 0;
|
|
}
|
|
|
|
if ( defined $self->{EXIT_STATUS} ) {
|
|
# Exit status already set => not running
|
|
return 0;
|
|
}
|
|
|
|
my $pid= $self->{SAFE_PID};
|
|
|
|
my $use_alarm;
|
|
my $blocking;
|
|
if (defined $timeout)
|
|
{
|
|
if ($timeout == 0)
|
|
{
|
|
# 0 -> just poll with WNOHANG
|
|
$blocking= 0;
|
|
$use_alarm= 0;
|
|
}
|
|
else
|
|
{
|
|
# >0 -> wait blocking for max timeout seconds
|
|
$blocking= 1;
|
|
$use_alarm= 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
# undef -> wait blocking infinitely
|
|
$blocking= 1;
|
|
$use_alarm= 0;
|
|
}
|
|
|
|
my $retpid;
|
|
eval
|
|
{
|
|
# alarm should break the wait
|
|
local $SIG{ALRM}= sub { die "waitpid timeout"; };
|
|
|
|
alarm($timeout) if $use_alarm;
|
|
|
|
$retpid= waitpid($pid, $blocking ? 0 : &WNOHANG);
|
|
|
|
alarm(0) if $use_alarm;
|
|
};
|
|
|
|
if ($@)
|
|
{
|
|
die "Got unexpected: $@" if ($@ !~ /waitpid timeout/);
|
|
if (!defined $retpid) {
|
|
# Got timeout
|
|
return 1;
|
|
}
|
|
# Got pid _and_ alarm, continue
|
|
}
|
|
|
|
if ( $retpid == 0 ) {
|
|
# 0 => still running
|
|
return 1;
|
|
}
|
|
|
|
if ( not $blocking and $retpid == -1 ) {
|
|
# still running
|
|
return 1;
|
|
}
|
|
|
|
warn "wait_one: expected pid $pid but got $retpid"
|
|
unless( $retpid == $pid );
|
|
|
|
$self->_collect();
|
|
return 0;
|
|
}
|
|
|
|
|
|
#
|
|
# Wait for any process to exit
|
|
#
|
|
# Returns a reference to the SafeProcess that
|
|
# exited or undefined
|
|
#
|
|
sub wait_any {
|
|
my $ret_pid;
|
|
if (IS_WIN32PERL) {
|
|
# Can't wait for -1 => use a polling loop
|
|
do {
|
|
Win32::Sleep(10); # 10 milli seconds
|
|
foreach my $pid (keys %running){
|
|
$ret_pid= waitpid($pid, &WNOHANG);
|
|
last if $pid == $ret_pid;
|
|
}
|
|
} while ($ret_pid == 0);
|
|
|
|
# Special processig of return code
|
|
# since negative pids are valid
|
|
if ($ret_pid == 0 or $ret_pid == -1) {
|
|
print STDERR "wait_any, got invalid pid: $ret_pid\n";
|
|
return undef;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
$ret_pid= waitpid(-1, 0);
|
|
if ($ret_pid <= 0){
|
|
# No more processes to wait for
|
|
print STDERR "wait_any, got invalid pid: $ret_pid\n";
|
|
return undef;
|
|
}
|
|
}
|
|
|
|
# Look it up in "running" table
|
|
my $proc= $running{$ret_pid};
|
|
unless (defined $proc){
|
|
print STDERR "Could not find pid in running list\n";
|
|
print STDERR "running: ". join(", ", keys(%running)). "\n";
|
|
return undef;
|
|
}
|
|
$proc->_collect;
|
|
return $proc;
|
|
}
|
|
|
|
#
|
|
# Overload string operator
|
|
# and fallback to default functions if no
|
|
# overloaded function is found
|
|
#
|
|
use overload
|
|
'""' => \&self2str,
|
|
fallback => 1;
|
|
|
|
|
|
#
|
|
# Return the process as a nicely formatted string
|
|
#
|
|
sub self2str {
|
|
my ($self)= @_;
|
|
my $pid= $self->{SAFE_PID};
|
|
my $winpid= $self->{SAFE_WINPID};
|
|
my $name= $self->{SAFE_NAME};
|
|
my $exit_status= $self->{EXIT_STATUS};
|
|
|
|
my $str= "[$name - pid: $pid";
|
|
$str.= ", winpid: $winpid" if defined $winpid;
|
|
$str.= ", exit: $exit_status" if defined $exit_status;
|
|
$str.= "]";
|
|
}
|
|
|
|
|
|
1;
|