mirror of
https://github.com/MariaDB/server.git
synced 2025-11-24 06:01:25 +03:00
Consequently, rename HAVE_purify to HAVE_valgrind, and related changes.
Leave some comments about purify when not clear that they apply also to Valgrind.
Fix redundant IF_VALGRIND declaration.
Misc. small fixes:
- Fixes for pool-of-threads patch.
- Fixes for push of PBXT storage engine.
- mysql-test-run.pl fix.
- Fix build problem in compile-pentium64-max.
BUILD/SETUP.sh:
Rename purify -> valgrind.
BUILD/build_mccge.sh:
Rename purify -> valgrind.
BUILD/compile-dist:
Fix that PBXT was missing in source tarball after `BUILD/compile-dist && make dist`
BUILD/compile-pentium64-max:
Fix a build problem with BUILD/compile-pentium64-max on CentOS/Fedora Core 10 amd64.
On these systems, there is libz.so but no libz.a. Finding libz.so, ./configure decides
to use system zlib. But since BUILD/compile-pentium64-max builds a fully static binary
with -all-static, the link of mysqld fails due to missing libz.a.
Fix by using bundled zlib in the build script.
BUILD/compile-solaris-sparc-purify:
Rename purify -> valgrind.
include/m_string.h:
Rename purify -> valgrind.
include/my_global.h:
Rename purify -> valgrind.
mysql-test/Makefile.am:
Fix that PBXT test suite was missing from `make dist` source tarball.
mysql-test/lib/mtr_unique.pm:
Better fix to avoid races when chmod'ing the semaphore file.
(Though using chmod 666 shared files in /tmp/ is still not a very good solution).
mysql-test/t/pool_of_threads.cnf:
Fix that test case pool_of_threads fails if run on mysqld with no --with-libevent support.
mysys/mf_qsort.c:
Rename purify -> valgrind.
mysys/my_alloc.c:
Rename purify -> valgrind.
mysys/my_init.c:
Rename purify -> valgrind.
mysys/my_rnd.c:
Rename purify -> valgrind.
mysys/safemalloc.c:
Rename purify -> valgrind.
scripts/mysql_config.pl.in:
Rename purify -> valgrind.
scripts/mysql_config.sh:
Rename purify -> valgrind.
sql/field_conv.cc:
Rename purify -> valgrind.
sql/filesort.cc:
Rename purify -> valgrind.
sql/ha_partition.cc:
Rename purify -> valgrind.
sql/hostname.cc:
Rename purify -> valgrind.
sql/item_timefunc.cc:
Rename purify -> valgrind.
sql/log_event.cc:
Rename purify -> valgrind.
sql/log_event_old.cc:
Rename purify -> valgrind.
sql/my_decimal.h:
Rename purify -> valgrind.
sql/mysqld.cc:
Rename purify -> valgrind.
Fix redundant IF_VALGRIND declaration.
sql/opt_range.cc:
Rename purify -> valgrind.
sql/opt_range.h:
Rename purify -> valgrind.
sql/records.cc:
Rename purify -> valgrind.
sql/rpl_rli.cc:
Rename purify -> valgrind.
sql/rpl_rli.h:
Rename purify -> valgrind.
sql/set_var.cc:
Fix missing static declaration on pool_of_threads.
sql/slave.cc:
Rename purify -> valgrind.
sql/sql_base.cc:
Rename purify -> valgrind.
sql/sql_binlog.cc:
Rename purify -> valgrind.
sql/sql_class.cc:
Rename purify -> valgrind.
sql/sql_list.h:
Rename purify -> valgrind.
sql/sql_load.cc:
Rename purify -> valgrind.
sql/sql_select.cc:
Rename purify -> valgrind.
sql/table.cc:
Rename purify -> valgrind.
storage/archive/azio.c:
Rename purify -> valgrind.
storage/innobase/buf/buf0buf.c:
Rename purify -> valgrind.
storage/innobase/include/univ.i:
Rename purify -> valgrind.
storage/innobase/srv/srv0start.c:
Rename purify -> valgrind.
storage/maria/ha_maria.cc:
Rename purify -> valgrind.
storage/maria/ma_blockrec.c:
Rename purify -> valgrind.
storage/maria/ma_check.c:
Rename purify -> valgrind.
storage/maria/ma_loghandler.c:
Rename purify -> valgrind.
storage/maria/ma_packrec.c:
Rename purify -> valgrind.
storage/maria/ma_page.c:
Rename purify -> valgrind.
storage/maria/ma_pagecrc.c:
Rename purify -> valgrind.
storage/maria/ma_search.c:
Rename purify -> valgrind.
storage/myisam/mi_check.c:
Rename purify -> valgrind.
storage/myisam/mi_page.c:
Rename purify -> valgrind.
storage/myisam/mi_search.c:
Rename purify -> valgrind.
storage/myisammrg/ha_myisammrg.cc:
Rename purify -> valgrind.
strings/bcmp.c:
Rename purify -> valgrind.
strings/decimal.c:
Rename purify -> valgrind.
strings/strmake.c:
Rename purify -> valgrind.
188 lines
4.3 KiB
Perl
188 lines
4.3 KiB
Perl
# -*- cperl -*-
|
|
# Copyright (C) 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 mtr_unique;
|
|
|
|
use strict;
|
|
use Fcntl ':flock';
|
|
|
|
use base qw(Exporter);
|
|
our @EXPORT= qw(mtr_get_unique_id mtr_release_unique_id);
|
|
|
|
use My::Platform;
|
|
|
|
sub msg {
|
|
# print "### unique($$) - ", join(" ", @_), "\n";
|
|
}
|
|
|
|
my $file= "/tmp/mysql-test-ports";
|
|
|
|
my %mtr_unique_ids;
|
|
|
|
END {
|
|
my $allocated_id= $mtr_unique_ids{$$};
|
|
if (defined $allocated_id)
|
|
{
|
|
mtr_release_unique_id($allocated_id);
|
|
}
|
|
delete $mtr_unique_ids{$$};
|
|
}
|
|
|
|
#
|
|
# Get a unique, numerical ID, given a file name (where all
|
|
# requested IDs are stored), a minimum and a maximum value.
|
|
#
|
|
# If no unique ID within the specified parameters can be
|
|
# obtained, return undef.
|
|
#
|
|
sub mtr_get_unique_id($$) {
|
|
my ($min, $max)= @_;;
|
|
|
|
msg("get, '$file', $min-$max");
|
|
|
|
die "Can only get one unique id per process!" if $mtr_unique_ids{$$};
|
|
|
|
my $ret = undef;
|
|
my $changed = 0;
|
|
|
|
if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
|
|
die 'lock file is a symbolic link';
|
|
}
|
|
|
|
my $save_umask= umask(0);
|
|
open SEM, ">", "$file.sem" or die "can't write to $file.sem";
|
|
flock SEM, LOCK_EX or die "can't lock $file.sem";
|
|
if(! -e $file) {
|
|
open FILE, ">", $file or die "can't create $file";
|
|
close FILE;
|
|
}
|
|
umask($save_umask);
|
|
|
|
msg("HAVE THE LOCK");
|
|
|
|
if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
|
|
die 'lock file is a symbolic link';
|
|
}
|
|
|
|
open FILE, "+<", $file or die "can't open $file";
|
|
#select undef,undef,undef,0.2;
|
|
seek FILE, 0, 0;
|
|
my %taken = ();
|
|
while(<FILE>) {
|
|
chomp;
|
|
my ($id, $pid) = split / /;
|
|
$taken{$id} = $pid;
|
|
msg("taken: $id, $pid");
|
|
# Check if process with given pid is alive
|
|
if(!process_alive($pid)) {
|
|
print "Removing slot $id used by missing process $pid\n";
|
|
msg("Removing slot $id used by missing process $pid");
|
|
delete $taken{$id};
|
|
$changed++;
|
|
}
|
|
}
|
|
for(my $i=$min; $i<=$max; ++$i) {
|
|
if(! exists $taken{$i}) {
|
|
$ret = $i;
|
|
$taken{$i} = $$;
|
|
$changed++;
|
|
# Remember the id this process got
|
|
$mtr_unique_ids{$$}= $i;
|
|
msg(" got $i");
|
|
last;
|
|
}
|
|
}
|
|
if($changed) {
|
|
seek FILE, 0, 0;
|
|
truncate FILE, 0 or die "can't truncate $file";
|
|
for my $k (keys %taken) {
|
|
print FILE $k . ' ' . $taken{$k} . "\n";
|
|
}
|
|
}
|
|
close FILE;
|
|
|
|
msg("RELEASING THE LOCK");
|
|
flock SEM, LOCK_UN or warn "can't unlock $file.sem";
|
|
close SEM;
|
|
|
|
return $ret;
|
|
}
|
|
|
|
|
|
#
|
|
# Release a unique ID.
|
|
#
|
|
sub mtr_release_unique_id($) {
|
|
my ($myid)= @_;
|
|
|
|
msg("release, $myid");
|
|
|
|
|
|
if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
|
|
die 'lock file is a symbolic link';
|
|
}
|
|
|
|
my $save_umask= umask(0);
|
|
open SEM, ">", "$file.sem" or die "can't write to $file.sem";
|
|
flock SEM, LOCK_EX or die "can't lock $file.sem";
|
|
|
|
msg("HAVE THE LOCK");
|
|
|
|
if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
|
|
die 'lock file is a symbolic link';
|
|
}
|
|
|
|
if(! -e $file) {
|
|
open FILE, ">", $file or die "can't create $file";
|
|
close FILE;
|
|
}
|
|
umask($save_umask);
|
|
open FILE, "+<", $file or die "can't open $file";
|
|
#select undef,undef,undef,0.2;
|
|
seek FILE, 0, 0;
|
|
my %taken = ();
|
|
while(<FILE>) {
|
|
chomp;
|
|
my ($id, $pid) = split / /;
|
|
msg(" taken, $id $pid");
|
|
$taken{$id} = $pid;
|
|
}
|
|
|
|
if ($taken{$myid} != $$)
|
|
{
|
|
msg(" The unique id for this process does not match pid");
|
|
}
|
|
|
|
|
|
msg(" removing $myid");
|
|
delete $taken{$myid};
|
|
seek FILE, 0, 0;
|
|
truncate FILE, 0 or die "can't truncate $file";
|
|
for my $k (keys %taken) {
|
|
print FILE $k . ' ' . $taken{$k} . "\n";
|
|
}
|
|
close FILE;
|
|
|
|
msg("RELEASE THE LOCK");
|
|
|
|
flock SEM, LOCK_UN or warn "can't unlock $file.sem";
|
|
close SEM;
|
|
}
|
|
|
|
|
|
1;
|
|
|