## INXI INFO ##

my $self_name='inxi';

my $self_patch='00';

## END INXI INFO ##

my ($b_pledge,@pledges);

$charge = 'N/A';

}

$model = $battery->{$key}{'model_name'} if $battery->{$key}{'model_name'};

$vendor = $battery->{$key}{'manufacturer'} if $battery->{$key}{'manufacturer'};

if ($vendor || $model){

if ($vendor && $model){

if ($extra > 2 && $upower_data{'rechargeable'}){

$rows[$j]->{main::key($num++,0,2,'rechargeable')} = $upower_data{'rechargeable'};

}

$rows[$j]->{main::key($num++,0,2,'status')} = $status;

}

}

$rows[$j]->{main::key($num++,0,3,'driver')} = $cpu->{'scaling-driver'};

$cpu->{'governor'} ||= 'N/A';

$rows[$j]->{main::key($num++,0,3,'governor')} = $cpu->{'governor'};

}

if ($extra > 2){

if ($properties->{'volts'}){

$cpu{'sys-freq'} = \%freq if %freq;

}

}

$cpu{'type'} = cpu_vendor($cpu_arch) if $cpu_arch =~ /e2k/; # already set to lower

my ($core_count,$proc_count,$speed) = (0,0,0);

my ($b_block_1) = (1);

# note: stepping and ARM cpu revision are integers

$temp = main::get_defined($block->{'stepping'},$block->{'cpu revision'});

# can be 0, but can be 'unknown'

if ($temp =~ /^\d+$/){

$cpu{'stepping'} = uc(sprintf("%x",$temp));

}

}

elsif (defined $block->{'revision'}){

$cpu{'revision'} = $block->{'revision'};

}

# this is hex so uc for cpu arch id. raspi 4 has Model rather than Hardware

if (defined $block->{'model'}){

# can be 0, but can be 'unknown'

}

if ($block->{'cpu variant'}){

$cpu{'model-id'} = uc($block->{'cpu variant'});

$block->{'l3 cache size'} =~ /(\d+\s*[KMG])i?B?$/){

$cpu{'l3-cache'} = main::translate_size($1);

}

$temp = main::get_defined($block->{'flags'} || $block->{'features'});

if ($temp){

$cpu{'flags'} = $temp;

}

}

}

## Start incrementers

$temp = main::get_defined($block->{'cpu mhz'},$block->{'clock'});

if ($temp){

}

sub cpuinfo_data_grabber {

eval $start if $b_log;

$loaded{'cpuinfo'} = 1;

# use --arm flag when testing arm cpus, and --fake-cpu to trigger fake data

if ($fake{'cpu'}){

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/android-pocom3-fake-cpuinfo.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/arm-pine64-cpuinfo-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/arm-riscyslack2-cpuinfo-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/riscv-unmatched-2021~cpuinfo-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/x86-brickwizard-atom-n270~cpuinfo-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/x86-amd-phenom-chrisretusn-cpuinfo-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/amd/4-core-althlon-mjro.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/amd/4-core-apu-vc-box.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/amd/4-core-a10-5800k-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/2-core-ht-atom-bruh.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/core-2-i3.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/8-core-i7-damentz64.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/4-1-core-xeon-vps-frodo1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/4-6-core-xeon-no-mt-lathander.txt";

## Elbrus

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/elbrus-2c3/cpuinfo.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/1xE1C-8.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/1xE2CDSP-4.txt";

return \%cpu_sys if !%{$working};

$cpu_sys{'data'} = $working->{'data'} if $working->{'data'};

my ($core_id,$fake_core_id,$phys_id,) = (0,0,-1);

foreach my $key (sort keys %{$working->{'cpus'}}){

($core_id,$phys_id) = (0,0);

my $cpu_id = $key + 0;

# For max / min, we want to prep for the day 1 pys cpu has > 1 min/max freq

if (defined $cpu->{'cpufreq'}{'cpuinfo_max_freq'}){

$cpu->{'cpufreq'}{'cpuinfo_max_freq'} = clean_speed($cpu->{'cpufreq'}{'cpuinfo_max_freq'},'khz');

}

if (!grep {$_ eq $cpu->{'cpufreq'}{'cpuinfo_max_freq'}} @{$cpu_sys{'cpus'}->{$phys_id}{'max-freq'}}){

push(@{$cpu_sys{'cpus'}->{$phys_id}{'max-freq'}},$cpu->{'cpufreq'}{'cpuinfo_max_freq'});

}

if (defined $cpu->{'cpufreq'}{'cpuinfo_min_freq'}){

$cpu->{'cpufreq'}{'cpuinfo_min_freq'} = clean_speed($cpu->{'cpufreq'}{'cpuinfo_min_freq'},'khz');

}

if (!grep {$_ eq $cpu->{'cpufreq'}{'cpuinfo_min_freq'}} @{$cpu_sys{'cpus'}->{$phys_id}{'min-freq'}}){

push(@{$cpu_sys{'cpus'}->{$phys_id}{'min-freq'}},$cpu->{'cpufreq'}{'cpuinfo_min_freq'});

}

}

if (defined $cpu->{'cpufreq'}{'scaling_governor'}){

if (!grep {$_ eq $cpu->{'cpufreq'}{'scaling_governor'}} @{$cpu_sys{'cpus'}->{$phys_id}{'governor'}}){

push(@{$cpu_sys{'cpus'}->{$phys_id}{'governor'}},$cpu->{'cpufreq'}{'scaling_governor'});

}

# cpuinfo_max_freq:["2000000"] cpuinfo_max_freq:["1500000"]

# cpuinfo_min_freq:["200000"]

}

}

(defined $cpu_sys{'data'}->{'speeds'}{'min-freq'} &&

defined $cpu_sys{'data'}->{'speeds'}{'max-freq'}) &&

($cpu_sys{'data'}->{'speeds'}{'min-freq'} > $cpu_sys{'data'}->{'speeds'}{'max-freq'} ||

# this data has to match the data in cpuinfo grabber fake cpu, and remember

# to use --arm flag if arm tests

if ($fake{'cpu'}){

## CPU sys/cpuinfo pairs:

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/android-pocom3-fake-sys.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/arm-pine64-sys-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/ppc-stuntkidz~sys.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/riscv-unmatched-2021~sys-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/x86-brickwizard-atom-n270~sys-1.txt";

# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/sys-ci-pairs/x86-drgibbon-intel-i7-sys.txt";

}

# There's a massive time hit reading full globbed set of files, so grab and

# read only what we need.

$glob .= 'cpu*/topology/{core_cpus_list,core_id,core_siblings_list,die_id,';

$glob .= 'physical_package_id,thread_siblings_list}';

$glob .= ',cpufreq/{boost,ondemand}';

if ($type eq 'full'){

$glob .= ',cpu*/cache/index*/{level,shared_cpu_list,shared_cpu_map,size,type}';

}

$glob .= ',smt/{active,control}';

$glob .= '}';

}

@files = main::globber($glob);

'min-max-key' => $speed_info->{'min-max-key'},

'min-max' => $speed_info->{'min-max'},

'socket' => $dmi_data{'socket'},

'speed-key' => $speed_info->{'speed-key'},

'speed' => $speed_info->{'speed'},

'topology-full' => $topology{'full'},

$counts->{'cpu-cores'} = $cpu->{'cores'};

$counts->{'dies'} = $cpu->{'dies'} = 4;

}

# final check, override the num of cores value if it clearly is wrong

# and use the raw core count and synthesize the total instead of real count

if ($counts->{'cpu-cores'} == 0 &&

}

# only elbrus shows L1 / L3 cache data in cpuinfo, cpu_sys data should show

# for newer full linux.

$counts->{'cores-multiplier'} = $counts->{'cpu-cores'};

}

# last test to catch some corner cases

if ($cpu_sys->{'cpus'}{$phys_id}{'scaling-driver'}){

$cpu->{'scaling-driver'} = $cpu_sys->{'cpus'}{$phys_id}{'scaling-driver'};

}

if (!grep {$counts->{'cpu-cores'} eq $_} @phys_cores){

push(@phys_cores,$counts->{'cpu-cores'});

}

$caches->{'l1d-desc'} = $counts->{'cores-multiplier'} . 'x';

$caches->{'l1d-desc'} .= main::get_size($cpu->{'l1d-cache'},'string');

$caches->{'l1'} += $cpu->{'l1d-cache'} * $counts->{'cores-multiplier'};

}

if ($cpu->{'l1i-cache'}){

$caches->{'l1i-desc'} = $counts->{'cores-multiplier'} . 'x';

if (defined $cpu_sys->{'data'}{'speeds'}{'max-freq'}){

$cpu->{'max-freq'} = $cpu_sys->{'data'}{'speeds'}{'max-freq'};

}

if (defined $cpu_sys->{'data'}{'speeds'}{'all'}){

# only replace if we got actual speed values from cpufreq, or if no legacy

# sourced processors data. Handles fake syz core speeds for counts.

if ($cpu->{'cur-freq'} && !$info{'speed'}){

$info{'speed'} = $cpu->{'cur-freq'};

}

if ($cpu->{'cur-freq'}){

if ($show{'short'}){

$info{'speed-key'} = 'speed';

eval $end if $b_log;

return \%info;

}

# update $tests by reference

sub cp_test_types {

my ($cpu,$tests) = @_;

.\" with this program; if not, write to the Free Software Foundation, Inc.,

.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

.\"

.SH NAME

inxi \- Command line system information script for console and IRC

values. The \fBbase/boost:\fR values are sometimes real, and sometimes not.

\fBbase\fR appears in general to be real.

\- Adds description of cache topology per cpu. Linux only.

================================================================================

Version: 3.3.10

Date: 2021-12-13

--------------------------------------------------------------------------------

RELEASE NOTES:

sudo/root, and it will be more accurate than ever before.

2. CPU: shows per CPU L1/L2/L3 totals, and shows actual full system physical

3. CPU: A long standing annoyance, previously for main CPU 'Speed:' item, showed

the fastest core speed found, now shows avg: [speed] and with -Cx, shows the

topology data found (OpenBSD for example), for -C shows 'smt: disabled' after

'type:' section, and enabled if -Cxxx (since MT really already tells you that).

It came tp my attention that the long standing shift+pgup/pgdown (aka

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=50145474f6ef4a9c19205b173da6264a644c7489

https://lwn.net/ml/linux-kernel/CAHk-=whe4ZdTdCebneWqC4gSQZwsVJ5-Emg0BucOGCwPhOAJpw@mail.gmail.com/

* -Y 0 or -Y: Set maximum block height to terminal line height.

* -Y [1-xxx]: Set maximum block line height to given integer.

* -Y -1: Print out one primary data block item at a time, with -F for example.

15. And finally, more disk vendors/vendor ids. As usual. As expected.

and call it a day.

You can change these new defaults using configuration options (these are the

previous options, though due to a bug, COLS_MAX_CONSOLE was never being used):

COLS_MAX_IRC=100

COLS_MAX_NO_DISPLAY=130 # not in display, no X/Wayland running

6. If > 1 physical cpu detected, no longer uses single/dual/triple/quad core

strings, rather uses: 2x 2-core. Also uses lower case -core, not -Core.

shows the Info: topology short form.

11. Bogomips always shows before flags data, whether -f or just -Cx trips flag

12. Flags/Features now shows in the same place, under Speeds: always, whether

-Cx shortlist, or -Cf full list. Makes more sense that way, and code is much

cleaner too.

--------------------------------------------------------------------------------

DOCUMENTATION:

for a while now, but this finalizes it, and makes it fully agnostic. Internally

doas is actually preferred over sudo, by the way.

5. Re-ordered help menu and man page, created new Filters and Output Controls

sections to make stuff easier to find. In man page, also added on top a list of

CODE:

1. Removed legacy /sys cpu functions: cpu_bugs_sys(); get_boost_status();

This logic is now integrated into cpu_data_sys() data generator.

that SOC data somewhere as far as I can tell.

4. New tools:

* regex_range() - generate ranges from comma, space, or ranges like 2-29, or any

combination of those, like 3,6,12-29

got rid of a lot of tests. Also made all risc tests consistent, some were ARM

only, or arm/mips, but were supposed to be for all risc cpus.

10. Changed all xxx_cleaner subs to clean_xxx, all filter subs to filter_xxx,

and row_defaults() to message().

12. Cleaned up print_data() to allow for more fine tuned indentation for the new

2 indent levels.

--------------------------------------------------------------------------------

-- Harald Hope - Tue, 13 Dec 2021 10:25:49 -0800