提交 d7addd68 编写于 作者: C Cole Robinson

build: predictably generate systemtap tapsets (bz 1173641)

The generated output is dependent on perl hashtable ordering, which
gives different results for i686 and x86_64. Fix this by sorting
the hash keys before iterating over them

https://bugzilla.redhat.com/show_bug.cgi?id=1173641
(cherry picked from commit a1edb05c)
上级 931888e6
...@@ -72,7 +72,7 @@ function libvirt_rpc_auth_name(type, verbose) ...@@ -72,7 +72,7 @@ function libvirt_rpc_auth_name(type, verbose)
{ {
EOF EOF
my $first = 1; my $first = 1;
foreach my $type (keys %auth) { foreach my $type (sort(keys %auth)) {
my $cond = $first ? "if" : "} else if"; my $cond = $first ? "if" : "} else if";
$first = 0; $first = 0;
print " $cond (type == ", $type, ") {\n"; print " $cond (type == ", $type, ") {\n";
...@@ -95,7 +95,7 @@ function libvirt_rpc_type_name(type, verbose) ...@@ -95,7 +95,7 @@ function libvirt_rpc_type_name(type, verbose)
{ {
EOF EOF
$first = 1; $first = 1;
foreach my $type (keys %type) { foreach my $type (sort(keys %type)) {
my $cond = $first ? "if" : "} else if"; my $cond = $first ? "if" : "} else if";
$first = 0; $first = 0;
print " $cond (type == ", $type, ") {\n"; print " $cond (type == ", $type, ") {\n";
...@@ -118,7 +118,7 @@ function libvirt_rpc_status_name(status, verbose) ...@@ -118,7 +118,7 @@ function libvirt_rpc_status_name(status, verbose)
{ {
EOF EOF
$first = 1; $first = 1;
foreach my $status (keys %status) { foreach my $status (sort(keys %status)) {
my $cond = $first ? "if" : "} else if"; my $cond = $first ? "if" : "} else if";
$first = 0; $first = 0;
print " $cond (status == ", $status, ") {\n"; print " $cond (status == ", $status, ") {\n";
...@@ -141,7 +141,7 @@ function libvirt_rpc_program_name(program, verbose) ...@@ -141,7 +141,7 @@ function libvirt_rpc_program_name(program, verbose)
{ {
EOF EOF
$first = 1; $first = 1;
foreach my $prog (keys %funcs) { foreach my $prog (sort(keys %funcs)) {
my $cond = $first ? "if" : "} else if"; my $cond = $first ? "if" : "} else if";
$first = 0; $first = 0;
print " $cond (program == ", $funcs{$prog}->{id}, ") {\n"; print " $cond (program == ", $funcs{$prog}->{id}, ") {\n";
...@@ -165,7 +165,7 @@ function libvirt_rpc_procedure_name(program, version, proc, verbose) ...@@ -165,7 +165,7 @@ function libvirt_rpc_procedure_name(program, version, proc, verbose)
{ {
EOF EOF
$first = 1; $first = 1;
foreach my $prog (keys %funcs) { foreach my $prog (sort(keys %funcs)) {
my $cond = $first ? "if" : "} else if"; my $cond = $first ? "if" : "} else if";
$first = 0; $first = 0;
print " $cond (program == ", $funcs{$prog}->{id}, " && version == ", $funcs{$prog}->{version}, ") {\n"; print " $cond (program == ", $funcs{$prog}->{id}, " && version == ", $funcs{$prog}->{version}, ") {\n";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册