Fix for issue 300: Correctly print usage for cpu 10
This commit is contained in:
parent
639a67f752
commit
d003edcba6
@ -163,7 +163,7 @@ void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format, const
|
||||
}
|
||||
int padding = 1;
|
||||
int step = 10;
|
||||
while (step < number) {
|
||||
while (step <= number) {
|
||||
step *= 10;
|
||||
padding++;
|
||||
}
|
||||
|
15
testcases/022-cpu-usage-tenth-cpu/cleanup.pl
Normal file
15
testcases/022-cpu-usage-tenth-cpu/cleanup.pl
Normal file
@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
use v5.10;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
if ($#ARGV != 0 || ! -d $ARGV[0]) {
|
||||
say "Error with cleanup script: argument not provided or not a directory";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
my $output_file = "$ARGV[0]/stat";
|
||||
if (-f $output_file) {
|
||||
unlink $output_file;
|
||||
}
|
12
testcases/022-cpu-usage-tenth-cpu/expected_output.pl
Normal file
12
testcases/022-cpu-usage-tenth-cpu/expected_output.pl
Normal file
@ -0,0 +1,12 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
use v5.10;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
chomp(my $cpu_count = `grep -c -P '^processor\\s+:' /proc/cpuinfo`);
|
||||
if ($cpu_count < 10) {
|
||||
print "all: 00% CPU_0: 00% CPU_10: \n";
|
||||
} else {
|
||||
print "all: 00% CPU_0: 00% CPU_10: 00%\n";
|
||||
}
|
10
testcases/022-cpu-usage-tenth-cpu/i3status.conf
Normal file
10
testcases/022-cpu-usage-tenth-cpu/i3status.conf
Normal file
@ -0,0 +1,10 @@
|
||||
general {
|
||||
output_format = "none"
|
||||
}
|
||||
|
||||
order += "cpu_usage"
|
||||
|
||||
cpu_usage {
|
||||
format = "all: %usage CPU_0: %cpu0 CPU_10: %cpu10"
|
||||
path = "testcases/022-cpu-usage-tenth-cpu/stat"
|
||||
}
|
19
testcases/022-cpu-usage-tenth-cpu/setup.pl
Normal file
19
testcases/022-cpu-usage-tenth-cpu/setup.pl
Normal file
@ -0,0 +1,19 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
use v5.10;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
if ($#ARGV != 0 || ! -d $ARGV[0]) {
|
||||
say "Error with setup script: argument not provided or not a directory";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
chomp(my $cpu_count = `grep -c -P '^processor\\s+:' /proc/cpuinfo`);
|
||||
my $output_file = "$ARGV[0]/stat";
|
||||
open(my $fh, '>', $output_file) or die "Could not open file '$output_file' $!";
|
||||
print $fh "cpu 0 0 0 0 0 0 0 0 0 0\n";
|
||||
for (my $i = 0; $i < $cpu_count; $i++) {
|
||||
print $fh "cpu$i 0 0 0 0 0 0 0 0 0 0\n";
|
||||
}
|
||||
close $fh;
|
Loading…
Reference in New Issue
Block a user