These do not fulfill any purpose and were introduced with false assumptions about what these guarantee and how these work. Also we recommend against their usage in our Perl Style Guide [0].
[0] https://pve.proxmox.com/wiki/Perl_Style_Guide#Prototypes Signed-off-by: Daniel Kral <[email protected]> Reviewed-by: Michael Köppl <[email protected]> Tested-by: Michael Köppl <[email protected]> --- src/PVE/HA/HashTools.pm | 6 +++--- src/PVE/HA/Rules.pm | 18 +++++++++--------- src/PVE/HA/Rules/NodeAffinity.pm | 2 +- src/PVE/HA/Rules/ResourceAffinity.pm | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/PVE/HA/HashTools.pm b/src/PVE/HA/HashTools.pm index cf5c7a20..ebe47e38 100644 --- a/src/PVE/HA/HashTools.pm +++ b/src/PVE/HA/HashTools.pm @@ -39,7 +39,7 @@ key-value pairs are always set to C<1> or another truthy value. =cut -sub set_intersect : prototype($$) { +sub set_intersect { my ($hash1, $hash2) = @_; my $result = { map { $hash1->{$_} && $hash2->{$_} ? ($_ => 1) : () } keys %$hash1 }; @@ -57,7 +57,7 @@ key-value pairs are always set to C<1> or another truthy value. =cut -sub set_union : prototype($$) { +sub set_union { my ($hash1, $hash2) = @_; my $result = { map { $_ => 1 } keys %$hash1, keys %$hash2 }; @@ -77,7 +77,7 @@ Returns C<1> if they are disjoint, C<0> otherwise. =cut -sub sets_are_disjoint : prototype($$) { +sub sets_are_disjoint { my ($hash1, $hash2) = @_; for my $key (keys %$hash1) { diff --git a/src/PVE/HA/Rules.pm b/src/PVE/HA/Rules.pm index 69c53356..1c7706ce 100644 --- a/src/PVE/HA/Rules.pm +++ b/src/PVE/HA/Rules.pm @@ -264,7 +264,7 @@ haven't been explicitly set yet. =cut -sub set_rule_defaults : prototype($$) { +sub set_rule_defaults { my ($class, $rule) = @_; if (my $plugin = $class->lookup($rule->{type})) { @@ -303,7 +303,7 @@ Used to register rule checks for a rule plugin. =cut -sub register_check : prototype($$$) { +sub register_check { my ($class, $check_func, $collect_errors_func) = @_; my $type = eval { $class->type() }; @@ -322,7 +322,7 @@ Used to register rule transformers for a rule plugin. =cut -sub register_transform : prototype($$) { +sub register_transform { my ($class, $transform_func) = @_; my $type = eval { $class->type() }; @@ -345,7 +345,7 @@ implementations. =cut -sub get_plugin_check_arguments : prototype($$) { +sub get_plugin_check_arguments { my ($class, $rules) = @_; return {}; @@ -361,7 +361,7 @@ creation of these can be shared inbetween rule check implementations. =cut -sub get_check_arguments : prototype($$) { +sub get_check_arguments { my ($class, $rules) = @_; my $global_args = {}; @@ -391,7 +391,7 @@ very last. =cut -sub check_feasibility : prototype($$$) { +sub check_feasibility { my ($class, $rules, $nodes) = @_; my $global_errors = {}; @@ -429,7 +429,7 @@ Returns a list of messages with the reasons why rules were removed. =cut -sub transform : prototype($$$) { +sub transform { my ($class, $rules, $nodes) = @_; my $messages = []; @@ -540,7 +540,7 @@ The following key-value pairs for C<$opts> are: =cut -sub foreach_rule : prototype($$;%) { +sub foreach_rule { my ($rules, $func, %opts) = @_; my $sid = $opts{sid}; @@ -568,7 +568,7 @@ be used a newly introduced rule afterwards. =cut -sub get_next_ordinal : prototype($) { +sub get_next_ordinal { my ($rules) = @_; my $current_order = (sort { $a <=> $b } values %{ $rules->{order} })[0] || 0; diff --git a/src/PVE/HA/Rules/NodeAffinity.pm b/src/PVE/HA/Rules/NodeAffinity.pm index d98f896d..3fa1fdb4 100644 --- a/src/PVE/HA/Rules/NodeAffinity.pm +++ b/src/PVE/HA/Rules/NodeAffinity.pm @@ -265,7 +265,7 @@ If there are no available nodes at all, returns C<undef>. =cut -sub get_node_affinity : prototype($$$) { +sub get_node_affinity { my ($node_affinity, $sid, $online_nodes) = @_; return ($online_nodes, $online_nodes) if !defined($node_affinity->{$sid}); diff --git a/src/PVE/HA/Rules/ResourceAffinity.pm b/src/PVE/HA/Rules/ResourceAffinity.pm index 91be21cd..41416b61 100644 --- a/src/PVE/HA/Rules/ResourceAffinity.pm +++ b/src/PVE/HA/Rules/ResourceAffinity.pm @@ -458,7 +458,7 @@ affinitive to C<'ct:200'> and C<'ct:201'>, the returned value will be: =cut -sub get_affinitive_resources : prototype($$) { +sub get_affinitive_resources { my ($resource_affinity, $sid) = @_; my $together = $resource_affinity->{positive}->{$sid} // {}; @@ -500,7 +500,7 @@ resource C<$sid> is in a negative affinity with, the returned value will be: =cut -sub get_resource_affinity : prototype($$$$) { +sub get_resource_affinity { my ($resource_affinity, $sid, $ss, $online_nodes) = @_; my $together = {}; @@ -540,7 +540,7 @@ node C<$node> must be avoided. =cut -sub is_allowed_on_node : prototype($$$) { +sub is_allowed_on_node { my ($together, $separate, $node) = @_; return $together->{$node} || !$separate->{$node}; @@ -561,7 +561,7 @@ resource has not failed running there yet. =cut -sub apply_positive_resource_affinity : prototype($$) { +sub apply_positive_resource_affinity { my ($together, $allowed_nodes) = @_; for my $node (keys %$together) { @@ -595,7 +595,7 @@ resource has not failed running there yet. =cut -sub apply_negative_resource_affinity : prototype($$) { +sub apply_negative_resource_affinity { my ($separate, $allowed_nodes) = @_; my $forbidden_nodes = { $separate->%* }; -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
