mirror of
git://git.proxmox.com/git/pve-guest-common.git
synced 2025-01-11 05:17:49 +03:00
guesthelpers: move/add safe comparison functions from lxc and qemu
move the safe_string_ne and safe_num_ne functions to guesthelpers to remove duplicate code. add the new safe_boolean_ne and typesafe_ne helper functions also add them in @EXPORT_OK Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
This commit is contained in:
parent
ab44df53f7
commit
24d90d8d10
@ -9,11 +9,64 @@ use PVE::Storage;
|
||||
use POSIX qw(strftime);
|
||||
use Scalar::Util qw(weaken);
|
||||
|
||||
our @EXPORT_OK = qw(safe_string_ne safe_boolean_ne safe_num_ne typesafe_ne);
|
||||
|
||||
# We use a separate lock to block migration while a replication job
|
||||
# is running.
|
||||
|
||||
our $lockdir = '/var/lock/pve-manager';
|
||||
|
||||
# safe variable comparison functions
|
||||
|
||||
sub safe_num_ne {
|
||||
my ($a, $b) = @_;
|
||||
|
||||
return 0 if !defined($a) && !defined($b);
|
||||
return 1 if !defined($a);
|
||||
return 1 if !defined($b);
|
||||
|
||||
return $a != $b;
|
||||
}
|
||||
|
||||
sub safe_string_ne {
|
||||
my ($a, $b) = @_;
|
||||
|
||||
return 0 if !defined($a) && !defined($b);
|
||||
return 1 if !defined($a);
|
||||
return 1 if !defined($b);
|
||||
|
||||
return $a ne $b;
|
||||
}
|
||||
|
||||
sub safe_boolean_ne {
|
||||
my ($a, $b) = @_;
|
||||
|
||||
# we don't check if value is defined, since undefined
|
||||
# is false (so it's a valid boolean)
|
||||
|
||||
# negate both values to normalize and compare
|
||||
return !$a != !$b;
|
||||
}
|
||||
|
||||
sub typesafe_ne {
|
||||
my ($a, $b, $type) = @_;
|
||||
|
||||
return 0 if !defined($a) && !defined($b);
|
||||
return 1 if !defined($a);
|
||||
return 1 if !defined($b);
|
||||
|
||||
if ($type eq 'string') {
|
||||
return safe_string_ne($a, $b);
|
||||
} elsif ($type eq 'number' || $type eq 'integer') {
|
||||
return safe_num_ne($a, $b);
|
||||
} elsif ($type eq 'boolean') {
|
||||
return safe_boolean_ne($a, $b);
|
||||
}
|
||||
|
||||
die "internal error: can't compare $a and $b with type $type";
|
||||
}
|
||||
|
||||
|
||||
sub guest_migration_lock {
|
||||
my ($vmid, $timeout, $func, @param) = @_;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user