aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--LICENSE.txt14
-rw-r--r--README.txt618
-rwxr-xr-xinxi41227
-rw-r--r--inxi.12988
-rw-r--r--inxi.changelog18401
6 files changed, 45533 insertions, 17716 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b2cd01b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+inxi linguist-language=Perl
diff --git a/LICENSE.txt b/LICENSE.txt
index 9cecc1d..f288702 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
- {one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- {project} Copyright (C) {year} {fullname}
+ <program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/README.txt b/README.txt
index 1a40d96..27e35e4 100644
--- a/README.txt
+++ b/README.txt
@@ -1,220 +1,320 @@
+================================================================================
README for inxi - a command line system information tool
+================================================================================
+FILE: README.txt
+VERSION: 6.0
+DATE: 2024-01-14
-The new faster, more powerful Perl inxi is here! File all issue reports
-with the master branch. All support for versions prior to 3.0 is now ended,
-sorry.
+The new faster, more powerful Perl inxi is here! File all issue reports with the
+master branch. All support for versions prior to 3.0 is ended.
-Make sure to update to the current inxi from the master branch before filing
-any issue reports. The code in pre 2.9 versions literally no longer exists in
-inxi 3. Bugs from earlier versions cannot usually be solved in the new version
-since the pre 2.9 and the 2.9 and later versions are completely different
-internally.
+Make sure to update to the current inxi from the master branch before filing any
+issue reports. Bugs from earlier versions cannot usually be solved in the new
+version since too much changes intnernally release to release.
-===============================================================================
+--------------------------------------------------------------------------------
+CODEBERG SOURCE REPO
+--------------------------------------------------------------------------------
+
+Packagers: Make sure to change your package URLs and repos to use codeberg.org.
+
+The previous inxi-perl, tarballs, and docs branches are now standalone repos
+on codeberg.org:
+
+docs > https://codeberg.org/smxi/inxi-docs master
+inxi-perl > https://codeberg.org/smxi/pinxi master
+master > https://codeberg.org/smxi/inxi master
+tarballs > https://codeberg.org/smxi/inxi-tarballs master
+
+inxi-perl branch has been rebuilt and now only contains the pinxi, pinxi.1
+files, plus a minimal README.txt for github users. docs and tarballs have been
+deleted. The inxi-perl branch should not be used, and exists only so that
+current pinxi users can update from there to get the new version with new URLs.
+
+inxi master will be mirrored to github until most packagers have switched to
+using codeberg. inxi-perl/pinxi no longer gets updates, and exists only to let
+users update to a version with the new self updater codeberg URLs.
+
+The inxi repo only contains master, plus the one, two branches, which are
+obsolete.
+
+--------------------------------------------------------------------------------
+
+Please file issue reports or feature requests at:
+
+https://codeberg.org/smxi/inxi
+
+Please take the time to read this helpful article from the Software Freedom
+Conservancy:
+
+https://sfconservancy.org/GiveUpGitHub/
+
+Any use of this project's code by GitHub Copilot, past or present, is done
+without my permission. I do not consent to GitHub's use of this project's code
+in Copilot.
+
+--------------------------------------------------------------------------------
+DONATE
+--------------------------------------------------------------------------------
+
+Help support the project with a one time or a sustaining donation.
+
+Paypal: https://www.paypal.com/donate/?hosted_button_id=77DQVM6A4L5E2
+
+LiberaPay (sustaining donations): https://liberapay.com/smxi/
+
+================================================================================
DEVELOPMENT AND ISSUES
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
Make inxi better! Expand supported hardware and OS data, fix broken items!
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
HELP PROJECT DEVELOPMENT! SUBMIT A DEBUGGER DATASET
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
-This is easy to do, and only takes a few seconds. These datasets really help
-the project add and debug features. You will generally also be asked to provide
-this data for non trivial issue reports.
+This is easy to do, and only takes a few seconds. These datasets really help the
+project add and debug features. You will generally also be asked to provide this
+data for non trivial issue reports.
Note that the following options are present:
1. Generate local gz'ed debugger dataset. Leaves gz on your system:
- inxi version 3: inxi --debug 20
- inxi version <= 2.3: inxi -@14
+ inxi version >= 3: inxi --debug 20
2. Generate, upload gz'ed debugger dataset. Leaves gz on your system:
- inxi version 3: inxi --debug 21
- inxi version <= 2.3: inxi -xx@14
+ inxi version >= 3: inxi --debug 21
3. Generate, upload, delete gz'ed debugger dataset:
- inxi version 3 only: inxi --debug 22
+ inxi version >= 3: inxi --debug 22
You can run these as regular user, or root/sudo, which will gather a bit more
-data, like from dmidecode, and other tools that need superuser permissions
-to run.
+data, like from dmidecode, and other tools that need superuser permissions to
+run.
ARM (plus MIPS, SPARC, PowerPC) and BSD datasets are particularly appreciated
because we simply do not have enough of those.
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
FILE AN ISSUE IF YOU FIND SOMETHING MISSING, BROKEN, OR FOR AN ENHANCEMENT
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
-inxi strives to support the widest range of operating systems and hardware,
-from the most simple consumer desktops, to the most advanced professional
-hardware and servers.
+inxi strives to support the widest range of operating systems and hardware, from
+the most simple consumer desktops, to the most advanced professional hardware
+and servers.
-The issues you post help maintain or expand that support, and are always
-appreciated since user data and feedback is what keeps inxi working and
+The issues you post help maintain or expand that support, and are always
+appreciated since user data and feedback is what keeps inxi working and
supporting the latest (or not so latest) hardware and operating systems.
See INXI VERSION/SUPPORT/ISSUES/BUGS INFORMATION for more about issues/support.
See BSD/UNIX below for qualifications re BSDs, and OSX in particular.
-===============================================================================
+================================================================================
SOURCE VERSION CONTROL
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+inxi:
+REPO: https://codeberg.org/smxi/inxi
+MAIN BRANCH: master
+DEVELOPMENT BRANCHES [not used]: one, two
-https://github.com/smxi/inxi
+pinxi [development version of inxi]:
+REPO: https://codeberg.org/smxi/pinxi
MAIN BRANCH: master
-DEVELOPMENT BRANCHES: inxi-perl, one, two
-inxi-perl is the dev branch, the others are rarely if ever used. inxi itself
-has the built in feature to be able to update itself from anywhere, including
-these branches, which is very useful for development and debugging on various
-user systems.
-
-PULL REQUESTS: Please talk to me before starting to work on patches of any
-reasonable complexity. inxi is hard to work on, and you have to understand how
-it works before submitting patches, unless it's a trivial bug fix. Please:
-NEVER even think about looking at or using previous inxi commits, previous to
-the current master version, as a base for a patch. If you do, your patch / pull
-request will probably be rejected. Developers, get your version from the
-inxi-perl branch, pinxi, otherwise you may not be current to actual development
-versions. inxi-perl pinxi is always equal to or ahead of master branch inxi.
-
-Man page updates, doc page updates, etc, of course, are easy and will probably
+
+pinxi is the standalone development version of inxi. inxi branches one, two are
+rarely if ever used. inxi has the built in feature to be able to update itself
+from anywhere, including these branches, which is very useful for development
+and debugging on various user systems.
+
+Please: NEVER even think about looking at or using previous inxi commits,
+previous to the current master version, as a base for a patch. If you do, your
+patch / pull request will probably be rejected.
+
+PULL REQUESTS: Please talk to me before starting to work on patches of any
+reasonable complexity. inxi is hard to work on, and you have to understand how
+it works before submitting patches, unless it's a trivial bug fix. Never work
+with inxi master, always work with pinxi master, since it can be quite far ahead
+of inxi. inxi master has only one purpose, to get updated to next inxi when
+pinxi is ready to be copied over to inxi. pinxi is always equal to or ahead of
+master branch inxi.
+
+Man page updates, doc pages updates, etc, of course, are easy and will probably
be accepted, as long as they are properly formatted and logically coherent.
-When under active development, inxi releases early, and releases often.
+When under active development, pinxi releases early, and releases often. inxi
+is stable and is generally only updated when a new tagged version is completed.
-PACKAGERS: inxi has one and only one 'release', and that is the current
-commit/version in the master branch (plus pinxi inxi-perl branch, of course,
-but those should never be packaged).
+PACKAGERS: inxi has one and only one 'release', and that is the current tagged
+version in the master branch (plus pinxi repo, of course, but pinxi should in
+general not be packaged). No non-current versions of inxi are supported.
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
MASTER BRANCH
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
-This is the only supported branch, and the current latest commit/version is
-the only supported 'release'. There are no 'releases' of inxi beyond the
-current commit/version in master. All past versions are not supported.
+This is the only supported branch, and the current latest commit/version is the
+only supported 'release'. There are no 'releases' of inxi beyond the current
+commit/version in master. All past versions are not supported.
-git clone https://github.com/smxi/inxi --branch master --single-branch
+git clone https://codeberg.org/smxi/inxi --branch master --single-branch
OR direct fast and easy install:
-wget -O inxi https://github.com/smxi/inxi/raw/master/inxi
-OR easy to remember shortcut (which redirects to github):
+wget -O inxi https://codeberg.org/smxi/inxi/raw/master/inxi
+
+OR easy to remember shortcut (which redirects to codeberg.org):
+
wget -O inxi https://smxi.org/inxi
wget -O inxi smxi.org/inxi
-NOTE: Just because github calls tagged commits 'Releases' does not mean they
-are releases! I can't change the words on the tag page. They are tagged
-commmits, period. A tag is a pointer to a commit, and has no further meaning.
+NOTE: There are no 'Releases' per se. There are only tagged commits, period. A
+tag is a pointer to a commit, and has no further meaning. A tagged commit
+however is the target for packagers.
If your distribution has blocked -U self updater and you want a newer version:
Open /etc/inxi.conf and change false to true: B_ALLOW_UPDATE=true
--------------------------------------------------------------------------------
-DEVELOPMENT BRANCH
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+SPECIAL NOTE FOR LEGACY OPERATING SYSTEMS WITH NO TLS 1.2 OR GREATER: Modern web
+servers are dropping support for TLS 1.0, 1.1, and so has smxi.org, this means
+to install inxi onto an older system with only TLS 1.0 or 1.1 available, you
+will need to do this to install inxi onto the old system:
+
+wget -O /usr/local/bin/inxi ftp://ftp.smxi.org/outgoing/inxi
+
+then update inxi/man pages after that with inxi -U 4, which uses FTP, not HTTP,
+to download the file.
+
+For pinxi, just change inxi to pinxi above (add --man to get the man page), and
+it will work the same.
+
+--------------------------------------------------------------------------------
+DEVELOPMENT VERSION (in pinxi repo)
+--------------------------------------------------------------------------------
-All active development is now done on the inxi-perl branch (pinxi):
+All active development is done in the pinxi repo master branch.:
-git clone https://github.com/smxi/inxi --branch inxi-perl --single-branch
+git clone https://codeberg.org/smxi/pinxi
OR direct fast and easy install:
-wget -O pinxi https://github.com/smxi/inxi/raw/inxi-perl/pinxi
-OR easy to remember shortcut (which redirects to github):
+wget -O pinxi https://codeberg.org/smxi/pinxi/raw/master/pinxi
+
+OR easy to remember shortcut (which redirects to codeberg.org):
+
wget -O pinxi https://smxi.org/pinxi
wget -O pinxi smxi.org/pinxi
Once new features have been debugged, tested, and are reasonably stable, pinxi
-is copied to inxi in the master branch.
+is copied to inxi in the inxi master branch.
-It's a good idea to check with pinxi if you want to make sure your issue has
-not been corrected, since pinxi is always equal to or ahead of inxi.
+It's a good idea to check with pinxi if you want to make sure your issue has not
+been corrected, since pinxi is always equal to or ahead of inxi.
--------------------------------------------------------------------------------
-LEGACY BRANCH
--------------------------------------------------------------------------------
+See SPECIAL NOTE FOR LEGACY OPERATING SYSTEMS above to install pinxi on very old
+operating systems with out of date TLS version.
-If you'd like to look at or check out the Gawk/Bash version of inxi, you can
-find it here, at the inxi-legacy branch (binxi):
+--------------------------------------------------------------------------------
+LEGACY INXI (in inxi-legacy repo)
+--------------------------------------------------------------------------------
-git clone https://github.com/smxi/inxi --branch inxi-legacy --single-branch
+If you'd like to look at the Gawk/Bash version of inxi, you can find it in the
+inxi-legacy repo, as binxi in the /inxi-legacy directory:
-OR direct fast and easy install:
-wget -O binxi https://github.com/smxi/inxi/raw/inxi-legacy/binxi
+Direct fast and easy install:
+
+wget -O binxi https://codeberg.org/smxi/inxi-legacy/raw/master/binxi
+
+OR easy to remember shortcut (which redirects to codeberg.org):
-OR easy to remember shortcut (which redirects to github):
wget -O binxi https://smxi.org/binxi
-This version will not be maintained, and it's unlikely that any time will be
-spent on it in the future, but it is there in case it's of use or interest to
-anyone.
+This version will not be maintained, and it's unlikely that any time will be
+spent on it in the future, but it is there in case it's of use or interest to
+anyone. Please don't ask for any help with that, the reason inxi was rewritten
+to Perl was to avoid ever needing to battle with bash/gawk again.
+
+This was kept for a long time as the inxi-legacy branch of inxi, but was moved
+to the inxi-legacy repo 2021-09-24.
-===============================================================================
+================================================================================
SUPPORT INFO
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
-Do not ask for basic help that reading the inxi -h / --help menus, or man page
+Do not ask for basic help that reading the inxi -h / --help menus, or man page
would show you, and do not ask for features to be added that inxi already has.
-Also do not ask for support if your distro won't update its inxi version, some
-are bad about that.
+Also do not ask for support if your distro won't update its inxi version, some
+are bad about that. Yes, these are long, but inxi does a lot of stuff, not all
+of it particularly ihtuitive.
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
DOCUMENTATION
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
https://smxi.org/docs/inxi.htm
-(smxi.org/docs/ is easier to remember, and is one click away from inxi.htm).
-The one page wiki on github is only a pointer to the real resources.
+(smxi.org/docs/ is easier to remember, and is one click away from inxi.htm). The
+one page wiki on codeberg.org is only a pointer to the real resources.
-https://github.com/smxi/inxi/tree/inxi-perl/docs
-Contains specific Perl inxi documentation, of interest mostly to developers.
-Includes internal inxi tools, values, configuration items. Also has useful
-information about Perl version support, including the list of Core modules that
+https://codeberg.org/smxi/pinxi/src/branch/master/docs
+
+Contains specific Perl inxi documentation, of interest mostly to developers.
+Includes internal inxi tools, values, configuration items. Also has useful
+information about Perl version support, including the list of Core modules that
_should_ be included in a distribution's core modules, but which are
unfortunately sometimes removed.
INXI CONFIGURATION: https://smxi.org/docs/inxi-configuration.htm
HTML MAN PAGE: https://smxi.org/docs/inxi-man.htm
-INXI OPTIONS PAGE: http://smxi.org/docs/inxi-options.htm
+INXI OPTIONS PAGE: https://smxi.org/docs/inxi-options.htm
+
+NOTE: Check the inxi version number on each doc page to see which version will
+support the options listed. The man and options page also link to a legacy
+version, pre 2.9.
+
+https://codeberg.org/smxi/inxi/wiki
-NOTE: Check the inxi version number on each doc page to see which version
-will support the options listed. The man and options page also link to a
-legacy version, pre 2.9.
+This is simply a page with links to actual inxi resources, which can be useful
+for developers and people with technical questions. No attempt will be made to
+reproduce those external resources on codeberg.org. You'll find stuff like
+how to export to json/xml there, and basic core philosophies, etc.
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
IRC
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+You can go to:
+
+irc.oftc.net or irc.libera.chat channel #smxi
-You can go to: irc.oftc.net channel #smxi
but be prepared to wait around for a while to get a response. Generally it's
-better to use github issues.
+better to use codeberg.org issues.
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
ISSUES
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+https://codeberg.org/smxi/inxi/issues
-https://github.com/smxi/inxi/issues
-No issues accepted for non current inxi versions. See below for more on that.
-Unfortunately as of 2.9, no support or issues can be accepted for older inxi's
-because inxi 2.9 (Perl) and newer is a full rewrite, and legacy inxi is not
-being supported since our time here on earth is finite (plus of course, one
+No issues accepted for non current inxi versions. See below for more on that.
+Unfortunately as of 2.9, no support or issues can be accepted for older inxi's
+because inxi 2.9 (Perl) and newer is a full rewrite, and legacy inxi is not
+being supported since our time here on earth is finite (plus of course, one
reason for the rewrite was to never have to work with Gawk->Bash again!).
-Sys Admin type inxi users always get the first level of support. ie, convince
-us you run real systems and networks, and your issue shoots to the top of the
-line. As do any real bugs.
+Sys Admin type inxi users always get the first level of support. ie, convince us
+you run real systems and networks, and your issue shoots to the top of the line.
+As do any real bugs.
Failure to supply requested debugger data will lead To a distinct lack of
interest on our part to help you with a bug. ie, saying, oh, it doesn't work,
doesn't cut it, unless it's obvious why.
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
SUPPORT FORUMS
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
https://techpatterns.com/forums/forum-33.html
This is the best place to place support issues that may be complicated.
@@ -222,126 +322,133 @@ This is the best place to place support issues that may be complicated.
If you are developer, use:
DEVELOPER FORUMS: https://techpatterns.com/forums/forum-32.html
-===============================================================================
+================================================================================
ABOUT INXI
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
-inxi is a command line system information tool. It was forked from the ancient
+inxi is a command line system information tool. It was forked from the ancient
and mindbendingly perverse yet ingenius infobash, by locsmif.
-That was a buggy, impossible to update or maintain piece of software, so the
-fork fixed those core issues, and made it flexible enough to expand the utility
-of the original ideas. Locmsif has given his thumbs up to inxi, so don't be
+That was a buggy, impossible to update or maintain piece of software, so the
+fork fixed those core issues, and made it flexible enough to expand the utility
+of the original ideas. Locmsif has given his thumbs up to inxi, so don't be
fooled by legacy infobash stuff you may see out there.
-inxi is lower case, except when I create a text header here in a file like
-this, but it's always lower case. Sometimes to follow convention I will use
-upper case inxi to start a sentence, but i find it a bad idea since invariably,
-someone will repeat that and type it in as the command name, then someone will
-copy that, and complain that the command: Inxi doesn't exist...
+inxi is lower case, except when I create a text header here in a file like this,
+but it's always lower case. Sometimes to follow convention I will use upper case
+inxi to start a sentence, but i find it a bad idea since invariably, someone
+will repeat that and type it in as the command name, then someone will copy
+that, and complain that the command: Inxi doesn't exist...
-The primary purpose of inxi is for support, and sys admin use. inxi is used
+The primary purpose of inxi is for support, and sys admin use. inxi is used
widely for forum and IRC support, which is I believe it's most common function.
-If you are piping output to paste or post (or writing to file), inxi now
-automatically turns off color codes, so the old suggestion to use -c 0 to turn
-off colors is no longer required.
+If you are piping output to paste or post (or writing to file), inxi now
+automatically turns off color codes, so the inxi 2.3.xx and older suggestion to
+use -c 0 to turn off colors is no longer required.
inxi strives to be as accurate as possible, but some things, like memory/ram
-data, depend on radically unreliable system self reporting based on OEM
-filling out data correctly, which doesn't often happen, so in those cases,
-you want to confirm things like ram capacity with a reputable hardware source,
-like crucial.com, which has the best ram hardware tool I know of.
+data, depend on radically unreliable system self reporting based on OEM filling
+out data correctly, which doesn't often happen, so in those cases, you want to
+confirm things like ram capacity with a reputable hardware source, like
+crucial.com, which has the best ram hardware tool I know of.
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
COMMITMENT TO LONG TERM STABILITY
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
The core mission of inxi is to always work on all systems all the time. Well,
-all systems with the core tools inxi requires to operate installed. Ie, not
-Android, yet. What this means is this: you can have a 10 year old box, or
-probably 15, not sure, and you can install today's inxi on it, and it will run.
-It won't run fast, but it will run. I test inxi on a 200 MHz laptop from about
-1998 to keep it honest. That's also what was used to optimize the code at some
-points, since differences appear as seconds, not 10ths or 100ths of seconds on
-old systems like that.
+all systems with the core tools inxi requires to operate installed.
+
+What this means is this: you can have a 10 year old box, or probably 15, not
+sure, and you can install today's inxi on it, and it will run. It won't run
+fast, but it will run. I test inxi on a 200 MHz laptop from about 1998 to keep
+it honest. That's also what was used to optimize the code at some points, since
+differences appear as seconds, not 10ths or 100ths of seconds on old systems
+like that.
inxi is being written, and tested, on Perl as old as 5.08, and will work on any
system that runs Perl 5.08 or later. Pre 2.9.0 Gawk/Bash inxi will also run on
any system no matter how old, within reason, so there should be no difference.
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
FEATURES AND FUNCTIONALITY
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
inxi's functionality continues to grow over time, but it's also important to
-understand that each core new feature usually requires about 30 days work to
-get it stable. So new features are not trivial things, nor is it acceptable to
-submit a patch that works only on your personal system. One inxi feature (-s,
-sensors data), took about 2 hours to get working in the alpha test on the local
-dev system, but then to handle the massive chaos that is actual user sensors
-output and system variations, it took several rewrites and about 30 days to
-get somewhat reliable for about 98% or so of inxi users. So if your patch is
-rejected, it's likely because you have not thought it through adequately, have
-not done adequate testing cross system and platform, etc.
-
--------------------------------------------------------------------------------
+understand that each core new feature usually requires about 30 days work to get
+it stable. So new features are not trivial things, nor is it acceptable to
+submit a patch that works only on your personal system.
+
+One inxi feature (-s, sensors data), took about 2 hours to get working in the
+alpha test on the local dev system, but then to handle the massive chaos that is
+actual user sensors output and system variations, it took several rewrites and
+about 30 days to get somewhat reliable for about 98% or so of inxi users. So if
+your patch is rejected, it's likely because you have not thought it through
+adequately, have not done adequate testing cross system and platform, etc.
+
+--------------------------------------------------------------------------------
SUPPORTED VERSIONS / DISTRO VERSIONS
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
Important: the only version of inxi that is supported is the latest current
master branch version/commit. No issue reports or bug reports will be accepted
for anything other than current master branch. No merges, attempts to patch old
-code from old versions, will be considered or accepted. If you are not updated
-to the latest inxi, do not file a bug report since it's probably been fixed
-ages ago. If your distro isn't packaging a current inxi, then file a bug report
-with your packager, not here.
+code from old versions, will be considered or accepted on the master branch of
+inxi. If you are not updated to the latest inxi, do not file a bug report since
+it's probably been fixed ages ago. If your distro isn't packaging a current
+inxi, then file a bug report with your packager, not here.
+
+The development branch inxi-perl/pinxi has been moved to its own standalone
+repo, pinxi, at https://codeberg.org/smxi/pinxi - this is the only place
+development happens.
inxi is 'rolling release' software, just like Debian Sid, Gentoo, or Arch Linux
are rolling release GNU/Linux distributions, with no 'release points'.
-Distributions should never feel any advantage comes from using old inxi
-versions because inxi has as a core promise to you, the end user, that it will
-never require new tools to run. New tools may be required for a new feature,
-but that will always be handled internally by inxi, and will not cause any
-operational failures. This is a promise, and I will never as long as I run this
-project violate that core inxi requirement. Old inxi is NOT more stable than
-current inxi, it's just old, and lacking in bug fixes and features. For pre 2.9
+Distributions should never feel any advantage comes from using old inxi versions
+because inxi has as a core promise to you, the end user, that it will never
+require new tools to run. New tools may be required for a new feature, but that
+will always be handled internally by inxi, and will not cause any operational
+failures. This is a promise, and I will never as long as I run this project
+violate that core inxi requirement. Old inxi is NOT more stable than current
+inxi, it's just old, and lacking in bug fixes and features. For pre 2.9
versions, it's also significantly slower, and with fewer features.
-Your distro not updating inxi ever, then failing to show something that is
-fixed in current inxi is not a bug, and please do not post it here. File the
-issue with your distro, not here. Updating inxi in a package pool will NEVER
-make anything break or fail, period. It has no version based dependencies, just
+Your distro not updating inxi ever, then failing to show something that is fixed
+in current inxi is not a bug, and please do not post it here. File the issue
+with your distro, not here. Updating inxi in a package pool will NEVER make
+anything break or fail, period. It has no version based dependencies, just
software, like Perl 5.xx, lspci, etc. There is never a valid reason to not
update inxi in a package pool of any distro in the world (with one single known
-exception, the Slackware based Puppy Linux release, which ships without the
-full Perl language. The Debian based one works fine).
+exception, the Slackware based Puppy Linux release, which ships without the full
+Perl language. The Debian based one works fine).
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
SEMANTIC VERSION NUMBERING
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
inxi uses 'semantic' version numbering, where the version numbers actually mean
something.
The version number follows these guidelines:
+
Using example 3.2.28-6
The first digit(s), "3", is a major version, and almost never changes. Only a
huge milestone, or if inxi reaches 3.9.xx, when it will simply move up to 4.0.0
just to keep it clean, would cause a change.
-The second digit(s), "2", means a new real feature has been added. Not a
-tweaked existing feature, an actual new feature, which usually also has a new
-argument option letter attached. The second number goes from 0 to 9, and then
-rolls over the first after 9. It could also be adding a very complicated
-expansion of existing features, like Wayland. It depends.
+The second digit(s), "2", means a new real feature has been added. Not a tweaked
+existing feature, an actual new feature, which usually also has a new argument
+option letter attached. The second number goes from 0 to 9, and then rolls over
+the first after 9.
-The third, "28", is for everything small, can cover bug fixes, tweaks to
-existing features to add support for something, pretty much anything where you
-want the end user to know that they are not up to date. The third goes from 0
-to 99, then rolls over the second.
+The third, "28", is for everything not covered by 1 and 2, can cover bug fixes,
+tweaks to existing features to add support for something, full on refactors of
+existing features, pretty much anything where you want the end user to know that
+they are not up to date. The third goes from 0 to 99, then rolls over the
+second.
The fourth, "6", is extra information about certain types of inxi updates. I
don't usually use this last one in master branch, but you will see it in
@@ -352,47 +459,68 @@ The fourth number, when used, will be alpha-numeric, a common version would be,
in say, branch one: 2.2.28-b1-02, in other words: branch 1 patch version 2.
In the past, now and then the 4th, or 'patch', number, was used in trunk/master
-branches of inxi, but I've pretty much stopped doing that because it's
+branches of inxi, but that practice has pretty much stopped because it's
confusing.
inxi does not use the fiction of date based versioning because that imparts no
useful information to the end user, when you look at say, 2.2.28, and you last
had 2.2.11, you can know with some certainty that inxi has no major new
-features, just fine tunings and bug fixes. And if you see one with 2.3.2, you
-will know that there is a new feature, almost, but not always, linked to one or
-more new line output items. Sometimes a fine tuning can be quite significant,
-sometimes it's a one line code fix.
+features, just refactors or expansion of existing logic, enhancements, fine
+tunings, and bug fixes. And if you see one with 2.3.2, you will know that there
+is a new feature, almost, but not always, linked to one or more new line output
+items. Sometimes a the changes in the third number can be quite significant,
+sometimes it's a one line code or bug fix.
A move to a new full version number, like the rewrite of inxi to Perl, would
-reflect in first version say, 2.9.01, then after a period of testing, where
-most little glitches are fixed, a move to 3.0.0. These almost never happen. I
-do not expect for example version 4.0 to ever happen after 3.0 (early 2018),
-unless so many new features are added that it actually hits 3.9, then it would
-roll over to 4.
+reflect in first version say, 2.9.01, then after a period of testing, where most
+little glitches are fixed, a move to 3.0.0. These almost never happen. I do not
+expect for example version 4.0 to ever happen after 3.0 (early 2018), unless so
+many new features are added that it actually hits 3.9, then it would roll over
+to 4.
-===============================================================================
+================================================================================
BSD / UNIX
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
BSD support is not as complete as GNU/Linux support due to the fact some of the
data simply is not available, or is structured in a way that makes it unique to
-each BSD. This fragmentation makes supporting BSDs far more difficult than it
-should be in the 21st century. The BSD support in inxi is an ongoing process,
-with more features being added as new data sources and types are discovered.
-
-Note that due to time/practicality constraints, in general, only the original
-BSD branches will be actively supported: FreeBSD+derived; OpenBSD+derived;
-NetBSD+derived. Other UNIX variants will generally only get the work required
-to make internal BSD flags get set and to remove visible output errors.
-
--------------------------------------------------------------------------------
+each BSD, or is difficult to process. This fragmentation makes supporting BSDs
+far more difficult than it should be in the 21st century.
+
+The BSD support in inxi is a slowly evolving process. Evolving in the strict
+technical sense of evolutionary fitness, following fitness for purpose, that is
+(like OpenBSD's focus on security and high quality code, for instance), not as
+in progressing forwards. Features are being added as new data sources and types
+are discovered, and others are being dropped, as prior data sources degenerate
+or mutate to a point where trying to deal with them stops being interesting.
+
+Once it starts growing evident that a particular branch has hit a dead end and
+no longer warrants the time required to follow it to its extinction, support
+will be reduced to basically maintenance mode. In other words, inxi follows this
+evolutionary process, and does not try to revive dead or dying branches, since
+that's a waste of time.
+
+Note that due to time/practicality constraints, in general, only the original
+BSD branches will be supported: OpenBSD+derived; FreeBSD+derived; NetBSD+derived
+(in that order of priority, with a steep curve down from first to last). With
+the caveat that since it's my time being volunteered here, if the BSD in
+question has basically no users, or has bad tools, or no usable tools, or
+inconsistent or unreliable tools, or bad / weak data, or, worst, no actual clear
+reason to exist, I'm not willing to spend time on it as a general rule.
+
+Other UNIX variants will generally only get the work required to make internal
+BSD flags get set and to remove visible output errors. I am not interested in
+them at all, zero. They are at this point basically historical artifacts, of
+interest only to computer museums as far as I'm concerned.
+
+--------------------------------------------------------------------------------
TRUE BSDs
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
All BSD issue reports unless trivial and obvious will require 1 of two things:
1. a full --debug 21 data dump so I don't have to spend days trying to get the
-information I need to resolve the issue file by painful file from the issue
+information I need to resolve the issue, file by painful file, from the issue
poster. This is only the start of the process, and realistically requires 2. to
complete it.
@@ -402,36 +530,58 @@ similar one.
Option 2 is far preferred because in terms of my finite time on this planet of
ours, the fact is, if I don't have direct (or SSH) access, I can't get much
-done, and the little I can get done will take 10 to 1000x longer than it
-should. That's my time spent (and sadly, with BSDs, largely lost), not yours.
+done, and the little I can get done will take 10 to 1000x longer than it should.
+That's my time spent (and sadly, with BSDs, largely wasted), not yours.
I decided I have to adopt this much more strict policy with BSDs after wasting
-untold hours on trying to get good BSD support, only to see that support break
-a few years down the road as the data inxi relied in changed structure or
-syntax, or the tools changed, or whatever else makes the BSDs such a challenge
-to support. In the end, I realized, the only BSDs that are well supported are
-ones that I have had direct access to for debugging and testing.
-
-I will always accept patches that are well done, if they do not break
-GNU/Linux, and extend BSD support, or add new BSD features, and follow the
-internal inxi logic, and aren't too long. inxi sets initial internal flags to
-identify that it is a BSD system vs a GNU/Linux system, and preloads some data
-structures for BSD use, so make sure you understand what inxi is doing before
-you get into it.
-
--------------------------------------------------------------------------------
+untold hours on trying to get good BSD support, only to see that support break a
+few years down the road as the data inxi relied on changed structure or syntax,
+or the tools changed, or whatever else makes the BSDs such a challenge to
+support. In the end, I realized, the only BSDs that are well supported are ones
+that I have had direct access to for debugging and testing.
+
+I will always accept patches that are well done, if they do not break GNU/Linux,
+and extend BSD support, or add new BSD features, and follow the internal inxi
+logic, and aren't too long. inxi sets initial internal flags to identify that it
+is a BSD system vs a GNU/Linux system, and preloads some data structures for BSD
+use, so make sure you understand what inxi is doing before you get into it.
+
+--------------------------------------------------------------------------------
APPLE CORPORATION OSX
--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
Non-free/libre OSX is in my view a BSD in name only. It is the least Unix-like
-operating system I've ever seen that claims to be a Unix, its tools are
-mutated, its data randomly and non-standardly organized, and it totally fails
-to respect the 'spirit' of Unix, even though it might pass some random tests
-that certify a system as a 'Unix'.
+operating system I've ever seen that claims to be a Unix, its tools are mutated,
+its data randomly and non-standardly organized, and it totally fails to respect
+the 'spirit' of Unix, even though it might pass some random tests that certify a
+system as a 'Unix'.
If you want me to use my time on OSX features or issues, you have to pay me,
because Apple is all about money, not freedom (that's what the 'free' in 'free
software' is referring to, not cost), and I'm not donating my finite time in
-support of non-free operating systems.
+support of non-free operating systems, particularly not one with a market
+capitalization hovering around 1 trillion dollars, with usually well north of
+100 billion dollars in liquid assetts.
+
+================================================================================
+MICROSOFT CORPORATION WINDOWS
+--------------------------------------------------------------------------------
+
+To be quite clear, support for Windows will never happen, I don't care about
+Windows, and don't want to waste a second of my time on it. I also don't care
+about cygwin issues, beyond maybe hyper basic issues that can be handled with a
+line or two of code. inxi isn't going to ruin itself by trying to handle the
+silly Microsoft path separator \, and obviously there's zero chance of my trying
+to support PowerShell or whatever else they come up with.
+
+While I would consider doing Apple stuff if you paid my hourly full market
+rates, in advance, I would not consider touching Windows for any amount of
+money. My best advice there is, fork inxi, and do it yourself if you want it.
+You'll soon run screaming from the project however, once you realize what a
+nightmare you've stepped into.
+
+If you are interested in something like inxi for Windows, I suggest, rather than
+forking inxi, you just start out from scratch, and build the features up one by
+one, that will lead to much better code.
### EOF ###
diff --git a/inxi b/inxi
index 277efa9..5edb0d2 100755
--- a/inxi
+++ b/inxi
@@ -1,11 +1,12 @@
#!/usr/bin/env perl
## infobash: Copyright (C) 2005-2007 Michiel de Boer aka locsmif
-## inxi: Copyright (C) 2008-2020 Harald Hope
-## Additional features (C) Scott Rogers - kde, cpu info
+## inxi: Copyright (C) 2008-2024 Harald Hope
+## Additional features (C) Scott Rogers - kde, cpu info
+## Parse::EDID (C): 2005-2010 by Mandriva SA, Pascal Rigaux, Anssi Hannula
## Further fixes (listed as known): Horst Tritremmel <hjt at sidux.com>
## Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch
-## Jarett.Stevens - dmidecode -M patch for older systems with the /sys
-##
+## Jarett.Stevens - dmidecode -M patch for older systems without /sys machine
+##
## License: GNU GPL v3 or greater
##
## You should have received a copy of the GNU General Public License
@@ -13,6 +14,8 @@
##
## If you don't understand what Free Software is, please read (or reread)
## this page: http://www.gnu.org/philosophy/free-sw.html
+##
+## DEVS: NOTE: geany/scite folding is picky. Leave 1 space after # or it breaks!
use strict;
use warnings;
@@ -20,89 +23,99 @@ use warnings;
use 5.008;
## Perl 7 things for testing: depend on Perl 5.032
-# use 5.032
+# use 5.034;
# use compat::perl5; # act like Perl 5's defaults
# no feature qw(indirect);
# no multidimensional;
-# no bareword::filehandle;
+# no bareword::filehandles;
-use Cwd qw(abs_path); # qw(abs_path);#abs_path realpath getcwd
+use Cwd qw(abs_path); # #abs_path realpath getcwd
use Data::Dumper qw(Dumper); # print_r
-use File::Find;
+$Data::Dumper::Sortkeys = 1;
+# NOTE: load in SystemDebugger unless encounter issues with require/import
+# use File::Find;
use File::stat; # needed for Xorg.0.log file mtime comparisons
use Getopt::Long qw(GetOptions);
-# Note: default auto_abbrev is enabled, that's fine
+# Note: default auto_abbrev is enabled
Getopt::Long::Configure ('bundling', 'no_ignore_case',
'no_getopt_compat', 'no_auto_abbrev','pass_through');
-use POSIX qw(uname strftime ttyname);
-# use feature qw(state);
+use POSIX qw(ceil uname strftime ttyname);
+# use bigint qw/hex/; # to handle large hex number warnings, but Perl 5.010 and later.
+# use Benchmark qw(:all);_
+# use Devel::Size qw(size total_size);
+# use feature qw(say state); # 5.10 or newer Perl
+
+### INITIALIZE VARIABLES ###
## INXI INFO ##
my $self_name='inxi';
-my $self_version='3.1.05';
-my $self_date='2020-07-27';
+my $self_version='3.3.33';
+my $self_date='2024-02-06';
my $self_patch='00';
## END INXI INFO ##
-### INITIALIZE VARIABLES ###
+my ($b_pledge,@pledges);
+if (eval {require OpenBSD::Pledge}){
+ OpenBSD::Pledge->import();
+ $b_pledge = 1;
+ # cpath/wpath: dir/files .inxi, --debug > 9, -c 9x, -w/W;
+ # dns/inet: ftp upload --debug > 20; exec/proc/rpath: critical;
+ # prot_exec: Perl import; getpw: perl getpwuid() -c 9x, Net::FTP --debug > 20;
+ # stdio: default; error: debugging pledge/perl
+ # tested. not required: mcast pf ps recvfd sendfd tmppath tty unix vminfo;
+ # Pledge removal: OptionsHandler::post_process() [dns,inet,cpath,getpw,wpath];
+ # SelectColors::set_selection() [getpw]
+ @pledges = qw(cpath dns exec getpw inet proc prot_exec rpath wpath);
+ pledge(@pledges);
+}
## Self data
-my ($self_path, $user_config_dir, $user_config_file,$user_data_dir);
+my ($fake_data_dir,$self_path,$user_config_dir,$user_config_file,$user_data_dir);
+
+## Hashes
+my (%alerts,%build_prop,%client,%colors,,%cpuinfo_machine,%comps,%disks_bsd,
+%dboot,%devices,%dl,%dmmapper,%force,%loaded,%mapper,%program_values,%ps_data,
+%risc,%service_tool,%show,%sysctl,%system_files,%usb,%windows);
+
+## System Arrays
+my (@cpuinfo,@dmi,@ifs,@ifs_bsd,@paths,@ps_aux,@ps_cmd,
+@sensors_exclude,@sensors_use,@uname);
+
+## Disk/Logical/Partition/RAID arrays
+my (@btrfs_raid,@glabel,@labels,@lsblk,@lvm,@lvm_raid,@md_raid,@partitions,
+@proc_partitions,@raw_logical,@soft_raid,@swaps,@uuids,@zfs_raid);
## Debuggers
-my $debug=0;
-my (@t0,$end,$start,$fh_l,$log_file); # log file handle, file
-my ($b_hires,$t1,$t2,$t3) = (0,0,0,0);
+my %debugger = ('level' => 0);
+my (@dbg,%fake,@t0);
+my ($b_hires,$b_log,$b_log_colors,$b_log_full);
+my ($end,$start,$fh_l,$log_file); # log file handle, file
+my ($t1,$t2,$t3) = (0,0,0); # timers
+## debug / temp tools
+$debugger{'sys'} = 1;
+$client{'test-konvi'} = 0;
+
# NOTE: redhat removed HiRes from Perl Core Modules.
if (eval {require Time::HiRes}){
Time::HiRes->import('gettimeofday','tv_interval','usleep');
$b_hires = 1;
}
@t0 = eval 'Time::HiRes::gettimeofday()' if $b_hires; # let's start it right away
-## Hashes
-my (%alerts,%client,%colors,%debugger,%dl,%files,%program_values,%rows,%system_files);
-
-## Arrays
-# ps_aux is full output, ps_cmd is only the last 10 columns to last
-my (@app,@dmesg_boot,@devices_audio,@devices_graphics,@devices_network,
-@devices_hwraid,@devices_timer,@dmi,@gpudata,@ifs,@ifs_bsd,
-@paths,@proc_partitions,@ps_aux,@ps_cmd,@ps_gui,
-@sysctl,@sysctl_battery,@sysctl_sensors,@sysctl_machine,@uname,@usb);
-## Disk arrays
-my (@dm_boot_disk,@dm_boot_optical,@glabel,@gpart,@hardware_raid,@labels,
-@lsblk,@partitions,@raid,@swaps,@sysctl_disks,@uuids);
-my @test = (0,0,0,0,0);
-
-## Booleans
-my ($b_admin,$b_arm,$b_bb_ps,$b_block_tool,$b_console_irc,
-$b_display,$b_dmesg_boot_check,$b_dmi,$b_dmidecode_force,
-$b_fake_bsd,$b_fake_dboot,$b_fake_dmidecode,$b_fake_pciconf,$b_fake_sysctl,
-$b_fake_usbdevs,$b_force_display,$b_gpudata,$b_irc,
-$b_log,$b_log_colors,$b_log_full,$b_man,$b_mem,$b_mips,$b_no_sudo,
-$b_pci,$b_pci_tool,$b_pkg,$b_ppc,$b_proc_partitions,$b_ps_gui,
-$b_root,$b_running_in_display,$b_skip_dig,
-$b_slot_tool,$b_soc_audio,$b_soc_gfx,$b_soc_net,$b_soc_timer,$b_sparc,
-$b_swaps,$b_sysctl,$b_usb,$b_usb_check,$b_usb_sys,$b_usb_tool,
-$b_wmctrl);
-## Disk checks
-my ($b_dm_boot_disk,$b_dm_boot_optical,$b_glabel,$b_hardware_raid,
-$b_label_uuid,$b_lsblk,$b_partitions,$b_raid,$b_smartctl);
-# initialize basic use features
-my %use = (
-'sysctl_disk' => 1, # unused currently
-'update' => 1, # switched off/on with maintainer config ALLOW_UPDATE
-'weather' => 1, # switched off/on with maintainer config ALLOW_WEATHER
-);
+
+## Booleans [busybox_ps not used actively]
+my ($b_admin,$b_android,$b_display,$b_irc,$b_root);
+
## System
-my ($bsd_type,$device_vm,$language,$os,$pci_tool,$wan_url) = ('','','','','','');
-my ($bits_sys,$cpu_arch);
-my ($cpu_sleep,$dl_timeout,$limit,$ps_cols,$ps_count) = (0.35,4,10,0,5);
+my ($bsd_type,$device_vm,$language,$os,$pci_tool) = ('','','','','');
+my ($wan_url) = ('');
+my ($bits_sys,$cpu_arch,$ppid);
+my ($cpu_sleep,$dl_timeout,$limit,$ps_count) = (0.35,4,10,5);
my $sensors_cpu_nu = 0;
-my ($dl_ua,$weather_source,$weather_unit) = ('s-tools/' . $self_name . '-',100,'mi');
+my ($weather_source,$weather_unit) = (100,'mi');
## Tools
-my ($display,$ftp_alt,$tty_session);
-my ($display_opt,$sudo) = ('','');
+my ($display,$ftp_alt);
+my ($display_opt,$sudoas) = ('','');
## Output
my $extra = 0;# supported values: 0-3
@@ -111,36 +124,40 @@ my $line1 = "-------------------------------------------------------------------
my $line2 = "======================================================================\n";
my $line3 = "----------------------------------------\n";
my ($output_file,$output_type) = ('','screen');
-my $prefix = 0; # for the primiary row hash key prefix
+my $prefix = 0; # for the primary row hash key prefix
-# these will assign a separator to non irc states. Important! Using ':' can
+## Initialize internal hashes
+# these assign a separator to non irc states. Important! Using ':' can
# trigger stupid emoticon. Note: SEP1/SEP2 from short form not used anymore.
# behaviors in output on IRC, so do not use those.
-my %sep = (
+my %sep = (
's1-irc' => ':',
's1-console' => ':',
's2-irc' => '',
's2-console' => ':',
);
-my %show;
#$show{'host'} = 1;
my %size = (
-'console' => 115,
+'console' => 80, # In display, orig: 115
# Default indentation level. NOTE: actual indent is 1 greater to allow for
# spacing
'indent' => 11,
-'indent-min' => 90,
+'indents' => 2,
'irc' => 100, # shorter because IRC clients have nick lists etc
-'max' => 0,
-'no-display' => 130,
-# these will be set dynamically in set_display_width()
-'term' => 80,
-'term-lines' => 100,
+'lines' => 1, # for active output line counter for -Y
+'max-cols' => 0,
+'max-join-list' => 30, # used in make_list_value() to add space after sep or not.
+'max-lines' => 0,
+'max-wrap' => 110,
+'no-display' => 100, # No Display, orig: 130
+# this will be set dynamically in set_display_size()
+'term-cols' => 80, # orig: 80
+'term-lines' => 40, # orig: 100
+);
+my %use = (
+'update' => 1, # switched off/on with maintainer config ALLOW_UPDATE
+'weather' => 1, # switched off/on with maintainer config ALLOW_WEATHER
);
-
-## debug / temp tools
-$debugger{'sys'} = 1;
-$client{'test-konvi'} = 0;
########################################################################
#### STARTUP
@@ -151,24 +168,24 @@ $client{'test-konvi'} = 0;
#### -------------------------------------------------------------------
sub main {
-# print Dumper \@ARGV;
+ # print Dumper \@ARGV;
eval $start if $b_log;
initialize();
## Uncomment these two values for start client debugging
- # $debug = 3; # 3 prints timers / 10 prints to log file
+ # $debugger{'level'} = 3; # 3 prints timers / 10 prints to log file
# set_debugger(); # for debugging of konvi and other start client issues
## legacy method
- #my $ob_start = StartClient->new();
+ # my $ob_start = StartClient->new();
#$ob_start->get_client_data();
- StartClient::get_client_data();
- # print_line( Dumper \%client);
- get_options();
+ StartClient::set();
+ # print_line(Dumper \%client);
+ OptionsHandler::get();
set_debugger(); # right after so it's set
- check_tools();
+ CheckTools::set();
set_colors();
set_sep();
# print download_file('stdout','https://') . "\n";
- generate_lines();
+ OutputGenerator::generate();
eval $end if $b_log;
cleanup();
# weechat's executor plugin forced me to do this, and rightfully so,
@@ -181,165 +198,222 @@ sub main {
#### -------------------------------------------------------------------
sub initialize {
- set_os();
set_path();
set_user_paths();
set_basics();
- system_files('set');
- get_configs();
+ set_system_files();
+ set_os();
+ Configs::set();
# set_downloader();
- set_display_width('live');
-}
-
-sub check_tools {
- my ($action,$program,$message,@data,%commands,%hash);
- if ( $b_dmi ){
- $action = 'use';
- if ($program = check_program('dmidecode')) {
- @data = grabber("$program -t chassis -t baseboard -t processor 2>&1");
- if (scalar @data < 15){
- if ($b_root) {
- foreach (@data){
- if ($_ =~ /No SMBIOS/i){
- $action = 'smbios';
- last;
- }
- elsif ($_ =~ /^\/dev\/mem: Operation/i){
- $action = 'no-data';
- last;
- }
- else {
- $action = 'unknown-error';
- last;
- }
- }
+ set_display_size();
+}
+
+## CheckTools
+{
+package CheckTools;
+my (%commands);
+
+sub set {
+ eval $start if $b_log;
+ set_commands();
+ my ($action,$program,$message,@data);
+ foreach my $test (keys %commands){
+ ($action,$program) = ('use','');
+ $message = main::message('tool-present');
+ if ($commands{$test}->[1] && (
+ ($commands{$test}->[1] eq 'linux' && $os ne 'linux') ||
+ ($commands{$test}->[1] eq 'bsd' && $os eq 'linux'))){
+ $action = 'platform';
+ }
+ elsif ($program = main::check_program($test)){
+ # > 0 means error in shell
+ # my $cmd = "$program $commands{$test} >/dev/null";
+ # print "$cmd\n";
+ $pci_tool = $test if $test =~ /pci/;
+ # this test is not ideal because other errors can make program fail, but
+ # we can't test for root since could be say, wheel permissions needed
+ if ($commands{$test}->[0] eq 'exec-sys'){
+ $action = 'permissions' if system("$program $commands{$test}->[2] >/dev/null 2>&1");
+ }
+ elsif ($commands{$test}->[0] eq 'exec-string'){
+ @data = main::grabber("$program $commands{$test}->[2] 2>&1");
+ # dmidecode errors are so specific it gets its own section
+ # also sets custom dmidecode error messages
+ if ($test eq 'dmidecode'){
+ $action = set_dmidecode(\@data) if scalar @data < 15;
}
- else {
- if (grep { $_ =~ /^\/dev\/mem: Permission/i } @data){
- $action = 'permissions';
- }
- else {
- $action = 'unknown-error';
- }
+ elsif (grep { $_ =~ /$commands{$test}->[3]/i } @data){
+ $action = 'permissions';
}
}
}
else {
$action = 'missing';
}
- %hash = (
- 'dmidecode' => {
- 'action' => $action,
- 'missing' => 'Required program dmidecode not available',
- 'permissions' => 'Unable to run dmidecode. Root privileges required.',
- 'smbios' => 'No SMBIOS data for dmidecode to process',
- 'no-data' => 'dmidecode is not allowed to read /dev/mem',
- 'unknown-error' => 'dmidecode was unable to generate data',
- },
- );
- %alerts = (%alerts, %hash);
- }
- # note: gnu/linux has sysctl so it may be used that for something if present
- # there is lspci for bsds so doesn't hurt to check it
- if ($b_pci || $b_sysctl){
- if (!$bsd_type){
- if ($b_pci ){
- %hash = ('lspci' => '-n',);
- %commands = (%commands,%hash);
- }
+ $alerts{$test}->{'action'} = $action;
+ $alerts{$test}->{'path'} = $program;
+ if ($action eq 'missing'){
+ $alerts{$test}->{'message'} = main::message('tool-missing-recommends',"$test");
}
- else {
- if ($b_pci ){
- %hash = ('pciconf' => '-l','pcictl' => 'list', 'pcidump' => '');
- %commands = (%commands,%hash);
+ elsif ($action eq 'permissions'){
+ $alerts{$test}->{'message'} = main::message('tool-permissions',"$test");
+ }
+ elsif ($action eq 'platform'){
+ $alerts{$test}->{'message'} = main::message('tool-missing-os', $uname[0] . " $test");
+ }
+ }
+ print Data::Dumper::Dumper \%alerts if $dbg[25];
+ set_fake_bsd_tools() if $fake{'bsd'};
+ eval $end if $b_log;
+}
+
+sub set_dmidecode {
+ my ($data) = @_;
+ my $action = 'use';
+ if ($b_root){
+ foreach (@$data){
+ # don't need first line or scanning /dev/mem lines
+ if (/^(# dmi|Scanning)/){
+ next;
}
- if ($b_sysctl ){
- # note: there is a case of kernel.osrelease but it's a linux distro
- %hash = ('sysctl' => 'kern.osrelease',);
- %commands = (%commands,%hash);
+ elsif ($_ =~ /No SMBIOS/i){
+ $action = 'smbios';
+ last;
}
- }
- foreach ( keys %commands ){
- $action = 'use';
- if ($program = check_program($_)) {
- # > 0 means error in shell
- #my $cmd = "$program $commands{$_} >/dev/null";
- #print "$cmd\n";
- $pci_tool = $_ if $_ =~ /pci/;
- $action = 'permissions' if system("$program $commands{$_} >/dev/null 2>&1");
+ elsif ($_ =~ /^\/dev\/mem: Operation/i){
+ $action = 'no-data';
+ last;
}
else {
- $action = 'missing';
- }
- %hash = (
- $_ => {
- 'action' => $action,
- 'missing' => "Missing system tool: $_. Output will be incomplete",
- 'permissions' => "Unable to run $_. Root required?",
- },
- );
- %alerts = (%alerts, %hash);
+ $action = 'unknown-error';
+ last;
+ }
}
}
- %commands = ();
- if ( $show{'sensor'} ){
- %commands = ('sensors' => 'linux',);
+ else {
+ if (grep {$_ =~ /(^\/dev\/mem: Permission|Permission denied)/i } @$data){
+ $action = 'permissions';
+ }
+ else {
+ $action = 'unknown-error';
+ }
}
- # note: lsusb ships in FreeBSD ports sysutils/usbutils
- if ( $b_usb ){
- %hash = ('lsusb' => 'all',);
- %commands = (%commands,%hash);
- %hash = ('usbdevs' => 'bsd',);
- %commands = (%commands,%hash);
+ if ($action ne 'use' && $action ne 'permissions'){
+ if ($action eq 'smbios'){
+ $alerts{'dmidecode'}->{'message'} = main::message('dmidecode-smbios');
+ }
+ elsif ($action eq 'no-data'){
+ $alerts{'dmidecode'}->{'message'} = main::message('dmidecode-dev-mem');
+ }
+ elsif ($action eq 'unknown-error'){
+ $alerts{'dmidecode'}->{'message'} = main::message('tool-unknown-error','dmidecode');
+ }
+ }
+ return $action;
+}
+
+sub set_commands {
+ # note: gnu/linux has sysctl so it may be used that for something if present
+ # there is lspci for bsds so doesn't hurt to check it
+ if (!$bsd_type){
+ if ($use{'pci'}){
+ $commands{'lspci'} = ['exec-sys','','-n'];
+ }
+ if ($use{'logical'}){
+ $commands{'lvs'} = ['exec-sys','',''];
+ }
+ if ($use{'udevadm'}){
+ $commands{'udevadm'} = ['missing','',''];
+ }
+ }
+ else {
+ if ($use{'pci'}){
+ $commands{'pciconf'} = ['exec-sys','','-l'];
+ $commands{'pcictl'} = ['exec-sys','',' pci0 list'];
+ $commands{'pcidump'} = ['exec-sys','',''];
+ }
+ if ($use{'sysctl'}){
+ # note: there is a case of kernel.osrelease but it's a linux distro
+ $commands{'sysctl'} = ['exec-sys','','kern.osrelease'];
+ }
+ if ($use{'bsd-partition'}){
+ $commands{'bioctl'} = ['missing','',''];
+ $commands{'disklabel'} = ['missing','',''];
+ $commands{'fdisk'} = ['missing','',''];
+ $commands{'gpart'} = ['missing','',''];
+ }
+ }
+ if ($use{'dmidecode'}){
+ $commands{'dmidecode'} = ['exec-string','','-t chassis -t baseboard -t processor',''];
+ }
+ if ($use{'usb'}){
+ # note: lsusb ships in FreeBSD ports sysutils/usbutils
+ $commands{'lsusb'} = ['missing','','',''];
+ # we want these set for various null bsd data tests
+ $commands{'usbconfig'} = ['exec-string','bsd','list','permissions'];
+ $commands{'usbdevs'} = ['missing','bsd','',''];
+ }
+ if ($show{'bluetooth'}){
+ $commands{'bluetoothctl'} = ['missing','linux','',''];
+ # bt-adapter hangs when bluetooth service is disabled
+ $commands{'bt-adapter'} = ['missing','linux','',''];
+ # btmgmt enters its own shell with no options given
+ $commands{'btmgmt'} = ['missing','linux','',''];
+ $commands{'hciconfig'} = ['missing','linux','',''];
+ }
+ if ($show{'sensor'}){
+ $commands{'sensors'} = ['missing','linux','',''];
}
if ($show{'ip'} || ($bsd_type && $show{'network-advanced'})){
- %hash = (
- 'ip' => 'linux',
- 'ifconfig' => 'all',
- );
- %commands = (%commands,%hash);
+ $commands{'ip'} = ['missing','linux','',''];
+ $commands{'ifconfig'} = ['missing','','',''];
}
# can't check permissions since we need to know the partition/disc
- if ($b_block_tool){
- %hash = (
- 'blockdev' => 'linux',
- 'lsblk' => 'linux',
- );
- %commands = (%commands,%hash);
+ if ($use{'block-tool'}){
+ $commands{'blockdev'} = ['missing','linux','',''];
+ $commands{'lsblk'} = ['missing','linux','',''];
}
- if ($b_smartctl){
- %hash = (
- 'smartctl' => 'all',
- );
- %commands = (%commands,%hash);
+ if ($use{'btrfs'}){
+ $commands{'btrfs'} = ['missing','linux','',''];
}
- foreach ( keys %commands ){
- $action = 'use';
- $message = 'Present and working';
- if ( ($commands{$_} eq 'linux' && $os ne 'linux' ) || ($commands{$_} eq 'bsd' && $os eq 'linux' ) ){
- $message = "No " . ucfirst($os) . " support. Is a comparable $_ tool available?";
- $action = 'platform';
- }
- elsif (!check_program($_)){
- $message = "Required tool $_ not installed. Check --recommends";
- $action = 'missing';
- }
- %hash = (
- $_ => {
- 'action' => $action,
- 'missing' => $message,
- 'platform' => $message,
- },
- );
- %alerts = (%alerts, %hash);
+ if ($use{'mdadm'}){
+ $commands{'mdadm'} = ['missing','linux','',''];
+ }
+ if ($use{'smartctl'}){
+ $commands{'smartctl'} = ['missing','','',''];
+ }
+ if ($show{'unmounted'}){
+ $commands{'disklabel'} = ['missing','bsd','xx'];
+ }
+}
+
+# only for dev/debugging BSD
+sub set_fake_bsd_tools {
+ $system_files{'dmesg-boot'} = '/var/run/dmesg.boot' if $fake{'dboot'};
+ $alerts{'sysctl'}->{'action'} = 'use' if $fake{'sysctl'};
+ if ($fake{'pciconf'} || $fake{'pcictl'} || $fake{'pcidump'}){
+ $alerts{'pciconf'}->{'action'} = 'use' if $fake{'pciconf'};
+ $alerts{'pcictl'}->{'action'} = 'use' if $fake{'pcictl'};
+ $alerts{'pcidump'}->{'action'} = 'use' if $fake{'pcidump'};
+ $alerts{'lspci'} = {
+ 'action' => 'missing',
+ 'message' => 'Required program lspci not available',
+ };
+ }
+ if ($fake{'usbconfig'} || $fake{'usbdevs'}){
+ $alerts{'usbconfig'}->{'action'} = 'use' if $fake{'usbconfig'};
+ $alerts{'usbdevs'}->{'action'} = 'use' if $fake{'usbdevs'};
+ $alerts{'lsusb'} = {
+ 'action' => 'missing',
+ 'message' => 'Required program lsusb not available',
+ };
+ }
+ if ($fake{'disklabel'}){
+ $alerts{'disklabel'}->{'action'} = 'use';
}
- # print Dumper \%alerts;
-
- set_fake_tools() if $b_fake_bsd;
}
-# args: 1 - desktop/app command for --version; 2 - search string;
-# 3 - space print number; 4 - [optional] version arg: -v, version, etc
-# 5 - [optional] exit first find 0/1; 6 - [optional] 0/1 stderr output
+}
+
sub set_basics {
### LOCALIZATION - DO NOT CHANGE! ###
# set to default LANG to avoid locales errors with , or .
@@ -348,15 +422,15 @@ sub set_basics {
$ENV{'LC_ALL'}='C';
# remember, perl uses the opposite t/f return as shell!!!
# some versions of busybox do not have tty, like openwrt
- $b_irc = ( check_program('tty') && system('tty >/dev/null') ) ? 1 : 0;
+ $b_irc = (check_program('tty') && system('tty >/dev/null')) ? 1 : 0;
# print "birc: $b_irc\n";
- $b_display = ( $ENV{'DISPLAY'} ) ? 1 : 0;
+ $b_display = ($ENV{'DISPLAY'}) ? 1 : 0;
$b_root = $< == 0; # root UID 0, all others > 0
$dl{'dl'} = 'curl';
$dl{'curl'} = 1;
+ $dl{'fetch'} = 1;
$dl{'tiny'} = 1; # note: two modules needed, tested for in set_downloader
$dl{'wget'} = 1;
- $dl{'fetch'} = 1;
$client{'console-irc'} = 0;
$client{'dcop'} = (check_program('dcop')) ? 1 : 0;
$client{'qdbus'} = (check_program('qdbus')) ? 1 : 0;
@@ -365,94 +439,114 @@ sub set_basics {
$client{'name-print'} = '';
$client{'su-start'} = ''; # shows sudo/su
$client{'version'} = '';
+ $client{'whoami'} = getpwuid($<) || '';
$colors{'default'} = 2;
$show{'partition-sort'} = 'id'; # sort order for partitions
-}
-
-# args: $1 - default OR override default cols max integer count. $_[0]
-# is the display width override.
-sub set_display_width {
- my ($width) = @_;
- if ( $width eq 'live' ){
- ## sometimes tput will trigger an error (mageia) if irc client
- if ( ! $b_irc ){
- if ( check_program('tput') ) {
- # trips error if use qx()...
- chomp($size{'term'}=qx{tput cols});
- chomp($size{'term-lines'}=qx{tput lines});
- $size{'term-cols'} = $size{'term'};
- }
- # print "tc: $size{'term'} cmc: $size{'console'}\n";
- # double check, just in case it's missing functionality or whatever
- if ( $size{'term'} == 0 || !is_int($size{'term'}) ){
- $size{'term'}=80;
- # we'll be using this for terminal dimensions later so don't set default.
- # $size{'term-lines'}=100;
- }
- }
- # this lets you set different size for in or out of display server
- if ( ! $b_running_in_display && $size{'no-display'} ){
- $size{'console'}=$size{'no-display'};
- }
- # term_cols is set in top globals, using tput cols
- # print "tc: $size{'term'} cmc: $size{'console'}\n";
- if ( $size{'term'} < $size{'console'} ){
- $size{'console'}=$size{'term'};
- }
- # adjust, some terminals will wrap if output cols == term cols
- $size{'console'}=( $size{'console'} - 2 );
- # echo cmc: $size{'console'}
- # comes after source for user set stuff
- if ( ! $b_irc ){
- $size{'max'}=$size{'console'};
- }
- else {
- $size{'max'}=$size{'irc'};
+ @raw_logical = (0,0,0);
+ $ppid = getppid();
+ # seen case where $HOME not set
+ if (!$ENV{'HOME'}){
+ if (my $who = qx(whoami)){
+ if (-d "/$who"){
+ $ENV{'HOME'} = "/$who";} # root
+ elsif (-d "/home/$who"){
+ $ENV{'HOME'} = "/home/$who";}
+ elsif (-d "/usr/home/$who"){
+ $ENV{'HOME'} = "/usr/home/$who";}
+ # else give up, we're not going to have any luck here
}
}
- else {
- $size{'max'}=$width;
- }
- # print "tc: $size{'term'} cmc: $size{'console'} cm: $size{'max'}\n";
}
-# only for dev/debugging BSD
-sub set_fake_tools {
- $system_files{'dmesg-boot'} = '/var/run/dmesg.boot' if $b_fake_dboot;
- $alerts{'pciconf'} = ({'action' => 'use'}) if $b_fake_pciconf;
- $alerts{'sysctl'} = ({'action' => 'use'}) if $b_fake_sysctl;
- if ($b_fake_usbdevs ){
- $alerts{'usbdevs'} = ({'action' => 'use'});
- $alerts{'lsusb'} = ({
- 'action' => 'missing',
- 'missing' => 'Required program lsusb not available',
- });
+sub set_display_size {
+ ## sometimes tput will trigger an error (mageia) if irc client
+ if (!$b_irc){
+ if (my $program = check_program('tput')){
+ # Arch urxvt: 'tput: unknown terminal "rxvt-unicode-256color"'
+ # trips error if use qx(); in FreeBSD, if you use 2>/dev/null
+ # it makes default value 80x24, who knows why?
+ chomp($size{'term-cols'} = qx{$program cols});
+ chomp($size{'term-lines'} = qx{$program lines});
+ }
+ # print "tc: $size{'term-cols'} cmc: $size{'console'}\n";
+ # double check, just in case it's missing functionality or whatever
+ if (!is_int($size{'term-cols'} || $size{'term-cols'} == 0)){
+ $size{'term-cols'} = 80;
+ }
+ if (!is_int($size{'term-lines'} || $size{'term-lines'} == 0)){
+ $size{'term-lines'} = 24;
+ }
+ }
+ # this lets you set different size for in or out of display server
+ if (!$b_display && $size{'no-display'}){
+ $size{'console'} = $size{'no-display'};
+ }
+ # term_cols is set in top globals, using tput cols
+ # print "tc: $size{'term-cols'} cmc: $size{'console'}\n";
+ if ($size{'term-cols'} < $size{'console'}){
+ $size{'console'} = $size{'term-cols'};
+ }
+ # adjust, some terminals will wrap if output cols == term cols
+ $size{'console'} = ($size{'console'} - 1);
+ # echo cmc: $size{'console'}
+ # comes after source for user set stuff
+ if (!$b_irc){
+ $size{'max-cols'} = $size{'console'};
+ }
+ else {
+ $size{'max-cols'} = $size{'irc'};
}
+ # for -V/-h overrides
+ $size{'max-cols-basic'} = $size{'max-cols'};
+ # print "tc: $size{'term-cols'} cmc: $size{'console'} cm: $size{'max-cols'}\n";
}
-# NOTE: most tests internally are against !$bsd_type
sub set_os {
@uname = uname();
$os = lc($uname[0]);
$cpu_arch = lc($uname[-1]);
- if ($cpu_arch =~ /arm|aarch/){$b_arm = 1}
- elsif ($cpu_arch =~ /mips/) {$b_mips = 1}
- elsif ($cpu_arch =~ /power|ppc/) {$b_ppc = 1}
- elsif ($cpu_arch =~ /sparc/) {$b_sparc = 1}
- # aarch32 mips32 intel/amd handled in cpu
- if ($cpu_arch =~ /(armv[1-7]|32|sparc_v9)/){
+ if ($cpu_arch =~ /arm|aarch/){
+ $risc{'arm'} = 1;
+ $risc{'id'} = 'arm';}
+ elsif ($cpu_arch =~ /mips/){
+ $risc{'mips'} = 1;
+ $risc{'id'} = 'mips';}
+ elsif ($cpu_arch =~ /power|ppc/){
+ $risc{'ppc'} = 1;
+ $risc{'id'} = 'ppc';}
+ elsif ($cpu_arch =~ /riscv/){
+ $risc{'riscv'} = 1;
+ $risc{'id'} = 'riscv';}
+ elsif ($cpu_arch =~ /(sparc|sun4[uv])/){
+ $risc{'sparc'} = 1;
+ $risc{'id'} = 'sparc';}
+ # aarch32 mips32, i386. centaur/via/intel/amd handled in cpu
+ if ($cpu_arch =~ /(armv[1-7]|32|[23456]86)/){
$bits_sys = 32;
}
- elsif ($cpu_arch =~ /(alpha|64|e2k)/){
+ elsif ($cpu_arch =~ /(alpha|64|e2k|sparc_v9|sun4[uv]|ultrasparc)/){
$bits_sys = 64;
+ # force to string e2k, and also in case we need that ID changed
+ $cpu_arch = 'elbrus' if $cpu_arch =~ /e2k|elbrus/;
+ }
+ # set some less common scenarios
+ if ($os =~ /cygwin/){
+ $windows{'cygwin'} = 1;
+ }
+ elsif (-e '/usr/lib/wsl/drivers'){
+ $windows{'wsl'} = 1;
+ }
+ elsif (-e '/system/build.prop'){
+ $b_android = 1;
}
- if ( $os =~ /(aix|bsd|cosix|dragonfly|darwin|hp-?ux|indiana|irix|sunos|solaris|ultrix|unix)/ ){
- if ( $os =~ /openbsd/ ){
+ if ($os =~ /(aix|bsd|cosix|dragonfly|darwin|hp-?ux|indiana|illumos|irix|sunos|solaris|ultrix|unix)/){
+ if ($os =~ /openbsd/){
$os = 'openbsd';
}
elsif ($os =~ /darwin/){
$os = 'darwin';
}
+ # NOTE: most tests internally are against !$bsd_type
if ($os =~ /kfreebsd/){
$bsd_type = 'debian-bsd';
}
@@ -462,30 +556,33 @@ sub set_os {
}
}
-# This data is hard set top of program but due to a specific project's
-# foolish idea that ignoring the FSH totally is somehow a positive step
-# forwards for free software, we also have to padd the results with PATH.
+# Sometimes users will have more PATHs local to their setup, so we want those
+# too.
sub set_path {
# Extra path variable to make execute failures less likely, merged below
my (@path);
# NOTE: recent Xorg's show error if you try /usr/bin/Xorg -version but work
# if you use the /usr/lib/xorg-server/Xorg path.
- @paths = qw(/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin);
- @path = split /:/, $ENV{'PATH'} if $ENV{'PATH'};
+ my @test = qw(/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin
+ /usr/X11R6/bin);
+ foreach (@test){
+ push(@paths,$_) if -d $_;
+ }
+ @path = split(':', $ENV{'PATH'}) if $ENV{'PATH'};
# print "paths: @paths\nPATH: $ENV{'PATH'}\n";
# Create a difference of $PATH and $extra_paths and add that to $PATH:
- foreach my $id (@path) {
- if ( !(grep { /^$id$/ } @paths) && $id !~ /(game)/ ){
- push @paths, $id;
+ foreach my $id (@path){
+ if (-d $id && !(grep {/^$id$/} @paths) && $id !~ /(game)/){
+ push(@paths, $id);
}
}
- # print "paths: @paths\n";
+ # print "paths: \n", join("\n", @paths),"\n";
}
sub set_sep {
- if ( $b_irc ){
+ if ($b_irc){
# too hard to read if no colors, so force that for users on irc
- if ($colors{'scheme'} == 0 ){
+ if ($colors{'scheme'} == 0){
$sep{'s1'} = $sep{'s1-console'};
$sep{'s2'} = $sep{'s2-console'};
}
@@ -501,142 +598,141 @@ sub set_sep {
}
# Important: -n makes it non interactive, no prompt for password
-# only use sudo if not root, -n option requires sudo -V 1.7 or greater.
+# only use doas/sudo if not root, -n option requires sudo -V 1.7 or greater.
# for some reason sudo -n with < 1.7 in Perl does not print to stderr
# sudo will just error out which is the safest course here for now,
# otherwise that interactive sudo password thing is too annoying
sub set_sudo {
- if (!$b_root && !$b_no_sudo && (my $path = main::check_program('sudo'))) {
- my @data = program_data('sudo');
- $data[1] =~ s/^([0-9]+\.[0-9]+).*/$1/;
- #print "sudo v: $data[1]\n";
- $sudo = "$path -n " if is_numeric($data[1]) && $data[1] >= 1.7;
+ if (!$b_root){
+ my ($path);
+ if (!$force{'no-doas'} && ($path = check_program('doas'))){
+ $sudoas = "$path -n ";
+ }
+ elsif (!$force{'no-sudo'} && ($path = check_program('sudo'))){
+ my @data = ProgramData::full('sudo');
+ $data[1] =~ s/^([0-9]+\.[0-9]+).*/$1/;
+ # print "sudo v: $data[1]\n";
+ $sudoas = "$path -n " if is_numeric($data[1]) && $data[1] >= 1.7;
+ }
+ }
+}
+
+sub set_system_files {
+ my %files = (
+ 'asound-cards' => '/proc/asound/cards',
+ 'asound-modules' => '/proc/asound/modules',
+ 'asound-version' => '/proc/asound/version',
+ 'dmesg-boot' => '/var/run/dmesg.boot',
+ 'proc-cmdline' => '/proc/cmdline',
+ 'proc-cpuinfo' => '/proc/cpuinfo',
+ 'proc-mdstat' => '/proc/mdstat',
+ 'proc-meminfo' => '/proc/meminfo',
+ 'proc-modules' => '/proc/modules', # not used
+ 'proc-mounts' => '/proc/mounts',# not used
+ 'proc-partitions' => '/proc/partitions',
+ 'proc-scsi' => '/proc/scsi/scsi',
+ 'proc-version' => '/proc/version',
+ # note: 'xorg-log' is set in set_xorg_log() only if -G is triggered
+ );
+ foreach (keys %files){
+ $system_files{$_} = (-e $files{$_}) ? $files{$_} : '';
}
}
sub set_user_paths {
- my ( $b_conf, $b_data );
+ my ($b_conf,$b_data);
# this needs to be set here because various options call the parent
# initialize function directly.
$self_path = $0;
$self_path =~ s/[^\/]+$//;
# print "0: $0 sp: $self_path\n";
-
- if ( defined $ENV{'XDG_CONFIG_HOME'} && $ENV{'XDG_CONFIG_HOME'} ){
+ # seen case where $HOME not set
+ if ($ENV{'XDG_CONFIG_HOME'}){
$user_config_dir=$ENV{'XDG_CONFIG_HOME'};
$b_conf=1;
}
- elsif ( -d "$ENV{'HOME'}/.config" ){
+ elsif (-d "$ENV{'HOME'}/.config"){
$user_config_dir="$ENV{'HOME'}/.config";
$b_conf=1;
}
else {
$user_config_dir="$ENV{'HOME'}/.$self_name";
}
- if ( defined $ENV{'XDG_DATA_HOME'} && $ENV{'XDG_DATA_HOME'} ){
+ if ($ENV{'XDG_DATA_HOME'}){
$user_data_dir="$ENV{'XDG_DATA_HOME'}/$self_name";
$b_data=1;
}
- elsif ( -d "$ENV{'HOME'}/.local/share" ){
+ elsif (-d "$ENV{'HOME'}/.local/share"){
$user_data_dir="$ENV{'HOME'}/.local/share/$self_name";
$b_data=1;
}
else {
$user_data_dir="$ENV{'HOME'}/.$self_name";
}
- # note, this used to be created/checked in specific instance, but we'll just do it
- # universally so it's done at script start.
- if ( ! -d $user_data_dir ){
+ # note, this used to be created/checked in specific instance, but we'll just
+ # do it universally so it's done at script start.
+ if (! -d $user_data_dir){
mkdir $user_data_dir;
# system "echo", "Made: $user_data_dir";
}
- if ( $b_conf && -f "$ENV{'HOME'}/.$self_name/$self_name.conf" ){
- #system 'mv', "-f $ENV{'HOME'}/.$self_name/$self_name.conf", $user_config_dir;
+ if ($b_conf && -f "$ENV{'HOME'}/.$self_name/$self_name.conf"){
+ # system 'mv', "-f $ENV{'HOME'}/.$self_name/$self_name.conf", $user_config_dir;
# print "WOULD: Moved $self_name.conf from $ENV{'HOME'}/.$self_name to $user_config_dir\n";
}
- if ( $b_data && -d "$ENV{'HOME'}/.$self_name" ){
- #system 'mv', '-f', "$ENV{'HOME'}/.$self_name/*", $user_data_dir;
- #system 'rm', '-Rf', "$ENV{'HOME'}/.$self_name";
+ if ($b_data && -d "$ENV{'HOME'}/.$self_name"){
+ # system 'mv', '-f', "$ENV{'HOME'}/.$self_name/*", $user_data_dir;
+ # system 'rm', '-Rf', "$ENV{'HOME'}/.$self_name";
# print "WOULD: Moved data dir $ENV{'HOME'}/.$self_name to $user_data_dir\n";
}
+ $fake_data_dir = "$ENV{'HOME'}/bin/scripts/inxi/data";
$log_file="$user_data_dir/$self_name.log";
- #system 'echo', "$ENV{'HOME'}/.$self_name/* $user_data_dir";
+ # system 'echo', "$ENV{'HOME'}/.$self_name/* $user_data_dir";
# print "scd: $user_config_dir sdd: $user_data_dir \n";
}
-# args: 1: set|hash key to return either null or path
-sub system_files {
- my ($file) = @_;
- if ( $file eq 'set'){
- %files = (
- 'asound-cards' => '/proc/asound/cards',
- 'asound-modules' => '/proc/asound/modules',
- 'asound-version' => '/proc/asound/version',
- 'cmdline' => '/proc/cmdline',
- 'cpuinfo' => '/proc/cpuinfo',
- 'dmesg-boot' => '/var/run/dmesg.boot',
- 'lsb-release' => '/etc/lsb-release',
- 'mdstat' => '/proc/mdstat',
- 'meminfo' => '/proc/meminfo',
- 'modules' => '/proc/modules',
- 'mounts' => '/proc/mounts',
- 'os-release' => '/etc/os-release',
- 'partitions' => '/proc/partitions',
- 'scsi' => '/proc/scsi/scsi',
- 'version' => '/proc/version',
- # note: 'xorg-log' is set only if -G is triggered
- );
- foreach ( keys %files ){
- $system_files{$_} = ( -e $files{$_} ) ? $files{$_} : '';
- }
- }
- else {
- return $system_files{$file};
- }
-}
sub set_xorg_log {
eval $start if $b_log;
my (@temp,@x_logs);
my ($file_holder,$time_holder,$x_mtime) = ('',0,0);
# NOTE: other variations may be /var/run/gdm3/... but not confirmed
- # we are just going to get all the Xorg logs we can find, and not worry about
- # which is 'right'.
- @temp = globber('/var/log/Xorg.*.log');
- push @x_logs, @temp if @temp;
+ # worry about we are just going to get all the Xorg logs we can find,
+ # and not which is 'right'. Xorg was XFree86 earlier, only in /var/log.
+ @temp = globber('/var/log/{Xorg,XFree86}.*.log');
+ push(@x_logs, @temp) if @temp;
@temp = globber('/var/lib/gdm/.local/share/xorg/Xorg.*.log');
- push @x_logs, @temp if @temp;
+ push(@x_logs, @temp) if @temp;
@temp = globber($ENV{'HOME'} . '/.local/share/xorg/Xorg.*.log',);
- push @x_logs, @temp if @temp;
+ push(@x_logs, @temp) if @temp;
# root will not have a /root/.local/share/xorg directory so need to use a
# user one if we can find one.
if ($b_root){
@temp = globber('/home/*/.local/share/xorg/Xorg.*.log');
- push @x_logs, @temp if @temp;
+ push(@x_logs, @temp) if @temp;
}
foreach (@x_logs){
if (-r $_){
my $src_info = File::stat::stat("$_");
- #print "$_\n";
+ # print "$_\n";
if ($src_info){
$x_mtime = $src_info->mtime;
# print $_ . ": $x_time" . "\n";
- if ($x_mtime > $time_holder ){
+ if ($x_mtime > $time_holder){
$time_holder = $x_mtime;
$file_holder = $_;
}
}
}
}
- if ( !$file_holder && check_program('xset') ){
+ if (!$file_holder && check_program('xset')){
my $data = qx(xset q 2>/dev/null);
- foreach ( split /\n/, $data){
+ foreach (split('\n', $data)){
if ($_ =~ /Log file/i){
$file_holder = get_piece($_,3);
last;
}
}
}
- print "Xorg log file: $file_holder\nLast modified: $time_holder\n" if $test[14];
+ print "Xorg log file: $file_holder\nLast modified: $time_holder\n" if $dbg[14];
log_data('data',"Xorg log file: $file_holder") if $b_log;
$system_files{'xorg-log'} = $file_holder;
eval $end if $b_log;
@@ -650,49 +746,49 @@ sub set_xorg_log {
#### COLORS
#### -------------------------------------------------------------------
-## arg: 1 - the type of action, either integer, count, or full
+## args: 0: the type of action, either integer, count, or full
sub get_color_scheme {
- my ($type) = @_;
eval $start if $b_log;
- my @color_schemes = (
- [qw(EMPTY EMPTY EMPTY )],
- [qw(NORMAL NORMAL NORMAL )],
+ my ($type) = @_;
+ my $color_schemes = [
+ [qw(EMPTY EMPTY EMPTY)],
+ [qw(NORMAL NORMAL NORMAL)],
# for dark OR light backgrounds
[qw(BLUE NORMAL NORMAL)],
- [qw(BLUE RED NORMAL )],
- [qw(CYAN BLUE NORMAL )],
+ [qw(BLUE RED NORMAL)],
+ [qw(CYAN BLUE NORMAL)],
[qw(DCYAN NORMAL NORMAL)],
- [qw(DCYAN BLUE NORMAL )],
- [qw(DGREEN NORMAL NORMAL )],
- [qw(DYELLOW NORMAL NORMAL )],
- [qw(GREEN DGREEN NORMAL )],
- [qw(GREEN NORMAL NORMAL )],
+ [qw(DCYAN BLUE NORMAL)],
+ [qw(DGREEN NORMAL NORMAL)],
+ [qw(DYELLOW NORMAL NORMAL)],
+ [qw(GREEN DGREEN NORMAL)],
+ [qw(GREEN NORMAL NORMAL)],
[qw(MAGENTA NORMAL NORMAL)],
[qw(RED NORMAL NORMAL)],
# for light backgrounds
[qw(BLACK DGREY NORMAL)],
- [qw(DBLUE DGREY NORMAL )],
+ [qw(DBLUE DGREY NORMAL)],
[qw(DBLUE DMAGENTA NORMAL)],
- [qw(DBLUE DRED NORMAL )],
+ [qw(DBLUE DRED NORMAL)],
[qw(DBLUE BLACK NORMAL)],
- [qw(DGREEN DYELLOW NORMAL )],
+ [qw(DGREEN DYELLOW NORMAL)],
[qw(DYELLOW BLACK NORMAL)],
[qw(DMAGENTA BLACK NORMAL)],
[qw(DCYAN DBLUE NORMAL)],
# for dark backgrounds
[qw(WHITE GREY NORMAL)],
[qw(GREY WHITE NORMAL)],
- [qw(CYAN GREY NORMAL )],
- [qw(GREEN WHITE NORMAL )],
- [qw(GREEN YELLOW NORMAL )],
- [qw(YELLOW WHITE NORMAL )],
- [qw(MAGENTA CYAN NORMAL )],
+ [qw(CYAN GREY NORMAL)],
+ [qw(GREEN WHITE NORMAL)],
+ [qw(GREEN YELLOW NORMAL)],
+ [qw(YELLOW WHITE NORMAL)],
+ [qw(MAGENTA CYAN NORMAL)],
[qw(MAGENTA YELLOW NORMAL)],
[qw(RED CYAN NORMAL)],
- [qw(RED WHITE NORMAL )],
+ [qw(RED WHITE NORMAL)],
[qw(BLUE WHITE NORMAL)],
# miscellaneous
- [qw(RED BLUE NORMAL )],
+ [qw(RED BLUE NORMAL)],
[qw(RED DBLUE NORMAL)],
[qw(BLACK BLUE NORMAL)],
[qw(BLACK DBLUE NORMAL)],
@@ -702,26 +798,25 @@ sub get_color_scheme {
[qw(BLACK MAGENTA NORMAL)],
[qw(MAGENTA BLUE NORMAL)],
[qw(MAGENTA DBLUE NORMAL)],
- );
- if ($type eq 'count' ){
- return scalar @color_schemes;
+ ];
+ eval $end if $b_log;
+ if ($type eq 'count'){
+ return scalar @$color_schemes;
}
- if ($type eq 'full' ){
- return @color_schemes;
+ if ($type eq 'full'){
+ return $color_schemes;
}
else {
- return @{$color_schemes[$type]};
- # print Dumper $color_schemes[$scheme_nu];
+ # print Dumper $color_schemes->[$type];
+ return $color_schemes->[$type];
}
- eval $end if $b_log;
}
sub set_color_scheme {
eval $start if $b_log;
my ($scheme) = @_;
$colors{'scheme'} = $scheme;
- my $index = ( $b_irc ) ? 1 : 0; # defaults to non irc
-
+ my $index = ($b_irc) ? 1 : 0; # defaults to non irc
# NOTE: qw(...) kills the escape, it is NOT the same as using
# Literal "..", ".." despite docs saying it is.
my %color_palette = (
@@ -744,10 +839,10 @@ sub set_color_scheme {
'GREY' => [ "\e[0;37m", "\x0315" ],
'NORMAL' => [ "\e[0m", "\x03" ],
);
- my @scheme = get_color_scheme($colors{'scheme'});
- $colors{'c1'} = $color_palette{$scheme[0]}[$index];
- $colors{'c2'} = $color_palette{$scheme[1]}[$index];
- $colors{'cn'} = $color_palette{$scheme[2]}[$index];
+ my $color_scheme = get_color_scheme($colors{'scheme'});
+ $colors{'c1'} = $color_palette{$color_scheme->[0]}[$index];
+ $colors{'c2'} = $color_palette{$color_scheme->[1]}[$index];
+ $colors{'cn'} = $color_palette{$color_scheme->[2]}[$index];
# print Dumper \@scheme;
# print "$colors{'c1'}here$colors{'c2'} we are!$colors{'cn'}\n";
eval $end if $b_log;
@@ -756,12 +851,12 @@ sub set_color_scheme {
sub set_colors {
eval $start if $b_log;
# it's already been set with -c 0-43
- if ( exists $colors{'c1'} ){
+ if (exists $colors{'c1'}){
return 1;
}
- # This let's user pick their color scheme. For IRC, only shows the color schemes,
- # no interactive. The override value only will be placed in user config files.
- # /etc/inxi.conf can also override
+ # This let's user pick their color scheme. For IRC, only shows the color
+ # schemes, no interactive. The override value only will be placed in user
+ # config files. /etc/inxi.conf can also override
if (exists $colors{'selector'}){
my $ob_selector = SelectColors->new($colors{'selector'});
$ob_selector->select_schema();
@@ -774,14 +869,14 @@ sub set_colors {
$color_scheme = $colors{'global'};
}
else {
- if ( $b_irc ){
+ if ($b_irc){
if (defined $colors{'irc-virt-term'} && $b_display && $client{'console-irc'}){
$color_scheme = $colors{'irc-virt-term'};
}
elsif (defined $colors{'irc-console'} && !$b_display){
$color_scheme = $colors{'irc-console'};
}
- elsif ( defined $colors{'irc-gui'}) {
+ elsif (defined $colors{'irc-gui'}){
$color_scheme = $colors{'irc-gui'};
}
}
@@ -795,7 +890,7 @@ sub set_colors {
}
}
# force 0 for | or > output, all others prints to irc or screen
- if (!$b_irc && ! -t STDOUT ){
+ if (!$b_irc && !$force{'colors'} && ! -t STDOUT){
$color_scheme = 0;
}
set_color_scheme($color_scheme);
@@ -805,24 +900,19 @@ sub set_colors {
## SelectColors
{
package SelectColors;
-
-# use warnings;
-# use strict;
-# use diagnostics;
-# use 5.008;
-
-my (@data,@rows,%configs,%status);
+my (@data,%configs,%status);
my ($type,$w_fh);
my $safe_color_count = 12; # null/normal + default color group
my $count = 0;
-# args: 1 - type
+# args: 0: type
sub new {
my $class = shift;
($type) = @_;
my $self = {};
return bless $self, $class;
}
+
sub select_schema {
eval $start if $b_log;
assign_selectors();
@@ -830,8 +920,8 @@ sub select_schema {
set_status();
start_selector();
create_color_selections();
- if (! $b_irc ){
- main::check_config_file();
+ if (!$b_irc){
+ Configs::check_file();
get_selection();
}
else {
@@ -875,15 +965,16 @@ sub assign_selectors {
$configs{'selection'} = 'global';
}
}
+
sub start_selector {
my $whoami = getpwuid($<) || "unknown???";
- if ( ! $b_irc ){
+ if (!$b_irc){
@data = (
[ 0, '', '', "Welcome to $self_name! Please select the default
$configs{'selection'} color scheme."],
);
}
- @rows = (
+ push(@data,
[ 0, '', '', "Because there is no way to know your $configs{'selection'}
foreground/background colors, you can set your color preferences from
color scheme option list below:"],
@@ -893,42 +984,40 @@ sub start_selector {
3-dark^backgrounds; 4-miscellaneous"],
[ 0, '', '', ""],
);
- push @data, @rows;
- if ( ! $b_irc ){
- @rows = (
+ if (!$b_irc){
+ push(@data,
[ 0, '', '', "Please note that this will set the $configs{'selection'}
preferences only for user: $whoami"],
);
- push @data, @rows;
}
- @rows = (
+ push(@data,
[ 0, '', '', "$line1"],
);
- push @data, @rows;
- main::print_basic(@data);
+ main::print_basic(\@data);
@data = ();
}
+
sub create_color_selections {
my $spacer = '^^'; # printer removes double spaces, but replaces ^ with ' '
- $count = ( main::get_color_scheme('count') - 1 );
- for my $i (0 .. $count){
+ $count = (main::get_color_scheme('count') - 1);
+ foreach my $i (0 .. $count){
if ($i > 9){
$spacer = '^';
}
- if ($configs{'selection'} =~ /^(global|irc-gui|irc-console|irc-virt-term)$/ && $i > $safe_color_count ){
+ if ($configs{'selection'} =~ /^(global|irc-gui|irc-console|irc-virt-term)$/ && $i > $safe_color_count){
last;
}
main::set_color_scheme($i);
- @rows = (
+ push(@data,
[0, '', '', "$i)$spacer$colors{'c1'}Card:$colors{'c2'}^nVidia^GT218
$colors{'c1'}Display^Server$colors{'c2'}^x11^(X.Org^1.7.7)$colors{'cn'}"],
);
- push @data, @rows;
}
- main::print_basic(@data);
+ main::print_basic(\@data);
@data = ();
main::set_color_scheme(0);
}
+
sub get_selection {
my $number = $count + 1;
@data = (
@@ -951,16 +1040,15 @@ sub get_selection {
schemes remove the global setting."],
[0, '', '', "$line1"],
);
- main::print_basic(@data);
+ main::print_basic(\@data);
@data = ();
- my $response = <STDIN>;
- chomp $response;
- if (!main::is_int($response) || $response > ($count + 3) ){
+ chomp(my $response = <STDIN>);
+ if (!main::is_int($response) || $response > ($count + 3)){
@data = (
[0, '', '', "Error - Invalid Selection. You entered this: $response. Hit <ENTER> to continue."],
[0, '', '', "$line1"],
);
- main::print_basic(@data);
+ main::print_basic(\@data);
my $response = <STDIN>;
start_selector();
create_color_selections();
@@ -969,12 +1057,19 @@ sub get_selection {
else {
process_selection($response);
}
+ if ($b_pledge){
+ @pledges = grep {$_ ne 'getpw'} @pledges;
+ OpenBSD::Pledge::pledge(@pledges);
+ }
}
+
sub process_selection {
my $response = shift;
- if ($response == ($count + 3) ){
- @data = ([0, '', '', "Ok, exiting $self_name now. You can set the colors later."],);
- main::print_basic(@data);
+ if ($response == ($count + 3)){
+ @data = (
+ [0, '', '', "Ok, exiting $self_name now. You can set the colors later."],
+ );
+ main::print_basic(\@data);
exit 0;
}
elsif ($response == ($count + 2)){
@@ -982,11 +1077,11 @@ sub process_selection {
[0, '', '', "Ok, continuing $self_name unchanged."],
[0, '', '', "$line1"],
);
- main::print_basic(@data);
- if ( defined $colors{'console'} && !$b_display ){
+ main::print_basic(\@data);
+ if (defined $colors{'console'} && !$b_display){
main::set_color_scheme($colors{'console'});
}
- if ( defined $colors{'virt-term'} ){
+ if (defined $colors{'virt-term'}){
main::set_color_scheme($colors{'virt-term'});
}
else {
@@ -998,7 +1093,7 @@ sub process_selection {
[0, '', '', "Removing all color settings from config file now..."],
[0, '', '', "$line1"],
);
- main::print_basic(@data);
+ main::print_basic(\@data);
delete_all_config_colors();
main::set_color_scheme($colors{'default'});
}
@@ -1008,7 +1103,7 @@ sub process_selection {
[0, '', '', "Updating config file for $configs{'selection'} color scheme now..."],
[0, '', '', "$line1"],
);
- main::print_basic(@data);
+ main::print_basic(\@data);
if ($configs{'selection'} eq 'global'){
delete_all_colors();
}
@@ -1018,39 +1113,42 @@ sub process_selection {
set_config_color_scheme($response);
}
}
+
sub delete_all_colors {
- my @file_lines = main::reader( $user_config_file );
- open( $w_fh, '>', $user_config_file ) or error_handler('open', $user_config_file, $!);
- foreach ( @file_lines ) {
- if ( $_ !~ /^(CONSOLE_COLOR_SCHEME|GLOBAL_COLOR_SCHEME|IRC_COLOR_SCHEME|IRC_CONS_COLOR_SCHEME|IRC_X_TERM_COLOR_SCHEME|VIRT_TERM_COLOR_SCHEME)/){
+ my @file_lines = main::reader($user_config_file);
+ open($w_fh, '>', $user_config_file) or main::error_handler('open', $user_config_file, $!);
+ foreach (@file_lines){
+ if ($_ !~ /^(CONSOLE_COLOR_SCHEME|GLOBAL_COLOR_SCHEME|IRC_COLOR_SCHEME|IRC_CONS_COLOR_SCHEME|IRC_X_TERM_COLOR_SCHEME|VIRT_TERM_COLOR_SCHEME)/){
print {$w_fh} "$_";
}
}
close $w_fh;
}
+
sub delete_global_color {
- my @file_lines = main::reader( $user_config_file );
- open( $w_fh, '>', $user_config_file ) or error_handler('open', $user_config_file, $!);
- foreach ( @file_lines ) {
- if ( $_ !~ /^GLOBAL_COLOR_SCHEME/){
+ my @file_lines = main::reader($user_config_file);
+ open($w_fh, '>', $user_config_file) or main::error_handler('open', $user_config_file, $!);
+ foreach (@file_lines){
+ if ($_ !~ /^GLOBAL_COLOR_SCHEME/){
print {$w_fh} "$_";
}
}
close $w_fh;
}
+
sub set_config_color_scheme {
my $value = shift;
- my @file_lines = main::reader( $user_config_file );
+ my @file_lines = main::reader($user_config_file);
my $b_found = 0;
- open( $w_fh, '>', $user_config_file ) or error_handler('open', $user_config_file, $!);
- foreach ( @file_lines ) {
- if ( $_ =~ /^$configs{'variable'}/ ){
+ open($w_fh, '>', $user_config_file) or main::error_handler('open', $user_config_file, $!);
+ foreach (@file_lines){
+ if ($_ =~ /^$configs{'variable'}/){
$_ = "$configs{'variable'}=$value";
$b_found = 1;
}
print $w_fh "$_\n";
}
- if (! $b_found ){
+ if (!$b_found){
print $w_fh "$configs{'variable'}=$value\n";
}
close $w_fh;
@@ -1069,97 +1167,152 @@ sub print_irc_message {
[ 0, '', '', "98 (irc,^not^in^desktop^-^$status{'irc-console'})"],
[ 0, '', '', "99 (global^-^$status{'global'})"]
);
- main::print_basic(@data);
+ main::print_basic(\@data);
exit 0;
}
-
}
#### -------------------------------------------------------------------
#### CONFIGS
#### -------------------------------------------------------------------
-sub check_config_file {
- $user_config_file = "$user_config_dir/$self_name.conf";
- if ( ! -f $user_config_file ){
- open( my $fh, '>', $user_config_file ) or error_handler('create', $user_config_file, $!);
- }
-}
+## Configs
+# public: set() check_file()
+{
+package Configs;
-sub get_configs {
- my (@configs) = @_;
- my ($key, $val,@config_files);
- if (!@configs){
- @config_files = (
- qq(/etc/$self_name.conf),
- qq($user_config_dir/$self_name.conf)
- );
- }
- else {
- @config_files = (@configs);
- }
+sub set {
+ my ($b_show) = @_;
+ my ($b_files,$key, $val,@config_files);
+ # removed legacy kde @$configs test which never worked
+ @config_files = (
+ qq(/etc/$self_name.conf),
+ qq(/etc/$self_name.d/$self_name.conf), # this was wrong path, but check in case
+ qq(/etc/$self_name.conf.d/$self_name.conf),
+ qq(/usr/etc/$self_name.conf),
+ qq(/usr/etc/$self_name.conf.d/$self_name.conf),
+ qq(/usr/local/etc/$self_name.conf),
+ qq(/usr/local/etc/$self_name.conf.d/$self_name.conf),
+ qq($user_config_dir/$self_name.conf)
+ );
# Config files should be passed in an array as a param to this function.
# Default intended use: global @CONFIGS;
- foreach (@config_files) {
- next unless open (my $fh, '<', "$_");
- while (<$fh>) {
+ foreach (@config_files){
+ next unless -e $_ && open(my $fh, '<', "$_");
+ my $b_configs;
+ $b_files = 1;
+ print "${line1}Configuration file: $_\n" if $b_show;
+ while (<$fh>){
chomp;
s/#.*//;
s/^\s+//;
s/\s+$//;
s/'|"//g;
- s/true/1/i; # switch to 1/0 perl boolean
- s/false/0/i; # switch to 1/0 perl boolean
next unless length;
($key, $val) = split(/\s*=\s*/, $_, 2);
next unless length($val);
- get_config_item($key,$val);
+ $val =~ s/true/1/i; # switch to 1/0 perl boolean
+ $val =~ s/false/0/i; # switch to 1/0 perl boolean
+ if (!$b_show){
+ process_item($key,$val);
+ }
+ else {
+ print $line3 if !$b_configs;
+ print "$key=$val\n";
+ $b_configs = 1;
+ }
# print "f: $file key: $key val: $val\n";
}
close $fh;
+ if ($b_show && !$b_configs){
+ print "No configuration items found in file.\n";
+ }
}
+ return $b_files if $b_show;
}
-# note: someone managed to make a config file with corrupted values, so check int
-# explicitly, don't assume it was done correctly.
+sub show {
+ print "Showing current active/set configurations, by file. Last overrides previous.\n";
+ my $b_files = set(1);
+ print $line1;
+ if ($b_files){
+ print "All done! Everything look good? If not, fix it.\n";
+ }
+ else {
+ print "No configuration files found. Is that what you expected?\n";
+ }
+ exit 0;
+}
+
+# note: someone managed to make a config file with corrupted values, so check
+# int explicitly, don't assume it was done correctly.
# args: 0: key; 1: value
-sub get_config_item {
+sub process_item {
my ($key,$val) = @_;
- if ($key eq 'ALLOW_UPDATE' || $key eq 'B_ALLOW_UPDATE') {$use{'update'} = $val if is_int($val)}
- elsif ($key eq 'ALLOW_WEATHER' || $key eq 'B_ALLOW_WEATHER') {$use{'weather'} = $val if is_int($val)}
- elsif ($key eq 'CPU_SLEEP') {$cpu_sleep = $val if is_numeric($val)}
- elsif ($key eq 'DL_TIMEOUT') {$dl_timeout = $val if is_int($val)}
- elsif ($key eq 'DOWNLOADER') {
+
+ ## UTILITIES ##
+ if ($key eq 'ALLOW_UPDATE' || $key eq 'B_ALLOW_UPDATE'){
+ $use{'update'} = $val if main::is_int($val)}
+ elsif ($key eq 'ALLOW_WEATHER' || $key eq 'B_ALLOW_WEATHER'){
+ $use{'weather'} = $val if main::is_int($val)}
+ elsif ($key eq 'CPU_SLEEP'){
+ $cpu_sleep = $val if main::is_numeric($val)}
+ elsif ($key eq 'DL_TIMEOUT'){
+ $dl_timeout = $val if main::is_int($val)}
+ elsif ($key eq 'DOWNLOADER'){
if ($val =~ /^(curl|fetch|ftp|perl|wget)$/){
# this dumps all the other data and resets %dl for only the
# desired downloader.
- $val = set_perl_downloader($val);
+ $val = main::set_perl_downloader($val);
%dl = ('dl' => $val, $val => 1);
}}
- elsif ($key eq 'FILTER_STRING') {$filter_string = $val}
- elsif ($key eq 'LANGUAGE') {$language = $val if $val =~ /^(en)$/}
- elsif ($key eq 'LIMIT') {$limit = $val if is_int($val)}
- elsif ($key eq 'OUTPUT_TYPE') {$output_type = $val if $val =~ /^(json|screen|xml)$/}
- elsif ($key eq 'NO_DIG') {$b_skip_dig = $val if is_int($val)}
- elsif ($key eq 'NO_SUDO') {$b_no_sudo = $val if is_int($val)}
- elsif ($key eq 'PARTITION_SORT') {$show{'partition-sort'} = $val if ($val =~ /^(dev-base|fs|id|label|percent-used|size|uuid|used)$/) }
- elsif ($key eq 'PS_COUNT') {$ps_count = $val if is_int($val) }
- elsif ($key eq 'SENSORS_CPU_NO') {$sensors_cpu_nu = $val if is_int($val)}
- elsif ($key eq 'SHOW_HOST' || $key eq 'B_SHOW_HOST') {
- if (is_int($val)){
+ elsif ($key eq 'FAKE_DATA_DIR'){
+ $fake_data_dir = $val}
+ elsif ($key eq 'FILTER_STRING'){
+ $filter_string = $val}
+ elsif ($key eq 'LANGUAGE'){
+ $language = $val if $val =~ /^(en)$/}
+ elsif ($key eq 'LIMIT'){
+ $limit = $val if main::is_int($val)}
+ elsif ($key eq 'OUTPUT_TYPE'){
+ $output_type = $val if $val =~ /^(json|screen|xml)$/}
+ elsif ($key eq 'NO_DIG'){
+ $force{'no-dig'} = $val if main::is_int($val)}
+ elsif ($key eq 'NO_DOAS'){
+ $force{'no-doas'} = $val if main::is_int($val)}
+ elsif ($key eq 'NO_HTML_WAN'){
+ $force{'no-html-wan'} = $val if main::is_int($val)}
+ elsif ($key eq 'NO_SUDO'){
+ $force{'no-sudo'} = $val if main::is_int($val)}
+ elsif ($key eq 'PARTITION_SORT'){
+ if ($val =~ /^(dev-base|fs|id|label|percent-used|size|uuid|used)$/){
+ $show{'partition-sort'} = $val;
+ }}
+ elsif ($key eq 'PS_COUNT'){
+ $ps_count = $val if main::is_int($val) }
+ elsif ($key eq 'SENSORS_CPU_NO'){
+ $sensors_cpu_nu = $val if main::is_int($val)}
+ elsif ($key eq 'SENSORS_EXCLUDE'){
+ @sensors_exclude = split(/\s*,\s*/, $val) if $val}
+ elsif ($key eq 'SENSORS_USE'){
+ @sensors_use = split(/\s*,\s*/, $val) if $val}
+ elsif ($key eq 'SHOW_HOST' || $key eq 'B_SHOW_HOST'){
+ if (main::is_int($val)){
$show{'host'} = $val;
$show{'no-host'} = 1 if !$show{'host'};
}
}
- elsif ($key eq 'USB_SYS') {$b_usb_sys = $val if is_int($val)}
- elsif ($key eq 'WAN_IP_URL') {
+ elsif ($key eq 'USB_SYS'){
+ $force{'usb-sys'} = $val if main::is_int($val)}
+ elsif ($key eq 'WAN_IP_URL'){
if ($val =~ /^(ht|f)tp[s]?:\//i){
$wan_url = $val;
- $b_skip_dig = 1;
+ $force{'no-dig'} = 1;
}
}
- elsif ($key eq 'WEATHER_SOURCE') {$weather_source = $val if is_int($val)}
- elsif ($key eq 'WEATHER_UNIT') {
+ elsif ($key eq 'WEATHER_SOURCE'){
+ $weather_source = $val if main::is_int($val)}
+ elsif ($key eq 'WEATHER_UNIT'){
$val = lc($val) if $val;
if ($val && $val =~ /^(c|f|cf|fc|i|m|im|mi)$/){
my %units = ('c'=>'m','f'=>'i','cf'=>'mi','fc'=>'im');
@@ -1167,28 +1320,65 @@ sub get_config_item {
$weather_unit = $val;
}
}
- # layout
- elsif ($key eq 'CONSOLE_COLOR_SCHEME') {$colors{'console'} = $val if is_int($val)}
- elsif ($key eq 'GLOBAL_COLOR_SCHEME') {$colors{'global'} = $val if is_int($val)}
- elsif ($key eq 'IRC_COLOR_SCHEME') {$colors{'irc-gui'} = $val if is_int($val)}
- elsif ($key eq 'IRC_CONS_COLOR_SCHEME') {$colors{'irc-console'} = $val if is_int($val)}
- elsif ($key eq 'IRC_X_TERM_COLOR_SCHEME') {$colors{'irc-virt-term'} = $val if is_int($val)}
- elsif ($key eq 'VIRT_TERM_COLOR_SCHEME') {$colors{'virt-term'} = $val if is_int($val)}
+
+ ## COLORS/SEP ##
+ elsif ($key eq 'CONSOLE_COLOR_SCHEME'){
+ $colors{'console'} = $val if main::is_int($val)}
+ elsif ($key eq 'GLOBAL_COLOR_SCHEME'){
+ $colors{'global'} = $val if main::is_int($val)}
+ elsif ($key eq 'IRC_COLOR_SCHEME'){
+ $colors{'irc-gui'} = $val if main::is_int($val)}
+ elsif ($key eq 'IRC_CONS_COLOR_SCHEME'){
+ $colors{'irc-console'} = $val if main::is_int($val)}
+ elsif ($key eq 'IRC_X_TERM_COLOR_SCHEME'){
+ $colors{'irc-virt-term'} = $val if main::is_int($val)}
+ elsif ($key eq 'VIRT_TERM_COLOR_SCHEME'){
+ $colors{'virt-term'} = $val if main::is_int($val)}
# note: not using the old short SEP1/SEP2
- elsif ($key eq 'SEP1_IRC') {$sep{'s1-irc'} = $val}
- elsif ($key eq 'SEP1_CONSOLE') {$sep{'s1-console'} = $val}
- elsif ($key eq 'SEP2_IRC') {$sep{'s2-irc'} = $val}
- elsif ($key eq 'SEP2_CONSOLE') {$sep{'s2-console'} = $val}
- # size
- elsif ($key eq 'COLS_MAX_CONSOLE') {$size{'console'} = $val if is_int($val)}
- elsif ($key eq 'COLS_MAX_IRC') {$size{'irc'} = $val if is_int($val)}
- elsif ($key eq 'COLS_MAX_NO_DISPLAY') {$size{'no-display'} = $val if is_int($val)}
- elsif ($key eq 'INDENT') {$size{'indent'} = $val if is_int($val)}
- elsif ($key eq 'INDENT_MIN') {$size{'indent-min'} = $val if is_int($val)}
+ elsif ($key eq 'SEP1_IRC'){
+ $sep{'s1-irc'} = $val}
+ elsif ($key eq 'SEP1_CONSOLE'){
+ $sep{'s1-console'} = $val}
+ elsif ($key eq 'SEP2_IRC'){
+ $sep{'s2-irc'} = $val}
+ elsif ($key eq 'SEP2_CONSOLE'){
+ $sep{'s2-console'} = $val}
+
+ ## SIZES ##
+ elsif ($key eq 'COLS_MAX_CONSOLE'){
+ $size{'console'} = $val if main::is_int($val)}
+ elsif ($key eq 'COLS_MAX_IRC'){
+ $size{'irc'} = $val if main::is_int($val)}
+ elsif ($key eq 'COLS_MAX_NO_DISPLAY'){
+ $size{'no-display'} = $val if main::is_int($val)}
+ elsif ($key eq 'INDENT'){
+ $size{'indent'} = $val if main::is_int($val)}
+ elsif ($key eq 'INDENTS'){
+ $filter_string = $val if main::is_int($val)}
+ elsif ($key eq 'LINES_MAX'){
+ if ($val =~ /^-?\d+$/ && $val >= -1){
+ if ($val == 0){
+ $size{'max-lines'} = $size{'term-lines'};}
+ elsif ($val == -1){
+ $use{'output-block'} = 1;}
+ else {
+ $size{'max-lines'} = $val;}
+ }}
+ elsif ($key eq 'MAX_WRAP' || $key eq 'WRAP_MAX' || $key eq 'INDENT_MIN'){
+ $size{'max-wrap'} = $val if main::is_int($val)}
# print "mc: key: $key val: $val\n";
# print Dumper (keys %size) . "\n";
}
+sub check_file {
+ $user_config_file = "$user_config_dir/$self_name.conf";
+ if (! -f $user_config_file){
+ open(my $fh, '>', $user_config_file) or
+ main::error_handler('create', $user_config_file, $!);
+ }
+}
+}
+
#### -------------------------------------------------------------------
#### DEBUGGERS
#### -------------------------------------------------------------------
@@ -1198,20 +1388,20 @@ sub get_config_item {
# inxi.2.log
sub begin_logging {
return 1 if $fh_l; # if we want to start logging for testing before options
- my $log_file_2="$user_data_dir/$self_name.1.log";
- my $log_file_3="$user_data_dir/$self_name.2.log";
+ my $log_file_2 = "$user_data_dir/$self_name.1.log";
+ my $log_file_3 = "$user_data_dir/$self_name.2.log";
my $data = '';
- $end='main::log_data("fe", (caller(1))[3], "");';
- $start='main::log_data("fs", (caller(1))[3], \@_);';
+ $end = 'main::log_data("fe", (caller(1))[3], "");';
+ $start = 'main::log_data("fs", (caller(1))[3], \@_);';
#$t3 = tv_interval ($t0, [gettimeofday]);
$t3 = eval 'Time::HiRes::tv_interval (\@t0, [Time::HiRes::gettimeofday()]);' if $b_hires;
- #print Dumper $@;
+ # print Dumper $@;
my $now = strftime "%Y-%m-%d %H:%M:%S", localtime;
return if $debugger{'timers'};
# do the rotation if logfile exists
- if ( -f $log_file ){
+ if (-f $log_file){
# copy if present second to third
- if ( -f $log_file_2 ){
+ if (-f $log_file_2){
rename $log_file_2, $log_file_3 or error_handler('rename', "$log_file_2 -> $log_file_3", "$!");
}
# then copy initial to second
@@ -1219,7 +1409,7 @@ sub begin_logging {
}
# now create the logfile
# print "Opening log file for reading: $log_file\n";
- open $fh_l, '>', $log_file or error_handler(4, $log_file, "$!");
+ open($fh_l, '>', $log_file) or error_handler(4, $log_file, "$!");
# and echo the start data
$data = $line2;
$data .= "START $self_name LOGGING:\n";
@@ -1236,20 +1426,17 @@ sub begin_logging {
# NOTE: no logging available until get_parameters is run, since that's what
# sets logging # in order to trigger earlier logging manually set $b_log
# to true in top variables.
-# args: $1 - type [fs|fe|cat|dump|raw] OR data to log
-# arg: $2 -
-# arg: $one type (fs/fe/cat/dump/raw) or logged data;
-# [$two is function name; [$three - function args]]
+# args: 0: type [fs|fe|cat|dump|raw]; 1: function name OR data to log;
+# [2: function args OR hash/array ref]
sub log_data {
- return if ! $b_log;
+ return if !$b_log;
my ($one, $two, $three) = @_;
my ($args,$data,$timer) = ('','','');
my $spacer = ' ';
# print "1: $one 2: $two 3: $three\n";
- if ($one eq 'fs') {
+ if ($one eq 'fs'){
if (ref $three eq 'ARRAY'){
- my @temp = @$three;
- # print Data::Dumper::Dumper \@$three;
+ # print Data::Dumper::Dumper $three;
$args = "\n${spacer}Args: " . joiner($three, '; ', 'unset');
}
else {
@@ -1258,24 +1445,24 @@ sub log_data {
# $t1 = [gettimeofday];
#$t3 = tv_interval ($t0, [gettimeofday]);
$t3 = eval 'Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()])' if $b_hires;
- #print Dumper $@;
+ # print Dumper $@;
$data = "Start: Function: $two$args\n${spacer}Elapsed: $t3\n";
$spacer='';
$timer = $data if $debugger{'timers'};
}
- elsif ( $one eq 'fe') {
+ elsif ($one eq 'fe'){
# print 'timer:', Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()]),"\n";
#$t3 = tv_interval ($t0, [gettimeofday]);
eval '$t3 = Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()])' if $b_hires;
- #print Dumper $t3;
+ # print Dumper $t3;
$data = "${spacer}Elapsed: $t3\nEnd: Function: $two\n";
$spacer='';
$timer = $data if $debugger{'timers'};
}
- elsif ( $one eq 'cat') {
- if ( $b_log_full ){
- for my $file ($two){
- my $contents = do { local( @ARGV, $/ ) = $file; <> }; # or: qx(cat $file)
+ elsif ($one eq 'cat'){
+ if ($b_log_full){
+ foreach my $file ($two){
+ my $contents = do { local(@ARGV, $/) = $file; <> }; # or: qx(cat $file)
$data = "$data${line3}Full file data: $file\n\n$contents\n$line3\n";
}
$spacer='';
@@ -1288,14 +1475,14 @@ sub log_data {
elsif ($one eq 'data'){
$data = "$two\n";
}
- elsif ( $one eq 'dump') {
+ elsif ($one eq 'dump'){
$data = "$two:\n";
if (ref $three eq 'HASH'){
- $data .= Data::Dumper::Dumper \%$three;
+ $data .= Data::Dumper::Dumper $three;
}
elsif (ref $three eq 'ARRAY'){
- # print Data::Dumper::Dumper \@$three;
- $data .= Data::Dumper::Dumper \@$three;
+ # print Data::Dumper::Dumper $three;
+ $data .= Data::Dumper::Dumper $three;
}
else {
$data .= Data::Dumper::Dumper $three;
@@ -1303,8 +1490,8 @@ sub log_data {
$data .= "\n";
# print $data;
}
- elsif ( $one eq 'raw') {
- if ( $b_log_full ){
+ elsif ($one eq 'raw'){
+ if ($b_log_full){
$data = "\n${line3}Raw System Data:\n\n$two\n$line3";
$spacer='';
}
@@ -1315,7 +1502,7 @@ sub log_data {
if ($debugger{'timers'}){
print $timer if $timer;
}
- #print "d: $data";
+ # print "d: $data";
elsif ($data){
print $fh_l "$spacer$data";
}
@@ -1323,27 +1510,27 @@ sub log_data {
sub set_debugger {
user_debug_test_1() if $debugger{'test-1'};
- if ( $debug >= 20){
+ if ($debugger{'level'} >= 20){
error_handler('not-in-irc', 'debug data generator') if $b_irc;
- my $option = ( $debug > 22 ) ? 'main-full' : 'main';
- $debugger{'gz'} = 1 if ($debug == 22 || $debug == 24);
+ my $option = ($debugger{'level'} > 22) ? 'main-full' : 'main';
+ $debugger{'gz'} = 1 if ($debugger{'level'} == 22 || $debugger{'level'} == 24);
my $ob_sys = SystemDebugger->new($option);
$ob_sys->run_debugger();
- $ob_sys->upload_file($ftp_alt) if $debug > 20;
+ $ob_sys->upload_file($ftp_alt) if $debugger{'level'} > 20;
exit 0;
}
- elsif ($debug >= 10 && $debug <= 12){
+ elsif ($debugger{'level'} >= 10 && $debugger{'level'} <= 12){
$b_log = 1;
- if ($debug == 11){
+ if ($debugger{'level'} == 11){
$b_log_full = 1;
}
- elsif ($debug == 12){
+ elsif ($debugger{'level'} == 12){
$b_log_colors = 1;
}
begin_logging();
}
- elsif ($debug <= 3){
- if ($debug == 3){
+ elsif ($debugger{'level'} <= 3){
+ if ($debugger{'level'} == 3){
$b_log = 1;
$debugger{'timers'} = 1;
begin_logging();
@@ -1358,20 +1545,13 @@ sub set_debugger {
## SystemDebugger
{
package SystemDebugger;
-
-# use File::Find q(find);
-#no warnings 'File::Find';
-# use File::Spec::Functions;
-#use File::Copy;
-#use POSIX qw(strftime);
-
my $option = 'main';
my ($data_dir,$debug_dir,$debug_gz,$parse_src,$upload) = ('','','','','');
-my @content = ();
+my @content;
my $b_debug = 0;
my $b_delete_dir = 1;
-# args: 1 - type
-# args: 2 - upload
+
+# args: 0: type; 1: upload
sub new {
my $class = shift;
($option) = @_;
@@ -1382,19 +1562,14 @@ sub new {
}
sub run_debugger {
- #require File::Find;
- #import File::Find::Functions;
- require File::Copy;
- import File::Copy;
- require File::Spec::Functions;
- import File::Spec::Functions;
-
print "Starting $self_name debugging data collector...\n";
+ check_required_items();
create_debug_directory();
- print "Note: for dmidecode data you must be root.\n" if !$b_root;
+ print "Note: for dmidecode, smartctl, lvm data you must be root.\n" if !$b_root;
print $line3;
if (!$b_debug){
audio_data();
+ bluetooth_data();
disk_data();
display_data();
network_data();
@@ -1406,18 +1581,20 @@ sub run_debugger {
if (!$b_debug){
# note: android has unreadable /sys, but -x and -r tests pass
# main::globber('/sys/*') &&
- if ( main::count_dir_files('/sys') ){
+ if ($debugger{'sys'} && main::count_dir_files('/sys')){
build_tree('sys');
# kernel crash, not sure what creates it, for ppc, as root
- sys_traverse_data() if ($debugger{'sys'} && ($debugger{'sys-force'} || !$b_root || !$b_ppc )) ;
+ if ($debugger{'sys'} && ($debugger{'sys-force'} || !$b_root || !$risc{'ppc'})){
+ sys_traverse_data();
+ }
}
else {
- print "Skipping /sys data collection. /sys not present, or empty.\n";
+ print "Skipping /sys data collection.\n";
}
print $line3;
# note: proc has some files that are apparently kernel processes, I've tried
# filtering them out but more keep appearing, so only run proc debugger if not root
- if ( !$debugger{'no-proc'} && (!$b_root || $debugger{'proc'} ) && -d '/proc' && main::count_dir_files('/proc') ){
+ if (!$debugger{'no-proc'} && (!$b_root || $debugger{'proc'}) && -d '/proc' && main::count_dir_files('/proc')){
build_tree('proc');
proc_traverse_data();
}
@@ -1431,44 +1608,84 @@ sub run_debugger {
compress_dir();
}
+sub check_required_items {
+ print "Loading required debugger Perl File:: modules... \n";
+ # Fedora/Redhat doesn't include File::Find File::Copy in
+ # core modules. why? Or rather, they deliberately removed them.
+ if (main::check_perl_module('File::Find')){
+ File::Find->import;
+ }
+ else {
+ main::error_handler('required-module', 'File', 'File::Find');
+ }
+ if (main::check_perl_module('File::Copy')){
+ File::Copy->import;
+ }
+ else {
+ main::error_handler('required-module', 'File', 'File::Copy');
+ }
+ if (main::check_perl_module('File::Spec::Functions')){
+ File::Spec::Functions->import;
+ }
+ else {
+ main::error_handler('required-module', 'File', 'File::Spec::Functions');
+ }
+ if ($debugger{'level'} > 20){
+ if (main::check_perl_module('Net::FTP')){
+ Net::FTP->import;
+ }
+ else {
+ main::error_handler('required-module', 'Net', 'Net::FTP');
+ }
+ }
+ print "Checking basic core system programs exist... \n";
+ if ($debugger{'level'} > 19){
+ # astoundingly, rhel 9 and variants are shipping without tar in minimal install
+ if (!main::check_program('tar')){
+ main::error_handler('required-program', 'tar', 'debugger');
+ }
+ }
+}
+
sub create_debug_directory {
my $host = main::get_hostname();
$host =~ s/ /-/g;
$host = 'no-host' if !$host || $host eq 'N/A';
- my ($alt_string,$bsd_string,$root_string) = ('','','');
+ my ($alt_string,$root_string) = ('','');
# note: Time::Piece was introduced in perl 5.9.5
my ($sec,$min,$hour,$mday,$mon,$year) = localtime;
$year = $year+1900;
$mon += 1;
- if (length($sec) == 1) {$sec = "0$sec";}
- if (length($min) == 1) {$min = "0$min";}
- if (length($hour) == 1) {$hour = "0$hour";}
- if (length($mon) == 1) {$mon = "0$mon";}
- if (length($mday) == 1) {$mday = "0$mday";}
-
+ if (length($sec) == 1){$sec = "0$sec";}
+ if (length($min) == 1){$min = "0$min";}
+ if (length($hour) == 1){$hour = "0$hour";}
+ if (length($mon) == 1){$mon = "0$mon";}
+ if (length($mday) == 1){$mday = "0$mday";}
my $today = "$year-$mon-${mday}_$hour$min$sec";
# my $date = strftime "-%Y-%m-%d_", localtime;
if ($b_root){
$root_string = '-root';
}
- $bsd_string = "-BSD-$bsd_type" if $bsd_type;
- if ($b_arm ){$alt_string = '-ARM'}
- elsif ($b_mips) {$alt_string = '-MIPS'}
- elsif ($b_ppc) {$alt_string = '-PPC'}
- elsif ($b_sparc) {$alt_string = '-SPARC'}
- $debug_dir = "$self_name$alt_string$bsd_string-$host-$today$root_string-$self_version";
+ my $id = ($debugger{'id'}) ? '-' . $debugger{'id'}: '';
+ $alt_string = '-' . uc($risc{'id'}) if %risc;
+ $alt_string .= "-BSD-$bsd_type" if $bsd_type;
+ $alt_string .= '-ANDROID' if $b_android;
+ $alt_string .= '-CYGWIN' if $windows{'cygwin'}; # could be windows arm?
+ $alt_string .= '-WSL' if $windows{'wsl'}; # could be windows arm?
+ $debug_dir = "$self_name$alt_string-$host$id-$today$root_string-$self_version-$self_patch";
$debug_gz = "$debug_dir.tar.gz";
$data_dir = "$user_data_dir/$debug_dir";
- if ( -d $data_dir ){
+ if (-d $data_dir){
unlink $data_dir or main::error_handler('remove', "$data_dir", "$!");
}
mkdir $data_dir or main::error_handler('mkdir', "$data_dir", "$!");
- if ( -e "$user_data_dir/$debug_gz" ){
+ if (-e "$user_data_dir/$debug_gz"){
#rmdir "$user_data_dir$debug_gz" or main::error_handler('remove', "$user_data_dir/$debug_gz", "$!");
print "Failed removing leftover directory:\n$user_data_dir$debug_gz error: $?" if system('rm','-rf',"$user_data_dir$debug_gz");
}
- print "Data going into:\n$data_dir\n";
+ print "Debugger data going into:\n$data_dir\n";
}
+
sub compress_dir {
print "Creating tar.gz compressed file of this material...\n";
print "File: $debug_gz\n";
@@ -1476,21 +1693,37 @@ sub compress_dir {
print "Removing $data_dir...\n";
#rmdir $data_dir or print "failed removing: $data_dir error: $!\n";
return 1 if !$b_delete_dir;
- if (system('rm','-rf',$data_dir) ){
+ if (system('rm','-rf',$data_dir)){
print "Failed removing: $data_dir\nError: $?\n";
}
else {
print "Directory removed.\n";
}
}
+
# NOTE: incomplete, don't know how to ever find out
# what sound server is actually running, and is in control
sub audio_data {
my (%data,@files,@files2);
print "Collecting audio data...\n";
my @cmds = (
- ['aplay', '-l'], # alsa
+ ['aplay', '--version'], # alsa
+ ['aplay', '-l'], # alsa devices
+ ['aplay', '-L'], # alsa list of features, can detect active sound server
+ ['artsd', '-v'], # aRts
+ ['esd', '-v'], # EsounD, to stderr
+ ['nasd', '-V'], # NAS
+ ['jackd', '--version'], # JACK
+ ['pactl', '--version'], # pulseaudio
+ ['pactl', 'info'], # pulseaudio, check if running as server: Server Name:
['pactl', 'list'], # pulseaudio
+ ['pipewire', '--version'], # pipewire
+ ['pipewire-alsa', '--version'], # pipewire-alsa - just config files
+ ['pipewire-pulse', '--version'], # pipewire-pulse
+ ['pulseaudio', '--version'], # PulseAudio
+ ['pw-jack', '--version'], # pipewire-jack
+ ['pw-cli', 'ls'], # pipewire, check if running as server
+ ['pw-cli', 'info all'],
);
run_commands(\@cmds,'audio');
@files = main::globber('/proc/asound/card*/codec*');
@@ -1507,9 +1740,33 @@ sub audio_data {
'/proc/asound/version',
);
@files2 = main::globber('/proc/asound/*/usbid');
- @files = (@files,@files2) if @files2;
+ push(@files,@files2) if @files2;
copy_files(\@files,'audio');
}
+
+sub bluetooth_data {
+ print "Collecting bluetooth data...\n";
+ # no warnings 'uninitialized';
+ my @cmds = (
+ ['btmgmt','info'],
+ ['hciconfig','-a'], # no version
+ #['hcidump',''], # hangs sometimes
+ ['hcitool','dev'],
+ ['rfkill','--output-all'],
+ );
+ # these hang if bluetoothd not enabled
+ if (@ps_cmd && (grep {m|/bluetoothd|} @ps_cmd)){
+ push(@cmds,
+ ['bt-adapter','--list'], # no version
+ ['bt-adapter','--info'],
+ ['bluetoothctl','--version'],
+ ['bluetoothctl','--list'],
+ ['bluetoothctl','--show']
+ );
+ }
+ run_commands(\@cmds,'bluetooth');
+}
+
## NOTE: >/dev/null 2>&1 is sh, and &>/dev/null is bash, fix this
# ls -w 1 /sysrs > tester 2>&1
sub disk_data {
@@ -1518,6 +1775,7 @@ sub disk_data {
@files = (
'/etc/fstab',
'/etc/mtab',
+ '/proc/devices',
'/proc/mdstat',
'/proc/mounts',
'/proc/partitions',
@@ -1527,27 +1785,50 @@ sub disk_data {
# very old systems
if (-d '/proc/ide/'){
my @ides = main::globber('/proc/ide/*/*');
- @files = (@files, @ides) if @ides;
+ push(@files, @ides) if @ides;
}
else {
- push (@files, '/proc-ide-directory');
+ push(@files, '/proc-ide-directory');
}
copy_files(\@files, 'disk');
my @cmds = (
+ ['blockdev', '--version'],
['blockdev', '--report'],
+ ['btrfs', 'fi show'], # no version
['btrfs', 'filesystem show'],
['btrfs', 'filesystem show --mounted'],
# ['btrfs', 'filesystem show --all-devices'],
- ['df', '-h -T'],
+ ['df', '-h -T'], # no need for version, and bsd doesn't have its
['df', '-h'],
['df', '-k'],
+ ['df', '-k -P'],
['df', '-k -T'],
['df', '-k -T -P'],
['df', '-k -T -P -a'],
['df', '-P'],
+ ['dmsetup', 'ls --tree'],
['findmnt', ''],
['findmnt', '--df --no-truncate'],
['findmnt', '--list --no-truncate'],
+ ['gpart', 'list'], # no version
+ ['gpart', 'show'],
+ ['gpart', 'status'],
+ ['ls', '-l /dev'],# core util, don't need version
+ # block is for mmcblk / arm devices
+ ['ls', '-l /dev/block'],
+ ['ls', '-l /dev/block/bootdevice'],
+ ['ls', '-l /dev/block/bootdevice/by-name'],
+ ['ls', '-l /dev/disk'],
+ ['ls', '-l /dev/disk/by-id'],
+ ['ls', '-l /dev/disk/by-label'],
+ ['ls', '-l /dev/disk/by-partlabel'],
+ ['ls', '-l /dev/disk/by-partuuid'],
+ ['ls', '-l /dev/disk/by-path'],
+ ['ls', '-l /dev/disk/by-uuid'],
+ # http://comments.gmane.org/gmane.linux.file-systems.zfs.user/2032
+ ['ls', '-l /dev/disk/by-wwn'],
+ ['ls', '-l /dev/mapper'],
+ ['lsblk', '--version'], # important since lsblk has been changing output
['lsblk', '-fs'],
['lsblk', '-fsr'],
['lsblk', '-fsP'],
@@ -1558,63 +1839,97 @@ sub disk_data {
['lsblk', '-pr'],
['lsblk', '-pP'],
['lsblk', '-r'],
- ['lsblk', '-r --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC'],
- ['lsblk', '-rb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC'],
+ ['lsblk', '-r --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
+ ['lsblk', '-rb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
+ ['lsblk', '-rb --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,MAJ:MIN,PKNAME'],
['lsblk', '-Pb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE'],
- ['lsblk', '-Pb --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC'],
- ['gpart', 'list'],
- ['gpart', 'show'],
- ['gpart', 'status'],
- ['ls', '-l /dev'],
- ['ls', '-l /dev/disk'],
- ['ls', '-l /dev/disk/by-id'],
- ['ls', '-l /dev/disk/by-label'],
- ['ls', '-l /dev/disk/by-uuid'],
- # http://comments.gmane.org/gmane.linux.file-systems.zfs.user/2032
- ['ls', '-l /dev/disk/by-wwn'],
- ['ls', '-l /dev/disk/by-path'],
- ['ls', '-l /dev/mapper'],
+ ['lsblk', '-Pb --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
+ # this should always be the live command used internally:
+ ['lsblk', '-bP --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,MAJ:MIN,PKNAME'],
+ ['lvdisplay', '--version'],
+ ['lvdisplay', '-c'],
+ ['lvdisplay', '-cv'],
+ ['lvdisplay', '-cv --segments'],
+ ['lvdisplay', '-m --segments'],
+ ['lvdisplay', '-ma --segments'],
+ ['lvs', '--version'],
+ ['lvs', '--separator :'],
+ ['lvs', '--separator : --segments'],
+ ['lvs', '-o +devices --separator : --segments'],
+ ['lvs', '-o +devices -v --separator : --segments'],
+ ['lvs', '-o +devices -av --separator : --segments'],
+ ['lvs', '-o +devices -aPv --separator : --segments'],
# LSI raid https://hwraid.le-vert.net/wiki/LSIMegaRAIDSAS
- ['megacli', '-AdpAllInfo -aAll'],
+ ['megacli', '-AdpAllInfo -aAll'], # no version
['megacli', '-LDInfo -L0 -a0'],
['megacli', '-PDList -a0'],
- ['megaclisas-status', ''],
+ ['megaclisas-status', ''], # no version
['megaraidsas-status', ''],
['megasasctl', ''],
['mount', ''],
- ['nvme', 'present'],
- ['readlink', '/dev/root'],
- ['swapon', '-s'],
+ ['nvme', 'present'], # no version
+ ['pvdisplay', '--version'],
+ ['pvdisplay', '-c'],
+ ['pvdisplay', '-cv'],
+ ['pvdisplay', '-m'],
+ ['pvdisplay', '-ma'],
+ ['pvs', '--version'],
+ ['pvs', '--separator :'],
+ ['pvs', '--separator : --segments'],
+ ['pvs', '-a --separator : --segments'],
+ ['pvs', '-av --separator : --segments'],
+ ['pvs', '-aPv --separator : --segments -o +pv_major,pv_minor'],
+ ['pvs', '-v --separator : --segments'],
+ ['pvs', '-Pv --separator : --segments'],
+ ['pvs', '--segments -o pv_name,pv_size,seg_size,vg_name,lv_name,lv_size,seg_pe_ranges'],
+ ['readlink', '/dev/root'], # coreutils, don't need version
+ ['swapon', '-s'], # coreutils, don't need version
# 3ware-raid
['tw-cli', 'info'],
+ ['vgdisplay', ''],
+ ['vgdisplay', '-v'],
+ ['vgdisplay', '-c'],
+ ['vgdisplay', '-vc'],
+ ['vgs', '--separator :'], # part of lvm, don't need version
+ ['vgs', '-av --separator :'],
+ ['vgs', '-aPv --separator :'],
+ ['vgs', '-v --separator :'],
+ ['vgs', '-o +pv_name --separator :'],
['zfs', 'list'],
- ['zpool', 'list'],
+ ['zpool', 'list'], # don't use version, might not be supported in linux
['zpool', 'list -v'],
);
run_commands(\@cmds,'disk');
@cmds = (
['atacontrol', 'list'],
['camcontrol', 'devlist'],
+ ['camcontrol', 'devlist -v'],
+ ['geom', 'part list'],
['glabel', 'status'],
+ ['gpart', 'list'], # gpart in linux/bsd but do it here again
+ ['gpart', 'show'],
+ ['gpart', 'status'],
['swapctl', '-l -k'],
['swapctl', '-l -k'],
+ ['vmstat', ''],
['vmstat', '-H'],
);
run_commands(\@cmds,'disk-bsd');
}
+
sub display_data {
my (%data,@files,@files2);
my $working = '';
- if ( ! $b_display ){
+ if (!$b_display){
print "Warning: only some of the data collection can occur if you are not in X\n";
main::toucher("$data_dir/display-data-warning-user-not-in-x");
}
- if ( $b_root ){
+ if ($b_root){
print "Warning: only some of the data collection can occur if you are running as Root user\n";
main::toucher("$data_dir/display-data-warning-root-user");
}
print "Collecting Xorg log and xorg.conf files...\n";
- if ( -d "/etc/X11/xorg.conf.d/" ){
+ if (-d "/etc/X11/xorg.conf.d/"){
@files = main::globber("/etc/X11/xorg.conf.d/*");
}
else {
@@ -1623,15 +1938,17 @@ sub display_data {
# keep this updated to handle all possible locations we know about for Xorg.0.log
# not using $system_files{'xorg-log'} for now though it would be best to know what file is used
main::set_xorg_log();
- push (@files, '/var/log/Xorg.0.log');
- push (@files, '/var/lib/gdm/.local/share/xorg/Xorg.0.log');
- push (@files, $ENV{'HOME'} . '/.local/share/xorg/Xorg.0.log');
- push (@files, $system_files{'xorg-log'}) if $system_files{'xorg-log'};
- push (@files, '/etc/X11/xorg.conf');
+ push(@files, '/var/log/Xorg.0.log');
+ push(@files, '/var/lib/gdm/.local/share/xorg/Xorg.0.log');
+ push(@files, $ENV{'HOME'} . '/.local/share/xorg/Xorg.0.log');
+ push(@files, $system_files{'xorg-log'}) if $system_files{'xorg-log'};
+ push(@files, '/etc/X11/XFCconfig-4'); # very old format for xorg.conf
+ push(@files, '/etc/X11/xorg.conf');
copy_files(\@files,'display-xorg');
- print "Collecting X, xprop, glxinfo, xrandr, xdpyinfo data, wayland, weston...\n";
+ print "Collecting X, xprop, glxinfo, xrandr, xdpyinfo data, Wayland info...\n";
%data = (
'desktop-session' => $ENV{'DESKTOP_SESSION'},
+ 'display' => $ENV{'DISPLAY'},
'gdmsession' => $ENV{'GDMSESSION'},
'gnome-desktop-session-id' => $ENV{'GNOME_DESKTOP_SESSION_ID'},
'kde-full-session' => $ENV{'KDE_FULL_SESSION'},
@@ -1641,22 +1958,29 @@ sub display_data {
'xdg-session-desktop' => $ENV{'XDG_SESSION_DESKTOP'},
'xdg-vtnr' => $ENV{'XDG_VTNR'},
# wayland data collectors:
- 'xdg-session-type' => $ENV{'XDG_SESSION_TYPE'},
'wayland-display' => $ENV{'WAYLAND_DISPLAY'},
+ 'xdg-session-type' => $ENV{'XDG_SESSION_TYPE'},
'gdk-backend' => $ENV{'GDK_BACKEND'},
'qt-qpa-platform' => $ENV{'QT_QPA_PLATFORM'},
'clutter-backend' => $ENV{'CLUTTER_BACKEND'},
'sdl-videodriver' => $ENV{'SDL_VIDEODRIVER'},
# program display values
+ 'size-cols-max' => $size{'max-cols'},
'size-indent' => $size{'indent'},
- 'size-indent-min' => $size{'indent-min'},
- 'size-cols-max' => $size{'max'},
+ 'size-lines-max' => $size{'max-lines'},
+ 'size-wrap-width' => $size{'max-wrap'},
);
write_data(\%data,'display');
my @cmds = (
# kde 5/plasma desktop 5, this is maybe an extra package and won't be used
['about-distro',''],
['aticonfig','--adapter=all --od-gettemperature'],
+ ['clinfo',''],
+ ['clinfo','--list'],
+ ['clinfo','--raw'], # machine friendly
+ ['eglinfo',''],
+ ['eglinfo','-B'],
+ ['es2_info',''],
['glxinfo',''],
['glxinfo','-B'],
['kded','--version'],
@@ -1666,43 +1990,68 @@ sub display_data {
['kded4','--version'],
['kded5','--version'],
['kded6','--version'],
+ ['kded7','--version'],
+ ['kf-config','--version'],
['kf4-config','--version'],
['kf5-config','--version'],
['kf6-config','--version'],
+ ['kf7-config','--version'],
['kwin_x11','--version'],
# ['locate','/Xorg'], # for Xorg.wrap problem
['loginctl','--no-pager list-sessions'],
+ ['ls','/sys/class/drm'],
['nvidia-settings','-q screens'],
['nvidia-settings','-c :0.0 -q all'],
['nvidia-smi','-q'],
['nvidia-smi','-q -x'],
['plasmashell','--version'],
+ ['swaymsg','-t get_inputs -p'],
+ ['swaymsg','-t get_inputs -r'],
+ ['swaymsg','-t get_outputs -p'],
+ ['swaymsg','-t get_outputs -r'],
+ ['swaymsg','-t get_tree'],
+ ['swaymsg','-t get_workspaces -p'],
+ ['swaymsg','-t get_workspaces -r'],
['vainfo',''],
['vdpauinfo',''],
['vulkaninfo',''],
+ ['vulkaninfo','--summary'],
+ # ['vulkaninfo','--json'], # outputs to file, not sure how to output to stdout
+ ['wayland-info',''], # wayland-utils
['weston-info',''],
['wmctrl','-m'],
['weston','--version'],
+ ['wlr-randr',''],
['xdpyinfo',''],
+ ['xdriinfo',''],
+ ['Xfbdev','-version'],
['Xorg','-version'],
['xprop','-root'],
['xrandr',''],
+ ['xrandr','--prop'],
+ ['xrandr','--verbose'],
+ ['Xvesa','-version'],
+ ['Xvesa','-listmodes'],
+ ['Xwayland','-version'],
);
run_commands(\@cmds,'display');
}
+
sub network_data {
print "Collecting networking data...\n";
-# no warnings 'uninitialized';
+ # no warnings 'uninitialized';
my @cmds = (
- ['ifconfig',''],
+ ['ifconfig',''], # no version maybe in bsd, --version in linux
+ ['ip','-Version'],
['ip','addr'],
['ip','-s link'],
);
run_commands(\@cmds,'network');
}
+
sub perl_modules {
print "Collecting Perl module data (this can take a while)...\n";
- my @modules = ();
+ my @modules;
my ($dirname,$holder,$mods,$value) = ('','','','');
my $filename = 'perl-modules.txt';
my @inc;
@@ -1711,21 +2060,21 @@ sub perl_modules {
if (-d $_ && $_ ne '.'){
$_ =~ s/\/$//; # just in case, trim off trailing slash
$value .= "EXISTS: $_\n";
- push @inc, $_;
+ push(@inc, $_);
}
else {
$value .= "ABSENT: $_\n";
}
}
main::writer("$data_dir/perl-inc-data.txt",$value);
- File::Find::find { wanted => sub {
- push @modules, File::Spec->canonpath($_) if /\.pm\z/
- }, no_chdir => 1 }, @inc;
- @modules = sort(@modules);
+ File::Find::find({ wanted => sub {
+ push(@modules, File::Spec->canonpath($_)) if /\.pm\z/
+ }, no_chdir => 1 }, @inc);
+ @modules = sort @modules;
foreach (@modules){
my $dir = $_;
$dir =~ s/[^\/]+$//;
- if (!$holder || $holder ne $dir ){
+ if (!$holder || $holder ne $dir){
$holder = $dir;
$value = "DIR: $dir\n";
$_ =~ s/^$dir//;
@@ -1738,18 +2087,22 @@ sub perl_modules {
}
$mods .= $value;
}
- open (my $fh, '>', "$data_dir/$filename");
+ open(my $fh, '>', "$data_dir/$filename");
print $fh $mods;
close $fh;
}
+
sub system_data {
print "Collecting system data...\n";
+ # has to run here because if null, error, list constructor throws fatal error
+ my $ksh = qx(ksh -c 'printf \%s "\$KSH_VERSION"' 2>/dev/null);
my %data = (
'cc' => $ENV{'CC'},
# @(#)MIRBSD KSH R56 2018/03/09: ksh and mksh
- 'ksh-version' => system('ksh -c \'printf %s "$KSH_VERSION"\''), # shell, not env, variable
+ 'ksh-version' => $ksh, # shell, not env, variable
'manpath' => $ENV{'MANPATH'},
'path' => $ENV{'PATH'},
+ 'shell' => $ENV{'SHELL'},
'xdg-config-home' => $ENV{'XDG_CONFIG_HOME'},
'xdg-config-dirs' => $ENV{'XDG_CONFIG_DIRS'},
'xdg-data-home' => $ENV{'XDG_DATA_HOME'},
@@ -1757,14 +2110,14 @@ sub system_data {
);
my @files = main::globber('/usr/bin/gcc*');
if (@files){
- $data{'gcc-versions'} = join "\n",@files;
+ $data{'gcc-versions'} = join("\n", @files);
}
else {
$data{'gcc-versions'} = undef;
}
@files = main::globber('/sys/*');
if (@files){
- $data{'sys-tree-ls-1-basic'} = join "\n", @files;
+ $data{'sys-tree-ls-1-basic'} = join("\n", @files);
}
else {
$data{'sys-tree-ls-1-basic'} = undef;
@@ -1773,20 +2126,30 @@ sub system_data {
# bsd tools http://cb.vu/unixtoolbox.xhtml
my @cmds = (
# general
+ ['sysctl', '-a'],
['sysctl', '-b kern.geom.conftxt'],
['sysctl', '-b kern.geom.confxml'],
['usbdevs','-v'],
# freebsd
+ ['ofwdump','-a'], # arm / soc
+ ['ofwdump','-ar'], # arm / soc
['pciconf','-l -cv'],
['pciconf','-vl'],
['pciconf','-l'],
+ ['usbconfig','dump_device_desc'],
+ ['usbconfig','list'], # needs root, sigh... why?
# openbsd
+ ['ofctl',''], # arm / soc, need to see data sample of this
['pcidump',''],
['pcidump','-v'],
# netbsd
['kldstat',''],
- ['pcictl','list'],
- ['pcictl','list -ns'],
+ ['pcictl','pci0 list'],
+ ['pcictl','pci0 list -N'],
+ ['pcictl','pci0 list -n'],
+ # sunos
+ ['prtdiag',''],
+ ['prtdiag','-v'],
);
run_commands(\@cmds,'system-bsd');
# diskinfo -v <disk>
@@ -1795,15 +2158,23 @@ sub system_data {
['clang','--version'],
# only for prospective ram feature data collection: requires i2c-tools and module eeprom loaded
['decode-dimms',''],
+ ['dmidecode','--version'],
['dmidecode',''],
['dmesg',''],
+ ['fruid_print',''], # elbrus
['gcc','--version'],
- ['hciconfig','-a'],
+ ['getconf','-a'],
+ ['getconf','-l'], # openbsd
['initctl','list'],
+ ['ipmi-sensors','-V'], # version
['ipmi-sensors',''],
['ipmi-sensors','--output-sensor-thresholds'],
+ ['ipmitool','-V'],# version
['ipmitool','sensor'],
- ['lscpu',''],
+ ['lscpu',''],# part of util-linux
+ ['lsmem',''],
+ ['lsmem','--all'],
+ ['lspci','--version'],
['lspci',''],
['lspci','-k'],
['lspci','-n'],
@@ -1817,54 +2188,78 @@ sub system_data {
['lspci','-mmv'],
['lspci','-mmnn'],
['lspci','-v'],
+ ['lsusb','--version'],
['lsusb',''],
['lsusb','-t'],
['lsusb','-v'],
+ ['ps',''],
['ps','aux'],
+ ['ps','auxww'],
['ps','-e'],
['ps','-p 1'],
['runlevel',''],
['rc-status','-a'],
['rc-status','-l'],
['rc-status','-r'],
+ ['sensors','--version'],
['sensors',''],
+ ['sensors','-j'],
+ ['sensors','-u'],
# leaving this commented out to remind that some systems do not
# support strings --version, but will just simply hang at that command
# which you can duplicate by simply typing: strings then hitting enter.
# ['strings','--version'],
['strings','present'],
['sysctl','-a'],
+ ['systemctl','--version'],
+ ['systemctl','get-default'],
['systemctl','list-units'],
['systemctl','list-units --type=target'],
['systemd-detect-virt',''],
+ ['tlp-stat',''], # no arg outputs all data
+ ['tlp-stat','-s'],
+ ['udevadm','info -e'],
+ ['udevadm','info -p /devices/virtual/dmi/id'],
+ ['udevadm','--version'],
+ ['uname','-a'],
['upower','-e'],
['uptime',''],
['vcgencmd','get_mem arm'],
['vcgencmd','get_mem gpu'],
);
run_commands(\@cmds,'system');
+ my $glob = '/sys/devices/system/cpu/';
+ $glob .= '{cpufreq,cpu*/topology,cpu*/cpufreq,cpu*/cache/index*,smt,';
+ $glob .= 'vulnerabilities}/*';
+ get_glob('sys','cpu',$glob);
@files = main::globber('/dev/bus/usb/*/*');
copy_files(\@files, 'system');
}
+
sub system_files {
print "Collecting system files data...\n";
my (%data,@files,@files2);
- @files = RepoData::get($data_dir);
+ @files = RepoItem::get($data_dir);
copy_files(\@files, 'repo');
# chdir "/etc";
@files = main::globber('/etc/*[-_]{[rR]elease,[vV]ersion,issue}*');
- push (@files, '/etc/issue');
- push (@files, '/etc/lsb-release');
- push (@files, '/etc/os-release');
+ push(@files, '/etc/issue','
+ /etc/lsb-release',
+ '/etc/os-release',
+ '/system/build.prop', # android data file, requires rooted
+ '/var/log/installer/oem-id'); # ubuntu only for oem installs?
copy_files(\@files,'system-distro');
@files = main::globber('/etc/upstream[-_]{[rR]elease,[vV]ersion}/*');
copy_files(\@files,'system-distro');
@files = main::globber('/etc/calamares/branding/*/branding.desc');
copy_files(\@files,'system-distro');
@files = (
+ '/etc/systemd/system/default.target',
'/proc/1/comm',
+ '/proc/bootdata', # elbrus
'/proc/cmdline',
'/proc/cpuinfo',
+ '/proc/iomem',
'/proc/meminfo',
'/proc/modules',
'/proc/net/arp',
@@ -1872,10 +2267,10 @@ sub system_files {
);
@files2=main::globber('/sys/class/power_supply/*/uevent');
if (@files2){
- @files = (@files,@files2);
+ push(@files,@files2);
}
else {
- push (@files, '/sys-class-power-supply-empty');
+ push(@files, '/sys-class-power-supply-empty');
}
copy_files(\@files, 'system');
@files = (
@@ -1887,15 +2282,23 @@ sub system_files {
@files = main::globber('/sys/devices/system/cpu/vulnerabilities/*');
copy_files(\@files,'security');
}
+
## SELF EXECUTE FOR LOG/OUTPUT
sub run_self {
print "Creating $self_name output file now. This can take a few seconds...\n";
print "Starting $self_name from: $self_path\n";
+ my $args = '-FERfJLrploudma --slots --pkg --edid';
+ my $a = ($debugger{'arg'}) ? ' ' . $debugger{'arg'} : '';
my $i = ($option eq 'main-full')? ' -i' : '';
- my $z = ($debugger{'z'}) ? ' -z' : '';
- my $iz = "$i$z";
- $iz =~ s/[\s-]//g;
- my $cmd = "$self_path/$self_name -FRfJrploudmaxxx$i$z --slots --debug 10 -y 120 > $data_dir/$self_name-FRfJrploudmaxxx$iz-slots-y120.txt 2>&1";
+ my $z = ($debugger{'filter'}) ? ' -z' : '';
+ my $w = ($debugger{'width'}) ? $debugger{'width'} : 120;
+ $args = $debugger{'arg-use'} if $debugger{'arg-use'};
+ $args = "$args$a$i$z --debug 10 -y $w";
+ my $arg_string = $args;
+ $arg_string =~ s/\s//g;
+ my $self_file = "$data_dir/$self_name$arg_string.txt";
+ my $cmd = "$self_path/$self_name $args > $self_file 2>&1";
+ # print "Args: $args\nArg String: $arg_string\n";exit;
system($cmd);
copy($log_file, "$data_dir") or main::error_handler('copy-failed', "$log_file", "$!");
system("$self_path/$self_name --recommends -y 120 > $data_dir/$self_name-recommends-120.txt 2>&1");
@@ -1907,7 +2310,7 @@ sub copy_files {
my ($absent,$error,$good,$name,$unreadable);
my $directory = ($alt_dir) ? $alt_dir : $data_dir;
my $working = ($type ne 'proc') ? "$type-file-": '';
- foreach (@$files_ref) {
+ foreach (@$files_ref){
$name = $_;
$name =~ s/^\///;
$name =~ s/\//~/g;
@@ -1918,7 +2321,7 @@ sub copy_files {
$error = $name . '-error';
$unreadable = $name . '-unreadable';
# proc have already been tested for readable/exists
- if ($type eq 'proc' || -e $_ ) {
+ if ($type eq 'proc' || -e $_){
print "F:$_\n" if $type eq 'proc' && $debugger{'proc-print'};
if ($type eq 'proc' || -r $_){
copy($_,"$good") or main::toucher($error);
@@ -1932,48 +2335,69 @@ sub copy_files {
}
}
}
+
sub run_commands {
my ($cmds,$type) = @_;
my $holder = '';
my ($name,$cmd,$args);
- foreach (@$cmds){
- my @rows = @$_;
- if (my $program = main::check_program($rows[0])){
- if ($rows[1] eq 'present'){
- $name = "$data_dir/$type-cmd-$rows[0]-present";
+ foreach my $rows (@$cmds){
+ if (my $program = main::check_program($rows->[0])){
+ if ($rows->[1] eq 'present'){
+ $name = "$data_dir/$type-cmd-$rows->[0]-present";
main::toucher($name);
}
else {
- $args = $rows[1];
+ $args = $rows->[1];
$args =~ s/\s|--|\/|=/-/g; # for:
$args =~ s/--/-/g;# strip out -- that result from the above
$args =~ s/^-//g;
$args = "-$args" if $args;
- $name = "$data_dir/$type-cmd-$rows[0]$args.txt";
- $cmd = "$program $rows[1] >$name 2>&1";
+ $name = "$data_dir/$type-cmd-$rows->[0]$args.txt";
+ $cmd = "$program $rows->[1] >$name 2>&1";
system($cmd);
}
}
else {
- if ($holder ne $rows[0]){
- $name = "$data_dir/$type-cmd-$rows[0]-absent";
+ if ($holder ne $rows->[0]){
+ $name = "$data_dir/$type-cmd-$rows->[0]-absent";
main::toucher($name);
- $holder = $rows[0];
+ $holder = $rows->[0];
}
}
}
}
+
+sub get_glob {
+ my ($type,$id,$glob) = @_;
+ my @files = main::globber($glob);
+ return if !@files;
+ my ($item,@result);
+ foreach (sort @files){
+ next if -d $_;
+ if (-r $_) {
+ $item = main::reader($_,'strip',0);
+ }
+ else {
+ $item = main::message('root-required');
+ }
+ $item = main::message('undefined') if !defined $item;
+ push(@result,$_ . '::' . $item);
+ }
+ # print Data::Dumper::Dumper \@result;
+ main::writer("$data_dir/$type-data-$id-glob.txt",\@result);
+}
+
sub write_data {
my ($data_ref, $type) = @_;
my ($empty,$error,$fh,$good,$name,$undefined,$value);
- foreach (keys %$data_ref) {
- $value = $$data_ref{$_};
+ foreach (keys %$data_ref){
+ $value = $data_ref->{$_};
$name = "$data_dir/$type-data-$_";
$good = $name . '.txt';
$empty = $name . '-empty';
$error = $name . '-error';
$undefined = $name . '-undefined';
- if (defined $value) {
+ if (defined $value){
if ($value || $value eq '0'){
open($fh, '>', $good) or main::toucher($error);
print $fh "$value";
@@ -1987,21 +2411,22 @@ sub write_data {
}
}
}
+
## TOOLS FOR DIRECTORY TREE/LS/TRAVERSE; UPLOADER
sub build_tree {
my ($which) = @_;
- if ( $which eq 'sys' && main::check_program('tree') ){
+ if ($which eq 'sys' && main::check_program('tree')){
print "Constructing /$which tree data...\n";
my $dirname = '/sys';
my $cmd;
system("tree -a -L 10 /sys > $data_dir/sys-data-tree-full-10.txt");
- opendir my($dh), $dirname or main::error_handler('open-dir',"$dirname", "$!");
- my @files = readdir $dh;
+ opendir(my $dh, $dirname) or main::error_handler('open-dir',"$dirname", "$!");
+ my @files = readdir($dh);
closedir $dh;
foreach (@files){
next if /^\./;
$cmd = "tree -a -L 10 $dirname/$_ > $data_dir/sys-data-tree-$_-10.txt";
- #print "$cmd\n";
+ # print "$cmd\n";
system($cmd);
}
}
@@ -2012,7 +2437,7 @@ sub build_tree {
directory_ls($which,3);
directory_ls($which,4);
}
- elsif ($which eq 'proc') {
+ elsif ($which eq 'proc'){
directory_ls('proc',1);
directory_ls('proc',2,'[a-z]');
# don't want the /proc/self or /proc/thread-self directories, those are
@@ -2024,36 +2449,39 @@ sub build_tree {
# include is basic regex for ls path syntax, like [a-z]
sub directory_ls {
- my ( $dir,$depth,$include) = @_;
+ my ($dir,$depth,$include) = @_;
$include ||= '';
my ($exclude) = ('');
- # wd do NOT want to see anything in self or thread-self!!
+ # we do NOT want to see anything in self or thread-self!!
# $exclude = 'I self -I thread-self' if $dir eq 'proc';
my $cmd = do {
- if ( $depth == 1 ){ "ls -l $exclude /$dir/$include 2>/dev/null" }
- elsif ( $depth == 2 ){ "ls -l $exclude /$dir/$include*/ 2>/dev/null" }
- elsif ( $depth == 3 ){ "ls -l $exclude /$dir/$include*/*/ 2>/dev/null" }
- elsif ( $depth == 4 ){ "ls -l $exclude /$dir/$include*/*/*/ 2>/dev/null" }
- elsif ( $depth == 5 ){ "ls -l $exclude /$dir/$include*/*/*/*/ 2>/dev/null" }
- elsif ( $depth == 6 ){ "ls -l $exclude /$dir/$include*/*/*/*/*/ 2>/dev/null" }
+ if ($depth == 1){ "ls -l $exclude /$dir/$include 2>/dev/null" }
+ elsif ($depth == 2){ "ls -l $exclude /$dir/$include*/ 2>/dev/null" }
+ elsif ($depth == 3){ "ls -l $exclude /$dir/$include*/*/ 2>/dev/null" }
+ elsif ($depth == 4){ "ls -l $exclude /$dir/$include*/*/*/ 2>/dev/null" }
+ elsif ($depth == 5){ "ls -l $exclude /$dir/$include*/*/*/*/ 2>/dev/null" }
+ elsif ($depth == 6){ "ls -l $exclude /$dir/$include*/*/*/*/*/ 2>/dev/null" }
};
- my @working = ();
+ my @working;
my $output = '';
my ($type);
my $result = qx($cmd);
- open my $ch, '<', \$result or main::error_handler('open-data',"$cmd", "$!");
- while ( my $line = <$ch> ){
+ open(my $ch, '<', \$result) or main::error_handler('open-data',"$cmd", "$!");
+ while (my $line = <$ch>){
chomp($line);
$line =~ s/^\s+|\s+$//g;
- @working = split /\s+/, $line;
+ @working = split(/\s+/, $line);
$working[0] ||= '';
- if ( scalar @working > 7 ){
- if ($working[0] =~ /^d/ ){
+ if (scalar @working > 7){
+ if ($working[0] =~ /^d/){
$type = "d - ";
}
elsif ($working[0] =~ /^l/){
$type = "l - ";
}
+ elsif ($working[0] =~ /^c/){
+ $type = "c - ";
+ }
else {
$type = "f - ";
}
@@ -2061,48 +2489,51 @@ sub directory_ls {
$working[10] ||= '';
$output = $output . " $type$working[8] $working[9] $working[10]\n";
}
- elsif ( $working[0] !~ /^total/ ){
+ elsif ($working[0] !~ /^total/){
$output = $output . $line . "\n";
}
}
close $ch;
my $file = "$data_dir/$dir-data-ls-$depth.txt";
- open my $fh, '>', $file or main::error_handler('create',"$file", "$!");
+ open(my $fh, '>', $file) or main::error_handler('create',"$file", "$!");
print $fh $output;
close $fh;
# print "$output\n";
}
+
sub proc_traverse_data {
print "Building /proc file list...\n";
# get rid pointless error:Can't cd to (/sys/kernel/) debug: Permission denied
- no warnings 'File::Find';
+ #no warnings 'File::Find';
+ no warnings;
$parse_src = 'proc';
- File::Find::find( \&wanted, "/proc");
- proc_traverse_processor();
+ File::Find::find(\&wanted, "/proc");
+ process_proc_traverse();
@content = ();
}
-sub proc_traverse_processor {
+
+sub process_proc_traverse {
my ($data,$fh,$result,$row,$sep);
my $proc_dir = "$data_dir/proc";
print "Adding /proc files...\n";
mkdir $proc_dir or main::error_handler('mkdir', "$proc_dir", "$!");
# @content = sort @content;
copy_files(\@content,'proc',$proc_dir);
-# foreach (@content){
-# print "$_\n";
-# }
+ # foreach (@content){print "$_\n";}
}
sub sys_traverse_data {
print "Building /sys file list...\n";
# get rid pointless error:Can't cd to (/sys/kernel/) debug: Permission denied
- no warnings 'File::Find';
+ #no warnings 'File::Find';
+ no warnings;
$parse_src = 'sys';
- File::Find::find( \&wanted, "/sys");
- sys_traverse_processsor();
+ File::Find::find(\&wanted, "/sys");
+ process_sys_traverse();
@content = ();
}
-sub sys_traverse_processsor {
+
+sub process_sys_traverse {
my ($data,$fh,$result,$row,$sep);
my $filename = "sys-data-parse.txt";
print "Parsing /sys files...\n";
@@ -2116,8 +2547,8 @@ sub sys_traverse_processsor {
open($fh, '<', $_) or $b_fh = 0;
# needed for removing -T test and root
if ($b_fh){
- while ($row = <$fh>) {
- chomp $row;
+ while ($row = <$fh>){
+ chomp($row);
$data .= $sep . '"' . $row . '"';
$sep=', ';
}
@@ -2129,26 +2560,50 @@ sub sys_traverse_processsor {
# print "$_:[$data]\n"
}
# print scalar @content . "\n";
- open ($fh, '>', "$data_dir/$filename");
+ open($fh, '>', "$data_dir/$filename");
print $fh $result;
close $fh;
# print $fh "$result";
}
+# perl compiler complains on start if prune = 1 used only once, so either
+# do $File::Find::prune = 1 if !$File::Find::prune; OR use no warnings 'once'
sub wanted {
+ # note: we want these directories pruned before the -d test so find
+ # doesn't try to read files inside of the directories
+ if ($parse_src eq 'proc'){
+ if ($File::Find::name =~ m!^/proc/[0-9]+! ||
+ # /proc/registry is from cygwin, we never want to see that
+ $File::Find::name =~ m!^/proc/(irq|spl|sys|reg)! ||
+ # these choke on sudo/root: kmsg kcore kpage and we don't want keys or kallsyms
+ $File::Find::name =~ m!^/proc/k! ||
+ $File::Find::name =~ m!^/proc/bus/pci!){
+ $File::Find::prune = 1;
+ return;
+ }
+ }
+ elsif ($parse_src eq 'sys'){
+ # note: a new file in 4.11 /sys can hang this, it is /parameter/ then
+ # a few variables. Since inxi does not need to see that file, we will
+ # not use it.
+ if ($File::Find::name =~ m!/(kernel/|trace/|parameters|debug)!){
+ $File::Find::prune = 1;
+ }
+ }
return if -d; # not directory
return unless -e; # Must exist
return unless -f; # Must be file
return unless -r; # Must be readable
if ($parse_src eq 'sys'){
- # note: a new file in 4.11 /sys can hang this, it is /parameter/ then
- # a few variables. Since inxi does not need to see that file, we will
- # not use it. Also do not need . files or __ starting files
# print $File::Find::name . "\n";
# block maybe: cfgroup\/
# picdec\/|, wait_for_fb_sleep/wake is an odroid thing caused hang
- return if $File::Find::name =~ /(^\/sys\/power\/wait_for_fb)/;
- return if $File::Find::name =~ /\/(\.[a-z]|kernel\/|trace\/|parameters\/|debug\/)/;
+ # wakeup_count also fails for android, but works fine on regular systems
+ return if $risc{'arm'} && $File::Find::name =~ m!^/sys/power/(wait_for_fb_|wakeup_count$)!;
+ # do not need . files or __ starting files
+ return if $File::Find::name =~ m!/\.[a-z]!;
+ # pp_num_states: amdgpu driver bug; android: wakeup_count
+ return if $File::Find::name =~ m!/pp_num_states$!;
# comment this one out if you experience hangs or if
# we discover syntax of foreign language characters
# Must be ascii like. This is questionable and might require further
@@ -2157,29 +2612,22 @@ sub wanted {
# the readable tests in copy_files()
# return unless -T;
}
- elsif ($parse_src eq 'proc') {
- return if $File::Find::name =~ /^\/proc\/[0-9]+\//;
- return if $File::Find::name =~ /^\/proc\/bus\/pci\//;
- return if $File::Find::name =~ /^\/proc\/(irq|spl|sys)\//;
- # these choke on sudo/root: kmsg kcore kpage and we don't want keys or kallsyms
- return if $File::Find::name =~ /^\/proc\/k/;
- return if $File::Find::name =~ /(\/mb_groups|debug)$/;
+ elsif ($parse_src eq 'proc'){
+ return if $File::Find::name =~ m!(/mb_groups|debug)$!;
}
# print $File::Find::name . "\n";
- push (@content, $File::Find::name);
+ push(@content, $File::Find::name);
return;
}
-# args: 1 - path to file to be uploaded
-# args: 2 - optional: alternate ftp upload url
+
+# args: 0: path to file to be uploaded; 1: optional: alternate ftp upload url
# NOTE: must be in format: ftp.site.com/incoming
sub upload_file {
- require Net::FTP;
- import Net::FTP;
my ($self, $ftp_url) = @_;
my ($ftp, $domain, $host, $user, $pass, $dir, $error);
$ftp_url ||= main::get_defaults('ftp-upload');
$ftp_url =~ s/\/$//g; # trim off trailing slash if present
- my @url = split(/\//, $ftp_url);
+ my @url = split('/', $ftp_url);
my $file_path = "$user_data_dir/$debug_gz";
$host = $url[0];
$dir = $url[1];
@@ -2187,13 +2635,11 @@ sub upload_file {
$domain =~ s/^ftp\.//;
$user = "anonymous";
$pass = "anonymous\@$domain";
-
print $line3;
print "Uploading to: $ftp_url\n";
# print "$host $domain $dir $user $pass\n";
print "File to be uploaded:\n$file_path\n";
-
- if ($host && ( $file_path && -e $file_path ) ){
+ if ($host && ($file_path && -e $file_path)){
# NOTE: important: must explicitly set to passive true/1
$ftp = Net::FTP->new($host, Debug => 0, Passive => 1) || main::error_handler('ftp-connect', $ftp->message);
$ftp->login($user, $pass) || main::error_handler('ftp-login', $ftp->message);
@@ -2216,6 +2662,37 @@ sub upload_file {
}
}
}
+
+# see docs/optimization.txt
+sub ram_use {
+ my ($name, $ref) = @_;
+ printf "%-25s %5d %5d\n", $name, size($ref), total_size($ref);
+}
+
+# Used to create user visible debuugging output for complicated scenarios
+# args: 0: $type; 1: data (scalar or array/hash ref); 2: 0/1 dbg item;
+sub feature_debugger {
+ my ($type,$data,$b_switch) = @_;
+ my @result;
+ push(@result,'sub: ' . (caller(1))[3],'type: ' . $type);
+ if (ref $data eq 'ARRAY' || ref $data eq 'HASH'){
+ $data = Data::Dumper::Dumper $data;
+ }
+ else {
+ $data .= "\n" if !$b_log;
+ }
+ push(@result,'data: ' . $data);
+ # note, if --debug 3 and eg. --dbg 63 used, we want this to print out
+ if (!$b_log || ($b_switch && $debugger{'level'} < 10)){
+ unshift(@result,'------------------');
+ push(@result,"------------------\n") if $b_log;
+ print join("\n",@result);
+ }
+ else {
+ main::log_data('dump','feature dbg @result',\@result);
+ }
+}
+
# random tests for various issues
sub user_debug_test_1 {
# open(my $duped, '>&', STDOUT);
@@ -2228,35 +2705,36 @@ sub user_debug_test_1 {
# print "With binmode: ", $item,"\n";
# print "Perl IO data:\n";
# print(join(', ', PerlIO::get_layers(STDOUT)), "\n");
-# close($duped);
+# close $duped;
}
#### -------------------------------------------------------------------
#### DOWNLOADER
#### -------------------------------------------------------------------
+# args: 0: download type; 1: url; 2: file; 3: [ua type string]
sub download_file {
my ($type, $url, $file,$ua) = @_;
my ($cmd,$args,$timeout) = ('','','');
my $debug_data = '';
my $result = 1;
$ua = ($ua && $dl{'ua'}) ? $dl{'ua'} . $ua : '';
- $dl{'no-ssl-opt'} ||= '';
+ $dl{'no-ssl'} ||= '';
$dl{'spider'} ||= '';
$file ||= 'N/A'; # to avoid debug error
- if ( ! $dl{'dl'} ){
+ if (!$dl{'dl'}){
return 0;
}
if ($dl{'timeout'}){
$timeout = "$dl{'timeout'}$dl_timeout";
}
- # print "$dl{'no-ssl-opt'}\n";
+ # print "$dl{'no-ssl'}\n";
# print "$dl{'dl'}\n";
# tiny supports spider sort of
## NOTE: 1 is success, 0 false for Perl
- if ($dl{'dl'} eq 'tiny' ){
+ if ($dl{'dl'} eq 'tiny'){
$cmd = "Using tiny: type: $type \nurl: $url \nfile: $file";
- $result = get_file($type, $url, $file);
+ $result = get_file_http_tiny($type,$url,$file,$ua);
$debug_data = ($type ne 'stdout') ? $result : 'Success: stdout data not null.';
}
# But: 0 is success, and 1 is false for these
@@ -2265,69 +2743,71 @@ sub download_file {
else {
if ($type eq 'stdout'){
$args = $dl{'stdout'};
- $cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $ua $timeout $args \"$url\" $dl{'null'}";
+ $cmd = "$dl{'dl'} $dl{'no-ssl'} $ua $timeout $args \"$url\" $dl{'null'}";
$result = qx($cmd);
$debug_data = ($result) ? 'Success: stdout data not null.' : 'Download resulted in null data!';
}
- elsif ($type eq 'file') {
+ elsif ($type eq 'file'){
$args = $dl{'file'};
- $cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $ua $timeout $args $file \"$url\" $dl{'null'}";
+ $cmd = "$dl{'dl'} $dl{'no-ssl'} $ua $timeout $args $file \"$url\" $dl{'null'}";
system($cmd);
$result = ($?) ? 0 : 1; # reverse these into Perl t/f
$debug_data = $result;
}
- elsif ( $dl{'dl'} eq 'wget' && $type eq 'spider'){
- $cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $ua $timeout $dl{'spider'} \"$url\"";
+ elsif ($dl{'dl'} eq 'wget' && $type eq 'spider'){
+ $cmd = "$dl{'dl'} $dl{'no-ssl'} $ua $timeout $dl{'spider'} \"$url\"";
system($cmd);
$result = ($?) ? 0 : 1; # reverse these into Perl t/f
$debug_data = $result;
}
}
- print "-------\nDownloader Data:\n$cmd\nResult: $debug_data\n" if $test[1];
+ print "-------\nDownloader Data:\n$cmd\nResult: $debug_data\n" if $dbg[1];
log_data('data',"$cmd\nResult: $result") if $b_log;
return $result;
}
-sub get_file {
- my ($type, $url, $file) = @_;
- my $tiny = HTTP::Tiny->new;
+sub get_file_http_tiny {
+ my ($type,$url,$file,$ua) = @_;
+ $ua = ($ua && $dl{'ua'}) ? $dl{'ua'} . $ua: '';
+ my %headers = ($ua) ? ('agent' => $ua) : ();
+ my $tiny = HTTP::Tiny->new(%headers);
# note: default is no verify, so default here actually is to verify unless overridden
- $tiny->verify_SSL => 1 if !$dl{'no-ssl-opt'};
+ $tiny->verify_SSL => 1 if !$use{'no-ssl'};
my $response = $tiny->get($url);
my $return = 1;
my $debug = 0;
my $fh;
$file ||= 'N/A';
- log_data('dump','%{$response}',\%{$response}) if $b_log;
- # print Dumper \%{$response};
- if ( ! $response->{success} ){
- my $content = $response->{content};
+ log_data('dump','%{$response}',$response) if $b_log;
+ # print Dumper $response;
+ if (!$response->{'success'}){
+ my $content = $response->{'content'};
$content ||= "N/A\n";
my $msg = "Failed to connect to server/file!\n";
$msg .= "Response: ${content}Downloader: HTTP::Tiny URL: $url\nFile: $file";
log_data('data',$msg) if $b_log;
- print error_defaults('download-error',$msg) if $test[1];
+ print error_defaults('download-error',$msg) if $dbg[1];
$return = 0;
}
else {
- if ( $debug ){
+ if ($debug){
print "$response->{success}\n";
print "$response->{status} $response->{reason}\n";
- while (my ($key, $value) = each %{$response->{headers}}) {
- for (ref $value eq "ARRAY" ? @$value : $value) {
+ while (my ($key, $value) = each %{$response->{'headers'}}){
+ for (ref $value eq "ARRAY" ? @$value : $value){
print "$key: $_\n";
}
}
}
- if ( $type eq "stdout" || $type eq "ua-stdout" ){
- $return = $response->{content};
+ if ($type eq "stdout" || $type eq "ua-stdout"){
+ $return = $response->{'content'};
}
elsif ($type eq "spider"){
# do nothing, just use the return value
}
elsif ($type eq "file"){
open($fh, ">", $file);
- print $fh $response->{content}; # or die "can't write to file!\n";
+ print $fh $response->{'content'}; # or die "can't write to file!\n";
close $fh;
}
}
@@ -2337,6 +2817,7 @@ sub get_file {
sub set_downloader {
eval $start if $b_log;
my $quiet = '';
+ my $ua_raw = 's-tools/' . $self_name . '-';
$dl{'no-ssl'} = '';
$dl{'null'} = '';
$dl{'spider'} = '';
@@ -2344,61 +2825,69 @@ sub set_downloader {
# It is NOT part of core modules. IO::Socket::SSL is also required
# For some https connections so only use tiny as option if both present
if ($dl{'tiny'}){
- if (check_module('HTTP::Tiny') && check_module('IO::Socket::SSL')){
- import HTTP::Tiny;
- import IO::Socket::SSL;
+ # this only for -U 4, grab file with ftp to avoid unsupported SSL issues
+ if ($use{'ftp-download'}){
+ $dl{'tiny'} = 0;
+ }
+ elsif (check_perl_module('HTTP::Tiny') && check_perl_module('IO::Socket::SSL')){
+ HTTP::Tiny->import;
+ IO::Socket::SSL->import;
$dl{'tiny'} = 1;
}
else {
$dl{'tiny'} = 0;
}
}
- #print $dl{'tiny'} . "\n";
+ # print $dl{'tiny'} . "\n";
if ($dl{'tiny'}){
$dl{'dl'} = 'tiny';
$dl{'file'} = '';
$dl{'stdout'} = '';
$dl{'timeout'} = '';
+ $dl{'ua'} = $ua_raw;
}
- elsif ( $dl{'curl'} && check_program('curl') ){
- $quiet = '-s ' if !$test[1];
+ elsif ($dl{'curl'} && check_program('curl')){
+ $quiet = '-s ' if !$dbg[1];
$dl{'dl'} = 'curl';
$dl{'file'} = " -L ${quiet}-o ";
$dl{'no-ssl'} = ' --insecure';
$dl{'stdout'} = " -L ${quiet}";
$dl{'timeout'} = ' -y ';
- $dl{'ua'} = ' -A ' . $dl_ua;
+ $dl{'ua'} = ' -A ' . $ua_raw;
}
- elsif ($dl{'wget'} && check_program('wget') ){
- $quiet = '-q ' if !$test[1];
+ elsif ($dl{'wget'} && check_program('wget')){
+ $quiet = '-q ' if !$dbg[1];
$dl{'dl'} = 'wget';
$dl{'file'} = " ${quiet}-O ";
$dl{'no-ssl'} = ' --no-check-certificate';
$dl{'spider'} = " ${quiet}--spider";
$dl{'stdout'} = " $quiet -O -";
$dl{'timeout'} = ' -T ';
- $dl{'ua'} = ' -U ' . $dl_ua;
+ $dl{'ua'} = ' -U ' . $ua_raw;
}
elsif ($dl{'fetch'} && check_program('fetch')){
- $quiet = '-q ' if !$test[1];
+ $quiet = '-q ' if !$dbg[1];
$dl{'dl'} = 'fetch';
$dl{'file'} = " ${quiet}-o ";
$dl{'no-ssl'} = ' --no-verify-peer';
$dl{'stdout'} = " ${quiet}-o -";
$dl{'timeout'} = ' -T ';
+ $dl{'ua'} = ' --user-agent=' . $ua_raw;
}
- elsif ( $bsd_type eq 'openbsd' && check_program('ftp') ){
+ # at least openbsd/netbsd
+ elsif ($bsd_type && check_program('ftp')){
$dl{'dl'} = 'ftp';
$dl{'file'} = ' -o ';
$dl{'null'} = ' 2>/dev/null';
$dl{'stdout'} = ' -o - ';
$dl{'timeout'} = '';
+ $dl{'ua'} = ' -U ' . $ua_raw;
}
else {
$dl{'dl'} = '';
}
- # no-ssl-opt is set to 1 with --no-ssl, so it is true, then assign
- $dl{'no-ssl-opt'} = $dl{'no-ssl'} if $dl{'no-ssl-opt'};
+ # $use{'no-ssl' is set to 1 with --no-ssl, when false, unset to ''
+ $dl{'no-ssl'} = '' if !$use{'no-ssl'};
eval $end if $b_log;
}
@@ -2414,81 +2903,93 @@ sub set_perl_downloader {
sub error_handler {
eval $start if $b_log;
- my ( $err, $one, $two) = @_;
+ my ($err,$one,$two) = @_;
my ($b_help,$b_recommends);
my ($b_exit,$errno) = (1,0);
my $message = do {
- if ( $err eq 'empty' ) { 'empty value' }
+ if ($err eq 'empty'){ 'empty value' }
## Basic rules
- elsif ( $err eq 'not-in-irc' ) {
+ elsif ($err eq 'not-in-irc'){
$errno=1; "You can't run option $one in an IRC client!" }
## Internal/external options
- elsif ( $err eq 'bad-arg' ) {
+ elsif ($err eq 'bad-arg'){
$errno=10; $b_help=1; "Unsupported value: $two for option: $one" }
- elsif ( $err eq 'bad-arg-int' ) {
+ elsif ($err eq 'bad-arg-int'){
$errno=11; "Bad internal argument: $one" }
- elsif ( $err eq 'distro-block' ) {
+ elsif ($err eq 'arg-modifier'){
+ $errno=10; $b_help=1; "Missing option: $one must be used with: $two" }
+ elsif ($err eq 'distro-block'){
$errno=20; "Option: $one has been disabled by the $self_name distribution maintainer." }
- elsif ( $err eq 'option-feature-incomplete' ) {
+ elsif ($err eq 'option-feature-incomplete'){
$errno=21; "Option: '$one' feature: '$two' has not been implemented yet." }
- elsif ( $err eq 'unknown-option' ) {
+ elsif ($err eq 'unknown-option'){
$errno=22; $b_help=1; "Unsupported option: $one" }
+ elsif ($err eq 'option-deprecated'){
+ $errno=23; $b_exit=0;
+ "The option: $one has been deprecated. Please use $two instead." }
+ elsif ($err eq 'option-removed'){
+ $errno=24; $b_help=1; "The option: $one has been remnoved. Please use $two instead." }
## Data
- elsif ( $err eq 'open-data' ) {
+ elsif ($err eq 'open-data'){
$errno=32; "Error opening data for reading: $one \nError: $two" }
- elsif ( $err eq 'download-error' ) {
+ elsif ($err eq 'download-error'){
$errno=33; "Error downloading file with $dl{'dl'}: $one \nError: $two" }
## Files:
- elsif ( $err eq 'copy-failed' ) {
+ elsif ($err eq 'copy-failed'){
$errno=40; "Error copying file: $one \nError: $two" }
- elsif ( $err eq 'create' ) {
+ elsif ($err eq 'create'){
$errno=41; "Error creating file: $one \nError: $two" }
- elsif ( $err eq 'downloader-error' ) {
+ elsif ($err eq 'downloader-error'){
$errno=42; "Error downloading file: $one \nfor download source: $two" }
- elsif ( $err eq 'file-corrupt' ) {
+ elsif ($err eq 'file-corrupt'){
$errno=43; "Downloaded file is corrupted: $one" }
- elsif ( $err eq 'mkdir' ) {
+ elsif ($err eq 'mkdir'){
$errno=44; "Error creating directory: $one \nError: $two" }
- elsif ( $err eq 'open' ) {
+ elsif ($err eq 'open'){
$errno=45; $b_exit=0; "Error opening file: $one \nError: $two" }
- elsif ( $err eq 'open-dir' ) {
+ elsif ($err eq 'open-dir'){
$errno=46; "Error opening directory: $one \nError: $two" }
- elsif ( $err eq 'output-file-bad' ) {
+ elsif ($err eq 'output-file-bad'){
$errno=47; "Value for --output-file must be full path, a writable directory, \nand include file name. Path: $two" }
- elsif ( $err eq 'not-writable' ) {
+ elsif ($err eq 'not-writable'){
$errno=48; "The file: $one is not writable!" }
- elsif ( $err eq 'open-dir-failed' ) {
+ elsif ($err eq 'open-dir-failed'){
$errno=49; "The directory: $one failed to open with error: $two" }
- elsif ( $err eq 'remove' ) {
+ elsif ($err eq 'remove'){
$errno=50; "Failed to remove file: $one Error: $two" }
- elsif ( $err eq 'rename' ) {
+ elsif ($err eq 'rename'){
$errno=51; "There was an error moving files: $one\nError: $two" }
- elsif ( $err eq 'write' ) {
+ elsif ($err eq 'write'){
$errno=52; "Failed writing file: $one - Error: $two!" }
+ elsif ($err eq 'dir-missing'){
+ $errno=53; "Directory supplied for option $one does not exist:\n $two" }
## Downloaders
- elsif ( $err eq 'missing-downloader' ) {
+ elsif ($err eq 'missing-downloader'){
$errno=60; "Downloader program $two could not be located on your system." }
- elsif ( $err eq 'missing-perl-downloader' ) {
+ elsif ($err eq 'missing-perl-downloader'){
$errno=61; $b_recommends=1; "Perl downloader missing required module." }
## FTP
- elsif ( $err eq 'ftp-bad-path' ) {
+ elsif ($err eq 'ftp-bad-path'){
$errno=70; "Unable to locate for FTP upload file:\n$one" }
- elsif ( $err eq 'ftp-connect' ) {
+ elsif ($err eq 'ftp-connect'){
$errno=71; "There was an error with connection to ftp server: $one" }
- elsif ( $err eq 'ftp-login' ) {
+ elsif ($err eq 'ftp-login'){
$errno=72; "There was an error with login to ftp server: $one" }
- elsif ( $err eq 'ftp-upload' ) {
+ elsif ($err eq 'ftp-upload'){
$errno=73; "There was an error with upload to ftp server: $one" }
## Modules
- elsif ( $err eq 'required-module' ) {
+ elsif ($err eq 'required-module'){
$errno=80; $b_recommends=1; "The required $one Perl module is not installed:\n$two" }
+ ## Programs
+ elsif ($err eq 'required-program'){
+ $errno=90; "Required program '$one' could not be located on your system.\nNeeded for: $two" }
## DEFAULT
else {
$errno=255; "Error handler ERROR!! Unsupported options: $err!"}
};
print_line("Error $errno: $message\n");
if ($b_help){
- print_line("Check -h for correct parameters.\n");
+ print_line("Check -h for correct useage.\n");
}
if ($b_recommends){
print_line("See --recommends for more information.\n");
@@ -2513,45 +3014,44 @@ sub error_defaults {
## CheckRecommends
{
package CheckRecommends;
+my ($item_data,@modules,@pms);
+
sub run {
main::error_handler('not-in-irc', 'recommends') if $b_irc;
my (@data,@rows);
- my $line = make_line();
- my $pm = get_pm();
- @data = basic_data($line,$pm);
- push @rows,@data;
+ my $rows = [];
+ my $line = main::make_line();
+ @pms = get_pms();
+ set_item_data();
+ basic_data($rows,$line);
if (!$bsd_type){
- @data = check_items('required system directories',$line,$pm);
- push @rows,@data;
- }
- @data = check_items('recommended system programs',$line,$pm);
- push @rows,@data;
- @data = check_items('recommended display information programs',$line,$pm);
- push @rows,@data;
- @data = check_items('recommended downloader programs',$line,$pm);
- push @rows,@data;
- @data = check_items('recommended Perl modules',$line,$pm);
- push @rows,@data;
- @data = check_items('recommended directories',$line,'');
- push @rows,@data;
- @data = check_items('recommended files',$line,'');
- push @rows,@data;
- @data = (
+ check_items($rows,'required system directories',$line);
+ }
+ check_items($rows,'recommended system programs',$line);
+ check_items($rows,'recommended display information programs',$line);
+ check_items($rows,'recommended downloader programs',$line);
+ if (!$bsd_type){
+ check_items($rows,'recommended kernel modules',$line);
+ }
+ check_items($rows,'recommended Perl modules',$line);
+ check_items($rows,'recommended directories',$line);
+ check_items($rows,'recommended files',$line);
+ push(@$rows,
['0', '', '', "$line"],
['0', '', '', "Ok, all done with the checks. Have a nice day."],
- ['0', '', '', " "],
+ ['0', '', '', ''],
);
- push @rows,@data;
- #print Data::Dumper::Dumper \@rows;
- main::print_basic(@rows);
+ # print Data::Dumper::Dumper $rows;
+ main::print_basic($rows);
exit 0; # shell true
}
sub basic_data {
- my ($line,$pm_local) = @_;
+ my ($rows,$line) = @_;
my (@data,@rows);
+ $extra = 1; # needed for shell version
+ ShellData::set();
my $client = $client{'name-print'};
- $pm_local ||= 'N/A';
$client .= ' ' . $client{'version'} if $client{'version'};
my $default_shell = 'N/A';
if ($ENV{'SHELL'}){
@@ -2560,28 +3060,39 @@ sub basic_data {
}
my $sh = main::check_program('sh');
my $sh_real = Cwd::abs_path($sh);
- @rows = (
+ push(@$rows,
['0', '', '', "$self_name will now begin checking for the programs it needs
to operate."],
- ['0', '', '', "" ],
+ ['0', '', '', ""],
['0', '', '', "Check $self_name --help or the man page (man $self_name)
- to see what options are available." ],
- ['0', '', '', "$line" ],
- ['0', '', '', "Test: core tools:" ],
- ['0', '', '', "" ],
- ['0', '', '', "Perl version: ^$]" ],
- ['0', '', '', "Current shell: " . $client ],
- ['0', '', '', "Default shell: " . $default_shell ],
- ['0', '', '', "sh links to: $sh_real" ],
- ['0', '', '', "Package manager: $pm_local" ],
+ to see what options are available."],
+ ['0', '', '', "$line"],
+ ['0', '', '', "Test: core tools:"],
+ ['0', '', '', ""],
+ ['0', '', '', "Perl version: ^$]"],
+ ['0', '', '', "Current shell: " . $client],
+ ['0', '', '', "Default shell: " . $default_shell],
+ ['0', '', '', "sh links to: $sh_real"],
);
- return @rows;
+ if (scalar @pms == 0){
+ push(@$rows,['0', '', '', "Package manager(s): No supported PM(s) detected"]);
+ }
+ elsif (scalar @pms == 1){
+ push(@$rows,['0', '', '', "Package manager: $pms[0]"]);
+ }
+ else {
+ push(@$rows,['0', '', '', "Package managers detected:"]);
+ foreach my $pm (@pms){
+ push(@$rows,['0', '', '', " pm: $pm"]);
+ }
+ }
}
+
sub check_items {
- my ($type,$line,$pm) = @_;
- my (@data,%info,@missing,$row,@rows,$result,@unreadable);
- my ($b_dir,$b_file,$b_module,$b_program,$item);
- my ($about,$extra,$extra2,$extra3,$extra4,$info_os,$install) = ('','','','','','info','');
+ my ($rows,$type,$line) = @_;
+ my (@data,@missing,$row,$result,@unreadable);
+ my ($b_dir,$b_file,$b_kernel_module,$b_perl_module,$b_program,$item);
+ my ($about,$extra,$extra2,$extra3,$extra4,$info_os) = ('','','','','','info');
if ($type eq 'required system directories'){
@data = qw(/proc /sys);
$b_dir = 1;
@@ -2589,14 +3100,16 @@ sub check_items {
}
elsif ($type eq 'recommended system programs'){
if ($bsd_type){
- @data = qw(camcontrol dig dmidecode fdisk file glabel gpart ifconfig ipmi-sensors
- ipmitool lsusb sudo smartctl sysctl tree upower uptime usbdevs);
+ @data = qw(camcontrol dig disklabel dmidecode doas fdisk file glabel gpart
+ ifconfig ipmi-sensors ipmitool pciconfig pcidump pcictl smartctl sudo
+ sysctl tree upower uptime usbconfig usbdevs);
$info_os = 'info-bsd';
}
else {
- @data = qw(blockdev dig dmidecode fdisk file hddtemp ifconfig ip ipmitool
- ipmi-sensors lsblk lsusb modinfo runlevel sensors smartctl strings sudo
- tree upower uptime);
+ @data = qw(blockdev bt-adapter btmgmt dig dmidecode doas fdisk file
+ fruid_print hciconfig hddtemp ifconfig ip ipmitool ipmi-sensors lsblk
+ lsusb lvs mdadm modinfo runlevel sensors smartctl strings sudo tree
+ udevadm upower uptime);
}
$b_program = 1;
$item = 'Program';
@@ -2605,11 +3118,13 @@ sub check_items {
}
elsif ($type eq 'recommended display information programs'){
if ($bsd_type){
- @data = qw(glxinfo wmctrl xdpyinfo xprop xrandr);
+ @data = qw(eglinfo glxinfo vulkaninfo wayland-info wmctrl xdpyinfo xprop
+ xdriinfo xrandr);
$info_os = 'info-bsd';
}
else {
- @data = qw(glxinfo wmctrl xdpyinfo xprop xrandr);
+ @data = qw(eglinfo glxinfo vulkaninfo wayland-info wmctrl xdpyinfo xprop
+ xdriinfo xrandr);
}
$b_program = 1;
$item = 'Program';
@@ -2633,14 +3148,33 @@ sub check_items {
$item = 'Program';
}
elsif ($type eq 'recommended Perl modules'){
- @data = qw(HTTP::Tiny IO::Socket::SSL Time::HiRes Cpanel::JSON::XS JSON::XS XML::Dumper Net::FTP);
- $b_module = 1;
+ @data = qw(File::Copy File::Find File::Spec::Functions HTTP::Tiny IO::Socket::SSL
+ Time::HiRes JSON::PP Cpanel::JSON::XS JSON::XS XML::Dumper Net::FTP);
+ if ($bsd_type && $bsd_type eq 'openbsd'){
+ push(@data, qw(OpenBSD::Pledge OpenBSD::Unveil));
+ }
+ $b_perl_module = 1;
$item = 'Perl Module';
$extra = ' (Optional)';
- $extra2 = "None of these are strictly required, but if you have them all, you can eliminate
- some recommended non Perl programs from the install. ";
- $extra3 = "HTTP::Tiny and IO::Socket::SSL must both be present to use as a downloader option.
- For json export Cpanel::JSON::XS is preferred over JSON::XS.";
+ $extra2 = "None of these are strictly required, but if you have them all,
+ you can eliminate some recommended non Perl programs from the install. ";
+ $extra3 = "HTTP::Tiny and IO::Socket::SSL must both be present to use as a
+ downloader option. For json export Cpanel::JSON::XS is preferred over
+ JSON::XS, but JSON::PP is in core modules. To run --debug 20-22 File::Copy,
+ File::Find, and File::Spec::Functions must be present (most distros have
+ these in Core Modules).
+ ";
+ }
+ elsif ($type eq 'recommended kernel modules'){
+ @data = qw(amdgpu drivetemp nouveau radeon);
+ @modules = main::lister('/sys/module/');
+ $b_kernel_module = 1;
+ $extra2 = "GPU modules are only needed if applicable. NVMe drives do not need drivetemp
+ but other types do.";
+ $extra3 = "To load a module: modprobe <module-name> - To permanently load
+ add to /etc/modules or /etc/modules-load.d/modules.conf (check your system
+ paths for exact file/directory names).";
+ $item = 'Kernel Module';
}
elsif ($type eq 'recommended directories'){
if ($bsd_type){
@@ -2648,7 +3182,7 @@ sub check_items {
}
else {
@data = qw(/dev /dev/disk/by-id /dev/disk/by-label /dev/disk/by-path
- /dev/disk/by-uuid /sys/class/dmi/id);
+ /dev/disk/by-uuid /sys/class/dmi/id /sys/class/hwmon);
}
$b_dir = 1;
$item = 'Directory';
@@ -2660,478 +3194,664 @@ sub check_items {
else {
@data = qw(/etc/lsb-release /etc/os-release /proc/asound/cards
/proc/asound/version /proc/cpuinfo /proc/mdstat /proc/meminfo /proc/modules
- /proc/mounts /proc/scsi/scsi /var/log/Xorg.0.log );
+ /proc/mounts /proc/scsi/scsi /var/log/Xorg.0.log);
}
$b_file = 1;
$item = 'File';
$extra2 = "Note that not all of these are used by every system,
so if one is missing it's usually not a big deal.";
}
- @rows = (
+ push(@$rows,
['0', '', '', "$line" ],
['0', '', '', "Test: $type$extra:" ],
- ['0', '', '', " " ],
+ ['0', '', '', ''],
);
if ($extra2){
- $rows[scalar @rows] = (['0', '', '', $extra2]);
- $rows[scalar @rows] = (['0', '', '', ' ']);
+ push(@$rows,
+ ['0', '', '', $extra2],
+ ['0', '', '', '']);
}
if ($extra3){
- $rows[scalar @rows] = (['0', '', '', $extra3]);
- $rows[scalar @rows] = (['0', '', '', ' ']);
- }
- foreach (@data){
- $install = '';
- $about = '';
- %info = item_data($_);
- $about = $info{$info_os};
- if ( ( $b_dir && -d $_ ) || ( $b_file && -r $_ ) ||
- ($b_program && main::check_program($_) ) || ($b_module && main::check_module($_)) ){
+ push(@$rows,
+ ['0', '', '', $extra3],
+ ['0', '', '', '']);
+ }
+ foreach my $item (@data){
+ undef $about;
+ my $info = $item_data->{$item};
+ $about = $info->{$info_os};
+ if (($b_dir && -d $item) || ($b_file && -r $item) ||
+ ($b_program && main::check_program($item)) ||
+ ($b_perl_module && main::check_perl_module($item)) ||
+ ($b_kernel_module && @modules && (grep {/^$item$/} @modules))){
$result = 'Present';
}
- elsif ($b_file && -f $_){
+ elsif ($b_file && -f $item){
$result = 'Unreadable';
- push @unreadable, "$_";
+ push(@unreadable, "$item");
}
else {
$result = 'Missing';
- if (($b_program || $b_module) && $pm){
- $info{$pm} ||= 'N/A';
- $install = " ~ Install package: $info{$pm}";
+ push(@missing,"$item");
+ if (($b_program || $b_perl_module) && @pms){
+ my @install;
+ foreach my $pm (@pms){
+ $info->{$pm} ||= 'N/A';
+ push(@install," $pm: $info->{$pm}");
+ }
+ push(@missing,@install);
}
- push @missing, "$_$install";
}
- $row = make_row($_,$about,$result);
- $rows[scalar @rows] = (['0', '', '', $row]);
+ $row = make_row($item,$about,$result);
+ push(@$rows, ['0', '', '', $row]);
}
- $rows[scalar @rows] = (['0', '', '', " "]);
+ push(@$rows, ['0', '', '', '']);
if (@missing){
- $rows[scalar @rows] = (['0', '', '', "The following $type are missing$extra4:"]);
- foreach (@missing) {
- $rows[scalar @rows] = (['0', '', '', "$item: $_"]);
+ push(@$rows, ['0', '', '', "The following $type are missing$extra4:"]);
+ foreach (@missing){
+ push(@$rows, ['0', '', '', $_]);
}
}
if (@unreadable){
- $rows[scalar @rows] = (['0', '', '', "The following $type are not readable: "]);
- foreach (@unreadable) {
- $rows[scalar @rows] = (['0', '', '', "$item: $_"]);
+ push(@$rows, ['0', '', '', "The following $type are not readable: "]);
+ foreach (@unreadable){
+ push(@$rows, ['0', '', '', "$item: $_"]);
}
}
if (!@missing && !@unreadable){
- $rows[scalar @rows] = (['0', '', '', "All $type are present"]);
+ push(@$rows, ['0', '', '', "All $type are present"]);
}
- return @rows;
}
-sub item_data {
- my ($type) = @_;
- my %data = (
- # Directory Data
- '/sys/class/dmi/id' => ({
- 'info' => '-M system, motherboard, bios',
- }),
- '/dev' => ({
+sub set_item_data {
+ $item_data = {
+ ## Directory Data ##
+ '/dev' => {
'info' => '-l,-u,-o,-p,-P,-D disk partition data',
- }),
- '/dev/disk/by-id' => ({
+ },
+ '/dev/disk/by-id' => {
'info' => '-D serial numbers',
- }),
- '/dev/disk/by-path' => ({
+ },
+ '/dev/disk/by-path' => {
'info' => '-D extra data',
- }),
- '/dev/disk/by-label' => ({
+ },
+ '/dev/disk/by-label' => {
'info' => '-l,-o,-p,-P partition labels',
- }),
- '/dev/disk/by-uuid' => ({
+ },
+ '/dev/disk/by-uuid' => {
'info' => '-u,-o,-p,-P partition uuid',
- }),
- '/proc' => ({
+ },
+ '/proc' => {
'info' => '',
- }),
- '/sys' => ({
+ },
+ '/sys' => {
'info' => '',
- }),
- # File Data
- '/etc/lsb-release' => ({
+ },
+ '/sys/class/dmi/id' => {
+ 'info' => '-M system, motherboard, bios',
+ },
+ '/sys/class/hwmon' => {
+ 'info' => '-s sensor data (fallback if no lm-sensors)',
+ },
+ ## File Data ##
+ '/etc/lsb-release' => {
'info' => '-S distro version data (older version)',
- }),
- '/etc/os-release' => ({
+ },
+ '/etc/os-release' => {
'info' => '-S distro version data (newer version)',
- }),
- '/proc/asound/cards' => ({
+ },
+ '/proc/asound/cards' => {
'info' => '-A sound card data',
- }),
- '/proc/asound/version' => ({
+ },
+ '/proc/asound/version' => {
'info' => '-A ALSA data',
- }),
- '/proc/cpuinfo' => ({
+ },
+ '/proc/cpuinfo' => {
'info' => '-C cpu data',
- }),
- '/proc/mdstat' => ({
+ },
+ '/proc/mdstat' => {
'info' => '-R mdraid data (if you use dm-raid)',
- }),
- '/proc/meminfo' => ({
+ },
+ '/proc/meminfo' => {
'info' => '-I,-tm, -m memory data',
- }),
- '/proc/modules' => ({
+ },
+ '/proc/modules' => {
'info' => '-G module data (sometimes)',
- }),
- '/proc/mounts' => ({
+ },
+ '/proc/mounts' => {
'info' => '-P,-p partition advanced data',
- }),
- '/proc/scsi/scsi' => ({
+ },
+ '/proc/scsi/scsi' => {
'info' => '-D Advanced hard disk data (used rarely)',
- }),
- '/var/log/Xorg.0.log' => ({
+ },
+ '/var/log/Xorg.0.log' => {
'info' => '-G graphics driver load status',
- }),
- '/var/run/dmesg.boot' => ({
+ },
+ '/var/run/dmesg.boot' => {
'info' => '-D,-d disk data',
- }),
+ },
+ ## Kernel Module Data ##
+ 'amdgpu' => {
+ 'info' => '-s, -G AMD GPU sensor data (newer GPUs)',
+ 'info-bsd' => '',
+ },
+ 'drivetemp' => {
+ 'info' => '-Dx drive temperature (kernel >= 5.6)',
+ 'info-bsd' => '',
+ },
+ 'nouveau' => {
+ 'info' => '-s, -G Nvidia GPU sensor data (if using free driver)',
+ 'info-bsd' => '',
+ },
+ 'radeon' => {
+ 'info' => '-s, -G AMD GPU sensor data (older GPUs)',
+ 'info-bsd' => '',
+ },
## START PACKAGE MANAGER BLOCK ##
- # Note: see inxi-perl branch for details: docs/recommends-package-manager.txt
+ # BSD only tools do not list package manager install names
+ ## Programs-System ##
+ # Note: see inxi-perl branch for details: docs/inxi-custom-recommends.txt
# System Tools
- 'blockdev' => ({
+ 'blockdev' => {
'info' => '--admin -p/-P (filesystem blocksize)',
'info-bsd' => '',
'apt' => 'util-linux',
'pacman' => 'util-linux',
+ 'pkgtool' => 'util-linux',
'rpm' => 'util-linux',
- }),
- 'curl' => ({
+ },
+ 'bt-adapter' => {
+ 'info' => '-E bluetooth data (if no hciconfig, btmgmt)',
+ 'info-bsd' => '',
+ 'apt' => 'bluez-tools',
+ 'pacman' => 'bluez-tools',
+ 'pkgtool' => '', # needs to be built by user
+ 'rpm' => 'bluez-tools',
+ },
+ 'btmgmt' => {
+ 'info' => '-E bluetooth data (if no hciconfig)',
+ 'info-bsd' => '',
+ 'apt' => 'bluez',
+ 'pacman' => 'bluez-utils',
+ 'pkgtool' => '', # needs to be built by user
+ 'rpm' => 'bluez',
+ },
+ 'curl' => {
'info' => '-i (if no dig); -w,-W; -U',
'info-bsd' => '-i (if no dig); -w,-W; -U',
'apt' => 'curl',
'pacman' => 'curl',
+ 'pkgtool' => 'curl',
'rpm' => 'curl',
- }),
- 'camcontrol' => ({
+ },
+ 'camcontrol' => {
'info' => '',
'info-bsd' => '-R; -D; -P. Get actual gptid /dev path',
- 'apt' => '',
- 'pacman' => '',
- 'rpm' => '',
- }),
- 'dig' => ({
+ },
+ 'dig' => {
'info' => '-i wlan IP',
'info-bsd' => '-i wlan IP',
'apt' => 'dnsutils',
'pacman' => 'dnsutils',
+ 'pkgtool' => 'bind',
'rpm' => 'bind-utils',
- }),
- 'dmidecode' => ({
+ },
+ 'disklabel' => {
+ 'info' => '',
+ 'info-bsd' => '-j, -p, -P; -R; -o (Open/NetBSD+derived)',
+ },
+ 'dmidecode' => {
'info' => '-M if no sys machine data; -m',
'info-bsd' => '-M if null sysctl; -m; -B if null sysctl',
'apt' => 'dmidecode',
'pacman' => 'dmidecode',
+ 'pkgtool' => 'dmidecode',
'rpm' => 'dmidecode',
- }),
- 'fdisk' => ({
+ },
+ 'doas' => {
+ 'info' => '-Dx hddtemp-user; -o file-user (alt for sudo)',
+ 'info-bsd' => '-Dx hddtemp-user; -o file-user',
+ 'apt' => 'doas',
+ 'pacman' => 'doas',
+ 'pkgtool' => ' opendoas',
+ 'rpm' => 'doas',
+ },
+ 'fdisk' => {
'info' => '-D partition scheme (fallback)',
'info-bsd' => '-D partition scheme',
'apt' => 'fdisk',
'pacman' => 'util-linux',
+ 'pkgtool' => 'util-linux',
'rpm' => 'util-linux',
- }),
- 'fetch' => ({
+ },
+ 'fetch' => {
'info' => '',
'info-bsd' => '-i (if no dig); -w,-W; -U',
- 'apt' => '',
- 'pacman' => '',
- 'rpm' => '',
- }),
- 'file' => ({
+ },
+ 'file' => {
'info' => '-o unmounted file system (if no lsblk)',
'info-bsd' => '-o unmounted file system',
'apt' => 'file',
'pacman' => 'file',
+ 'pkgtool' => 'file',
'rpm' => 'file',
- }),
- 'ftp' => ({
+ },
+ 'ftp' => {
'info' => '',
'info-bsd' => '-i (if no dig); -w,-W; -U',
+ },
+ 'fruid_print' => {
+ 'info' => '-M machine data, Elbrus only',
+ 'info-bsd' => '',
'apt' => '',
'pacman' => '',
+ 'pkgtool' => '',
'rpm' => '',
- }),
- 'glabel' => ({
+ },
+ 'glabel' => {
'info' => '',
'info-bsd' => '-R; -D; -P. Get actual gptid /dev path',
- 'apt' => '',
- 'pacman' => '',
- 'rpm' => '',
- }),
- 'gpart' => ({
+ },
+ 'gpart' => {
'info' => '',
- 'info-bsd' => '-p,-P file system, size',
- 'apt' => '',
- 'pacman' => '',
- 'rpm' => '',
- }),
- 'hciconfig' => ({
- 'info' => 'Experimental',
+ 'info-bsd' => '-p,-P; -R; -o (FreeBSD+derived)',
+ },
+ 'hciconfig' => {
+ 'info' => '-E bluetooth data (deprecated, good report)',
'info-bsd' => '',
'apt' => 'bluez',
- 'pacman' => 'bluez-utils',
+ 'pacman' => 'bluez-utils-compat (frugalware: bluez-utils)',
+ 'pkgtool' => 'bluez',
'rpm' => 'bluez-utils',
- }),
- 'hddtemp' => ({
- 'info' => '-Dx show hdd temp',
+ },
+ 'hddtemp' => {
+ 'info' => '-Dx show hdd temp, if no drivetemp module',
'info-bsd' => '-Dx show hdd temp',
'apt' => 'hddtemp',
'pacman' => 'hddtemp',
+ 'pkgtool' => 'hddtemp',
'rpm' => 'hddtemp',
- }),
- 'ifconfig' => ({
+ },
+ 'ifconfig' => {
'info' => '-i ip LAN (deprecated)',
'info-bsd' => '-i ip LAN',
'apt' => 'net-tools',
'pacman' => 'net-tools',
+ 'pkgtool' => 'net-tools',
'rpm' => 'net-tools',
- }),
- 'ip' => ({
+ },
+ 'ip' => {
'info' => '-i ip LAN',
'info-bsd' => '',
'apt' => 'iproute',
'pacman' => 'iproute2',
+ 'pkgtool' => 'iproute2',
'rpm' => 'iproute',
- }),
- 'ipmi-sensors' => ({
+ },
+ 'ipmi-sensors' => {
'info' => '-s IPMI sensors (servers)',
'info-bsd' => '',
'apt' => 'freeipmi-tools',
'pacman' => 'freeipmi',
+ 'pkgtool' => 'freeipmi',
'rpm' => 'freeipmi',
- }),
- 'ipmitool' => ({
+ },
+ 'ipmitool' => {
'info' => '-s IPMI sensors (servers)',
'info-bsd' => '-s IPMI sensors (servers)',
'apt' => 'ipmitool',
'pacman' => 'ipmitool',
+ 'pkgtool' => 'ipmitool',
'rpm' => 'ipmitool',
- }),
- 'lsblk' => ({
- 'info' => '-o unmounted file system (best option)',
+ },
+ 'lsblk' => {
+ 'info' => '-L LUKS/bcache; -o unmounted file system (best option)',
'info-bsd' => '-o unmounted file system',
'apt' => 'util-linux',
'pacman' => 'util-linux',
+ 'pkgtool' => 'util-linux',
'rpm' => 'util-linux-ng',
- }),
- 'lsusb' => ({
+ },
+ 'lvs' => {
+ 'info' => '-L LVM data',
+ 'info-bsd' => '',
+ 'apt' => 'lvm2',
+ 'pacman' => 'lvm2',
+ 'pkgtool' => 'lvm2',
+ 'rpm' => 'lvm2',
+ },
+ 'lsusb' => {
'info' => '-A usb audio; -J (optional); -N usb networking',
- 'info-bsd' => '-A; -J; -N. Alternate to usbdevs',
+ 'info-bsd' => '',
'apt' => 'usbutils',
'pacman' => 'usbutils',
+ 'pkgtool' => 'usbutils',
'rpm' => 'usbutils',
- }),
- 'modinfo' => ({
+ },
+ 'mdadm' => {
+ 'info' => '-Ra advanced mdraid data',
+ 'info-bsd' => '',
+ 'apt' => 'mdadm',
+ 'pacman' => 'mdadm',
+ 'pkgtool' => 'mdadm',
+ 'rpm' => 'mdadm',
+ },
+ 'modinfo' => {
'info' => 'Ax; -Nx module version',
'info-bsd' => '',
'apt' => 'module-init-tools',
'pacman' => 'module-init-tools',
+ 'pkgtool' => 'kmod (earlier: module-init-tools)',
'rpm' => 'module-init-tools',
- }),
- 'runlevel' => ({
+ },
+ 'pciconfig' => {
+ 'info' => '',
+ 'info-bsd' => '-A,-E,-G,-N pci devices (FreeBSD+derived)',
+ },
+ 'pcictl' => {
+ 'info' => '',
+ 'info-bsd' => '-A,-E,-G,-N pci devices (NetBSD+derived)',
+ },
+ 'pcidump' => {
+ 'info' => '',
+ 'info-bsd' => '-A,-E,-G,-N pci devices (OpenBSD+derived, doas/su)',
+ },
+ 'runlevel' => {
'info' => '-I fallback to Perl',
'info-bsd' => '',
'apt' => 'systemd or sysvinit',
'pacman' => 'systemd',
+ 'pkgtool' => 'sysvinit',
'rpm' => 'systemd or sysvinit',
- }),
- 'sensors' => ({
- 'info' => '-s sensors output',
+ },
+ 'sensors' => {
+ 'info' => '-s sensors output (optional, /sys supplies most)',
'info-bsd' => '',
'apt' => 'lm-sensors',
'pacman' => 'lm-sensors',
+ 'pkgtool' => 'lm_sensors',
'rpm' => 'lm-sensors',
- }),
- 'smartctl' => ({
+ },
+ 'smartctl' => {
'info' => '-Da advanced data',
'info-bsd' => '-Da advanced data',
'apt' => 'smartmontools',
'pacman' => 'smartmontools',
+ 'pkgtool' => 'smartmontools',
'rpm' => 'smartmontools',
- }),
- 'strings' => ({
+ },
+ 'strings' => {
'info' => '-I sysvinit version',
'info-bsd' => '',
'apt' => 'binutils',
- 'pacman' => '?',
- 'rpm' => '?',
- }),
- 'sysctl' => ({
- 'info' => '',
- 'info-bsd' => '-C; -I; -m; -tm',
- 'apt' => '?',
- 'pacman' => '?',
- 'rpm' => '?',
- }),
- 'sudo' => ({
- 'info' => '-Dx hddtemp-user; -o file-user',
- 'info-bsd' => '-Dx hddtemp-user; -o file-user',
+ 'pacman' => 'binutils',
+ 'pkgtool' => 'binutils',
+ 'rpm' => 'binutils',
+ },
+ 'sudo' => {
+ 'info' => '-Dx hddtemp-user; -o file-user (try doas!)',
+ 'info-bsd' => '-Dx hddtemp-user; -o file-user (alt for doas)',
'apt' => 'sudo',
'pacman' => 'sudo',
+ 'pkgtool' => 'sudo',
'rpm' => 'sudo',
- }),
- 'tree' => ({
+ },
+ 'sysctl' => {
+ 'info' => '',
+ 'info-bsd' => '-C; -I; -m; -tm',
+ },
+ 'tree' => {
'info' => '--debugger 20,21 /sys tree',
'info-bsd' => '--debugger 20,21 /sys tree',
'apt' => 'tree',
'pacman' => 'tree',
+ 'pkgtool' => 'tree',
'rpm' => 'tree',
- }),
- 'upower' => ({
+ },
+ 'udevadm' => {
+ 'info' => '-m ram data for non-root, or no dmidecode',
+ 'apt' => 'udev (non-systemd: eudev)',
+ 'pacman' => 'systemd',
+ 'pkgtool' => 'eudev',
+ 'rpm' => 'udev (fedora: systemd-udev)',
+ },
+ 'upower' => {
'info' => '-sx attached device battery info',
'info-bsd' => '-sx attached device battery info',
'apt' => 'upower',
'pacman' => 'upower',
+ 'pkgtool' => 'upower',
'rpm' => 'upower',
- }),
- 'uptime' => ({
+ },
+ 'uptime' => {
'info' => '-I uptime',
'info-bsd' => '-I uptime',
'apt' => 'procps',
'pacman' => 'procps',
+ 'pkgtool' => 'procps',
'rpm' => 'procps',
- }),
- 'usbdevs' => ({
+ },
+ 'usbconfig' => {
'info' => '',
- 'info-bsd' => '-A; -J; -N;',
- 'apt' => 'usbutils',
- 'pacman' => 'usbutils',
- 'rpm' => 'usbutils',
- }),
- 'wget' => ({
+ 'info-bsd' => '-A; -E; -G; -J; -N; (FreeBSD+derived, doas/su)',
+ },
+ 'usbdevs' => {
+ 'info' => '',
+ 'info-bsd' => '-A; -E; -G; -J; -N; (Open/NetBSD+derived)',
+ },
+ 'wget' => {
'info' => '-i (if no dig); -w,-W; -U',
'info-bsd' => '-i (if no dig); -w,-W; -U',
'apt' => 'wget',
'pacman' => 'wget',
+ 'pkgtool' => 'wget',
'rpm' => 'wget',
- }),
- # Display Tools
- 'glxinfo' => ({
- 'info' => '-G glx info',
- 'info-bsd' => '-G glx info',
+ },
+ ## Programs-Display ##
+ 'eglinfo' => {
+ 'info' => '-G X11/Wayland EGL info',
+ 'info-bsd' => '-G X11/Wayland EGL info',
+ 'apt' => 'mesa-utils (or: mesa-utils-extra)',
+ 'pacman' => 'mesa-utils',
+ 'pkgtool' => 'mesa',
+ 'rpm' => 'egl-utils (SUSE: Mesa-demo-egl)',
+ },
+ 'glxinfo' => {
+ 'info' => '-G X11 GLX info',
+ 'info-bsd' => '-G X11 GLX info',
'apt' => 'mesa-utils',
- 'pacman' => 'mesa-demos',
- 'rpm' => 'glx-utils (openSUSE 12.3 and later Mesa-demo-x)',
- }),
- 'wmctrl' => ({
+ 'pacman' => 'mesa-utils',
+ 'pkgtool' => 'mesa',
+ 'rpm' => 'glx-utils (Fedora: glx-utils; SUSE: Mesa-demo-x)',
+ },
+ 'vulkaninfo' => {
+ 'info' => '-G Vulkan API info',
+ 'info-bsd' => '-G Vulkan API info',
+ 'apt' => 'vulkan-tools',
+ 'pacman' => 'vulkan-tools',
+ 'pkgtool' => 'vulkan-tools',
+ 'rpm' => 'vulkan-demos (Fedora: vulkan-tools; SUSE: vulkan-demos)',
+ },
+ 'wayland-info' => {
+ 'info' => '-G Wayland data (not for X)',
+ 'info-bsd' => '-G Wayland data (not for X)',
+ 'apt' => 'wayland-utils',
+ 'pacman' => 'wayland-utils',
+ 'pkgtool' => 'wayland-utils',
+ 'rpm' => 'wayland-utils',
+ },
+ 'wmctrl' => {
'info' => '-S active window manager (fallback)',
- 'info-bsd' => '-S active window managerr (fallback)',
+ 'info-bsd' => '-S active window manager (fallback)',
'apt' => 'wmctrl',
'pacman' => 'wmctrl',
+ 'pkgtool' => 'wmctrl',
'rpm' => 'wmctrl',
- }),
- 'xdpyinfo' => ({
- 'info' => '-G multi screen resolution',
- 'info-bsd' => '-G multi screen resolution',
+ },
+ 'xdpyinfo' => {
+ 'info' => '-G (X) Screen resolution, dpi; -Ga Screen size',
+ 'info-bsd' => '-G (X) Screen resolution, dpi; -Ga Screen size',
'apt' => 'X11-utils',
'pacman' => 'xorg-xdpyinfo',
- 'rpm' => 'xorg-x11-utils',
- }),
- 'xprop' => ({
- 'info' => '-S desktop data',
- 'info-bsd' => '-S desktop data',
+ 'pkgtool' => 'xdpyinfo',
+ 'rpm' => 'xorg-x11-utils (SUSE/Fedora: xdpyinfo)',
+ },
+ 'xdriinfo' => {
+ 'info' => '-G (X) DRI driver (if missing, fallback to Xorg log)',
+ 'info-bsd' => '-G (X) DRI driver (if missing, fallback to Xorg log',
+ 'apt' => 'X11-utils',
+ 'pacman' => 'xorg-xdriinfo',
+ 'pkgtool' => 'xdriinfo',
+ 'rpm' => 'xorg-x11-utils (SUSE/Fedora: xdriinfo)',
+ },
+ 'xprop' => {
+ 'info' => '-S (X) desktop data',
+ 'info-bsd' => '-S (X) desktop data',
'apt' => 'X11-utils',
'pacman' => 'xorg-xprop',
- 'rpm' => 'x11-utils',
- }),
- 'xrandr' => ({
- 'info' => '-G single screen resolution',
- 'info-bsd' => '-G single screen resolution',
+ 'pkgtool' => 'xprop',
+ 'rpm' => 'x11-utils (Fedora/SUSE: xprop)',
+ },
+ 'xrandr' => {
+ 'info' => '-G (X) monitors(s) resolution; -Ga monitor data',
+ 'info-bsd' => '-G (X) monitors(s) resolution; -Ga monitor data',
'apt' => 'x11-xserver-utils',
'pacman' => 'xrandr',
- 'rpm' => 'x11-server-utils',
- }),
- # Perl Modules
- 'Cpanel::JSON::XS' => ({
- 'info' => '--output json - required for export.',
- 'info-bsd' => '--output json - required for export.',
+ 'pkgtool' => 'xrandr',
+ 'rpm' => 'x11-server-utils (SUSE/Fedora: xrandr)',
+ },
+ ## Perl Modules ##
+ 'Cpanel::JSON::XS' => {
+ 'info' => '-G wayland, --output json (faster).',
+ 'info-bsd' => '-G wayland, --output json (faster).',
'apt' => 'libcpanel-json-xs-perl',
'pacman' => 'perl-cpanel-json-xs',
+ 'pkgtool' => 'perl-Cpanel-JSON-XS',
'rpm' => 'perl-Cpanel-JSON-XS',
- }),
- 'HTTP::Tiny' => ({
+ },
+ 'File::Copy' => {
+ 'info' => '--debug 20-22 - required for debugger.',
+ 'info-bsd' => '--debug 20-22 - required for debugger.',
+ 'apt' => 'Core Modules',
+ 'pacman' => 'Core Modules',
+ 'pkgtool' => 'Core Modules',
+ 'rpm' => 'perl-File-Copy',
+ },
+ 'File::Find' => {
+ 'info' => '--debug 20-22 - required for debugger.',
+ 'info-bsd' => '--debug 20-22 - required for debugger.',
+ 'apt' => 'Core Modules',
+ 'pacman' => 'Core Modules',
+ 'pkgtool' => 'Core Modules',
+ 'rpm' => 'perl-File-Find',
+ },
+ 'File::Spec::Functions' => {
+ 'info' => '--debug 20-22 - required for debugger.',
+ 'info-bsd' => '--debug 20-22 - required for debugger.',
+ 'apt' => 'Core Modules',
+ 'pacman' => 'Core Modules',
+ 'pkgtool' => 'Core Modules',
+ 'rpm' => 'Core Modules',
+ },
+ 'HTTP::Tiny' => {
'info' => '-U; -w,-W; -i (if dig not installed).',
'info-bsd' => '-U; -w,-W; -i (if dig not installed)',
- 'apt' => 'libhttp-tiny-perl',
+ 'apt' => 'libhttp-tiny-perl (Core Modules >= 5.014)',
'pacman' => 'Core Modules',
+ 'pkgtool' => 'perl-http-tiny (Core Modules >= 5.014)',
'rpm' => 'Perl-http-tiny',
- }),
- 'IO::Socket::SSL' => ({
+ },
+ 'IO::Socket::SSL' => {
'info' => '-U; -w,-W; -i (if dig not installed).',
'info-bsd' => '-U; -w,-W; -i (if dig not installed)',
'apt' => 'libio-socket-ssl-perl',
'pacman' => 'perl-io-socket-ssl',
+ 'pkgtool' => 'perl-IO-Socket-SSL', # maybe in core modules
'rpm' => 'perl-IO-Socket-SSL',
- }),
- 'JSON::XS' => ({
- 'info' => '--output json - required for export (legacy).',
- 'info-bsd' => '--output json - required for export (legacy).',
+ },
+ 'JSON::PP' => {
+ 'info' => '-G wayland, --output json (in CoreModules, slower).',
+ 'info-bsd' => '-G wayland, --output json (in CoreModules, slower).',
+ 'apt' => 'libjson-pp-perl (Core Modules >= 5.014)',
+ 'pacman' => 'perl-json-pp (Core Modules >= 5.014)',
+ 'pkgtool' => 'Core Modules >= 5.014',
+ 'rpm' => 'perl-JSON-PP',
+ },
+ 'JSON::XS' => {
+ 'info' => '-G wayland, --output json (legacy).',
+ 'info-bsd' => '-G wayland, --output json (legacy).',
'apt' => 'libjson-xs-perl',
'pacman' => 'perl-json-xs',
+ 'pkgtool' => 'perl-JSON-XS',
'rpm' => 'perl-JSON-XS',
- }),
- 'Net::FTP' => ({
+ },
+ 'Net::FTP' => {
'info' => '--debug 21,22',
'info-bsd' => '--debug 21,22',
'apt' => 'Core Modules',
'pacman' => 'Core Modules',
+ 'pkgtool' => 'Core Modules',
'rpm' => 'Core Modules',
- }),
- 'Time::HiRes' => ({
+ },
+ 'OpenBSD::Pledge' => {
+ 'info' => "$self_name Perl pledge support.",
+ 'info-bsd' => "$self_name Perl pledge support.",
+ },
+ 'OpenBSD::Unveil' => {
+ 'info' => "Experimental: $self_name Perl unveil support.",
+ 'info-bsd' => "Experimental: $self_name Perl unveil support.",
+ },
+ 'Time::HiRes' => {
'info' => '-C cpu sleep (not required); --debug timers',
'info-bsd' => '-C cpu sleep (not required); --debug timers',
'apt' => 'Core Modules',
'pacman' => 'Core Modules',
+ 'pkgtool' => 'Core Modules',
'rpm' => 'perl-Time-HiRes',
- }),
- 'XML::Dumper' => ({
+ },
+ 'XML::Dumper' => {
'info' => '--output xml - Crude and raw.',
'info-bsd' => '--output xml - Crude and raw.',
'apt' => 'libxml-dumper-perl',
'pacman' => 'perl-xml-dumper',
+ 'pkgtool' => '', # package does not appear to exist
'rpm' => 'perl-XML-Dumper',
- }),
+ },
## END PACKAGE MANAGER BLOCK ##
- );
- my $ref = $data{$type};
- my %values = %$ref;
- return %values;
+ };
}
-sub get_pm {
- my ($pm) = ('');
+
+sub get_pms {
+ my @pms = ();
# support maintainers of other pm types using custom lists
if (main::check_program('dpkg')){
- $pm = 'apt';
+ push(@pms,'apt');
}
- elsif (main::check_program('pacman')){
- $pm = 'pacman';
+ if (main::check_program('pacman')){
+ push(@pms,'pacman');
}
- elsif (main::check_program('rpm')){
- $pm = 'rpm';
+ # assuming netpkg uses installpkg as backend
+ if (main::check_program('installpkg')){
+ push(@pms,'pkgtool');
}
- return $pm;
+ # rpm needs to go last because it's sometimes available on other pm systems
+ if (main::check_program('rpm')){
+ push(@pms,'rpm');
+ }
+ return @pms;
}
+
# note: end will vary, but should always be treated as longest value possible.
# expected values: Present/Missing
sub make_row {
my ($start,$middle,$end) = @_;
my ($dots,$line,$sep) = ('','',': ');
- foreach (0 .. ($size{'max'} - 16 - length("$start$middle"))){
+ foreach (0 .. ($size{'max-cols'} - 16 - length("$start$middle"))){
$dots .= '.';
}
$line = "$start$sep$middle$dots $end";
return $line;
}
-sub make_line {
- my $line = '';
- foreach (0 .. $size{'max'} - 2 ){
- $line .= '-';
- }
- return $line;
-}
}
#### -------------------------------------------------------------------
@@ -3140,7 +3860,7 @@ sub make_line {
# Duplicates the functionality of awk to allow for one liner
# type data parsing. note: -1 corresponds to awk NF
-# args 1: array of data; 2: search term; 3: field result; 4: separator
+# args: 0: array of data; 1: search term; 2: field result; 3: separator
# correpsonds to: awk -F='separator' '/search/ {print $2}' <<< @data
# array is sent by reference so it must be dereferenced
# NOTE: if you just want the first row, pass it \S as search string
@@ -3150,8 +3870,9 @@ sub awk {
my ($ref,$search,$num,$sep) = @_;
my ($result);
# print "search: $search\n";
- return if ! @$ref || ! $search;
+ return if !@$ref || !$search;
foreach (@$ref){
+ next if !defined $_;
if (/$search/i){
$result = $_;
$result =~ s/^\s+|\s+$//g;
@@ -3161,15 +3882,15 @@ sub awk {
if ($result && defined $num){
$sep ||= '\s+';
$num-- if $num > 0; # retain the negative values as is
- $result = (split /$sep/, $result)[$num];
+ $result = (split(/$sep/, $result))[$num];
$result =~ s/^\s+|,|\s+$//g if $result;
}
eval $end if $b_log;
return $result;
}
-# $1 - Perl module to check
-sub check_module {
+# 0: Perl module to check
+sub check_perl_module {
my ($module) = @_;
my $b_present = 0;
eval "require $module";
@@ -3177,7 +3898,7 @@ sub check_module {
return $b_present;
}
-# arg: 1 - string or path to search gneerated @paths data for.
+# args: 0: string or path to search gneerated @paths data for.
# note: a few nano seconds are saved by using raw $_[0] for program
sub check_program {
(grep { return "$_/$_[0]" if -e "$_/$_[0]"} @paths)[0];
@@ -3192,7 +3913,7 @@ sub cleanup {
}
}
-# args: $1, $2, version numbers to compare by turning them to strings
+# args: 0,1: version numbers to compare by turning them to strings
# note that the structure of the two numbers is expected to be fairly
# similar, otherwise it may not work perfectly.
sub compare_versions {
@@ -3201,27 +3922,33 @@ sub compare_versions {
elsif ($two && !$one){return $two;}
elsif (!$one && !$two){return}
my ($pad1,$pad2) = ('','');
- my (@temp1) = split /[._-]/, $one;
- my (@temp2) = split /[._-]/, $two;
- @temp1 = map {$_ = sprintf("%04s", $_);$_ } @temp1;
- @temp2 = map {$_ = sprintf("%04s", $_);$_ } @temp2;
- $pad1 = join '', @temp1;
- $pad2 = join '', @temp2;
+ $pad1 = join('', map {$_ = sprintf("%04s", $_);$_ } split(/[._-]/, $one));
+ $pad2 = join('', map {$_ = sprintf("%04s", $_);$_ } split(/[._-]/, $two));
# print "p1:$pad1 p2:$pad2\n";
if ($pad1 ge $pad2){return $one}
elsif ($pad2 gt $pad1){return $two}
}
+
+# some things randomly use hex with 0x starter, return always integer
+# warning: perl will generate a 32 bit too big number warning if you pass it
+# random values that exceed 2^32 in hex, even if the base system is 64 bit.
+# sample: convert_hex(0x000b0000000b);
+sub convert_hex {
+ return (defined $_[0] && $_[0] =~ /^0x/) ? hex($_[0]) : $_[0];
+}
+
# returns count of files in directory, if 0, dir is empty
sub count_dir_files {
return unless -d $_[0];
- opendir my $dh, $_[0] or error_handler('open-dir-failed', "$_[0]", $!);
- my $count = grep { ! /^\.{1,2}/ } readdir $dh; # strips out . and ..
+ opendir(my $dh, $_[0]) or error_handler('open-dir-failed', "$_[0]", $!);
+ my $count = grep { ! /^\.{1,2}/ } readdir($dh); # strips out . and ..
+ closedir $dh;
return $count;
}
-# args: 1 - the string to get piece of
-# 2 - the position in string, starting at 1 for 0 index.
-# 3 - the separator, default is ' '
+# args: 0: the string to get piece of
+# 1: the position in string, starting at 1 for 0 index.
+# 2: the separator, default is ' '
sub get_piece {
eval $start if $b_log;
my ($string, $num, $sep) = @_;
@@ -3230,30 +3957,37 @@ sub get_piece {
$string =~ s/^\s+|\s+$//g;
my @temp = split(/$sep/, $string);
eval $end if $b_log;
- if ( exists $temp[$num] ){
+ if (exists $temp[$num]){
$temp[$num] =~ s/,//g;
return $temp[$num];
}
}
-# arg: 1 - command to turn into an array; 2 - optional: splitter
-# 3 - optionsl, strip and clean data
+# args: 0: command to turn into an array; 1: optional: splitter;
+# 2: strip-trim, clean data, remove empty lines
# similar to reader() except this creates an array of data
# by lines from the command arg
sub grabber {
eval $start if $b_log;
- my ($cmd,$split,$strip) = @_;
+ my ($cmd,$split,$strip,$type) = @_;
+ $type ||= 'arr';
$split ||= "\n";
- my @rows = split /$split/, qx($cmd);
- if ($strip && @rows){
- @rows = grep {/^\s*[^#]/} @rows;
- @rows = map {s/^\s+|\s+$//g; $_} @rows if @rows;
+ my @rows;
+ if ($strip){
+ for (split(/$split/, qx($cmd))){
+ next if /^\s*(#|$)/;
+ $_ =~ s/^\s+|\s+$//g;
+ push(@rows,$_);
+ }
+ }
+ else {
+ @rows = split(/$split/, qx($cmd));
}
eval $end if $b_log;
- return @rows;
+ return ($type eq 'arr') ? @rows : \@rows;
}
-# args: 1 - string value to glob
+# args: 0: string value to glob
sub globber {
eval $start if $b_log;
my @files = <$_[0]>;
@@ -3261,28 +3995,33 @@ sub globber {
return @files;
}
+# arg MUST be quoted when inserted, otherwise perl takes it for a hex number
+sub is_hex {
+ return (defined $_[0] && $_[0] =~ /^0x/) ? 1 : 0;
+}
+
## NOTE: for perl pre 5.012 length(undef) returns warning
# receives string, returns boolean 1 if integer
sub is_int {
- return 1 if (defined $_[0] && length($_[0]) && length($_[0]) == ($_[0] =~ tr/0123456789//));
+ return 1 if (defined $_[0] && length($_[0]) &&
+ length($_[0]) == ($_[0] =~ tr/0123456789//));
}
-# receives string, returns boolean 1 if numeric. tr/// is 4x faster than regex
+# receives string, returns true/1 if >= 0 numeric. tr/// 4x faster than regex
sub is_numeric {
- return 1 if ( defined $_[0] && ( $_[0] =~ tr/0123456789//) >= 1 &&
- length($_[0]) == ($_[0] =~ tr/0123456789.//) && ($_[0] =~ tr/.//) <= 1);
+ return 1 if (defined $_[0] && ($_[0] =~ tr/0123456789//) >= 1 &&
+ length($_[0]) == ($_[0] =~ tr/0123456789.//) && ($_[0] =~ tr/.//) <= 1);
}
# gets array ref, which may be undefined, plus join string
# this helps avoid debugger print errors when we are printing arrays
# which we don't know are defined or not null.
-# args: 1 - array ref; 2 - join string; 3 - default value, optional
+# args: 0: array ref; 1: join string; 2: default value, optional
sub joiner {
- my ($ref,$join,$default) = @_;
- my @arr = @$ref;
+ my ($arr,$join,$default) = @_;
$default ||= '';
my $string = '';
- foreach (@arr){
+ foreach (@$arr){
if (defined $_){
$string .= $_ . $join;
}
@@ -3293,497 +4032,142 @@ sub joiner {
return $string;
}
-# returns array of: 0: program print name 1: program version
-# args: 1: program values id 2: program version string
-# 3: $extra level. Note that StartClient runs BEFORE -x levels are set!
-# Only use this function when you only need the name/version data returned
-sub program_data {
- eval $start if $b_log;
- my ($values_id,$version_id,$level) = @_;
- my (@data,$path,@program_data);
- $level = 0 if ! $level;
- #print "val_id: $values_id ver_id:$version_id lev:$level ex:$extra\n";
- $version_id = $values_id if ! $version_id;
- @data = program_values($values_id);
- if ($data[3]){
- $program_data[0] = $data[3];
- # programs that have no version method return 0 0 for index 1 and 2
- if ( $extra >= $level && $data[1] && $data[2]){
- $program_data[1] = program_version($version_id,$data[0],
- $data[1],$data[2],$data[5],$data[6],$data[7],$data[8]);
- }
- }
- $program_data[0] ||= '';
- $program_data[1] ||= '';
- eval $end if $b_log;
- return @program_data;
-}
-
-# it's almost 1000 times slower to load these each time program_values is called!!
-sub set_program_values {
- %program_values = (
- ## Clients ##
- 'bitchx' => ['bitchx',2,'','BitchX',1,0,0,'',''],# special
- 'finch' => ['finch',2,'-v','Finch',1,1,0,'',''],
- 'gaim' => ['[0-9.]+',2,'-v','Gaim',0,1,0,'',''],
- 'ircii' => ['[0-9.]+',3,'-v','ircII',1,1,0,'',''],
- 'irssi' => ['irssi',2,'-v','Irssi',1,1,0,'',''],
- 'irssi-text' => ['irssi',2,'-v','Irssi',1,1,0,'',''],
- 'konversation' => ['konversation',2,'-v','Konversation',0,0,0,'',''],
- 'kopete' => ['Kopete',2,'-v','Kopete',0,0,0,'',''],
- 'kvirc' => ['[0-9.]+',2,'-v','KVIrc',0,0,1,'',''], # special
- 'pidgin' => ['[0-9.]+',2,'-v','Pidgin',0,1,0,'',''],
- 'quassel' => ['',1,'-v','Quassel [M]',0,0,0,'',''], # special
- 'quasselclient' => ['',1,'-v','Quassel',0,0,0,'',''],# special
- 'quasselcore' => ['',1,'-v','Quassel (core)',0,0,0,'',''],# special
- 'gribble' => ['^Supybot',2,'--version','Gribble',1,0,0,'',''],# special
- 'limnoria' => ['^Supybot',2,'--version','Limnoria',1,0,0,'',''],# special
- 'supybot' => ['^Supybot',2,'--version','Supybot',1,0,0,'',''],# special
- 'weechat' => ['[0-9.]+',1,'-v','WeeChat',1,0,0,'',''],
- 'weechat-curses' => ['[0-9.]+',1,'-v','WeeChat',1,0,0,'',''],
- 'xchat-gnome' => ['[0-9.]+',2,'-v','X-Chat-Gnome',1,1,0,'',''],
- 'xchat' => ['[0-9.]+',2,'-v','X-Chat',1,1,0,'',''],
- ## Desktops / wm / compositors ##
- '3dwm' => ['^3dwm',0,'0','3Dwm',0,1,0,'',''], # unverified
- '9wm' => ['^9wm',3,'-version','9wm',0,1,0,'',''],
- 'aewm' => ['^aewm',3,'--version','aewm',0,1,0,'',''],
- 'aewm++' => ['^Version:',2,'-version','aewm++',0,1,0,'',''],
- 'afterstep' => ['^afterstep',3,'--version','AfterStep',0,1,0,'',''],
- 'amiwm' => ['^amiwm',0,'0','AmiWM',0,1,0,'',''], # no version
- 'antiwm' => ['^antiwm',0,'0','AntiWM',0,1,0,'',''], # no version known
- 'asc' => ['^asc',0,'0','asc',0,1,0,'',''],
- 'awesome' => ['^awesome',2,'--version','awesome',0,1,0,'',''],
- 'beryl' => ['^beryl',0,'0','Beryl',0,1,0,'',''], # unverified; legacy
- 'blackbox' => ['^Blackbox',2,'--version','Blackbox',0,1,0,'',''],
- 'bspwm' => ['^\S',1,'-v','bspwm',0,1,0,'',''],
- 'budgie-desktop' => ['^budgie-desktop',2,'--version','Budgie',0,1,0,'',''],
- 'budgie-wm' => ['^budgie',0,'0','budgie-wm',0,1,0,'',''],
- 'cagebreak' => ['^Cagebreak',3,'-v','Cagebreak',0,1,0,'',''],
- 'calmwm' => ['^calmwm',0,'0','CalmWM',0,1,0,'',''], # unverified
- 'cinnamon' => ['^cinnamon',2,'--version','Cinnamon',0,1,0,'',''],
- 'clfswm' => ['^clsfwm',0,'0','clfswm',0,1,0,'',''], # no version
- 'compiz' => ['^compiz',2,'--version','Compiz',0,1,0,'',''],
- 'compton' => ['^\d',1,'--version','Compton',0,1,0,'',''],
- 'cwm' => ['^cwm',0,'0','CWM',0,1,0,'',''], # no version
- 'dcompmgr' => ['^dcompmgr',0,'0','dcompmgr',0,1,0,'',''], # unverified
- 'deepin' => ['^Version',2,'file','Deepin',0,100,'=','','/etc/deepin-version'], # special
- 'deepin-metacity' => ['^metacity',2,'--version','Deepin-Metacity',0,1,0,'',''],
- 'deepin-mutter' => ['^mutter',2,'--version','Deepin-Mutter',0,1,0,'',''],
- 'deepin-wm' => ['^gala',0,'0','DeepinWM',0,1,0,'',''], # no version
- 'dwc' => ['^dwc',0,'0','dwc',0,1,0,'',''], # unverified
- 'dwm' => ['^dwm',1,'-v','dwm',0,1,1,'^dwm-',''],
- 'echinus' => ['^echinus',1,'-v','echinus',0,1,1,'',''], # echinus-0.4.9 (c)...
- # only listed here for compositor values, version data comes from xprop
- 'enlightenment' => ['^enlightenment',0,'0','enlightenment',0,1,0,'',''], # no version, yet?
- 'evilwm' => ['evilwm',3,'-V','evilwm',0,1,0,'',''],# might use full path in match
- 'fireplace' => ['^fireplace',0,'0','fireplace',0,1,0,'',''], # unverified
- 'fluxbox' => ['^fluxbox',2,'-v','Fluxbox',0,1,0,'',''],
- 'flwm' => ['^flwm',0,'0','FLWM',0,0,1,'',''], # no version
- 'fvwm' => ['^fvwm',2,'-version','FVWM',0,1,0,'',''],
- 'fvwm1' => ['^Fvwm',3,'-version','FVWM1',0,1,1,'',''],
- 'fvwm2' => ['^fvwm',2,'--version','fVWM2',0,1,0,'',''],
- 'fvwm3' => ['^fvwm',2,'--version','fVWM3',0,1,0,'',''],
- 'fvwm95' => ['^fvwm',2,'--version','FVWM95',0,1,1,'',''],
- 'fvwm-crystal' => ['^fvwm',2,'--version','FVWM-Crystal',0,0,0,'',''], # for print name fvwm
- 'gala' => ['^gala',0,'0','gala',0,1,0,'',''], # pantheon wm: super slow result, 2, '--version' works?
- 'glass' => ['^glass',3,'-v','Glass',0,1,0,'',''],
- 'gnome' => ['^gnome',3,'--version','GNOME',0,1,0,'',''], # no version, print name
- 'gnome-about' => ['^gnome',3,'--version','GNOME',0,1,0,'',''],
- 'gnome-shell' => ['^gnome',3,'--version','gnome-shell',0,1,0,'',''],
- 'grefson' => ['^grefson',0,'0','grefson',0,1,0,'',''], # unverified
- 'hackedbox' => ['^hackedbox',2,'-version','HackedBox',0,1,0,'',''], # unverified, assume blackbox
- # note, herbstluftwm when launched with full path returns full path in version string
- 'herbstluftwm' => ['herbstluftwm',2,'--version','herbstluftwm',0,1,0,'',''],
- 'i3' => ['^i3',3,'--version','i3',0,1,0,'',''],
- 'icewm' => ['^icewm',2,'--version','IceWM',0,1,0,'',''],
- 'instantwm' => ['^instantwm',1,'-v','instantWM',0,1,1,'^instantwm-?(instantos-?)?',''],
- 'ion3' => ['^ion3',0,'--version','Ion3',0,1,0,'',''], # unverified; also shell called ion
- 'jbwm' => ['jbwm',3,'-v','JBWM',0,1,0,'',''], # might use full path in match
- 'jwm' => ['^jwm',2,'--version','JWM',0,1,0,'',''],
- 'kded' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
- 'kded1' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
- 'kded2' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
- 'kded3' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
- 'kded4' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
- 'ksmcon' => ['^ksmcon',0,'0','ksmcon',0,1,0,'',''],# no version
- 'kwin' => ['^kwin',0,'0','kwin',0,1,0,'',''],# no version
- 'kwin_wayland' => ['^kwin_wayland',0,'0','kwin_wayland',0,1,0,'',''],# no version
- 'kwin_x11' => ['^kwin_x11',0,'0','kwin_x11',0,1,0,'',''],# no version
- 'larswm' => ['^larswm',2,'-v','larswm',0,1,1,'',''],
- 'liri' => ['^liri',0,'0','liri',0,1,0,'',''],
- 'lumina' => ['^\S',1,'--version','Lumina',0,1,1,'',''],
- 'lwm' => ['^lwm',0,'0','lwm',0,1,0,'',''], # no version
- 'lxpanel' => ['^lxpanel',2,'--version','LXDE',0,1,0,'',''],
- # command: lxqt-panel
- 'lxqt-panel' => ['^lxqt-panel',2,'--version','LXQt',0,1,0,'',''],
- 'lxqt-variant' => ['^lxqt-panel',0,'0','LXQt-Variant',0,1,0,'',''],
- 'lxsession' => ['^lxsession',0,'0','lxsession',0,1,0,'',''],
- 'manokwari' => ['^manokwari',0,'0','Manokwari',0,1,0,'',''],
- 'marco' => ['^marco',2,'--version','marco',0,1,0,'',''],
- 'matchbox' => ['^matchbox',0,'0','Matchbox',0,1,0,'',''],
- 'matchbox-window-manager' => ['^matchbox',2,'--help','Matchbox',0,0,0,'',''],
- 'mate-about' => ['^MATE[[:space:]]DESKTOP',-1,'--version','MATE',0,1,0,'',''],
- # note, mate-session when launched with full path returns full path in version string
- 'mate-session' => ['mate-session',-1,'--version','MATE',0,1,0,'',''],
- 'metacity' => ['^metacity',2,'--version','Metacity',0,1,0,'',''],
- 'metisse' => ['^metisse',0,'0','metisse',0,1,0,'',''],
- 'mini' => ['^Mini',5,'--version','Mini',0,1,0,'',''],
- 'mir' => ['^mir',0,'0','mir',0,1,0,'',''],# unverified
- 'moblin' => ['^moblin',0,'0','moblin',0,1,0,'',''],# unverified
- 'motorcar' => ['^motorcar',0,'0','motorcar',0,1,0,'',''],# unverified
- 'muffin' => ['^muffin',2,'--version','Muffin',0,1,0,'',''],
- 'musca' => ['^musca',0,'-v','Musca',0,1,0,'',''], # unverified
- 'mutter' => ['^mutter',2,'--version','Mutter',0,1,0,'',''],
- 'mwm' => ['^mwm',0,'0','MWM',0,1,0,'',''],# no version
- 'nawm' => ['^nawm',0,'0','nawm',0,1,0,'',''],# unverified
- 'notion' => ['^.',1,'--version','Notion',0,1,0,'',''],
- 'openbox' => ['^openbox',2,'--version','Openbox',0,1,0,'',''],
- 'orbital' => ['^orbital',0,'0','orbital',0,1,0,'',''],# unverified
- 'pantheon' => ['^pantheon',0,'0','Pantheon',0,1,0,'',''],# no version
- 'papyros' => ['^papyros',0,'0','papyros',0,1,0,'',''],# no version
- 'pekwm' => ['^pekwm',3,'--version','PekWM',0,1,0,'',''],
- 'perceptia' => ['^perceptia',0,'0','perceptia',0,1,0,'',''],
- 'picom' => ['^\S',1,'--version','Picom',0,1,0,'^v',''],
- 'plasmashell' => ['^plasmashell',2,'--version','KDE Plasma',0,1,0,'',''],
- 'qtile' => ['^',1,'--version','Qtile',0,1,0,'',''],
- 'qvwm' => ['^qvwm',0,'0','qvwm',0,1,0,'',''], # unverified
- 'razor-session' => ['^razor',0,'0','Razor-Qt',0,1,0,'',''],
- 'ratpoison' => ['^ratpoison',2,'--version','Ratpoison',0,1,0,'',''],
- 'rustland' => ['^rustland',0,'0','rustland',0,1,0,'',''], # unverified
- 'sawfish' => ['^sawfish',3,'--version','Sawfish',0,1,0,'',''],
- 'scrotwm' => ['^scrotwm.*welcome.*',5,'-v','scrotwm',0,1,1,'',''],
- 'sommelier' => ['^sommelier',0,'0','sommelier',0,1,0,'',''], # unverified
- 'spectrwm' => ['^spectrwm.*welcome.*wm',5,'-v','spectrwm',0,1,1,'',''],
- # out of stump, 2 --version, but in tries to start new wm instance endless hang
- 'stumpwm' => ['^SBCL',0,'--version','StumpWM',0,1,0,'',''], # hangs when run in wm
- 'sway' => ['^sway',3,'-v','sway',0,1,0,'',''],
- 'swc' => ['^swc',0,'0','swc',0,1,0,'',''], # unverified
- 'tinywm' => ['^tinywm',0,'0','TinyWM',0,1,0,'',''], # no version
- 'tvtwm' => ['^tvtwm',0,'0','tvtwm',0,1,0,'',''], # unverified
- 'twin' => ['^Twin:',2,'--version','Twin',0,0,0,'',''],
- 'twm' => ['^twm',0,'0','TWM',0,1,0,'',''], # no version
- 'ukui' => ['^ukui-session',2,'--version','UKUI',0,1,0,'',''],
- 'ukwm' => ['^ukwm',2,'--version','ukwm',0,1,0,'',''],
- 'unagi' => ['^\S',1,'--version','unagi',0,1,0,'',''],
- 'unity' => ['^unity',2,'--version','Unity',0,1,0,'',''],
- 'unity-system-compositor' => ['^unity-system-compositor',2,'--version',
- 'unity-system-compositor (mir)',0,0,0,'',''],
- 'wavy' => ['^wavy',0,'0','wavy',0,1,0,'',''], # unverified
- 'waycooler' => ['^way',3,'--version','way-cooler',0,1,0,'',''],
- 'way-cooler' => ['^way',3,'--version','way-cooler',0,1,0,'',''],
- 'wayfire' => ['^way',0,'0','wayfire',0,1,0,'',''], # unverified
- 'wayhouse' => ['^wayhouse',0,'0','wayhouse',0,1,0,'',''], # unverified
- 'westford' => ['^westford',0,'0','westford',0,1,0,'',''], # unverified
- 'weston' => ['^weston',0,'0','weston',0,1,0,'',''], # unverified
- 'windowlab' => ['^windowlab',2,'-about','WindowLab',0,1,0,'',''],
- 'wm2' => ['^wm2',0,'0','wm2',0,1,0,'',''], # no version
- 'wmaker' => ['^Window[[:space:]]*Maker',-1,'--version','WindowMaker',0,1,0,'',''],
- 'wmii' => ['^wmii',1,'-v','wmii',0,1,0,'^wmii[234]?-',''], # wmii is wmii3
- 'wmii2' => ['^wmii2',1,'--version','wmii2',0,1,0,'^wmii[234]?-',''],
- 'wmx' => ['^wmx',0,'0','wmx',0,1,0,'',''], # no version
- 'xcompmgr' => ['^xcompmgr',0,'0','xcompmgr',0,1,0,'',''], # no version
- 'xfce4-panel' => ['^xfce4-panel',2,'--version','Xfce',0,1,0,'',''],
- 'xfce5-panel' => ['^xfce5-panel',2,'--version','Xfce',0,1,0,'',''],
- 'xfdesktop' => ['xfdesktop[[:space:]]version',5,'--version','Xfce',0,1,0,'',''],
- # command: xfdesktop
- 'xfdesktop-toolkit' => ['Built[[:space:]]with[[:space:]]GTK',4,'--version','Gtk',0,1,0,'',''],
- 'xmonad' => ['^xmonad',2,'--version','XMonad',0,1,0,'',''],
- 'yeahwm' => ['^yeahwm',0,'--version','YeahWM',0,1,0,'',''], # unverified
- ## Toolkits ##
- 'gtk-launch' => ['^\S',1,'--version','GTK',0,1,0,'',''],
- 'qmake' => ['^^Using Qt version',4,'--version','Qt',0,0,0,'',''],
- 'qtdiag' => ['^qt',2,'--version','Qt',0,1,0,'',''],
- ## Display Managers (dm) ##
- 'cdm' => ['^cdm',0,'0','CDM',0,1,0,'',''],
- 'entrance' => ['^entrance',0,'0','Entrance',0,1,0,'',''],
- 'gdm' => ['^gdm',2,'--version','GDM',0,1,0,'',''],
- 'gdm3' => ['^gdm',2,'--version','GDM3',0,1,0,'',''],
- 'kdm' => ['^kdm',0,'0','KDM',0,1,0,'',''],
- 'ldm' => ['^ldm',0,'0','LDM',0,1,0,'',''],
- 'lightdm' => ['^lightdm',2,'--version','LightDM',0,1,1,'',''],
- 'lxdm' => ['^lxdm',0,'0','LXDM',0,1,0,'',''],
- 'ly' => ['^ly',3,'--version','Ly',0,1,0,'',''],
- 'mdm' => ['^mdm',0,'0','MDM',0,1,0,'',''],
- 'nodm' => ['^nodm',0,'0','nodm',0,1,0,'',''],
- 'pcdm' => ['^pcdm',0,'0','PCDM',0,1,0,'',''],
- 'sddm' => ['^sddm',0,'0','SDDM',0,1,0,'',''],
- 'slim' => ['slim version',3,'-v','SLiM',0,1,0,'',''],
- 'tdm' => ['^tdm',0,'0','TDM',0,1,0,'',''],
- 'udm' => ['^udm',0,'0','udm',0,1,0,'',''],
- 'wdm' => ['^wdm',0,'0','WINGs DM',0,1,0,'',''],
- 'xdm' => ['^xdm',0,'0','XDM',0,1,0,'',''],
- 'xenodm' => ['^xenodm',0,'0','xenodm',0,1,0,'',''],
- ## Shells - not checked: ion, eshell ##
- ## See test_shell() for unhandled but known shells
- 'ash' => ['',3,'pkg','ash',1,0,0,'',''], # special; dash precursor
- 'bash' => ['^GNU[[:space:]]bash',4,'--version','Bash',1,1,0,'',''],
- 'busybox' => ['^busybox',0,'0','BusyBox',1,0,0,'',''], # unverified, hush/ash likely
- 'cicada' => ['^\s*version',2,'cmd','cicada',1,1,0,'',''], # special
- 'csh' => ['^tcsh',2,'--version','csh',1,1,0,'',''], # mapped to tcsh often
- 'dash' => ['',3,'pkg','DASH',1,0,0,'',''], # no version, pkg query
- 'elvish' => ['^\S',1,'--version','Elvish',1,0,0,'',''],
- 'fish' => ['^fish',3,'--version','fish',1,0,0,'',''],
- 'fizsh' => ['^fizsh',3,'--version','FIZSH',1,0,0,'',''],
- # ksh/lksh/loksh/mksh/posh//pdksh need to print their own $VERSION info
- 'ksh' => ['^\S',1,'cmd','ksh',1,0,0,'^(Version|.*KSH)\s*',''], # special
- 'ksh93' => ['^\S',1,'cmd','ksh93',1,0,0,'^(Version|.*KSH)\s*',''], # special
- 'lksh' => ['^\S',1,'cmd','lksh',1,0,0,'^.*KSH\s*',''], # special
- 'loksh' => ['^\S',1,'cmd','loksh',1,0,0,'^.*KSH\s*',''], # special
- 'mksh' => ['^\S',1,'cmd','mksh',1,0,0,'^.*KSH\s*',''], # special
- 'nash' => ['^nash',0,'0','Nash',1,0,0,'',''], # unverified; rc based [no version]
- 'oh' => ['^oh',0,'0','Oh',1,0,0,'',''], # no version yet
- 'oil' => ['^Oil',3,'--version','Oil',1,1,0,'',''], # could use cmd $OIL_SHELL
- 'osh' => ['^osh',3,'--version','OSH',1,1,0,'',''], # precursor of oil
- 'pdksh' => ['^\S',1,'cmd','pdksh',1,0,0,'^.*KSH\s*',''], # special, in ksh family
- 'posh' => ['^\S',1,'cmd','posh',1,0,0,'',''], # special, in ksh family
- 'tcsh' => ['^tcsh',2,'--version','tcsh',1,1,0,'',''], # enhanced csh
- 'xonsh' => ['^xonsh',1,'--version','xonsh',1,0,0,'^xonsh[\/-]',''],
- 'yash' => ['^Y',5,'--version','yash',1,0,0,'',''],
- 'zsh' => ['^zsh',2,'--version','Zsh',1,0,0,'',''],
- ## Tools ##
- 'clang' => ['clang',3,'--version','Clang',1,0,0,'',''],
- 'gcc' => ['^gcc',3,'--version','GCC',1,0,0,'',''],
- 'gcc-apple' => ['Apple[[:space:]]LLVM',2,'--version','LLVM',1,0,0,'',''],
- 'sudo' => ['^Sudo',3,'-V','Sudo',1,1,0,'',''], # sudo pre 1.7 does not have --version
- );
-}
-
-# returns array of:
-# 0 - match string; 1 - search number; 2 - version string [alt: file];
-# 3 - Print name; 4 - console 0/1;
-# 5 - 0/1 exit version loop at 1 [alt: if version=file replace value with \s];
-# 6 - 0/1 write to stderr [alt: if version=file, path for file]
-# 7 - replace regex for further cleanup; 8 - extra data
-# note: setting index 1 or 2 to 0 will trip flags to not do version
-# arg: 1 - program lower case name
-sub program_values {
- my ($app) = @_;
- my (@program_data);
- set_program_values() if !%program_values;
- if ( defined $program_values{$app} ){
- @program_data = @{$program_values{$app}};
- }
- #my $debug = Dumper \@program_data;
- main::log_data('dump',"Program Data",\@program_data) if $b_log;
- return @program_data;
-}
-
-# args: 1 - desktop/app command for --version; 2 - search string;
-# 3 - space print number; 4 - [optional] version arg: -v, version, etc
-# 5 - [optional] exit first find 0/1; 6 - [optional] 0/1 stderr output
-# 7 - replace regex; 8 - extra data
-sub program_version {
+# gets directory file list
+sub lister {
+ return if ! -d $_[0];
+ opendir my $dir, $_[0] or return;
+ my @list = readdir $dir;
+ @list = grep {!/^(\.|\.\.)$/} @list if @list;
+ closedir $dir;
+ return @list;
+}
+# checks for 1 of 3 perl json modules. All three have same encode_json,
+# decode_json() methods.
+sub load_json {
+ eval $start if $b_log;
+ $loaded{'json'} = 1;
+ # recommended, but not in core modules
+ if (check_perl_module('Cpanel::JSON::XS')){
+ Cpanel::JSON::XS->import(qw(encode_json decode_json));
+ # my $new = Cpanel::JSON::XS->new;
+ $use{'json'} = {'type' => 'cpanel-json-xs',
+ 'encode' => \&Cpanel::JSON::XS::encode_json,
+ 'decode' => \&Cpanel::JSON::XS::decode_json,};
+ # $use{'json'} = {'type' => 'cpanel-json-xs',
+ # 'new-json' => \Cpanel::JSON::XS->new()};
+ }
+ # somewhat legacy, not in perl modules
+ elsif (check_perl_module('JSON::XS')){
+ JSON::XS->import;
+ $use{'json'} = {'type' => 'json-xs',
+ 'encode' => \&JSON::XS::encode_json,
+ 'decode' => \&JSON::XS::decode_json};
+ }
+ # perl, in core modules as of 5.14
+ elsif (check_perl_module('JSON::PP')){
+ JSON::PP->import;
+ $use{'json'} = {'type' => 'json-pp',
+ 'encode' => \&JSON::PP::encode_json,
+ 'decode' => \&JSON::PP::decode_json};
+ }
+ eval $end if $b_log;
+}
+
+# args: 0: full file path, returns array of file lines;
+# 1: optionsl, strip and clean data;
+# 2: optional: undef|arr|ref|index return specific index, if it exists, else undef
+# note: chomp has to chomp the entire action, not just <$fh>
+sub reader {
eval $start if $b_log;
- my ($app,$search,$num,$version,$exit,$stderr,$replace,$extra) = @_;
- my ($b_no_space,$cmd,$line,$output);
- my $version_nu = '';
- my $count = 0;
- my $app_name = $app;
- $app_name =~ s%^.*/%%;
- # print "app: $app :: appname: $app_name\n";
- $exit ||= 100; # basically don't exit ever
- $version ||= '--version';
- # adjust to array index, not human readable
- $num-- if (defined $num && $num > 0);
- # konvi in particular doesn't like using $ENV{'PATH'} as set, so we need
- # to always assign the full path if it hasn't already been done
- if ( $version ne 'file' && $app !~ /^\// ){
- if (my $program = check_program($app) ){
- $app = $program;
- }
- else {
- log_data('data',"$app not found in path.") if $b_log;
- return 0;
- }
- }
- if ($version eq 'file'){
- return 0 unless $extra && -r $extra;
- my @data = reader($extra,'strip');
- @data = map {s/$stderr/ /;$_} @data if $stderr; # $stderr is the splitter
- $output = join "\n",@data;
- }
- # These will mostly be shells that require running the shell command -c to get info data
- elsif ($version eq 'cmd'){
- ($cmd,$b_no_space) = program_version_cmd($app,$app_name,$extra);
- return 0 if !$cmd;
- }
- # slow: use pkg manager to get version, avoid unless you really want version
- elsif ($version eq 'pkg'){
- ($cmd,$search) = program_version_pkg($app_name);
- return 0 if !$cmd;
- }
- # note, some wm/apps send version info to stderr instead of stdout
- elsif ($stderr) {
- $cmd = "$app $version 2>&1";
+ my ($file,$strip,$type) = @_;
+ return if !$file || ! -r $file; # not all OS respect -r tests!!
+ $type = 'arr' if !defined $type;
+ my ($error,@rows);
+ open(my $fh, '<', $file) or $error = $!; # $fh always non null, even on error
+ if ($error){
+ error_handler('open', $file, $error);
}
else {
- $cmd = "$app $version 2>/dev/null";
- }
- log_data('data',"version: $version num: $num search: $search command: $cmd") if $b_log;
- # special case, in rare instances version comes from file
- if ($version ne 'file'){
- $output = qx($cmd);
- log_data('data',"output: $output") if $b_log;
- }
- # print "cmd: $cmd\noutput:\n$output\n";
- # sample: dwm-5.8.2, ©.. etc, why no space? who knows. Also get rid of v in number string
- # xfce, and other, output has , in it, so dump all commas and parentheses
- if ($output){
- open my $ch, '<', \$output or error_handler('open-data',"$cmd", "$!");
- while (<$ch>){
- #chomp;
- last if $count > $exit;
- if ( $_ =~ /$search/i ) {
- $_ = trimmer($_);
- # print "loop: $_ :: num: $num\n";
- $_ =~ s/$replace//i if $replace;
- $_ =~ s/\s/_/g if $b_no_space; # needed for some items with version > 1 word
- my @data = split /\s+/, $_;
- $version_nu = $data[$num];
- last if ! defined $version_nu;
- # some distros add their distro name before the version data, which
- # breaks version detection. A quick fix attempt is to just add 1 to $num
- # to get the next value.
- $version_nu = $data[$num+1] if $data[$num+1] && $version_nu =~ /version/i;
- $version_nu =~ s/(\([^)]+\)|,|"|\||\(|\))//g if $version_nu;
- # trim off leading v but only when followed by a number
- $version_nu =~ s/^v([0-9])/$1/i if $version_nu;
- # print "$version_nu\n";
- last;
+ chomp(@rows = <$fh>);
+ close $fh;
+ if (@rows && $strip){
+ my @temp;
+ for (@rows){
+ next if /^\s*(#|$)/;
+ $_ =~ s/^\s+|\s+$//g;
+ push(@temp,$_);
}
- $count++;
+ @rows = @temp;
}
- close $ch if $ch;
- }
- log_data('data',"Program version: $version_nu") if $b_log;
- eval $end if $b_log;
- return $version_nu;
-}
-# print program_version('bash', 'bash', 4) . "\n";
-
-# returns ($cmdd, $b_no_space)
-# ksh: Version JM 93t+ 2010-03-05 [OR] Version A 2020.0.0
-# mksh: @(#)MIRBSD KSH R56 2018/03/09; lksh/pdksh: @(#)LEGACY KSH R56 2018/03/09
-# loksh: @(#)PD KSH v5.2.14 99/07/13.2; posh: 0.13.2
-sub program_version_cmd {
- eval $start if $b_log;
- my ($app,$app_name,$extra) = @_;
- my @data = ('',0);
- if ($app_name eq 'cicada') {
- $data[0] = $app . ' -c "' . $extra . '" 2>/dev/null';}
- elsif ($app_name =~ /^(|l|lo|m|pd)ksh(93)?$/){
- $data[0] = $app . ' -c \'printf %s "$KSH_VERSION"\' 2>/dev/null';
- $data[1] = 1;}
- elsif ($app_name eq 'posh'){
- $data[0] = $app . ' -c \'printf %s "$POSH_VERSION"\' 2>/dev/null'}
- # print "$data[0] :: $data[1]\n";
- eval $end if $b_log;
- return @data;
-}
-# returns $cmd, $search
-sub program_version_pkg {
- eval $start if $b_log;
- my ($app) = @_;
- my ($program,@data);
- # note: version $num is 3 in dpkg-query/pacman/rpm, which is convenient
- if ($program = check_program('dpkg-query') ){
- $data[0] = "$program -W -f='\${Package}\tversion\t\${Version}\n' $app 2>/dev/null";
- $data[1] = "^$app\\b";
- }
- elsif ($program = check_program('pacman') ){
- $data[0] = "$program -Q --info $app 2>/dev/null";
- $data[1] = '^Version';
- }
- elsif ($program = check_program('rpm') ){
- $data[0] = "$program -qi --nodigest --nosignature $app 2>/dev/null";
- $data[1] = '^Version';
- }
- # print "$data[0] :: $data[1]\n";
- eval $end if $b_log;
- return @data;
-}
-
-# arg: 1 - full file path, returns array of file lines.
-# 2 - optionsl, strip and clean data
-# note: chomp has to chomp the entire action, not just <$fh>
-sub reader {
- eval $start if $b_log;
- my ($file,$strip) = @_;
- return if ! $file;
- open( my $fh, '<', $file ) or error_handler('open', $file, $!);
- chomp(my @rows = <$fh>);
- if ($strip && @rows){
- @rows = grep {/^\s*[^#]/} @rows;
- @rows = map {s/^\s+|\s+$//g; $_} @rows if @rows;
}
eval $end if $b_log;
- return @rows;
+ return @rows if $type eq 'arr';
+ return \@rows if $type eq 'ref';
+ # note: returns undef scalar value if $rows[index] does not exist
+ return $rows[$type];
}
-# args: 1 - the file to create if not exists
+# args: 0: the file to create if not exists
sub toucher {
my $file = shift;
- if ( ! -e $file ){
- open( my $fh, '>', $file ) or error_handler('create', $file, $!);
+ if (! -e $file){
+ open(my $fh, '>', $file) or error_handler('create', $file, $!);
}
}
# calling it trimmer to avoid conflicts with existing trim stuff
-# arg: 1 - string to be right left trimmed. Also slices off \n so no chomp needed
+# args: 0: string to be right left trimmed. Also slices off \n so no chomp needed
# this thing is super fast, no need to log its times etc, 0.0001 seconds or less
sub trimmer {
- #eval $start if $b_log;
+ # eval $start if $b_log;
my ($str) = @_;
$str =~ s/^\s+|\s+$|\n$//g;
- #eval $end if $b_log;
+ # eval $end if $b_log;
return $str;
}
-# args: 1 - hash
-# send array, assign to hash, return array, uniq values only.
+# args: 0: array, by ref, modifying by ref
+# send array, assign to hash, changed array by reference, uniq values only.
sub uniq {
my %seen;
- grep !$seen{$_}++, @_;
+ @{$_[0]} = grep !$seen{$_}++, @{$_[0]};
}
-# arg: 1 file full path to write to; 2 - arrayof data to write.
+# args: 0: file full path to write to; 1: array ref or scalar of data to write.
# note: turning off strict refs so we can pass it a scalar or an array reference.
sub writer {
- my ($path, $ref_content) = @_;
- my ($content);
+ my ($path, $content) = @_;
+ my ($contents);
no strict 'refs';
- # print Dumper $ref_content, "\n";
- if (ref $ref_content eq 'ARRAY'){
- $content = join "\n", @$ref_content or die "failed with error $!";
+ # print Dumper $content, "\n";
+ if (ref $content eq 'ARRAY'){
+ $contents = join("\n", @$content); # or die "failed with error $!";
}
else {
- $content = scalar $ref_content;
+ $contents = $content;
}
open(my $fh, ">", $path) or error_handler('open',"$path", "$!");
- print $fh $content;
+ print $fh $contents;
close $fh;
}
#### -------------------------------------------------------------------
#### UPDATER
-##### -------------------------------------------------------------------
+#### -------------------------------------------------------------------
-# arg 1: type to return
+# args: 0: type to return
sub get_defaults {
my ($type) = @_;
my %defaults = (
- 'ftp-upload' => 'ftp.techpatterns.com/incoming',
- 'inxi-branch-1' => 'https://github.com/smxi/inxi/raw/one/',
- 'inxi-branch-2' => 'https://github.com/smxi/inxi/raw/two/',
- 'inxi-dev' => 'https://smxi.org/in/',
- 'inxi-main' => 'https://github.com/smxi/inxi/raw/master/',
- 'inxi-pinxi' => 'https://github.com/smxi/inxi/raw/inxi-perl/',
- 'inxi-man' => "https://smxi.org/in/$self_name.1.gz",
- 'inxi-man-gh' => "https://github.com/smxi/inxi/raw/master/$self_name.1",
- 'pinxi-man' => "https://smxi.org/in/$self_name.1.gz",
- 'pinxi-man-gh' => "https://github.com/smxi/inxi/raw/inxi-perl/$self_name.1",
+ 'ftp-upload' => 'ftp.smxi.org/incoming',
+ 'inxi-branch-1' => 'https://codeberg.org/smxi/inxi/raw/one/',
+ 'inxi-branch-2' => 'https://codeberg.org/smxi/inxi/raw/two/',
+ "$self_name-dev" => 'https://smxi.org/in/',
+ "$self_name-dev-ftp" => 'ftp://ftp.smxi.org/outgoing/',
+ "inxi-main" => 'https://codeberg.org/smxi/inxi/raw/master/',
+ 'pinxi-main' => 'https://codeberg.org/smxi/pinxi/raw/master/',
);
- if ( exists $defaults{$type}){
+ if ($defaults{$type}){
return $defaults{$type};
}
else {
@@ -3791,23 +4175,22 @@ sub get_defaults {
}
}
-# args: 1 - download url, not including file name; 2 - string to print out
-# 3 - update type option
-# note that 1 must end in / to properly construct the url path
+# args: 0: download url, not including file name; 1: string to print out
+# 2: update type option
+# note that 0 must end in / to properly construct the url path
sub update_me {
eval $start if $b_log;
- my ( $self_download, $download_id ) = @_;
+ my ($self_download,$download_id) = @_;
my $downloader_error=1;
my $file_contents='';
my $output = '';
$self_path =~ s/\/$//; # dirname sometimes ends with /, sometimes not
$self_download =~ s/\/$//; # dirname sometimes ends with /, sometimes not
my $full_self_path = "$self_path/$self_name";
-
- if ( $b_irc ){
- error_handler('not-in-irc', "-U/--update" )
+ if ($b_irc){
+ error_handler('not-in-irc', "-U/--update")
}
- if ( ! -w $full_self_path ){
+ if (! -w $full_self_path){
error_handler('not-writable', "$self_name", '');
}
$output .= "Starting $self_name self updater.\n";
@@ -3820,26 +4203,25 @@ sub update_me {
$output = '';
$self_download = "$self_download/$self_name";
$file_contents = download_file('stdout', $self_download);
-
# then do the actual download
- if ( $file_contents ){
+ if ($file_contents){
# make sure the whole file got downloaded and is in the variable
- if ( $file_contents =~ /###\*\*EOF\*\*###/ ){
+ print "Validating downloaded data...\n";
+ if ($file_contents =~ /###\*\*EOF\*\*###/){
open(my $fh, '>', $full_self_path);
- print $fh $file_contents or error_handler('write', "$full_self_path", "$!" );
+ print $fh $file_contents or error_handler('write', $full_self_path, "$!");
close $fh;
- qx( chmod +x '$self_path/$self_name' );
+ qx(chmod +x '$self_path/$self_name');
set_version_data();
$output .= "Successfully updated to $download_id version: $self_version\n";
$output .= "New $download_id version patch number: $self_patch\n";
$output .= "New $download_id version release date: $self_date\n";
$output .= "To run the new version, just start $self_name again.\n";
$output .= "$line3\n";
- $output .= "Starting download of man page file now.\n";
print $output;
$output = '';
- if ($b_man){
- update_man($download_id);
+ if ($use{'man'}){
+ update_man($self_download,$download_id);
}
else {
print "Skipping man download because branch version is being used.\n";
@@ -3858,62 +4240,69 @@ sub update_me {
}
sub update_man {
- my ($download_id) = @_;
- my $man_file_location=set_man_location();
- my $man_file_path="$man_file_location/$self_name.1" ;
- my ($man_file_url,$output) = ('','');
-
- my $b_downloaded = 0;
- if ( ! -d $man_file_location ){
+ eval $start if $b_log;
+ my ($self_download,$download_id) = @_;
+ my $man_file_location = set_man_location();
+ my $man_file_path = "$man_file_location/$self_name.1" ;
+ my ($file_contents,$man_file_url,$output,$program) = ('','','','');
+ print "Starting download of man page file now.\n";
+ if (! -d $man_file_location){
print "The required man directory was not detected on your system.\n";
print "Unable to continue: $man_file_location\n";
return 0;
}
- if ( ! -w $man_file_location ){
+ if (! -w $man_file_location){
print "Cannot write to $man_file_location! Root privileges required.\n";
print "Unable to continue: $man_file_location\n";
return 0;
}
- if ( -f "/usr/share/man/man8/inxi.8.gz" ){
+ if (-f "/usr/share/man/man8/inxi.8.gz"){
print "Updating man page location to man1.\n";
rename "/usr/share/man/man8/inxi.8.gz", "$man_file_location/inxi.1.gz";
- if ( check_program('mandb') ){
- system( 'mandb' );
+ if (check_program('mandb')){
+ system('mandb');
}
}
- # first choice is inxi.1/pinxi.1 from gh, second gz from smxi.org
- if ( $download_id ne 'dev server' && (my $program = check_program('gzip'))){
- $man_file_url=get_defaults($self_name . '-man-gh');
- print "Downloading Man page file...\n";
- $b_downloaded = download_file('file', $man_file_url, $man_file_path);
- if ($b_downloaded){
- print "Download successful. Compressing file...\n";
+ if (!($program = check_program('gzip'))){
+ print "Required program gzip not found. Unable to install man page.\n";
+ return 0;
+ }
+ # first choice is inxi.1/pinxi.1 from gh, second from smxi.org
+ $man_file_url = $self_download . '.1';
+ print "Updating $self_name.1 in $man_file_location\n";
+ print "using $download_id branch as download source\n";
+ print "Downloading man page file...\n";
+ print "Download URL: $man_file_url\n" if $dbg[1];
+ $file_contents = download_file('stdout', $man_file_url);
+ if ($file_contents){
+ # make sure the whole file got downloaded and is in the variable
+ print "Download successful. Validating downloaded man file data...\n";
+ if ($file_contents =~ m|\.\\" EOF|){
+ print "Contents validated. Writing to man location...\n";
+ open(my $fh, '>', $man_file_path);
+ print $fh $file_contents or error_handler('write', $man_file_path, "$!");
+ close $fh;
+ print "Writing successful. Compressing file...\n";
system("$program -9 -f $man_file_path > $man_file_path.gz");
my $err = $?;
if ($err > 0){
- print "Oh no! Something went wrong compressing the manfile:\n";
- print "Local path: $man_file_path Error: $err\n";
+ print "Oh no! Something went wrong compressing the man file!\n";
+ print "Error: $err\n";
}
else {
- print "Download and install of man page successful.\nCheck to make sure it works: man $self_name\n";
+ print "Download, install, and compression of man page successful.\n";
+ print "Check to make sure it works: man $self_name\n";
}
}
- }
- else {
- $man_file_url = get_defaults($self_name . '-man');
- # used to use spider tests, but only wget supports that, so no need
- print "Downloading Man page file gz...\n";
- $man_file_path .= '.gz';
- # returns perl, 1 for true, 0 for false, even when using shell tool returns
- $b_downloaded = download_file('file', $man_file_url, $man_file_path );
- if ($b_downloaded) {
- print "Download and install of man page successful.\nCheck to make sure it works: man $self_name\n";
+ else {
+ error_handler('file-corrupt', "$self_name.1");
}
}
- if ( !$b_downloaded ){
- print "Oh no! Something went wrong downloading the Man file at:\n$man_file_url\n";
- print "Try -U with --dbg 1 for more information on the failure.\n";
+ # now run the error handlers on any downloader failure
+ else {
+ error_handler('download-error', $man_file_url, $download_id);
}
+ eval $end if $b_log;
}
sub set_man_location {
@@ -3922,22 +4311,22 @@ sub set_man_location {
my $man_paths=qx(man --path 2>/dev/null);
my $man_local='/usr/local/share/man';
my $b_use_local=0;
- if ( $man_paths && $man_paths =~ /$man_local/ ){
+ if ($man_paths && $man_paths =~ /$man_local/){
$b_use_local=1;
}
# for distro installs
- if ( -f "$default_location/inxi.1.gz" ){
+ if (-f "$default_location/inxi.1.gz"){
$location=$default_location;
}
else {
- if ( $b_use_local ){
- if ( ! -d "$man_local/man1" ){
+ if ($b_use_local){
+ if (! -d "$man_local/man1"){
mkdir "$man_local/man1";
}
$location="$man_local/man1";
}
}
- if ( ! $location ){
+ if (!$location){
$location=$default_location;
}
return $location;
@@ -3947,21 +4336,21 @@ sub set_man_location {
# note, this is only now used for self updater function so it can get
# the values from the UPDATED file, NOT the running program!
sub set_version_data {
- open (my $fh, '<', "$self_path/$self_name");
- while( my $row = <$fh>){
- chomp $row;
+ open(my $fh, '<', "$self_path/$self_name");
+ while (my $row = <$fh>){
+ chomp($row);
$row =~ s/'|;//g;
- if ($row =~ /^my \$self_name/ ){
- $self_name = (split /=/, $row)[1];
+ if ($row =~ /^my \$self_name/){
+ $self_name = (split('=', $row))[1];
}
- elsif ($row =~ /^my \$self_version/ ){
- $self_version = (split /=/, $row)[1];
+ elsif ($row =~ /^my \$self_version/){
+ $self_version = (split('=', $row))[1];
}
- elsif ($row =~ /^my \$self_date/ ){
- $self_date = (split /=/, $row)[1];
+ elsif ($row =~ /^my \$self_date/){
+ $self_date = (split('=', $row))[1];
}
- elsif ($row =~ /^my \$self_patch/ ){
- $self_patch = (split /=/, $row)[1];
+ elsif ($row =~ /^my \$self_patch/){
+ $self_patch = (split('=', $row))[1];
}
elsif ($row =~ /^## END INXI INFO/){
last;
@@ -3974,13 +4363,17 @@ sub set_version_data {
#### OPTIONS HANDLER / VERSION
########################################################################
-sub get_options{
+## OptionsHandler
+{
+package OptionsHandler;
+# Note: used %trigger here, but perl 5.008 had issues, so mmoved to global.
+# Careful with hash globals in first Perl 5.0080.
+my ($self_download,$download_id);
+
+sub get {
eval $start if $b_log;
- my (@args) = @_;
$show{'short'} = 1;
- my ($b_downloader,$b_help,$b_no_man,$b_no_man_force,$b_recommends,$b_updater,
- $b_version,$b_use_man,$self_download, $download_id);
- GetOptions (
+ Getopt::Long::GetOptions (
'a|admin' => sub {
$b_admin = 1;},
'A|audio' => sub {
@@ -4001,40 +4394,54 @@ sub get_options{
'B|battery' => sub {
$show{'short'} = 0;
$show{'battery'} = 1;
- $show{'battery-forced'} = 1; },
+ $show{'battery-forced'} = 1;},
'c|color:i' => sub {
my ($opt,$arg) = @_;
- if ( $arg >= 0 && $arg < get_color_scheme('count') ){
- set_color_scheme($arg);
+ if ($arg >= 0 && $arg < main::get_color_scheme('count')){
+ main::set_color_scheme($arg);
}
- elsif ( $arg >= 94 && $arg <= 99 ){
+ elsif ($arg >= 94 && $arg <= 99){
$colors{'selector'} = $arg;
}
else {
- error_handler('bad-arg', $opt, $arg);
- } },
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
'C|cpu' => sub {
$show{'short'} = 0;
- $show{'cpu'} = 1; },
+ $show{'cpu'} = 1;},
+ 'config|configs|configuration|configurations' => sub {
+ $show{'configs'} = 1;},
'd|disk-full|optical' => sub {
$show{'short'} = 0;
$show{'disk'} = 1;
- $show{'optical'} = 1; },
+ $show{'optical'} = 1;},
'D|disk' => sub {
$show{'short'} = 0;
- $show{'disk'} = 1; },
+ $show{'disk'} = 1;},
+ 'E|bluetooth' => sub {
+ $show{'short'} = 0;
+ $show{'bluetooth'} = 1;
+ $show{'bluetooth-forced'} = 1;},
+ 'edid' => sub {
+ $b_admin = 1;
+ $show{'short'} = 0;
+ $show{'edid'} = 1;
+ $show{'graphic'} = 1;
+ $show{'graphic-full'} = 1;},
'f|flags|flag' => sub {
$show{'short'} = 0;
$show{'cpu'} = 1;
- $show{'cpu-flag'} = 1; },
+ $show{'cpu-flag'} = 1;},
'F|full' => sub {
$show{'short'} = 0;
$show{'audio'} = 1;
$show{'battery'} = 1;
+ $show{'bluetooth'} = 1;
$show{'cpu'} = 1;
$show{'disk'} = 1;
$show{'graphic'} = 1;
$show{'graphic-basic'} = 1;
+ $show{'graphic-full'} = 1;
$show{'info'} = 1;
$show{'machine'} = 1;
$show{'network'} = 1;
@@ -4043,111 +4450,149 @@ sub get_options{
$show{'raid'} = 1;
$show{'sensor'} = 1;
$show{'swap'} = 1;
- $show{'system'} = 1; },
+ $show{'system'} = 1;},
+ 'gpu|nvidia|nv' => sub {
+ main::error_handler('option-removed', '--gpu/--nvidia/--nv','-Ga');},
'G|graphics|graphic' => sub {
$show{'short'} = 0;
$show{'graphic'} = 1;
- $show{'graphic-basic'} = 1; },
+ $show{'graphic-basic'} = 1;
+ $show{'graphic-full'} = 1;},
'h|help|?' => sub {
- $b_help = 1; },
+ $show{'help'} = 1;},
'i|ip' => sub {
$show{'short'} = 0;
$show{'ip'} = 1;
$show{'network'} = 1;
$show{'network-advanced'} = 1;
- $b_downloader = 1 if ! check_program('dig');},
+ $use{'downloader'} = 1 if !main::check_program('dig');},
+ 'ip-limit|limit:i' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg != 0){
+ $limit = $arg;
+ $use{'ip-limit'} = 1;
+ }
+ else {
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
'I|info' => sub {
$show{'short'} = 0;
- $show{'info'} = 1; },
+ $show{'info'} = 1;},
'j|swap|swaps' => sub {
$show{'short'} = 0;
- $show{'swap'} = 1; },
+ $show{'swap'} = 1;},
'J|usb' => sub {
$show{'short'} = 0;
- $show{'usb'} = 1; },
+ $show{'usb'} = 1;},
'l|labels|label' => sub {
+ $show{'label'} = 1;},
+ 'L|logical|lvm' => sub {
$show{'short'} = 0;
- $show{'label'} = 1;
- $show{'partition'} = 1; },
- 'limit:i' => sub {
- my ($opt,$arg) = @_;
- if ($arg != 0){
- $limit = $arg;
- }
- else {
- error_handler('bad-arg',$opt,$arg);
- } },
+ $show{'logical'} = 1;},
'm|memory' => sub {
$show{'short'} = 0;
- $show{'ram'} = 1; },
- 'memory-modules' => sub {
+ $show{'ram'} = 1;},
+ 'memory-modules|mm' => sub {
$show{'short'} = 0;
$show{'ram'} = 1;
$show{'ram-modules'} = 1;},
- 'memory-short' => sub {
+ 'memory-short|ms' => sub {
$show{'short'} = 0;
$show{'ram'} = 1;
$show{'ram-short'} = 1;},
'M|machine' => sub {
$show{'short'} = 0;
- $show{'machine'} = 1; },
+ $show{'machine'} = 1;},
'n|network-advanced' => sub {
$show{'short'} = 0;
$show{'network'} = 1;
- $show{'network-advanced'} = 1; },
+ $show{'network-advanced'} = 1;},
'N|network' => sub {
$show{'short'} = 0;
- $show{'network'} = 1; },
+ $show{'network'} = 1;},
'o|unmounted' => sub {
$show{'short'} = 0;
- $show{'unmounted'} = 1; },
+ $show{'unmounted'} = 1;},
'p|partition-full|partitions-full' => sub {
$show{'short'} = 0;
$show{'partition'} = 0;
- $show{'partition-full'} = 1; },
- 'P|partitions|partition' => sub {
- $show{'short'} = 0;
- $show{'partition'} = 1; },
- 'partition-sort:s' => sub {
+ $show{'partition-full'} = 1;},
+ 'partition-sort|partitions-sort|ps:s' => sub {
my ($opt,$arg) = @_;
if ($arg =~ /^(dev-base|fs|id|label|percent-used|size|uuid|used)$/){
$show{'partition-sort'} = $arg;
+ $use{'partition-sort'} = 1;
}
else {
- error_handler('bad-arg',$opt,$arg);
- } },
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
+ 'P|partition|partitions' => sub {
+ $show{'short'} = 0;
+ $show{'partition'} = 1;},
'r|repos|repo' => sub {
$show{'short'} = 0;
- $show{'repo'} = 1; },
+ $show{'repo'} = 1;},
'R|raid' => sub {
$show{'short'} = 0;
$show{'raid'} = 1;
- $show{'raid-forced'} = 1; },
+ $show{'raid-forced'} = 1;},
's|sensors|sensor' => sub {
$show{'short'} = 0;
- $show{'sensor'} = 1; },
+ $show{'sensor'} = 1;},
+ 'sensors-default' => sub {
+ $use{'sensors-default'} = 1;},
+ 'sensors-exclude:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg){
+ @sensors_exclude = split(/\s*,\s*/, $arg);
+ $use{'sensors-exclude'} = 1;
+ }
+ else {
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
+ 'sensors-use:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg){
+ @sensors_use = split(/\s*,\s*/, $arg);
+ $use{'sensors-use'} = 1;
+ }
+ else {
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
+ 'separator|sep:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg){
+ $sep{'s1-console'} = $arg;
+ $sep{'s2-console'} = $arg;
+ $sep{'s1-irc'} = $arg;
+ $sep{'s2-irc'} = $arg;
+ }
+ else {
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
'sleep:s' => sub {
my ($opt,$arg) = @_;
$arg ||= 0;
if ($arg >= 0){
$cpu_sleep = $arg;
+ $use{'cpu-sleep'} = 1;
}
else {
- error_handler('bad-arg',$opt,$arg);
- } },
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
'slots|slot' => sub {
$show{'short'} = 0;
- $show{'slot'} = 1; },
+ $show{'slot'} = 1;},
'S|system' => sub {
$show{'short'} = 0;
- $show{'system'} = 1; },
+ $show{'system'} = 1;},
't|processes|process:s' => sub {
my ($opt,$arg) = @_;
$show{'short'} = 0;
$arg ||= 'cm';
my $num = $arg;
$num =~ s/^[cm]+// if $num;
- if ( $arg =~ /^([cm]+)([0-9]+)?$/ && (!$num || $num =~ /^\d+/) ){
+ if ($arg =~ /^([cm]+)([0-9]+)?$/ && (!$num || $num =~ /^\d+/)){
$show{'process'} = 1;
if ($arg =~ /c/){
$show{'ps-cpu'} = 1;
@@ -4158,20 +4603,18 @@ sub get_options{
$ps_count = $num if $num;
}
else {
- error_handler('bad-arg',$opt,$arg);
- } },
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
'u|uuid' => sub {
- $show{'short'} = 0;
- $show{'partition'} = 1;
- $show{'uuid'} = 1; },
+ $show{'uuid'} = 1;},
'v|verbosity:i' => sub {
my ($opt,$arg) = @_;
$show{'short'} = 0;
- if ( $arg =~ /^[0-8]$/ ){
- if ($arg == 0 ){
+ if ($arg =~ /^[0-8]$/){
+ if ($arg == 0){
$show{'short'} = 1;
}
- if ($arg >= 1 ){
+ if ($arg >= 1){
$show{'cpu-basic'} = 1;
$show{'disk-total'} = 1;
$show{'graphic'} = 1;
@@ -4179,102 +4622,105 @@ sub get_options{
$show{'info'} = 1;
$show{'system'} = 1;
}
- if ($arg >= 2 ){
+ if ($arg >= 2){
$show{'battery'} = 1;
$show{'disk-basic'} = 1;
$show{'raid-basic'} = 1;
$show{'machine'} = 1;
$show{'network'} = 1;
}
- if ($arg >= 3 ){
+ if ($arg >= 3){
$show{'network-advanced'} = 1;
$show{'cpu'} = 1;
$extra = 1;
}
- if ($arg >= 4 ){
+ if ($arg >= 4){
$show{'disk'} = 1;
$show{'partition'} = 1;
}
- if ($arg >= 5 ){
+ if ($arg >= 5){
$show{'audio'} = 1;
- $show{'ram'} = 1;
+ $show{'bluetooth'} = 1;
+ $show{'graphic-full'} = 1;
$show{'label'} = 1;
$show{'optical-basic'} = 1;
- $show{'ram'} = 1;
$show{'raid'} = 1;
+ $show{'ram'} = 1;
$show{'sensor'} = 1;
$show{'swap'} = 1;
$show{'uuid'} = 1;
}
- if ($arg >= 6 ){
+ if ($arg >= 6){
$show{'optical'} = 1;
$show{'partition-full'} = 1;
$show{'unmounted'} = 1;
$show{'usb'} = 1;
$extra = 2;
}
- if ($arg >= 7 ){
- $b_downloader = 1 if ! check_program('dig');
+ if ($arg >= 7){
+ $use{'downloader'} = 1 if !main::check_program('dig');
+ $show{'battery-forced'} = 1;
+ $show{'bluetooth-forced'} = 1;
$show{'cpu-flag'} = 1;
$show{'ip'} = 1;
+ $show{'logical'} = 1;
$show{'raid-forced'} = 1;
$extra = 3;
}
- if ($arg >= 8 ){
+ if ($arg >= 8){
$b_admin = 1;
- $b_downloader = 1;
- $show{'slot'} = 1;
+ # $use{'downloader'} = 1; # only if weather
+ $force{'pkg'} = 1;
+ $show{'edid'} = 1;
$show{'process'} = 1;
$show{'ps-cpu'} = 1;
$show{'ps-mem'} = 1;
$show{'repo'} = 1;
- #$show{'weather'} = 1;
+ $show{'slot'} = 1;
+ # $show{'weather'} = 1;
}
}
else {
- error_handler('bad-arg',$opt,$arg);
- } },
- 'V|version' => sub {
- $b_version = 1 },
- 'w|weather' => sub {
- my ($opt) = @_;
- $show{'short'} = 0;
- $b_downloader = 1;
- if ( $use{'weather'} ){
- $show{'weather'} = 1;
- }
- else {
- error_handler('distro-block', $opt);
- } },
- 'W|weather-location:s' => sub {
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
+ 'V' => sub {
+ main::error_handler('option-deprecated', '-V','--version/--vf');
+ $show{'version'} = 1;},
+ 'version|vf' => sub {
+ $show{'version'} = 1;},
+ 'version-short|vs' => sub {
+ $show{'version-short'} = 1;},
+ 'w|weather:s' => sub {
my ($opt,$arg) = @_;
- $arg ||= '';
- $arg =~ s/\s//g;
$show{'short'} = 0;
- $b_downloader = 1;
- if ( $use{'weather'} ){
+ $use{'downloader'} = 1;
+ if ($use{'weather'}){
+ $arg =~ s/\s//g if $arg;
if ($arg){
$show{'weather'} = 1;
$show{'weather-location'} = $arg;
}
else {
- error_handler('bad-arg',$opt,$arg);
+ $show{'weather'} = 1;
}
}
else {
- error_handler('distro-block', $opt);
- } },
+ main::error_handler('distro-block', $opt);
+ }},
+ 'W|weather-location:s' => sub {
+ main::error_handler('option-removed', '-W','-w/--weather [location]');},
'ws|weather-source:s' => sub {
my ($opt,$arg) = @_;
# let api processor handle checks if valid, this
# future proofs this
if ($arg =~ /^[1-9]$/){
$weather_source = $arg;
+ $use{'weather-source'} = 1;
}
else {
- error_handler('bad-arg',$opt,$arg);
- } },
- 'weather-unit:s' => sub {
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
+ 'weather-unit|wu:s' => sub {
my ($opt,$arg) = @_;
$arg ||= '';
$arg =~ s/\s//g;
@@ -4283,10 +4729,11 @@ sub get_options{
my %units = ('c'=>'m','f'=>'i','cf'=>'mi','fc'=>'im');
$arg = $units{$arg} if defined $units{$arg};
$weather_unit = $arg;
+ $use{'weather-unit'} = 1;
}
else {
- error_handler('bad-arg',$opt,$arg);
- } },
+ main::error_handler('bad-arg',$opt,$arg);
+ }},
'x|extra:i' => sub {
my ($opt,$arg) = @_;
if ($arg > 0){
@@ -4294,93 +4741,153 @@ sub get_options{
}
else {
$extra++;
- } },
+ }},
'y|width:i' => sub {
my ($opt, $arg) = @_;
- if( defined $arg && $arg == -1){
+ if (defined $arg && $arg == -1){
$arg = 2000;
}
# note: :i creates 0 value if not supplied even though means optional
elsif (!$arg){
$arg = 80;
}
- if ( $arg =~ /\d/ && ($arg == 1 || $arg >= 80) ){
- set_display_width($arg);
+ if ($arg =~ /\d/ && ($arg == 1 || $arg >= 60)){
+ $size{'max-cols-basic'} = $arg if $arg != 1;
+ $size{'max-cols'} = $arg;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'Y|height|less:i' => sub {
+ my ($opt, $arg) = @_;
+ main::error_handler('not-in-irc', '-Y/--height') if $b_irc;
+ if ($arg >= -3){
+ if ($arg >= 0){
+ $size{'max-lines'} = ($arg) ? $arg: $size{'term-lines'};
+ }
+ elsif ($arg == -1) {
+ $use{'output-block'} = 1;
+ }
+ elsif ($arg == -2) {
+ $force{'colors'} = 1;
+ }
+ # unset conifiguration set max height
+ else {
+ $size{'max-lines'} = 0;
+ }
}
else {
- error_handler('bad-arg', $opt, $arg);
- } },
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
'z|filter' => sub {
- $use{'filter'} = 1; },
- 'filter-label' => sub {
- $use{'filter-label'} = 1; },
- 'Z|filter-override' => sub {
- $use{'filter-override'} = 1; },
- 'filter-uuid' => sub {
- $use{'filter-uuid'} = 1; },
+ $use{'filter'} = 1;},
+ 'filter-all|za' => sub {
+ $use{'filter'} = 1;
+ $use{'filter-label'} = 1;
+ $use{'filter-uuid'} = 1;
+ $use{'filter-vulnerabilities'} = 1;},
+ 'filter-label|zl' => sub {
+ $use{'filter-label'} = 1;},
+ 'Z|filter-override|no-filter' => sub {
+ $use{'filter-override'} = 1;},
+ 'filter-uuid|zu' => sub {
+ $use{'filter-uuid'} = 1;},
+ 'filter-v|filter-vulnerabilities|zv' => sub {
+ $use{'filter-vulnerabilities'} = 1;},
## Start non data options
'alt:i' => sub {
my ($opt,$arg) = @_;
- if ($arg == 40) {
+ if ($arg == 40){
$dl{'tiny'} = 0;
- $b_downloader = 1;}
- elsif ($arg == 41) {
+ $use{'downloader'} = 1;}
+ elsif ($arg == 41){
$dl{'curl'} = 0;
- $b_downloader = 1;}
- elsif ($arg == 42) {
+ $use{'downloader'} = 1;}
+ elsif ($arg == 42){
$dl{'fetch'} = 0;
- $b_downloader = 1;}
- elsif ($arg == 43) {
+ $use{'downloader'} = 1;}
+ elsif ($arg == 43){
$dl{'wget'} = 0;
- $b_downloader = 1;}
- elsif ($arg == 44) {
+ $use{'downloader'} = 1;}
+ elsif ($arg == 44){
$dl{'curl'} = 0;
$dl{'fetch'} = 0;
$dl{'wget'} = 0;
- $b_downloader = 1;}
+ $use{'downloader'} = 1;}
else {
- error_handler('bad-arg', $opt, $arg);
+ main::error_handler('bad-arg', $opt, $arg);
}},
+ # set --arm flag separately since android can be on different platforms
+ 'android' => sub {
+ $b_android = 1;},
'arm' => sub {
- $b_arm = 1 },
+ undef %risc;
+ $risc{'id'} = 'arm';
+ $risc{'arm'} = 1;},
'bsd:s' => sub {
my ($opt,$arg) = @_;
if ($arg =~ /^(darwin|dragonfly|freebsd|openbsd|netbsd)$/i){
$bsd_type = lc($arg);
- $b_fake_bsd = 1;
+ $fake{'bsd'} = 1;
}
else {
- error_handler('bad-arg', $opt, $arg);
+ main::error_handler('bad-arg', $opt, $arg);
}
},
- 'bsd-data:s' => sub {
+ 'bt-tool:s' => sub {
my ($opt,$arg) = @_;
- if ($arg =~ /^(dboot|pciconf|sysctl|usbdevs)$/i){
- $b_fake_dboot = 1 if $arg eq 'dboot';
- $b_fake_pciconf = 1 if $arg eq 'pciconf';
- $b_fake_sysctl = 1 if $arg eq 'sysctl';
- $b_fake_usbdevs = 1 if $arg eq 'usbdevs';
+ if ($arg =~ /^(bluetoothctl|bt-adapter|btmgmt|hciconfig|rfkill)$/i){
+ $force{lc($arg)} = 1;
}
else {
- error_handler('bad-arg', $opt, $arg);
+ main::error_handler('bad-arg', $opt, $arg);
}
},
- 'dbg:i' => sub {
+ 'cygwin' => sub {
+ $windows{'cygwin'} = 1;},
+ 'dbg:s' => sub {
my ($opt,$arg) = @_;
- if ($arg > 0) {
- $test[$arg] = 1;
+ if ($arg !~ /^\d+(,\d+)*$/){
+ main::error_handler('bad-arg', $opt, $arg);
}
- else {
- error_handler('bad-arg', $opt, $arg);
+ for (split(',',$arg)){
+ $dbg[$_] = 1;
}},
'debug:i' => sub {
my ($opt,$arg) = @_;
if ($arg =~ /^[1-3]|1[0-3]|2[0-4]$/){
- $debug=$arg;
+ $debugger{'level'} = $arg;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'debug-arg:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg && $arg =~ /^--?[a-z]/ig){
+ $debugger{'arg'} = $arg;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'debug-arg-use:s' => sub {
+ my ($opt,$arg) = @_;
+ print "$arg\n";
+ if ($arg && $arg =~ /^--?[a-z]/ig){
+ $debugger{'arg-use'} = $arg;
}
else {
- error_handler('bad-arg', $opt, $arg);
- } },
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'debug-filter|debug-z' => sub {
+ $debugger{'filter'} = 1 },
+ 'debug-id:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg){
+ $debugger{'id'} = $arg;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
'debug-no-eps' => sub {
$debugger{'no-exit'} = 1;
$debugger{'no-proc'} = 1;
@@ -4389,736 +4896,1110 @@ sub get_options{
'debug-no-exit' => sub {
$debugger{'no-exit'} = 1 },
'debug-no-proc' => sub {
- $debugger{'no-proc'} = 1; },
+ $debugger{'no-proc'} = 1;},
'debug-no-sys' => sub {
- $debugger{'sys'} = 0; },
+ $debugger{'sys'} = 0;},
'debug-proc' => sub {
- $debugger{'proc'} = 1; },
+ $debugger{'proc'} = 1;},
'debug-proc-print' => sub {
$debugger{'proc-print'} = 1;},
'debug-sys-print' => sub {
- $debugger{'sys-print'} = 1; },
+ $debugger{'sys-print'} = 1;},
'debug-test-1' => sub {
- $debugger{'test-1'} = 1; },
- 'debug-z' => sub {
- $debugger{'z'} = 1 },
+ $debugger{'test-1'} = 1;},
+ 'debug-width|debug-y:i' => sub {
+ my ($opt,$arg) = @_;
+ $arg ||= 80;
+ if ($arg =~ /^\d+$/ && ($arg == 1 || $arg >= 80)){
+ $debugger{'width'} = $arg;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'debug-zy|debug-yz:i' => sub {
+ my ($opt,$arg) = @_;
+ $arg ||= 80;
+ if ($arg =~ /^\d+$/ && ($arg == 1 || $arg >= 80)){
+ $debugger{'width'} = $arg;
+ $debugger{'filter'} = 1;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
'dig' => sub {
- $b_skip_dig = 0; },
+ $force{'no-dig'} = 0;},
'display:s' => sub {
my ($opt,$arg) = @_;
- if ($arg =~ /^:?([0-9]+)?$/){
+ if ($arg =~ /^:?([0-9\.]+)?$/){
$display=$arg;
$display ||= ':0';
$display = ":$display" if $display !~ /^:/;
$b_display = ($b_root) ? 0 : 1;
- $b_force_display = 1;
+ $force{'display'} = 1;
$display_opt = "-display $display";
}
else {
- error_handler('bad-arg', $opt, $arg);
- } },
- 'dmidecode' => sub {
- $b_dmidecode_force = 1 },
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'dmi|dmidecode' => sub {
+ $force{'dmidecode'} = 1;},
'downloader:s' => sub {
my ($opt,$arg) = @_;
$arg = lc($arg);
if ($arg =~ /^(curl|fetch|ftp|perl|wget)$/){
- if ($arg eq 'perl' && (!check_module('HTTP::Tiny') || !check_module('IO::Socket::SSL') )){
- error_handler('missing-perl-downloader', $opt, $arg);
+ if ($arg eq 'perl' && (!main::check_perl_module('HTTP::Tiny') ||
+ !main::check_perl_module('IO::Socket::SSL'))){
+ main::error_handler('missing-perl-downloader', $opt, $arg);
}
- elsif ( !check_program($arg)) {
- error_handler('missing-downloader', $opt, $arg);
+ elsif (!main::check_program($arg)){
+ main::error_handler('missing-downloader', $opt, $arg);
}
else {
# this dumps all the other data and resets %dl for only the
# desired downloader.
- $arg = set_perl_downloader($arg);
+ $arg = main::set_perl_downloader($arg);
%dl = ('dl' => $arg, $arg => 1);
- $b_downloader = 1;
+ $use{'downloader'} = 1;
+ }
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'fake:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg){
+ my $wl = 'bluetooth|compiler|cpu|dboot|dmidecode|egl|elbrus|glx|';
+ $wl .= 'iomem|ip-if|ipmi|logical|lspci|partitions|pciconf|pcictl|pcidump|';
+ $wl .= 'raid-btrfs|raid-hw|raid-lvm|raid-md|raid-soft|raid-zfs|';
+ $wl .= 'sensors|sensors-sys|swaymsg|sys-mem|sysctl|';
+ $wl .= 'udevadm|uptime|usbconfig|usbdevs|vmstat|vulkan|wl-info|wlr-randr|';
+ $wl .= 'xdpyinfo|xorg-log|xrandr';
+ for (split(',',$arg)){
+ if ($_ =~ /\b($wl)\b/){
+ $fake{lc($1)} = 1;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $_);
+ }
}
}
else {
- error_handler('bad-arg', $opt, $arg);
- } },
- 'fake-dmi' => sub {
- $b_fake_dmidecode = 1 },
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'fake-data-dir:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg && -d $arg){
+ $fake_data_dir = $arg;
+ }
+ else {
+ main::error_handler('dir-not-exist', $opt, $arg);
+ }},
+ 'force:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg){
+ my $wl = 'bluetoothctl|bt-adapter|btmgmt|colors|cpuinfo|display|dmidecode|';
+ $wl .= 'hciconfig|hddtemp|ip|ifconfig|lsusb|man|meminfo|';
+ $wl .= 'no-dig|no-doas|no-html-wan|no-sudo|pkg|rfkill|rpm|sensors-sys|';
+ $wl .= 'udevadm|usb-sys|vmstat|wayland|wmctrl';
+ for (split(',',$arg)){
+ if ($_ =~ /\b($wl)\b/){
+ $force{lc($1)} = 1;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $_);
+ }
+ }
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
'ftp:s' => sub {
my ($opt,$arg) = @_;
# pattern: ftp.x.x/x
- if ($arg =~ /^ftp\..+\..+\/[^\/]+$/ ){
+ if ($arg =~ /^ftp\..+\..+\/[^\/]+$/){
$ftp_alt = $arg;
}
else {
- error_handler('bad-arg', $opt, $arg);
+ main::error_handler('bad-arg', $opt, $arg);
}},
+ 'hddtemp' => sub {
+ $force{'hddtemp'} = 1;},
'host|hostname' => sub {
$show{'host'} = 1;
- $show{'no-host'} = 0},
- 'indent-min:i' => sub {
+ $show{'no-host'} = 0;},
+ 'html-wan' => sub {
+ $force{'no-html-wan'} = 0;},
+ 'ifconfig' => sub {
+ $force{'ifconfig'} = 1;},
+ 'indent:i' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg >= 11){
+ $size{'indent'} = $arg;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'indents:i' => sub {
my ($opt,$arg) = @_;
- if ($arg =~ /^\d+$/){
- $size{'indent-min'} = $arg;
+ if ($arg >= 0 && $arg < 11){
+ $size{'indents'} = $arg;
}
else {
- error_handler('bad-arg', $opt, $arg);
+ main::error_handler('bad-arg', $opt, $arg);
}},
'irc' => sub {
- $b_irc = 1; },
+ $b_irc = 1;},
'man' => sub {
- $b_use_man = 1; },
- 'mips' => sub {
- $b_mips = 1 },
- 'output:s' => sub {
+ $use{'yes-man'} = 1;},
+ 'max-wrap|wrap-max|indent-min:i' => sub {
my ($opt,$arg) = @_;
- if ($arg =~ /^(json|screen|xml)$/){
- if ($arg =~ /json|screen|xml/){
- $output_type = $arg;
- }
- else {
- error_handler('option-feature-incomplete', $opt, $arg);
- }
+ if ($arg >= 0){
+ $size{'max-wrap'} = $arg;
}
else {
- error_handler('bad-arg', $opt, $arg);
+ main::error_handler('bad-arg', $opt, $arg);
}},
+ 'mips' => sub {
+ undef %risc;
+ $risc{'id'} = 'mips';
+ $risc{'mips'} = 1;},
'no-dig' => sub {
- $b_skip_dig = 1; },
+ $force{'no-dig'} = 1;},
+ 'no-doas' => sub {
+ $force{'no-doas'} = 1;},
'no-host|no-hostname' => sub {
- $show{'host'} = 0 ;
- $show{'no-host'} = 1},
+ $show{'host'} = 0;
+ $show{'no-host'} = 1;},
+ 'no-html-wan' => sub {
+ $force{'no-html-wan'}= 1;},
'no-man' => sub {
- $b_no_man_force = 0; },
+ $use{'no-man'} = 0;},
'no-ssl' => sub {
- $dl{'no-ssl-opt'}=1 },
+ $use{'no-ssl'} = 1;},
'no-sudo' => sub {
- $b_no_sudo = 1; },
- 'output-file:s' => sub {
+ $force{'no-sudo'} = 1;},
+ 'output|export:s' => sub {
+ my ($opt,$arg) = @_;
+ if ($arg =~ /^(json|screen|xml)$/){
+ $output_type = $arg;
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }},
+ 'output-file|export-file:s' => sub {
my ($opt,$arg) = @_;
if ($arg){
- if ($arg eq 'print' || check_output_path($arg)){
+ if ($arg eq 'print' || main::check_output_path($arg)){
$output_file = $arg;
}
else {
- error_handler('output-file-bad', $opt, $arg);
+ main::error_handler('output-file-bad', $opt, $arg);
}
}
else {
- error_handler('bad-arg', $opt, $arg);
+ main::error_handler('bad-arg', $opt, $arg);
}},
+ 'pkg|rpm' => sub {
+ $force{'pkg'} = 1;},
'ppc' => sub {
- $b_ppc = 1 },
+ undef %risc;
+ $risc{'id'} = 'ppc';
+ $risc{'ppc'} = 1;},
'recommends' => sub {
- $b_recommends = 1; },
+ $show{'recommends'} = 1;},
+ 'riscv' => sub {
+ undef %risc;
+ $risc{'id'} = 'riscv';
+ $risc{'riscv'} = 1;},
+ 'sensors-sys' => sub {
+ $force{'sensors-sys'} = 1;},
'sparc' => sub {
- $b_sparc = 1; },
+ undef %risc;
+ $risc{'id'} = 'sparc';
+ $risc{'sparc'} = 1;},
'sys-debug' => sub {
- $debugger{'sys-force'} = 1; },
- 'tty' => sub { # workaround for ansible running this
- $b_irc = 0; },
- 'U|update:s' => sub { # 1,2,3 OR http://myserver/path/inxi
+ $debugger{'sys-force'} = 1;},
+ 'tty' => sub { # workaround for ansible/scripts running this
+ $b_irc = 0;},
+ 'U|update:s' => sub { # 1,2,3,4 OR http://myserver/path/inxi
my ($opt,$arg) = @_;
- $b_downloader = 1;
- if ( $use{'update'} ){
- $b_updater = 1;
- if (!$arg && $self_name eq 'pinxi'){
- $b_man = 1;
- $download_id = 'inxi-perl branch';
- $self_download = get_defaults('inxi-pinxi');
- }
- elsif ($arg && $arg eq '3'){
- $b_man = 1;
- $download_id = 'dev server';
- $self_download = get_defaults('inxi-dev');
- }
- else {
- if (!$arg){
- $download_id = 'main branch';
- $self_download = get_defaults('inxi-main');
- $b_man = 1;
- $b_use_man = 1;
- }
- elsif ( $arg =~ /^[12]$/){
- $download_id = "branch $arg";
- $self_download = get_defaults("inxi-branch-$arg");
- }
- elsif ( $arg =~ /^http/){
- $download_id = 'alt server';
- $self_download = $arg;
- }
- }
- if (!$self_download){
- error_handler('bad-arg', $opt, $arg);
- }
- }
- else {
- error_handler('distro-block', $opt);
- } },
+ process_updater($opt,$arg);},
'usb-sys' => sub {
- $b_usb_sys = 1 },
+ $force{'usb-sys'} = 1;},
'usb-tool' => sub {
- $b_usb_tool = 1 },
+ $force{'lsusb'} = 1;},
'wan-ip-url:s' => sub {
my ($opt,$arg) = @_;
if ($arg && $arg =~ /^(f|ht)tp[s]?:\/\//){
$wan_url = $arg;
- $b_skip_dig = 1
+ $force{'no-dig'} = 1;
}
else {
- error_handler('bad-arg', $opt, $arg);
+ main::error_handler('bad-arg', $opt, $arg);
}},
- 'wm' => sub {
- $b_wmctrl = 1 },
+ 'wayland|wl' => sub {
+ $force{'wayland'} = 1;},
+ 'wm|wmctrl' => sub {
+ $force{'wmctrl'} = 1;},
+ 'wsl' => sub {
+ $windows{'wsl'} = 1;},
'<>' => sub {
my ($opt) = @_;
- error_handler('unknown-option', "$opt", "" ); }
- ) ; #or error_handler('unknown-option', "@ARGV", '');
- ## run all these after so that we can change widths, downloaders, etc
- eval $end if $b_log;
- CheckRecommends::run() if $b_recommends;
- set_downloader() if $b_downloader || $wan_url || ($b_skip_dig && $show{'ip'}); # sets for either config or arg here
- set_xorg_log() if $show{'graphic'};
- show_version() if $b_version;
- show_options() if $b_help;
- $b_man = 0 if (!$b_use_man || $b_no_man_force);
- update_me( $self_download, $download_id ) if $b_updater;
- if ($output_type){
- if ($output_type ne 'screen' && ! $output_file){
- error_handler('bad-arg', '--output', '--output-file not provided');
- }
- }
- $show{'graphic-basic'} = 0 if $b_admin;
- $b_block_tool = 1 if ( $b_admin && ($show{'partition'} || $show{'partition-full'} ));
- set_sudo() if ( $show{'unmounted'} || ($extra > 0 && $show{'disk'}) );
- $extra = 3 if $b_admin;
- $use{'filter'} = 0 if $use{'filter-override'};
+ main::error_handler('unknown-option', "$opt", "");}
+ ); # or error_handler('unknown-option', "@ARGV", '');
+ # run all these after so that we can change widths, downloaders, etc
+ post_process();
+ eval $end if $b_log;
+}
+
+# These options require other option[s] to function, and have no meaning alone.
+sub check_modifiers {
+ if ($use{'cpu-sleep'} && !$show{'cpu'} && !$show{'cpu-basic'} &&
+ !$show{'short'}){
+ main::error_handler('arg-modifier', '--sleep', '[no-options], -b, -C, -v [>0]');
+ }
+ if ($show{'label'} && !$show{'partition'} && !$show{'partition-full'} &&
+ !$show{'swap'} && !$show{'unmounted'}){
+ main::error_handler('arg-modifier', '-l/--label', '-j, -o, -p, -P');
+ }
+ if ($use{'ip-limit'} && !$show{'ip'}){
+ main::error_handler('arg-modifier', '--limit', '-i');
+ }
+ if ($output_type && $output_type ne 'screen' && !$output_file){
+ main::error_handler('arg-modifier', '--output', '--output-file [filename]');
+ }
+ if ($use{'partition-sort'} && !$show{'partition'} && !$show{'partition-full'}){
+ main::error_handler('arg-modifier', '--partition-sort', '-p, -P');
+ }
+ if ($use{'sensors-default'} && !$show{'sensor'}){
+ main::error_handler('arg-modifier', '--sensors-default', '-s');
+ }
+ if ($use{'sensors-exclude'} && !$show{'sensor'}){
+ main::error_handler('arg-modifier', '--sensors-exclude', '-s');
+ }
+ if ($use{'sensors-use'} && !$show{'sensor'}){
+ main::error_handler('arg-modifier', '--sensors-use', '-s');
+ }
+ if ($show{'uuid'} && !$show{'machine'} && !$show{'partition'} &&
+ !$show{'partition-full'} && !$show{'swap'} && !$show{'unmounted'}){
+ main::error_handler('arg-modifier', '-u/--uuid', '-j, -M, -o, -p, -P');
+ }
+ if ($use{'weather-source'} && !$show{'weather'}){
+ main::error_handler('arg-modifier', '--weather-source/--ws', '-w');
+ }
+ if ($use{'weather-unit'} && !$show{'weather'}){
+ main::error_handler('arg-modifier', '--weather-unit/--wu', '-w');
+ }
+}
+
+sub post_process {
+ # first run all the stuff that exits after running
+ CheckRecommends::run() if $show{'recommends'};
+ Configs::show() if $show{'configs'};
+ main::show_options() if $show{'help'};
+ main::show_version() if ($show{'version'} || $show{'version-short'});
+ # sets for either config or arg here
+ if ($use{'downloader'} || $wan_url || ($force{'no-dig'} && $show{'ip'})){
+ main::set_downloader();
+ }
+ $use{'man'} = 0 if (!$use{'yes-man'} || $use{'no-man'});
+ main::update_me($self_download,$download_id) if $use{'update-trigger'};
+ main::set_xorg_log() if $show{'graphic'};
+ set_pledge() if $b_pledge;
+ $extra = 3 if $b_admin; # before check_modifiers in case we make $estra based.
+ check_modifiers();
+ # this turns off basic for F/v graphic output levels.
+ if ($show{'graphic-basic'} && $show{'graphic-full'} && $extra > 1){
+ $show{'graphic-basic'} = 0;
+ }
+ if ($force{'rpm'}){
+ $force{'pkg'} = 1;
+ delete $force{'rpm'};
+ }
+ if ($use{'sensors-default'}){
+ @sensors_exclude = ();
+ @sensors_use = ();
+ }
+ if ($show{'short'} || $show{'disk'} || $show{'disk-basic'} || $show{'disk-total'} ||
+ $show{'logical'} || $show{'partition'} || $show{'partition-full'} || $show{'raid'} ||
+ $show{'unmounted'}){
+ $use{'block-tool'} = 1;
+ }
+ if ($show{'short'} || $show{'raid'} || $show{'disk'} || $show{'disk-total'} ||
+ $show{'disk-basic'} || $show{'unmounted'}){
+ $use{'btrfs'} = 1;
+ $use{'mdadm'} = 1;
+ }
+ if ($b_admin && $show{'disk'}){
+ $use{'smartctl'} = 1;
+ }
+ # triggers may extend to -D, -pP
+ if ($show{'short'} || $show{'logical'} || $show{'raid'} || $show{'disk'} ||
+ $show{'disk-total'} || $show{'disk-basic'} || $show{'unmounted'}){
+ $use{'logical'} = 1;
+ }
+ main::set_sudo() if ($show{'unmounted'} || ($extra > 0 && $show{'disk'}));
+ if ($use{'filter-override'}){
+ $use{'filter'} = 0;
+ $use{'filter-label'} = 0;
+ $use{'filter-uuid'} = 0;
+ $use{'filter-vulnerabilities'} = 0;
+ }
# override for things like -b or -v2 to -v3
$show{'cpu-basic'} = 0 if $show{'cpu'};
$show{'optical-basic'} = 0 if $show{'optical'};
$show{'partition'} = 0 if $show{'partition-full'};
$show{'host'} = 0 if $show{'no-host'};
$show{'host'} = 1 if ($show{'host'} || (!$use{'filter'} && !$show{'no-host'}));
- if ($show{'disk'} || $show{'optical'} ){
+ if ($show{'disk'} || $show{'optical'}){
$show{'disk-basic'} = 0;
$show{'disk-total'} = 0;
}
- if ( $show{'ram'} || $show{'slot'} || ($show{'cpu'} && $extra > 1) ||
- ( ( $bsd_type || $b_dmidecode_force ) && ($show{'machine'} || $show{'battery'}) ) ){
- $b_dmi = 1;
+ if ($show{'ram'} || $show{'slot'} ||
+ ($show{'cpu'} && ($extra > 1 || $bsd_type)) ||
+ (($bsd_type || $force{'dmidecode'}) && ($show{'machine'} || $show{'battery'}))){
+ $use{'dmidecode'} = 1;
}
- if ($show{'audio'} || $show{'graphic'} || $show{'network'} || $show{'raid'} || $show{'raid-forced'} ){
- $b_pci = 1;
+ if (!$bsd_type && ($show{'ram'})){
+ $use{'udevadm'} = 1;
}
- if ($show{'usb'} || $show{'audio'} || $show{'graphic'} || $show{'network'} ){
- $b_usb = 1;
+ if ($show{'audio'} || $show{'bluetooth'} || $show{'graphic'} ||
+ $show{'network'} || $show{'raid'}){
+ $use{'pci'} = 1;
}
- if ($bsd_type && ($show{'short'} || $show{'system'} || $show{'battery'} || $show{'cpu'} || $show{'cpu-basic'} ||
- $show{'info'} || $show{'machine'} || $show{'process'} || $show{'ram'} || $show{'sensor'} ) ){
- $b_sysctl = 1;
+ if ($show{'usb'} || $show{'audio'} || $show{'bluetooth'} || $show{'disk'} ||
+ $show{'graphic'} || $show{'network'}){
+ $use{'usb'} = 1;
+ }
+ if ($bsd_type){
+ if ($show{'audio'}){
+ $use{'bsd-audio'} = 1;}
+ if ($show{'battery'}){
+ $use{'bsd-battery'} = 1;}
+ if ($show{'short'} || $show{'cpu-basic'} || $show{'cpu'}){
+ $use{'bsd-cpu'} = 1;
+ $use{'bsd-sleep'} = 1;}
+ if ($show{'short'} || $show{'disk-basic'} || $show{'disk-total'} ||
+ $show{'disk'} || $show{'partition'} || $show{'partition-full'} ||
+ $show{'raid'} || $show{'swap'} || $show{'unmounted'}){
+ $use{'bsd-disk'} = 1;
+ $use{'bsd-partition'} = 1;
+ $use{'bsd-raid'} = 1;}
+ if ($show{'system'}){
+ $use{'bsd-kernel'} = 1;}
+ if ($show{'machine'}){
+ $use{'bsd-machine'} = 1;}
+ if ($show{'short'} || $show{'info'} || $show{'ps-mem'} || $show{'ram'}){
+ $use{'bsd-memory'} = 1;}
+ if ($show{'optical-basic'} || $show{'optical'}){
+ $use{'bsd-optical'} = 1;}
+ # strictly only used to fill in pci drivers if tool doesn't support that
+ if ($use{'pci'}){
+ $use{'bsd-pci'} = 1;}
+ if ($show{'raid'}){
+ $use{'bsd-raid'} = 1;}
+ if ($show{'ram'}){
+ $use{'bsd-ram'} = 1;}
+ if ($show{'sensor'}){
+ $use{'bsd-sensor'} = 1;}
+ # always use this, it's too core
+ $use{'sysctl'} = 1;
+ }
+}
+
+sub process_updater {
+ my ($opt,$arg) = @_;
+ $use{'downloader'} = 1;
+ if ($use{'update'}){
+ $use{'update-trigger'} = 1;
+ if (!$arg){
+ $use{'man'} = 1;
+ $download_id = "$self_name main branch";
+ $self_download = main::get_defaults("$self_name-main");
+ }
+ elsif ($arg && $arg eq '3'){
+ $use{'man'} = 1;
+ $download_id = 'dev server';
+ $self_download = main::get_defaults("$self_name-dev");
+ }
+ elsif ($arg && $arg eq '4'){
+ $use{'man'} = 1;
+ $use{'ftp-download'} = 1;
+ $download_id = 'dev server ftp';
+ $self_download = main::get_defaults("$self_name-dev-ftp");
+ }
+ elsif ($arg =~ /^[12]$/){
+ if ($self_name eq 'inxi'){
+ $download_id = "branch $arg";
+ $self_download = main::get_defaults("inxi-branch-$arg");
+ }
+ else {
+ main::error_handler('bad-arg', $opt, $arg);
+ }
+ }
+ elsif ($arg =~ /^(ftp|https?):/){
+ $download_id = 'alt server';
+ $self_download = $arg;
+ }
+ if ($self_download && $self_name eq 'inxi'){
+ $use{'man'} = 1;
+ $use{'yes-man'} = 1;
+ }
+ if (!$self_download){
+ main::error_handler('bad-arg', $opt, $arg);
+ }
}
- if ($bsd_type && ($show{'short'} || $show{'disk-basic'} || $show{'disk-total'} || $show{'disk'})){
- $b_dm_boot_disk = 1;
+ else {
+ main::error_handler('distro-block', $opt);
+ }
+}
+
+sub set_pledge {
+ my $b_update;
+ # if -c 9x, remove in SelectColors::set_selection(), else remove here
+ if (!$colors{'selector'} && $debugger{'level'} < 21){
+ @pledges = grep {$_ ne 'getpw'} @pledges;
+ $b_update = 1;
}
- if ($bsd_type && ($show{'optical-basic'} || $show{'optical'})){
- $b_dm_boot_optical = 1
+ if ($debugger{'level'} < 21){ # remove ftp upload
+ @pledges = grep {!/(dns|inet)/} @pledges;
+ $b_update = 1;
}
- if ($b_admin && $show{'disk'}){
- $b_smartctl = 1;
+ # not writing/creating .inxi data dirs colors selector launches set_color()
+ if (!$show{'weather'} && !$colors{'selector'} && $debugger{'level'} < 10 &&
+ $output_type eq 'screen'){
+ @pledges = grep {!/(cpath|wpath)/} @pledges;
+ $b_update = 1;
}
-
-}
+ OpenBSD::Pledge::pledge(@pledges) if $b_update;
+}
+}
sub show_options {
error_handler('not-in-irc', 'help') if $b_irc;
- my (@row,@rows,@data);
- my $line = '';
+ my $rows = [];
+ my $line = make_line();
my $color_scheme_count = get_color_scheme('count') - 1;
my $partition_string='partition';
my $partition_string_u='Partition';
- my $flags = ($b_arm) ? 'features' : 'flags' ;
- if ( $bsd_type ){
+ my $flags = (%risc || $bsd_type) ? 'features' : 'flags' ;
+ if ($bsd_type){
$partition_string='slice';
$partition_string_u='Slice';
}
# fit the line to the screen!
- for my $i ( 0 .. ( ( $size{'max'} / 2 ) - 2 ) ){
- $line = $line . '- ';
- }
- @rows = (
+ push(@$rows,
['0', '', '', "$self_name supports the following options. For more detailed
information, see man^$self_name. If you start $self_name with no arguments,
- it will display a short system summary." ],
- ['0', '', '', '' ],
+ it will display a short system summary."],
+ ['0', '', '', ''],
['0', '', '', "You can use these options alone or together,
- to show or add the item(s) you want to see: A, B, C, D, G, I, J, M, N, P,
- R, S, W, d, f, i, j, l, m, n, o, p, r, s, t, u, w, --slots.
- If you use them with -v [level], -b or -F, $self_name will add the requested
- lines to the output." ],
+ to show or add the item(s) you want to see: A, B, C, d, D, E, f, G, i, I, j,
+ J, l, L, m, M, n, N, o, p, P, r, R, s, S, t, u, w, --edid, --mm, --ms,
+ --slots. If you use them with -v [level], -b or -F, $self_name will add the
+ requested lines to the output."],
['0', '', '', '' ],
['0', '', '', "Examples:^$self_name^-v4^-c6 OR $self_name^-bDc^6 OR
- $self_name^-FzjJxy^80" ],
+ $self_name^-FzjJxy^80"],
['0', '', '', $line ],
- ['0', '', '', "Output Control Options:" ],
- ['1', '-a', '--admin', "Adds advanced sys admin data (only works with
- verbose or line output, not short form); check man page for explanations!;
- also sets --extra=3:" ],
- ['2', '-A', '', "If available: list of alternate kernel modules/drivers
- for device(s)." ],
- ['2', '-C', '', "If available: CPU socket type, base/boost speeds
- (dmidecode+root/sudo required); CPU vulnerabilities (bugs);
- family, model-id, stepping - format: hex (decimal) if greater
- than 9, otherwise hex; microcode - format: hex." ],
- ['2', '-d,-D', '', "If available: logical and physical block sizes; drive family;
- USB drive specifics; SMART report." ],
- ['2', '-G', '', "If available: Xorg Display ID, Screens total, default Screen,
- current Screen; per X Screen: resolution, dpi, size, diagonal; per Monitor:
- resolution; hz; dpi; size; diagonal; list of alternate kernel modules/drivers
- for device(s)." ],
- ['2', '-I', '', "As well as per package manager counts, also adds total
- number of lib files found for each package manager if not -r." ],
- ['2', '-j,-p,-P', '', "For swap (if available): swappiness and vfs cache
- pressure, and if values are default or not." ],
- ['2', '-n,-N', '', "If available: list of alternate kernel modules/drivers
- for device(s)." ],
- ['2', '-p,-P', '', "If available: raw size of ${partition_string}s,
- percent available for user, block size of file system (root required)." ],
- ['2', '-r', '', "Packages, see -Ia." ],
- ['2', '-S', '', "If available: kernel boot parameters." ],
- ['1', '-A', '--audio', "Audio/sound card(s), driver, sound server." ],
- ['1', '-b', '--basic', "Basic output, short form. Same as $self_name^-v^2." ],
- ['1', '-B', '--battery', "System battery info, including charge and condition, plus
- extra info (if battery present)." ],
- ['1', '-c', '--color', "Set color scheme (0-42). For piped or redirected output,
- you must use an explicit color selector. Example:^$self_name^-c^11" ],
- ['1', '', '', "Color selectors let you set the config file value for the
- selection (NOTE: IRC and global only show safe color set)" ],
- ['2', '94', '', "Console, out of X" ],
- ['2', '95', '', "Terminal, running in X - like xTerm" ],
- ['2', '96', '', "Gui IRC, running in X - like Xchat, Quassel, Konversation etc." ],
- ['2', '97', '', "Console IRC running in X - like irssi in xTerm" ],
- ['2', '98', '', "Console IRC not in X" ],
- ['2', '99', '', "Global - Overrides/removes all settings. Setting specific
- removes global." ],
- ['1', '-C', '--cpu', "CPU output, including per CPU clock speed and max
- CPU speed (if available)." ],
+ ['0', '', '', "See Filter Options for output filtering, Output Control Options
+ for colors, sizing, output changes, Extra Data Options to extend Main output,
+ Additional Options and Advanced Options for less common situations."],
+ ['0', '', '', $line ],
+ ['0', '', '', "Main Feature Options:"],
+ ['1', '-A', '--audio', "Audio/sound devices(s), driver; active sound APIs and
+ servers."],
+ ['1', '-b', '--basic', "Basic output, short form. Same as $self_name^-v^2."],
+ ['1', '-B', '--battery', "System battery info, including charge, condition
+ voltage (if critical), plus extra info (if battery present/detected)."],
+ ['1', '-C', '--cpu', "CPU output (if each item available): basic topology,
+ model, type (see man for types), cache, average CPU speed, min/max speeds,
+ per core clock speeds."],
['1', '-d', '--disk-full, --optical', "Optical drive data (and floppy disks,
- if present). Triggers -D." ],
+ if present). Triggers -D."],
['1', '-D', '--disk', "Hard Disk info, including total storage and details
for each disk. Disk total used percentage includes swap ${partition_string}
- size(s)." ],
+ size(s)."],
+ ['1', '-E', '--bluetooth', "Show bluetooth device data and report, if
+ available. Shows state, address, IDs, version info."],
+ ['1', '', '--edid', "Full graphics data, triggers -a, -G. Add monitor chroma,
+ full modelines (if > 2), EDID errors and warnings, if present."],
['1', '-f', '--flags', "All CPU $flags. Triggers -C. Not shown with -F to
- avoid spamming." ],
+ avoid spamming."],
['1', '-F', '--full', "Full output. Includes all Upper Case line letters
- except -W, plus --swap, -s and -n. Does not show extra verbose options such
- as -d -f -i -l -m -o -p -r -t -u -x, unless specified." ],
- ['1', '-G', '--graphics', "Graphics info (card(s), driver, display protocol
- (if available), display server/Wayland compositor, resolution, renderer,
- OpenGL version)." ],
+ (except -J, -W) plus --swap, -s and -n. Does not show extra verbose options
+ such as -d -f -i -J -l -m -o -p -r -t -u -x, unless specified."],
+ ['1', '-G', '--graphics', "Graphics info (devices(s), drivers, display
+ protocol (if available), display server/Wayland compositor, resolution, X.org:
+ renderer, basic EGL, OpenGL, Vulkan API data; Xvesa API: VBE info."],
['1', '-i', '--ip', "WAN IP address and local interfaces (requires ifconfig
or ip network tool). Triggers -n. Not shown with -F for user security reasons.
- You shouldn't paste your local/WAN IP." ],
- ['1', '-I', '--info', "General info, including processes, uptime, memory,
- IRC client or shell type, $self_name version." ],
- ['1', '-j', '--swap', "Swap in use. Includes ${partition_string}s, zram, file." ],
- ['1', '-J', '--usb', "Show USB data: Hubs and Devices." ],
- ['1', '-l', '--label', "$partition_string_u labels. Triggers -P.
- For full -p output, use -pl." ],
- ['1', '-m', '--memory', "Memory (RAM) data. Requires root. Numbers of
- devices (slots) supported and individual memory devices (sticks of memory etc).
- For devices, shows device locator, size, speed, type (e.g. DDR3).
- If neither -I nor -tm are selected, also shows RAM used/total." ],
- ['1', '', '--memory-modules', "Memory (RAM) data. Exclude empty module slots." ],
- ['1', '', '--memory-short', "Memory (RAM) data. Show only short Memory RAM report,
- number of arrays, slots, modules, and RAM type." ],
+ You shouldn't paste your local/WAN IP."],
+ ['1', '', '--ip-limit, --limit', "[-1; 1-x] Set max output limit of IP
+ addresses for -i (default 10; -1 removes limit)."],
+ ['1', '-I', '--info', "General info, including processes, uptime, memory (if
+ -m/-tm not used), IRC client or shell type, $self_name version."],
+ ['1', '-j', '--swap', "Swap in use. Includes ${partition_string}s, zram,
+ file."],
+ ['1', '-J', '--usb', "Show USB data: Hubs and Devices."],
+ ['1', '-l', '--label', "$partition_string_u labels. Use with -j, -o, -p, -P."],
+ ['1', '-L', '--logical', "Logical devices, LVM (VG, LV),
+ LUKS, Crypto, bcache, etc. Shows components/devices, sizes, etc."],
+ ['1', '-m', '--memory', "Memory (RAM) data. Numbers of devices (slots)
+ supported and individual memory devices (sticks of memory etc). For devices,
+ shows device locator, type (e.g. DDR3), size, speed. Also shows System RAM
+ report, and removes Memory report from -I or -tm."],
+ ['1', '', '--memory-modules,--mm', "Memory (RAM) data. Exclude empty module slots."],
+ ['1', '', '--memory-short,--ms', "Memory (RAM) data. Show only short Memory RAM
+ report, number of arrays, slots, modules, and RAM type."],
['1', '-M', '--machine', "Machine data. Device type (desktop, server, laptop,
- VM etc.), motherboard, BIOS and, if present, system builder (e.g. Lenovo).
+ VM etc.), motherboard, BIOS and, if present, system builder (e.g. Lenovo).
Shows UEFI/BIOS/UEFI [Legacy]. Older systems/kernels without the required /sys
- data can use dmidecode instead, run as root. Dmidecode can be forced with --dmidecode" ],
- ['1', '-n', '--network-advanced', "Advanced Network card info. Triggers -N. Shows
- interface, speed, MAC id, state, etc. " ],
- ['1', '-N', '--network', "Network card(s), driver." ],
+ data can use dmidecode instead, run as root. Dmidecode can be forced with
+ --dmidecode"],
+ ['1', '-n', '--network-advanced', "Advanced Network device info. Triggers -N.
+ Shows interface, speed, MAC id, state, etc. "],
+ ['1', '-N', '--network', "Network device(s), driver."],
['1', '-o', '--unmounted', "Unmounted $partition_string info (includes UUID
and Label if available). Shows file system type if you have lsblk installed
(Linux) or, for BSD/GNU Linux, if 'file' installed and you are root or if
- you have added to /etc/sudoers (sudo v. 1.7 or newer)." ],
- ['1', '', '', "Example: ^<username>^ALL^=^NOPASSWD:^/usr/bin/file^" ],
- ['1', '-p', '--partitions-full', "Full $partition_string information (-P plus all other
- detected ${partition_string}s)." ],
+ you have added to /etc/sudoers (sudo v. 1.7 or newer)(or try doas)."],
+ ['1', '', '', "Example: ^<username>^ALL^=^NOPASSWD:^/usr/bin/file^"],
+ ['1', '-p', '--partitions-full', "Full $partition_string information (-P plus
+ all other detected ${partition_string}s)."],
+ ['1', '', '--partitions-sort, --ps', "
+ [dev-base|fs|id|label|percent-used|size|uuid|used] Change sort order of
+ ${partition_string} output. See man page for specifics."],
['1', '-P', '--partitions', "Basic $partition_string info. Shows, if detected:
/ /boot /home /opt /tmp /usr /usr/home /var /var/log /var/tmp. Swap
${partition_string}s show if --swap is not used. Use -p to see all
- mounted ${partition_string}s." ],
+ mounted ${partition_string}s."],
['1', '-r', '--repos', "Distro repository data. Supported repo types: APK,
- APT, CARDS, EOPKG, PACMAN, PACMAN-G2, PISI, PORTAGE, PORTS (BSDs), SLACKPKG,
- TCE, URPMQ, XBPS, YUM/ZYPP." ],
- ['1', '-R', '--raid', "RAID data. Shows RAID devices, states, levels,
- and components. md-raid: If device is resyncing, also shows resync progress line." ],
+ APT, CARDS, EOPKG, NETPKG, NIX, PACMAN, PACMAN-G2, PISI, PKG (BSDs), PORTAGE,
+ PORTS (BSDs), SBOPKG, SBOUI, SCRATCHPKG, SLACKPKG, SLAPT_GET, SLPKG, TCE,
+ TAZPKG, URPMQ, XBPS, YUM/ZYPP."],
+ ['1', '-R', '--raid', "RAID data. Shows RAID devices, states, levels, array
+ sizes, and components. md-raid: If device is resyncing, also shows resync
+ progress line."],
['1', '-s', '--sensors', "Sensors output (if sensors installed/configured):
- mobo/CPU/GPU temp; detected fan speeds. GPU temp only for Fglrx/Nvidia drivers.
- Nvidia shows screen number for > 1 screen. IPMI sensors if present." ],
- ['1', '', '--slots', "PCI slots: type, speed, status. Requires root." ],
+ mobo/CPU/GPU temp; detected fan speeds. Nvidia shows screen number for > 1
+ screen. IPMI sensors if present."],
+ ['1', '', '--slots', "PCI slots: type, speed, status. Requires root."],
['1', '-S', '--system', "System info: host name, kernel, desktop environment
- (if in X/Wayland), distro." ],
+ (if in X/Wayland), distro."],
['1', '-t', '--processes', "Processes. Requires extra options: c (CPU), m
(memory), cm (CPU+memory). If followed by numbers 1-x, shows that number
- of processes for each type (default: 5; if in IRC, max: 5). " ],
+ of processes for each type (default: 5; if in IRC, max: 5). "],
['1', '', '', "Make sure that there is no space between letters and
- numbers (e.g.^-t^cm10)." ],
- ['1', '-u', '--uuid', "$partition_string_u UUIDs. Triggers -P. For full -p
- output, use -pu." ],
+ numbers (e.g.^-t^cm10)."],
+ ['1', '-u', '--uuid', "$partition_string_u, system board UUIDs. Use with -j,
+ -M, -o, -p, -P."],
['1', '-v', '--verbosity', "Set $self_name verbosity level (0-8).
- Should not be used with -b or -F. Example: $self_name^-v^4" ],
- ['2', '0', '', "Same as: $self_name" ],
- ['2', '1', '', "Basic verbose, -S + basic CPU + -G + basic Disk + -I." ],
- ['2', '2', '', "Networking card (-N), Machine (-M), Battery (-B; if present),
- and, if present, basic RAID (devices only; notes if inactive).
- Same as $self_name^-b" ],
+ Should not be used with -b or -F. Example: $self_name^-v^4"],
+ ['2', '0', '', "Same as: $self_name"],
+ ['2', '1', '', "Basic verbose, -S + basic CPU + -G + basic Disk + -I."],
+ ['2', '2', '', "Networking device (-N), Machine (-M), Battery (-B; if
+ present), and, if present, basic RAID (devices only; notes if inactive). Same
+ as $self_name^-b"],
['2', '3', '', "Advanced CPU (-C), battery (-B), network (-n);
- triggers -x. " ],
+ triggers -x. "],
['2', '4', '', "$partition_string_u size/used data (-P) for
- (if present) /, /home, /var/, /boot. Shows full disk data (-D). " ],
- ['2', '5', '', "Audio card (-A), sensors (-s), memory/RAM (-m),
- $partition_string label^(-l), full swap (-j), UUID^(-u), short form
- of optical drives, standard RAID data (-R). " ],
+ (if present) /, /home, /var/, /boot. Shows full disk data (-D). "],
+ ['2', '5', '', "Audio device (-A), sensors (-s), memory/RAM (-m),
+ bluetooth (if present), $partition_string label^(-l), full swap (-j),
+ UUID^(-u), short form of optical drives, RAID data (if present)."],
['2', '6', '', "Full $partition_string (-p),
unmounted $partition_string (-o), optical drive (-d), USB (-J),
- full RAID; triggers -xx." ],
- ['2', '7', '', "Network IP data (-i); triggers -xxx."],
- ['2', '8', '', "Everything available, including repos (-r), processes
- (-tcm), PCI slots (--slots)."],
+ full RAID; triggers -xx."],
+ ['2', '7', '', "Network IP data (-i), bluetooth, logical (-L),
+ RAID forced, full CPU $flags; triggers -xxx."],
+ ['2', '8', '', "Everything available, including advanced gpu EDID (--edid)
+ data, repos (-r), processes (-tcm), PCI slots (--slots); triggers
+ admin (-a)."],
);
- push @data, @rows;
# if distro maintainers don't want the weather feature disable it
- if ( $use{'weather'} ){
- @rows = (
- ['1', '-w', '--weather', "Local weather data/time. To check an alternate
- location, see -W. NO AUTOMATED QUERIES ALLOWED!"],
- ['1', '-W', '--weather-location', "[location] Supported options for
- [location]: postal code[,country/country code]; city, state (USA)/country
+ if ($use{'weather'}){
+ push(@$rows,
+ ['1', '-w', '--weather', "NO^AUTOMATED^QUERIES^OR^EXCESSIVE^USE^ALLOWED!"],
+ ['1', '', '', "Without [location]: Your current local (local to
+ your IP address) weather data/time.Example:^$self_name^-w"],
+ ['1', '', '', "With [location]: Supported location options are:
+ postal code[,country/country code]; city, state (USA)/country
(country/two character country code); latitude, longitude. Only use if you
want the weather somewhere other than the machine running $self_name. Use
only ASCII characters, replace spaces in city/state/country names with '+'.
- Example:^$self_name^-W^[new+york,ny^london,gb^madrid,es]"],
- ['1', '', '--weather-source', "[1-9] Change weather data source. 1-4 generally
- active, 5-9 check. See man."],
- ['1', '', '--weather-unit', "Set weather units to metric (m), imperial (i),
- metric/imperial (mi), or imperial/metric (im)."],
+ Example:^$self_name^-w^[new+york,ny^london,gb^madrid,es]"],
+ ['1', '', '--weather-source,--ws', "[1-9] Change weather data source. 1-4
+ generally active, 5-9 check. See man."],
+ ['1', '', '--weather-unit,--wu', "Set weather units to metric (m), imperial
+ (i), metric/imperial (mi), or imperial/metric (im)."],
);
- push @data, @rows;
}
- @rows = (
+ push(@$rows,
+ [0, '', '', "$line"],
+ ['0', '', '', "Filter Options:"],
+ ['1', '', '--host', "Turn on hostname for -S. Overrides -z."],
+ ['1', '', '--no-host', "Turn off hostname for -S. Useful if showing output
+ from servers etc. Activated by -z as well."],
+ ['1', '-z', '--filter', "Adds security filters for IP/MAC addresses, serial
+ numbers, location (-w), user home directory name, host name. Default on for
+ IRC clients."],
+ ['1', '', '--za,--filter-all', "Shortcut, triggers -z, --zl, --zu, --zv."],
+ ['1', '', '--zl,--filter-label', "Filters out ${partition_string} labels in
+ -j, -o, -p, -P, -Sa."],
+ ['1', '', '--zu,--filter-uuid', "Filters out ${partition_string} UUIDs in -j,
+ -o, -p, -P, -Sa, board UUIDs in -Mxxx."],
+ ['1', '', '--zv,--filter-vulnerabilities', "Filters out Vulnerabilities
+ report in -Ca."],
+ ['1', '-Z', '--no-filter', "Disable output filters. Useful for debugging
+ networking issues in IRC, or you needed to use --tty, for example."],
+ [0, '', '', "$line"],
+ ['0', '', '', "Output Control Options:"],
+ ['1', '-c', '--color', "Set color scheme (0-42). For piped or redirected
+ output, you must use an explicit color selector. Example:^$self_name^-c^11"],
+ ['1', '', '', "Color selectors let you set the config file value for the
+ selection (NOTE: IRC and global only show safe color set)"],
+ ['2', '94', '', "Console, out of X"],
+ ['2', '95', '', "Terminal, running in X - like xTerm"],
+ ['2', '96', '', "Gui IRC, running in X - like Xchat, Quassel, Konversation
+ etc."],
+ ['2', '97', '', "Console IRC running in X - like irssi in xTerm"],
+ ['2', '98', '', "Console IRC not in X"],
+ ['2', '99', '', "Global - Overrides/removes all settings. Setting specific
+ removes global."],
+ ['1', '', '--indent', "[11-20] Change default wide mode primary indentation
+ width."],
+ ['1', '', '--indents', "[0-10] Change wrapped mode primary indentation width,
+ and secondary / -y1 indent widths."],
+ ['1', '', '--max-wrap,--wrap-max', "[70-xxx] Set maximum width where
+ $self_name autowraps line starters. Current: $size{'max-wrap'}"],
+ ['1', '', '--output', "[json|screen|xml] Change data output type. Requires
+ --output-file if not screen."],
+ ['1', '', '--output-file', "[Full filepath|print] Output file to be used for
+ --output."],
+ ['1', '', '--separator, --sep', "[key:value separator character]. Change
+ separator character(s) for key: value pairs."],
+ ['1', '-y', '--width', "[empty|-1|1|60-xxx] Output line width max. Overrides
+ IRC/Terminal settings or actual widths. If no integer give, defaults to 80.
+ -1 removes line lengths. 1 switches output to 1 key/value pair per line.
+ Example:^inxi^-y^130"],
+ ['1', '-Y', '--height', "[empty|-3-xxx] Output height control. Similar to
+ 'less' command except colors preserved, defaults to console/terminal height.
+ -1 shows 1 primary Item: at a time; -2 retains color on redirect/piping (to
+ less -R); -3 removes configuration value; 0 or -Y sets to detected terminal
+ height. Greater than 0 shows x lines at a time."],
+ ['0', '', '', "$line"],
+ ['0', '', '', "Extra Data Options:"],
['1', '-x', '--extra', "Adds the following extra data (only works with
- verbose or line output, not short form):" ],
+ verbose or line output, not short form):"],
['2', '-A', '', "Specific vendor/product information (if relevant);
- PCI Bus ID/USB ID number of card; Version/port(s)/driver version (if available)." ],
- ['2', '-B', '', "Vendor/model, status (if available); attached devices
- (e.g. wireless mouse, keyboard, if present)." ],
- ['2', '-C', '', "CPU $flags (short list, use -f to see full list), Bogomips
- on CPU; CPU microarchitecture + revision (if found, or unless --admin,
- then shows as 'stepping')." ],
+ PCI/USB ID of device; Version/port(s)/driver version (if available);
+ inactive sound servers/APIs."],
+ ['2', '-B', '', "Current/minimum voltage, vendor/model, status (if available);
+ attached devices (e.g. wireless mouse, keyboard, if present)."],
+ ['2', '-C', '', "L1/L3 cache (if most Linux, or if root and dmidecode
+ installed); smt if disabled, CPU $flags (short list, use -f to see full list);
+ Highest core speed (if > 1 core); CPU boost (turbo) enabled/disabled, if
+ present; Bogomips on CPU; CPU microarchitecture + revision (if found, or
+ unless --admin, then shows as 'stepping')."],
['2', '-d', '', "Extra optical drive features data; adds rev version to
- optical drive." ],
- ['2', '-D', '', "HDD temp with disk data if you have hddtemp installed,
- if you are root, or if you have added to /etc/sudoers (sudo v. 1.7 or newer).
- Example:^<username>^ALL^=^NOPASSWD:^/usr/sbin/hddtemp" ],
- ['2', '-G', '', "Specific vendor/product information (if relevant);
- PCI Bus ID/USB ID number of card; Direct rendering status (in X); Screen
- number GPU is running on (Nvidia only)." ],
+ optical drive."],
+ ['2', '-D', '', "HDD temp with disk data. Kernels >= 5.6: enable module
+ drivetemp if not enabled. Older systems require hddtemp, run as
+ as superuser, or as user if you have added hddtemp to /etc/sudoers
+ (sudo v. 1.7 or newer)(or try doas).
+ Example:^<username>^ALL^=^NOPASSWD:^/usr/sbin/hddtemp"],
+ ['2', '-E', '', "PCI/USB Bus ID of device, driver version,
+ LMP version."],
+ ['2', '-G', '', "GPU arch (AMD/Intel/Nvidia only); Specific vendor/product
+ information (if relevant); PCI/USB ID of device; Screen number GPU is running
+ on (Nvidia only); device temp (Linux, if found); APIs: EGL: active/inactive
+ platforms; OpenGL: direct rendering status (in X); Vulkan device counts."],
['2', '-i', '', "For IPv6, show additional scope addresses: Global, Site,
- Temporary, Unknown. See --limit for large counts of IP addresses." ],
- ['2', '-I', '', "Default system GCC. With -xx, also shows other installed
- GCC versions. If running in shell, not in IRC client, shows shell version
- number, if detected. Init/RC type and runlevel (if available). Total
- count of all packages discovered in system and not -r." ],
- ['2', '-J', '', "For Device: driver." ],
- ['2', '-m,--memory-modules', '', "Max memory module size (if available), device type." ],
+ Temporary, Unknown. See --limit for large counts of IP addresses."],
+ ['2', '-I', '', "Default system compilers. With -xx, also shows other
+ installed compiler versions. If running in shell, not in IRC client, shows
+ shell version number, if detected. Init/RC type and runlevel/target (if
+ available). Total count of all packages discovered in system (if not -r)."],
+ ['2', '-j', '', "Add mapped: name if partition mapped."],
+ ['2', '-J', '', "For Device: driver; Si speed (base 10, bits/s)."],
+ ['2', '-L', '', "For VG > LV, and other Devices, dm:"],
+ ['2', '-m,--mm', '', "Max memory module size (if available)."],
['2', '-N', '', "Specific vendor/product information (if relevant);
- PCI Bus ID/USB ID number of card; Version/port(s)/driver version (if available)." ],
- ['2', '-r', '', "Packages, see -Ix." ],
+ PCI/USB ID of device; Version/port(s)/driver version (if available); device
+ temperature (Linux, if found)."],
+ ['2', '-o,-p,-P', '', "Add mapped: name if partition mapped."],
+ ['2', '-r', '', "Packages, see -Ix."],
['2', '-R', '', "md-raid: second RAID Info line with extra data:
blocks, chunk size, bitmap (if present). Resync line, shows blocks
- synced/total blocks. Hardware RAID driver version, bus ID." ],
- ['2', '-s', '', "Basic voltages (ipmi, lm-sensors if present): 12v, 5v, 3.3v, vbat." ],
+ synced/total blocks. Hardware RAID driver version, bus-ID."],
+ ['2', '-s', '', "Basic voltages (ipmi, lm-sensors if present): 12v, 5v, 3.3v,
+ vbat."],
['2', '-S', '', "Kernel gcc version; system base of distro (if relevant
- and detected)" ],
+ and detected)"],
+ ['2', '', '--slots', "Adds BusID for slot."],
['2', '-t', '', "Adds memory use output to CPU (-xt c), and CPU use to
- memory (-xt m)." ],
+ memory (-xt m)."],
);
- push @data, @rows;
- if ( $use{'weather'} ){
- @rows = (['2', '-w -W', '', "Wind speed and direction, humidity, pressure,
- and time zone, if available." ]);
- push @data, @rows;
+ if ($use{'weather'}){
+ push(@$rows,
+ ['2', '-w', '', "Wind speed and direction, humidity, pressure, and time
+ zone, if available."]);
}
- @rows = (
+ push(@$rows,
+ ['0', '', '', ''],
['1', '-xx', '--extra 2', "Show extra, extra data (only works with verbose
- or line output, not short form):" ],
- ['2', '-A', '', "Chip vendor:product ID for each audio device." ],
- ['2', '-B', '', "Serial number, voltage now/minimum (if available)." ],
- ['2', '-C', '', "L1/L3 cache (if root and dmidecode installed)." ],
- ['2', '-D', '', "Disk transfer speed; NVMe lanes; Disk serial number." ],
- ['2', '-G', '', "Chip vendor:product ID for each video card; OpenGL
- compatibility version, if free drivers and available; Xorg compositor;
- alternate Xorg drivers (if available). Alternate means driver is on automatic
- driver check list of Xorg for the card vendor, but is not installed on system;
- Xorg dpi." ],
- ['2', '-I', '', "Other detected installed gcc versions (if present). System
- default runlevel. Adds parent program (or tty) for shell info if not in
- IRC. Adds Init version number, RC (if found). Adds per package manager
- package counts if not -r." ],
- ['2', '-j,-p,-P', '', "Swap priority." ],
- ['2', '-J', '', "Vendor:chip ID." ],
- ['2', '-m,--memory-modules', '', "Manufacturer, part number; single/double bank (if found)." ],
- ['2', '-M', '', "Chassis info, BIOS ROM size (dmidecode only), if available." ],
- ['2', '-N', '', "Chip vendor:product ID." ],
- ['2', '-r', '', "Packages, see -Ixx." ],
+ or line output, not short form):"],
+ ['2', '-A', '', "Chip vendor:product ID for each audio device; PCIe speed,
+ lanes (if found); USB rev, speed, lanes (if found); sound server/api helper
+ daemons/plugins."],
+ ['2', '-B', '', "Power used, in watts; serial number."],
+ ['2', '-D', '', "Disk transfer speed; NVMe lanes; USB rev, speed, lanes (if
+ found); Disk serial number; LVM volume group free space (if available); disk
+ duid (some BSDs)."],
+ ['2', '-E', '', "Chip vendor:product ID, LMP subversion; PCIe speed, lanes
+ (if found); USB rev, speed, lanes (if found)."],
+ ['2', '-G', '', "Chip vendor:product ID for each video device; Output ports,
+ used and empty; PCIe speed, lanes (if found); USB rev, speed, lanes (if
+ found); Xorg: Xorg compositor; alternate Xorg drivers (if available. Alternate
+ means driver is on automatic driver check list of Xorg for the device vendor,
+ but is not installed on system); Xorg Screen data: ID, s-res, dpi; Monitors:
+ ID, position (if > 1), resolution, dpi, model, diagonal; APIs: EGL: per
+ platform report; OpenGL: ES version, device-ID, display-ID (if not found in
+ Display line); Vulkan: per device report."],
+ ['2', '-I', '', "Adds Power: with children uptime, wakeups (from suspend);
+ other detected installed gcc versions (if present). System default
+ target/runlevel. Adds parent program (or pty/tty) for shell info if not in
+ IRC. Adds Init version number, RC (if found). Adds per package manager
+ installed package counts (if not -r)."],
+ ['2', '-j,-p,-P', '', "Swap priority."],
+ ['2', '-J', '', "Vendor:chip-ID; lanes (Linux only)."],
+ ['2', '-L', '', "Show internal LVM volumes, like raid image/meta volumes;
+ for LVM RAID, adds RAID report line (if not -R); show all components >
+ devices, number of 'c' or 'p' indicate depth of device."],
+ ['2', '-m,--mm', '', "Manufacturer, part number; single/double
+ bank (if found); memory array voltage (legacy, rare); module voltage (if
+ available)."],
+ ['2', '-M', '', "Chassis info, part number, BIOS ROM size (dmidecode only),
+ if available."],
+ ['2', '-N', '', "Chip vendor:product ID; PCIe speed, lanes (if found); USB
+ rev, speed, lanes (if found)."],
+ ['2', '-r', '', "Packages, see -Ixx."],
['2', '-R', '', "md-raid: Superblock (if present), algorithm. If resync,
- shows progress bar. Hardware RAID Chip vendor:product ID." ],
- ['2', '-s', '', "DIMM/SOC voltages (ipmi only)." ],
- ['2', '-S', '', "Display manager (dm) in desktop output (e.g. kdm,
- gdm3, lightdm); active window manager if detected; desktop toolkit,
- if available (Xfce/KDE/Trinity only)." ],
- ['2', '--slots', '', "Slot length." ],
+ shows progress bar. Hardware RAID Chip vendor:product ID."],
+ ['2', '-s', '', "DIMM/SOC voltages (ipmi only)."],
+ ['2', '-S', '', "Desktop toolkit (tk), if available (only some DE/wm
+ supported); window manager (wm); display/Login manager (dm,lm) (e.g. kdm,
+ gdm3, lightdm, greetd, seatd)."],
+ ['2', '--slots', '', "Slot length; slot voltage, if available."],
);
- push @data, @rows;
- if ( $use{'weather'} ){
- @rows = (['2', '-w -W', '', "Snow, rain, precipitation, (last observed hour),
- cloud cover, wind chill, dew point, heat index, if available." ]);
- push @data, @rows;
+ if ($use{'weather'}){
+ push(@$rows,
+ ['2', '-w', '', "Snow, rain, precipitation, (last observed hour), cloud
+ cover, wind chill, dew point, heat index, if available."]
+ );
}
- @rows = (
+ push(@$rows,
+ ['0', '', '', ''],
['1', '-xxx', '--extra 3', "Show extra, extra, extra data (only works
- with verbose or line output, not short form):" ],
- ['2', '-A', '', "Serial number." ],
- ['2', '-B', '', "Chemistry, cycles, location (if available)." ],
- ['2', '-C', '', "CPU boost (turbo) enabled/disabled, if present;
- CPU voltage, external clock speed (if root and dmidecode installed)." ],
- ['2', '-D', '', "Firmware rev. if available; partition scheme, in some cases; disk
- rotation speed (if detected)." ],
- ['2', '-I', '', "For 'Shell:' adds ([su|sudo|login]) to shell name if present;
- adds default shell+version if different; for 'running in:' adds (SSH) if SSH session." ],
- ['2', '-J', '', "For Device: serial number (if present), interface count; USB speed." ],
- ['2', '-m,--memory-modules', '', "Width of memory bus, data and total (if present and greater
- than data); Detail for Type, if present; module voltage, if available; serial
- number." ],
- ['2', '-N', '', "Serial number." ],
+ with verbose or line output, not short form):"],
+ ['2', '-A', '', "Serial number, class ID."],
+ ['2', '-B', '', "Chemistry, cycles, location (if available)."],
+ ['2', '-C', '', "CPU voltage, external clock speed (if root and dmidecode
+ installed); smt status, if available."],
+ ['2', '-D', '', "Firmware rev. if available; partition scheme, in some cases;
+ disk type, rotation rpm (if available)."],
+ ['2', '-E', '', "Serial number, class ID, bluetooth device class ID, HCI
+ version and revision."],
+ ['2', '-G', '', "Device serial number, class ID; Xorg Screen size, diag;
+ Monitors: hz, size, modes, serial, scale, modes (max/min); APIs: EGL: hardware
+ driver info; Vulkan: layer count, device hardware vendor."],
+ ['2', '-I', '', "For Power:, adds states, suspend/hibernate active type;
+ For 'Shell:' adds ([doas|su|sudo|login]) to shell name if present; adds
+ default shell+version if different; for 'running in:' adds (SSH) if SSH
+ session."],
+ ['2', '-J', '', "If present: Devices: serial number, interface count, max
+ power."],
+ ['2', '-m,--mm', '', "Width of memory bus, data and total (if
+ present and greater than data); Detail for Type, if present; module current,
+ min, max voltages (if present and different from each other); serial number."],
+ ['2', '-M', '', "Board/Chassis UUID, if available."],
+ ['2', '-N', '', "Serial number, class ID."],
['2', '-R', '', "zfs-raid: portion allocated (used) by RAID devices/arrays.
- md-raid: system md-raid support types (kernel support, read ahead, RAID events).
- Hardware RAID rev, ports, specific vendor/product information." ],
- ['2', '-S', '', "Panel/tray/bar/dock info in desktop output, if in X (like lxpanel,
- xfce4-panel, mate-panel); (if available) dm version number, window manager
- version number." ],
+ md-raid: system md-raid support types (kernel support, read ahead, RAID
+ events). Hardware RAID rev, ports, specific vendor/product information."],
+ ['2', '-S', '', "Kernel clocksource; if in non console wm/desktop; window
+ manager version number; if available: panel/tray/bar/dock (with:);
+ screensavers/lockers running (tools:); virtual terminal number;
+ display/login manager version number."],
);
- push @data, @rows;
- if ( $use{'weather'} ){
- @rows = (['2', '-w -W', '', "Location (uses -z/irc filter), weather observation
- time, altitude, sunrise/sunset, if available." ] );
- push @data, @rows;
- }
- @rows = (
- ['1', '-y', '--width', "Output line width max (integer >= 80). Overrides IRC/Terminal
- settings or actual widths. If no integer give, defaults to 80. -1 removes line lengths.
- 1 switches output to 1 key/value pair per line. Example:^inxi^-y^130" ],
- ['1', '-z', '--filter', "Adds security filters for IP/MAC addresses, serial numbers,
- location (-w), user home directory name, host item. Default on for IRC clients." ],
- ['1', '', '--filter-label', "Filters out ${partition_string} labels in -j,
- -o, -p, -P, -Sa." ],
- ['1', '-Z', '--filter-override', "Override for output filters. Useful for
- debugging networking issues in IRC, for example." ],
- ['1', '', '--filter-uuid', "Filters out ${partition_string} UUIDs in -j,
- -o, -p, -P, -Sa." ],
- [0, '', '', "$line" ],
- [0, '', '', "Additional Options:" ],
- ['1', '-h', '--help', "This help menu." ],
- ['1', '', '--recommends', "Checks $self_name application dependencies + recommends,
- and directories, then shows what package(s) you need to install to add support
- for that feature." ]
+ if ($use{'weather'}){
+ push(@$rows,
+ ['2', '-w', '', "Location (uses -z/irc filter), weather observation time,
+ altitude, sunrise/sunset, if available."]
+ );
+ }
+ push(@$rows,
+ ['0', '', '', ''],
+ ['1', '-a', '--admin', "Adds advanced sys admin data (only works with
+ verbose or line output, not short form); check man page for explanations!;
+ also sets --extra=3:"],
+ ['2', '-A', '', "If available: list of alternate kernel modules/drivers
+ for device(s); PCIe lanes-max: gen, speed, lanes (if relevant); USB mode (if
+ found); list of installed tools for servers."],
+ ['2', '-C', '', "If available: microarchitecture level (64 bit AMD/Intel
+ only).CPU generation, process node, built years; CPU socket type, base/boost
+ speeds (dmidecode+root/sudo/doas required); Full topology line, with cores,
+ threads, threads per core, granular cache data, smt status; CPU
+ vulnerabilities (bugs); family, model-id, stepping - format: hex (decimal)
+ if greater than 9; microcode format: hex."],
+ ['2', '-d,-D', '', "If available: logical and physical block sizes; drive
+ family; maj:min; USB mode (if found); USB drive specifics; SMART report."],
+ ['2', '-E', '', "PCIe lanes-max: gen, speed, lanes (if relevant); USB mode
+ (if found); If available: in Report:, adds status: discoverable, pairing;
+ adds Info: line: acl-mtu, sco-mtu, link-policy, link-mode, service-classes."],
+ ['2', '-G', '', "GPU process node, built year (AMD/Intel/Nvidia only);
+ non-free driver info (Nvidia only); PCIe lanes-max: gen, speed, lanes (if
+ relevant); USB mode (if found); list of alternate kernel modules/drivers for
+ device(s) (if available); Monitor built year, gamma, screen ratio (if
+ available); APIs: OpenGL: device memory, unified memory status; Vulkan: adds
+ full device report, device name, driver version, surfaces."],
+ ['2', '-I', '', "Adds to Power suspend/hibernate available non active states,
+ hibernate image size, suspend failed totals (if not 0), active power services;
+ Packages total number of lib files found for each package manager and pm tools
+ (if not -r); adds init service tool."],
+ ['2', '-j,-p,-P', '', "For swap (if available): swappiness and vfs cache
+ pressure, and if values are default or not."],
+ ['2', '-j', '', "Linux only: (if available): row one zswap data, and per zram
+ row, active and available zram compressions, max compression streams."],
+ ['2', '-J', '', "Adds USB mode (Linux only); IEC speed (base 2, Bytes/s)."],
+ ['2', '-L', '', "LV, Crypto, devices, components: add maj:min; show
+ full device/components report (speed, mapped names)."],
+ ['2', '-m', '', "Show full volts report, current, min, max, even if
+ identical; show firmware version (if available)."],
+ ['2', '-n,-i', '', "Info: services: line, with running network services."],
+ ['2', '-n,-N,-i', '', "If available: list of alternate kernel modules/drivers
+ for device(s); PCIe lanes-max: gen, speed, lanes (if relevant); USB mode (if
+ found)."],
+ ['2', '-o', '', "If available: maj:min of device."],
+ ['2', '-p,-P', '', "If available: raw size of ${partition_string}s, maj:min,
+ percent available for user, block size of file system (root required)."],
+ ['2', '-r', '', "Packages, see -Ia."],
+ ['2', '-R', '', "mdraid: device maj:min; per component: size, maj:min, state."],
+ ['2', '-S', '', "If available: kernel alternate clocksources, boot parameters;
+ de extra data (info: eg kde frameworks); screensaver/locker tools available
+ but not active (avail:)."],
+ ['2', '--slots', '', "If available: slot bus ID children."],
+ );
+ push(@$rows,
+ [0, '', '', "$line"],
+ [0, '', '', "Additional Options:"],
+ ['1', '--config', '--configuration', "Show active configurations, by file(s).
+ Last item listed overrides previous."],
+ ['1', '-h', '--help', "This help menu."],
+ ['1', '', '--recommends', "Checks $self_name application dependencies +
+ recommends, and directories, then shows what package(s) you need to install
+ to add support for that feature."],
);
- push @data, @rows;
- if ( $use{'update'} ){
- @rows = (
- ['1', '-U', '--update', "Auto-update $self_name. Will also install/update man
- page. Note: if you installed as root, you must be root to update, otherwise
- user is fine. Man page installs require root. No arguments downloads from
- main $self_name git repo." ],
- ['1', '', '', "Use alternate sources for updating $self_name" ],
- ['2', '1', '', "Get the git branch one version." ],
- ['2', '2', '', "Get the git branch two version." ],
- ['3', '3', '', "Get the dev server (smxi.org) version." ],
- ['2', '<http>', '', "Get a version of $self_name from your own server.
- Use the full download path, e.g.^$self_name^-U^https://myserver.com/inxi" ]
+ if ($use{'update'}){
+ push(@$rows,
+ ['1', '-U', '--update', "Auto-update $self_name. Will also install/update
+ man page. Note: if you installed as root, you must be root to update,
+ otherwise user is fine. Man page installs require root. No arguments
+ downloads from main $self_name git repo."],
+ ['1', '', '', "Use alternate sources for updating $self_name"],
+ ['2', '3', '', "Get the dev server (smxi.org) version."],
+ ['2', '4', '', "Get the dev server (smxi.org) FTP version. Use if SSL issues
+ and --no-ssl doesn't work."],
+ ['2', '[http|https|ftp]', '', "Get a version of $self_name from your own
+ server. Use the full download path, e.g.
+ ^$self_name^-U^https://myserver.com/inxi"],
);
- push @data, @rows;
}
- @rows = (
- ['1', '-V', '--version', "Prints $self_name version info then exits." ],
- ['0', '', '', "$line" ],
- ['0', '', '', "Advanced Options:" ],
- ['1', '', '--alt', "Trigger for various advanced options:" ],
- ['2', '40', '', "Bypass Perl as a downloader option." ],
- ['2', '41', '', "Bypass Curl as a downloader option." ],
- ['2', '42', '', "Bypass Fetch as a downloader option." ],
- ['2', '43', '', "Bypass Wget as a downloader option." ],
+ push(@$rows,
+ ['1', '', '--version, --vf', "Prints full $self_name version info then exits."],
+ ['1', '', '--version-short,--vs', "Prints 1 line $self_name version info. Can
+ be used with other line options."],
+ ['0', '', '', "$line"],
+ ['0', '', '', "Advanced Options:"],
+ ['1', '', '--alt', "Trigger for various advanced options:"],
+ ['2', '40', '', "Bypass Perl as a downloader option."],
+ ['2', '41', '', "Bypass Curl as a downloader option."],
+ ['2', '42', '', "Bypass Fetch as a downloader option."],
+ ['2', '43', '', "Bypass Wget as a downloader option."],
['2', '44', '', "Bypass Curl, Fetch, and Wget as downloader options. Forces
- Perl if HTTP::Tiny present." ],
- ['1', '', '--dig', "Overrides configuration item NO_DIG (resets to default)." ],
- ['1', '', '--display', "[:[0-9]] Try to get display data out of X (default: display 0)." ],
- ['1', '', '--dmidecode', "Force use of dmidecode data instead of /sys where relevant
- (e.g. -M, -B)." ],
- ['1', '', '--downloader', "Force $self_name to use [curl|fetch|perl|wget] for downloads." ],
- ['1', '', '--host', "Turn on hostname for -S." ],
- ['1', '', '--indent-min', "Set point where $self_name autowraps line starters." ],
- ['1', '', '--limit', "[-1; 1-x] Set max output limit of IP addresses for -i
- (default 10; -1 removes limit)." ],
+ Perl if HTTP::Tiny present."],
+ ['1', '', '--bt-tool', "[bt-adapter btmgmt hciconfig rfkill] Force use of
+ given tool forbluetooth report. Or use --force [tool]."],
+ ['1', '', '--dig', "Overrides configuration item NO_DIG (resets to default)."],
+ ['1', '', '--display', "[:[0-9]] Try to get display data out of X (default:
+ display 0)."],
+ ['1', '', '--dmidecode', "Force use of dmidecode data instead of /sys where
+ relevant
+ (e.g. -M, -B)."],
+ ['1', '', '--downloader', "Force $self_name to use [curl fetch perl wget] for
+ downloads."],
+ ['1', '', '--force', "[bt-adapter btmgmt dmidecode hciconfig hddtemp ip
+ ifconfig lsusb meminfo rfkill usb-sys vmstat wmctrl].
+ 1 or more in comma separated list. Force use of item(s).
+ See --hddtemp, --dmidecode, --wm, --usb-tool, --usb-sys."],
+ ['1', '', '--hddtemp', "Force use of hddtemp for disk temps."],
+ ['1', '', '--html-wan', "Overrides configuration item NO_HTML_WAN (resets to
+ default)."],
+ ['1', '', '--ifconfig', "Force use of ifconfig for IF with -i."],
);
- push @data, @rows;
- if ( $use{'update'} ){
- @rows = (
- ['1', '', '--man', "Install correct man version for dev branch (-U 3) or pinxi using -U." ],
+ if ($use{'update'}){
+ push(@$rows,
+ ['1', '', '--man', "Install correct man version for dev branch (-U 3) or
+ pinxi using -U."],
);
- push @data, @rows;
}
- @rows = (
- ['1', '', '--no-dig', "Skip dig for WAN IP checks, use downloader program." ],
- ['1', '', '--no-host', "Turn off hostname for -S. Useful if showing output from servers etc." ],
+ push(@$rows,
+ ['1', '', '--no-dig', "Skip dig for WAN IP checks, use downloader program."],
+ ['1', '', '--no-doas', "Skip internal program use of doas features (not
+ related to starting $self_name with doas)."],
+ ['1', '', '--no-html-wan', "Skip HTML IP sources for WAN IP checks, use dig
+ only, or nothing if --no-dig."],
);
- push @data, @rows;
- if ( $use{'update'} ){
- @rows = (
- ['1', '', '--no-man', "Disable man install for all -U update actions." ],
+ if ($use{'update'}){
+ push(@$rows,
+ ['1', '', '--no-man', "Disable man install for all -U update actions."],
);
- push @data, @rows;
}
- @rows = (
+ push(@$rows,
['1', '', '--no-ssl', "Skip SSL certificate checks for all downloader actions
- (Wget/Fetch/Curl/Perl-HTTP::Tiny)." ],
- ['1', '', '--no-sudo', "Skip internal program use of sudo features (not related
- to starting $self_name with sudo)." ],
- ['1', '', '--output', "[json|screen|xml] Change data output type. Requires --output-file
- if not screen." ],
- ['1', '', '--output-file', "[Full filepath|print] Output file to be used for --output." ],
- ['1', '', '--partition-sort', "[dev-base|fs|id|label|percent-used|size|uuid|used]
- Change sort order of ${partition_string} output. See man page for specifics." ],
+ (Wget/Fetch/Curl/Perl-HTTP::Tiny)."],
+ ['1', '', '--no-sudo', "Skip internal program use of sudo features (not
+ related to starting $self_name with sudo)."],
+ ['1', '', '--rpm', "Force use of disabled package manager counts for packages
+ feature with -rx/-Ix. RPM disabled by default due to slow to massive rpm
+ package query times."],
+ ['1', '', '--sensors-default', "Removes configuration item SENSORS_USE and
+ SENSORS_EXCLUDE. Same as default behavior."],
+ ['1', '', '--sensors-exclude', "[sensor[s] name, comma separated] Exclude
+ supplied sensor array[s] for -s output (lm-sensors, /sys. Linux only)."],
+ ['1', '', '--sensors-use', "[sensor[s] name, comma separated] Use only
+ supplied sensor array[s] for -s output (lm-sensors, /sys. Linux only)."],
['1', '', '--sleep', "[0-x.x] Change CPU sleep time, in seconds, for -C
(default:^$cpu_sleep). Allows system to catch up and show a more accurate CPU
- use. Example:^$self_name^-Cxxx^--sleep^0.15" ],
- ['1', '', '--tty', "Forces irc flag to false. Generally useful if $self_name is running
- inside of another tool like Chef or MOTD and returns corrupted color codes. Please see
- man page or file an issue if you need to use this flag. Must use -y [width] option if
- you want a specific output width. Always put this option first in an option list."],
- ['1', '', '--usb-sys', "Force USB data to use /sys as data source (Linux only)." ],
- ['1', '', '--usb-tool', "Force USB data to use lsusb as data source (Linux only)." ],
+ use. Example:^$self_name^-Cxxx^--sleep^0.15"],
+ ['1', '', '--tty', "Forces irc flag to false. Generally useful if $self_name
+ is running inside of another tool like Chef or MOTD and returns corrupted
+ color codes. Please see man page or file an issue if you need to use this
+ flag. Must use -y [width] option if you want a specific output width. Always
+ put this option first in an option list. See -Z for disabling output filters
+ as well."],
+ ['1', '', '--usb-sys', "Force USB data to use only /sys as data source (Linux
+ only)."],
+ ['1', '', '--usb-tool', "Force USB data to use lsusb as data source [default]
+ (Linux only)."],
['1', '', '--wan-ip-url', "[URL] Skips dig, uses supplied URL for WAN IP (-i).
URL output must end in the IP address. See man.
- Example:^$self_name^-i^--wan-ip-url^https://yoursite.com/ip.php" ],
- ['1', '', '--wm', "Force wm: to use wmctrl as data source. Default uses ps." ],
+ Example:^$self_name^-i^--wan-ip-url^https://yoursite.com/remote-ip"],
+ ['1', '', '--wm', "Force wm: to use wmctrl as data source. Default uses ps."],
['0', '', '', $line ],
- ['0', '', '', "Debugging Options:" ],
- ['1', '', '--dbg', "Specific debuggers, change often. Only 1 is constant:" ],
- ['2', '1', '', "Show downloader output. Turns off quiet mode." ],
- ['1', '', '--debug', "Triggers debugging modes." ],
- ['2', '1-3', '', "On screen debugger output." ],
- ['2', '10', '', "Basic logging." ],
- ['2', '11', '', "Full file/system info logging." ],
- ['1', '', ,'', "The following create a tar.gz file of system data, plus $self_name
- output. To automatically upload debugger data tar.gz file
- to ftp.techpatterns.com: $self_name^--debug^21" ],
- ['2', '20', '', "Full system data collection: /sys; xorg conf and log data, xrandr,
- xprop, xdpyinfo, glxinfo etc.; data from dev, disks,
- ${partition_string}s, etc." ],
+ ['0', '', '', "Debugging Options:"],
+ ['1', '', '--dbg', "[1-xx[,1-xx]] Comma separated list of debugger numbers.
+ Each triggers specific debugger[s]. See man page or docs."],
+ ['2', '1', '', "Show downloader output. Turns off quiet mode."],
+ ['1', '', '--debug', "[1-3|10|11|20-22] Triggers debugging modes."],
+ ['2', '1-3', '', "On screen debugger output."],
+ ['2', '10', '', "Basic logging."],
+ ['2', '11', '', "Full file/system info logging."],
+ ['1', '', ,'', "The following create a tar.gz file of system data, plus
+ $self_name output. To automatically upload debugger data tar.gz file to
+ ftp.smxi.org: $self_name^--debug^21"],
+ ['2', '20', '', "Full system data collection: /sys; xorg conf and log data,
+ xrandr, xprop, xdpyinfo, glxinfo etc.; data from dev, disks,
+ ${partition_string}s, etc."],
['2', '21', '', "Upload debugger dataset to $self_name debugger server
- automatically, removes debugger data directory, leaves tar.gz debugger file." ],
+ automatically, removes debugger data directory, leaves tar.gz debugger file."],
['2', '22', '', "Upload debugger dataset to $self_name debugger server
- automatically, removes debugger data directory and debugger tar.gz file." ],
- ['1', '', '--debug-proc', "Force debugger parsing of /proc as sudo/root." ],
- ['1', '', '--debug-proc-print', "To locate file that /proc debugger hangs on." ],
- ['1', '', '--debug-no-exit', "Skip exit on error to allow completion." ],
- ['1', '', '--debug-no-proc', "Skip /proc debugging in case of a hang." ],
- ['1', '', '--debug-no-sys', "Skip /sys debugging in case of a hang." ],
- ['1', '', '--debug-sys', "Force PowerPC debugger parsing of /sys as sudo/root." ],
- ['1', '', '--debug-sys-print', "To locate file that /sys debugger hangs on." ],
- ['1', '', '--ftp', "Use with --debugger 21 to trigger an alternate FTP server for upload.
- Format:^[ftp.xx.xx/yy]. Must include a remote directory to upload to.
- Example:^$self_name^--debug^21^--ftp^ftp.myserver.com/incoming" ],
- ['0', '', '', "$line" ],
+ automatically, removes debugger data directory and debugger tar.gz file."],
+ # ['1', '', '--debug-filter', "Add -z flag to debugger $self_name optiions."],
+ ['1', '', '--debug-id', "[short-string] Add given string to debugger file
+ name. Helps identify source of debugger dataset. Use with --debug 20-22."],
+ ['1', '', '--debug-proc', "Force debugger parsing of /proc as sudo/doas/root."],
+ ['1', '', '--debug-proc-print', "To locate file that /proc debugger hangs on."],
+ ['1', '', '--debug-no-exit', "Skip exit on error to allow completion."],
+ ['1', '', '--debug-no-proc', "Skip /proc debugging in case of a hang."],
+ ['1', '', '--debug-no-sys', "Skip /sys debugging in case of a hang."],
+ ['1', '', '--debug-sys', "Force PowerPC debugger parsing of /sys as
+ sudo/doas/root."],
+ ['1', '', '--debug-sys-print', "To locate file that /sys debugger hangs on."],
+ ['1', '', '--ftp', "Use with --debugger 21 to trigger an alternate FTP server
+ for upload. Format:^[ftp.xx.xx/yy]. Must include a remote directory to upload
+ to. Example:^$self_name^--debug^21^--ftp^ftp.myserver.com/incoming"],
+ ['0', '', '', "$line"],
);
- push @data, @rows;
- print_basic(@data);
+ print_basic($rows);
exit 0; # shell true
}
sub show_version {
- require Cwd;
- import Cwd;
# if not in PATH could be either . or directory name, no slash starting
my $working_path=$self_path;
- my (@data, @row, @rows, $link, $self_string);
- if ( $working_path eq '.' ){
+ my ($link,$self_string);
+ my $rows = [];
+ Cwd->import('getcwd'); # no point loading this on top use, we only use getcwd here
+ if ($working_path eq '.'){
$working_path = getcwd();
}
- elsif ( $working_path !~ /^\// ){
+ elsif ($working_path !~ /^\//){
$working_path = getcwd() . "/$working_path";
}
$working_path =~ s%/$%%;
# handle if it's a symbolic link, rare, but can happen with directories
# in irc clients which would only matter if user starts inxi with -! 30 override
# in irc client
- if ( -l "$working_path/$self_name" ){
+ if (-l "$working_path/$self_name"){
$link="$working_path/$self_name";
$working_path = readlink "$working_path/$self_name";
$working_path =~ s/[^\/]+$//;
}
# strange output /./ ending, but just trim it off, I don't know how it happens
$working_path =~ s%/\./%/%;
- @row = (
- [ 0, '', '', "$self_name $self_version-$self_patch ($self_date)"],
- );
- push @data, @row;
- if ( ! $b_irc ){
- @row = ([ 0, '', '', ''],);
- push @data, @row;
+ push(@$rows, [ 0, '', '', "$self_name $self_version-$self_patch ($self_date)"]);
+ if (!$b_irc && !$show{'version-short'}){
+ push(@$rows, [ 0, '', '', '']);
my $year = (split/-/, $self_date)[0];
- @row = (
+ push(@$rows,
[ 0, '', '', "Copyright^(C)^2008-$year^Harald^Hope^aka^h2"],
[ 0, '', '', "Forked from Infobash 3.02: Copyright^(C)^2005-2007^Michiel^de^Boer^aka^locsmif." ],
[ 0, '', '', "Using Perl version: $]"],
[ 0, '', '', "Program Location: $working_path" ],
);
- push @data, @row;
- if ( $link ){
- @row = [ 0, '', '', "Started via symbolic link: $link" ];
- push @data, @row;
+ if ($link){
+ push(@$rows, [ 0, '', '', "Started via symbolic link: $link" ]);
}
- @rows = (
+ push(@$rows,
[ 0, '', '', '' ],
- [ 0, '', '', "Website:^https://github.com/smxi/inxi^or^https://smxi.org/" ],
+ [ 0, '', '', "Website:^https://codeberg.org/smxi/inxi^or^https://smxi.org/" ],
[ 0, '', '', "IRC:^irc.oftc.net channel:^#smxi" ],
[ 0, '', '', "Forums:^https://techpatterns.com/forums/forum-33.html" ],
-
[ 0, '', '', '' ],
[ 0, '', '', "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 3 of the License, or (at your option) any later version.
(https://www.gnu.org/licenses/gpl.html)" ]
);
- push @data, @rows;
}
- print_basic(@data);
- exit 0; # shell true
+ print_basic($rows);
+ exit 0 if !$show{'version-short'} || $show{'short'}; # shell true
}
########################################################################
#### STARTUP DATA
########################################################################
-# StartClient
+## StartClient
{
package StartClient;
# use warnings;
# use strict;
-my $ppid = '';
my $pppid = '';
-# NOTE: there's no reason to crete an object, we can just access
+# NOTE: there's no reason to create an object, we can just access
# the features statically.
# args: none
# sub new {
@@ -5129,13 +6010,12 @@ my $pppid = '';
# return bless $self, $class;
# }
-sub get_client_data {
+sub set {
eval $start if $b_log;
- $ppid = getppid();
- main::set_ps_aux() if ! @ps_aux;
+ PsData::set_cmd() if !$loaded{'ps-cmd'};
+ # $b_irc = 1; # for testing, like cli konvi start which shows as tty
if (!$b_irc){
- # we'll run get_shell_data for -I, but only then
- $client{'ppid'} = $ppid;
+ # we'll run ShellData::set() for -I, but only then
}
else {
$use{'filter'} = 1;
@@ -5150,17 +6030,16 @@ sub get_client_data {
sub get_client_name {
eval $start if $b_log;
my $client_name = '';
-
# print "$ppid\n";
- if ($ppid && -e "/proc/$ppid/exe" ){
+ if ($ppid && -e "/proc/$ppid/exe"){
$client_name = lc(readlink "/proc/$ppid/exe");
$client_name =~ s/^.*\///;
- if ($client_name =~ /^bash|dash|sh|python.*|perl.*$/){
- $pppid = (main::grabber("ps -p $ppid -o ppid"))[1];
- #my @temp = (main::grabber("ps -p $ppid -o ppid 2>/dev/null"))[1];
+ if ($client_name =~ /^(bash|csh|dash|fish|sh|python.*|perl.*|zsh)$/){
+ $pppid = (main::grabber("ps -wwp $ppid -o ppid 2>/dev/null"))[1];
+ # my @temp = (main::grabber("ps -wwp $ppid -o ppid 2>/dev/null"))[1];
$pppid =~ s/^\s+|\s+$//g;
$client_name =~ s/[0-9\.]+$//; # clean things like python2.7
- if ($pppid && -f "/proc/$pppid/exe" ){
+ if ($pppid && -f "/proc/$pppid/exe"){
$client_name = lc(readlink "/proc/$pppid/exe");
$client_name =~ s/^.*\///;
$client{'native'} = 0;
@@ -5169,16 +6048,15 @@ sub get_client_name {
$client{'name'} = $client_name;
get_client_version();
# print "c:$client_name p:$pppid\n";
- #print "$client{'name-print'}\n";
+ # print "$client{'name-print'}\n";
}
else {
- if (! check_modern_konvi() ){
- $ppid = getppid();
- $client_name = (main::grabber("ps -p $ppid"))[1];
+ if (!check_modern_konvi()){
+ $client_name = (main::grabber("ps -wwp $ppid 2>/dev/null"))[1];
if ($client_name){
- my @data = split /\s+/, $client_name if $client_name;
+ my @data = split(/\s+/, $client_name);
if ($bsd_type){
- $client_name = lc($data[5]);
+ $client_name = lc($data[4]);
}
# gnu/linux uses last value
else {
@@ -5196,31 +6074,33 @@ sub get_client_name {
}
}
if ($b_log){
- my $string = "Client: $client{'name'} :: version: $client{'version'} :: konvi: $client{'konvi'} :: PPID: $ppid";
+ my $string = "Client: $client{'name'} :: version: $client{'version'} ::";
+ $string .= " konvi: $client{'konvi'} :: PPID: $ppid";
main::log_data('data', $string);
}
eval $end if $b_log;
}
+
sub get_client_version {
eval $start if $b_log;
- @app = main::program_values($client{'name'});
+ my @app = ProgramData::values($client{'name'});
my (@data,@working,$string);
if (@app){
$string = ($client{'name'} =~ /^gribble|limnoria|supybot$/) ? 'supybot' : $client{'name'};
- $client{'version'} = main::program_version($string,$app[0],$app[1],$app[2],$app[4],$app[5],$app[6]);
+ $client{'version'} = ProgramData::version($string,$app[0],$app[1],$app[2],$app[4],$app[5],$app[6]);
$client{'name-print'} = $app[3];
$client{'console-irc'} = $app[4];
}
- if ($client{'name'} =~ /^bash|dash|sh$/ ){
+ if ($client{'name'} =~ /^(bash|csh|fish|dash|sh|zsh)$/){
$client{'name-print'} = 'shell wrapper';
$client{'console-irc'} = 1;
}
- elsif ($client{'name'} eq 'bitchx') {
- @data = main::grabber("$client{'name'} -v");
+ elsif ($client{'name'} eq 'bitchx'){
+ @data = main::grabber("$client{'name'} -v 2>/dev/null");
$string = awk(\@data,'Version');
if ($string){
$string =~ s/[()]|bitchx-//g;
- @data = split /\s+/, $string;
+ @data = split(/\s+/, $string);
$_=lc for @data;
$client{'version'} = ($data[1] eq 'version') ? $data[2] : $data[1];
}
@@ -5230,44 +6110,44 @@ sub get_client_version {
# so we need to read the actual config file for hexchat. Note that older hexchats
# used xchat config file, so test first for default, then legacy. Because it's possible
# for this file to be user edited, doing some extra checks here.
- elsif ($client{'name'} eq 'hexchat') {
- if ( -f '~/.config/hexchat/hexchat.conf' ){
+ elsif ($client{'name'} eq 'hexchat'){
+ if (-f '~/.config/hexchat/hexchat.conf'){
@data = main::reader('~/.config/hexchat/hexchat.conf','strip');
}
- elsif ( -f '~/.config/hexchat/xchat.conf' ){
+ elsif (-f '~/.config/hexchat/xchat.conf'){
@data = main::reader('~/.config/hexchat/xchat.conf','strip');
}
if (@data){
$client{'version'} = main::awk(\@data,'version',2,'\s*=\s*');
}
# fingers crossed, hexchat won't open gui!!
- if (!$client{'version'}) {
+ if (!$client{'version'}){
@data = main::grabber("$client{'name'} --version 2>/dev/null");
$client{'version'} = main::awk(\@data,'hexchat',2,'\s+');
}
$client{'name-print'} = 'HexChat';
}
# note: see legacy inxi konvi logic if we need to restore any of the legacy code.
- elsif ($client{'name'} eq 'konversation') {
- $client{'konvi'} = ( ! $client{'native'} ) ? 2 : 1;
+ elsif ($client{'name'} eq 'konversation'){
+ $client{'konvi'} = (!$client{'native'}) ? 2 : 1;
}
- elsif ($client{'name'} =~ /quassel/) {
+ elsif ($client{'name'} =~ /quassel/i){
@data = main::grabber("$client{'name'} -v 2>/dev/null");
foreach (@data){
if ($_ =~ /^Quassel IRC:/){
- $client{'version'} = (split /\s+/, $_ )[2];
+ $client{'version'} = (split(/\s+/, $_))[2];
last;
}
elsif ($_ =~ /quassel\s[v]?[0-9]/){
- $client{'version'} = (split /\s+/, $_ )[1];
+ $client{'version'} = (split(/\s+/, $_))[1];
last;
}
}
$client{'version'} ||= '(pre v0.4.1)?';
}
# then do some perl type searches, do this last since it's a wildcard search
- elsif ($client{'name'} =~ /^(perl.*|ksirc|dsirc)$/ ) {
- my @cmdline = main::get_cmdline();
+ elsif ($client{'name'} =~ /^(perl.*|ksirc|dsirc)$/){
+ my $cmdline = main::get_cmdline();
# Dynamic runpath detection is too complex with KSirc, because KSirc is started from
# kdeinit. /proc/<pid of the grandparent of this process>/exe is a link to /usr/bin/kdeinit
# with one parameter which contains parameters separated by spaces(??), first param being KSirc.
@@ -5276,36 +6156,38 @@ sub get_client_version {
# You can imagine how hosed I am if I try to make inxi find out dynamically with which path
# KSirc was run by browsing up the process tree in /proc. That alone is straightjacket material.
# (KSirc sucks anyway ;)
- foreach (@cmdline){
- if ( $_ =~ /dsirc/ ){
- $client{'version'} = main::program_version('ksirc','KSirc:',2,'-v',0,0);
+ foreach (@$cmdline){
+ if ($_ =~ /dsirc/){
$client{'name'} = 'ksirc';
- $client{'name-print'} = 'KSirc';
+ ($client{'name-print'},$client{'version'}) = ProgramData::full('ksirc');
}
}
$client{'console-irc'} = 1;
perl_python_client();
}
- elsif ($client{'name'} =~ /python/) {
+ elsif ($client{'name'} =~ /python/){
perl_python_client();
}
- if (!$client{'name-print'}) {
- # NOTE: these must be empirically determined, not all events that
- # show no tty are actually IRC.
- my $wl_terms = 'alacritty|evilvte|germinal|guake|hyper|kate|kitty|kmscon|';
- $wl_terms .= 'konsole|minicom|putty|rxvt|sakura|shellinabox|^st$|sudo|term|tilda|';
- $wl_terms .= 'tilix|urvxt|yaft|yakuake';
- my $wl_clients = 'ansible|chef|run-parts';
+ # NOTE: these must be empirically determined, not all events that
+ # show no tty are actually IRC. tmux is not a vt, but runs inside one
+ if (!$client{'name-print'}){
+ my $wl_terms = 'alacritty|altyo|\bate\b|black-screen|conhost|doas|evilvte|';
+ $wl_terms .= 'foot|germinal|guake|havoc|hyper|kate|kitty|kmscon|konsole|';
+ $wl_terms .= 'login|macwise|minicom|putty|rxvt|sakura|securecrt|';
+ $wl_terms .= 'shellinabox|^st$|sudo|term|tilda|tilix|tmux|tym|wayst|xiki|';
+ $wl_terms .= 'yaft|yakuake|\bzoc\b';
+ my $wl_clients = 'ansible|chef|run-parts|slurm|sshd';
my $whitelist = "$wl_terms|$wl_clients";
# print "$client{'name'}\n";
if ($client{'name'} =~ /($whitelist)/i){
if ($client{'name'} =~ /($wl_terms)/i){
- main::get_shell_data($ppid);
+ ShellData::set();
}
else {
$client{'name-print'} = $client{'name'};
}
$b_irc = 0;
+ $use{'filter'} = 0;
}
else {
$client{'name-print'} = 'Unknown Client: ' . $client{'name'};
@@ -5313,60 +6195,62 @@ sub get_client_version {
}
eval $end if $b_log;
}
+
sub get_cmdline {
eval $start if $b_log;
my @cmdline;
my $i = 0;
- $ppid = getppid();
- if (! -e "/proc/$ppid/cmdline" ){
+ if (! -e "/proc/$ppid/cmdline"){
return 1;
}
local $\ = '';
- open( my $fh, '<', "/proc/$ppid/cmdline" ) or
- print_line("Open /proc/$ppid/cmdline failed: $!");
+ open(my $fh, '<', "/proc/$ppid/cmdline") or
+ print_line("Open /proc/$ppid/cmdline failed: $!");
my @rows = <$fh>;
close $fh;
foreach (@rows){
- push @cmdline, $_;
+ push(@cmdline, $_);
$i++;
last if $i > 31;
}
- if ( $i == 0 ){
+ if ($i == 0){
$cmdline[0] = $rows[0];
$i = ($cmdline[0]) ? 1 : 0;
}
main::log_data('string',"cmdline: @cmdline count: $i") if $b_log;
eval $end if $b_log;
- return @cmdline;
+ return [@cmdline];
}
+
sub perl_python_client {
eval $start if $b_log;
return 1 if $client{'version'};
+ my @app;
# this is a hack to try to show konversation if inxi is running but started via /cmd
# OR via program shortcuts, both cases in fact now
# main::print_line("konvi: " . scalar grep { $_ =~ /konversation/ } @ps_cmd);
- if ( $b_display && main::check_program('konversation') &&
- ( grep { $_ =~ /konversation/ } @ps_cmd )){
- @app = main::program_values('konversation');
- $client{'version'} = main::program_version('konversation',$app[0],$app[1],$app[2],$app[5],$app[6]);
+ if ($b_display && main::check_program('konversation') &&
+ (grep { $_ =~ /konversation/ } @ps_cmd)){
+ @app = ProgramData::values('konversation');
+ $client{'version'} = ProgramData::version('konversation',$app[0],$app[1],$app[2],$app[5],$app[6]);
$client{'name'} = 'konversation';
$client{'name-print'} = $app[3];
$client{'console-irc'} = $app[4];
}
## NOTE: supybot only appears in ps aux using 'SHELL' command; the 'CALL' command
## gives the user system irc priority, and you don't see supybot listed, so use SHELL
- elsif ( !$b_display &&
+ elsif (!$b_display &&
(main::check_program('supybot') ||
main::check_program('gribble') || main::check_program('limnoria')) &&
- ( grep { $_ =~ /supybot/ } @ps_cmd ) ){
- @app = main::program_values('supybot');
- $client{'version'} = main::program_version('supybot',$app[0],$app[1],$app[2],$app[5],$app[6]);
+ (grep { $_ =~ /supybot/ } @ps_cmd)){
+ @app = ProgramData::values('supybot');
+ $client{'version'} = ProgramData::version('supybot',$app[0],$app[1],$app[2],$app[5],$app[6]);
if ($client{'version'}){
- if ( grep { $_ =~ /gribble/ } @ps_cmd ){
+ if (grep { $_ =~ /gribble/ } @ps_cmd){
$client{'name'} = 'gribble';
$client{'name-print'} = 'Gribble';
}
- if ( grep { $_ =~ /limnoria/ } @ps_cmd){
+ if (grep { $_ =~ /limnoria/ } @ps_cmd){
$client{'name'} = 'limnoria';
$client{'name-print'} = 'Limnoria';
}
@@ -5385,40 +6269,49 @@ sub perl_python_client {
$client{'name-print'} = "Unknown $client{'name'} client";
}
if ($b_log){
- my $string = "namep: $client{'name-print'} name: $client{'name'} version: $client{'version'}";
+ my $string = "namep: $client{'name-print'} name: $client{'name'} ";
+ $string .= " version: $client{'version'}";
main::log_data('data',$string);
}
eval $end if $b_log;
}
-## try to infer the use of Konversation >= 1.2, which shows $PPID improperly
-## no known method of finding Konvi >= 1.2 as parent process, so we look to see if it is running,
-## and all other irc clients are not running. As of 2014-03-25 this isn't used in my cases
+
+# Try to infer the use of Konversation >= 1.2, which shows $PPID improperly
+# no known method of finding Konvi >= 1.2 as parent process, so we look to
+# see if it is running, and all other irc clients are not running. As of
+# 2014-03-25 this isn't used in my cases
sub check_modern_konvi {
eval $start if $b_log;
- return 0 if ! $client{'qdbus'};
- my $b_modern_konvi = 0;
- my $konvi_version = '';
- my $konvi = '';
- my $pid = '';
- my (@temp);
+ return 0 if !$client{'qdbus'};
+ my ($b_modern_konvi,$konvi,$konvi_version,$pid) = (0,'','','');
# main::log_data('data',"name: $client{'name'} :: qdb: $client{'qdbus'} :: version: $client{'version'} :: konvi: $client{'konvi'} :: PPID: $ppid") if $b_log;
# sabayon uses /usr/share/apps/konversation as path
- if ( -d '/usr/share/kde4/apps/konversation' || -d '/usr/share/apps/konversation' ){
- $pid = main::awk(\@ps_aux,'konversation -session',2,'\s+');
- main::log_data('data',"pid: $pid") if $b_log;
- $konvi = readlink ("/proc/$pid/exe");
- $konvi =~ s/^.*\///; # basename
- @app = main::program_values('konversation');
+ # Paths not checked for BSDs to see what they are.
+ if (-d '/usr/share/kde4/apps/konversation' || -d '/usr/share/apps/konversation'){
+ # much faster test, added 2022, newer konvis support
+ # can also query qdbus to see if it's running, but that's a subshell and grep
+ if ($ENV{'PYTHONPATH'} && $ENV{'PYTHONPATH'} =~ /konversation/i){
+ $konvi = 'konversation';
+ }
+ # was -session, then -qwindowtitle; cli start, nothing, just konversation$
+ elsif ($pid = main::awk(\@ps_aux,'konversation( -|$)',2,'\s+')){
+ main::log_data('data',"pid: $pid") if $b_log;
+ if (-e "/proc/$pid/exe"){
+ $konvi = readlink("/proc/$pid/exe");
+ $konvi =~ s/^.*\///; # basename
+ }
+ }
+ # print "$pid $konvi\n";
if ($konvi){
- @app = main::program_values('konversation');
- $konvi_version = main::program_version($konvi,$app[0],$app[1],$app[2],$app[5],$app[6]);
- @temp = split /\./, $konvi_version;
+ my @app = ProgramData::values('konversation');
+ $konvi_version = ProgramData::version($konvi,$app[0],$app[1],$app[2],$app[5],$app[6]);
$client{'console-irc'} = $app[4];
$client{'konvi'} = 3;
$client{'name'} = 'konversation';
$client{'name-print'} = $app[3];
$client{'version'} = $konvi_version;
# note: we need to change this back to a single dot number, like 1.3, not 1.3.2
+ my @temp = split('\.', $konvi_version);
$konvi_version = $temp[0] . "." . $temp[1];
if ($konvi_version > 1.1){
$b_modern_konvi = 1;
@@ -5429,23 +6322,23 @@ sub check_modern_konvi {
qdb: $client{'qdbus'} version: $konvi_version konvi: $konvi PID: $pid") if $b_log;
main::log_data('data',"b_is_qt4: $b_modern_konvi") if $b_log;
## for testing this module
-# my $ppid = getppid();
-# system('qdbus org.kde.konversation', '/irc', 'say', $client{'dserver'}, $client{'dtarget'},
-# "getpid_dir: $konvi_qt4 verNum: $konvi_version pid: $pid ppid: $ppid" );
+ # my $ppid = getppid();
+ # system('qdbus org.kde.konversation', '/irc', 'say', $client{'dserver'}, $client{'dtarget'},
+ # "getpid_dir: verNum: $konvi_version pid: $pid ppid: $ppid");
+ # print "verNum: $konvi_version pid: $pid ppid: $ppid\n";
eval $end if $b_log;
return $b_modern_konvi;
}
sub set_konvi_data {
eval $start if $b_log;
- my $config_tool = '';
# https://userbase.kde.org/Konversation/Scripts/Scripting_guide
- if ( $client{'konvi'} == 3 ){
+ if ($client{'konvi'} == 3){
$client{'dserver'} = shift @ARGV;
$client{'dtarget'} = shift @ARGV;
$client{'dobject'} = 'default';
}
- elsif ( $client{'konvi'} == 1 ){
+ elsif ($client{'konvi'} == 1){
$client{'dport'} = shift @ARGV;
$client{'dserver'} = shift @ARGV;
$client{'dtarget'} = shift @ARGV;
@@ -5453,22 +6346,6 @@ sub set_konvi_data {
}
# for some reason this logic hiccups on multiple spaces between args
@ARGV = grep { $_ ne '' } @ARGV;
- # there's no current kde 5 konvi config tool that we're aware of. Correct if changes.
- if ( main::check_program('kde4-config') ){
- $config_tool = 'kde4-config';
- }
- elsif ( main::check_program('kde5-config') ){
- $config_tool = 'kde5-config';
- }
- elsif ( main::check_program('kde-config') ){
- $config_tool = 'kde-config';
- }
- # The section below is on request of Argonel from the Konversation developer team:
- # it sources config files like $HOME/.kde/share/apps/konversation/scripts/inxi.conf
- if ($config_tool){
- my @data = main::grabber("$config_tool --path data 2>/dev/null",':');
- main::get_configs(@data);
- }
eval $end if $b_log;
}
}
@@ -5478,37 +6355,25 @@ sub set_konvi_data {
########################################################################
#### -------------------------------------------------------------------
-#### FILTERS AND TOOLS
+#### CLEANERS, FILTERS, AND TOOLS
#### -------------------------------------------------------------------
-sub apply_filter {
- my ($string) = @_;
- if ($string){
- $string = ( $use{'filter'} ) ? $filter_string : $string;
- }
- else {
- $string = 'N/A';
- }
- return $string;
-}
-# note, let the print logic handle N/A cases
-sub apply_partition_filter {
- my ($source,$string,$type) = @_;
- return $string if !$string || $string eq 'N/A';
- if ($source eq 'system') {
- my $test = ($type eq 'label') ? '=LABEL=': '=UUID=';
- $string =~ s/$test[^\s]+/$test$filter_string/g;
- }
- else {
- $string = $filter_string;
- }
- return $string;
+sub clean {
+ my ($item) = @_;
+ return $item if !$item;# handle cases where it was 0 or '' or undefined
+ # note: |nee trips engineering, but I don't know why nee was filtered
+ $item =~ s/chipset|company|components|computing|computer|corporation|communications|electronics?|electric(al)?|group|incorporation|industrial|international|limited|\bnee\b|<?no\sstring>?|revision|semiconductor|software|technolog(ies|y)|<?unknown>?|ltd\.|<ltd>|\bltd\b|inc\.|<inc>|\binc\b|intl\.|co\.|<co>|corp\.|<corp>|\(tm\)|\(r\)|®|\(rev ..\)|\'|\"|\?//gi;
+ $item =~ s/,|\*/ /g;
+ $item =~ s/^\s+|\s+$//g;
+ $item =~ s/\s\s+/ /g;
+ return $item;
}
-sub arm_cleaner {
+
+sub clean_arm {
my ($item) = @_;
$item =~ s/(\([^\(]*Device Tree[^\)]*\))//gi;
- $item =~ s/\s\s+/ /g;
$item =~ s/^\s+|\s+$//g;
+ $item =~ s/\s\s+/ /g;
return $item;
}
@@ -5517,70 +6382,156 @@ sub clean_characters {
# newline, pipe, brackets, + sign, with space, then clear doubled
# spaces and then strip out trailing/leading spaces.
# etc/issue often has junk stuff like (\l) \n \l
- return if ! $data;
+ return if !$data;
$data =~ s/[:\47]|\\[a-z]|\n|,|\"|\*|\||\+|\[\s\]|n\/a|\s\s+/ /g;
$data =~ s/\(\s*\)//;
$data =~ s/^\s+|\s+$//g;
return $data;
}
-sub cleaner {
- my ($item) = @_;
- return $item if !$item;# handle cases where it was 0 or ''
- # note: |nee trips engineering, but I don't know why nee was filtered
- $item =~ s/chipset|company|components|computing|computer|corporation|communications|electronics|electrical|electric|gmbh|group|incorporation|industrial|international|\bnee\b|revision|semiconductor|software|technologies|technology|ltd\.|<ltd>|\bltd\b|inc\.|<inc>|\binc\b|intl\.|co\.|<co>|corp\.|<corp>|\(tm\)|\(r\)|®|\(rev ..\)|\'|\"|\sinc\s*$|\?//gi;
- $item =~ s/,|\*/ /g;
- $item =~ s/\s\s+/ /g;
- $item =~ s/^\s+|\s+$//g;
- return $item;
-}
-
-sub disk_cleaner {
+sub clean_disk {
my ($item) = @_;
return $item if !$item;
# <?unknown>?|
$item =~ s/vendor.*|product.*|O\.?E\.?M\.?//gi;
- $item =~ s/\s\s+/ /g;
$item =~ s/^\s+|\s+$//g;
+ $item =~ s/\s\s+/ /g;
return $item;
}
-sub dmi_cleaner {
+sub clean_dmi {
my ($string) = @_;
- my $cleaner = '^Base Board .*|^Chassis .*|empty|Undefined.*|.*O\.E\.M\..*|.*OEM.*|^Not .*';
- $cleaner .= '|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*|^0x[0]+$';
- $cleaner .= '|\[Empty\]|<Bad Index>|<OUT OF SPEC>|Default string|^\.\.$|Manufacturer.*';
- $cleaner .= '|AssetTagNum|Manufacturer| Or Motherboard|PartNum.*|\bOther\b.*|SerNum';
- $string =~ s/$cleaner//i;
- $string =~ s/^\s+|\bbios\b|\bacpi\b|\s+$//gi;
+ $string = clean_unset($string,'AssetTagNum|^Base Board .*|^Chassis .*|' .
+ 'Manufacturer.*| Or Motherboard|\bOther\b.*|PartNum.*|SerNum|' .
+ '^System .*|^0x[0]+$');
+ $string =~ s/\bbios\b|\bacpi\b//gi;
$string =~ s/http:\/\/www.abit.com.tw\//Abit/i;
+ $string =~ s/^[\s'"]+|[\s'"]+$//g;
$string =~ s/\s\s+/ /g;
- $string =~ s/^\s+|\s+$//g;
$string = remove_duplicates($string) if $string;
return $string;
}
-sub remove_duplicates {
+sub clean_pci {
+ my ($string,$type) = @_;
+ # print "st1 $type:$string\n";
+ my $filter = 'and\ssubsidiaries|compatible\scontroller|licensed\sby|';
+ $filter .= '\b(device|controller|connection|multimedia)\b|\([^)]+\)';
+ # \[[^\]]+\]$| not trimming off ending [...] initial type filters removes end
+ $filter = '\[[^\]]+\]$|' . $filter if $type eq 'pci';
+ $string =~ s/($filter)//ig;
+ $string =~ s/^[\s'"]+|[\s'"]+$//g;
+ $string =~ s/\s\s+/ /g;
+ # print "st2 $type:$string\n";
+ $string = remove_duplicates($string) if $string;
+ return $string;
+}
+
+sub clean_pci_subsystem {
my ($string) = @_;
- return if ! $string;
- my $holder = '';
- my (@temp);
- my @data = split /\s+/, $string;
- foreach (@data){
- if ($holder ne $_){
- push @temp, $_;
+ # we only need filters for features that might use vendor, -AGN
+ my $filter = 'and\ssubsidiaries|adapter|(hd\s)?audio|definition|desktop|ethernet|';
+ $filter .= 'gigabit|graphics|hdmi(\/[\S]+)?|high|integrated|licensed\sby|';
+ $filter .= 'motherboard|network|onboard|raid|pci\s?express';
+ $string =~ s/\b($filter)\b//ig;
+ $string =~ s/^[\s'"]+|[\s'"]+$//g;
+ $string =~ s/\s\s+/ /g;
+ return $string;
+}
+
+# Use sparingly, but when we need regex type stuff
+# stripped out for reliable string compares, it's better.
+# sometimes the pattern comes from unknown strings
+# which can contain regex characters, get rid of those
+sub clean_regex {
+ my ($string) = @_;
+ return if !$string;
+ $string =~ s/(\{|\}|\(|\)|\[|\]|\|)/ /g;
+ $string =~ s/^\s+|\s+$//g;
+ $string =~ s/\s\s+/ /g;
+ return $string;
+}
+
+# args: 0: string; 1: optional, if you want to add custom filter to defaults
+sub clean_unset {
+ my ($string,$extra) = @_;
+ my $cleaner = '^(\.)+$|Bad Index|default string|\[?empty\]?|\bnone\b|N\/A|^not |';
+ $cleaner .= 'not set|OUT OF SPEC|To be filled|O\.?E\.?M|undefine|unknow|unspecif';
+ $cleaner .= '|' . $extra if $extra;
+ $string =~ s/.*($cleaner).*//i;
+ return $string;
+}
+
+sub filter {
+ my ($string,$type) = @_;
+ if ($string){
+ $type ||= 'filter';
+ if ($use{$type} && $string ne message('root-required')){
+ $string = $filter_string;
}
- $holder = $_;
}
- $string = join ' ', @temp;
+ else {
+ $string = 'N/A';
+ }
+ return $string;
+}
+
+# Note, let the print logic handle N/A cases
+sub filter_partition {
+ my ($source,$string,$type) = @_;
+ return $string if !$string || $string eq 'N/A';
+ if ($source eq 'system'){
+ my $test = ($type eq 'label') ? '=LABEL=': '=UUID=';
+ $string =~ s/$test[^\s]+/$test$filter_string/g;
+ }
+ else {
+ $string = $filter_string;
+ }
+ return $string;
+}
+
+sub filter_pci_long {
+ my ($string) = @_;
+ if ($string =~ /\[AMD(\/ATI)?\]/){
+ $string =~ s/Advanced\sMicro\sDevices\s\[AMD(\/ATI)?\]/AMD/;
+ }
return $string;
}
-# args: $1 - size in KB, return KB, MB, GB, TB, PB, EB
+# args: 0: list of values. Return the first one that is defined.
+sub get_defined {
+ for (@_){
+ return $_ if defined $_;
+ }
+ return; # don't return undef explicitly, only implicitly!
+}
+
+# args: 0: vendor id; 1: product id.
+# Returns print ready vendor:chip id string, or na variants
+sub get_chip_id {
+ my ($vendor,$product)= @_;
+ my $id = 'N/A';
+ if ($vendor && $product){
+ $id = "$vendor:$product";
+ }
+ elsif ($vendor){
+ $id = "$vendor:n/a";
+ }
+ elsif ($product){
+ $id = "n/a:$product";
+ }
+ return $id;
+}
+
+# args: 0: size in KiB, return KiB, MiB, GiB, TiB, PiB, EiB; 1: 'string';
+# 2: default value if null. Assumes KiB input.
+# Returns string with units or array or size unmodified if not numeric
sub get_size {
- my ($size,$b_int) = @_;
+ my ($size,$type,$empty) = @_;
my (@data);
- return ('','') if ! defined $size;
+ $type ||= '';
+ $empty ||= '';
+ return $empty if !defined $size;
if (!is_numeric($size)){
$data[0] = $size;
$data[1] = '';
@@ -5609,167 +6560,271 @@ sub get_size {
$data[0] = sprintf("%.0f",$size);
$data[1] = 'KiB';
}
- $data[0] = int($data[0]) if $b_int && $data[0];
- return @data;
+ $data[0] += 0 if $data[1]; # trim trailing 0s
+ # note: perl throws strict error if you try to convert string to int
+ # $data[0] = int($data[0]) if $b_int && $data[0];
+ if ($type eq 'string'){
+ return ($data[1]) ? join(' ', @data) : $size;
+ }
+ else {
+ return @data;
+ }
}
# not used, but keeping logic for now
sub increment_starters {
my ($key,$indexes) = @_;
my $result = $key;
- if (defined $$indexes{$key} ){
- $$indexes{$key}++;
- $result = "$key-$$indexes{$key}";
+ if (defined $indexes->{$key}){
+ $indexes->{$key}++;
+ $result = "$key-$indexes->{$key}";
}
return $result;
}
-sub pci_cleaner {
- my ($string,$type) = @_;
- #print "st1 $type:$string\n";
- my $filter = 'compatible\scontroller|\b(device|controller|connection|multimedia)\b|\([^)]+\)';
- # \[[^\]]+\]$| not trimming off ending [...] initial type filters removes end
- $filter = '\[[^\]]+\]$|' . $filter if $type eq 'pci';
- $string =~ s/$filter//ig;
- $string =~ s/\s\s+/ /g;
- $string =~ s/^\s+|\s+$//g;
- #print "st2 $type:$string\n";
- $string = remove_duplicates($string) if $string;
- return $string;
-}
-sub pci_cleaner_subsystem {
- my ($string) = @_;
- # we only need filters for features that might use vendor, -AGN
- my $filter = 'adapter|(hd\s)?audio|definition|desktop|ethernet|gigabit|graphics|';
- $filter .= 'hdmi(\/[\S]+)?|high|integrated|motherboard|network|onboard|';
- $filter .= 'raid|pci\s?express';
- $string =~ s/\b($filter)\b//gi;
- $string =~ s/\s\s+/ /g;
- $string =~ s/^\s+|\s+$//g;
- return $string;
-}
-
-sub pci_long_filter {
- my ($string) = @_;
- if ($string =~ /\[AMD(\/ATI)?\]/){
- $string =~ s/Advanced\sMicro\sDevices\s\[AMD(\/ATI)?\]/AMD/;
+sub make_line {
+ my $line = '';
+ foreach (0 .. $size{'max-cols-basic'} - 2){
+ $line .= '-';
}
- return $string;
+ return $line;
}
-# Use sparingly, but when we need regex type stuff
-# stripped out for reliable string compares, it's better.
-# sometimes the pattern comes from unknown strings
-# which can contain regex characters, get rid of those
-sub regex_cleaner {
- my ($string) = @_;
- return if ! $string;
- $string =~ s/(\{|\}|\(|\)|\[|\]|\|)/ /g;
- $string =~ s/\s\s+/ /g;
- $string =~ s/^\s+|\s+$//g;
- return $string;
+# Takes an array ref, creates value ref, comma separated, with ','/', '
+# depending on assigned max list value length.
+# args: 0: array ref; 1: value result ref; 2: [separator]; 3: [sort];
+# 4: [N/A value, if missing, return undef]
+sub make_list_value {
+ my $sep = $_[2];
+ $sep ||= ',';
+ if (!defined $_[0] || !@{$_[0]}){
+ ${$_[1]} = $_[4] if $_[4];
+ return;
+ }
+ # note: printer only wraps if value 'word' count > 2, and trick with quoting
+ # array includes 1 white space between values
+ if (scalar @{$_[0]} > 2 && length("@{$_[0]}") > $size{'max-join-list'}){
+ $sep .= ' ';
+ }
+ @{$_[0]} = sort {"\L$a" cmp "\L$b"} @{$_[0]} if $_[3] && $_[3] eq 'sort';
+ ${$_[1]} = join($sep,@{$_[0]});
}
-sub row_defaults {
- my ($type,$id) = @_;
+# args: 0: type; 1: info [optional]; 2: info [optional]
+sub message {
+ my ($type,$id,$id2) = @_;
$id ||= '';
- my %unfound = (
+ $id2 ||= '';
+ my %message = (
'arm-cpu-f' => 'Use -f option to see features',
- 'arm-pci' => "No ARM data found for this feature.",
- 'battery-data' => "No system battery data found. Is one present?",
- 'battery-data-sys' => "No /sys data found.",
- 'cpu-bugs-null' => "No CPU vulnerability/bugs data available.",
- 'cpu-model-null' => "Model N/A",
- 'cpu-speeds' => "No speed data found for $id cores.",
- 'darwin-feature' => "Feature not supported iu Darwin/OSX.",
- 'disk-data-bsd' => "No disk data found for this BSD system.",
- 'disk-data' => "No Disk data was found.",
- 'disk-size-0' => "Total N/A",
- 'display-console' => 'No advanced graphics data found on this system in console.',
- 'display-driver-na' => "display driver n/a",
- 'display-null' => 'No advanced graphics data found on this system.',
- 'display-root' => 'Advanced graphics data unavailable in console for root.',
- 'display-root-x' => 'Advanced graphics data unavailable for root.',
- 'display-server' => "No display server data found. Headless machine?",
- 'glxinfo-missing' => "Unable to show advanced data. Required tool glxinfo missing.",
- 'gl-empty' => 'Unset. Missing GL driver?',
- 'display-try' => 'Advanced graphics data unavailable in console. Try -G --display',
+ 'audio-server-on-pipewire-pulse' => 'off (using pipewire-pulse)',
+ 'audio-server-process-on' => 'active (process)',
+ 'audio-server-root-na' => 'n/a (root, process)',
+ 'audio-server-root-on' => 'active (root, process)',
+ 'battery-data' => 'No system battery data found. Is one present?',
+ 'battery-data-bsd' => 'No battery data found. Try with --dmidecode',
+ 'battery-data-sys' => 'No /sys data found.',
+ 'bluetooth-data' => 'No bluetooth data found.',
+ 'bluetooth-down' => "tool can't run",
+ 'cpu-bugs-null' => 'No CPU vulnerability/bugs data available.',
+ 'cpu-model-null' => 'Model N/A',
+ 'cpu-speeds' => 'No per core speed data found.',
+ 'cpu-speeds-bsd' => 'No OS support for core speeds.',
+ 'darwin-feature' => 'Feature not supported iu Darwin/OSX.',
'dev' => 'Feature under development',
+ 'device-data' => 'No device data found.',
+ 'disk-data' => 'No disk data found.',
+ 'disk-data-bsd' => 'No disk data found.',
+ 'disk-size-0' => 'Total N/A',
+ 'display-driver-na' => 'X driver n/a', # legacy, leave for now
+ 'display-driver-na-try-root' => 'X driver n/a, try sudo/root',
+ 'display-server' => 'No display server data found. Headless machine?',
'dmesg-boot-permissions' => 'dmesg.boot permissions',
'dmesg-boot-missing' => 'dmesg.boot not found',
+ 'dmidecode-dev-mem' => 'dmidecode is not allowed to read /dev/mem',
+ 'dmidecode-smbios' => 'No SMBIOS data for dmidecode to process',
+ 'edid-revision' => "invalid EDID revision: $id",
+ 'edid-sync' => "bad sync value: $id",
+ 'edid-version' => "invalid EDID version: $id",
+ 'egl-missing' => 'EGL data requires eglinfo. Check --recommends.',
+ 'egl-missing-console' => 'EGL data unavailable in console, eglinfo missing.',
+ 'egl-null' => 'No EGL data available.',
+ 'file-unreadable' => 'File not readable (permissions?)',
+ 'gfx-api' => 'No display API data available.',
+ 'gfx-api-console' => 'No API data available in console. Headless machine?',
+ 'glx-console-root' => 'GL data unavailable in console for root.',
+ 'glx-console-try' => 'GL data unavailable in console. Try -G --display',
+ 'glx-display-root' => 'GL data unavailable for root.',
+ 'glx-egl' => 'incomplete (EGL sourced)',
+ 'glx-egl-console' => 'console (EGL sourced)',
+ 'glx-egl-missing' => 'glxinfo missing (EGL sourced)',
+ 'glx-missing' => 'Unable to show GL data. glxinfo is missing.',
+ 'glx-missing-console' => 'GL data unavailable in console, glxinfo missing.',
+ 'glx-null' => 'No GL data available.',
+ 'glx-value-empty' => 'Unset. Missing GL driver?',
'IP' => "No $id found. Connected to web? SSL issues?",
'IP-dig' => "No $id found. Connected to web? SSL issues? Try --no-dig",
- 'machine-data' => "No machine data: try newer kernel.",
- 'machine-data-bsd' => "No machine data: Is dmidecode installed? Try -M --dmidecode.",
- 'machine-data-dmidecode' => "No machine data: try newer kernel. Is dmidecode installed? Try -M --dmidecode.",
- 'machine-data-force-dmidecode' => "No machine data: try newer kernel. Is dmidecode installed? Try -M --dmidecode.",
- 'mips-pci' => "No MIPS data found for this feature.",
- 'optical-data' => "No Optical or Floppy data was found.",
- 'optical-data-bsd' => "No floppy or optical data found for this BSD system.",
+ 'IP-no-dig' => "No $id found. Connected to web? SSL issues? Try enabling dig",
+ 'logical-data' => 'No logical block device data found.',
+ 'logical-data-bsd' => "Logical block device feature unsupported in $id.",
+ 'machine-data' => 'No machine data: try newer kernel.',
+ 'machine-data-bsd' => 'No machine data: Is dmidecode installed? Try -M --dmidecode.',
+ 'machine-data-dmidecode' => 'No machine data: try newer kernel. Is dmidecode installed? Try -M --dmidecode.',
+ 'machine-data-force-dmidecode' => 'No machine data: try newer kernel. Is dmidecode installed? Try -M --dmidecode.',
+ 'machine-data-fruid' => 'No machine data: Is fruid_print installed?',
+ 'monitor-console' => 'N/A in console',
+ 'monitor-id' => 'not-matched',
+ 'monitor-na' => 'N/A',
+ 'monitor-wayland' => 'no compositor data',
+ 'network-services' => 'No services found.',
+ 'note-check' => 'check',
+ 'note-est' => 'est.',
+ 'note-not-reliable' => 'not reliable',
+ 'nv-current' => "current (as of $id)",
+ 'nv-current-eol' => "current (as of $id; EOL~$id2)",
+ 'nv-legacy-active' => "legacy-active (EOL~$id)",
+ 'nv-legacy-eol' => "legacy (EOL~$id)",
+ 'optical-data' => 'No optical or floppy data found.',
+ 'optical-data-bsd' => 'No optical or floppy data found.',
+ 'output-control' => "-:: 'Enter' to continue to next block. Any key + 'Enter' to exit:",
+ 'output-control-exit' => 'Exiting output. Have a nice day.',
'output-limit' => "Output throttled. IPs: $id; Limit: $limit; Override: --limit [1-x;-1 all]",
- 'packages' => 'No packages detected. Unsupported package manager?',
- 'partition-data' => "No Partition data was found.",
- 'partition-hidden' => "N/A (hidden?)",
- 'pci-advanced-data' => 'bus/chip ids unavailable',
- 'pci-card-data' => "No Device data found.",
- 'pci-card-data-root' => "Device data requires root.",
- 'pci-slot-data' => "No PCI slot data found.",
- 'ps-data-null' => "No Process data available.",
- 'raid-data' => "No RAID data was found.",
- 'ram-data' => "No RAM data was found.",
- 'root-required' => "<superuser/root required>",
- 'root-suggested' => "try sudo/root",
- 'sensors-data-ipmi' => "No ipmi sensors data was found.",
- 'sensors-data-linux' => "No sensors data was found. Is sensors configured?",
- 'sensors-ipmi-root' => "Unable to run ipmi sensors. Root privileges required.",
- 'smartctl-command-failed' => "A mandatory SMART command failed. Various possible causes.",
- 'smartctl-root' => "Unable to run smartctl. Root privileges required.",
- 'smartctl-udma-crc' => "Bad cable/connection?",
- 'smartctl-usb' => "Unknown USB bridge. Flash drive/Unsupported enclosure?",
- 'smartctl-unknown' => "Unknown smartctl error. Unable to get data.",
- 'swap-admin' => "No admin swap data available.",
- 'swap-data' => "No Swap data was found.",
- 'tool-missing' => "<missing $id>",
- 'unmounted-data' => "No unmounted partitions found.",
- 'unmounted-data-bsd' => "No unmounted partition data found for this BSD system.",
- 'unmounted-file' => "No /proc/partitions file found.",
- 'usb-data' => "No USB data was found. Server?",
- 'unknown-desktop-version' => "ERR-101",
- 'unknown-dev' => "ERR-102",
- 'unknown-shell' => "ERR-100",
+ 'package-data' => 'No packages detected. Unsupported package manager?',
+ 'partition-data' => 'No partition data found.',
+ 'partition-hidden' => 'N/A (hidden?)',
+ 'pci-advanced-data' => 'bus/chip ids n/a',
+ 'pci-card-data' => 'No PCI device data found.',
+ 'pci-card-data-root' => 'PCI device data requires root.',
+ 'pci-slot-data' => 'No PCI Slot data found.',
+ 'pm-disabled' => "see --$id",
+ 'ps-data-null' => 'No process data available.',
+ 'raid-data' => 'No RAID data found.',
+ 'ram-data' => "No RAM data found using $id.",
+ 'ram-data-complete' => 'For complete report, try with --dmidecode',
+ 'ram-data-dmidecode' => 'No RAM data found. Try with --dmidecode',
+ 'ram-no-module' => 'no module installed',
+ 'ram-udevadm' => 'For most reliable report, use superuser + dmidecode.',
+ 'ram-udevadm-root' => 'For most reliable report, install dmidecode.',
+ 'ram-udevadm-version' => "Installed udevadm v$id. Requires >= 249. Try root?",
+ 'recommends' => 'see --recommends',
+ 'repo-data', "No repo data detected. Does $self_name support your package manager?",
+ 'repo-data-bsd', "No repo data detected. Does $self_name support $id?",
+ 'risc-pci' => 'No ' . uc($id) . ' data found for this feature.',
+ 'root-feature' => 'Feature requires superuser permissions.',
+ 'root-item-incomplete' => "Full $id report requires superuser permissions.",
+ 'root-required' => '<superuser required>',
+ 'root-suggested' => 'try sudo/root',# gdm only
+ 'screen-wayland' => 'no compositor data',
+ 'screen-tinyx' => "no X$id data",
+ 'sensor-data-bsd' => "$id sensor data found but not usable.",
+ 'sensor-data-bsd-ok' => 'No sensor data found. Are data sources present?',
+ 'sensor-data-bsd-unsupported' => 'Sensor data not available. Unsupported BSD variant.',
+ 'sensor-data-ipmi' => 'No ipmi sensor data found.',
+ 'sensor-data-ipmi-root' => 'Unable to run ipmi sensors. Root privileges required.',
+ 'sensors-data-linux' => 'No sensor data found. Missing /sys/class/hwmon, lm-sensors.',
+ 'sensor-data-lm-sensors' => 'No sensor data found. Is lm-sensors configured?',
+ 'sensor-data-sys' => 'No sensor data found in /sys/class/hwmon.',
+ 'sensor-data-sys-lm' => 'No sensor data found using /sys/class/hwmon or lm-sensors.',
+ 'smartctl-command' => 'A mandatory SMART command failed. Various possible causes.',
+ 'smartctl-open' => 'Unable to open device. Wrong device ID given?',
+ 'smartctl-udma-crc' => 'Bad cable/connection?',
+ 'smartctl-usb' => 'Unknown USB bridge. Flash drive/Unsupported enclosure?',
+ 'stopped' => 'stopped',
+ 'swap-admin' => 'No admin swap data available.',
+ 'swap-data' => 'No swap data was found.',
+ 'tool-missing-basic' => "<missing: $id>",
+ 'tool-missing-incomplete' => "Missing system tool: $id. Output will be incomplete",
+ 'tool-missing-os' => "No OS support. Is a comparable $id tool available?",
+ 'tool-missing-recommends' => "Required tool $id not installed. Check --recommends",
+ 'tool-missing-required' => "Required program $id not available",
+ 'tool-permissions' => "Unable to run $id. Root privileges required.",
+ 'tool-present' => 'Present and working',
+ 'tool-unknown-error' => "Unknown $id error. Unable to generate data.",
+ 'tools-missing' => "This feature requires one of these tools: $id",
+ 'tools-missing-bsd' => "This feature requires one of these tools: $id",
+ 'undefined' => '<undefined>',
+ 'unmounted-data' => 'No unmounted partitions found.',
+ 'unmounted-data-bsd' => "Unmounted partition feature unsupported in $id.",
+ 'unmounted-file' => 'No /proc/partitions file found.',
+ 'unsupported' => '<unsupported>',
+ 'usb-data' => 'No USB data found. Server?',
+ 'usb-mode-mismatch' => '<unknown rev+speed>',
+ 'unknown-cpu-topology' => 'ERR-103',
+ 'unknown-desktop-version' => 'ERR-101',
+ 'unknown-dev' => 'ERR-102',
+ 'unknown-device-id' => 'unknown device ID',
+ 'unknown-shell' => 'ERR-100',
+ 'vulkan-missing' => 'Unable to show Vulkan data. vulkaninfo is missing.', # not used yet
+ 'vulkan-null' => 'No Vulkan data available.',
'weather-error' => "Error: $id",
'weather-null' => "No $id found. Internet connection working?",
- 'xdpyinfo-missing' => '<xdpyinfo missing>',
+ 'xvesa-null' => 'No Xvesa VBE/GOP data found.',
);
- return $unfound{$type};
+ return $message{$type};
}
-# convert string passed to KB, based on GB/MB/TB id
-# NOTE: K 1024 KB 1000
+# args: 0: string of range types (2-5; 3 4; 3,4,2-12) to generate single regex
+# string for
+sub regex_range {
+ return if ! defined $_[0];
+ my @processed;
+ foreach my $item (split(/[,\s]+/,$_[0])){
+ if ($item =~ /(\d+)-(\d+)/){
+ $item = join('|',($1..$2));
+ }
+ push(@processed,$item);
+ }
+ return join('|',@processed);
+}
+
+# Handles duplicates occuring anywhere in string
+sub remove_duplicates {
+ my ($string) = @_;
+ return if !$string;
+ my (%holder,@temp);
+ foreach (split(/\s+/, $string)){
+ if (!$holder{lc($_)}){
+ push(@temp, $_);
+ $holder{lc($_)} = 1;
+ }
+ }
+ $string = join(' ', @temp);
+ return $string;
+}
+
+# args: 0: string to turn to KiB integer value.
+# Convert string passed to KB, based on GB/MB/TB id
+# NOTE: 1 [K 1000; kB: 1000; KB 1024; KiB 1024] bytes
+# The logic will turn false MB to M for this tool
+# Hopefully one day sizes will all be in KiB type units
sub translate_size {
my ($working) = @_;
- my $size = 0;
- #print ":$working:\n";
- return if ! defined $working;
- my $math = ( $working =~ /B$/) ? 1000: 1024;
- if ( $working =~ /^([0-9\.]+)\s*M[B]?$/i){
+ my ($size,$unit) = (0,'');
+ # print ":$working:\n";
+ return if !defined $working;
+ my $math = ($working =~ /B$/) ? 1000: 1024;
+ if ($working =~ /^([0-9\.]+)\s*([kKMGTPE])i?B?$/i){
+ $size = $1;
+ $unit = uc($2);
+ }
+ if ($unit eq 'K'){
+ $size = $1;
+ }
+ elsif ($unit eq 'M'){
$size = $1 * $math;
}
- elsif ( $working =~ /^([0-9\.]+)\s*G[B]?$/i){
+ elsif ($unit eq 'G'){
$size = $1 * $math**2;
}
- elsif ( $working =~ /^([0-9\.]+)\s*T[B]?$/i){
+ elsif ($unit eq 'T'){
$size = $1 * $math**3;
}
- elsif ( $working =~ /^([0-9\.]+)\s*P[B]?$/i){
+ elsif ($unit eq 'P'){
$size = $1 * $math**4;
}
- elsif ( $working =~ /^([0-9\.]+)\s*E[B]?$/i){
+ elsif ($unit eq 'E'){
$size = $1 * $math**5;
}
- elsif ( $working =~ /^([0-9\.]+)\s*[kK][B]?$/i){
- $size = $1;
- }
$size = int($size) if $size;
return $size;
}
@@ -5789,39 +6844,42 @@ sub check_output_path {
return $b_good;
}
+# Passing along hash ref
sub output_handler {
- my (%data) = @_;
+ my ($data) = @_;
# print Dumper \%data;
if ($output_type eq 'screen'){
- print_data(%data);
+ print_data($data);
}
elsif ($output_type eq 'json'){
- generate_json(%data);
+ generate_json($data);
}
elsif ($output_type eq 'xml'){
- generate_xml(%data);
+ generate_xml($data);
}
}
+# Passing along hash ref
# NOTE: file has already been set and directory verified
sub generate_json {
eval $start if $b_log;
- my (%data) = @_;
+ my ($data) = @_;
my ($json);
- my $b_debug = 1;
+ my $b_debug = 0;
my ($b_cpanel,$b_valid);
error_handler('not-in-irc', 'help') if $b_irc;
- #print Dumper \%data if $b_debug;
- if (check_module('Cpanel::JSON::XS')){
- import Cpanel::JSON::XS;
- $json = Cpanel::JSON::XS::encode_json(\%data);
- }
- elsif (check_module('JSON::XS')){
- import JSON::XS;
- $json = JSON::XS::encode_json(\%data);
+ print Dumper $data if $b_debug;
+ load_json() if !$loaded{'json'};
+ print Data::Dumper::Dumper $use{'json'} if $b_debug;
+ if ($use{'json'}){
+ # ${$use{'json'}->{'new'}}->canonical(1);
+ # $json = ${$use{'json'}->{'new'}}->json_encode($data);
+ # ${$use{'json'}->{'new-json'}}->canonical(1);
+ # $json = ${$use{'json'}->{'new-json'}}->encode_json($data);
+ $json = &{$use{'json'}->{'encode'}}($data);
}
else {
- error_handler('required-module', 'json', 'Cpanel::JSON::XS OR JSON::XS');
+ error_handler('required-module', 'json', 'JSON::PP, Cpanel::JSON::XS or JSON::XS');
}
if ($json){
#$json =~ s/"[0-9]+#/"/g;
@@ -5845,14 +6903,14 @@ sub generate_json {
# least xml has some output now.
sub generate_xml {
eval $start if $b_log;
- my (%data) = @_;
+ my ($data) = @_;
my ($xml);
my $b_debug = 0;
error_handler('not-in-irc', 'help') if $b_irc;
- #print Dumper \%data if $b_debug;
- if (check_module('XML::Dumper')){
- import XML::Dumper;
- $xml = XML::Dumper::pl2xml(\%data);
+ # print Dumper $data if $b_debug;
+ if (check_perl_module('XML::Dumper')){
+ XML::Dumper->import;
+ $xml = XML::Dumper::pl2xml($data);
#$xml =~ s/"[0-9]+#/"/g;
if ($output_file eq 'print'){
print "$xml";
@@ -5875,114 +6933,131 @@ sub key {
return sprintf("%03d#%s#%s#%s", $_[0],$_[1],$_[2],$_[3]);
}
+sub output_control {
+ print message('output-control');
+ chomp(my $response = <STDIN>);
+ if (!$response){
+ $size{'lines'} = 1;
+ }
+ else {
+ print message('output-control-exit'), "\n";
+ exit 0;
+ }
+}
+
sub print_basic {
- my (@data) = @_;
+ my ($data) = @_;
my $indent = 18;
my $indent_static = 18;
my $indent1_static = 5;
my $indent2_static = 8;
my $indent1 = 5;
my $indent2 = 8;
- my $length = @data;
- my ($start,$aref,$i,$j,$line);
-
- if ( $size{'max'} > 110 ){
+ my $length = @$data;
+ my ($start,$i,$j,$line);
+ my $width = $size{'max-cols-basic'};
+ if ($width > 110){
$indent_static = 22;
}
- elsif ($size{'max'} < 90 ){
+ elsif ($width < 90){
$indent_static = 15;
}
# print $length . "\n";
- for my $i (0 .. $#data){
- $aref = $data[$i];
- #print "0: $data[$i][0]\n";
- if ($data[$i][0] == 0 ){
+ for my $i (0 .. $#$data){
+ # print "0: $data->[$i][0]\n";
+ if ($data->[$i][0] == 0){
$indent = 0;
$indent1 = 0;
$indent2 = 0;
}
- elsif ($data[$i][0] == 1 ){
+ elsif ($data->[$i][0] == 1){
$indent = $indent_static;
$indent1 = $indent1_static;
$indent2= $indent2_static;
}
- elsif ($data[$i][0] == 2 ){
- $indent = ( $indent_static + 7 );
- $indent1 = ( $indent_static + 5 );
+ elsif ($data->[$i][0] == 2){
+ $indent = ($indent_static + 7);
+ $indent1 = ($indent_static + 5);
$indent2 = 0;
}
- $data[$i][3] =~ s/\n/ /g;
- $data[$i][3] =~ s/\s+/ /g;
- if ($data[$i][1] && $data[$i][2]){
- $data[$i][1] = $data[$i][1] . ', ';
+ $data->[$i][3] =~ s/\n/ /g;
+ $data->[$i][3] =~ s/\s+/ /g;
+ if ($data->[$i][1] && $data->[$i][2]){
+ $data->[$i][1] = $data->[$i][1] . ', ';
}
- $start = sprintf("%${indent1}s%-${indent2}s",$data[$i][1],$data[$i][2]);
- if ($indent > 1 && ( length($start) > ( $indent - 1) ) ){
+ $start = sprintf("%${indent1}s%-${indent2}s",$data->[$i][1],$data->[$i][2]);
+ if ($indent > 1 && (length($start) > ($indent - 1))){
$line = sprintf("%-${indent}s\n", "$start");
print_line($line);
$start = '';
- #print "1-print.\n";
+ # print "1-print.\n";
}
- if ( ( $indent + length($data[$i][3]) ) < $size{'max'} ){
- $data[$i][3] =~ s/\^/ /g;
- $line = sprintf("%-${indent}s%s\n", "$start", $data[$i][3]);
+ if (($indent + length($data->[$i][3])) < $width){
+ $data->[$i][3] =~ s/\^/ /g;
+ $line = sprintf("%-${indent}s%s\n", "$start", $data->[$i][3]);
print_line($line);
- #print "2-print.\n";
+ # print "2-print.\n";
}
else {
my $holder = '';
my $sep = ' ';
- foreach my $word (split / /, $data[$i][3]){
- #print "$word\n";
- if ( ( $indent + length($holder) + length($word) ) < $size{'max'} ) {
+ # note: special case, split ' ' trims leading, trailing spaces,
+ # then splits like awk, on one or more white spaces.
+ foreach my $word (split(' ', $data->[$i][3])){
+ # print "$word\n";
+ if (($indent + length($holder) + length($word)) < $width){
$word =~ s/\^/ /g;
$holder .= $word . $sep;
- #print "3-hold.\n";
+ # print "3-hold.\n";
}
- #elsif ( ( $indent + length($holder) + length($word) ) >= $size{'max'}){
+ # elsif (($indent + length($holder) + length($word)) >= $width){
else {
$line = sprintf("%-${indent}s%s\n", "$start", $holder);
print_line($line);
$start = '';
$word =~ s/\^/ /g;
$holder = $word . $sep;
- #print "4-print-hold.\n";
+ # print "4-print-hold.\n";
}
}
if ($holder !~ /^[ ]*$/){
$line = sprintf("%-${indent}s%s\n", "$start", $holder);
print_line($line);
- #print "5-print-last.\n";
+ # print "5-print-last.\n";
}
}
}
}
-# this has to get a hash of hashes, at least for now.
-# because perl does not retain insertion order, I use a prefix for each
-# hash key to force sorts.
+# This has to get a hash of hashes, at least for now. Because perl does not
+# retain insertion order, I use a prefix for each hash key to force sorts.
sub print_data {
- my (%data) = @_;
- my ($array,$counter,$length,$split_count) = (0,0,0,0);
- my ($hash_id,$holder,$start,$start2,$start_holder) = ('','','','','');
+ my ($data) = @_;
+ my ($counter,$length,$split_count) = (0,0,0);
+ my ($hash_id,$holder,$holder2,$start,$start2,$start_holder) = ('','','','','','');
my $indent = $size{'indent'};
- my (@temp,@working,@values,%ids,%row);
- my ($holder2,$key,$line,$val2,$val3);
+ my (%ids);
+ my ($b_container,$b_ni2,$key,$line,$val2,$val3);
# these 2 sets are single logic items
- my $b_single = ($size{'max'} == 1) ? 1: 0;
- my ($b_container,$indent_use,$indentx) = (0,0,0);
- # $size{'max'} = 88;
+ my $b_single = ($size{'max-cols'} == 1) ? 1: 0;
+ my ($b_row1,$indent_2,$indent_use,$indentx) = (1,0,0,0);
+ # $size{'max-cols'} = 88;
# NOTE: indent < 11 would break the output badly in some cases
- if ($size{'max'} < $size{'indent-min'} || $size{'indent'} < 11 ){
- $indent = 2;
- }
- #foreach my $key1 (sort { (split/#/, $a)[0] <=> (split/#/, $b)[0] } keys %data) {
- foreach my $key1 (sort { substr($a,0,3) <=> substr($b,0,3) } keys %data) {
- #foreach my $key1 (sort { $a cmp $b } keys %data) {
- $key = (split/#/, $key1)[3];
- if ($key ne 'SHORT' ) {
+ if ($size{'max-cols'} < $size{'max-wrap'} || $size{'indent'} < 11){
+ $indent = $size{'indents'};
+ }
+ foreach my $key1 (sort { substr($a,0,3) <=> substr($b,0,3) } keys %$data){
+ $key = (split('#', $key1))[3];
+ $b_row1 = 1;
+ if ($key ne 'SHORT'){
$start = sprintf("$colors{'c1'}%-${indent}s$colors{'cn'}","$key$sep{'s1'}");
+ if ($use{'output-block'}){
+ output_control() if $use{'output-block'} > 1;
+ $use{'output-block'}++;
+ }
$start_holder = $key;
+ $indent_2 = $indent + $size{'indents'};
+ $b_ni2 = 0; # ($start_holder eq 'Info') ? 1 : 0;
if ($indent < 10){
$line = "$start\n";
print_line($line);
@@ -5993,8 +7068,7 @@ sub print_data {
else {
$indent = 0;
}
- next if ref($data{$key1}) ne 'ARRAY';
- # @working = @{$data{$key1}};
+ next if ref($data->{$key1}) ne 'ARRAY';
# Line starters that will be -x incremented always
# It's a tiny bit faster manually resetting rather than using for loop
%ids = (
@@ -6004,22 +7078,28 @@ sub print_data {
'Device' => 1,
'Floppy' => 1,
'Hardware' => 1, # hardware raid report
+ 'Hub' => 1,
'ID' => 1,
'IF-ID' => 1,
+ 'LV' => 1,
'Monitor' => 1,
'Optical' => 1,
'Screen' => 1,
+ 'Server' => 1, # was 'Sound Server'
'variant' => 1, # arm > 1 cpu type
);
- foreach my $val1 (@{$data{$key1}}){
- $indent_use = $length = $indent;
+ foreach my $val1 (@{$data->{$key1}}){
if (ref($val1) eq 'HASH'){
- #%row = %$val1;
- ($counter,$split_count) = (0,0);
- #foreach my $key2 (sort { (split/#/, $a)[0] <=> (split/#/, $b)[0] } keys %$val1){
- foreach my $key2 (sort { substr($a,0,3) <=> substr($b,0,3) } keys %$val1){
- #foreach my $key2 (sort { $a cmp $b } keys %$val1){
- ($hash_id,$b_container,$indentx,$key) = (split/#/, $key2);
+ if (!$b_single){
+ $indent_use = $length = ($b_row1 && $key !~ /^(Features)$/) ? $indent : $indent_2;
+ }
+ ($counter,$b_row1,$split_count) = (0,1,0);
+ foreach my $key2 (sort {substr($a,0,3) <=> substr($b,0,3)} keys %$val1){
+ ($hash_id,$b_container,$indentx,$key) = (split('#', $key2));
+ if (!$b_single){
+ $indent_use = ($b_row1 || $b_ni2) ? $indent: $indent_2;
+ }
+ # print "m-1: r1: $b_row1 iu: $indent_use\n";
if ($start_holder eq 'Graphics' && $key eq 'Screen'){
$ids{'Monitor'} = 1;
}
@@ -6032,47 +7112,63 @@ sub print_data {
elsif ($start_holder eq 'USB' && $key eq 'Hub'){
$ids{'Device'} = 1;
}
+ elsif ($start_holder eq 'Logical' && $key eq 'Device'){
+ $ids{'LV'} = 1;
+ }
if ($counter == 0 && defined $ids{$key}){
$key .= '-' . $ids{$key}++;
}
- $val2 = $$val1{$key2};
+ $val2 = $val1->{$key2};
# we have to handle cases where $val2 is 0
if (!$b_single && $val2 || $val2 eq '0'){
$val2 .= " ";
}
- # see: Use of implicit split to @_ is deprecated. Only get this warning
- # in Perl 5.08 oddly enough.
- @temp = split/\s+/, $val2;
- $split_count = scalar @temp;
- if ( !$b_single && ( length( "$key$sep{'s2'} $val2" ) + $length ) < $size{'max'} ) {
- #print "one\n";
+ # See: Use of implicit split to @_ is deprecated. Only get this
+ # warning in Perl 5.08 oddly enough. ie, no: scalar (split(...));
+ my @values = split(/\s+/, $val2);
+ $split_count = scalar @values;
+ # print "sc: $split_count l: " . (length("$key$sep{'s2'} $val2") + $indent_use), " val2: $val2\n";
+ if (!$b_single &&
+ (length("$key$sep{'s2'} $val2") + $length) <= $size{'max-cols'}){
+ # print "h-1: r1: $b_row1 iu: $indent_use\n";
$length += length("$key$sep{'s2'} $val2");
$holder .= "$colors{'c1'}$key$sep{'s2'}$colors{'c2'} $val2";
}
- # handle case where the opening key/value pair is > max, and where
- # there are a lot of terms, like cpu flags, raid types supported. Raid
- # can have the last row have a lot of devices, or many raid types
- elsif ( !$b_single && ( length( "$key$sep{'s2'} $val2" ) + $indent ) > $size{'max'} &&
- !defined $ids{$key} && $split_count > 2 ) {
- #print "two\n";
- @values = split/\s+/, $val2;
+ # Handle case where the key/value pair is > max, and where there are
+ # a lot of terms, like cpu flags, raid types supported. Raid can have
+ # the last row have a lot of devices, or many raid types. But we don't
+ # want to wrap things like: 3.45 MiB (6.3%)
+ elsif (!$b_single && $split_count > 2 && length($val2) > 24 &&
+ !defined $ids{$key} &&
+ (length("$key$sep{'s2'} $val2") + $indent_use + $length) > $size{'max-cols'}){
+ # print "m-2 r1: $b_row1 iu: $indent_use\n";
$val3 = shift @values;
- # $length += length("$key$sep{'s2'} $val3 ") + $indent;
$start2 = "$colors{'c1'}$key$sep{'s2'}$colors{'c2'} $val3 ";
- $holder2 = '';
+ # Case where not first item in line, but when key+first word added,
+ # is wider than max width.
+ if ($holder &&
+ ($length + length("$key$sep{'s2'} $val3")) > $size{'max-cols'}){
+ # print "p-1a r1: $b_row1 iu: $indent_use\n";
+ $holder =~ s/\s+$//;
+ $line = sprintf("%-${indent_use}s%s$colors{'cn'}\n","$start","$holder");
+ print_line($line);
+ $b_row1 = 0;
+ $start = '';
+ $holder = '';
+ $length = $indent_use;
+ }
$length += length("$key$sep{'s2'} $val3 ");
# print scalar @values,"\n";
foreach (@values){
# my $l = (length("$_ ") + $length);
- #print "$l\n";
- if ( (length("$_ ") + $length) < $size{'max'} ){
- #print "three.1\n";
- #print "a\n";
+ # print "$l\n";
+ $indent_use = ($b_row1 || $b_ni2) ? $indent : $indent_2;
+ if ((length("$_ ") + $length) < $size{'max-cols'}){
+ # print "h-2: r1: $b_row1 iu: $indent_use\n";
+ # print "a\n";
if ($start2){
$holder2 .= "$start2$_ ";
$start2 = '';
- #$length += $length2;
- #$length2 = 0;
}
else {
$holder2 .= "$_ ";
@@ -6080,81 +7176,101 @@ sub print_data {
$length += length("$_ ");
}
else {
- #print "three.2\n";
+ # print "p-1b: r1: $b_row1 iu: $indent_use\n";
if ($start2){
$holder2 = "$start2$holder2";
}
else {
$holder2 = "$colors{'c2'}$holder2";
}
- #print "xx:$holder";
- $line = sprintf("%-${indent}s%s$colors{'cn'}\n","$start","$holder$holder2");
+ # print "xx:$holder";
+ $holder2 =~ s/\s+$//;
+ $line = sprintf("%-${indent_use}s%s$colors{'cn'}\n","$start","$holder$holder2");
print_line($line);
+ # make sure wrapped value is indented correctly!
+ $b_row1 = 0;
+ $indent_use = ($b_row1) ? $indent : $indent_2;
$holder = '';
$holder2 = "$_ ";
- #print "h2: $holder2\n";
- $length = length($holder2) + $indent;
+ # print "h2: $holder2\n";
+ $length = length($holder2) + $indent_use;
$start2 = '';
$start = '';
- #$length2 = 0;
}
}
+ # We don't want to start a new line, continue until full length.
if ($holder2 !~ /^\s*$/){
- #print "four\n";
+ # print "p-2: r1: $b_row1 iu: $indent_use\n";
$holder2 = "$colors{'c2'}$holder2";
- $line = sprintf("%-${indent}s%s$colors{'cn'}\n","$start","$holder$holder2");
- print_line($line);
- $holder = '';
+ $holder = $holder2;
+ $b_row1 = 0;
$holder2 = '';
- $length = $indent;
$start2 = '';
$start = '';
- #$length2 = 0;
}
}
# NOTE: only these and the last fallback are used for b_single output
else {
- #print "H: $counter " . scalar %$val1 . " $indent3 $indent2\n";
if ($holder){
- #print "five\n";
+ # print "p-3: r1: $b_row1 iu: $indent_use\n";
+ $holder =~ s/\s+$//;
$line = sprintf("%-${indent_use}s%s$colors{'cn'}\n",$start,"$holder");
$length = length("$key$sep{'s2'} $val2") + $indent_use;
print_line($line);
+ $b_row1 = 0;
$start = '';
}
else {
- #print "six\n";
+ # print "h-3a: r1: $b_row1 iu: $indent_use\n";
$length = $indent_use;
- #$holder = '';
+ }
+ if ($b_single){
+ $indent_use = ($indent * $indentx);
+ }
+ else {
+ $indent_use = ($b_row1 || $b_ni2) ? $indent: $indent_2;
}
$holder = "$colors{'c1'}$key$sep{'s2'}$colors{'c2'} $val2";
+ # print "h-3b: r1: $b_row1 iu: $indent_use\n";
}
$counter++;
- $indent_use = ($indent * $indentx) if $b_single;
}
if ($holder !~ /^\s*$/){
- #print "seven\n";
+ # print "p-4: r1: $b_row1 iu: $indent_use\n";
+ $holder =~ s/\s+$//;
$line = sprintf("%-${indent_use}s%s$colors{'cn'}\n",$start,"$start2$holder");
print_line($line);
+ $b_row1 = 0;
$holder = '';
$length = 0;
$start = '';
}
}
- # only for repos currently
+ # Only for repos currently
elsif (ref($val1) eq 'ARRAY'){
- #print "eight\n";
- $array=0;
+ # print "p-5: r1: $b_row1 iu: $indent_use\n";
+ my $num = 0;
+ my ($l1,$l2);
+ $indent_use = $indent_2;
foreach my $item (@$val1){
- $array++;
- $indent_use = ($b_single) ? $indent + 2: $indent;
- $line = "$colors{'c1'}$array$sep{'s2'} $colors{'c2'}$item$colors{'cn'}";
+ $num++;
+ if ($size{'max-lines'}){
+ $l1 = length("$num$sep{'s2'} $item") + $indent_use;
+ # Cut down the line string until it's short enough to fit in term
+ if ($l1 > $size{'term-cols'}){
+ $l2 = length("$num$sep{'s2'} ") + $indent_use + 6;
+ # print "$l1 $size{'term-cols'} $l2 $num $indent_use\n";
+ $item = substr($item,0,$size{'term-cols'} - $l2) . '[...]';
+ }
+ }
+ $line = "$colors{'c1'}$num$sep{'s2'} $colors{'c2'}$item$colors{'cn'}";
$line = sprintf("%-${indent_use}s%s\n","","$line");
print_line($line);
}
+
}
}
- # we want a space between data blocks for single
+ # We want a space between data blocks for single
print_line("\n") if $b_single;
}
}
@@ -6165,444 +7281,832 @@ sub print_line {
$client{'konvi'} = 3;
$client{'dobject'} = 'Konversation';
}
- if ($client{'konvi'} == 1 && $client{'dcop'} ){
+ if ($client{'konvi'} == 1 && $client{'dcop'}){
# konvi doesn't seem to like \n characters, it just prints them literally
$line =~ s/\n//g;
#qx('dcop "$client{'dport'}" "$client{'dobject'}" say "$client{'dserver'}" "$client{'dtarget'}" "$line 1");
system('dcop', $client{'dport'}, $client{'dobject'}, 'say', $client{'dserver'}, $client{'dtarget'}, "$line 1");
}
- elsif ($client{'konvi'} == 3 && $client{'qdbus'} ){
+ elsif ($client{'konvi'} == 3 && $client{'qdbus'}){
# print $line;
$line =~ s/\n//g;
#qx(qdbus org.kde.konversation /irc say "$client{'dserver'}" "$client{'dtarget'}" "$line");
system('qdbus', 'org.kde.konversation', '/irc', 'say', $client{'dserver'}, $client{'dtarget'}, $line);
}
else {
+ # print "tl: $size{'term-lines'} ml: $size{'max-lines'} l:$size{'lines'}\n";
+ if ($size{'max-lines'}){
+ # -y1 + -Y can result in start of output scrolling off screen if terminal
+ # wrapped lines happen.
+ if ((($size{'max-lines'} >= $size{'term-lines'}) &&
+ $size{'max-lines'} == $size{'lines'}) ||
+ ($size{'max-lines'} < $size{'term-lines'} &&
+ $size{'max-lines'} + 1 == $size{'lines'})){
+ output_control();
+ }
+ }
print $line;
+ $size{'lines'}++ if $size{'max-lines'};
}
}
########################################################################
-#### DATA PROCESSORS
+#### ITEM PROCESSORS
########################################################################
#### -------------------------------------------------------------------
-#### PRIMARY DATA GENERATORS
+#### ITEM GENERATORS
#### -------------------------------------------------------------------
-## AudioData
+## AudioItem
{
-package AudioData;
+package AudioItem;
sub get {
eval $start if $b_log;
- my (@data,@rows);
+ my $rows = [];
my $num = 0;
- if (($b_arm || $b_mips) && !$b_soc_audio && !$b_pci_tool){
- my $type = ($b_arm) ? 'arm' : 'mips';
+ if (%risc && !$use{'soc-audio'} && !$use{'pci-tool'}){
my $key = 'Message';
- @data = ({
- main::key($num++,0,1,$key) => main::row_defaults($type . '-pci',''),
- },);
- @rows = (@rows,@data);
+ @$rows = ({
+ main::key($num++,0,1,$key) => main::message('risc-pci',$risc{'id'})
+ });
}
else {
- @data = card_data();
- @rows = (@rows,@data);
+ device_output($rows);
}
- if ( ( (($b_arm || $b_mips) && !$b_soc_audio && !$b_pci_tool) || !@rows ) &&
- (my $file = main::system_files('asound-cards') ) ){
- @data = asound_data($file);
- @rows = (@rows,@data);
+ if (((%risc && !$use{'soc-audio'} && !$use{'pci-tool'}) || !@$rows) &&
+ (my $file = $system_files{'asound-cards'})){
+ asound_output($rows,$file);
}
- @data = usb_data();
- @rows = (@rows,@data);
- if (!@rows){
+ usb_output($rows);
+ # note: for servers often no audio, so we don't care about pci specific
+ if (!@$rows){
my $key = 'Message';
- my $type = 'pci-card-data';
- if ($pci_tool && ${$alerts{$pci_tool}}{'action'} eq 'permissions'){
+ my $type = 'device-data';
+ if ($pci_tool && $alerts{$pci_tool}->{'action'} eq 'permissions'){
$type = 'pci-card-data-root';
}
- @data = ({
- main::key($num++,0,1,$key) => main::row_defaults($type,''),
- },);
- @rows = (@rows,@data);
+ @$rows = ({main::key($num++,0,1,$key) => main::message($type,'')});
}
- @data = sound_server_data();
- @rows = (@rows,@data);
+ sound_output($rows);
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub card_data {
+sub device_output {
eval $start if $b_log;
- my (@rows,@data);
+ return if !$devices{'audio'};
+ my $rows = $_[0];
my ($j,$num) = (0,1);
- foreach (@devices_audio){
+ foreach my $row (@{$devices{'audio'}}){
$num = 1;
- my @row = @$_;
- $j = scalar @rows;
- my $driver = $row[9];
+ $j = scalar @$rows;
+ my $driver = $row->[9];
$driver ||= 'N/A';
- my $card = $row[4];
- $card = ($card) ? main::pci_cleaner($card,'output') : 'N/A';
+ my $device = $row->[4];
+ $device = ($device) ? main::clean_pci($device,'output') : 'N/A';
# have seen absurdly verbose card descriptions, with non related data etc
- if (length($card) > 85 || $size{'max'} < 110){
- $card = main::pci_long_filter($card);
+ if (length($device) > 85 || $size{'max-cols'} < 110){
+ $device = main::filter_pci_long($device);
}
- @data = ({
- main::key($num++,1,1,'Device') => $card,
- },);
- @rows = (@rows,@data);
- if ($extra > 0 && $b_pci_tool && $row[12]){
- my $item = main::get_pci_vendor($row[4],$row[12]);
- $rows[$j]{main::key($num++,0,2,'vendor')} = $item if $item;
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $device,
+ });
+ if ($extra > 0 && $use{'pci-tool'} && $row->[12]){
+ my $item = main::get_pci_vendor($row->[4],$row->[12]);
+ $rows->[$j]{main::key($num++,0,2,'vendor')} = $item if $item;
}
- $rows[$j]{main::key($num++,1,2,'driver')} = $driver;
+ $rows->[$j]{main::key($num++,1,2,'driver')} = $driver;
if ($extra > 0 && !$bsd_type){
- if ($row[9] ){
- my $version = main::get_module_version($row[9]);
- $rows[$j]{main::key($num++,0,3,'v')} = $version if $version;
+ if ($row->[9]){
+ my $version = main::get_module_version($row->[9]);
+ $rows->[$j]{main::key($num++,0,3,'v')} = $version if $version;
}
}
- if ($b_admin && $row[10]){
- $row[10] = main::get_driver_modules($row[9],$row[10]);
- $rows[$j]{main::key($num++,0,3,'alternate')} = $row[10] if $row[10];
+ if ($b_admin && $row->[10]){
+ $row->[10] = main::get_driver_modules($row->[9],$row->[10]);
+ $rows->[$j]{main::key($num++,0,3,'alternate')} = $row->[10] if $row->[10];
}
if ($extra > 0){
- $rows[$j]{main::key($num++,0,2,'bus ID')} = (!$row[2] && !$row[3]) ? 'N/A' : "$row[2].$row[3]";
+ my $bus_id = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
+ if ($extra > 1 && $bus_id ne 'N/A'){
+ main::get_pcie_data($bus_id,$j,$rows,\$num);
+ }
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = $bus_id;
}
if ($extra > 1){
- my $chip_id = 'N/A';
- if ($row[5] && $row[6]){
- $chip_id = "$row[5]:$row[6]";
+ my $chip_id = main::get_chip_id($row->[5],$row->[6]);
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $chip_id;
+ if ($extra > 2 && $row->[1]){
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = $row->[1];
}
- elsif ($row[6]){
- $chip_id = $row[6];
- }
- $rows[$j]{main::key($num++,0,2,'chip ID')} = $chip_id;
}
- #print "$row[0]\n";
+ # print "$row->[0]\n";
}
- #my $ref = $pci[-1];
- #print $$ref[0],"\n";
eval $end if $b_log;
- return @rows;
}
+
# this handles fringe cases where there is no card on pcibus,
# but there is a card present. I don't know the exact architecture
# involved but I know this situation exists on at least one old machine.
-sub asound_data {
+sub asound_output {
eval $start if $b_log;
- my ($file) = @_;
- my (@asound,@rows,@data);
- my ($card,$driver,$j,$num) = ('','',0,1);
- @asound = main::reader($file);
+ my ($file,$rows) = @_;
+ my ($device,$driver,$j,$num) = ('','',0,1);
+ my @asound = main::reader($file);
foreach (@asound){
# filtering out modems and usb devices like webcams, this might get a
# usb audio card as well, this will take some trial and error
- if ( !/modem|usb/i && /^\s*[0-9]/ ) {
+ if (!/modem|usb/i && /^\s*[0-9]/){
$num = 1;
- my @working = split /:\s*/, $_;
+ my @working = split(/:\s*/, $_);
# now let's get 1 2
$working[1] =~ /(.*)\s+-\s+(.*)/;
- $card = $2;
+ $device = $2;
$driver = $1;
- if ( $card ){
- $j = scalar @rows;
+ if ($device){
+ $j = scalar @$rows;
$driver ||= 'N/A';
- @data = ({
- main::key($num++,1,1,'Device') => $card,
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $device,
main::key($num++,1,2,'driver') => $driver,
- },);
- @rows = (@rows,@data);
+ });
if ($extra > 0){
my $version = main::get_module_version($driver);
- $rows[$j]{main::key($num++,0,3,'v')} = $version if $version;
- $rows[$j]{main::key($num++,0,2,'message')} = main::row_defaults('pci-advanced-data','');
+ $rows->[$j]{main::key($num++,0,3,'v')} = $version if $version;
+ $rows->[$j]{main::key($num++,0,2,'message')} = main::message('pci-advanced-data','');
}
}
}
}
- # print Data::Dumper:Dumper \s@rows;
+ # print Data::Dumper:Dumper $rows;
eval $end if $b_log;
- return @rows;
}
-sub usb_data {
+
+sub usb_output {
eval $start if $b_log;
- my (@rows,@data,@ids,$driver,$path_id,$product,@temp2);
+ my $rows = $_[0];
+ my (@ids,$path_id,$product,@temp2);
my ($j,$num) = (0,1);
- if (-d '/proc/asound') {
- # note: this will double the data, but it's easier this way.
- # inxi tested for -L in the /proc/asound files, and used only those.
- my @files = main::globber('/proc/asound/*/usbid');
- foreach (@files){
- my $id = (main::reader($_))[0];
- push @ids, $id if ($id && ! grep {/$id/} @ids);
- }
- # lsusb is a very expensive operation
- if (@ids){
- if (!$bsd_type && !$b_usb_check){
- main::USBData::set();
+ return if !$usb{'audio'};
+ foreach my $row (@{$usb{'audio'}}){
+ $num = 1;
+ $j = scalar @$rows;
+ # make sure to reset, or second device trips last flag
+ ($path_id,$product) = ('','');
+ $product = main::clean($row->[13]) if $row->[13];
+ $product ||= 'N/A';
+ $row->[15] ||= 'N/A';
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $product,
+ main::key($num++,0,2,'driver') => $row->[15],
+ main::key($num++,1,2,'type') => 'USB',
+ });
+ if ($extra > 0){
+ # print "$j \n";
+ if ($extra > 1){
+ $row->[8] ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'rev')} = $row->[8];
+ if ($row->[17]){
+ $rows->[$j]{main::key($num++,0,3,'speed')} = $row->[17];
+ }
+ if ($row->[24]){
+ $rows->[$j]{main::key($num++,0,3,'lanes')} = $row->[24];
+ }
+ if ($b_admin && $row->[22]){
+ $rows->[$j]{main::key($num++,0,3,'mode')} = $row->[22];
+ }
}
- }
- main::log_data('dump','@ids',\@ids) if $b_log;
- return if !@usb;
- foreach my $id (@ids){
- $j = scalar @rows;
- foreach my $ref (@usb){
- my @row = @$ref;
- # a device will always be the second or > device on the bus
- if ($row[1] > 1 && $row[7] eq $id){
- $num = 1;
- # makre sure to reset, or second device trips last flag
- ($driver,$path_id,$product) = ('','','');
- $product = main::cleaner($row[13]) if $row[13];
- $driver = $row[15] if $row[15];
- $path_id = $row[2] if $row[2];
- $product ||= 'N/A';
- $driver ||= 'snd-usb-audio';
- @data = ({
- main::key($num++,1,1,'Device') => $product,
- main::key($num++,0,2,'type') => 'USB',
- main::key($num++,0,2,'driver') => $driver,
- },);
- @rows = (@rows,@data);
- if ($extra > 0){
- $rows[$j]{main::key($num++,0,2,'bus ID')} = "$path_id:$row[1]";
- }
- if ($extra > 1){
- $row[7] ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'chip ID')} = $row[7];
- }
- if ($extra > 2 && $row[16]){
- $rows[$j]{main::key($num++,0,2,'serial')} = main::apply_filter($row[16]);
- }
+ $path_id = $row->[2] if $row->[2];
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = "$path_id:$row->[1]";
+ if ($extra > 1){
+ $row->[7] ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $row->[7];
+ }
+ if ($extra > 2){
+ if (defined $row->[5] && $row->[5] ne ''){
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = "$row->[4]$row->[5]";
+ }
+ if ($row->[16]){
+ $rows->[$j]{main::key($num++,0,2,'serial')} = main::filter($row->[16]);
}
}
}
}
eval $end if $b_log;
- return @rows;
}
-sub sound_server_data {
+sub sound_output {
eval $start if $b_log;
- my (@data,$server,$version);
- my $num = 0;
- if (my $file = main::system_files('asound-version') ){
- my $content = (main::reader($file))[0];
- # some alsa strings have the build date in (...)
- # remove trailing . and remove possible second line if compiled by user
-# foreach (@content){
-# if (!/compile/i){
- #$_ =~ s/Advanced Linux Sound Architecture/ALSA/;
- $version = (split /\s+/, $content)[-1];
+ my $rows = $_[0];
+ my ($key,$program,$value);
+ my ($j,$num) = (0,0);
+ foreach my $server (@{sound_data()}){
+ next if $extra < 1 && (!$server->[3] || $server->[3] !~ /^(active|.*api)/);
+ $j = scalar @$rows;
+ $server->[2] ||= 'N/A';
+ $server->[3] ||= 'N/A';
+ push(@$rows, {
+ main::key($num++,1,1,$server->[0]) => $server->[1],
+ main::key($num++,0,2,'v') => $server->[2],
+ main::key($num++,0,2,'status') => $server->[3],
+ });
+ if ($extra > 1 && defined $server->[4] && ref $server->[4] eq 'ARRAY'){
+ my $b_multi = (scalar @{$server->[4]} > 1) ? 1: 0;
+ my $b_start;
+ my $k = 0;
+ foreach my $item (@{$server->[4]}){
+ if ($item->[2] eq 'daemon'){
+ $key = 'status';
+ $value = $item->[3];
+ }
+ else {
+ $key = 'type';
+ $value = $item->[2];
+ }
+ if (!$b_multi){
+ $rows->[$j]{main::key($num++,1,2,$item->[0])} = $item->[1];
+ $rows->[$j]{main::key($num++,0,3,$key)} = $value;
+ }
+ else {
+ $rows->[$j]{main::key($num++,1,2,$item->[0])} = '' if !$b_start;
+ $b_start = 1;
+ $k++;
+ $rows->[$j]{main::key($num++,1,3,$k)} = $item->[1];
+ $rows->[$j]{main::key($num++,0,4,$key)} = $value;
+ }
+ }
+ }
+ if ($b_admin){
+ # Let long lines wrap for high tool counts, but best avoid too many tools
+ my $join = (defined $server->[5] && length(join(',',@{$server->[5]})) > 40) ? ', ': ',';
+ my $val = (defined $server->[5]) ? join($join,@{$server->[5]}) : 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'tools')} = $val;
+ }
+ }
+ eval $end if $b_log;
+}
+
+# see docs/inxi-audio.txt for unused or alternate helpers/tools
+sub sound_data {
+ eval $start if $b_log;
+ my ($config,$helpers,$name,$program,$status,$test,$tools,$type,$version);
+ my $data = [];
+ ## API Types ##
+ # not yet, user lib: || main::globber('/usr/lib*{,/*}/libasound.so*')
+ # the config test is expensive but will only trigger on servers with no audio
+ # devices. Checks if kernel was compiled with SND_ items, even if no devices.
+ if (!$bsd_type && -r "/boot/config-$uname[2]"){
+ $config = "/boot/config-$uname[2]";
+ }
+ if ($system_files{'asound-version'} ||
+ ($config && (grep {/^CONFIG_SND_/} @{main::reader($config,'','ref')}))){
+ $name = 'ALSA';
+ $type = 'API';
+ # always true until find better test for inactive API test
+ if ($system_files{'asound-version'}){
+ # avoid possible second line if compiled by user
+ my $content = main::reader($system_files{'asound-version'},'',0);
+ # we want the string after driver version for old and new ALSA
+ # some alsa strings have the build date in (...) after Version
+ if ($content =~ /Driver Version (\S+)(\s|\.?$)/){
+ $version = $1;
$version =~ s/\.$//; # trim off period
- $server = 'ALSA';
-# }
-# }
- }
- elsif (my $program = main::check_program('oss')){
- $server = 'OSS';
- $version = main::program_version('oss','\S',2);
- $version ||= 'N/A';
- }
- if ($server){
- @data = ({
- main::key($num++,1,1,'Sound Server') => $server,
- main::key($num++,0,2,'v') => $version,
- },);
+ }
+ $status = 'kernel-api';
+ }
+ else {
+ $status = 'inactive';
+ $version = $uname[2];
+ $version =~ s/^k//; # avoid double kk possible result
+ $version = 'k' . $version;
+ }
+ if ($extra > 1){
+ $test = [['osspd','daemon'],['aoss','oss-emulator'],
+ ['apulse','pulse-emulator'],];
+ $helpers = sound_helpers($test);
+ }
+ if ($b_admin){
+ $test = [qw(alsactl alsamixer alsamixergui amixer)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ # sndstat file may be removed in linux oss, but ossinfo part of oss4-base
+ # alsa oss compat driver will create /dev/sndstat in linux however
+ # Note: kernel compile: SOUND_OSS
+ if ((-e '/dev/sndstat' && !$system_files{'asound-version'}) ||
+ main::check_program('ossinfo')){
+ $name = 'OSS';
+ # not a great test, but ok for now, check on current Linux, seems unlikely
+ # to find OSS on OpenBSD in general.
+ if ($bsd_type){
+ $status = (-e '/dev/sndstat') ? 'kernel-api' : 'inactive';
+ }
+ else {
+ $status = (-e '/dev/sndstat') ? 'active' : 'off?';
+ }
+ $type = 'API'; # not strictly an API on linux, but almost nobody uses it.
+ # not certain to be cross distro, Debian/Ubuntu at least.
+ if (-e '/etc/oss4/version.dat'){
+ $version = main::reader('/etc/oss4/version.dat','',0);
+ }
+ elsif ($sysctl{'audio'}){
+ $version = (grep {/^hw.snd.version:/} @{$sysctl{'audio'}})[0];
+ $version = (split(/:\s*/,$version),1)[1] if $version;
+ $version =~ s|/.*$|| if $version;
+ }
+ if ($extra > 1){
+ # virtual_oss freebsd, not verified; osspd-alsa/pulseaudio no path exec
+ $test = [['virtual_oss','daemon'],['virtual_equalizer','plugin']];
+ $helpers = sound_helpers($test);
+ }
+ if ($b_admin){
+ # *mixer are FreeBSD tools
+ $test = [qw(dsbmixer mixer ossctl ossinfo ossmix ossxmix vmixctl)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
}
+ if ($program = main::check_program('sndiod')){
+ if ($bsd_type){
+ push(@$data, ['API','sndio',undef,'sound-api',undef,undef]);
+ }
+ $name = 'sndiod';
+ # verified: accurate
+ $status = (grep {/sndiod/} @ps_cmd) ? 'active': 'off';
+ $type = 'Server';
+ # $version: no known method
+ if ($b_admin){
+ $test = [qw(aucat midicat mixerctl sndioctl)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ ## Servers ##
+ if ($program = main::check_program('artsd')){
+ ($name,$version) = ProgramData::full('arts',$program);
+ $status = (grep {/artsd/} @ps_cmd) ? 'active': 'off';
+ $type = 'Server';
+ if ($extra > 1){
+ $test = [['artswrapper','daemon'],];
+ $helpers = sound_helpers($test);
+ }
+ if ($b_admin){
+ $test = [qw(artsbuilder artsdsp)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ # pulseaudio-esound-compat has esd pointing to esdcompat
+ if (($program = main::check_program('esd')) &&
+ !main::check_program('esdcompat')){
+ ($name,$version) = ProgramData::full('esound',$program);
+ $status = (grep {/\besd\b/} @ps_cmd) ? 'active': 'off';
+ $type = 'Server';
+ # if ($extra > 1){
+ # $test = [['','daemon'],];
+ # $helpers = sound_helpers($test);
+ # }
+ if ($b_admin){
+ $test = [qw(esdcat esdctl esddsp)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ if ($program = main::check_program('jackd')){
+ ($name,$version) = ProgramData::full('jack',$program);
+ $status = jack_status();
+ $type = 'Server';
+ if ($extra > 1){
+ $test = [['a2jmidid','daemon'],['nsmd','daemon']];
+ $helpers = sound_helpers($test);
+ }
+ if ($b_admin){
+ $test = [qw(agordejo cadence jack_control jack_mixer qjackctl)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ if ($program = main::check_program('nasd')){
+ ($name,$version) = ProgramData::full('nas',$program);
+ $status = (grep {/(^|\/)nasd/} @ps_cmd) ? 'active': 'off';
+ $type = 'Server';
+ if ($extra > 1){
+ $test = [['audiooss','oss-compat'],];
+ $helpers = sound_helpers($test);
+ }
+ if ($b_admin){
+ $test = [qw(auctl auinfo)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ if ($program = main::check_program('pipewire')){
+ ($name,$version) = ProgramData::full('pipewire',$program);
+ $status = pipewire_status();
+ $type = 'Server';
+ if ($extra > 1){
+ # pipewire-alsa is a plugin, but is just some config files
+ $test = [['pipewire-pulse','daemon'],['pipewire-media-session','daemon'],
+ ['wireplumber','daemon'],
+ ['pipewire-alsa','plugin','/etc/alsa/conf.d/*-pipewire-default.conf'],
+ ['pw-jack','plugin']];
+ $helpers = sound_helpers($test);
+ }
+ if ($b_admin){
+ $test = [qw(pw-cat pw-cli wpctl)];
+ # note: pactl can be used w/pipewire-pulse;
+ if (!main::check_program('pulseaudio') &&
+ main::check_program('pipewire-pulse')){
+ splice(@$test,0,0,'pactl');
+ }
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ # note: pactl info/list/stat could be used
+ if ($program = main::check_program('pulseaudio')){
+ ($name,$version) = ProgramData::full('pulseaudio',$program);
+ $status = pulse_status($program);
+ $type = 'Server';
+ if ($extra > 1){
+ $test = [['pulseaudio-dlna','daemon'],
+ ['pulseaudio-alsa','plugin','/etc/alsa/conf.d/*-pulseaudio-default.conf'],
+ ['esdcompat','plugin'],
+ ['pulseaudio-jack','module','/usr/lib/pulse*/modules/module-jack-sink.so']];
+ $helpers = sound_helpers($test);
+ }
+ if ($b_admin){
+ $test = [qw(pacat pactl paman pamix pamixer pavucontrol pulsemixer)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ if ($program = main::check_program('roard')){
+ ($name,$version) = ProgramData::full('roaraudio',$program);# no version so far
+ $status = (grep {/roard/} @ps_cmd) ? 'active': 'off';
+ $type = 'Server';
+ if ($extra > 1){
+ $test = [['roarplaylistd','daemon'],['roarify','pulse/viff-emulation']];
+ $helpers = sound_helpers($test);
+ }
+ if ($b_admin){
+ $test = [qw(roarcat roarctl)];
+ $tools = sound_tools($test);
+ }
+ push(@$data,[$type,$name,$version,$status,$helpers,$tools]);
+ ($status,$version,$helpers,$tools) = ('','',undef,undef);
+ }
+ main::log_data('dump','sound data: @$data',$data) if $b_log;
+ print 'Sound data: ', Data::Dumper::Dumper $data if $dbg[26];
eval $end if $b_log;
- return @data;
+ return $data;
+}
+
+# assume if jackd running we have active jack, update if required
+sub jack_status {
+ eval $start if $b_log;
+ my $status;
+ if (grep {/jackd/} @ps_cmd){
+ if (my $program = main::check_program('jack_control')){
+ system("$program status > /dev/null 2>&1");
+ # 0 means running, always, else 1.
+ if ($? == 0){
+ $status = 'active';
+ }
+ else {
+ $status = ($b_root) ? main::message('audio-server-root-na') : 'off';
+ }
+ }
+ $status = main::message('audio-server-process-on') if !$status;
+ }
+ else {
+ $status = 'off';
+ }
+ eval $end if $b_log;
+ return $status;
+}
+
+# pipewire is complicated, it can be there and running without being active server
+# This is NOT verified as valid true/yes case!!
+sub pipewire_status {
+ eval $start if $b_log;
+ my ($b_process,$program,$status,@data);
+ if (grep {/(^|\/)pipewire(d|\s|:|$)/} @ps_cmd){
+ # note: if pipewire was stopped but not masked, pw-cli can start service so
+ # only use if pipewire process already running
+ if ($program = main::check_program('pw-cli')){
+ @data = qx($program ls 2>/dev/null);
+ main::log_data('dump','pw-cli @data', \@data) if $b_log;
+ print 'pw-cli: ', Data::Dumper::Dumper \@data if $dbg[52];
+ if (@data){
+ $status = (grep {/media\.class\s*=\s*"(Audio|Midi)/i} @data) ? 'active' : 'off';
+ }
+ elsif ($b_root){
+ $status = main::message('audio-server-root-na');
+ }
+ }
+ $status = main::message('audio-server-process-on') if !$status;
+ }
+ else {
+ $status = 'off';
+ }
+ eval $end if $b_log;
+ return $status;
+}
+
+# pulse might be running through pipewire
+sub pulse_status {
+ eval $start if $b_log;
+ my $program = $_[0];
+ my ($status,@data);
+ if (grep {/(^|\/)pulseaudiod?\b/} @ps_cmd){
+ # this is almost certainly not needed, but keep for now
+ system("$program --check > /dev/null 2>&1");
+ # 0 means running, always, other could be an error.
+ if ($? == 0){
+ $status = 'active';
+ }
+ else {
+ $status = ($b_root) ? main::message('audio-server-root-on') : 'off';
+ }
+ }
+ else {
+ # can't use pactl info test because starts pulseaudio/pipewire if unmasked
+ if (main::check_program('pipewire-pulse') &&
+ (grep {/(^|\/)pipewire-pulse/} @ps_cmd)){
+ $status = main::message('audio-server-on-pipewire-pulse');
+ }
+ else {
+ $status = 'off';
+ }
+ }
+ eval $end if $b_log;
+ return $status;
}
+
+sub sound_helpers {
+ eval $start if $b_log;
+ my $test = $_[0];
+ my ($helpers,$name,$status,$key);
+ foreach my $item (@$test){
+ if (main::check_program($item->[0]) ||
+ (defined $item->[2] && main::globber($item->[2]))){
+ $name = $item->[0];
+ $key = 'with';
+ # these are active/off daemons unless not a daemon
+ if ($item->[1] eq 'daemon'){
+ $status = (grep {/$item->[0]/} @ps_cmd) ? 'active':'off' ;
+ }
+ else {
+ $status = $item->[1];
+ }
+ push(@$helpers,[$key,$name,$item->[1],$status]);
+ }
+ }
+ # push(@$helpers, ['with','pipewire-pulse','daemon','active'],['with','pw-jack','plugin']);
+ # push(@$helpers, ['with','pipewire-pulse','daemon','active']);
+ eval $end if $b_log;
+ # print Data::Dumper::Dumper $helpers;
+ return $helpers;
}
-## BatteryData
+sub sound_tools {
+ eval $start if $b_log;
+ my $test = $_[0];
+ my $tools;
+ foreach my $item (@$test){
+ if (main::check_program($item)){
+ push(@$tools,$item);
+ }
+ }
+ eval $end if $b_log;
+ # print Data::Dumper::Dumper $tools;
+ return $tools;
+}
+}
+
+## BatteryItem
{
-package BatteryData;
+package BatteryItem;
my (@upower_items,$b_upower,$upower);
+
sub get {
eval $start if $b_log;
- my (@rows,%battery,$key1,$val1);
+ my ($key1,$val1);
+ my $battery = {};
+ my $rows = [];
my $num = 0;
- if ($bsd_type || $b_dmidecode_force){
- my $ref = $alerts{'dmidecode'};
- if ( $$ref{'action'} ne 'use'){
- $key1 = $$ref{'action'};
- $val1 = $$ref{$key1};
+ if ($force{'dmidecode'}){
+ if ($alerts{'dmidecode'}->{'action'} ne 'use'){
+ $key1 = $alerts{'dmidecode'}->{'action'};
+ $val1 = $alerts{'dmidecode'}->{'message'};
$key1 = ucfirst($key1);
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
else {
- %battery = battery_data_dmi();
- if (!%battery){
+ battery_data_dmi($battery);
+ if (!%$battery){
if ($show{'battery-forced'}){
$key1 = 'Message';
- $val1 = main::row_defaults('battery-data','');
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ $val1 = main::message('battery-data','');
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
}
else {
- @rows = create_output(%battery);
+ battery_output($rows,$battery);
}
}
}
+ elsif ($bsd_type && ($sysctl{'battery'} || $show{'battery-forced'})){
+ battery_data_sysctl($battery) if $sysctl{'battery'};
+ if (!%$battery){
+ if ($show{'battery-forced'}){
+ $key1 = 'Message';
+ $val1 = main::message('battery-data-bsd','');
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
+ }
+ }
+ else {
+ battery_output($rows,$battery);
+ }
+ }
elsif (-d '/sys/class/power_supply/'){
- %battery = battery_data_sys();
- if (!%battery){
+ battery_data_sys($battery);
+ if (!%$battery){
if ($show{'battery-forced'}){
$key1 = 'Message';
- $val1 = main::row_defaults('battery-data','');
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ $val1 = main::message('battery-data','');
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
}
else {
- @rows = create_output(%battery);
+ battery_output($rows,$battery);
}
}
else {
if ($show{'battery-forced'}){
$key1 = 'Message';
- $val1 = main::row_defaults('battery-data-sys','');
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ $val1 = (!$bsd_type) ? main::message('battery-data-sys'): main::message('battery-data-bsd');
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
}
- (@upower_items,$b_upower,$upower) = undef;
+ (@upower_items,$b_upower,$upower) = ();
eval $end if $b_log;
- return @rows;
+ return $rows;
}
+
# alarm capacity capacity_level charge_full charge_full_design charge_now
-# cycle_count energy_full energy_full_design energy_now location manufacturer model_name
-# power_now present serial_number status technology type voltage_min_design voltage_now
-# 0 name - battery id, not used
-# 1 status
-# 2 present
-# 3 technology
-# 4 cycle_count
-# 5 voltage_min_design
-# 6 voltage_now
-# 7 power_now
-# 8 energy_full_design
-# 9 energy_full
-# 10 energy_now
-# 11 capacity
-# 12 capacity_level
-# 13 of_orig
-# 14 model_name
-# 15 manufacturer
-# 16 serial_number
-# 17 location
-sub create_output {
- eval $start if $b_log;
- my (%battery) = @_;
- my ($key,@data,@rows);
+# cycle_count energy_full energy_full_design energy_now location manufacturer model_name
+# power_now present serial_number status technology type voltage_min_design voltage_now
+# 0: name - battery id, not used
+# 1: status
+# 2: present
+# 3: technology
+# 4: cycle_count
+# 5: voltage_min_design
+# 6: voltage_now
+# 7: power_now
+# 8: energy_full_design
+# 9: energy_full
+# 10: energy_now
+# 11: capacity
+# 12: capacity_level
+# 13: of_orig
+# 14: model_name
+# 15: manufacturer
+# 16: serial_number
+# 17: location
+sub battery_output {
+ eval $start if $b_log;
+ my ($rows,$battery) = @_;
+ my ($key);
my $num = 0;
my $j = 0;
- # print Data::Dumper::Dumper \%battery;
- foreach $key (sort keys %battery){
+ # print Data::Dumper::Dumper $battery;
+ foreach $key (sort keys %$battery){
$num = 0;
- my ($charge,$condition,$model,$serial,$status,$volts) = ('','','','','','');
+ my ($charge,$condition,$model,$serial,$status) = ('','','','','');
my ($chemistry,$cycles,$location) = ('','','');
- next if !$battery{$key}{'purpose'} || $battery{$key}{'purpose'} ne 'primary';
- # $battery{$key}{''};
+ next if !$battery->{$key}{'purpose'} || $battery->{$key}{'purpose'} ne 'primary';
+ # $battery->{$key}{''};
# we need to handle cases where charge or energy full is 0
- if (defined $battery{$key}{'energy_now'} && $battery{$key}{'energy_now'} ne ''){
- $charge = "$battery{$key}{'energy_now'} Wh";
+ if (defined $battery->{$key}{'energy_now'} && $battery->{$key}{'energy_now'} ne ''){
+ $charge = "$battery->{$key}{'energy_now'} Wh";
+ if ($battery->{$key}{'energy_full'} &&
+ main::is_numeric($battery->{$key}{'energy_full'})){
+ my $percent = sprintf("%.1f", $battery->{$key}{'energy_now'}/$battery->{$key}{'energy_full'}*100);
+ $charge .= ' (' . $percent . '%)';
+ }
}
# better than nothing, shows the charged percent
- elsif (defined $battery{$key}{'capacity'} && $battery{$key}{'capacity'} ne ''){
- $charge = $battery{$key}{'capacity'} . '%'
+ elsif (defined $battery->{$key}{'capacity'} && $battery->{$key}{'capacity'} ne ''){
+ $charge = $battery->{$key}{'capacity'} . '%'
}
else {
$charge = 'N/A';
}
- if ($battery{$key}{'energy_full'} || $battery{$key}{'energy_full_design'}){
- $battery{$key}{'energy_full_design'} ||= 'N/A';
- $battery{$key}{'energy_full'}= (defined $battery{$key}{'energy_full'} && $battery{$key}{'energy_full'} ne '') ? $battery{$key}{'energy_full'} : 'N/A';
- $condition = "$battery{$key}{'energy_full'}/$battery{$key}{'energy_full_design'} Wh";
- if ($battery{$key}{'of_orig'}){
- $condition .= " ($battery{$key}{'of_orig'}%)";
+ if ($battery->{$key}{'energy_full'} || $battery->{$key}{'energy_full_design'}){
+ $battery->{$key}{'energy_full_design'} ||= 'N/A';
+ $battery->{$key}{'energy_full'} = (defined $battery->{$key}{'energy_full'} &&
+ $battery->{$key}{'energy_full'} ne '') ? $battery->{$key}{'energy_full'} : 'N/A';
+ $condition = "$battery->{$key}{'energy_full'}/$battery->{$key}{'energy_full_design'} Wh";
+ if ($battery->{$key}{'of_orig'}){
+ $condition .= " ($battery->{$key}{'of_orig'}%)";
}
}
$condition ||= 'N/A';
- $j = scalar @rows;
- @data = ({
+ $j = scalar @$rows;
+ push(@$rows, {
main::key($num++,1,1,'ID') => $key,
main::key($num++,0,2,'charge') => $charge,
main::key($num++,0,2,'condition') => $condition,
- },);
- @rows = (@rows,@data);
- if ($extra > 0){
- if ($extra > 1){
- if ($battery{$key}{'voltage_min_design'} || $battery{$key}{'voltage_now'}){
- $battery{$key}{'voltage_min_design'} ||= 'N/A';
- $battery{$key}{'voltage_now'} ||= 'N/A';
- $volts = "$battery{$key}{'voltage_now'}/$battery{$key}{'voltage_min_design'}";
- }
- $volts ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'volts')} = $volts;
+ });
+ if ($extra > 2){
+ if ($battery->{$key}{'power_now'}){
+ $rows->[$j]{main::key($num++,0,2,'power')} = sprintf('%0.1f W',($battery->{$key}{'power_now'}/10**6));
+ }
+ }
+ if ($extra > 0 || ($battery->{$key}{'voltage_now'} &&
+ $battery->{$key}{'voltage_min_design'} &&
+ ($battery->{$key}{'voltage_now'} - $battery->{$key}{'voltage_min_design'}) < 0.5)){
+ $battery->{$key}{'voltage_now'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,2,'volts')} = $battery->{$key}{'voltage_now'};
+ if ($battery->{$key}{'voltage_now'} ne 'N/A' || $battery->{$key}{'voltage_min_design'}){
+ $battery->{$key}{'voltage_min_design'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'min')} = $battery->{$key}{'voltage_min_design'};
}
- if ($battery{$key}{'manufacturer'} || $battery{$key}{'model_name'}) {
- if ($battery{$key}{'manufacturer'} && $battery{$key}{'model_name'}){
- $model = "$battery{$key}{'manufacturer'} $battery{$key}{'model_name'}";
+ }
+ if ($extra > 0){
+ if ($battery->{$key}{'manufacturer'} || $battery->{$key}{'model_name'}){
+ if ($battery->{$key}{'manufacturer'} && $battery->{$key}{'model_name'}){
+ $model = "$battery->{$key}{'manufacturer'} $battery->{$key}{'model_name'}";
}
- elsif ($battery{$key}{'manufacturer'}){
- $model = $battery{$key}{'manufacturer'};
+ elsif ($battery->{$key}{'manufacturer'}){
+ $model = $battery->{$key}{'manufacturer'};
}
- elsif ($battery{$key}{'model_name'}){
- $model = $battery{$key}{'model_name'};
+ elsif ($battery->{$key}{'model_name'}){
+ $model = $battery->{$key}{'model_name'};
}
}
else {
$model = 'N/A';
}
- $rows[$j]{main::key($num++,0,2,'model')} = $model;
+ $rows->[$j]{main::key($num++,0,2,'model')} = $model;
if ($extra > 2){
- $chemistry = ( $battery{$key}{'technology'} ) ? $battery{$key}{'technology'}: 'N/A';
- $rows[$j]{main::key($num++,0,2,'type')} = $chemistry;
+ $chemistry = ($battery->{$key}{'technology'}) ? $battery->{$key}{'technology'}: 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'type')} = $chemistry;
}
if ($extra > 1){
- $serial = main::apply_filter($battery{$key}{'serial_number'});
- $rows[$j]{main::key($num++,0,2,'serial')} = $serial;
+ $serial = main::filter($battery->{$key}{'serial_number'});
+ $rows->[$j]{main::key($num++,0,2,'serial')} = $serial;
}
- $status = ($battery{$key}{'status'}) ? $battery{$key}{'status'}: 'N/A';
- $rows[$j]{main::key($num++,0,2,'status')} = $status;
+ $status = ($battery->{$key}{'status'}) ? $battery->{$key}{'status'}: 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'status')} = $status;
if ($extra > 2){
- if ($battery{$key}{'cycle_count'}){
- $rows[$j]{main::key($num++,0,2,'cycles')} = $battery{$key}{'cycle_count'};
+ if ($battery->{$key}{'cycle_count'}){
+ $rows->[$j]{main::key($num++,0,2,'cycles')} = $battery->{$key}{'cycle_count'};
}
- if ($battery{$key}{'location'}){
- $rows[$j]{main::key($num++,0,2,'location')} = $battery{$key}{'location'};
+ if ($battery->{$key}{'location'}){
+ $rows->[$j]{main::key($num++,0,2,'location')} = $battery->{$key}{'location'};
}
}
}
- $battery{$key} = undef;
+ $battery->{$key} = undef;
}
- # print Data::Dumper::Dumper \%battery;
+ # print Data::Dumper::Dumper \%$battery;
# now if there are any devices left, print them out, excluding Mains
if ($extra > 0){
$upower = main::check_program('upower');
- foreach $key (sort keys %battery){
+ foreach $key (sort keys %$battery){
$num = 0;
- next if !defined $battery{$key} || $battery{$key}{'purpose'} eq 'mains';
+ next if !defined $battery->{$key} || $battery->{$key}{'purpose'} eq 'mains';
my ($charge,$model,$serial,$percent,$status,$vendor) = ('','','','','','');
- my (%upower_data);
- $j = scalar @rows;
- %upower_data = upower_data($key) if $upower;
- if ($upower_data{'percent'}){
- $charge = $upower_data{'percent'};
+ $j = scalar @$rows;
+ my $upower_data = ($upower) ? upower_data($key) : {};
+ if ($upower_data->{'percent'}){
+ $charge = $upower_data->{'percent'};
}
- elsif ($battery{$key}{'capacity_level'} && lc($battery{$key}{'capacity_level'}) ne 'unknown'){
- $charge = $battery{$key}{'capacity_level'};
+ elsif ($battery->{$key}{'capacity_level'} &&
+ lc($battery->{$key}{'capacity_level'}) ne 'unknown'){
+ $charge = $battery->{$key}{'capacity_level'};
}
else {
$charge = 'N/A';
}
- $model = $battery{$key}{'model_name'} if $battery{$key}{'model_name'};
- $status = ($battery{$key}{'status'} && lc($battery{$key}{'status'}) ne 'unknown') ? $battery{$key}{'status'}: 'N/A' ;
- $vendor = $battery{$key}{'manufacturer'} if $battery{$key}{'manufacturer'};
+ $model = $battery->{$key}{'model_name'} if $battery->{$key}{'model_name'};
+ $vendor = $battery->{$key}{'manufacturer'} if $battery->{$key}{'manufacturer'};
if ($vendor || $model){
if ($vendor && $model){
$model = "$vendor $model";
@@ -6614,50 +8118,51 @@ sub create_output {
else {
$model = 'N/A';
}
- @data = ({
+ push(@$rows, {
main::key($num++,1,1,'Device') => $key,
main::key($num++,0,2,'model') => $model,
},);
- @rows = (@rows,@data);
if ($extra > 1){
- $serial = main::apply_filter($battery{$key}{'serial_number'});
- $rows[$j]{main::key($num++,0,2,'serial')} = $serial;
+ $serial = main::filter($battery->{$key}{'serial_number'});
+ $rows->[$j]{main::key($num++,0,2,'serial')} = $serial;
}
- $rows[$j]{main::key($num++,0,2,'charge')} = $charge;
- if ($extra > 2 && $upower_data{'rechargeable'}){
- $rows[$j]{main::key($num++,0,2,'rechargeable')} = $upower_data{'rechargeable'};
+ $rows->[$j]{main::key($num++,0,2,'charge')} = $charge;
+ 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;
+ $status = ($battery->{$key}{'status'}) ? $battery->{$key}{'status'}: 'N/A' ;
+ $rows->[$j]{main::key($num++,0,2,'status')} = $status;
}
}
eval $end if $b_log;
- return @rows;
}
# charge: mAh energy: Wh
sub battery_data_sys {
eval $start if $b_log;
- my ($b_ma,%battery,$file,$id,$item,$path,$value);
+ my $battery = $_[0];
+ my ($b_ma,$file,$id,$item,$path,$value);
my $num = 0;
my @batteries = main::globber("/sys/class/power_supply/*");
# note: there is no 'location' file, but dmidecode has it
# 'type' is generic, like: Battery, Mains
# capacity_level is a string, like: Normal
- my @items = qw(alarm capacity capacity_level charge_full charge_full_design charge_now
- constant_charge_current constant_charge_current_max cycle_count
+ my @items = qw(alarm capacity capacity_level charge_full charge_full_design
+ charge_now constant_charge_current constant_charge_current_max cycle_count
energy_full energy_full_design energy_now location manufacturer model_name
- power_now present scope serial_number status technology type voltage_min_design voltage_now);
+ power_now present scope serial_number status technology type voltage_min_design
+ voltage_now);
foreach $item (@batteries){
$b_ma = 0;
$id = $item;
$id =~ s%/sys/class/power_supply/%%g;
- $battery{$id} = ({});
foreach $file (@items){
$path = "$item/$file";
- $value = (-f $path) ? (main::reader($path))[0]: '';
+ # android shows some files only root readable
+ $value = (-r $path) ? main::reader($path,'',0): '';
# mains, plus in psu
- if ($file eq 'type' && $value && lc($value) ne 'battery' ){
- $battery{$id}{'purpose'} = 'mains';
+ if ($file eq 'type' && $value && lc($value) ne 'battery'){
+ $battery->{$id}{'purpose'} = 'mains';
}
if ($value){
$value = main::trimmer($value);
@@ -6694,1775 +8199,4325 @@ sub battery_data_sys {
$b_ma = 1;
}
elsif ($file eq 'manufacturer'){
- $value = main::dmi_cleaner($value);
+ $value = main::clean_dmi($value);
}
elsif ($file eq 'model_name'){
- $value = main::dmi_cleaner($value);
+ $value = main::clean_dmi($value);
+ }
+ # Valid values: Unknown,Charging,Discharging,Not charging,Full
+ # don't use clean_unset because Not charging is a valid value.
+ elsif ($file eq 'status'){
+ $value = lc($value);
+ $value =~ s/unknown//;
+
}
}
- elsif ($b_root && -e $path && ! -r $path ){
- $value = main::row_defaults('root-required');
+ elsif ($b_root && -e $path && ! -r $path){
+ $value = main::message('root-required');
}
- $battery{$id}{$file} = $value;
- # print "$battery{$id}{$file}\n";
+ $battery->{$id}{$file} = $value;
+ # print "$battery->{$id}{$file}\n";
}
# note, too few data sets, there could be sbs-charger but not sure
- if (!$battery{$id}{'purpose'}){
+ if (!$battery->{$id}{'purpose'}){
# NOTE: known ids: BAT[0-9] CMB[0-9]. arm may be like: sbs- sbm- but just check
# if the energy/charge values exist for this item, if so, it's a battery, if not,
# it's a device.
if ($id =~ /^(BAT|CMB).*$/i ||
- ( $battery{$id}{'energy_full'} || $battery{$id}{'charge_full'} ||
- $battery{$id}{'energy_now'} || $battery{$id}{'charge_now'} ||
- $battery{$id}{'energy_full_design'} || $battery{$id}{'charge_full_design'} ) ||
- $battery{$id}{'voltage_min_design'} || $battery{$id}{'voltage_now'} ){
- $battery{$id}{'purpose'} = 'primary';
+ ($battery->{$id}{'energy_full'} || $battery->{$id}{'charge_full'} ||
+ $battery->{$id}{'energy_now'} || $battery->{$id}{'charge_now'} ||
+ $battery->{$id}{'energy_full_design'} || $battery->{$id}{'charge_full_design'}) ||
+ $battery->{$id}{'voltage_min_design'} || $battery->{$id}{'voltage_now'}){
+ $battery->{$id}{'purpose'} = 'primary';
}
else {
- $battery{$id}{'purpose'} = 'device';
+ $battery->{$id}{'purpose'} = 'device';
}
}
# note:voltage_now fluctuates, which will make capacity numbers change a bit
# if any of these values failed, the math will be wrong, but no way to fix that
# tests show more systems give right capacity/charge with voltage_min_design
# than with voltage_now
- if ($b_ma && $battery{$id}{'voltage_min_design'}){
- if ($battery{$id}{'charge_now'}){
- $battery{$id}{'energy_now'} = $battery{$id}{'charge_now'} * $battery{$id}{'voltage_min_design'};
+ if ($b_ma && $battery->{$id}{'voltage_min_design'}){
+ if ($battery->{$id}{'charge_now'}){
+ $battery->{$id}{'energy_now'} = $battery->{$id}{'charge_now'} * $battery->{$id}{'voltage_min_design'};
}
- if ($battery{$id}{'charge_full'}){
- $battery{$id}{'energy_full'} = $battery{$id}{'charge_full'}*$battery{$id}{'voltage_min_design'};
+ if ($battery->{$id}{'charge_full'}){
+ $battery->{$id}{'energy_full'} = $battery->{$id}{'charge_full'}*$battery->{$id}{'voltage_min_design'};
}
- if ($battery{$id}{'charge_full_design'}){
- $battery{$id}{'energy_full_design'} = $battery{$id}{'charge_full_design'} * $battery{$id}{'voltage_min_design'};
+ if ($battery->{$id}{'charge_full_design'}){
+ $battery->{$id}{'energy_full_design'} = $battery->{$id}{'charge_full_design'} * $battery->{$id}{'voltage_min_design'};
}
}
- if ( $battery{$id}{'energy_now'} && $battery{$id}{'energy_full'} ){
- $battery{$id}{'capacity'} = 100 * $battery{$id}{'energy_now'}/$battery{$id}{'energy_full'};
- $battery{$id}{'capacity'} = sprintf( "%.1f", $battery{$id}{'capacity'} );
+ if ($battery->{$id}{'energy_now'} && $battery->{$id}{'energy_full'}){
+ $battery->{$id}{'capacity'} = 100 * $battery->{$id}{'energy_now'}/$battery->{$id}{'energy_full'};
+ $battery->{$id}{'capacity'} = sprintf("%.1f", $battery->{$id}{'capacity'});
}
- if ( $battery{$id}{'energy_full_design'} && $battery{$id}{'energy_full'} ){
- $battery{$id}{'of_orig'} = 100 * $battery{$id}{'energy_full'}/$battery{$id}{'energy_full_design'};
- $battery{$id}{'of_orig'} = sprintf( "%.0f", $battery{$id}{'of_orig'} );
+ if ($battery->{$id}{'energy_full_design'} && $battery->{$id}{'energy_full'}){
+ $battery->{$id}{'of_orig'} = 100 * $battery->{$id}{'energy_full'}/$battery->{$id}{'energy_full_design'};
+ $battery->{$id}{'of_orig'} = sprintf("%.1f", $battery->{$id}{'of_orig'});
}
- if ( $battery{$id}{'energy_now'} ){
- $battery{$id}{'energy_now'} = sprintf( "%.1f", $battery{$id}{'energy_now'} );
+ if ($battery->{$id}{'energy_now'}){
+ $battery->{$id}{'energy_now'} = sprintf("%.1f", $battery->{$id}{'energy_now'});
}
- if ( $battery{$id}{'energy_full_design'} ){
- $battery{$id}{'energy_full_design'} = sprintf( "%.1f",$battery{$id}{'energy_full_design'} );
+ if ($battery->{$id}{'energy_full_design'}){
+ $battery->{$id}{'energy_full_design'} = sprintf("%.1f",$battery->{$id}{'energy_full_design'});
}
- if ( $battery{$id}{'energy_full'} ){
- $battery{$id}{'energy_full'} = sprintf( "%.1f", $battery{$id}{'energy_full'} );
+ if ($battery->{$id}{'energy_full'}){
+ $battery->{$id}{'energy_full'} = sprintf("%.1f", $battery->{$id}{'energy_full'});
}
}
- main::log_data('dump','sys: %battery',\%battery) if $b_log;
+ print Data::Dumper::Dumper $battery if $dbg[33];
+ main::log_data('dump','sys: %$battery',$battery) if $b_log;
eval $end if $b_log;
- return %battery;
}
+
+sub battery_data_sysctl {
+ eval $start if $b_log;
+ my $battery = $_[0];
+ my ($id);
+ for (@{$sysctl{'battery'}}){
+ if (/^(hw\.sensors\.)acpi([^\.]+)(\.|:)/){
+ $id = uc($2);
+ }
+ if (/volt[^:]+:([0-9\.]+)\s+VDC\s+\(voltage\)/){
+ $battery->{$id}{'voltage_min_design'} = $1;
+ }
+ elsif (/volt[^:]+:([0-9\.]+)\s+VDC\s+\(current voltage\)/){
+ $battery->{$id}{'voltage_now'} = $1;
+ }
+ elsif (/watthour[^:]+:([0-9\.]+)\s+Wh\s+\(design capacity\)/){
+ $battery->{$id}{'energy_full_design'} = $1;
+ }
+ elsif (/watthour[^:]+:([0-9\.]+)\s+Wh\s+\(last full capacity\)/){
+ $battery->{$id}{'energy_full'} = $1;
+ }
+ elsif (/watthour[^:]+:([0-9\.]+)\s+Wh\s+\(remaining capacity\)/){
+ $battery->{$id}{'energy_now'} = $1;
+ }
+ elsif (/amphour[^:]+:([0-9\.]+)\s+Ah\s+\(design capacity\)/){
+ $battery->{$id}{'charge_full_design'} = $1;
+ }
+ elsif (/amphour[^:]+:([0-9\.]+)\s+Ah\s+\(last full capacity\)/){
+ $battery->{$id}{'charge_full'} = $1;
+ }
+ elsif (/amphour[^:]+:([0-9\.]+)\s+Ah\s+\(remaining capacity\)/){
+ $battery->{$id}{'charge_now'} = $1;
+ }
+ elsif (/raw[^:]+:[0-9\.]+\s+\((battery) ([^\)]+)\)/){
+ $battery->{$id}{'status'} = $2;
+ }
+ elsif (/^acpi[\S]+:at [^:]+:\s*$id\s+/i){
+ if (/\s+model\s+(.*?)\s*/){
+ $battery->{$id}{'model_name'} = main::clean_dmi($1);
+ }
+ if (/\s*serial\s+([\S]*?)\s*/){
+ $battery->{$id}{'serial_number'} = main::clean_unset($1,'^(0x)0+$');
+ }
+ if (/\s*type\s+(.*?)\s*/){
+ $battery->{$id}{'technology'} = $1;
+ }
+ if (/\s*oem\s+(.*)/){
+ $battery->{$id}{'manufacturer'} = main::clean_dmi($1);
+ }
+ }
+ }
+ # then do the condition/charge percent math
+ for my $id (keys %$battery){
+ $battery->{$id}{'purpose'} = 'primary';
+ # CHARGE is Ah, which are converted to Wh by: Ah x voltage.
+ if ($battery->{$id}{'voltage_min_design'}){
+ if ($battery->{$id}{'charge_now'}){
+ $battery->{$id}{'energy_now'} = $battery->{$id}{'charge_now'} * $battery->{$id}{'voltage_min_design'};
+ }
+ if ($battery->{$id}{'charge_full'}){
+ $battery->{$id}{'energy_full'} = $battery->{$id}{'charge_full'}*$battery->{$id}{'voltage_min_design'};
+ }
+ if ($battery->{$id}{'charge_full_design'}){
+ $battery->{$id}{'energy_full_design'} = $battery->{$id}{'charge_full_design'} * $battery->{$id}{'voltage_min_design'};
+ }
+ }
+ if ($battery->{$id}{'energy_full_design'} && $battery->{$id}{'energy_full'}){
+ $battery->{$id}{'of_orig'} = 100 * $battery->{$id}{'energy_full'}/$battery->{$id}{'energy_full_design'};
+ $battery->{$id}{'of_orig'} = sprintf("%.1f", $battery->{$id}{'of_orig'});
+ }
+ if ($battery->{$id}{'energy_now'} && $battery->{$id}{'energy_full'}){
+ $battery->{$id}{'capacity'} = 100 * $battery->{$id}{'energy_now'}/$battery->{$id}{'energy_full'};
+ $battery->{$id}{'capacity'} = sprintf("%.1f", $battery->{$id}{'capacity'});
+ }
+ if ($battery->{$id}{'energy_now'}){
+ $battery->{$id}{'energy_now'} = sprintf("%.1f", $battery->{$id}{'energy_now'});
+ }
+ if ($battery->{$id}{'energy_full'}){
+ $battery->{$id}{'energy_full'} = sprintf("%.1f", $battery->{$id}{'energy_full'});
+ }
+ if ($battery->{$id}{'energy_full_design'}){
+ $battery->{$id}{'energy_full_design'} = sprintf("%.1f", $battery->{$id}{'energy_full_design'});
+ }
+ }
+ print Data::Dumper::Dumper $battery if $dbg[33];
+ main::log_data('dump','dmi: %$battery',$battery) if $b_log;
+ eval $end if $b_log;
+}
+
# note, dmidecode does not have charge_now or charge_full
sub battery_data_dmi {
eval $start if $b_log;
- my (%battery,$id);
+ my $battery = $_[0];
+ my ($id);
my $i = 0;
- foreach (@dmi){
- my @ref = @$_;
+ foreach my $row (@dmi){
# Portable Battery
- if ($ref[0] == 22){
+ if ($row->[0] == 22){
$id = "BAT$i";
$i++;
- $battery{$id} = ({});
- $battery{$id}{'purpose'} = 'primary';
+ $battery->{$id}{'purpose'} = 'primary';
# skip first three row, we don't need that data
- splice @ref, 0, 3 if @ref;
- foreach my $item (@ref){
- my @value = split /:\s+/, $item;
+ foreach my $item (@$row[3 .. $#$row]){
+ my @value = split(/:\s+/, $item);
next if !$value[0];
- if ($value[0] eq 'Location') {$battery{$id}{'location'} = $value[1] }
- elsif ($value[0] eq 'Manufacturer') {$battery{$id}{'manufacturer'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] =~ /Chemistry/) {$battery{$id}{'technology'} = $value[1] }
- elsif ($value[0] =~ /Serial Number/) {$battery{$id}{'serial_number'} = $value[1] }
- elsif ($value[0] =~ /^Name/) {$battery{$id}{'model_name'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Design Capacity') {
+ if ($value[0] eq 'Location'){
+ $battery->{$id}{'location'} = $value[1]}
+ elsif ($value[0] eq 'Manufacturer'){
+ $battery->{$id}{'manufacturer'} = main::clean_dmi($value[1])}
+ elsif ($value[0] =~ /Chemistry/){
+ $battery->{$id}{'technology'} = $value[1]}
+ elsif ($value[0] =~ /Serial Number/){
+ $battery->{$id}{'serial_number'} = $value[1]}
+ elsif ($value[0] =~ /^Name/){
+ $battery->{$id}{'model_name'} = main::clean_dmi($value[1])}
+ elsif ($value[0] eq 'Design Capacity'){
$value[1] =~ s/\s*mwh$//i;
- $battery{$id}{'energy_full_design'} = sprintf( "%.1f", $value[1]/1000);
+ $battery->{$id}{'energy_full_design'} = sprintf("%.1f", $value[1]/1000);
}
- elsif ($value[0] eq 'Design Voltage') {
+ elsif ($value[0] eq 'Design Voltage'){
$value[1] =~ s/\s*mv$//i;
- $battery{$id}{'voltage_min_design'} = sprintf( "%.1f", $value[1]/1000);
+ $battery->{$id}{'voltage_min_design'} = sprintf("%.1f", $value[1]/1000);
}
}
- if ($battery{$id}{'energy_now'} && $battery{$id}{'energy_full'} ){
- $battery{$id}{'capacity'} = 100 * $battery{$id}{'energy_now'} / $battery{$id}{'energy_full'};
- $battery{$id}{'capacity'} = sprintf( "%.1f%", $battery{$id}{'capacity'} );
+ if ($battery->{$id}{'energy_now'} && $battery->{$id}{'energy_full'}){
+ $battery->{$id}{'capacity'} = 100 * $battery->{$id}{'energy_now'} / $battery->{$id}{'energy_full'};
+ $battery->{$id}{'capacity'} = sprintf("%.1f%", $battery->{$id}{'capacity'});
}
- if ($battery{$id}{'energy_full_design'} && $battery{$id}{'energy_full'} ){
- $battery{$id}{'of_orig'} = 100 * $battery{$id}{'energy_full'} / $battery{$id}{'energy_full_design'};
- $battery{$id}{'of_orig'} = sprintf( "%.0f%", $battery{$id}{'of_orig'} );
+ if ($battery->{$id}{'energy_full_design'} && $battery->{$id}{'energy_full'}){
+ $battery->{$id}{'of_orig'} = 100 * $battery->{$id}{'energy_full'} / $battery->{$id}{'energy_full_design'};
+ $battery->{$id}{'of_orig'} = sprintf("%.0f%", $battery->{$id}{'of_orig'});
}
}
- elsif ($ref[0] > 22){
+ elsif ($row->[0] > 22){
last;
}
}
- # print Data::Dumper::Dumper \%battery;
- main::log_data('dump','dmi: %battery',\%battery) if $b_log;
+ print Data::Dumper::Dumper $battery if $dbg[33];
+ main::log_data('dump','dmi: %$battery',$battery) if $b_log;
eval $end if $b_log;
- return %battery;
}
+
sub upower_data {
my ($id) = @_;
eval $start if $b_log;
- my (%data);
+ my $data = {};
if (!$b_upower && $upower){
- @upower_items = main::grabber("$upower -e",'','strip');
+ @upower_items = main::grabber("$upower -e 2>/dev/null",'','strip');
$b_upower = 1;
}
if ($upower && @upower_items){
foreach (@upower_items){
if ($_ =~ /$id/){
- my @working = main::grabber("$upower -i $_",'','strip');
+ my @working = main::grabber("$upower -i $_ 2>/dev/null",'','strip');
foreach my $row (@working){
- my @temp = split /\s*:\s*/, $row;
+ my @temp = split(/\s*:\s*/, $row);
if ($temp[0] eq 'percentage'){
- $data{'percent'} = $temp[1];
+ $data->{'percent'} = $temp[1];
}
elsif ($temp[0] eq 'rechargeable'){
- $data{'rechargeable'} = $temp[1];
+ $data->{'rechargeable'} = $temp[1];
}
}
last;
}
}
}
- main::log_data('dump','upower: %data',\%data) if $b_log;
+ main::log_data('dump','upower: %$data',$data) if $b_log;
eval $end if $b_log;
- return %data;
+ return $data;
}
-
}
-## CpuData
+## BluetoothItem
{
-package CpuData;
+package BluetoothItem;
+my ($b_bluetooth,$b_hci_error,$b_hci,$b_rfk,$b_service);
+my ($service);
+my (%hci);
sub get {
eval $start if $b_log;
- my ($type) = @_;
- my (@data,@rows,$single,$key1,$val1);
+ my $rows = [];
my $num = 0;
- if ($type eq 'short' || $type eq 'basic'){
- @rows = data_short($type);
+ if ($fake{'bluetooth'} || (@ps_cmd && (grep {m|/bluetoothd\b|} @ps_cmd))){
+ $b_bluetooth = 1;
+ }
+ # note: rapi 4 has pci bus
+ if (%risc && !$use{'soc-bluetooth'} && !$use{'pci-tool'}){
+ # do nothing, but keep the test conditions to force
+ # the non risc case to always run
+ # my $key = 'Message';
+ # @$rows = ({
+ # main::key($num++,0,1,$key) => main::message('risc-pci',$risc{'id'})
+ # });
}
else {
- @rows = create_output_full();
+ device_output($rows);
+ }
+ usb_output($rows);
+ if (!@$rows){
+ if ($show{'bluetooth-forced'}){
+ my $key = 'Message';
+ @$rows = ({main::key($num++,0,1,$key) => main::message('bluetooth-data')});
+ }
+ }
+ # if there are any unhandled hci items print them out
+ if (%hci){
+ advanced_output($rows,'check','');
}
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub create_output_full {
+
+sub device_output {
eval $start if $b_log;
- my $num = 0;
- my ($b_flags,$b_speeds,$core_speeds_value,$flag_key,@flags,%cpu,@data,@rows);
- my $sleep = $cpu_sleep * 1000000;
- if ($b_hires){
- eval 'Time::HiRes::usleep( $sleep )';
+ return if !$devices{'bluetooth'};
+ my $rows = $_[0];
+ my ($bus_id);
+ my ($j,$num) = (0,1);
+ foreach my $row (@{$devices{'bluetooth'}}){
+ $num = 1;
+ $bus_id = '';
+ $j = scalar @$rows;
+ my $driver = ($row->[9]) ? $row->[9] : 'N/A';
+ my $device = $row->[4];
+ $device = ($device) ? main::clean_pci($device,'output') : 'N/A';
+ # have seen absurdly verbose card descriptions, with non related data etc
+ if (length($device) > 85 || $size{'max-cols'} < 110){
+ $device = main::filter_pci_long($device);
+ }
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $device,
+ },);
+ if ($extra > 0 && $use{'pci-tool'} && $row->[12]){
+ my $item = main::get_pci_vendor($row->[4],$row->[12]);
+ $rows->[$j]{main::key($num++,0,2,'vendor')} = $item if $item;
+ }
+ $rows->[$j]{main::key($num++,1,2,'driver')} = $driver;
+ if ($extra > 0 && $row->[9] && !$bsd_type){
+ my $version = main::get_module_version($row->[9]);
+ $rows->[$j]{main::key($num++,0,3,'v')} = $version if $version;
+ }
+ if ($b_admin && $row->[10]){
+ $row->[10] = main::get_driver_modules($row->[9],$row->[10]);
+ $rows->[$j]{main::key($num++,0,3,'alternate')} = $row->[10] if $row->[10];
+ }
+ if ($extra > 0){
+ $bus_id = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
+ if ($extra > 1 && $bus_id ne 'N/A'){
+ main::get_pcie_data($bus_id,$j,$rows,\$num);
+ }
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = $bus_id;
+ }
+ if ($extra > 1){
+ my $chip_id = main::get_chip_id($row->[5],$row->[6]);
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $chip_id;
+ if ($extra > 2 && $row->[1]){
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = $row->[1];
+ }
+ }
+ # weird serial rpi bt
+ if ($use{'soc-bluetooth'}){
+ # /sys/devices/platform/soc/fe201000.serial/
+ $bus_id = "$row->[6].$row->[1]" if defined $row->[1] && defined $row->[6];
+ }
+ else {
+ # only theoretical, never seen one
+ $bus_id = "$row->[2].$row->[3]" if defined $row->[2] && defined $row->[3];
+ }
+ advanced_output($rows,'pci',$bus_id) if $bus_id;
+ # print "$row->[0]\n";
+ }
+ eval $end if $b_log;
+}
+
+sub usb_output {
+ eval $start if $b_log;
+ return if !$usb{'bluetooth'};
+ my $rows = $_[0];
+ my ($path_id,$product);
+ my ($j,$num) = (0,1);
+ foreach my $row (@{$usb{'bluetooth'}}){
+ # print Data::Dumper::Dumper $row;
+ $num = 1;
+ $j = scalar @$rows;
+ # makre sure to reset, or second device trips last flag
+ ($path_id,$product) = ('','');
+ $product = main::clean($row->[13]) if $row->[13];
+ $product ||= 'N/A';
+ $row->[15] ||= 'N/A';
+ $path_id = $row->[2] if $row->[2];
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $product,
+ main::key($num++,1,2,'driver') => $row->[15],
+ },);
+ if ($extra > 0 && $row->[15] && !$bsd_type){
+ my $version = main::get_module_version($row->[15]);
+ $rows->[$j]{main::key($num++,0,3,'v')} = $version if $version;
+ }
+ $rows->[$j]{main::key($num++,1,2,'type')} = 'USB';
+ if ($extra > 0){
+ if ($extra > 1){
+ $row->[8] ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'rev')} = $row->[8];
+ if ($row->[17]){
+ $rows->[$j]{main::key($num++,0,3,'speed')} = $row->[17];
+ }
+ if ($row->[24]){
+ $rows->[$j]{main::key($num++,0,3,'lanes')} = $row->[24];
+ }
+ if ($b_admin && $row->[22]){
+ $rows->[$j]{main::key($num++,0,3,'mode')} = $row->[22];
+ }
+ }
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = "$path_id:$row->[1]";
+ if ($extra > 1){
+ $row->[7] ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $row->[7];
+ }
+ if ($extra > 2){
+ if (defined $row->[5] && $row->[5] ne ''){
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = "$row->[4]$row->[5]";
+ }
+ if ($row->[16]){
+ $rows->[$j]{main::key($num++,0,2,'serial')} = main::filter($row->[16]);
+ }
+ }
+ }
+ advanced_output($rows,'usb',$path_id) if $path_id;
+ }
+ eval $end if $b_log;
+}
+
+sub advanced_output {
+ eval $start if $b_log;
+ my ($rows,$type,$bus_id) = @_;
+ my (@temp);
+ my ($j,$num,$k,$l,$m,$n,$address,$id,$note,$tool) = (0,1,2,3,4,5,'','','','');
+ set_bluetooth_data(\$tool);
+ # print "bid: $bus_id\n";
+ if ($type ne 'check'){
+ @temp = main::globber('/sys/class/bluetooth/*');
+ @temp = map {$_ = Cwd::abs_path($_);$_} @temp if @temp;
+ # print Data::Dumper::Dumper \@temp;
+ @temp = grep {/$bus_id/} @temp if @temp;
+ @temp = map {$_ =~ s|^/.*/||;$_;} @temp if @temp;
+ # print Data::Dumper::Dumper \@temp;
+ }
+ elsif ($type eq 'check' && %hci){
+ @temp = keys %hci;
+ $id = '-ID';
+ ($k,$l,$m,$n) = (1,2,3,4);
+ }
+ if (@temp && %hci){
+ if ($hci{'alert'}){
+ if (keys %hci == 1){
+ check_service(); # sets $service
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,1,$k,'Report')} = $tool;
+ $rows->[$j]{main::key($num++,0,$l,'bt-service')} = $service;
+ $rows->[$j]{main::key($num++,0,$l,'note')} = $hci{'alert'};
+ }
+ else {
+ $note = $hci{'alert'};
+ }
+ delete $hci{'alert'};
+ }
+ foreach my $item (@temp){
+ if ($hci{$item}){
+ $j = scalar @$rows;
+ push(@$rows,{
+ main::key($num++,1,$k,'Report' . $id) => $tool,
+ },);
+ if ($note){
+ $rows->[$j]{main::key($num++,0,$l,'note')} = $note;
+ }
+ # synthesize for rfkill
+ if (!$hci{$item}->{'state'}){
+ $hci{$item}->{'state'} = ($b_bluetooth) ? 'up' : 'down';
+ }
+ $rows->[$j]{main::key($num++,0,$l,'ID')} = $item;
+ if (defined $hci{$item}->{'rf-index'} &&
+ ($extra > 0 || $hci{$item}->{'state'} eq 'down')){
+ $rows->[$j]{main::key($num++,0,$m,'rfk-id')} = $hci{$item}->{'rf-index'};
+ }
+ $rows->[$j]{main::key($num++,1,$l,'state')} = $hci{$item}->{'state'};
+ # this only appears for hciconfig, bt-adapter does not run without bt service
+ if (!$b_bluetooth || $hci{$item}->{'state'} eq 'down'){
+ if (!$b_bluetooth || $hci{$item}->{'state'} eq 'down'){
+ check_service(); # sets $service
+ $rows->[$j]{main::key($num++,0,$m,'bt-service')} = $service;
+ }
+ if ($hci{$item}->{'hard-blocked'}){
+ $rows->[$j]{main::key($num++,1,$m,'rfk-block')} = '';
+ $rows->[$j]{main::key($num++,0,$n,'hardware')} = $hci{$item}->{'hard-blocked'};
+ $rows->[$j]{main::key($num++,0,$n,'software')} = $hci{$item}->{'soft-blocked'};
+ }
+ }
+ if (!$hci{$item}->{'address'} && $tool eq 'rfkill'){
+ $address = main::message('recommends');
+ }
+ else {
+ $address = main::filter($hci{$item}->{'address'});
+ }
+ $rows->[$j]{main::key($num++,0,$l,'address')} = $address;
+ # lmp/hci version only hciconfig
+ if ($hci{$item}->{'bt-version'}){
+ $rows->[$j]{main::key($num++,0,$l,'bt-v')} = $hci{$item}->{'bt-version'};
+ }
+ if ($extra > 0 && defined $hci{$item}->{'lmp-version'}){
+ $rows->[$j]{main::key($num++,0,$l,'lmp-v')} = $hci{$item}->{'lmp-version'};
+ if ($extra > 1 && $hci{$item}->{'lmp-subversion'}){
+ $rows->[$j]{main::key($num++,0,$m,'sub-v')} = $hci{$item}->{'lmp-subversion'};
+ }
+ }
+ if ($extra > 0 && defined $hci{$item}->{'hci-version'} &&
+ ($extra > 2 || !$hci{$item}->{'lmp-version'} ||
+ ($hci{$item}->{'lmp-version'} &&
+ $hci{$item}->{'lmp-version'} ne $hci{$item}->{'hci-version'}))){
+ $rows->[$j]{main::key($num++,0,$l,'hci-v')} = $hci{$item}->{'hci-version'};
+ if ($extra > 1 && $hci{$item}->{'hci-revision'}){
+ $rows->[$j]{main::key($num++,0,$m,'rev')} = $hci{$item}->{'hci-revision'};
+ }
+ }
+ if ($b_admin &&
+ ($hci{$item}->{'discoverable'} || $hci{$item}->{'pairable'})){
+ $rows->[$j]{main::key($num++,1,$l,'status')} = '';
+ if ($hci{$item}->{'discoverable'}){
+ $rows->[$j]{main::key($num++,1,$m,'discoverable')} = $hci{$item}->{'discoverable'};
+ if ($hci{$item}->{'discovering'}){
+ $rows->[$j]{main::key($num++,1,$n,'active')} = $hci{$item}->{'discovering'};
+ }
+ }
+ if ($hci{$item}->{'pairable'}){
+ $rows->[$j]{main::key($num++,0,$m,'pairing')} = $hci{$item}->{'pairable'};
+ }
+ }
+ if ($extra > 2 && $hci{$item}->{'class'}){
+ $rows->[$j]{main::key($num++,0,$l,'class-ID')} = $hci{$item}->{'class'};
+ }
+ # this data only from hciconfig
+ if ($b_admin && ($hci{$item}->{'acl-mtu'} || $hci{$item}->{'sco-mtu'} ||
+ $hci{$item}->{'link-policy'})){
+ $j = scalar @$rows;
+ push(@$rows,{
+ main::key($num++,1,$l,'Info') => '',
+ },);
+ if ($hci{$item}->{'acl-mtu'}){
+ $rows->[$j]{main::key($num++,0,$m,'acl-mtu')} = $hci{$item}->{'acl-mtu'};
+ }
+ if ($hci{$item}->{'sco-mtu'}){
+ $rows->[$j]{main::key($num++,0,$m,'sco-mtu')} = $hci{$item}->{'sco-mtu'};
+ }
+ if ($hci{$item}->{'link-policy'}){
+ $rows->[$j]{main::key($num++,0,$m,'link-policy')} = $hci{$item}->{'link-policy'};
+ }
+ if ($hci{$item}->{'link-mode'}){
+ $rows->[$j]{main::key($num++,0,$m,'link-mode')} = $hci{$item}->{'link-mode'};
+ }
+ if ($hci{$item}->{'service-classes'}){
+ $rows->[$j]{main::key($num++,0,$m,'service-classes')} = $hci{$item}->{'service-classes'};
+ }
+ }
+ delete $hci{$item};
+ }
+ }
+ }
+ # since $rows is ref, we need to just check if no $j were set.
+ if (!$j && !$b_hci_error && ($alerts{'hciconfig'}->{'action'} ne 'use' &&
+ $alerts{'bt-adapter'}->{'action'} ne 'use' &&
+ $alerts{'btmgmt'}->{'action'} ne 'use')){
+ my $key = 'Report';
+ my $value = '';
+ if ($alerts{'hciconfig'}->{'action'} eq 'platform' ||
+ $alerts{'bt-adapter'}->{'action'} eq 'platform' ||
+ $alerts{'btmgmt'}->{'action'} eq 'platform'){
+ $value = main::message('tool-missing-os','bluetooth');
+ }
+ else {
+ $value = main::message('tools-missing','hciconfig/bt-adapter');
+ }
+ push(@$rows,{
+ main::key($num++,0,1,$key) => $value,
+ },);
+ $b_hci_error = 1;
+ }
+ eval $end if $b_log;
+}
+
+# note: echo 'show' | bluetoothctl outputs everything but hciX ID, and is fast
+# args: 0: $tool, by ref
+sub set_bluetooth_data {
+ eval $start if $b_log;
+ if (!$b_hci && !$force{'bt-adapter'} && !$force{'btmgmt'} &&
+ !$force{'rfkill'} &&
+ ($fake{'bluetooth'} || $alerts{'hciconfig'}->{'action'} eq 'use')){
+ hciconfig_data();
+ ${$_[0]} = 'hciconfig';
+ }
+ elsif (!$b_hci && !$force{'rfkill'} && !$force{'bt-adapter'} &&
+ ($fake{'bluetooth'} || $alerts{'btmgmt'}->{'action'} eq 'use')){
+ btmgmt_data();
+ ${$_[0]} = 'btmgmt';
+ }
+ elsif (!$b_hci && !$force{'rfkill'} &&
+ ($fake{'bluetooth'} || $alerts{'bt-adapter'}->{'action'} eq 'use')){
+ bt_adapter_data();
+ ${$_[0]} = 'bt-adapter';
+ }
+ if (!$b_rfk && ($fake{'bluetooth'} || -e '/sys/class/bluetooth/')){
+ rfkill_data();
+ ${$_[0]} = 'rfkill' if !${$_[0]};
+ }
+ eval $end if $b_log;
+}
+
+sub bt_adapter_data {
+ eval $start if $b_log;
+ $b_hci = 1;
+ my (@data,$id);
+ if ($fake{'bluetooth'}){
+ my $file;
+ $file = "";
+ @data = main::reader($file,'strip');
}
else {
- select(undef, undef, undef, $cpu_sleep);
+ if ($b_bluetooth){
+ my $cmd = "$alerts{'bt-adapter'}->{'path'} --info 2>/dev/null";
+ @data = main::grabber($cmd,'','strip');
+ }
+ }
+ # print Data::Dumper::Dumper \@data;
+ main::log_data('dump','@data', \@data) if $b_log;
+ foreach (@data){
+ my @working = split(/:\s*/,$_);
+ # print Data::Dumper::Dumper \@working;
+ next if ! @working;
+ if ($working[0] =~ /^\[([^\]]+)\]/){
+ $id = $1;
+ }
+ elsif ($working[0] eq 'Address'){
+ $hci{$id}->{'address'} = join(':',@working[1 .. $#working]);
+ }
+ elsif ($working[0] eq 'Class' && $working[1] =~ /^0x0*(\S+)/){
+ $hci{$id}->{'class'} = $1;
+ }
+ elsif ($working[0] eq 'Powered'){
+ $hci{$id}->{'state'} = ($working[1] =~ /^(1|yes)\b/) ? 'up': 'down';
+ }
+ elsif ($working[0] eq 'Discoverable'){
+ $hci{$id}->{'discoverable'} = ($working[1] =~ /^(1|yes)\b/) ? 'yes': 'no';
+ }
+ elsif ($working[0] eq 'Pairable'){
+ $hci{$id}->{'pairable'} = ($working[1] =~ /^(1|yes)\b/) ? 'yes': 'no';
+ }
+ elsif ($working[0] eq 'Discovering'){
+ $hci{$id}->{'discovering'} = ($working[1] =~ /^(1|yes)\b/) ? 'yes': 'no';
+ }
+ }
+ if (!@data && !$b_bluetooth){
+ $hci{'alert'} = main::message('bluetooth-down');
+ }
+ print 'bt-adapter: ', Data::Dumper::Dumper \%hci if $dbg[27];
+ main::log_data('dump','%hci', \%hci) if $b_log;
+ eval $end if $b_log;
+}
+
+sub btmgmt_data {
+ eval $start if $b_log;
+ $b_hci = 1;
+ my (@data,$id);
+ if ($fake{'bluetooth'}){
+ my $file;
+ $file = "$fake_data_dir/bluetooth/btmgmt-2.txt";
+ @data = main::reader($file,'strip');
+ }
+ else {
+ if ($b_bluetooth){
+ my $cmd = "$alerts{'btmgmt'}->{'path'} info 2>/dev/null";
+ @data = main::grabber($cmd,'', 'strip');
+ }
+ }
+ # print Data::Dumper::Dumper \@data;
+ main::log_data('dump','@data', \@data) if $b_log;
+ foreach (@data){
+ next if /^Index list/;
+ if (/^(hci[0-9]+):\s+/){
+ $id = $1;
+ }
+ # addr 4C:F3:72:9C:B4:D3 version 6 manufacturer 15 class 0x000104
+ elsif (/^addr\s+([0-9A-F:]+)\s+version\s+([0-9]+)\s/){
+ $hci{$id}->{'address'} = $1;
+ $hci{$id}->{'lmp-version'} = $2; # assume non hex integer
+ $hci{$id}->{'bt-version'} = bluetooth_version($2);
+ if (/ class\s+0x0*(\S+)\b/){
+ $hci{$id}->{'class'} = $1;
+ }
+ }
+ elsif (/^current settings:\s+(.*)/){
+ my $settings = $1;
+ $hci{$id}->{'state'} = ($settings =~ /\bpowered\b/) ? 'up' : 'down';
+ $hci{$id}->{'discoverable'} = ($settings =~ /\bdiscoverable\b/) ? 'yes' : 'no';
+ $hci{$id}->{'pairable'} = ($settings =~ /\bconnectable\b/) ? 'yes' : 'no';
+ }
+ }
+ print 'btmgmt: ', Data::Dumper::Dumper \%hci if $dbg[27];
+ main::log_data('dump','%hci', \%hci) if $b_log;
+ eval $end if $b_log;
+}
+
+sub hciconfig_data {
+ eval $start if $b_log;
+ $b_hci = 1;
+ my (@data,$id);
+ if ($fake{'bluetooth'}){
+ my $file;
+ $file = "$fake_data_dir/bluetooth/hciconfig-a-2.txt";
+ @data = main::reader($file,'strip');
+ }
+ else {
+ my $cmd = "$alerts{'hciconfig'}->{'path'} -a 2>/dev/null";
+ @data = main::grabber($cmd,'', 'strip');
+ }
+ # print Data::Dumper::Dumper \@data;
+ main::log_data('dump','@data', \@data) if $b_log;
+ foreach (@data){
+ if (/^(hci[0-9]+):\s+Type:\s+(.*)\s+Bus:\s+([\S]+)/){
+ $id = $1;
+ $hci{$id} = {
+ 'type'=> $2,
+ 'bus' => $3,
+ };
+ }
+ elsif (/^BD Address:\s+([0-9A-F:]*)\s+ACL\s+MTU:\s+([0-9:]+)\s+SCO MTU:\s+([0-9:]+)/){
+ $hci{$id}->{'address'} = $1;
+ $hci{$id}->{'acl-mtu'} = $2;
+ $hci{$id}->{'sco-mtu'} = $3;
+ }
+ elsif (/^(UP|DOWN).*/){
+ $hci{$id}->{'state'} = lc($1);
+ }
+ elsif (/^Class:\s+0x0*(\S+)/){
+ $hci{$id}->{'class'} = $1;
+ }
+ # HCI Version: 4.0 (0x6) Revision: 0x1000
+ # HCI Version: 6.6 Revision: 0x1000 [don't know if this exists]
+ # HCI Version: (0x7) Revision: 0x3101
+ elsif (/^HCI Version:\s+(([0-9\.]+)\s+)?\(0x([0-9a-f]+)\)\s+Revision:\s+0x([0-9a-f]+)/i){
+ $hci{$id}->{'hci-revision'} = $4;
+ if (defined $3){
+ $hci{$id}->{'bt-version'} = bluetooth_version(hex($3));
+ $hci{$id}->{'hci-version'} = hex($3);
+ $hci{$id}->{'hci-version-hex'} = $3;
+ }
+ }
+ # LMP Version: 4.0 (0x6) Subversion: 0x220e
+ # LMP Version: 6.6 Revision: 0x1000 [don't know if this exists]
+ # LMP Version: (0x7) Subversion: 0x1
+ elsif (/^LMP Version:\s+(([0-9\.]+)\s+)?\(0x([0-9a-f]+)\)\s+Subversion:\s+0x([0-9a-f]+)/i){
+ $hci{$id}->{'lmp-subversion'} = $4;
+ $hci{$id}->{'bt-version'} = bluetooth_version(hex($3));
+ $hci{$id}->{'lmp-version'} = hex($3);
+ $hci{$id}->{'lmp-version-hex'} = $3;
+ }
+ elsif (/^Link policy:\s+(.*)/){
+ $hci{$id}->{'link-policy'} = lc($1);
+ }
+ elsif (/^Link mode:\s+(.*)/){
+ $hci{$id}->{'link-mode'} = lc($1);
+ }
+ elsif (/^Service Classes?:\s+(.+)/){
+ $hci{$id}->{'service-classes'} = main::clean_unset(lc($1));
+ }
+ }
+ print 'hciconfig: ', Data::Dumper::Dumper \%hci if $dbg[27];
+ main::log_data('dump','%hci', \%hci) if $b_log;
+ eval $end if $b_log;
+}
+
+sub rfkill_data {
+ eval $start if $b_log;
+ $b_rfk = 1;
+ my (@data,$id,$value);
+ if ($fake{'bluetooth'}){
+ my $file;
+ $file = "";
+ @data = main::reader($file,'strip');
+ }
+ else {
+ # /state is the state of rfkill, NOT bluetooth!
+ @data = main::globber('/sys/class/bluetooth/hci*/rfkill*/{hard,index,soft}');
+ }
+ # print Data::Dumper::Dumper \@data;
+ main::log_data('dump','@data', \@data) if $b_log;
+ foreach (@data){
+ $id = (split(/\//,$_))[4];
+ if (m|/soft$|){
+ $value = main::reader($_,'strip',0);
+ $hci{$id}->{'soft-blocked'} = ($value) ? 'yes': 'no';
+ $hci{$id}->{'state'} = 'down' if $hci{$id}->{'soft-blocked'} eq 'yes';
+ }
+ elsif (m|/hard$|){
+ $value = main::reader($_,'strip',0);
+ $hci{$id}->{'hard-blocked'} = ($value) ? 'yes': 'no';
+ $hci{$id}->{'state'} = 'down' if $hci{$id}->{'hard-blocked'} eq 'yes';
+ }
+ elsif (m|/index$|){
+ $value = main::reader($_,'strip',0);
+ $hci{$id}->{'rf-index'} = $value;
+ }
+ }
+ print 'rfkill: ', Data::Dumper::Dumper \%hci if $dbg[27];
+ main::log_data('dump','%hci', \%hci) if $b_log;
+ eval $end if $b_log;
+}
+
+sub check_service {
+ eval $start if $b_log;
+ if (!$b_service){
+ $service = ServiceData::get('status','bluetooth');
+ $service ||= 'N/A';
+ $b_service = 1;
+ }
+ eval $end if $b_log;
+}
+
+# args: 0: lmp versoin - could be hex, but probably decimal, like 6.6
+sub bluetooth_version {
+ eval $start if $b_log;
+ my ($lmp) = @_;
+ return if !defined $lmp;
+ return if !main::is_numeric($lmp);
+ $lmp = int($lmp);
+ # Conveniently, LMP starts with 0, so perfect for array indexes.
+ # 6.0 is coming, but might be 5.5 first, nobody knows.
+ my @bt = qw(1.0b 1.1 1.2 2.0 2.1 3.0 4.0 4.1 4.2 5.0 5.1 5.2 5.3 5.4);
+ return $bt[$lmp];
+ eval $end if $b_log;
+}
+}
+
+## CpuItem
+{
+package CpuItem;
+my (%fake_data,$type);
+
+sub get {
+ eval $start if $b_log;
+ ($type) = @_;
+ my $rows = [];
+ if ($type eq 'short' || $type eq 'basic'){
+ # note, for short form, just return the raw data, not the processed output
+ my $cpu = short_data();
+ if ($type eq 'basic'){
+ short_output($rows,$cpu);
+ }
+ else {
+ $rows = $cpu;
+ }
+ }
+ else {
+ full_output($rows);
}
- if (my $file = main::system_files('cpuinfo')){
- %cpu = data_cpuinfo($file,'full');
+ eval $end if $b_log;
+ return $rows;
+}
+
+## OUTPUT HANDLERS ##
+sub full_output {
+ eval $start if $b_log;
+ my $rows = $_[0];
+ my $num = 0;
+ my ($b_speeds,$core_speeds_value,$cpu);
+ my $sleep = $cpu_sleep * 1000000;
+ if (my $file = $system_files{'proc-cpuinfo'}){
+ $cpu = cpuinfo_data($file);
}
- elsif ($bsd_type ){
+ elsif ($bsd_type){
my ($key1,$val1) = ('','');
- if ( $alerts{'sysctl'} ){
- if ( $alerts{'sysctl'}{'action'} eq 'use' ){
+ if ($alerts{'sysctl'}){
+ if ($alerts{'sysctl'}->{'action'} eq 'use'){
# $key1 = 'Status';
-# $val1 = main::row_defaults('dev');
- %cpu = data_sysctl('full');
+# $val1 = main::message('dev');
+ $cpu = sysctl_data();
}
else {
- $key1 = ucfirst($alerts{'sysctl'}{'action'});
- $val1 = $alerts{'sysctl'}{$alerts{'sysctl'}{'action'}};
- @data = ({main::key($num++,0,1,$key1) => $val1,});
- return @data;
- }
- }
- }
- my %properties = cpu_properties(%cpu);
- my $type = ($properties{'cpu-type'}) ? $properties{'cpu-type'}: '';
- my $ref = $cpu{'processors'};
- my @processors = @$ref;
- my @speeds = cpu_speeds(@processors);
- my $j = scalar @rows;
- $cpu{'model_name'} ||= 'N/A';
- @data = ({
- main::key($num++,1,1,'Topology') => $properties{'cpu-layout'},
- main::key($num++,0,2,'model') => $cpu{'model_name'},
+ $key1 = ucfirst($alerts{'sysctl'}->{'action'});
+ $val1 = $alerts{'sysctl'}->{'message'};
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
+ return;
+ }
+ }
+ }
+ my $properties = cpu_properties($cpu);
+ my $type = ($properties->{'cpu-type'}) ? $properties->{'cpu-type'}: '';
+ my $j = scalar @$rows;
+ $cpu->{'model_name'} ||= 'N/A';
+ push(@$rows, {
+ main::key($num++,1,1,'Info') => $properties->{'topology-string'},
+ main::key($num++,0,2,'model') => $cpu->{'model_name'},
},);
- @rows = (@rows,@data);
- if ($cpu{'system-cpus'}){
- my $ref = $cpu{'system-cpus'};
- my %system_cpus = %$ref;
+ if ($cpu->{'system-cpus'}){
+ my %system_cpus = %{$cpu->{'system-cpus'}};
my $i = 1;
- my $counter = ( %system_cpus && scalar keys %system_cpus > 1 ) ? '-' : '';
+ my $counter = (%system_cpus && scalar keys %system_cpus > 1) ? '-' : '';
foreach my $key (keys %system_cpus){
$counter = '-' . $i++ if $counter;
- $rows[$j]{main::key($num++,0,2,'variant'.$counter)} = $key;
+ $rows->[$j]{main::key($num++,0,2,'variant'.$counter)} = $key;
}
}
- if ($b_admin && $properties{'socket'}){
- if ($properties{'upgrade'}){
- $rows[$j]{main::key($num++,1,2,'socket')} = $properties{'socket'} . ' (' . $properties{'upgrade'} . ')';
- $rows[$j]{main::key($num++,0,3,'note')} = 'check';
+ if ($b_admin && $properties->{'socket'}){
+ if ($properties->{'upgrade'}){
+ $rows->[$j]{main::key($num++,1,2,'socket')} = $properties->{'socket'} . ' (' . $properties->{'upgrade'} . ')';
+ $rows->[$j]{main::key($num++,0,3,'note')} = main::message('note-check');
}
else {
- $rows[$j]{main::key($num++,0,2,'socket')} = $properties{'socket'};
+ $rows->[$j]{main::key($num++,0,2,'socket')} = $properties->{'socket'};
}
}
- $properties{'bits-sys'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'bits')} = $properties{'bits-sys'};
+ $properties->{'bits-sys'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'bits')} = $properties->{'bits-sys'};
if ($type){
- $rows[$j]{main::key($num++,0,2,'type')} = $type;
+ $rows->[$j]{main::key($num++,0,2,'type')} = $type;
+ if (!$properties->{'topology-full'} && $cpu->{'smt'} && ($extra > 2 ||
+ ($extra > 0 && $cpu->{'smt'} eq 'disabled'))){
+ $rows->[$j]{main::key($num++,0,2,'smt')} = $cpu->{'smt'};
+ }
}
if ($extra > 0){
- $cpu{'arch'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'arch')} = $cpu{'arch'};
- if ( !$b_admin && $cpu{'arch'} ne 'N/A' && $cpu{'rev'} ){
- $rows[$j]{main::key($num++,0,2,'rev')} = $cpu{'rev'};
+ $cpu->{'arch'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,2,'arch')} = $cpu->{'arch'};
+ if ($cpu->{'arch-note'}){
+ $rows->[$j]{main::key($num++,0,3,'note')} = $cpu->{'arch-note'};
}
- }
- if ($b_admin){
- $rows[$j]{main::key($num++,0,2,'family')} = hex_and_decimal($cpu{'family'});
- $rows[$j]{main::key($num++,0,2,'model-id')} = hex_and_decimal($cpu{'model_id'});
- $rows[$j]{main::key($num++,0,2,'stepping')} = hex_and_decimal($cpu{'rev'});
- $cpu{'microcode'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'microcode')} = $cpu{'microcode'};
- }
- if ($extra > 1 && $properties{'l1-cache'}){
- $rows[$j]{main::key($num++,0,2,'L1 cache')} = $properties{'l1-cache'};
- }
- $properties{'l2-cache'} ||= 'N/A';
- if (!$b_arm || ($b_arm && $properties{'l2-cache'} ne 'N/A')){
- $rows[$j]{main::key($num++,0,2,'L2 cache')} = $properties{'l2-cache'};
- }
- if ($extra > 1 && $properties{'l3-cache'}){
- $rows[$j]{main::key($num++,0,2,'L3 cache')} = $properties{'l3-cache'};
- }
-
- if ($extra > 0 && !$show{'cpu-flag'}){
- $j = scalar @rows;
- @flags = split /\s+/, $cpu{'flags'} if $cpu{'flags'};
- $flag_key = ($b_arm || $bsd_type) ? 'features': 'flags';
- my $flag = 'N/A';
- if (@flags){
- # failure to read dmesg.boot: dmesg.boot permissions; then short -Cx list flags
- @flags = grep {/^(dmesg.boot|permissions|avx[2-9]?|lm|nx|pae|pni|(sss|ss)e([2-9])?([a-z])?(_[0-9])?|svm|vmx)$/} @flags;
- @flags = map {s/pni/sse3/; $_} @flags;
- @flags = sort(@flags);
- $flag = join ' ', @flags if @flags;
+ if ($b_admin && $cpu->{'gen'}){
+ $rows->[$j]{main::key($num++,0,3,'gen')} = $cpu->{'gen'};
}
- if ($b_arm && $flag eq 'N/A'){
- $flag = main::row_defaults('arm-cpu-f');
+ if ($b_admin && $properties->{'arch-level'}){
+ $rows->[$j]{main::key($num++,1,2,'level')} = $properties->{'arch-level'}[0];
+ if ($properties->{'arch-level'}[1]){
+ $rows->[$j]{main::key($num++,0,3,'note')} = $properties->{'arch-level'}[1];
+ }
}
- @data = ({
- main::key($num++,0,2,$flag_key) => $flag,
+ if ($b_admin){
+ if ($cpu->{'year'}){
+ $rows->[$j]{main::key($num++,0,2,'built')} = $cpu->{'year'};
+ }
+ if ($cpu->{'process'}){
+ $rows->[$j]{main::key($num++,0,2,'process')} = $cpu->{'process'};
+ }
+ }
+ # note: had if arch, but stepping can be defined where arch failed, stepping can be 0
+ if (!$b_admin && (defined $cpu->{'stepping'} || defined $cpu->{'revision'})){
+ my $rev = main::get_defined($cpu->{'stepping'},$cpu->{'revision'});
+ $rows->[$j]{main::key($num++,0,2,'rev')} = $rev;
+ }
+ }
+ if ($b_admin){
+ $rows->[$j]{main::key($num++,0,2,'family')} = hex_and_decimal($cpu->{'family'});
+ $rows->[$j]{main::key($num++,0,2,'model-id')} = hex_and_decimal($cpu->{'model-id'});
+ if (defined $cpu->{'stepping'}){
+ $rows->[$j]{main::key($num++,0,2,'stepping')} = hex_and_decimal($cpu->{'stepping'});
+ }
+ elsif (defined $cpu->{'revision'}){
+ $rows->[$j]{main::key($num++,0,2,'rev')} = $cpu->{'revision'};
+ }
+ if (!%risc && $cpu->{'type'} ne 'elbrus'){
+ $cpu->{'microcode'} = ($cpu->{'microcode'}) ? '0x' . $cpu->{'microcode'} : 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'microcode')} = $cpu->{'microcode'};
+ }
+ }
+ # note, risc cpus are using l1, L2, L3 more often, but if risc and no L2, skip
+ if ($properties->{'topology-string'} && (($extra > 1 &&
+ ($properties->{'l1-cache'} || $properties->{'l3-cache'})) ||
+ (!%risc || $properties->{'l2-cache'}) || $properties->{'cache'})){
+ full_output_caches($j,$properties,\$num,$rows);
+ }
+ # all tests already done to load this, admin, etc
+ if ($properties->{'topology-full'}){
+ $j = scalar @$rows;
+ push(@$rows, {
+ main::key($num++,1,1,'Topology') => '',
},);
- @rows = (@rows,@data);
- $b_flags = 1;
+ my ($id,$var) = (2,'');
+ if (scalar @{$properties->{'topology-full'}} > 1){
+ $var = 'variant';
+ $id = 3;
+ }
+ foreach my $topo (@{$properties->{'topology-full'}}){
+ if ($var){
+ $rows->[$j]{main::key($num++,1,2,'variant')} = '';
+ }
+ my $x = ($size{'max-cols'} == 1 || $output_type ne 'screen') ? '' : 'x';
+ $rows->[$j]{main::key($num++,0,$id,'cpus')} = $topo->{'cpus'} . $x;
+ $rows->[$j]{main::key($num++,1,$id+1,'cores')} = $topo->{'cores'};
+ if ($topo->{'cores-mt'} && $topo->{'cores-st'}){
+ $rows->[$j]{main::key($num++,1,$id+2,'mt')} = $topo->{'cores-mt'};
+ $rows->[$j]{main::key($num++,0,$id+3,'tpc')} = $topo->{'tpc'};
+ $rows->[$j]{main::key($num++,0,$id+2,'st')} = $topo->{'cores-st'};
+ }
+ elsif ($topo->{'cores-mt'}){
+ $rows->[$j]{main::key($num++,0,$id+2,'tpc')} = $topo->{'tpc'};
+ }
+ if ($topo->{'max'} || $topo->{'min'}){
+ my ($freq,$key) = ('','');
+ if ($topo->{'max'} && $topo->{'min'}){
+ $key = 'min/max';
+ $freq = $topo->{'min'} . '/' . $topo->{'max'};
+ }
+ elsif ($topo->{'max'}){
+ $key = 'max';
+ $freq = $topo->{'max'};
+ }
+ else {
+ $key = 'min';
+ $freq = $topo->{'min'};
+ }
+ $rows->[$j]{main::key($num++,0,$id+1,$key)} = $freq;
+ }
+ if ($topo->{'threads'}){
+ $rows->[$j]{main::key($num++,0,$id+1,'threads')} = $topo->{'threads'};
+ }
+ if ($topo->{'dies'}){
+ $rows->[$j]{main::key($num++,0,$id+1,'dies')} = $topo->{'dies'};
+ }
+ }
+ $cpu->{'smt'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'smt')} = $cpu->{'smt'};
+ full_output_caches($j,$properties,\$num,$rows);
}
- if ($extra > 0 && !$bsd_type){
- my $bogomips = (main::is_numeric($cpu{'bogomips'})) ? int($cpu{'bogomips'}) : 'N/A';
- $rows[$j]{main::key($num++,0,2,'bogomips')} = $bogomips;
- }
- $j = scalar @rows;
- my $core_key = (scalar @speeds > 1) ? 'Core speeds (MHz)' : 'Core speed (MHz)';
- my $speed_key = ($properties{'speed-key'}) ? $properties{'speed-key'}: 'Speed';
- my $min_max = ($properties{'min-max'}) ? $properties{'min-max'}: 'N/A';
- my $min_max_key = ($properties{'min-max-key'}) ? $properties{'min-max-key'}: 'min/max';
- my $speed = (defined $properties{'speed'}) ? $properties{'speed'}: 'N/A';
- # aren't able to get per core speeds in bsds yet
- if (@speeds){
- if (grep {$_ ne '0'} @speeds){
+ my $speeds = $cpu->{'processors'};
+ my $core_key = (defined $speeds && scalar @{$speeds} > 1) ? 'cores' : 'core';
+ my $speed_key = ($properties->{'speed-key'}) ? $properties->{'speed-key'}: 'Speed';
+ my $min_max = ($properties->{'min-max'}) ? $properties->{'min-max'}: 'N/A';
+ my $min_max_key = ($properties->{'min-max-key'}) ? $properties->{'min-max-key'}: 'min/max';
+ my $speed = '';
+ if (!$properties->{'avg-speed-key'}){
+ $speed = (defined $properties->{'speed'}) ? $properties->{'speed'}: 'N/A';
+ }
+ # Aren't able to get per core speeds in BSDs. Why don't they support this?
+ if (defined $speeds && @$speeds){
+ # only if defined and not 0
+ if (grep {$_} @{$speeds}){
$core_speeds_value = '';
$b_speeds = 1;
}
else {
- $core_speeds_value = main::row_defaults('cpu-speeds',scalar @speeds);
+ my $id = ($bsd_type) ? 'cpu-speeds-bsd' : 'cpu-speeds';
+ $core_speeds_value = main::message($id);
}
}
else {
- $core_speeds_value = 'N/A';
+ $core_speeds_value = main::message('cpu-speeds');
}
- $j = scalar @rows;
- @data = ({
+ $j = scalar @$rows;
+ push(@$rows, {
main::key($num++,1,1,$speed_key) => $speed,
- main::key($num++,0,2,$min_max_key) => $min_max,
});
- @rows = (@rows,@data);
- if ($b_admin && $properties{'dmi-speed'} && $properties{'dmi-max-speed'}){
- $rows[$j]{main::key($num++,0,2,'base/boost')} = $properties{'dmi-speed'} . '/' . $properties{'dmi-max-speed'};
+ if ($properties->{'avg-speed-key'}){
+ $rows->[$j]{main::key($num++,0,2,$properties->{'avg-speed-key'})} = $properties->{'speed'};
+ if ($extra > 0 && $properties->{'high-speed-key'}){
+ $rows->[$j]{main::key($num++,0,2,$properties->{'high-speed-key'})} = $cpu->{'high-freq'};
+ }
+ }
+ $rows->[$j]{main::key($num++,0,2,$min_max_key)} = $min_max;
+ if ($extra > 0 && defined $cpu->{'boost'}){
+ $rows->[$j]{main::key($num++,0,2,'boost')} = $cpu->{'boost'};
+ }
+ if ($b_admin && $properties->{'dmi-speed'} && $properties->{'dmi-max-speed'}){
+ $rows->[$j]{main::key($num++,0,2,'base/boost')} = $properties->{'dmi-speed'} . '/' . $properties->{'dmi-max-speed'};
+ }
+ if ($b_admin && ($cpu->{'governor'} || $cpu->{'scaling-driver'})){
+ $rows->[$j]{main::key($num++,1,2,'scaling')} = '';
+ $cpu->{'driver'} ||= 'N/A';
+ $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'};
+ # only set if different from cpu min/max
+ if ($cpu->{'scaling-min-max'} && $cpu->{'scaling-min-max-key'}){
+ $rows->[$j]{main::key($num++,0,3,$cpu->{'scaling-min-max-key'})} = $cpu->{'scaling-min-max'};
+ }
}
if ($extra > 2){
- my $boost = get_boost_status();
- $rows[$j]{main::key($num++,0,2,'boost')} = $boost if $boost;
- if ($properties{'volts'}){
- $rows[$j]{main::key($num++,0,2,'volts')} = $properties{'volts'} . ' V';
+ if ($properties->{'volts'}){
+ $rows->[$j]{main::key($num++,0,2,'volts')} = $properties->{'volts'} . ' V';
}
- if ($properties{'ext-clock'}){
- $rows[$j]{main::key($num++,0,2,'ext-clock')} = $properties{'ext-clock'};
+ if ($properties->{'ext-clock'}){
+ $rows->[$j]{main::key($num++,0,2,'ext-clock')} = $properties->{'ext-clock'};
}
}
- $rows[$j]{main::key($num++,1,2,$core_key)} = $core_speeds_value;
+ $rows->[$j]{main::key($num++,1,2,$core_key)} = $core_speeds_value;
my $i = 1;
# if say 96 0 speed cores, no need to print all those 0s
if ($b_speeds){
- foreach (@speeds){
- $rows[$j]{main::key($num++,0,3,$i++)} = $_;
+ foreach (@{$speeds}){
+ $rows->[$j]{main::key($num++,0,3,$i++)} = $_;
}
}
- if ($show{'cpu-flag'} && !$b_flags){
- $flag_key = ($b_arm || $bsd_type) ? 'Features': 'Flags';
- @flags = split /\s+/, $cpu{'flags'} if $cpu{'flags'};
+ if ($extra > 0 && !$bsd_type){
+ my $bogomips = ($cpu->{'bogomips'} &&
+ main::is_numeric($cpu->{'bogomips'})) ? int($cpu->{'bogomips'}) : 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'bogomips')} = $bogomips;
+ }
+ if (($extra > 0 && !$show{'cpu-flag'}) || $show{'cpu-flag'}){
+ my @flags = ($cpu->{'flags'}) ? split(/\s+/, $cpu->{'flags'}) : ();
+ my $flag_key = (%risc || $bsd_type) ? 'Features': 'Flags';
my $flag = 'N/A';
+ if (!$show{'cpu-flag'}){
+ if (@flags){
+ # failure to read dmesg.boot: dmesg.boot permissions; then short -Cx list flags
+ @flags = grep {/^(dmesg.boot|permissions|avx[2-9]?|ht|lm|nx|pae|pni|(sss|ss)e([2-9])?([a-z])?(_[0-9])?|svm|vmx)$/} @flags;
+ @flags = map {s/pni/sse3/; $_} @flags if @flags;
+ @flags = sort @flags;
+ }
+ # only ARM has Features, never seen them for MIPS/PPC/SPARC/RISCV, but check
+ if ($risc{'arm'} && $flag eq 'N/A'){
+ $flag = main::message('arm-cpu-f');
+ }
+ }
if (@flags){
- @flags = sort(@flags);
- $flag = join ' ', @flags if @flags;
+ @flags = sort @flags;
+ $flag = join(' ', @flags);
}
- @data = ({
+ push(@$rows, {
main::key($num++,0,1,$flag_key) => $flag,
},);
- @rows = (@rows,@data);
}
if ($b_admin){
- my @bugs = cpu_bugs_sys();
my $value = '';
- if (!@bugs){
- if ( $cpu{'bugs'}){
- my @proc_bugs = split /\s+/, $cpu{'bugs'};
- @proc_bugs = sort(@proc_bugs);
- $value = join ' ', @proc_bugs;
+ if (!defined $cpu->{'bugs-hash'}){
+ if ($cpu->{'bugs-string'}){
+ my @proc_bugs = split(/\s+/, $cpu->{'bugs-string'});
+ @proc_bugs = sort @proc_bugs;
+ $value = join(' ', @proc_bugs);
}
else {
- $value = main::row_defaults('cpu-bugs-null');
+ $value = main::message('cpu-bugs-null');
}
}
- @data = ({
+ if ($use{'filter-vulnerabilities'} &&
+ (defined $cpu->{'bugs-hash'} || $cpu->{'bugs-string'})){
+ $value = $filter_string;
+ undef $cpu->{'bugs-hash'};
+ }
+ push(@$rows, {
main::key($num++,1,1,'Vulnerabilities') => $value,
},);
- @rows = (@rows,@data);
- if (@bugs){
- $j = $#rows;
- foreach my $ref (@bugs){
- my @bug = @$ref;
- $rows[$j]{main::key($num++,1,2,'Type')} = $bug[0];
- $rows[$j]{main::key($num++,0,3,$bug[1])} = $bug[2];
+ if (defined $cpu->{'bugs-hash'}){
+ $j = scalar @$rows;
+ foreach my $key (sort keys %{$cpu->{'bugs-hash'}}){
+ $rows->[$j]{main::key($num++,1,2,'Type')} = $key;
+ $rows->[$j]{main::key($num++,0,3,$cpu->{'bugs-hash'}->{$key}[0])} = $cpu->{'bugs-hash'}->{$key}[1];
$j++;
}
}
}
eval $end if $b_log;
- return @rows;
}
-sub create_output_short {
+
+# $num, $rows passed by reference
+sub full_output_caches {
eval $start if $b_log;
- my (@cpu) = @_;
- my @data;
+ my ($j,$properties,$num,$rows) = @_;
+ my $value = '';
+ if (!$properties->{'l1-cache'} && !$properties->{'l2-cache'} &&
+ !$properties->{'l3-cache'}){
+ $value = ($properties->{'cache'}) ? $properties->{'cache'} : 'N/A';
+ }
+ $rows->[$j]{main::key($$num++,1,2,'cache')} = $value;
+ if ($extra > 0 && $properties->{'l1-cache'}){
+ $rows->[$j]{main::key($$num++,2,3,'L1')} = $properties->{'l1-cache'};
+ if ($b_admin && ($properties->{'l1d-desc'} || $properties->{'l1i-desc'})){
+ my $desc = '';
+ if ($properties->{'l1d-desc'}){
+ $desc .= 'd-' . $properties->{'l1d-desc'};
+ }
+ if ($properties->{'l1i-desc'}){
+ $desc .= '; ' if $desc;
+ $desc .= 'i-' . $properties->{'l1i-desc'};
+ }
+ $rows->[$j]{main::key($$num++,0,4,'desc')} = $desc;
+ }
+ }
+ # $rows->[$j]{main::key($$num++,1,$l,$key)} = $support;
+ if (!$value){
+ $properties->{'l2-cache'} = ($properties->{'l2-cache'}) ? $properties->{'l2-cache'} : 'N/A';
+ $rows->[$j]{main::key($$num++,1,3,'L2')} = $properties->{'l2-cache'};
+ if ($b_admin && $properties->{'l2-desc'}){
+ $rows->[$j]{main::key($$num++,0,4,'desc')} = $properties->{'l2-desc'};
+ }
+ }
+ if ($extra > 0 && $properties->{'l3-cache'}){
+ $rows->[$j]{main::key($$num++,1,3,'L3')} = $properties->{'l3-cache'};
+ if ($b_admin && $properties->{'l3-desc'}){
+ $rows->[$j]{main::key($$num++,0,4,'desc')} = $properties->{'l3-desc'};
+ }
+ }
+ if ($properties->{'cache-check'}){
+ $rows->[$j]{main::key($$num++,0,3,'note')} = $properties->{'cache-check'};
+ }
+ eval $end if $b_log;
+}
+
+sub short_output {
+ eval $start if $b_log;
+ my ($rows,$cpu) = @_;
my $num = 0;
- $cpu[1] ||= main::row_defaults('cpu-model-null');
- $cpu[2] ||= 'N/A';
- @data = ({
- main::key($num++,1,1,$cpu[0]) => $cpu[1],
- main::key($num++,0,2,'type') => $cpu[2],
- },);
+ $cpu->[1] ||= main::message('cpu-model-null');
+ $cpu->[2] ||= 'N/A';
+ push(@$rows,{
+ main::key($num++,1,1,'Info') => $cpu->[0] . ' ' . $cpu->[1] . ' [' . $cpu->[2] . ']'
+ #main::key($num++,0,2,'type') => $cpu->[2],
+ });
if ($extra > 0){
- $data[0]{main::key($num++,0,2,'arch')} = $cpu[7];
+ $rows->[0]{main::key($num++,1,2,'arch')} = $cpu->[8];
+ if ($cpu->[9]){
+ $rows->[0]{main::key($num++,0,3,'note')} = $cpu->[9];
+ }
+ }
+ my $value = ($cpu->[7]) ? '' : $cpu->[4];
+ $rows->[0]{main::key($num++,1,2,$cpu->[3])} = $value;
+ if ($cpu->[7]){
+ $rows->[0]{main::key($num++,0,3,$cpu->[7])} = $cpu->[4];
}
- $data[0]{main::key($num++,0,2,$cpu[3])} = $cpu[4];
- if ($cpu[6]){
- $data[0]{main::key($num++,0,2,$cpu[5])} = $cpu[6];
+ if ($cpu->[6]){
+ $rows->[0]{main::key($num++,0,3,$cpu->[5])} = $cpu->[6];
}
eval $end if $b_log;
- return @data;
}
-sub data_short {
+
+## SHORT OUTPUT DATA ##
+sub short_data {
eval $start if $b_log;
- my ($type) = @_;
my $num = 0;
- my (%cpu,@data,%speeds);
+ my ($cpu,$data,%speeds);
my $sys = '/sys/devices/system/cpu/cpufreq/policy0';
- my $sleep = $cpu_sleep * 1000000;
- if ($b_hires){
- eval 'Time::HiRes::usleep( $sleep )';
- }
- else {
- select(undef, undef, undef, $cpu_sleep);
- }
# NOTE: : Permission denied, ie, this is not always readable
# /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq
- if (my $file = main::system_files('cpuinfo')){
- %cpu = data_cpuinfo($file,$type);
+ if (my $file = $system_files{'proc-cpuinfo'}){
+ $cpu = cpuinfo_data($file);
}
- elsif ($bsd_type ){
+ elsif ($bsd_type){
my ($key1,$val1) = ('','');
- if ( $alerts{'sysctl'} ){
- if ( $alerts{'sysctl'}{'action'} eq 'use' ){
+ if ($alerts{'sysctl'}){
+ if ($alerts{'sysctl'}->{'action'} eq 'use'){
# $key1 = 'Status';
-# $val1 = main::row_defaults('dev');
- %cpu = data_sysctl($type);
+# $val1 = main::message('dev');
+ $cpu = sysctl_data($type);
}
else {
- $key1 = ucfirst($alerts{'sysctl'}{'action'});
- $val1 = $alerts{'sysctl'}{$alerts{'sysctl'}{'action'}};
- @data = ({main::key($num++,0,1,$key1) => $val1,});
- return @data;
+ $key1 = ucfirst($alerts{'sysctl'}->{'action'});
+ $val1 = $alerts{'sysctl'}->{'message'};
+ $data = ({main::key($num++,0,1,$key1) => $val1,});
+ return $data;
}
}
}
- # $cpu{'cur-freq'} = $cpu[0]{'core-id'}[0]{'speed'};
- if ($type eq 'short' || $type eq 'basic'){
- @data = prep_short_data(%cpu);
- }
- if ($type eq 'basic'){
- @data = create_output_short(@data);
- }
+ # $cpu{'cur-freq'} = $cpu[0]->{'core-id'}[0]{'speed'};
+ $data = prep_short_data($cpu);
eval $end if $b_log;
- return @data;
+ return $data;
}
sub prep_short_data {
eval $start if $b_log;
- my (%cpu) = @_;
- my %properties = cpu_properties(%cpu);
+ my ($cpu_data) = @_;
+ my $properties = cpu_properties($cpu_data);
my ($cpu,$speed_key,$speed,$type) = ('','speed',0,'');
- $cpu = $cpu{'model_name'} if $cpu{'model_name'};
- $type = $properties{'cpu-type'} if $properties{'cpu-type'};
- $speed_key = $properties{'speed-key'} if $properties{'speed-key'};
- $speed = $properties{'speed'} if $properties{'speed'};
- my @result = (
- $properties{'cpu-layout'},
+ $cpu = $cpu_data->{'model_name'} if $cpu_data->{'model_name'};
+ $type = $properties->{'cpu-type'} if $properties->{'cpu-type'};
+ $speed_key = $properties->{'speed-key'} if $properties->{'speed-key'};
+ $speed = $properties->{'speed'} if $properties->{'speed'};
+ my $result = [
+ $properties->{'topology-string'},
$cpu,
$type,
$speed_key,
$speed,
- $properties{'min-max-key'},
- $properties{'min-max'},
- );
+ $properties->{'min-max-key'},
+ $properties->{'min-max'},
+ $properties->{'avg-speed-key'},
+ ];
if ($extra > 0){
- $cpu{'arch'} ||= 'N/A';
- $result[7] = $cpu{'arch'};
+ $cpu_data->{'arch'} ||= 'N/A';
+ $result->[8] = $cpu_data->{'arch'};
+ $result->[9] = $cpu_data->{'arch-note'};
}
eval $end if $b_log;
- return @result;
+ return $result;
}
-sub data_cpuinfo {
- eval $start if $b_log;
- my ($file,$type)= @_;
- my ($arch,@ids,@line,$b_first,$b_proc_int,$starter);
- # use --arm flag when testing arm cpus
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/arm-4-core-pinebook-1.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/armv6-single-core-1.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/armv7-dual-core-1.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/armv7-new-format-model-name-single-core.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/arm-2-die-96-core-rk01.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/amd/16-core-32-mt-ryzen.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/amd/2-16-core-epyc-abucodonosor.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/amd/2-core-probook-antix.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/amd/4-core-jean-antix.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/2-10-core-xeon-ht.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/4-core-xeon-fake-dual-die-zyanya.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/2-core-i5-fake-dual-die-hek.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/2-1-core-xeon-vm-vs2017.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";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/mips/mips-mainusg-cpuinfo.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/ppc/ppc-debian-ppc64-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";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/1xE2S4-3-monocub.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/1xMBE8C-7.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/4xEL2S4-3.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/4xE8C-7.txt";
- # $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/4xE2CDSP-4.txt";
- my %speeds = set_cpu_speeds_sys();
- my @cpuinfo = main::reader($file);
- my @phys_cpus = (0);# start with 1 always
- my ($core_count,$die_holder,$die_id,$phys_id,$proc_count,$speed) = (0,0,0,0,0,0,0);
- my ($phys_holder) = (undef);
+## PRIMARY DATA GENERATORS ##
+sub cpuinfo_data {
+ eval $start if $b_log;
+ my ($file)= @_;
+ my ($cpu,$arch,$note,$temp);
+ # has to be set above fake cpu section
+ set_cpu_data(\$cpu);
+ set_fake_data() if $fake{'cpu'} && !$loaded{'cpu-fake-data'};
+ # sleep is also set in front of sysctl_data for BSDs, same idea
+ my $sleep = $cpu_sleep * 1000000;
+ if ($b_hires){
+ eval 'Time::HiRes::usleep($sleep)';
+ }
+ else {
+ select(undef, undef, undef, $cpu_sleep);
+ }
+ # Run first to get raw as possible speeds
+ cpuinfo_speed_sys(\$cpu) if $fake{'cpu'} || -e '/sys/devices/system/cpu/';
+ cpuinfo_data_grabber($file,\$cpu->{'type'}) if !$loaded{'cpuinfo'};
+ $cpu->{'type'} = cpu_vendor($cpu_arch) if $cpu_arch eq 'elbrus'; # already set to lower
+ my ($core_count,$proc_count,$speed) = (0,0,0);
+ my ($b_block_1) = (1);
# need to prime for arm cpus, which do not have physical/core ids usually
# level 0 is phys id, level 1 is die id, level 2 is core id
- #$ids[0] = ([(0)]);
- $ids[0] = ([]);
- $ids[0][0] = ([]);
- my %cpu = set_cpu_data();
- $cpu{'type'} = cpu_vendor($cpu_arch) if $cpu_arch =~ /e2k/; # already set to lower
- #$cpu{'type'} = 'elbrus';
# note, there con be a lot of processors, 32 core HT would have 64, for example.
- foreach (@cpuinfo){
- next if /^\s*$/;
- @line = split /\s*:\s*/, $_;
- next if !$line[0];
- $starter = $line[0]; # preserve case for one specific ARM issue
- $line[0] = lc($line[0]);
- if ($b_arm && !$b_first && $starter eq 'Processor' && $line[1] !~ /^\d+$/){
- #print "l1:$line[1]\n";
- $cpu{'model_name'} = main::cleaner($line[1]);
- $cpu{'model_name'} = cpu_cleaner($cpu{'model_name'});
- $cpu{'type'} = 'arm';
- # Processor : AArch64 Processor rev 4 (aarch64)
- # Processor : Feroceon 88FR131 rev 1 (v5l)
- if ($cpu{'model_name'} && $cpu{'model_name'} =~ /(.*)\srev\s([\S]+)\s(\(([\S]+)\))?/){
- $cpu{'model_name'} = $1;
- $cpu{'rev'} = $2;
- if ($4){
- $cpu{'arch'} = $4;
- $cpu{'model_name'} .= ' ' . $cpu{'arch'} if $cpu{'model_name'} !~ /$cpu{'arch'}/i;
- }
- $cpu{'processors'}[$proc_count] = 0;
- $b_proc_int = 0;
- $b_first = 1;
- #print "p0:\n";
- }
- }
- elsif ($line[0] eq 'processor'){
- # this protects against double processor lines, one int, one string
- if ($line[1] =~ /^\d+$/){
- $b_proc_int = 1;
- $b_first = 1;
- $cpu{'processors'}[$proc_count] = 0;
- $proc_count++;
- #print "p1: $proc_count\n";
+ foreach my $block (@cpuinfo){
+ # get the repeated data for CPUs, after assign the dynamic per core data
+ next if !$block;
+ if ($b_block_1){
+ $b_block_1 = 0;
+ # this may also kick in for centaur/via types, but no data available, guess
+ if (!$cpu->{'type'} && $block->{'vendor_id'}){
+ $cpu->{'type'} = cpu_vendor($block->{'vendor_id'});
+ }
+ # PPC can use 'cpu', MIPS 'cpu model'
+ $temp = main::get_defined($block->{'model name'},$block->{'cpu'},
+ $block->{'cpu model'});
+ if ($temp){
+ $cpu->{'model_name'} = $temp;
+ $cpu->{'model_name'} = main::clean($cpu->{'model_name'});
+ $cpu->{'model_name'} = clean_cpu($cpu->{'model_name'});
+ if ($risc{'arm'} || $cpu->{'model_name'} =~ /ARM|AArch/i){
+ $cpu->{'type'} = 'arm';
+ if ($cpu->{'model_name'} =~ /(.*)\srev\s([\S]+)\s(\(([\S]+)\))?/){
+ $cpu->{'model_name'} = $1;
+ $cpu->{'stepping'} = $2;
+ if ($4){
+ $cpu->{'arch'} = $4;
+ if ($cpu->{'model_name'} !~ /\Q$cpu->{'arch'}\E/i){
+ $cpu->{'model_name'} .= ' ' . $cpu->{'arch'};
+ }
+ }
+ # print "p0:\n";
+ }
+ }
+ elsif ($risc{'mips'} || $cpu->{'model_name'} =~ /mips/i){
+ $cpu->{'type'} = 'mips';
+ }
}
- else {
- if (!$b_proc_int){
- $cpu{'processors'}[$proc_count] = 0;
- $proc_count++;
- #print "p2a: $proc_count\n";
- }
- if (!$b_first ){
- # note: alternate:
- # Processor : AArch64 Processor rev 4 (aarch64)
- # but no model name type
- if ( $b_arm || $line[1] =~ /ARM|AArch/i){
- $b_arm = 1;
- $cpu{'type'} = 'arm';
+ $temp = main::get_defined($block->{'architecture'},
+ $block->{'cpu family'},$block->{'cpu architecture'});
+ if ($temp){
+ if ($temp =~ /^\d+$/){
+ # translate integers to hex
+ $cpu->{'family'} = uc(sprintf("%x",$temp));
+ }
+ elsif ($risc{'arm'}){
+ $cpu->{'arch'} = $temp;
+ }
+ }
+ # 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 (defined $temp ||
+ ($cpu->{'type'} eq 'elbrus' && defined $block->{'revision'})){
+ $temp = $block->{'revision'} if defined $block->{'revision'};
+ if ($temp =~ /^\d+$/){
+ $cpu->{'stepping'} = uc(sprintf("%x",$temp));
+ }
+ }
+ # PPC revision is a string, but elbrus revision is hex
+ 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'
+ $cpu->{'model-id'} = uc(sprintf("%x",$block->{'model'}));
+ }
+ if ($block->{'cpu variant'}){
+ $cpu->{'model-id'} = uc($block->{'cpu variant'});
+ $cpu->{'model-id'} =~ s/^0X//;
+ }
+ # this is per cpu, not total if > 1 pys cpus
+ if (!$cpu->{'cores'} && $block->{'cpu cores'}){
+ $cpu->{'cores'} = $block->{'cpu cores'};
+ }
+ ## this is only for -C full cpu output
+ if ($type eq 'full'){
+ # note: in cases where only cache is there, don't guess, it can be L1,
+ # L2, or L3, but never all of them added togehter, so give up.
+ if ($block->{'cache size'} &&
+ $block->{'cache size'} =~ /(\d+\s*[KMG])i?B?$/){
+ $cpu->{'cache'} = main::translate_size($1);
+ }
+ if ($block->{'l1 cache size'} &&
+ $block->{'l1 cache size'} =~ /(\d+\s*[KMG])i?B?$/){
+ $cpu->{'l1-cache'} = main::translate_size($1);
+ }
+ if ($block->{'l2 cache size'} &&
+ $block->{'l2 cache size'} =~ /(\d+\s*[KMG])i?B?$/){
+ $cpu->{'l2-cache'} = main::translate_size($1);
+ }
+ if ($block->{'l3 cache size'} &&
+ $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;
+ }
+ if ($b_admin){
+ # note: not used unless maybe /sys data missing?
+ if ($block->{'bugs'}){
+ $cpu->{'bugs-string'} = $block->{'bugs'};
}
- $cpu{'model_name'} = main::cleaner($line[1]);
- $cpu{'model_name'} = cpu_cleaner($cpu{'model'});
- #print "p2b:\n";
- }
- $b_first = 1;
- }
- }
- elsif (!$cpu{'family'} &&
- ($line[0] eq 'architecture' || $line[0] eq 'cpu family' || $line[0] eq 'cpu architecture' )){
- if ($line[1] =~ /^\d+$/){
- # translate integers to hex
- $cpu{'family'} = uc(sprintf("%x", $line[1]));
- }
- elsif ($b_arm) {
- $cpu{'arch'} = $line[1];
- }
- }
- elsif (!$cpu{'rev'} && ($line[0] eq 'stepping' || $line[0] eq 'cpu revision')){
- $cpu{'rev'} = uc(sprintf("%x", $line[1]));
- }
- # ppc
- elsif (!$cpu{'rev'} && $line[0] eq 'revision'){
- $cpu{'rev'} = $line[1];
- }
- # this is hex so uc for cpu arch id. raspi 4 has Model rather than Hard
- elsif (!$cpu{'model_id'} && (!$b_ppc && !$b_arm && $line[0] eq 'model') ){
- $cpu{'model_id'} = uc(sprintf("%x", $line[1]));
- }
- elsif (!$cpu{'model_id'} && $line[0] eq 'cpu variant' ){
- $cpu{'model_id'} = uc($line[1]);
- $cpu{'model_id'} =~ s/^0X//;
- }
- # cpu can show in arm
- elsif (!$cpu{'model_name'} && ( $line[0] eq 'model name' || $line[0] eq 'cpu' || $line[0] eq 'cpu model' )){
- $cpu{'model_name'} = main::cleaner($line[1]);
- $cpu{'model_name'} = cpu_cleaner($cpu{'model_name'});
- if ( $b_arm || $line[1] =~ /ARM|AArch/i){
- $b_arm = 1;
- $cpu{'type'} = 'arm';
- if ($cpu{'model_name'} && $cpu{'model_name'} =~ /(.*)\srev\s([\S]+)\s(\(([\S]+)\))?/){
- $cpu{'model_name'} = $1;
- $cpu{'rev'} = $2;
- if ($4){
- $cpu{'arch'} = $4;
- $cpu{'model_name'} .= ' ' . $cpu{'arch'} if $cpu{'model_name'} !~ /$cpu{'arch'}/i;
+ # unlike family and model id, microcode appears to be hex already
+ if ($block->{'microcode'}){
+ if ($block->{'microcode'} =~ /0x/){
+ $cpu->{'microcode'} = uc($block->{'microcode'});
+ $cpu->{'microcode'} =~ s/^0X//;
+ }
+ else {
+ $cpu->{'microcode'} = uc(sprintf("%x",$block->{'microcode'}));
+ }
}
- #$cpu{'processors'}[$proc_count] = 0;
}
}
- elsif ($b_mips || $line[1] =~ /mips/i){
- $b_mips = 1;
- $cpu{'type'} = 'mips';
- }
}
- elsif ( $line[0] eq 'cpu mhz' || $line[0] eq 'clock' ){
- $speed = speed_cleaner($line[1]);
- $cpu{'processors'}[$proc_count-1] = $speed;
- #$ids[$phys_id][$die_id] = ([($speed)]);
+ # These occurs in a separate block with E2C3, last in cpuinfo blocks,
+ # otherwise per block in E8C variants
+ if ($cpu->{'type'} eq 'elbrus' && (!$cpu->{'l1i-cache'} &&
+ !$cpu->{'l1d-cache'} && !$cpu->{'l2-cache'} && !$cpu->{'l3-cache'})){
+ # note: cache0 is L1i and cache1 L1d. cp_caches_fallback handles
+ if ($block->{'cache0'} &&
+ $block->{'cache0'} =~ /size\s*=\s*(\d+)K\s/){
+ $cpu->{'l1i-cache'} = $1;
+ }
+ if ($block->{'cache1'} &&
+ $block->{'cache1'} =~ /size\s*=\s*(\d+)K\s/){
+ $cpu->{'l1d-cache'} = $1;
+ }
+ if ($block->{'cache2'} &&
+ $block->{'cache2'} =~ /size\s*=\s*(\d+)(K|M)\s/){
+ $cpu->{'l2-cache'} = ($2 eq 'M') ? ($1*1024) : $1;
+ }
+ if ($block->{'cache3'} &&
+ $block->{'cache3'} =~ /size\s*=\s*(\d+)(K|M)\s/){
+ $cpu->{'l3-cache'} = ($2 eq 'M') ? ($1*1024) : $1;
+ }
}
- elsif (!$cpu{'siblings'} && $line[0] eq 'siblings' ){
- $cpu{'siblings'} = $line[1];
+ ## Start incrementers
+ $temp = main::get_defined($block->{'cpu mhz'},$block->{'clock'});
+ if ($temp){
+ $speed = clean_speed($temp);
+ push(@{$cpu->{'processors'}},$speed);
}
- elsif (!$cpu{'cores'} && $line[0] eq 'cpu cores' ){
- $cpu{'cores'} = $line[1];
+ # new arm shows bad bogomip value, so don't use it, however, ancient
+ # cpus, intel 486, can have super low bogomips, like 33.17
+ if ($extra > 0 && $block->{'bogomips'} && ((%risc &&
+ $block->{'bogomips'} > 50) || !%risc)){
+ $cpu->{'bogomips'} += $block->{'bogomips'};
}
- # increment by 1 for every new physical id we see. These are in almost all cases
- # separate cpus, not separate dies within a single cpu body.
- elsif ( $line[0] eq 'physical id' ){
- if ( !defined $phys_holder || $phys_holder != $line[1] ){
- # only increment if not in array counter
- push @phys_cpus, $line[1] if ! grep {/$line[1]/} @phys_cpus;
- $phys_holder = $line[1];
- $ids[$phys_holder] = ([]) if ! exists $ids[$phys_holder];
- $ids[$phys_holder][$die_id] = ([]) if ! exists $ids[$phys_holder][$die_id];
- #print "pid: $line[1] ph: $phys_holder did: $die_id\n";
- $die_id = 0;
- #$die_holder = 0;
+ # just to get core counts for ARM/MIPS/PPC systems
+ if (defined $block->{'processor'} && !$temp){
+ if ($block->{'processor'} =~ /^\d+$/){
+ push(@{$cpu->{'processors'}},0);
}
}
- elsif ( $line[0] eq 'core id' ){
- #print "ph: $phys_holder did: $die_id l1: $line[1] s: $speed\n";
+ # note: for alder lake, could vary, depending on if e or p core but we
+ # only care aobut the highest value for crude logic here
+ if ($block->{'siblings'} &&
+ (!$cpu->{'siblings'} || $block->{'siblings'} > $cpu->{'siblings'})){
+ $cpu->{'siblings'} = $block->{'siblings'};
+ }
+ # Ignoring trying to catch dies with $block->{'physical id'},
+ # that's too buggy for cpuinfo
+ if (defined $block->{'core id'}){
# https://www.pcworld.com/article/3214635/components-processors/ryzen-threadripper-review-we-test-amds-monster-cpu.html
- if ($line[1] > 0 ){
- $die_holder = $line[1];
- $core_count++;
+ my $phys = (defined $block->{'physical id'}) ? $block->{'physical id'}: 0;
+ my $die_id = 0;
+ if (!grep {$_ eq $block->{'core id'}} @{$cpu->{'ids'}->[$phys][$die_id]}){
+ push(@{$cpu->{'ids'}->[$phys][$die_id]},$block->{'core id'});
+ }
+ }
+ }
+ undef @cpuinfo; # we're done with it, dump it
+ undef %cpuinfo_machine;
+ if (%risc){
+ if (!$cpu->{'type'}){
+ $cpu->{'type'} = $risc{'id'};
+ }
+ if (!$bsd_type){
+ my $system_cpus = system_cpu_name();
+ $cpu->{'system-cpus'} = $system_cpus if %$system_cpus;
+ }
+ }
+ main::log_data('dump','%$cpu',$cpu) if $b_log;
+ print 'cpuinfo: ', Data::Dumper::Dumper $cpu if $dbg[8];
+ eval $end if $b_log;
+ return $cpu;
+}
+
+# args: 0: $cpu ref;
+sub cpuinfo_speed_sys {
+ eval $start if $b_log;
+ my @data;
+ my $val_id = 0;
+ # Run this logic first to make sure we get the speeds as raw as possible.
+ # Not in function to avoid unnecessary cpu use, we have slept right before.
+ # ARM and legacy systems etc do not always have cpufreq.
+ # note that there can be a definite cost to reading scaling_cur_freq, which
+ # must be generated on the fly based on some time snippet sample.
+ if ($fake{'cpu'}){
+ if ($fake_data{'sys'} && (my @fake = main::reader($fake_data{'sys'},'strip'))){
+ my $pattern = '/sys/devices/system/cpu/cpufreq/policy\d+/(affected_cpus|';
+ # reading cpuinfo WAY faster than scaling, but root only
+ if (grep {m%/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq%} @fake){
+ $pattern .= 'cpuinfo_cur_freq)';
}
- # NOTE: this logic won't work for die detections, unforutnately.
- # ARM uses a different /sys based method, and ryzen relies on math on the cores
- # in process_data
- elsif ($line[1] == 0 && $die_holder > 0 ){
- $die_holder = $line[1];
- $core_count = 0;
- $die_id++ if ($cpu{'type'} ne 'intel' && $cpu{'type'} ne 'amd' );
+ else {
+ $pattern .= 'scaling_cur_freq)';
}
- $phys_holder = 0 if ! defined $phys_holder;
- $ids[$phys_holder][$die_id][$line[1]] = $speed;
- #print "ph: $phys_holder did: $die_id l1: $line[1] s: $speed\n";
+ @data = grep {m%^$pattern%} @fake;
+ # print Data::Dumper::Dumper \@fake,"\n";
}
- if (!$cpu{'type'} && $line[0] eq 'vendor_id' ){
- $cpu{'type'} = cpu_vendor($line[1]);
+ $val_id = 1;
+ }
+ else {
+ my $glob = '/sys/devices/system/cpu/cpu*/cpufreq/{affected_cpus,';
+ # reading cpuinfo WAY faster than scaling, but root only
+ if (-r '/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq'){
+ $glob .= 'cpuinfo_cur_freq}';
+ }
+ else {
+ $glob .= 'scaling_cur_freq}';
}
- ## this is only for -C full cpu output
- if ( $type eq 'full' ){
- if (!$cpu{'l2-cache'} && ($line[0] eq 'cache size' || $line[0] eq 'l2 cache size' )){
- if ($line[1] =~ /(\d+)\sKB$/){
- $cpu{'l2-cache'} = $1;
+ @data = main::globber($glob);
+ }
+ my ($error,$file,$key,%working,%freq,@value);
+ foreach (@data){
+ next if !$fake{'cpu'} && ! -r $_;
+ undef $error;
+ # print "loop: $_\n";
+ my $fh;
+ # $fh always non null, even on error
+ if (!$fake{'cpu'}){
+ open($fh, '<', $_) or $error = $!;
+ }
+ if (!$error){
+ if (m%/sys/devices/system/cpu/(cpufreq/)?(cpu|policy)(\d+)/(cpufreq/)?(affected_cpus|(cpuinfo|scaling)_cur_freq)%){
+ $key = $3;
+ $file = $5;
+ if (!$fake{'cpu'}){
+ chomp(@value = <$fh>);
+ close $fh;
}
- elsif ($line[1] =~ /(\d+)\sMB$/){
- $cpu{'l2-cache'} = ($1*1024);
+ else {
+ @value = split(/::/,$_,2);
+ }
+ if ($file eq 'affected_cpus'){
+ # chomp seems to turn undefined into '', not sure why. Behavior varies
+ # so check for both cases.
+ if (defined $value[$val_id] && $value[$val_id] ne ''){
+ $working{$key}->[0] = $value[$val_id];
+ }
+ }
+ else {
+ $working{$key}->[1] = clean_speed($value[$val_id],'khz');
}
}
- elsif (!$cpu{'l1-cache'} && $line[0] eq 'l1 cache size'){
- if ($line[1] =~ /(\d+)\sKB$/){
- $cpu{'l1-cache'} = ($1);
+ }
+ }
+ if (%working){
+ foreach (keys %working){
+ $freq{sprintf("%04d",$_)} = $working{$_}->[1] if defined $working{$_}->[0];
+ }
+ ${$_[0]}->{'sys-freq'} = \%freq if %freq;
+ # print 'result: ', Data::Dumper::Dumper $_[0];
+ }
+ eval $end if $b_log;
+}
+
+sub cpuinfo_data_grabber {
+ eval $start if $b_log;
+ my ($file,$cpu_type) = @_; # type by ref
+ $loaded{'cpuinfo'} = 1;
+ # use --arm flag when testing arm cpus, and --fake-cpu to trigger fake data
+ $file = $fake_data{'cpuinfo'} if $fake{'cpu'};
+ my $raw = main::reader($file,'','ref');
+ @$raw = map {$_ =~ s/^\s*$/~~~/;$_;} @$raw;
+ push(@$raw,'~~~') if @$raw;
+ my ($b_processor,$key,$value);
+ my ($i) = (0);
+ my @key_tests = ('firmware','hardware','mmu','model','motherboard',
+ 'platform','system type','timebase');
+ foreach my $row (@$raw){
+ ($key,$value) = split(/\s*:\s*/,$row,2);
+ next if !defined $key;
+ # ARM: 'Hardware' can appear in processor block; system type (mips)
+ # ARM: CPU revision; machine: Revision/PPC: revision (CPU implied)
+ # orangepi3 has Hardware/Processor embedded in processor block
+ if (%risc && ((grep {lc($key) eq $_} @key_tests) ||
+ (!$risc{'ppc'} && lc($key) eq 'revision'))){
+ $b_processor = 0;
+ }
+ else {
+ $b_processor = 1;
+ }
+ if ($b_processor){
+ if ($key eq '~~~'){
+ $i++;
+ next;
+ }
+ # A small handful of ARM devices use Processor instead of 'model name'
+ # Processor : AArch64 Processor rev 4 (aarch64)
+ # Processor : Feroceon 88FR131 rev 1 (v5l)
+ $key = ($key eq 'Processor') ? 'model name' : lc($key);
+ $cpuinfo[$i]->{$key} = $value;
+ }
+ else {
+ next if $cpuinfo_machine{lc($key)};
+ $cpuinfo_machine{lc($key)} = $value;
+ }
+ }
+ if ($b_log){
+ main::log_data('dump','@cpuinfo',\@cpuinfo);
+ main::log_data('dump','%cpuinfo_machine',\%cpuinfo_machine);
+ }
+ if ($dbg[41]){
+ print Data::Dumper::Dumper \@cpuinfo;
+ print Data::Dumper::Dumper \%cpuinfo_machine;
+ }
+ eval $end if $b_log;
+}
+
+sub cpu_sys_data {
+ eval $start if $b_log;
+ my $sys_freq = $_[0];
+ my $cpu_sys = {};
+ my $working = sys_data_grabber();
+ return $cpu_sys if !%$working;
+ $cpu_sys->{'data'} = $working->{'data'} if $working->{'data'};
+ my ($core_id,$fake_core_id,$phys_id,) = (0,0,-1);
+ my (%cache_ids,@ci_freq_max,@ci_freq_min,@sc_freq_max,@sc_freq_min);
+ foreach my $key (sort keys %{$working->{'cpus'}}){
+ ($core_id,$phys_id) = (0,0);
+ my $cpu_id = $key + 0;
+ my $speed;
+ my $cpu = $working->{'cpus'}{$key};
+ if (defined $cpu->{'topology'}{'physical_package_id'}){
+ $phys_id = sprintf("%04d",$cpu->{'topology'}{'physical_package_id'});
+ }
+ if (defined $cpu->{'topology'}{'core_id'}){
+ # id is not consistent, seen 5 digit id
+ $core_id = sprintf("%08d",$cpu->{'topology'}{'core_id'});
+ if ($fake{'cpu'}){
+ if (defined $cpu->{'cpufreq'}{'scaling_cur_freq'} &&
+ $cpu->{'cpufreq'}{'affected_cpus'} &&
+ $cpu->{'cpufreq'}{'affected_cpus'} ne 'UNDEFINED' &&
+ # manually generated cpu debuggers will show '', not UNDEFINED
+ $cpu->{'cpufreq'}{'affected_cpus'} ne ''){
+ $speed = clean_speed($cpu->{'cpufreq'}{'scaling_cur_freq'},'khz');
}
}
- elsif (!$cpu{'l3-cache'} && $line[0] eq 'l3 cache size'){
- if ($line[1] =~ /(\d+)\sKB$/){
- $cpu{'l3-cache'} = $1;
+ elsif (defined $sys_freq && defined $sys_freq->{$key}){
+ $speed = $sys_freq->{$key};
+ }
+ if (defined $speed){
+ push(@{$cpu_sys->{'cpus'}{$phys_id}{'cores'}{$core_id}},$speed);
+ push(@{$cpu_sys->{'data'}{'speeds'}{'all'}},$speed);
+ }
+ else {
+ push(@{$cpu_sys->{'data'}{'speeds'}{'all'}},0);
+ # seen cases, riscv, where core id, phys id, are all -1
+ my $id = ($core_id != -1) ? $core_id: $fake_core_id++;
+ push(@{$cpu_sys->{'cpus'}{$phys_id}{'cores'}{$id}},0);
+ }
+ # Only use if topology core-id exists, some virtualized cpus can list
+ # frequency data for the non available cores, but those do not show
+ # topology data.
+ # 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'}} @ci_freq_max){
+ push(@ci_freq_max,$cpu->{'cpufreq'}{'cpuinfo_max_freq'});
}
- elsif ($line[1] =~ /(\d+)\sMB$/){
- $cpu{'l3-cache'} = ($1*1024);
+ 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 (!$cpu{'flags'} && ($line[0] eq 'flags' || $line[0] eq 'features' )){
- $cpu{'flags'} = $line[1];
+ 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'}} @ci_freq_min){
+ push(@ci_freq_min,$cpu->{'cpufreq'}{'cpuinfo_min_freq'});
+ }
+ 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 ( $extra > 0 && $type eq 'full' ){
- if ($line[0] eq 'bogomips'){
- # new arm shows bad bogomip value, so don't use it
- $cpu{'bogomips'} += $line[1] if $line[1] > 50;
+ if (defined $cpu->{'cpufreq'}{'scaling_max_freq'}){
+ $cpu->{'cpufreq'}{'scaling_max_freq'} = clean_speed($cpu->{'cpufreq'}{'scaling_max_freq'},'khz');
+ if (!grep {$_ eq $cpu->{'cpufreq'}{'scaling_max_freq'}} @sc_freq_max){
+ push(@sc_freq_max,$cpu->{'cpufreq'}{'scaling_max_freq'});
+ }
+ if (!grep {$_ eq $cpu->{'cpufreq'}{'scaling_max_freq'}} @{$cpu_sys->{'cpus'}{$phys_id}{'max-freq'}}){
+ push(@{$cpu_sys->{'cpus'}{$phys_id}{'max-freq'}},$cpu->{'cpufreq'}{'scaling_max_freq'});
+ }
}
- }
- if ($b_admin ){
- # note: not used unless maybe /sys data missing?
- if ( !$cpu{'bugs'} && $line[0] eq 'bugs'){
- $cpu{'bugs'} = $line[1];
+ if (defined $cpu->{'cpufreq'}{'scaling_min_freq'}){
+ $cpu->{'cpufreq'}{'scaling_min_freq'} = clean_speed($cpu->{'cpufreq'}{'scaling_min_freq'},'khz');
+ if (!grep {$_ eq $cpu->{'cpufreq'}{'scaling_min_freq'}} @sc_freq_min){
+ push(@sc_freq_min,$cpu->{'cpufreq'}{'scaling_min_freq'});
+ }
+ if (!grep {$_ eq $cpu->{'cpufreq'}{'scaling_min_freq'}} @{$cpu_sys->{'cpus'}{$phys_id}{'min-freq'}}){
+ push(@{$cpu_sys->{'cpus'}{$phys_id}{'min-freq'}},$cpu->{'cpufreq'}{'scaling_min_freq'});
+ }
}
- # unlike family and model id, microcode appears to be hex already
- if ( !$cpu{'microcode'} && $line[0] eq 'microcode'){
- if ($line[1] =~ /0x/){
- $cpu{'microcode'} = uc($line[1]);
- $cpu{'microcode'} =~ s/^0X//;
+ 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'});
}
- else {
- $cpu{'microcode'} = uc(sprintf("%x", $line[1]));
+ }
+ if (defined $cpu->{'cpufreq'}{'scaling_driver'}){
+ $cpu_sys->{'cpus'}{$phys_id}{'scaling-driver'} = $cpu->{'cpufreq'}{'scaling_driver'};
+ }
+ }
+ if (!defined $cpu_sys->{'data'}{'cpufreq-boost'} && defined $cpu->{'cpufreq'}{'cpb'}){
+ $cpu_sys->{'data'}{'cpufreq-boost'} = $cpu->{'cpufreq'}{'cpb'};
+ }
+ if (defined $cpu->{'topology'}{'core_cpus_list'}){
+ $cpu->{'topology'}{'thread_siblings_list'} = $cpu->{'topology'}{'core_cpus_list'};
+ }
+ if (defined $cpu->{'cache'} && keys %{$cpu->{'cache'}} > 0){
+ foreach my $key2 (sort keys %{$cpu->{'cache'}}){
+ my $cache = $cpu->{'cache'}{$key2};
+ my $type = ($cache->{'type'} =~ /^([DI])/i) ? lc($1): '';
+ my $level = 'l' . $cache->{'level'} . $type;
+ # Very old systems, 2.6.xx do not have shared_cpu_list
+ if (!defined $cache->{'shared_cpu_list'} && defined $cache->{'shared_cpu_map'}){
+ $cache->{'shared_cpu_list'} = $cache->{'shared_cpu_map'};
}
+ # print Data::Dumper::Dumper $cache;
+ if (defined $cache->{'shared_cpu_list'}){
+ # not needed, the cpu is always in the range
+ # my $range = main::regex_range($cache->{'shared_cpu_list'});
+ my $size = main::translate_size($cache->{'size'});
+ # print "cpuid: $cpu_id phys-core: $phys_id-$core_id level: $level range: $range shared: $cache->{'shared_cpu_list'}\n";
+ if (!(grep {$_ eq $cache->{'shared_cpu_list'}} @{$cache_ids{$phys_id}->{$level}})){
+ push(@{$cache_ids{$phys_id}->{$level}},$cache->{'shared_cpu_list'});
+ push(@{$cpu_sys->{'cpus'}{$phys_id}{'caches'}{$level}},$size);
+ }
+ }
+ }
+ }
+ # die_id is relatively new, core_siblings_list has been around longer
+ if (defined $cpu->{'topology'}{'die_id'} ||
+ defined $cpu->{'topology'}{'core_siblings_list'}){
+ my $die = $cpu->{'topology'}{'die_id'};
+ $die = $cpu->{'topology'}{'core_siblings_list'} if !defined $die;
+ if (!grep {$_ eq $die} @{$cpu_sys->{'cpus'}{$phys_id}{'dies'}}){
+ push(@{$cpu_sys->{'cpus'}{$phys_id}{'dies'}},$die);
}
}
}
- $cpu{'phys'} = scalar @phys_cpus;
- $cpu{'dies'} = $die_id++; # count starts at 0, all cpus have 1 die at least
- if ($b_arm || $b_mips){
- if ($cpu{'dies'} <= 1){
- my $arm_dies = cpu_dies_sys();
- # case were 4 core arm returned 4 sibling lists, obviously wrong
- $cpu{'dies'} = $arm_dies if $arm_dies && $proc_count != $arm_dies;
+ if (defined $cpu_sys->{'data'}{'cpufreq-boost'} &&
+ $cpu_sys->{'data'}{'cpufreq-boost'} =~ /^[01]$/){
+ if ($cpu_sys->{'data'}{'cpufreq-boost'}){
+ $cpu_sys->{'data'}{'cpufreq-boost'} = 'enabled';
}
- $cpu{'type'} = ($b_arm) ? 'arm' : 'mips' if !$cpu{'type'};
- if (!$bsd_type){
- my %system_cpus = system_cpu_name();
- $cpu{'system-cpus'} = \%system_cpus if %system_cpus;
+ else {
+ $cpu_sys->{'data'}{'cpufreq-boost'} = 'disabled';
+ }
+ }
+ # cpuinfo_max_freq:["2000000"] cpuinfo_max_freq:["1500000"]
+ # cpuinfo_min_freq:["200000"]
+ if (@ci_freq_max){
+ $cpu_sys->{'data'}{'speeds'}{'max-freq'} = join(':',@ci_freq_max);
+ }
+ if (@ci_freq_min){
+ $cpu_sys->{'data'}{'speeds'}{'min-freq'} = join(':',@ci_freq_min);
+ }
+ # also handle off chance that cpuinfo_min/max not set, but scaling_min/max there
+ if (@sc_freq_max){
+ $cpu_sys->{'data'}{'speeds'}{'scaling-max-freq'} = join(':',@sc_freq_max);
+ if (!$cpu_sys->{'data'}{'speeds'}{'max-freq'}){
+ $cpu_sys->{'data'}{'speeds'}{'max-freq'} = $cpu_sys->{'data'}{'speeds'}{'scaling-max-freq'};
}
}
- $cpu{'ids'} = (\@ids);
- if ( $extra > 0 && !$cpu{'arch'} && $type ne 'short' ){
- $cpu{'arch'} = cpu_arch($cpu{'type'},$cpu{'family'},$cpu{'model_id'},$cpu{'rev'});
- # cpu_arch comes from set_os()
- $cpu{'arch'} = $cpu_arch if (!$cpu{'arch'} && $cpu_arch && ($b_mips || $b_arm || $b_ppc));
- #print "$cpu{'type'},$cpu{'family'},$cpu{'model_id'},$cpu{'arch'}\n";
+ if (@sc_freq_min){
+ $cpu_sys->{'data'}{'speeds'}{'scaling-min-freq'} = join(':',@sc_freq_min);
+ if (!$cpu_sys->{'data'}{'speeds'}{'min-freq'}){
+ $cpu_sys->{'data'}{'speeds'}{'min-freq'} = $cpu_sys->{'data'}{'speeds'}{'scaling-min-freq'};
+ }
}
- if (!$speeds{'cur-freq'}){
- $cpu{'cur-freq'} = $cpu{'processors'}[0];
- $speeds{'min-freq'} = 0;
- $speeds{'max-freq'} = 0;
+ # this corrects a bug we see sometimes in min/max frequencies
+ if ((scalar @ci_freq_max < 2 && scalar @ci_freq_min < 2) &&
+ (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'} ||
+ $cpu_sys->{'data'}{'speeds'}{'min-freq'} == $cpu_sys->{'data'}{'speeds'}{'max-freq'})){
+ $cpu_sys->{'data'}{'speeds'}{'min-freq'} = 0;
}
+ main::log_data('dump','%$cpu_sys',$cpu_sys) if $b_log;
+ print 'cpu-sys: ', Data::Dumper::Dumper $cpu_sys if $dbg[8];
+ eval $end if $b_log;
+ return $cpu_sys;
+}
+
+sub sys_data_grabber {
+ eval $start if $b_log;
+ my (@files);
+ set_fake_data() if $fake{'cpu'} && !$loaded{'cpu-fake-data'};
+ # this data has to match the data in cpuinfo grabber fake cpu, and remember
+ # to use --arm flag if arm tests
+ if ($fake{'cpu'}){
+ # print "$fake_data{'sys'}\n";
+ @files = main::reader($fake_data{'sys'}) if $fake_data{'sys'};
+ # print Data::Dumper::Dumper \@files;
+ }
+ # There's a massive time hit reading full globbed set of files, so grab and
+ # read only what we need.
else {
- $cpu{'cur-freq'} = $speeds{'cur-freq'};
- $cpu{'min-freq'} = $speeds{'min-freq'};
- $cpu{'max-freq'} = $speeds{'max-freq'};
+ my $glob = '/sys/devices/system/cpu/{';
+ if ($dbg[43]){
+ $glob .= 'cpufreq,cpu*/topology,cpu*/cpufreq,cpu*/cache/index*,smt,vulnerabilities}/*';
+ }
+ else {
+ $glob .= 'cpu*/topology/{core_cpus_list,core_id,core_siblings_list,die_id,';
+ $glob .= 'physical_package_id,thread_siblings_list}';
+ $glob .= ',cpufreq/{boost,ondemand}';
+ $glob .= ',cpu*/cpufreq/{cpb,cpuinfo_max_freq,cpuinfo_min_freq,';
+ $glob .= 'scaling_max_freq,scaling_min_freq';
+ $glob .= ',scaling_driver,scaling_governor' if $type eq 'full' && $b_admin;
+ $glob .= '}';
+ if ($type eq 'full'){
+ $glob .= ',cpu*/cache/index*/{level,shared_cpu_list,shared_cpu_map,size,type}';
+ }
+ $glob .= ',smt/{active,control}';
+ $glob .= ',vulnerabilities/*' if $b_admin;
+ $glob .= '}';
+ }
+ # print "sys glob: $glob\n";
+ @files = main::globber($glob);
+ }
+ main::log_data('dump','@files',\@files) if $b_log;
+ print Data::Dumper::Dumper \@files if $dbg[40];
+ my ($b_bug,$b_cache,$b_freq,$b_topo,$b_main);
+ my $working = {};
+ my ($main_id,$main_key,$holder,$id,$item,$key) = ('','','','','','');
+ # need to return hash reference on failure or old systems complain
+ return $working if !@files;
+ foreach (sort @files){
+ if ($fake{'cpu'}){
+ ($_,$item) = split(/::/,$_,2);
+ }
+ else {
+ next if -d $_ || ! -e $_;
+ undef $item;
+ }
+ $key = $_;
+ $key =~ m|/([^/]+)/([^/]+)$|;
+ my ($key_1,$key_2) = ($1,$2);
+ if (m|/cpu(\d+)/|){
+ if (!$holder || $1 ne $holder){
+ $id = sprintf("%04d",$1);
+ $holder = $1;
+ }
+ $b_bug = 0;
+ $b_cache = 0;
+ $b_freq = 0;
+ $b_main = 0;
+ $b_topo = 0;
+ if ($key_1 eq 'cpufreq'){
+ $b_freq = 1;
+ $main_key = $key_2;
+ $key = $key_1;
+ }
+ elsif ($key_1 eq 'topology'){
+ $b_topo = 1;
+ $main_key = $key_2;
+ $key = $key_1;
+ }
+ elsif ($key_1 =~ /^index(\d+)$/){
+ $b_cache = 1;
+ $main_key = $key_2;
+ $main_id = sprintf("%02d",$1);
+ $key = 'cache';
+ }
+ }
+ elsif ($key_1 eq 'vulnerabilities'){
+ $id = $key_1;
+ $key = $key_2;
+ $b_bug = 1;
+ $b_cache = 0;
+ $b_main = 0;
+ $b_freq = 0;
+ $b_topo = 0;
+ $main_key = '';
+ $main_id = '';
+ }
+ else {
+ $id = $key_1 . '-' . $key_2;
+ $b_bug = 0;
+ $b_cache = 0;
+ $b_main = 1;
+ $b_freq = 0;
+ $b_topo = 0;
+ $main_key = '';
+ $main_id = '';
+ }
+ if (!$fake{'cpu'}){
+ if (-r $_) {
+ my $error;
+ # significantly faster to skip reader() and do it directly
+ # $fh always non null, even on error
+ open(my $fh, '<', $_) or $error = $!;
+ if (!$error){
+ chomp(my @value = <$fh>);
+ close $fh;
+ $item = $value[0];
+ }
+ # $item = main::reader($_,'strip',0);
+ }
+ else {
+ $item = main::message('root-required');
+ }
+ $item = main::message('undefined') if !defined $item;
+ }
+ # print "$key_1 :: $key_2 :: $item\n";
+ if ($b_main){
+ $working->{'data'}{$id} = $item;
+ }
+ elsif ($b_bug){
+ my $type = ($item =~ /^Mitigation:/) ? 'mitigation': 'status';
+ $item =~ s/Mitigation: //;
+ $working->{'data'}{$id}{$key} = [$type,$item];
+ }
+ elsif ($b_cache){
+ $working->{'cpus'}{$id}{$key}{$main_id}{$main_key} = $item;
+ }
+ elsif ($b_freq || $b_topo){
+ $working->{'cpus'}{$id}{$key}{$main_key} = $item;
+ }
}
- main::log_data('dump','%cpu',\%cpu) if $b_log;
- print Data::Dumper::Dumper \%cpu if $test[8];
+ main::log_data('dump','%$working',$working) if $b_log;
+ print Data::Dumper::Dumper $working if $dbg[39];
eval $end if $b_log;
- return %cpu;
+ return $working;
}
-sub data_sysctl {
+# Set in one place to make sure we get them all consistent
+sub set_fake_data {
+ $loaded{'cpu-fake-data'} = 1;
+ my ($ci,$sys);
+ ## CPUINFO DATA FILES ##
+ ## ARM/MIPS
+ # $ci = "$fake_data_dir/cpu/arm/arm-4-core-pinebook-1.txt";
+ # $ci = "$fake_data_dir/cpu/arm/armv6-single-core-1.txt";
+ # $ci = "$fake_data_dir/cpu/arm/armv7-dual-core-1.txt";
+ # $ci = "$fake_data_dir/cpu/arm/armv7-new-format-model-name-single-core.txt";
+ # $ci = "$fake_data_dir/cpu/arm/arm-2-die-96-core-rk01.txt";
+ # $ci = "$fake_data_dir/cpu/arm/arm-shevaplug-1.2ghz.txt";
+ # $ci = "$fake_data_dir/cpu/mips/mips-mainusg-cpuinfo.txt";
+ # $ci = "$fake_data_dir/cpu/ppc/ppc-debian-ppc64-cpuinfo.txt";
+ ## x86
+ # $ci = "$fake_data_dir/cpu/amd/16-core-32-mt-ryzen.txt";
+ # $ci = "$fake_data_dir/cpu/amd/2-16-core-epyc-abucodonosor.txt";
+ # $ci = "$fake_data_dir/cpu/amd/2-core-probook-antix.txt";
+ # $ci = "$fake_data_dir/cpu/amd/4-core-jean-antix.txt";
+ # $ci = "$fake_data_dir/cpu/amd/4-core-althlon-mjro.txt";
+ # $ci = "$fake_data_dir/cpu/amd/4-core-apu-vc-box.txt";
+ # $ci = "$fake_data_dir/cpu/amd/4-core-a10-5800k-1.txt";
+ # $ci = "$fake_data_dir/cpu/intel/1-core-486-fourtysixandtwo.txt";
+ # $ci = "$fake_data_dir/cpu/intel/2-core-ht-atom-bruh.txt";
+ # $ci = "$fake_data_dir/cpu/intel/core-2-i3.txt";
+ # $ci = "$fake_data_dir/cpu/intel/8-core-i7-damentz64.txt";
+ # $ci = "$fake_data_dir/cpu/intel/2-10-core-xeon-ht.txt";
+ # $ci = "$fake_data_dir/cpu/intel/4-core-xeon-fake-dual-die-zyanya.txt";
+ # $ci = "$fake_data_dir/cpu/intel/2-core-i5-fake-dual-die-hek.txt";
+ # $ci = "$fake_data_dir/cpu/intel/2-1-core-xeon-vm-vs2017.txt";
+ # $ci = "$fake_data_dir/cpu/intel/4-1-core-xeon-vps-frodo1.txt";
+ # $ci = "$fake_data_dir/cpu/intel/4-6-core-xeon-no-mt-lathander.txt";
+ ## Elbrus
+ # $cpu_type = 'elbrus'; # uncomment to test elbrus
+ # $ci = "$fake_data_dir/cpu/elbrus/elbrus-2c3/cpuinfo.txt";
+ # $ci = "$fake_data_dir/cpu/elbrus/1xE1C-8.txt";
+ # $ci = "$fake_data_dir/cpu/elbrus/1xE2CDSP-4.txt";
+ # $ci = "$fake_data_dir/cpu/elbrus/1xE2S4-3-monocub.txt";
+ # $ci = "$fake_data_dir/cpu/elbrus/1xMBE8C-7.txt";
+ # $ci = "$fake_data_dir/cpu/elbrus/4xEL2S4-3.txt";
+ # $ci = "$fake_data_dir/cpu/elbrus/4xE8C-7.txt";
+ # $ci = "$fake_data_dir/cpu/elbrus/4xE2CDSP-4.txt";
+ # $ci = "$fake_data_dir/cpu/elbrus/cpuinfo.e8c2.txt";
+
+ ## CPU CPUINFO/SYS PAIRS DATA FILES ##
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/android-pocom3-fake-cpuinfo.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/android-pocom3-fake-sys.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/arm-pine64-cpuinfo-1.txt";v
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/arm-pine64-sys-1.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/arm-riscyslack2-cpuinfo-1.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/arm-riscyslack2-sys-1.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/ppc-stuntkidz~cpuinfo.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/ppc-stuntkidz~sys.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/riscv-unmatched-2021~cpuinfo-1.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/riscv-unmatched-2021~sys-1.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/x86-brickwizard-atom-n270~cpuinfo-1.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/x86-brickwizard-atom-n270~sys-1.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/x86-amd-phenom-chrisretusn-cpuinfo-1.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/x86-amd-phenom-chrisretusn-sys-1.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/x86-drgibbon-intel-i7-cpuinfo.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/x86-drgibbon-intel-i7-sys.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/ryzen-threadripper-1x64-3950x-cpuinfo.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/ryzen-threadripper-1x64-3950x-sys.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/amd-threadripper-1x12-5945wx-cpuinfo-1.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/amd-threadripper-1x12-5945wx-sys-1.txt";
+ # $ci = "$fake_data_dir/cpu/sys-ci-pairs/intel-i7-1165G7-4-core-no-smt-cpuinfo.txt";
+ # $sys = "$fake_data_dir/cpu/sys-ci-pairs/intel-i7-1165G7-4-core-no-smt-sys.txt";
+ $ci = "$fake_data_dir/cpu/sys-ci-pairs/elbrus-e16c-1-cpuinfo.txt";
+ $sys = "$fake_data_dir/cpu/sys-ci-pairs/elbrus-e16c-1-sys.txt";
+ $fake_data{'cpuinfo'} = $ci;
+ $fake_data{'sys'} = $sys;
+}
+
+sub sysctl_data {
eval $start if $b_log;
- my ($type) = @_;
- my %cpu = set_cpu_data();
- my (@ids,@line,%speeds,@working);
+ my ($cpu,@line,%speeds,@working);
my ($sep) = ('');
my ($die_holder,$die_id,$phys_holder,$phys_id,$proc_count,$speed) = (0,0,0,0,0,0,0);
- foreach (@sysctl){
- @line = split /\s*:\s*/, $_;
- next if ! $line[0];
+ set_cpu_data(\$cpu);
+ @{$sysctl{'cpu'}} = () if !$sysctl{'cpu'}; # don't want error next!
+ foreach (@{$sysctl{'cpu'}}){
+ @line = split(/\s*:\s*/, $_);
+ next if !$line[0];
# darwin shows machine, like MacBook7,1, not cpu
# machdep.cpu.brand_string: Intel(R) Core(TM)2 Duo CPU P8600 @ 2.40GHz
- if ( ($bsd_type ne 'darwin' && $line[0] eq 'hw.model' ) || $line[0] eq 'machdep.cpu.brand_string' ){
+ if (($bsd_type ne 'darwin' && $line[0] eq 'hw.model') ||
+ $line[0] eq 'machdep.cpu.brand_string'){
# cut L2 cache/cpu max speed out of model string, if available
# openbsd 5.6: AMD Sempron(tm) Processor 3400+ ("AuthenticAMD" 686-class, 256KB L2 cache)
+ # openbsd 6.x has Lx cache data in dmesg.boot
# freebsd 10: hw.model: AMD Athlon(tm) II X2 245 Processor
- $line[1] = main::cleaner($line[1]);
- $line[1] = cpu_cleaner($line[1]);
- if ( $line[1] =~ /([0-9]+)[-[:space:]]*([KM]B)\s+L2 cache/) {
+ $line[1] = main::clean($line[1]);
+ $line[1] = clean_cpu($line[1]);
+ if ($line[1] =~ /([0-9]+)[\s-]*([KM]B)\s+L2 cache/i){
my $multiplier = ($2 eq 'MB') ? 1024: 1;
- $cpu{'l2-cache'} = $1 * $multiplier;
+ $cpu->{'l2-cache'} = $1 * $multiplier;
}
- if ( $line[1] =~ /([^0-9\.][0-9\.]+)[-[:space:]]*[MG]Hz/) {
- $cpu{'max-freq'} = $1;
- if ($cpu{'max-freq'} =~ /MHz/i) {
- $cpu{'max-freq'} =~ s/[-[:space:]]*MHz//;
- $cpu{'max-freq'} = speed_cleaner($cpu{'max-freq'},'mhz');
+ if ($line[1] =~ /([^0-9\.][0-9\.]+)[\s-]*[MG]Hz/){
+ $cpu->{'max-freq'} = $1;
+ if ($cpu->{'max-freq'} =~ /MHz/i){
+ $cpu->{'max-freq'} =~ s/[\s-]*MHz//;
+ $cpu->{'max-freq'} = clean_speed($cpu->{'max-freq'},'mhz');
}
- elsif ($cpu{'max-freq'} =~ /GHz/) {
- $cpu{'max-freq'} =~ s/[-[:space:]]*GHz//i;
- $cpu{'max-freq'} = $cpu{'max-freq'} / 1000;
- $cpu{'max-freq'} = speed_cleaner($cpu{'max-freq'},'mhz');
+ elsif ($cpu->{'max-freq'} =~ /GHz/){
+ $cpu->{'max-freq'} =~ s/[\s-]*GHz//i;
+ $cpu->{'max-freq'} = $cpu->{'max-freq'} / 1000;
+ $cpu->{'max-freq'} = clean_speed($cpu->{'max-freq'},'mhz');
}
}
- if ( $line[1] =~ /\)$/ ){
+ if ($line[1] =~ /\)$/){
$line[1] =~ s/\s*\(.*\)$//;
}
- $cpu{'model_name'} = $line[1];
- $cpu{'type'} = cpu_vendor($line[1]);
+ $cpu->{'model_name'} = $line[1];
+ $cpu->{'type'} = cpu_vendor($line[1]);
+ }
+ # NOTE: hw.l1icachesize: hw.l1dcachesize: ; in bytes, apparently
+ elsif ($line[0] eq 'hw.l1dcachesize'){
+ $cpu->{'l1d-cache'} = $line[1]/1024;
+ }
+ elsif ($line[0] eq 'hw.l1icachesize'){
+ $cpu->{'l1i-cache'} = $line[1]/1024;
+ }
+ elsif ($line[0] eq 'hw.l2cachesize'){
+ $cpu->{'l2-cache'} = $line[1]/1024;
}
- # NOTE: hw.l1icachesize: hw.l1dcachesize:
- elsif ($line[0] eq 'hw.l1icachesize') {
- $cpu{'l1-cache'} = $line[1]/1024;
+ elsif ($line[0] eq 'hw.l3cachesize'){
+ $cpu->{'l3-cache'} = $line[1]/1024;
}
- elsif ($line[0] eq 'hw.l2cachesize') {
- $cpu{'l2-cache'} = $line[1]/1024;
+ # hw.smt: openbsd
+ elsif ($line[0] eq 'hw.smt'){
+ $cpu->{'smt'} = ($line[1]) ? 'enabled' : 'disabled';
}
- elsif ($line[0] eq 'hw.l3cachesize') {
- $cpu{'l3-cache'} = $line[1]/1024;
+ # htl: maybe freebsd, never seen, 1 is disabled, sigh...
+ elsif ($line[0] eq 'machdep.hlt_logical_cpus'){
+ $cpu->{'smt'} = ($line[1]) ? 'disabled' : 'enabled';
}
# this is in mghz in samples
- elsif ($line[0] eq 'hw.clockrate' || $line[0] eq 'hw.cpuspeed') {
- $cpu{'cur-freq'} = $line[1];
+ elsif (!$cpu->{'cur-freq'} &&
+ ($line[0] eq 'hw.clockrate' || $line[0] eq 'hw.cpuspeed')){
+ $cpu->{'cur-freq'} = $line[1];
}
# these are in hz: 2400000000
- elsif ($line[0] eq 'hw.cpufrequency') {
- $cpu{'cur-freq'} = $line[1]/1000000;
+ elsif ($line[0] eq 'hw.cpufrequency'){
+ $cpu->{'cur-freq'} = $line[1]/1000000;
}
- elsif ($line[0] eq 'hw.busfrequency_min') {
- $cpu{'min-freq'} = $line[1]/1000000;
+ elsif ($line[0] eq 'hw.busfrequency_min'){
+ $cpu->{'min-freq'} = $line[1]/1000000;
}
- elsif ($line[0] eq 'hw.busfrequency_max') {
- $cpu{'max-freq'} = $line[1]/1000000;
+ elsif ($line[0] eq 'hw.busfrequency_max'){
+ $cpu->{'max-freq'} = $line[1]/1000000;
}
- elsif ($line[0] eq 'machdep.cpu.vendor') {
- $cpu{'type'} = cpu_vendor($line[1]);
- }
- # darwin only?
- elsif ($line[0] eq 'machdep.cpu.features') {
- $cpu{'flags'} = lc($line[1]);
+ # FB seems to call freq something other than clock speed, unreliable
+ # eg: 1500 Mhz real shows as 2400 freq, which is wrong
+ # elsif ($line[0] =~ /^dev\.cpu\.([0-9]+)\.freq$/){
+ # $speed = clean_speed($line[1]);
+ # $cpu->{'processors'}->[$1] = $speed;
+ # }
+ # weird FB thing, freq can be wrong, so just count the cores and call it
+ # done.
+ elsif ($line[0] =~ /^dev\.cpu\.([0-9]+)\./ &&
+ (!$cpu->{'processors'} || !defined $cpu->{'processors'}->[$1])){
+ $cpu->{'processors'}->[$1] = undef;
}
- elsif ($line[0] eq 'hw.ncpu' ) {
- $cpu{'cores'} = $line[1];
+ elsif ($line[0] eq 'machdep.cpu.vendor'){
+ $cpu->{'type'} = cpu_vendor($line[1]);
}
- # Freebsd does some voltage hacking to actually run at lowest listed frequencies.
- # The cpu does not actually support all the speeds output here but works in freebsd.
- elsif ($line[0] eq 'dev.cpu.0.freq_levels') {
+ # darwin only?
+ elsif ($line[0] eq 'machdep.cpu.features'){
+ $cpu->{'flags'} = lc($line[1]);
+ }
+ # is this per phys or total?
+ elsif ($line[0] eq 'hw.ncpu'){
+ $cpu->{'cores'} = $line[1];
+ }
+ # Freebsd does some voltage hacking to actually run at lowest listed
+ # frequencies. The cpu does not actually support all the speeds output
+ # here but works in freebsd. Disabled this, the freq appear to refer to
+ # something else, not cpu clock. Remove XXX to enable
+ elsif ($line[0] eq 'dev.cpu.0.freq_levelsXXX'){
$line[1] =~ s/^\s+|\/[0-9]+|\s+$//g;
- if ( $line[1] =~ /[0-9]+\s+[0-9]+/ ) {
- my @temp = split /\s+/, $line[1];
- $cpu{'max-freq'} = $temp[0];
- $cpu{'min-freq'} = $temp[-1];
- $cpu{'scalings'} = \@temp;
+ if ($line[1] =~ /[0-9]+\s+[0-9]+/){
+ # get rid of -1 in FB: 2400/-1 2200/-1 2000/-1 1800/-1
+ $line[1] =~ s|/-1||g;
+ my @temp = split(/\s+/, $line[1]);
+ $cpu->{'max-freq'} = $temp[0];
+ $cpu->{'min-freq'} = $temp[-1];
+ $cpu->{'scalings'} = \@temp;
}
}
- elsif (!$cpu{'cur-freq'} && $line[0] eq 'dev.cpu.0.freq' ) {
- $cpu{'cur-freq'} = $line[1];
+ # Disabled w/XXX. this is almost certainly bad data, should not be used
+ elsif (!$cpu->{'cur-freq'} && $line[0] eq 'dev.cpu.0.freqXXX'){
+ $cpu->{'cur-freq'} = $line[1];
}
# the following have only been seen in DragonflyBSD data but thumbs up!
- elsif ($line[0] eq 'hw.cpu_topology.members' ) {
- my @temp = split /\s+/, $line[1];
+ elsif ($line[0] eq 'hw.cpu_topology.members'){
+ my @temp = split(/\s+/, $line[1]);
my $count = scalar @temp;
$count-- if $count > 0;
- $cpu{'processors'}[$count] = 0;
# no way to get per processor speeds yet, so assign 0 to each
foreach (0 .. $count){
- $cpu{'processors'}[$_] = 0;
+ $cpu->{'processors'}->[$_] = 0;
}
}
- elsif ($line[0] eq 'hw.cpu_topology.cpu1.physical_siblings' ) {
+ elsif ($line[0] eq 'hw.cpu_topology.cpu1.physical_siblings'){
# string, like: cpu0 cpu1
- my @temp = split /\s+/, $line[1];
- $cpu{'siblings'} = scalar @temp;
- }
- # increment by 1 for every new physical id we see. These are in almost all cases
- # separate cpus, not separate dies within a single cpu body.
- elsif ( $line[0] eq 'hw.cpu_topology.cpu0.physical_id' ){
- if ($phys_holder != $line[1] ){
+ my @temp = split(/\s+/, $line[1]);
+ $cpu->{'siblings'} = scalar @temp;
+ }
+ # increment by 1 for every new physical id we see. These are in almost all
+ # cases separate cpus, not separate dies within a single cpu body.
+ # This needs DATA!! Almost certainly wrong!!
+ elsif ($line[0] eq 'hw.cpu_topology.cpu0.physical_id'){
+ if ($phys_holder != $line[1]){
$phys_id++;
$phys_holder = $line[1];
- $ids[$phys_id] = ([(0)]);
- $ids[$phys_id][$die_id] = ([(0)]);
+ push(@{$cpu->{'ids'}->[$phys_id][$die_id]},0);
+ }
+ }
+ elsif ($line[0] eq 'hw.cpu_topology.cpu0.core_id'){
+ $cpu->{'ids'}->[$phys_id][$line[1]] = $speed;
+ }
+ }
+ if (!$cpu->{'flags'} || !$cpu->{'family'}){
+ my $dmesg_boot = dboot_data();
+ # this core count may fix failed MT detection.
+ $cpu->{'cores'} = $dmesg_boot->{'cores'} if $dmesg_boot->{'cores'};
+ $cpu->{'flags'} = $dmesg_boot->{'flags'} if !$cpu->{'flags'};
+ $cpu->{'family'} = $dmesg_boot->{'family'} if !$cpu->{'family'};
+ $cpu->{'l1d-cache'} = $dmesg_boot->{'l1d-cache'} if !$cpu->{'l1d-cache'};
+ $cpu->{'l1i-cache'} = $dmesg_boot->{'l1i-cache'} if !$cpu->{'l1i-cache'};
+ $cpu->{'l2-cache'} = $dmesg_boot->{'l2-cache'} if !$cpu->{'l2-cache'};
+ $cpu->{'l3-cache'} = $dmesg_boot->{'l3-cache'} if !$cpu->{'l3-cache'};
+ $cpu->{'microcode'} = $dmesg_boot->{'microcode'} if !$cpu->{'microcode'};
+ $cpu->{'model-id'} = $dmesg_boot->{'model-id'} if !$cpu->{'model-id'};
+ $cpu->{'max-freq'} = $dmesg_boot->{'max-freq'} if !$cpu->{'max-freq'};
+ $cpu->{'min-freq'} = $dmesg_boot->{'min-freq'} if !$cpu->{'min-freq'};
+ $cpu->{'scalings'} = $dmesg_boot->{'scalings'} if !$cpu->{'scalings'};
+ $cpu->{'siblings'} = $dmesg_boot->{'siblings'} if !$cpu->{'siblings'};
+ $cpu->{'stepping'} = $dmesg_boot->{'stepping'} if !$cpu->{'stepping'};
+ $cpu->{'type'} = $dmesg_boot->{'type'} if !$cpu->{'type'};
+ }
+ main::log_data('dump','%$cpu',$cpu) if $b_log;
+ print Data::Dumper::Dumper $cpu if $dbg[8];
+ eval $end if $b_log;
+ return $cpu;
+}
+
+## DATA GENERATOR DATA SOURCES ##
+sub dboot_data {
+ eval $start if $b_log;
+ my ($max_freq,$min_freq,@scalings);
+ my ($family,$flags,$microcode,$model,$sep,$stepping,$type) = ('','','','','','','');
+ my ($cores,$siblings) = (0,0);
+ my ($l1d,$l1i,$l2,$l3) = (0,0,0,0);
+ # this will be null if it was not readable
+ my $file = $system_files{'dmesg-boot'};
+ if ($dboot{'cpu'}){
+ foreach (@{$dboot{'cpu'}}){
+ # can be ~Features/Features2/AMD Features
+ if (/Features/ || ($bsd_type eq "openbsd" &&
+ /^cpu0:\s*[a-z0-9]{2,3}(\s|,)[a-z0-9]{2,3}(\s|,)/i)){
+ my @line = split(/:\s*/, lc($_));
+ # free bsd has to have weird syntax: <....<b23>,<b34>>
+ # Features2=0x1e98220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,POPCNT,AESNI,XSAVE,OSXSAVE,AVX>
+ $line[1] =~ s/^[^<]*<|>[^>]*$//g;
+ # then get rid of <b23> stuff
+ $line[1] =~ s/<[^>]+>//g;
+ # handle corner case like ,EL3 32,
+ $line[1] =~ s/ (32|64)/_$1/g;
+ # and replace commas with spaces
+ $line[1] =~ s/,/ /g;
+ $flags .= $sep . $line[1];
+ $sep = ' ';
}
- }
- elsif ( $line[0] eq 'hw.cpu_topology.cpu0.core_id' ){
- if ($line[1] > 0 ){
- $die_holder = $line[1];
+ # cpu0:AMD E1-1200 APU with Radeon(tm) HD Graphics, 1398.66 MHz, 14-02-00
+ elsif (/^cpu0:\s*([^,]+),\s+([0-9\.]+\s*MHz),\s+([0-9a-f]+)-([0-9a-f]+)-([0-9a-f]+)/){
+ $type = cpu_vendor($1);
+ $family = uc($3);
+ $model = uc($4);
+ $stepping = uc($5);
+ $family =~ s/^0//;
+ $model =~ s/^0//;
+ $stepping =~ s/^0//; # can be 00
}
- # this handles multi die cpus like 16 core ryzen
- elsif ($line[1] == 0 && $die_holder > 0 ){
- $die_id++ ;
- $die_holder = $line[1];
+ # note: cpu cache is in KiB MiB even though they call it KB and MB
+ # cpu31: 32KB 64b/line 8-way I-cache, 32KB 64b/line 8-way D-cache, 512KB 64b/line 8-way L2 cache
+ # 8-way means 1 per core, 16-way means 1/2 per core
+ elsif (/^cpu0:\s*[0-9\.]+[KMG]B\s/){
+ # cpu0: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
+ # cpu0:48KB 64b/line 3-way L1 PIPT I-cache, 32KB 64b/line 2-way L1 D-cache
+ if (/\b([0-9\.]+[KMG])i?B\s\S+\s([0-9]+)-way\sD[\s-]?cache/){
+ $l1d = main::translate_size($1);
+ }
+ if (/\b([0-9\.]+[KMG])i?B\s\S+\s([0-9]+)-way\s(L1 \S+\s)?I[\s-]?cache/){
+ $l1i = main::translate_size($1);
+ }
+ if (/\b([0-9\.]+[KMG])i?B\s\S+\s([0-9]+)-way\sL2[\s-]?cache/){
+ $l2 = main::translate_size($1);
+ }
+ if (/\b([0-9\.]+[KMG])i?B\s\S+\s([0-9]+)-way\sL3[\s-]?cache/){
+ $l3 = main::translate_size($1);
+ }
+ }
+ elsif (/^~Origin:(.+?)[\s,]+(Id|Family|Model|Stepping)/){
+ $type = cpu_vendor($1);
+ if (/\bId\s*=\s*(0x)?([0-9a-f]+)\b/){
+ $microcode = ($1) ? uc($2) : $2;
+ }
+ if (/\bFamily\s*=\s*(0x)?([a-f0-9]+)\b/){
+ $family = ($1) ? uc($2) : $2;
+ }
+ if (/\bModel\s*=\s*(0x)?([a-f0-9]+)\b/){
+ $model = ($1) ? uc($2) : $2;
+ }
+ # they don't seem to use hex for steppings, so convert it
+ if (/\bStepping\s*=\s*(0x)?([0-9a-f]+)\b/){
+ $stepping = (!$1) ? uc(sprintf("%X",$2)) : $2;
+ }
+ }
+ elsif (/^cpu0:.*?[0-9\.]+\s?MHz:\sspeeds:\s(.*?)\s?MHz/){
+ @scalings = split(/[,\s]+/,$1);
+ $min_freq = $scalings[-1];
+ $max_freq = $scalings[0];
+ }
+ # 2 core MT Intel Core/Rzyen similar, use smt 0 as trigger to count:
+ # cpu2:smt 0, core 1, package 0
+ # cpu3:smt 1, core 1, package 0
+ ## but: older AMD Athlon 2 core:
+ # cpu0:smt 0, core 0, package 0
+ # cpu0:smt 0, core 0, package 1
+ elsif (/cpu([0-9]+):smt\s([0-9]+),\score\s([0-9]+)(,\spackage\s([0-9]+))?/){
+ $siblings = $1 + 1;
+ $cores += 1 if $2 == 0;
}
- $ids[$phys_id][$die_id][$line[1]] = $speed;
- $cpu{'dies'} = $die_id;
+ }
+ if ($flags){
+ $flags =~ s/\s+/ /g;
+ $flags =~ s/^\s+|\s+$//g;
}
}
- if (!$cpu{'flags'}){
- $cpu{'flags'} = cpu_flags_bsd();
- }
- main::log_data('dump','%cpu',\%cpu) if $b_log;
- print Data::Dumper::Dumper \%cpu if $test[8];
+ else {
+ if ($file && ! -r $file){
+ $flags = main::message('dmesg-boot-permissions');
+ }
+ }
+ my $values = {
+ 'cores' => $cores,
+ 'family' => $family,
+ 'flags' => $flags,
+ 'l1d-cache' => $l1d,
+ 'l1i-cache' => $l1i,
+ 'l2-cache' => $l2,
+ 'l3-cache' => $l3,
+ 'max-freq' => $max_freq,
+ 'microcode' => $microcode,
+ 'min-freq' => $min_freq,
+ 'model-id' => $model,
+ 'scalings' => \@scalings,
+ 'siblings' => $siblings,
+ 'stepping' => $stepping,
+ 'type' => $type,
+ };
+ print Data::Dumper::Dumper $values if $dbg[27];
eval $end if $b_log;
- return %cpu;
+ return $values;
}
-sub cpu_properties {
- my (%cpu) = @_;
- my ($b_amd_zen,$b_epyc,$b_ht,$b_elbrus,$b_intel,$b_ryzen,$b_xeon);
- if ($cpu{'type'} ){
- if ($cpu{'type'} eq 'intel'){
- $b_intel = 1;
- $b_xeon = 1 if $cpu{'model_name'} =~ /Xeon/i;
- }
- elsif ($cpu{'type'} eq 'amd' ){
- if ( $cpu{'family'} && $cpu{'family'} eq '17' ) {
- $b_amd_zen = 1;
- if ($cpu{'model_name'} ){
- if ($cpu{'model_name'} =~ /Ryzen/i ){
- $b_ryzen = 1;
+sub dmidecode_data {
+ eval $start if $b_log;
+ my $dmi_data = {'L1' => 0, 'L2' => 0,'L3' => 0, 'phys-cnt' => 0,
+ 'ext-clock' => undef, 'socket' => undef, 'speed' => undef,
+ 'max-speed' => undef, 'upgrade' => undef, 'volts' => undef};
+ return $dmi_data if !@dmi;
+ my ($id,$amount,$socket,$upgrade);
+ foreach my $item (@dmi){
+ next if ref $item ne 'ARRAY';
+ next if ($item->[0] < 4 || $item->[0] == 5 || $item->[0] == 6);
+ last if $item->[0] > 7;
+ if ($item->[0] == 7){
+ # skip first three rows, we don't need that data
+ # seen very bad data, L2 labeled L3, and random phantom type 7 caches
+ ($id,$amount) = ('',0);
+ # Configuration: Disabled, Not Socketed, Level 2
+ next if $item->[4] =~ /^Configuration:.*Disabled/i;
+ # labels have to be right before the block, otherwise exiting sub errors
+ DMI:
+ foreach my $value (@$item[3 .. $#$item]){
+ next if $value =~ /^~/;
+ # variants: L3 - Cache; L3 Cache; L3-cache; L2 CACHE; CPU Internal L1
+ if ($value =~ /^Socket Designation:.*? (L[1-3])\b/){
+ $id = lc($1);
+ }
+ # some cpus only show Socket Designation: Internal cache
+ elsif (!$id && $value =~ /^Configuration:.* Level.*?([1-3])\b/){
+ if ($value !~ /Disabled/i){
+ $id = "l$1";
}
- elsif ($cpu{'model_name'} =~ /EPYC/i){
- $b_epyc = 1;
+ }
+ # NOTE: cache is in KiB or MiB but they call it kB or MB
+ # so we send translate_size k or M which trips KiB/MiB mode
+ # if disabled can be 0.
+ elsif ($id && $value =~ /^Installed Size:\s+(.*?[kKM])i?B$/){
+ # Config..Disabled test should have gotten this, but just in case 0 size
+ next DMI if !$1;
+ $amount = main::translate_size($1);
}
+ if ($id && $amount){
+ $dmi_data->{$id} = $amount;
+ last;
}
}
}
- elsif ($cpu{'type'} eq 'elbrus') {
- $b_elbrus = 1;
+ # note: for multi cpu systems, we're hoping that these values are
+ # the same for each cpu, which in most pc situations they will be,
+ # and most ARM etc won't be using dmi data here anyway.
+ # Older dmidecode appear to have unreliable Upgrade outputs
+ elsif ($item->[0] == 4){
+ # skip first three row,s we don't need that data
+ ($socket,$upgrade) = ();
+ $dmi_data->{'phys-cnt'}++; # try to catch bsds without physical cpu count
+ foreach my $value (@$item[3 .. $#$item]){
+ next if $value =~ /^~/;
+ # note: on single cpu systems, Socket Designation shows socket type,
+ # but on multi, shows like, CPU1; CPU Socket #2; Socket 0; so check values a bit.
+ # Socket Designation: Intel(R) Core(TM) i5-3470 CPU @ 3.20GHz
+ # Sometimes shows as CPU Socket...
+ if ($value =~ /^Socket Designation:\s*(CPU\s*Socket|Socket)?[\s-]*(.*)$/i){
+ $upgrade = main::clean_dmi($2) if $2 !~ /(cpu|[mg]hz|onboard|socket|@|^#?[0-9]$)/i;
+ # print "$socket_temp\n";
+ }
+ # normally we prefer this value, but sometimes it's garbage
+ # older systems often show: Upgrade: ZIF Socket which is a generic term, legacy
+ elsif ($value =~ /^Upgrade:\s*(CPU\s*Socket|Socket)?[\s-]*(.*)$/i){
+ # print "$2\n";
+ $socket = main::clean_dmi($2) if $2 !~ /(ZIF|\bslot\b)/i;
+ }
+ # seen: Voltage: 5.0 V 2.9 V
+ elsif ($value =~ /^Voltage:\s*([0-9\.]+)\s*(V|Volts)?\b/i){
+ $dmi_data->{'volts'} = main::clean_dmi($1);
+ }
+ elsif ($value =~ /^Current Speed:\s*([0-9\.]+)\s*([MGK]Hz)?\b/i){
+ $dmi_data->{'speed'} = main::clean_dmi($1);
+ }
+ elsif ($value =~ /^Max Speed:\s*([0-9\.]+)\s*([MGK]Hz)?\b/i){
+ $dmi_data->{'max-speed'} = main::clean_dmi($1);
+ }
+ elsif ($value =~ /^External Clock:\s*([0-9\.]+\s*[MGK]Hz)\b/){
+ $dmi_data->{'ext-clock'} = main::clean_dmi($1);
+ }
+ }
}
}
- #my @dies = $phys[0][0];
- my $ref = $cpu{'ids'};
- my @phys = @$ref;
- my $phyical_count = 0;
- #my $phyical_count = scalar @phys;
- my @processors;
- my ($speed,$speed_key);
- # handle case where cpu reports say, phys id 0, 2, 4, 6 [yes, seen it]
- foreach (@phys) {
- $phyical_count++ if $_;
+ # Seen older cases where Upgrade: Other value exists
+ if ($socket || $upgrade){
+ if ($socket && $upgrade){
+ undef $upgrade if $socket eq $upgrade;
+ }
+ elsif ($upgrade){
+ $socket = $upgrade;
+ undef $upgrade;
+ }
+ $dmi_data->{'socket'} = $socket;
+ $dmi_data->{'upgrade'} = $upgrade;
+ }
+ main::log_data('dump','%$dmi_data',$dmi_data) if $b_log;
+ print Data::Dumper::Dumper $dmi_data if $dbg[27];
+ eval $end if $b_log;
+ return $dmi_data;
+}
+
+## CPU PROPERTIES MAIN ##
+sub cpu_properties {
+ my ($cpu) = @_;
+ my ($cpu_sys,$arch_level);
+ my $dmi_data = {};
+ my $tests = {};
+ my $caches = {
+ 'cache' => 0, # general, non id'ed from cpuinfo generic cache
+ 'l1' => 0,
+ 'l1d' => 0,
+ 'l1i' => 0,
+ 'l2' => 0,
+ 'l3' => 0,
+ };
+ my $counts = {
+ 'dies' => 0,
+ 'cpu-cores' => 0,
+ 'cores' => 0,
+ 'cores-multiplier' => 0,
+ 'physical' => 0,
+ 'processors' => 0,
+ };
+ my ($cache_check) = ('');
+ if (!$bsd_type && -d '/sys/devices' && !$force{'cpuinfo'}){
+ $cpu_sys = cpu_sys_data($cpu->{'sys-freq'});
+ }
+ cp_test_types($cpu,$tests) if $cpu->{'type'};
+ undef $cpu_sys if $dbg[42];
+ ## START CPU DATA HANDLERS ##
+ if (defined $cpu_sys->{'cpus'}){
+ cp_data_sys(
+ $cpu,
+ $cpu_sys,
+ $caches,
+ $counts
+ );
+ }
+ if (!defined $cpu_sys->{'cpus'} || !$counts->{'physical'} ||
+ !$counts->{'cpu-cores'}){
+ cp_data_fallback(
+ $cpu,
+ $caches,
+ \$cache_check,
+ $counts,
+ $tests,
+ );
+ }
+ # some arm cpus report each core as its own die, but that's wrong
+ if (%risc && $counts->{'dies'} > 1 &&
+ $counts->{'cpu-cores'} == $counts->{'dies'}){
+ $counts->{'dies'} = 1;
+ $cpu->{'dies'} = 1;
+ }
+ if ($type eq 'full' && ($extra > 1 || ($bsd_type && !$cpu->{'l2-cache'}))){
+ cp_data_dmi(
+ $cpu,
+ $dmi_data,
+ $caches,
+ $counts, # only to set BSD phys cpu counts if not found
+ \$cache_check,
+ );
+ }
+ ## END CPU DATA HANDLERS ##
+
+ # print "pc: $counts{'processors'} s: $cpu->{'siblings'} cpuc: $counts{'cpu-cores'} corec: $counts{'cores'}\n";
+
+ ## START CACHE PROCESSING ##
+ # Get BSD and legacy linux caches if not already from dmidecode or cpu_sys.
+ if ($type eq 'full' &&
+ !$caches->{'l1'} && !$caches->{'l2'} && !$caches->{'l2'}){
+ cp_caches_fallback(
+ $counts,
+ $cpu,
+ $caches,
+ \$cache_check,
+ );
+ }
+ # nothing to check!
+ if ($type eq 'full'){
+ if (!$caches->{'l1'} && !$caches->{'l2'} && !$caches->{'l3'} &&
+ !$caches->{'cache'}){
+ $cache_check = '';
+ }
+ if ($caches->{'cache'}){
+ # we don't want any math done on this one, who knows what it is
+ $caches->{'cache'} = cp_cache_processor($caches->{'cache'},1);
+ }
+ if ($caches->{'l1'}){
+ $caches->{'l1'} = cp_cache_processor($caches->{'l1'},$counts->{'physical'});
+ }
+ if ($caches->{'l2'}){
+ $caches->{'l2'} = cp_cache_processor($caches->{'l2'},$counts->{'physical'});
+ }
+ if ($caches->{'l3'}){
+ $caches->{'l3'} = cp_cache_processor($caches->{'l3'},$counts->{'physical'});
+ }
+ }
+ ## END CACHE PROCESSING ##
+
+ ## START TYPE/LAYOUT/ARCH/BUGS ##
+ my ($cpu_type) = ('');
+ $cpu_type = cp_cpu_type(
+ $counts,
+ $cpu,
+ $tests
+ );
+ my $topology = {};
+ cp_cpu_topology($counts,$topology);
+ my $arch = cp_cpu_arch(
+ $cpu->{'type'},
+ $cpu->{'family'},
+ $cpu->{'model-id'},
+ $cpu->{'stepping'},
+ $cpu->{'model_name'},
+ );
+ # arm cpuinfo case only; confirm on bsds, not sure all get family/ids
+ if ($arch->[0] && !$cpu->{'arch'}){
+ ($cpu->{'arch'},$cpu->{'arch-note'},$cpu->{'process'},$cpu->{'gen'},
+ $cpu->{'year'}) = @$arch;
+ }
+ # cpu_arch comes from set_os()
+ if (!$cpu->{'arch'} && $cpu_arch && %risc){
+ $cpu->{'arch'} = $cpu_arch;
+ }
+ if ($b_admin && defined $cpu_sys->{'data'}{'vulnerabilities'}){
+ $cpu->{'bugs-hash'} = $cpu_sys->{'data'}{'vulnerabilities'};
+ }
+ ## END TYPE/LAYOUT/ARCH/BUGS ##
+
+ ## START SPEED/BITS ##
+ my $speed_info = cp_speed_data($cpu,$cpu_sys);
+ # seen case where 64 bit cpu with lm flag shows as i686 (tinycore)
+ if (!%risc && $cpu->{'flags'} && (!$bits_sys || $bits_sys == 32)){
+ $bits_sys = ($cpu->{'flags'} =~ /\blm\b/) ? 64 : 32;
+ }
+ # must run after to make sure we have cpu bits
+ if ($b_admin && !%risc && $bits_sys && $bits_sys == 64 && $cpu->{'flags'}){
+ $arch_level = cp_cpu_level(
+ $cpu->{'flags'}
+ );
+ }
+ ## END SPEED/BITS ##
+
+ ## LOAD %cpu_properties
+ my $cpu_properties = {
+ 'arch-level' => $arch_level,
+ 'avg-speed-key' => $speed_info->{'avg-speed-key'},
+ 'bits-sys' => $bits_sys,
+ 'cache' => $caches->{'cache'},
+ 'cache-check' => $cache_check,
+ 'cpu-type' => $cpu_type,
+ 'dmi-max-speed' => $dmi_data->{'max-speed'},
+ 'dmi-speed' => $dmi_data->{'speed'},
+ 'ext-clock' => $dmi_data->{'ext-clock'},
+ 'high-speed-key' => $speed_info->{'high-speed-key'},
+ 'l1-cache' => $caches->{'l1'},
+ 'l1d-desc' => $caches->{'l1d-desc'},
+ 'l1i-desc' => $caches->{'l1i-desc'},
+ 'l2-cache' => $caches->{'l2'},
+ 'l2-desc' => $caches->{'l2-desc'},
+ 'l3-cache' => $caches->{'l3'},
+ 'l3-desc' => $caches->{'l3-desc'},
+ 'min-max-key' => $speed_info->{'min-max-key'},
+ 'min-max' => $speed_info->{'min-max'},
+ 'socket' => $dmi_data->{'socket'},
+ 'scaling-min-max-key' => $speed_info->{'scaling-min-max-key'},
+ 'scaling-min-max' => $speed_info->{'scaling-min-max'},
+ 'speed-key' => $speed_info->{'speed-key'},
+ 'speed' => $speed_info->{'speed'},
+ 'topology-full' => $topology->{'full'},
+ 'topology-string' => $topology->{'string'},
+ 'upgrade' => $dmi_data->{'upgrade'},
+ 'volts' => $dmi_data->{'volts'},
+ };
+ if ($b_log){
+ main::log_data('dump','%$cpu_properties',$cpu_properties);
+ main::log_data('dump','%$topology',$topology);
+ }
+ # print Data::Dumper::Dumper $cpu;
+ if ($dbg[38]){
+ print Data::Dumper::Dumper $cpu_properties;
+ print Data::Dumper::Dumper $topology;
+ }
+ # my $dc = scalar @dies;
+ # print 'phys: ' . $pc . ' dies: ' . $dc, "\n";
+ eval $end if $b_log;
+ return $cpu_properties;
+}
+
+## CPU DATA ENGINES ##
+# everything is passed by reference so no need to return anything
+sub cp_data_dmi {
+ eval $start if $b_log;
+ my ($cpu,$dmi_data,$caches,$counts,$cache_check) = @_;
+ my $cpu_dmi = dmidecode_data();
+ # fix for bsds that do not show physical cpus, like openbsd
+ if ($cpu_dmi->{'phys-cnt'} && $counts->{'physical'} == 1 &&
+ $cpu_dmi->{'phys-cnt'} > 1){
+ $counts->{'physical'} = $cpu_dmi->{'phys-cnt'};
+ }
+ # We have to undef all the sys stuff to get back to the true dmidecode results
+ # Too many variants to treat one by one, just clear it out if forced.
+ undef $caches if $force{'dmidecode'};
+ # We don't want to use dmi L1/L2/L3 at all for non BSD systems unless forced
+ # because have seen totally gibberish dmidecode data for caches. /sys cache
+ # data preferred, more granular and basically consistently right.
+ # Only run for linux if no cache data found, but BSD use to fill in missing
+ # (we don't care about legacy errors for BSD since the data isn't adequate).
+ # legacy dmidecode cache data used the per cache value, NOT the per CPU total
+ # value like it does today. Which makes it impossible to know for sure if the
+ # given value is right (new, or if cache matched cpu total) or inadequate.
+ if ((!$bsd_type && !$caches->{'l1'} && !$caches->{'l2'} && !$caches->{'l3'}) ||
+ ($bsd_type && (!$caches->{'l1'} || !$caches->{'l2'} || !$caches->{'l3'}))){
+ # Newer dmi: cache type total per phys cpu; Legacy: raw cache size only
+ if ($cpu_dmi->{'l1'} && !$caches->{'l1'}){
+ $caches->{'l1'} = $cpu_dmi->{'l1'};
+ $$cache_check = main::message('note-check');
+ }
+ # note: bsds often won't have L2 catch data found yet, but bsd sysctl can
+ # have these values so let's check just in case. OpenBSD does have it often.
+ if ($cpu_dmi->{'l2'} && !$caches->{'l2'}){
+ $caches->{'l2'} = $cpu_dmi->{'l2'};
+ $$cache_check = main::message('note-check');
+ }
+ if ($cpu_dmi->{'l3'} && !$caches->{'l3'}){
+ $caches->{'l3'} = $cpu_dmi->{'l3'};
+ $$cache_check = main::message('note-check');
+ }
+ }
+ $dmi_data->{'max-speed'} = $cpu_dmi->{'max-speed'};
+ $dmi_data->{'socket'} = $cpu_dmi->{'socket'} if $cpu_dmi->{'socket'};
+ $dmi_data->{'upgrade'} = $cpu_dmi->{'upgrade'} if $cpu_dmi->{'upgrade'};
+ $dmi_data->{'speed'} = $cpu_dmi->{'speed'} if $cpu_dmi->{'speed'};
+ $dmi_data->{'ext-clock'} = $cpu_dmi->{'ext-clock'} if $cpu_dmi->{'ext-clock'};
+ $dmi_data->{'volts'} = $cpu_dmi->{'volts'} if $cpu_dmi->{'volts'};
+ eval $end if $b_log;
+}
+
+sub cp_data_fallback {
+ eval $start if $b_log;
+ my ($cpu,$caches,$cache_check,$counts,$tests) = @_;
+ if (!$counts->{'physical'}){
+ # handle case where cpu reports say, phys id 0, 2, 4, 6
+ foreach (@{$cpu->{'ids'}}){
+ $counts->{'physical'}++ if $_;
+ }
}
# count unique processors ##
# note, this fails for intel cpus at times
- $ref = $cpu{'processors'};
- @processors = @$ref;
- #print ref $cpu{'processors'}, "\n";
- my $processors_count = scalar @processors;
- #print "p count:$processors_count\n";
- #print Data::Dumper::Dumper \@processors;
- # $cpu_cores is per physical cpu
- my ($cpu_layout,$cpu_type,$min_max,$min_max_key) = ('','','','');
- my ($dmi_max_speed,$dmi_speed,$ext_clock,$socket,$upgrade,$volts) = (undef);
- my ($l1_cache,$l2_cache,$l3_cache,$core_count,$cpu_cores,$die_count) = (0,0,0,0,0,0);
- # note: elbrus supports turning off cores, so we need to add one for cases where rounds to 0 or 1 less
- if ($b_elbrus && $processors_count){
- my @elbrus = elbrus_data($cpu{'model_id'},$processors_count,$cpu{'arch'});
- $cpu_cores = $elbrus[0];
- $phyical_count = $elbrus[1];
- $cpu{'arch'} = $elbrus[2];
- # print 'model id: ' . $cpu{'model_id'} . ' arch: ' . $cpu{'arch'} . " cpc: $cpu_cores phyc: $phyical_count proc: $processors_count \n";
- }
- $phyical_count ||= 1; # assume 1 if no id found, as with ARM
- if ($extra > 1){
- # note: dmidecode has one entry per cpu per cache type, so this already
- # has done the arithmetic on > 1 cpus for L1 and L3.
- my %cpu_dmi = cpu_dmi_data();
- $l1_cache = $cpu_dmi{'L1'} if $cpu_dmi{'L1'};
- $l3_cache = $cpu_dmi{'L3'} if $cpu_dmi{'L3'};
- # bsd sysctl can have these values so let's check just in case
- $l1_cache = $cpu{'l1-cache'} * $phyical_count if !$l1_cache && $cpu{'l1-cache'};
- $l3_cache = $cpu{'l3-cache'} * $phyical_count if !$l3_cache && $cpu{'l3-cache'};
- $dmi_max_speed = $cpu_dmi{'max-speed'} if $cpu_dmi{'max-speed'};
- $socket = $cpu_dmi{'socket'} if $cpu_dmi{'socket'};
- $upgrade = $cpu_dmi{'upgrade'} if $cpu_dmi{'upgrade'};
- $dmi_speed = $cpu_dmi{'speed'} if $cpu_dmi{'speed'};
- $ext_clock = $cpu_dmi{'ext-clock'} if $cpu_dmi{'ext-clock'};
- $volts = $cpu_dmi{'volts'} if $cpu_dmi{'volts'};
- }
- foreach my $die_ref ( @phys ){
- next if ! $die_ref;
- my @dies = @$die_ref;
- $core_count = 0;
- $die_count = scalar @dies;
- #$cpu{'dies'} = $die_count;
- foreach my $core_ref (@dies){
+ # print ref $cpu->{'processors'}, "\n";
+ if (!$counts->{'processors'}){
+ $counts->{'processors'} = scalar @{$cpu->{'processors'}};
+ }
+ # print "p count:$counts->{'processors'}\n";
+ # print Data::Dumper::Dumper $cpu->{'processors'};
+ # $counts->{'cpu-cores'} is per physical cpu
+ # note: elbrus supports turning off cores, so we need to add one for cases
+ # where rounds to 0 or 1 less
+ # print "$cpu{'type'},$cpu{'family'},$cpu{'model-id'},$cpu{'arch'}\n";
+ if ($tests->{'elbrus'} && $counts->{'processors'}){
+ my $elbrus = cp_elbrus_data($cpu->{'family'},$cpu->{'model-id'},
+ $counts->{'processors'},$cpu->{'arch'});
+ $counts->{'cpu-cores'} = $elbrus->[0];
+ $counts->{'physical'} = $elbrus->[1];
+ $cpu->{'arch'} = $elbrus->[2];
+ # print 'model id: ' . $cpu->{'model-id'} . ' arch: ' . $cpu->{'arch'} . " cpc: $counts->{'cpu-cores'} phyc: $counts->{'physical'} proc: $counts->{'processors'} \n";
+ }
+ $counts->{'physical'} ||= 1; # assume 1 if no id found, as with ARM
+ foreach my $die_ref (@{$cpu->{'ids'}}){
+ next if ref $die_ref ne 'ARRAY';
+ $counts->{'cores'} = 0;
+ $counts->{'dies'} = scalar @$die_ref;
+ #$cpu->{'dies'} = $counts->{'dies'};
+ foreach my $core_ref (@$die_ref){
next if ref $core_ref ne 'ARRAY';
- my @cores = @$core_ref;
- $core_count = 0;# reset for each die!!
+ $counts->{'cores'} = 0;# reset for each die!!
# NOTE: the counters can be undefined because the index comes from
# core id: which can be 0 skip 1 then 2, which leaves index 1 undefined
- # arm cpus do not actually show core id so ignore that counter
- foreach my $id (@cores){
- $core_count++ if defined $id && !$b_arm;
+ # risc cpus do not actually show core id so ignore that counter
+ foreach my $id (@$core_ref){
+ $counts->{'cores'}++ if defined $id && !%risc;
}
- #print 'cores: ' . $core_count, "\n";
+ # print 'cores: ' . $counts->{'cores'}, "\n";
}
}
-
# this covers potentially cases where ARM cpus have > 1 die
- $cpu{'dies'} = ($b_arm && $die_count <= 1 && $cpu{'dies'} > 1) ? $cpu{'dies'}: $die_count;
+ # maybe applies to all risc, not sure, but dies is broken anyway for cpuinfo
+ if (!$cpu->{'dies'}){
+ if ($risc{'arm'} && $counts->{'dies'} <= 1 && $cpu->{'dies'} > 1){
+ $counts->{'dies'} = $cpu->{'dies'};
+ }
+ else {
+ $cpu->{'dies'} = $counts->{'dies'};
+ }
+ }
# this is an attempt to fix the amd family 15 bug with reported cores vs actual cores
# NOTE: amd A6-4400M APU 2 core reports: cores: 1 siblings: 2
# NOTE: AMD A10-5800K APU 4 core reports: cores: 2 siblings: 4
- if (!$cpu_cores){
- if ($cpu{'cores'} && ! $core_count || $cpu{'cores'} >= $core_count){
- $cpu_cores = $cpu{'cores'};
+ if (!$counts->{'cpu-cores'}){
+ if ($cpu->{'cores'} && !$counts->{'cores'} ||
+ $cpu->{'cores'} >= $counts->{'cores'}){
+ $counts->{'cpu-cores'} = $cpu->{'cores'};
}
- elsif ($core_count > $cpu{'cores'}){
- $cpu_cores = $core_count;
+ elsif ($counts->{'cores'} > $cpu->{'cores'}){
+ $counts->{'cpu-cores'} = $counts->{'cores'};
}
}
- #print "cpu-c:$cpu_cores\n";
- #$cpu_cores = $cpu{'cores'};
+ # print "cpu-c:$counts->{'cpu-cores'}\n";
+ # $counts->{'cpu-cores'} = $cpu->{'cores'};
# like, intel core duo
# NOTE: sadly, not all core intel are HT/MT, oh well...
# xeon may show wrong core / physical id count, if it does, fix it. A xeon
# may show a repeated core id : 0 which gives a fake num_of_cores=1
- if ($b_intel){
- if ($cpu{'siblings'} && $cpu{'siblings'} > 1 && $cpu{'cores'} && $cpu{'cores'} > 1 ){
- if ( $cpu{'siblings'}/$cpu{'cores'} == 1 ){
- $b_intel = 0;
- $b_ht = 0;
+ if ($tests->{'intel'}){
+ if ($cpu->{'siblings'} && $cpu->{'siblings'} > 1 &&
+ $cpu->{'cores'} && $cpu->{'cores'} > 1){
+ if ($cpu->{'siblings'}/$cpu->{'cores'} == 1){
+ $tests->{'intel'} = 0;
+ $tests->{'ht'} = 0;
}
else {
- $cpu_cores = ($cpu{'siblings'}/2);
- $b_ht = 1;
+ $counts->{'cpu-cores'} = ($cpu->{'siblings'}/2);
+ $tests->{'ht'} = 1;
}
}
}
- # ryzen is made out of blocks of 8 core dies
- elsif ($b_ryzen){
- $cpu_cores = $cpu{'cores'};
+ # ryzen is made out of blocks of 2, 4, or 8 core dies...
+ if ($tests->{'ryzen'}){
+ $counts->{'cpu-cores'} = $cpu->{'cores'};
# note: posix ceil isn't present in Perl for some reason, deprecated?
- my $working = $cpu_cores / 8;
- my @temp = split /\./, $working;
- $cpu{'dies'} = ($temp[1] && $temp[1] > 0) ? $temp[0]++ : $temp[0];
+ my $working = $counts->{'cpu-cores'} / 8;
+ my @temp = split('\.', $working);
+ $cpu->{'dies'} = ($temp[1] && $temp[1] > 0) ? $temp[0]++ : $temp[0];
+ $counts->{'dies'} = $cpu->{'dies'};
}
# these always have 4 dies
- elsif ($b_epyc) {
- $cpu_cores = $cpu{'cores'};
- $cpu{'dies'} = 4;
+ elsif ($tests->{'epyc'}){
+ $counts->{'cpu-cores'} = $cpu->{'cores'};
+ $counts->{'dies'} = $cpu->{'dies'} = 4;
}
-# elsif ($b_elbrus){
-# $cpu_cores =
-# }
# 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 ( $cpu_cores == 0 && ($cpu{'cores'} * $phyical_count > 1)){
- $cpu_cores = ($cpu{'cores'} * $phyical_count);
+ if ($counts->{'cpu-cores'} == 0 &&
+ $cpu->{'cores'} * $counts->{'physical'} > 1){
+ $counts->{'cpu-cores'} = ($cpu->{'cores'} * $counts->{'physical'});
}
# last check, seeing some intel cpus and vms with intel cpus that do not show any
# core id data at all, or siblings.
- if ($cpu_cores == 0 && $processors_count > 0){
- $cpu_cores = $processors_count;
+ if ($counts->{'cpu-cores'} == 0 && $counts->{'processors'} > 0){
+ $counts->{'cpu-cores'} = $counts->{'processors'};
}
# this happens with BSDs which have very little cpu data available
- if ( $processors_count == 0 && $cpu_cores > 0 ){
- $processors_count = $cpu_cores;
- if ($bsd_type && ($b_ht || $b_amd_zen) && $cpu_cores > 2 ){
- $cpu_cores = $cpu_cores/2;;
+ if ($counts->{'processors'} == 0 && $counts->{'cpu-cores'} > 0){
+ $counts->{'processors'} = $counts->{'cpu-cores'};
+ if ($bsd_type && ($tests->{'ht'} || $tests->{'amd-zen'}) &&
+ $counts->{'cpu-cores'} > 2){
+ $counts->{'cpu-cores'} = $counts->{'cpu-cores'}/2;;
}
- my $count = $processors_count;
+ my $count = $counts->{'processors'};
$count-- if $count > 0;
- $cpu{'processors'}[$count] = 0;
+ $cpu->{'processors'}[$count] = 0;
# no way to get per processor speeds yet, so assign 0 to each
# must be a numeric value. Could use raw speed from core 0, but
# that would just be a hack.
foreach (0 .. $count){
- $cpu{'processors'}[$_] = 0;
+ $cpu->{'processors'}[$_] = 0;
+ }
+ }
+ # so far only OpenBSD has a way to detect MT cpus, but Openbsd has disabled MT
+ if ($bsd_type){
+ if ($cpu->{'siblings'} &&
+ $counts->{'cpu-cores'} && $counts->{'cpu-cores'} > 1){
+ $counts->{'cores-multiplier'} = $counts->{'cpu-cores'};
+ }
+ # if no siblings we couldn't get MT status of cpu so can't trust cache
+ else {
+ $$cache_check = main::message('note-check');
}
}
+ # only elbrus shows L1 / L3 cache data in cpuinfo, cpu_sys data should show
+ # for newer full linux.
+ elsif ($counts->{'cpu-cores'} &&
+ ($tests->{'elbrus'} || $counts->{'cpu-cores'} > 1)) {
+ $counts->{'cores-multiplier'} = $counts->{'cpu-cores'};
+ }
# last test to catch some corner cases
# seen a case where a xeon vm in a dual xeon system actually had 2 cores, no MT
# so it reported 4 siblings, 2 cores, but actually only had 1 core per virtual cpu
- #print "prc: $processors_count phc: $phyical_count coc: $core_count cpc: $cpu_cores\n";
- if (!$b_arm && $processors_count == $phyical_count*$core_count && $cpu_cores > $core_count){
- $b_ht = 0;
- #$b_xeon = 0;
- $b_intel = 0;
- $cpu_cores = 1;
- $core_count = 1;
- $cpu{'siblings'} = 1;
- }
- #print "pc: $processors_count s: $cpu{'siblings'} cpuc: $cpu_cores corec: $core_count\n";
- # Algorithm:
- # if > 1 processor && processor id (physical id) == core id then Multi threaded (MT)
- # if siblings > 1 && siblings == 2 * num_of_cores ($cpu{'cores'}) then Multi threaded (MT)
- # if > 1 processor && processor id (physical id) != core id then Multi-Core Processors (MCP)
- # if > 1 processor && processor ids (physical id) > 1 then Symmetric Multi Processing (SMP)
- # if = 1 processor then single core/processor Uni-Processor (UP)
- if ( $processors_count > 1 || ( $b_intel && $cpu{'siblings'} > 0 ) ) {
- # non-multicore MT
- if ($processors_count == ($phyical_count * $cpu_cores * 2)){
- #print "mt:1\n";
- $cpu_type .= 'MT';
- }
-# elsif ($b_xeon && $cpu{'siblings'} > 1){
-# #print "mt:2\n";
-# $cpu_type .= 'MT';
-# }
- elsif ($cpu{'siblings'} > 1 && ($cpu{'siblings'} == 2 * $cpu_cores )){
- #print "mt:3\n";
- $cpu_type .= 'MT';
- }
- # non-MT multi-core or MT multi-core
- if ( ($processors_count == $cpu_cores ) || ($phyical_count < $cpu_cores)){
- my $sep = ($cpu_type) ? ' ' : '' ;
- $cpu_type .= $sep . 'MCP';
- }
- # only solidly known > 1 die cpus will use this, ryzen and arm for now
- if ( $cpu{'dies'} > 1 ){
- my $sep = ($cpu_type) ? ' ' : '' ;
- $cpu_type .= $sep . 'MCM';
+ # print "prc: $counts->{'processors'} phc: $counts->{'physical'} coc: $counts->{'cores'} cpc: $counts->{'cpu-cores'}\n";
+ # this test was for arm but I think it applies to all risc, but risc will be sys
+ if (!%risc &&
+ $counts->{'processors'} == $counts->{'physical'} * $counts->{'cores'} &&
+ $counts->{'cpu-cores'} > $counts->{'cores'}){
+ $tests->{'ht'} = 0;
+ # $tests->{'xeon'} = 0;
+ $tests->{'intel'} = 0;
+ $counts->{'cpu-cores'} = 1;
+ $counts->{'cores'} = 1;
+ $cpu->{'siblings'} = 1;
+ }
+ eval $end if $b_log;
+}
+
+# all values passed by reference so no need for returns
+sub cp_data_sys {
+ eval $start if $b_log;
+ my ($cpu,$cpu_sys,$caches,$counts) = @_;
+ my (@keys) = (sort keys %{$cpu_sys->{'cpus'}});
+ return if !@keys;
+ $counts->{'physical'} = scalar @keys;
+ if ($type eq 'full' && $cpu_sys->{'cpus'}{$keys[0]}{'caches'}){
+ cp_sys_caches($cpu_sys->{'cpus'}{$keys[0]}{'caches'},$caches,'l1','l1d');
+ cp_sys_caches($cpu_sys->{'cpus'}{$keys[0]}{'caches'},$caches,'l1','l1i');
+ cp_sys_caches($cpu_sys->{'cpus'}{$keys[0]}{'caches'},$caches,'l2','');
+ cp_sys_caches($cpu_sys->{'cpus'}{$keys[0]}{'caches'},$caches,'l3','');
+ }
+ if ($cpu_sys->{'data'}{'speeds'}{'all'}){
+ $counts->{'processors'} = scalar @{$cpu_sys->{'data'}{'speeds'}{'all'}};
+ }
+ if (defined $cpu_sys->{'data'}{'smt-active'}){
+ if ($cpu_sys->{'data'}{'smt-active'}){
+ $cpu->{'smt'} = 'enabled';
+ }
+ # values: on/off/notsupported/notimplemented
+ elsif (defined $cpu_sys->{'data'}{'smt-control'} &&
+ $cpu_sys->{'data'}{'smt-control'} =~ /^not/){
+ $cpu->{'smt'} = main::message('unsupported');
}
- # >1 cpu sockets active: Symetric Multi Processing
- if ($phyical_count > 1){
- my $sep = ($cpu_type) ? ' ' : '' ;
- $cpu_type .= $sep . 'SMP';
+ else {
+ $cpu->{'smt'} = 'disabled';
}
}
- else {
- $cpu_type = 'UP';
+ my $i = 0;
+ my (@governor,@max,@min,@phys_cores);
+ foreach my $phys_id (@keys){
+ if ($cpu_sys->{'cpus'}{$phys_id}{'cores'}){
+ my ($mt,$st) = (0,0);
+ my (@core_keys) = keys %{$cpu_sys->{'cpus'}{$phys_id}{'cores'}};
+ $cpu->{'cores'} = $counts->{'cpu-cores'} = scalar @core_keys;
+ $counts->{'cpu-topo'}[$i]{'cores'} = $cpu->{'cores'};
+ if ($cpu_sys->{'cpus'}{$phys_id}{'dies'}){
+ $counts->{'cpu-topo'}[$i]{'dies'} = scalar @{$cpu_sys->{'cpus'}{$phys_id}{'dies'}};
+ $cpu->{'dies'} = $counts->{'cpu-topo'}[$i]{'dies'};
+ }
+ # If we ever get > 1 min/max speed per phy cpu, we'll need to fix the [0]
+ if ($cpu_sys->{'cpus'}{$phys_id}{'max-freq'}[0]){
+ if (!grep {$cpu_sys->{'cpus'}{$phys_id}{'max-freq'}[0] eq $_} @max){
+ push(@max,$cpu_sys->{'cpus'}{$phys_id}{'max-freq'}[0]);
+ }
+ $counts->{'cpu-topo'}[$i]{'max'} = $cpu_sys->{'cpus'}{$phys_id}{'max-freq'}[0];
+ }
+ if ($cpu_sys->{'cpus'}{$phys_id}{'min-freq'}[0]){
+ if (!grep {$cpu_sys->{'cpus'}{$phys_id}{'min-freq'}[0] eq $_} @min){
+ push(@min,$cpu_sys->{'cpus'}{$phys_id}{'min-freq'}[0]);
+ }
+ $counts->{'cpu-topo'}[$i]{'min'} = $cpu_sys->{'cpus'}{$phys_id}{'min-freq'}[0];
+ }
+ # cheating, this is not a count, but we need the data for topology, must
+ # sort since governors can be in different order if > 1
+ if ($cpu_sys->{'cpus'}{$phys_id}{'governor'}){
+ foreach my $gov (@{$cpu_sys->{'cpus'}{$phys_id}{'governor'}}){
+ push(@governor,$gov) if !grep {$_ eq $gov} @governor;
+ }
+ $cpu->{'governor'} = join(',',@governor);
+ }
+ if ($cpu_sys->{'cpus'}{$phys_id}{'scaling-driver'}){
+ $cpu->{'scaling-driver'} = $cpu_sys->{'cpus'}{$phys_id}{'scaling-driver'};
+ }
+ if ($cpu_sys->{'cpus'}{$phys_id}{'scaling-driver'}){
+ $cpu->{'scaling-driver'} = $cpu_sys->{'cpus'}{$phys_id}{'scaling-driver'};
+ }
+ if ($cpu_sys->{'cpus'}{$phys_id}{'scaling-max-freq'}){
+ $cpu->{'scaling-max-freq'} = $cpu_sys->{'cpus'}{$phys_id}{'scaling-max-freq'};
+ }
+ if ($cpu_sys->{'cpus'}{$phys_id}{'scaling-min-freq'}){
+ $cpu->{'scaling-min-freq'} = $cpu_sys->{'cpus'}{$phys_id}{'scaling-min-freq'};
+ }
+ if (!grep {$counts->{'cpu-cores'} eq $_} @phys_cores){
+ push(@phys_cores,$counts->{'cpu-cores'});
+ }
+ if ($counts->{'processors'}){
+ if ($counts->{'processors'} > $counts->{'cpu-cores'}){
+ for my $key (@core_keys){
+ if ((my $threads = scalar @{$cpu_sys->{'cpus'}{$phys_id}{'cores'}{$key}}) > 1){
+ $counts->{'cpu-topo'}[$i]{'cores-mt'}++;
+ $counts->{'cpu-topo'}[$i]{'threads'} += $threads;
+ # note: for mt+st type cpus, we need to handle tpc on output per type
+ $counts->{'cpu-topo'}[$i]{'tpc'} = $threads;
+ $counts->{'struct-mt'} = 1;
+ }
+ else {
+ $counts->{'cpu-topo'}[$i]{'cores-st'}++;
+ $counts->{'cpu-topo'}[$i]{'threads'}++;
+ $counts->{'struct-st'} = 1;
+ }
+ }
+ }
+ }
+ $i++;
+ }
}
- if ($phyical_count > 1){
- $cpu_layout = $phyical_count . 'x ';
+ $counts->{'struct-max'} = 1 if scalar @max > 1;
+ $counts->{'struct-min'} = 1 if scalar @min > 1;
+ $counts->{'struct-cores'} = 1 if scalar @phys_cores > 1;
+ if ($b_log){
+ main::log_data('dump','%cpu_properties',$caches);
+ main::log_data('dump','%cpu_properties',$counts);
}
- $cpu_layout .= count_alpha($cpu_cores) . 'Core';
- $cpu_layout .= ' (' . $cpu{'dies'}. '-Die)' if !$bsd_type && $cpu{'dies'} > 1;
- # the only possible change for bsds is if we can get phys counts in the future
- if ($bsd_type){
- $l2_cache = $cpu{'l2-cache'} * $phyical_count;
+ # print Data::Dumper::Dumper $caches;
+ # print Data::Dumper::Dumper $counts;
+ eval $end if $b_log;
+}
+
+sub cp_sys_caches {
+ eval $start if $b_log;
+ my ($sys_caches,$caches,$id,$id_di) = @_;
+ my $cache_id = ($id_di) ? $id_di: $id;
+ my %cache_desc;
+ if ($sys_caches->{$cache_id}){
+ # print Data::Dumper::Dumper $cpu_sys->{'cpus'};
+ foreach (@{$sys_caches->{$cache_id}}){
+ # android seen to have cache data without size item
+ next if !defined $_;
+ $caches->{$cache_id} += $_;
+ $cache_desc{$_}++ if $b_admin;
+ }
+ $caches->{$id} += $caches->{$id_di} if $id_di;
+ $caches->{$cache_id . '-desc'} = cp_cache_desc(\%cache_desc) if $b_admin;
}
- # AMD SOS chips appear to report full L2 cache per core
- elsif ($cpu{'type'} eq 'amd' && ($cpu{'family'} eq '14' || $cpu{'family'} eq '15' || $cpu{'family'} eq '16')){
- $l2_cache = $cpu{'l2-cache'} * $phyical_count;
+ eval $end if $b_log;
+}
+
+## CPU PROPERTIES TOOLS ##
+sub cp_cache_desc {
+ my ($cache_desc) = @_;
+ my ($desc,$sep) = ('','');
+ foreach (sort keys %{$cache_desc}){
+ $desc .= $sep . $cache_desc->{$_} . 'x' . main::get_size($_,'string');
+ $sep = ', ';
}
- elsif ($cpu{'type'} ne 'intel'){
- $l2_cache = $cpu{'l2-cache'} * $cpu_cores * $phyical_count;
+ undef $cache_desc;
+ return $desc;
+}
+
+# args: 0: $caches passed by reference
+sub cp_cache_processor {
+ my ($cache,$count) = @_;
+ my $output;
+ if ($count > 1){
+ $output = $count . 'x ' . main::get_size($cache,'string');
+ $output .= ' (' . main::get_size($cache * $count,'string') . ')';
}
- ## note: this handles how intel reports L2, total instead of per core like AMD does
- # note that we need to multiply by number of actual cpus here to get true cache size
else {
- $l2_cache = $cpu{'l2-cache'} * $phyical_count;
+ $output = main::get_size($cache,'string');
}
- if ($l1_cache > 0){
- $l1_cache = "$l1_cache KiB";
- }
- if ($l2_cache > 10000){
- $l2_cache = sprintf("%.01f MiB",$l2_cache/1024); # trim to no decimals?
+ # print "$cache :: $count :: $output\n";
+ return $output;
+}
+
+sub cp_caches_fallback {
+ eval $start if $b_log;
+ my ($counts,$cpu,$caches,$cache_check) = @_;
+ # L1 Cache
+ if ($cpu->{'l1-cache'}){
+ $caches->{'l1'} = $cpu->{'l1-cache'} * $counts->{'cores-multiplier'};
}
- elsif ($l2_cache > 0){
- $l2_cache = "$l2_cache KiB";
+ else {
+ if ($cpu->{'l1d-cache'}){
+ $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';
+ $caches->{'l1i-desc'} .= main::get_size($cpu->{'l1i-cache'},'string');
+ $caches->{'l1'} += $cpu->{'l1i-cache'} * $counts->{'cores-multiplier'};
+ }
+ }
+ # L2 Cache
+ # If summed by dmidecode or from cpu_sys don't use this
+ if ($cpu->{'l2-cache'}){
+ # the only possible change for bsds is if dmidecode method gives phy counts
+ # Looks like Intel on bsd shows L2 per core, not total. Note: Pentium N3540
+ # uses 2(not 4)xL2 cache size for 4 cores, sigh... you just can't win...
+ if ($bsd_type){
+ $caches->{'l2'} = $cpu->{'l2-cache'} * $counts->{'cores-multiplier'};
+ }
+ # AMD SOS chips appear to report full L2 cache per cpu
+ elsif ($cpu->{'type'} eq 'amd' && ($cpu->{'family'} eq '14' ||
+ $cpu->{'family'} eq '15' || $cpu->{'family'} eq '16')){
+ $caches->{'l2'} = $cpu->{'l2-cache'};
+ }
+ elsif ($cpu->{'type'} ne 'intel'){
+ $caches->{'l2'} = $cpu->{'l2-cache'} * $counts->{'cpu-cores'};
+ }
+ # note: this handles how intel reports L2, total instead of per core like
+ # AMD does when cpuinfo sourced, when caches sourced, is per core as expected
+ else {
+ $caches->{'l2'} = $cpu->{'l2-cache'};
+ }
}
- if ($l3_cache > 10000){
- $l3_cache = sprintf("%.01f MiB",$l3_cache/1024); # trim to no decimals?
+ # l3 Cache - usually per physical cpu, but some rzyen will have per ccx.
+ if ($cpu->{'l3-cache'}){
+ $caches->{'l3'} = $cpu->{'l3-cache'};
}
- elsif ($l3_cache > 0){
- $l3_cache = "$l3_cache KiB";
+ # don't do anything with it, we have no ideaw if it's L1, L2, or L3, generic
+ # cpuinfo fallback, it's junk data essentially, and will show as cache:
+ # only use this fallback if no cache data was found
+ if ($cpu->{'cache'} && !$caches->{'l1'} && !$caches->{'l2'} &&
+ !$caches->{'l3'}){
+ $caches->{'cache'} = $cpu->{'cache'};
+ $$cache_check = main::message('note-check');
}
- if ($cpu{'cur-freq'} && $cpu{'min-freq'} && $cpu{'max-freq'} ){
- $min_max = "$cpu{'min-freq'}/$cpu{'max-freq'} MHz";
- $min_max_key = "min/max";
- $speed_key = ($show{'short'} || $show{'cpu-basic'}) ? 'speed' : 'Speed';
- $speed = "$cpu{'cur-freq'} MHz";
- }
- elsif ($cpu{'cur-freq'} && $cpu{'max-freq'}){
- $min_max = "$cpu{'max-freq'} MHz";
- $min_max_key = "max";
- $speed_key = ($show{'short'} || $show{'cpu-basic'}) ? 'speed' : 'Speed';
- $speed = "$cpu{'cur-freq'} MHz";
- }
-# elsif ($cpu{'cur-freq'} && $cpu{'max-freq'} && $cpu{'cur-freq'} == $cpu{'max-freq'}){
-# $speed_key = ($show{'short'} || $show{'cpu-basic'}) ? 'speed' : 'Speed';
-# $speed = "$cpu{'cur-freq'} MHz (max)";
-# }
- elsif ($cpu{'cur-freq'} && $cpu{'min-freq'}){
- $min_max = "$cpu{'min-freq'} MHz";
- $min_max_key = "min";
- $speed_key = ($show{'short'} || $show{'cpu-basic'}) ? 'speed' : 'Speed';
- $speed = "$cpu{'cur-freq'} MHz";
- }
- elsif ($cpu{'cur-freq'} && !$cpu{'max-freq'}){
- $speed_key = ($show{'short'} || $show{'cpu-basic'}) ? 'speed' : 'Speed';
- $speed = "$cpu{'cur-freq'} MHz";
- }
-
- if ( !$bits_sys && !$b_arm && $cpu{'flags'} ){
- $bits_sys = ($cpu{'flags'} =~ /\blm\b/) ? 64 : 32;
- }
- my %cpu_properties = (
- 'bits-sys' => $bits_sys,
- 'cpu-layout' => $cpu_layout,
- 'cpu-type' => $cpu_type,
- 'dmi-max-speed' => $dmi_max_speed,
- 'dmi-speed' => $dmi_speed,
- 'ext-clock' => $ext_clock,
- 'min-max-key' => $min_max_key,
- 'min-max' => $min_max,
- 'socket' => $socket,
- 'speed-key' => $speed_key,
- 'speed' => $speed,
- 'upgrade' => $upgrade,
- 'volts' => $volts,
- 'l1-cache' => $l1_cache,
- 'l2-cache' => $l2_cache,
- 'l3-cache' => $l3_cache,
- );
- main::log_data('dump','%cpu_properties',\%cpu_properties) if $b_log;
- #print Data::Dumper::Dumper \%cpu;
- #print Data::Dumper::Dumper \%cpu_properties;
- #my $dc = scalar @dies;
- #print 'phys: ' . $pc . ' dies: ' . $dc, "\n";
eval $end if $b_log;
- return %cpu_properties;
}
-sub cpu_dmi_data {
+
+## START CPU ARCH ##
+sub cp_cpu_arch {
eval $start if $b_log;
- return if !@dmi;
- my %dmi_data = ('L1' => 0, 'L2' => 0,'L3' => 0, 'ext-clock' => undef, 'socket' => undef,
- 'speed' => undef, 'max-speed' => undef, 'upgrade' => undef, 'volts' => undef);
- my ($id,$amount,$socket,$upgrade);
- foreach my $ref (@dmi){
- next if ref $ref ne 'ARRAY';
- my @item = @$ref;
- next if ($item[0] < 4 || $item[0] == 5 || $item[0] == 6);
- last if $item[0] > 7;
- if ($item[0] == 7){
- # skip first three row, we don't need that data
- splice @item, 0, 3;
- ($id,$amount) = ('',0);
- foreach my $value (@item){
- next if $value =~ /~/;
- # variants: L3 - Cache; L3 Cache; L3-cache; CPU Internal L1
- if ($value =~ /^Socket Designation:.* (L[1-3])\b/){
- $id = $1;
- }
- # some cpus only show Socket Designation: Internal cache
- elsif (!$id && $value =~ /^Configuration:.* Level.*([1-3])\b/){
- $id = "L$1";
- }
- elsif ($id && $value =~ /^Installed Size:\s+(.*B)$/){
- $amount = main::translate_size($1);
- }
- if ($id && $amount){
- $dmi_data{$id} += $amount;
- last;
- }
- }
+ my ($type,$family,$model,$stepping,$name) = @_;
+ # we can get various random strings for rev/stepping, particularly for arm,ppc
+ # but we want stepping to be integer for math comparisons, so convert, or set
+ # to 0 so it won't break anything.
+ if (defined $stepping && $stepping =~ /^[A-F0-9]{1,3}$/i){
+ $stepping = hex($stepping);
+ }
+ else {
+ $stepping = 0
+ }
+ $family ||= '';
+ $model = '' if !defined $model; # model can be 0
+ my ($arch,$gen,$note,$process,$year);
+ my $check = main::message('note-check');
+ # See: docs/inxi-cpu.txt
+ # print "type:$type fam:$family model:$model step:$stepping\n";
+ # Note: AMD family is not Ext fam . fam but rather Ext-fam + fam.
+ # But model is Ext model . model...
+ if ($type eq 'amd'){
+ if ($family eq '3'){
+ $arch = 'Am386';
+ $process = 'AMD 900-1500nm';
+ $year = '1991-92';
+ }
+ elsif ($family eq '4'){
+ if ($model =~ /^(3|7|8|9|A)$/){
+ $arch = 'Am486';
+ $process = 'AMD 350-700nm';
+ $year = '1993-95';}
+ elsif ($model =~ /^(E|F)$/){
+ $arch = 'Am5x86';
+ $process = 'AMD 350nm';
+ $year = '1995-99';}
}
- # note: for multi cpu systems, we're hoping that these values are
- # the same for each cpu, which in most pc situations they will be,
- # and ARM etc won't be using dmi data here anyway.
- # Older dmidecode appear to have unreliable Upgrade outputs
- elsif ($item[0] == 4){
- # skip first three row, we don't need that data
- splice @item, 0, 3;
- ($socket,$upgrade) = (undef);
- foreach my $value (@item){
- next if $value =~ /~/;
- # note: on single cpu systems, Socket Designation shows socket type,
- # but on multi, shows like, CPU1; CPU Socket #2; Socket 0; so check values a bit.
- # Socket Designation: Intel(R) Core(TM) i5-3470 CPU @ 3.20GHz
- # Sometimes shows as CPU Socket...
- if ($value =~ /^Socket Designation:\s*(CPU\s*Socket|Socket)?[\s-]*(.*)$/i){
- $upgrade = main::dmi_cleaner($2) if $2 !~ /(cpu|[mg]hz|onboard|socket|@|^#?[0-9]$)/i;
- #print "$socket_temp\n";
- }
- # normally we prefer this value, but sometimes it's garbage
- # older systems often show: Upgrade: ZIF Socket which is a generic term, legacy
- elsif ($value =~ /^Upgrade:\s*(CPU\s*Socket|Socket)?[\s-]*(.*)$/i){
- #print "$2\n";
- $socket = main::dmi_cleaner($2) if $2 !~ /(ZIF|\bslot\b)/i;
- }
- # seen: Voltage: 5.0 V 2.9 V
- elsif ($value =~ /^Voltage:\s*([0-9\.]+)\s*(V|Volts)?\b/i){
- $dmi_data{'volts'} = main::dmi_cleaner($1);
- }
- elsif ($value =~ /^Current Speed:\s*([0-9\.]+)\s*([MGK]Hz)?\b/i){
- $dmi_data{'speed'} = main::dmi_cleaner($1);
- }
- elsif ($value =~ /^Max Speed:\s*([0-9\.]+)\s*([MGK]Hz)?\b/i){
- $dmi_data{'max-speed'} = main::dmi_cleaner($1);
- }
- elsif ($value =~ /^External Clock:\s*([0-9\.]+\s*[MGK]Hz)\b/){
- $dmi_data{'ext-clock'} = main::dmi_cleaner($1);
- }
- }
+ elsif ($family eq '5'){
+ ## verified
+ if ($model =~ /^(0|1|2|3)$/){
+ $arch = 'K5';
+ $process = 'AMD 350nm';
+ $year = '1996-97';}
+ elsif ($model =~ /^(6)$/){
+ $arch = 'K6';
+ $process = 'AMD 350nm';
+ $year = '1997-98';}
+ elsif ($model =~ /^(7)$/){
+ $arch = 'K6';
+ $process = 'AMD 250nm';
+ $year = '1997-98';}
+ elsif ($model =~ /^(8)$/){
+ $arch = 'K6-2';
+ $process = 'AMD 250nm';
+ $year = '1998-2003';}
+ elsif ($model =~ /^(9)$/){
+ $arch = 'K6-3';
+ $process = 'AMD 250nm';
+ $year = '1999-2003';}
+ elsif ($model =~ /^(D)$/){
+ $arch = 'K6-3';
+ $process = 'AMD 180nm';
+ $year = '1999-2003';}
+ ## unverified
+ elsif ($model =~ /^(A)$/){
+ $arch = 'K6 Geode';
+ $process = 'AMD 150-350nm';
+ $year = '1999';} # dates uncertain, 1999 start
+ ## fallback
+ else {
+ $arch = 'K6';
+ $process = 'AMD 250-350nm';
+ $year = '1999-2003';}
}
- }
- # Seen older cases where Upgrade: Other value exists
- if ($socket || $upgrade){
- if ($socket && $upgrade){
- $upgrade = undef if $socket eq $upgrade;
+ elsif ($family eq '6'){
+ ## verified
+ if ($model =~ /^(1)$/){
+ $arch = 'K7'; # 1:2:argon
+ $process = 'AMD 250nm';
+ $year = '1999-2001';}
+ elsif ($model =~ /^(2|3|4|6)$/){
+ # 3:0:duron;3:1:spitfire;4:2,4:thunderbird; 6:2:Palomino, duron; 2:1:Pluto
+ $arch = 'K7';
+ $process = 'AMD 180nm';
+ $year = '2000-01';}
+ elsif ($model =~ /^(7|8|A)$/){
+ $arch = 'K7'; # 7:0,1:Morgan;8:1:thoroughbred,duron-applebred; A:0:barton
+ $process = 'AMD 130nm';
+ $year = '2002-04';}
+ ## fallback
+ else {
+ $arch = 'K7';
+ $process = 'AMD 130-180nm';
+ $year = '2003-14';}
}
- elsif ($upgrade){
- $socket = $upgrade;
- $upgrade = undef;
+ # note: family F K8 needs granular breakdowns, was a long lived family
+ elsif ($family eq 'F'){
+ ## verified
+ # check: B|E|F
+ if ($model =~ /^(4|5|7|8|B|C|E|F)$/){
+ # 4:0:clawhammer;5:8:sledgehammer;8:2,4:8:dubin;7:A;C:0:NewCastle;
+ $arch = 'K8';
+ $process = 'AMD 130nm';
+ $year = '2004-05';}
+ # check: 14|17|18|1B|25|48|4B|5D
+ elsif ($model =~ /^(14|15|17|18|1B|1C|1F|21|23|24|25|27|28|2C|2F|37|3F|41|43|48|4B|4C|4F|5D|5F|C1)$/){
+ # 1C:0,2C:2:Palermo;21:0,2,23:2:denmark;1F:0:winchester;2F:2:Venice;
+ # 27:1,37:2:san diego;28:1,3F:2:Manchester;23:2:Toledo;$F:2,5F:2,3:Orleans;
+ # 5F:2:Manila?;37:2;C1:3:windsor fx;43:2,3:santa ana;41:2:santa rosa;
+ # 4C:2:Keene;2C:2:roma;24:2:newark
+ $arch = 'K8';
+ $process = 'AMD 90nm';
+ $year = '2004-06';}
+ elsif ($model =~ /^(68|6B|6C|6F|7C|7F)$/){
+ $arch = 'K8'; # 7F:1,2:Lima; 68:1,6B:1,2:Brisbane;6F:2:conesus;7C:2:sherman
+ $process = 'AMD 65nm';
+ $year = '2005-08';}
+ ## fallback
+ else {
+ $arch = 'K8';
+ $process = 'AMD 65-130nm';
+ $year = '2004-2008';}
+ }
+ # K9 was planned but skipped
+ elsif ($family eq '10'){ # 1F
+ ## verified
+ if ($model =~ /^(2)$/){
+ $arch = 'K10'; # 2:2:budapest;2:1,3:barcelona
+ $process = 'AMD 65nm';
+ $year = '2007-08';}
+ elsif ($model =~ /^(4|5|6|8|9|A)$/){
+ # 4:2:Suzuka;5:2,3:propus;6:2:Regor;8:0:Istanbul;9:1:maranello
+ $arch = 'K10';
+ $process = 'AMD 45nm';
+ $year = '2009-13';}
+ ## fallback
+ else {
+ $arch = 'K10';
+ $process = 'AMD 45-65nm';
+ $year = '2007-13';}
+ }
+ # very loose, all stepping 1: covers athlon x2, sempron, turion x2
+ # years unclear, could be 2005 start, or 2008
+ elsif ($family eq '11'){ # 2F
+ if ($model =~ /^(3)$/){
+ $arch = 'K11 Turion X2'; # mix of K8/K10
+ $note = $check;
+ $process = 'AMD 65-90nm';
+ $year = ''; }
}
- $dmi_data{'socket'} = $socket;
- $dmi_data{'upgrade'} = $upgrade;
- }
- main::log_data('dump','%dmi_data',\%dmi_data) if $b_log;
- # print Data::Dumper::Dumper \%dmi_data;
- eval $end if $b_log;
- return %dmi_data;
-}
-sub cpu_bugs_sys {
- eval $start if $b_log;
- my (@bugs,$type,$value);
- return if ! -d '/sys/devices/system/cpu/vulnerabilities/';
- my @items = main::globber('/sys/devices/system/cpu/vulnerabilities/*');
- if (@items){
- foreach (@items){
- $value = ( -r $_) ? (main::reader($_))[0] : main::row_defaults('root-required');
- $type = ($value =~ /^Mitigation:/) ? 'mitigation': 'status';
- $_ =~ s/.*\/([^\/]+)$/$1/;
- $value =~ s/Mitigation: //;
- @bugs = (@bugs,[($_,$type,$value)]);
+ # might also need cache handling like 14/16
+ elsif ($family eq '12'){ # 3F
+ if ($model =~ /^(1)$/){
+ $arch = 'K12 Fusion'; # K10 based apu, llano
+ $process = 'GF 32nm';
+ $year = '2011';} # check years
+ else {
+ $arch = 'K12 Fusion';
+ $process = 'GF 32nm';
+ $year = '2011';} # check years
}
+ # SOC, apu
+ elsif ($family eq '14'){ # 5F
+ if ($model =~ /^(1|2)$/){
+ $arch = 'Bobcat';
+ $process = 'GF 40nm';
+ $year = '2011-13';}
+ else {
+ $arch = 'Bobcat';
+ $process = 'GF 40nm';
+ $year = '2011-13';}
+ }
+ elsif ($family eq '15'){ # 6F
+ # note: only model 1 confirmd
+ if ($model =~ /^(0|1|3|4|5|6|7|8|9|A|B|C|D|E|F)$/){
+ $arch = 'Bulldozer';
+ $process = 'GF 32nm';
+ $year = '2011';}
+ # note: only 2,10,13 confirmed
+ elsif ($model =~ /^(2|10|11|12|13|14|15|16|17|18|19|1A|1B|1C|1D|1E|1F)$/){
+ $arch = 'Piledriver';
+ $process = 'GF 32nm';
+ $year = '2012-13';}
+ # note: only 30,38 confirmed
+ elsif ($model =~ /^(30|31|32|33|34|35|36|37|38|39|3A|3B|3C|3D|3E|3F)$/){
+ $arch = 'Steamroller';
+ $process = 'GF 28nm';
+ $year = '2014';}
+ # note; only 60,65,70 confirmed
+ elsif ($model =~ /^(60|61|62|63|64|65|66|67|68|69|6A|6B|6C|6D|6E|6F|70|71|72|73|74|75|76|77|78|79|7A|7B|7C|7D|7E|7F)$/){
+ $arch = 'Excavator';
+ $process = 'GF 28nm';
+ $year = '2015';}
+ else {
+ $arch = 'Bulldozer';
+ $process = 'GF 32nm';
+ $year = '2011-12';}
+ }
+ # SOC, apu
+ elsif ($family eq '16'){ # 7F
+ if ($model =~ /^(0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F)$/){
+ $arch = 'Jaguar';
+ $process = 'GF 28nm';
+ $year = '2013-14';}
+ elsif ($model =~ /^(30|31|32|33|34|35|36|37|38|39|3A|3B|3C|3D|3E|3F)$/){
+ $arch = 'Puma';
+ $process = 'GF 28nm';
+ $year = '2014-15';}
+ else {
+ $arch = 'Jaguar';
+ $process = 'GF 28nm';
+ $year = '2013-14';}
+ }
+ elsif ($family eq '17'){ # 8F
+ # can't find stepping/model for no ht 2x2 core/die models, only first ones
+ if ($model =~ /^(1|11|20)$/){
+ $arch = 'Zen';
+ $process = 'GF 14nm';
+ $year = '2017-19';}
+ # Seen: stepping 1 is Zen+ Ryzen 7 3750H. But stepping 1 Zen is: Ryzen 3 3200U
+ # AMD Ryzen 3 3200G is stepping 1, Zen+
+ # Unknown if stepping 0 is Zen or either.
+ elsif ($model =~ /^(18)$/){
+ $arch = 'Zen/Zen+';
+ $gen = '1';
+ $process = 'GF 12nm';
+ $note = $check;
+ $year = '2019';}
+ # shares model 8 with zen, stepping unknown
+ elsif ($model =~ /^(8)$/){
+ $arch = 'Zen+';
+ $gen = '2';
+ $process = 'GF 12nm';
+ $year = '2018-21';}
+ # used this but it didn't age well: ^(2[0123456789ABCDEF]|
+ elsif ($model =~ /^(3.|4.|5.|6.|7.|8.|9.|A.)$/){
+ $arch = 'Zen 2';
+ $gen = '3';
+ $process = 'TSMC n7 (7nm)'; # some consumer maybe GF 14nm
+ $year = '2020-22';}
+ else {
+ $arch = 'Zen';
+ $note = $check;
+ $process = '7-14nm';
+ $year = '';}
+ }
+ # Joint venture between AMD and Chinese companies. Type amd? or hygon?
+ elsif ($family eq '18'){ # 9F
+ # model 0, zen 1
+ $arch = 'Zen (Hygon Dhyana)';
+ $gen = '1';
+ $process = 'GF 14nm';
+ $year = '';}
+ elsif ($family eq '19'){ # AF
+ # zen 4 raphael, phoenix 1 use n5 I believe
+ # Epyc Bergamo zen4c 4nm, only few full model IDs, update when appear
+ # zen4c is for cloud hyperscale
+ if ($model =~ /^(78)$/){
+ $arch = 'Zen 4c';
+ $gen = '5';
+ $process = 'TSMC n4 (4nm)';
+ $year = '2023+';}
+ # ext model 6,7, base models trickling in
+ # 10 engineering sample
+ elsif ($model =~ /^(1.|6.|7.|A.)$/){
+ $arch = 'Zen 4';
+ $gen = '5';
+ $process = 'TSMC n5 (5nm)';
+ $year = '2022+';}
+ # double check 40, 44; 21 confirmed
+ elsif ($model =~ /^(21|4.)$/){
+ $arch = 'Zen 3+';
+ $gen = '4';
+ $process = 'TSMC n6 (7nm)';
+ $year = '2022';}
+ # 21, 50: step 0; known: 21, 3x, 50
+ elsif ($model =~ /^(0|1|8|2.|3.|5.)$/){
+ $arch = 'Zen 3';
+ $gen = '4';
+ $process = 'TSMC n7 (7nm)';
+ $year = '2021-22';}
+ else {
+ $arch = 'Zen 3/4';
+ $note = $check;
+ $process = 'TSMC n5 (5nm)';
+ $year = '2021-22';}
+ }
+ # Zen 5: TSMC n3/n4, epyc turin / granite ridge? / turin dense zen 5c 3nm
+ elsif ($family eq '20'){ # BF
+ if ($model =~ /^(0)$/){
+ $arch = 'Zen 5';
+ $gen = '5';
+ $process = 'TSMC n3 (3nm)'; # turin could be 4nm, need more data
+ $year = '2023+';}
+ elsif ($model =~ /^(20|40)$/){
+ $arch = 'Zen 5';
+ $gen = '5';
+ $process = 'TSMC n3 (3nm)'; # desktop, granite ridge, confirm 2024
+ $year = '2024+';}
+ else {
+ $arch = 'Zen 5';
+ $note = $check;
+ $process = 'TSMC n3/n4 (3,4nm)';
+ $year = '2024+';}
+ }
+ # Roadmap: check to verify, AMD is usually closer to target than Intel
+ # Epyc 4 genoa: zen 4, nm, 2022+ (dec 2022), cxl-1.1,pcie-5, ddr-5
+ }
+ # we have no advanced data for ARM cpus, this is an area that could be improved?
+ elsif ($type eq 'arm'){
+ if ($family ne ''){
+ $arch="ARMv$family";}
+ else {
+ $arch='ARM';}
}
- main::log_data('dump','@bugs',\@bugs) if $b_log;
- # print Data::Dumper::Dumper \@bugs;
- eval $end if $b_log;
- return @bugs;
-}
-
-sub cpu_speeds {
- eval $start if $b_log;
- my (@processors) = @_;
- my (@speeds);
- my @files = main::globber('/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq');
- foreach (@files){
- my $speed = (main::reader($_))[0];
- if ($speed || $speed eq '0'){
- $speed = sprintf "%.0f", $speed/1000;
- push @speeds, $speed;
+ # elsif ($type eq 'ppc'){
+ # $arch='PPC';
+ # }
+ # aka VIA
+ elsif ($type eq 'centaur'){
+ if ($family eq '5'){
+ if ($model =~ /^(4)$/){
+ $arch = 'WinChip C6';
+ $process = '250nm';
+ $year = '';}
+ elsif ($model =~ /^(8)$/){
+ $arch = 'WinChip 2';
+ $process = '250nm';
+ $year = '';}
+ elsif ($model =~ /^(9)$/){
+ $arch = 'WinChip 3';
+ $process = '250nm';
+ $year = '';}
+ }
+ elsif ($family eq '6'){
+ if ($model =~ /^(6)$/){
+ $arch = 'Via Cyrix III (WinChip 5)';
+ $process = '150nm'; # guess
+ $year = '';}
+ elsif ($model =~ /^(7|8)$/){
+ $arch = 'Via C3';
+ $process = '150nm';
+ $year = '';}
+ elsif ($model =~ /^(9)$/){
+ $arch = 'Via C3-2';
+ $process = '130nm';
+ $year = '';}
+ elsif ($model =~ /^(A|D)$/){
+ $arch = 'Via C7';
+ $process = '90nm';
+ $year = '';}
+ elsif ($model =~ /^(F)$/){
+ if ($stepping <= 1){
+ $arch = 'Via CN Nano (Isaah)';}
+ elsif ($stepping <= 2){
+ $arch = 'Via Nano (Isaah)';}
+ elsif ($stepping <= 10){
+ $arch = 'Via Nano (Isaah)';}
+ elsif ($stepping <= 12){
+ $arch = 'Via Isaah';}
+ elsif ($stepping <= 13){
+ $arch = 'Via Eden';}
+ elsif ($stepping <= 14){
+ $arch = 'Zhaoxin ZX';}
+ $process = '90nm'; # guess
+ $year = '';}
+ }
+ elsif ($family eq '7'){
+ if ($model =~ /^(1.|3.)$/){
+ $arch = 'Zhaoxin ZX';
+ $process = '90nm'; # guess
+ $year = '';
+ }
+ }
+ }
+ # note, to test uncoment $cpu{'type'} = Elbrus in proc/cpuinfo logic
+ # ExpLicit Basic Resources Utilization Scheduling
+ elsif ($type eq 'elbrus'){
+ # E8CB
+ if ($family eq '4'){
+ if ($model eq '1'){
+ $arch = 'Elbrus 2000 (gen-1)';
+ $process = 'Mikron 130nm';
+ $year = '2005';}
+ elsif ($model eq '2'){
+ $arch = 'Elbrus-S (gen-2)';
+ $process = 'Mikron 90nm';
+ $year = '2010';}
+ elsif ($model eq '3'){
+ $arch = 'Elbrus-4C (gen-3)';
+ $process = 'TSMC 65nm';
+ $year = '2014';}
+ elsif ($model eq '4'){
+ $arch = 'Elbrus-2C+ (gen-2)';
+ $process = 'Mikron 90nm';
+ $year = '2011';}
+ elsif ($model eq '6'){
+ $arch = 'Elbrus-2CM (gen-2)';
+ $note = $check;
+ $process = 'Mikron 90nm';
+ $year = '2011 (?)';}
+ elsif ($model eq '7'){
+ if ($stepping >= 2){
+ $arch = 'Elbrus-8C1 (gen-4)';
+ $process = 'TSMC 28nm';
+ $year = '2016';}
+ else {
+ $arch = 'Elbrus-8C (gen-4)';
+ $process = 'TSMC 28nm';
+ $year = '2016';}
+ } # note: stepping > 1 may be 8C1
+ elsif ($model eq '8'){
+ $arch = 'Elbrus-1C+ (gen-4)';
+ $process = 'TSMC 40nm';
+ $year = '2016';}
+ # 8C2 morphed out of E8CV, but the two were the same die
+ elsif ($model eq '9'){
+ $arch = 'Elbrus-8CV/8C2 (gen-4/5)';
+ $process = 'TSMC 28nm';
+ $note = $check;
+ $year = '2016/2020';}
+ elsif ($model eq 'A'){
+ $arch = 'Elbrus-12C (gen-6)';
+ $process = 'TSMC 16nm';
+ $year = '2021+';}
+ elsif ($model eq 'B'){
+ $arch = 'Elbrus-16C (gen-6)';
+ $process = 'TSMC 16nm';
+ $year = '2021+';}
+ elsif ($model eq 'C'){
+ $arch = 'Elbrus-2C3 (gen-6)';
+ $process = 'TSMC 16nm';
+ $year = '2021+';}
+ else {
+ $arch = 'Elbrus-??';;
+ $note = $check;
+ $year = '';}
+ }
+ elsif ($family eq '5'){
+ if ($model eq '9'){
+ $arch = 'Elbrus-8C2 (gen-4)';
+ $process = 'TSMC 28nm';
+ $year = '2020';}
+ else {
+ $arch = 'Elbrus-??';
+ $note = $check;
+ $process = '';
+ $year = '';}
+ }
+ elsif ($family eq '6'){
+ if ($model eq 'A'){
+ $arch = 'Elbrus-12C (gen-6)';
+ $process = 'TSMC 16nm';
+ $year = '2021+';}
+ elsif ($model eq 'B'){
+ $arch = 'Elbrus-16C (gen-6)';
+ $process = 'TSMC 16nm';
+ $year = '2021+';}
+ elsif ($model eq 'C'){
+ $arch = 'Elbrus-2C3 (gen-6)';
+ $process = 'TSMC 16nm';
+ $year = '2021+';}
+ # elsif ($model eq '??'){
+ # $arch = 'Elbrus-32C (gen-7)';
+ # $process = '?? 7nm';
+ # $year = '2025';}
+ else {
+ $arch = 'Elbrus-??';
+ $note = $check;
+ $process = '';
+ $year = '';}
+ }
+ else {
+ $arch = 'Elbrus-??';
+ $note = $check;
}
}
- if (!@speeds){
- foreach (@processors){
- if ($_ || $_ eq '0'){
- $_ = sprintf "%.0f", $_;
- push @speeds, $_;
+ elsif ($type eq 'intel'){
+ if ($family eq '4'){
+ if ($model =~ /^(0|1|2)$/){
+ $arch = 'i486';
+ $process = '1000nm'; # 33mhz
+ $year = '1989-98';}
+ elsif ($model =~ /^(3)$/){
+ $arch = 'i486';
+ $process = '800nm'; # 66mhz
+ $year = '1992-98';}
+ elsif ($model =~ /^(4|5|6|7|8|9)$/){
+ $arch = 'i486';
+ $process = '600nm'; # 100mhz
+ $year = '1993-98';}
+ else {
+ $arch = 'i486';
+ $process = '600-1000nm';
+ $year = '1989-98';}
+ }
+ # 1993-2000
+ elsif ($family eq '5'){
+ # verified
+ if ($model =~ /^(1)$/){
+ $arch = 'P5';
+ $process = 'Intel 800nm'; # 1:3,5,7:800
+ $year = '1993-94';}
+ elsif ($model =~ /^(2)$/){
+ $arch = 'P5'; # 2:5:MMX
+ # 2:C:350[or 600]; 2:1,4,5,6:600;but:
+ if ($stepping > 9){
+ $process = 'Intel 350nm';
+ $year = '1996-2000';}
+ else {
+ $process = 'Intel 600nm';
+ $year = '1993-95';}
+ }
+ elsif ($model =~ /^(4)$/){
+ $arch = 'P5';
+ $process = 'Intel 350nm'; # MMX. 4:3:P55C
+ $year = '1997';}
+ # unverified
+ elsif ($model =~ /^(3|7)$/){
+ $arch = 'P5'; # 7:0:MMX
+ $process = 'Intel 350-600nm';
+ $year = '';}
+ elsif ($model =~ /^(8)$/){
+ $arch = 'P5';
+ $process = 'Intel 350-600nm'; # MMX
+ $year = '';}
+ elsif ($model =~ /^(9|A)$/){
+ $arch = 'Lakemont';
+ $process = 'Intel 350nm';
+ $year = '';}
+ # fallback
+ else {
+ $arch = 'P5';
+ $process = 'Intel 350-600nm'; # MMX
+ $year = '1994-2000';}
+ }
+ elsif ($family eq '6'){
+ if ($model =~ /^(1)$/){
+ $arch = 'P6 Pro';
+ $process = 'Intel 350nm';
+ $year = '';}
+ elsif ($model =~ /^(3)$/){
+ $arch = 'P6 II Klamath';
+ $process = 'Intel 350nm';
+ $year = '';}
+ elsif ($model =~ /^(5)$/){
+ $arch = 'P6 II Deschutes';
+ $process = 'Intel 250nm';
+ $year = '';}
+ elsif ($model =~ /^(6)$/){
+ $arch = 'P6 II Mendocino';
+ $process = 'Intel 250nm'; # 6:5:P6II-celeron-mendo
+ $year = '1999';}
+ elsif ($model =~ /^(7)$/){
+ $arch = 'P6 III Katmai';
+ $process = 'Intel 250nm';
+ $year = '1999';}
+ elsif ($model =~ /^(8)$/){
+ $arch = 'P6 III Coppermine';
+ $process = 'Intel 180nm';
+ $year = '1999';}
+ elsif ($model =~ /^(9)$/){
+ $arch = 'M Banias'; # Pentium M
+ $process = 'Intel 130nm';
+ $year = '2003';}
+ elsif ($model =~ /^(A)$/){
+ $arch = 'P6 III Xeon';
+ $process = 'Intel 180-250nm';
+ $year = '1999';}
+ elsif ($model =~ /^(B)$/){
+ $arch = 'P6 III Tualitin'; # 6:B:1,4
+ $process = 'Intel 130nm';
+ $year = '2001';}
+ elsif ($model =~ /^(D)$/){
+ $arch = 'M Dothan'; # Pentium M
+ $process = 'Intel 90nm';
+ $year = '2003-05';}
+ elsif ($model =~ /^(E)$/){
+ $arch = 'M Yonah';
+ $process = 'Intel 65nm';
+ $year = '2006-08';}
+ elsif ($model =~ /^(F|16)$/){
+ $arch = 'Core2 Merom'; # 16:1:conroe-l[65nm]
+ $process = 'Intel 65nm';
+ $year = '2006-09';}
+ elsif ($model =~ /^(15)$/){
+ $arch = 'M Tolapai'; # pentium M system on chip
+ $process = 'Intel 90nm';
+ $year = '2008';}
+ elsif ($model =~ /^(17)$/){
+ $arch = 'Penryn'; # 17:A:Core 2,Celeron-wolfdale,yorkfield
+ $process = 'Intel 45nm';
+ $year = '2008';}
+ # had 25 also, but that's westmere, at least for stepping 2
+ elsif ($model =~ /^(1A|1E|1F|2C|2E|2F)$/){
+ $arch = 'Nehalem';
+ $process = 'Intel 45nm';
+ $year = '2008-10';}
+ elsif ($model =~ /^(1C|26)$/){
+ $arch = 'Bonnell';
+ $process = 'Intel 45nm';
+ $year = '2008-13';} # atom Bonnell? 27?
+ elsif ($model =~ /^(1D)$/){
+ $arch = 'Penryn';
+ $process = 'Intel 45nm';
+ $year = '2007-08';}
+ # 25 may be nahelem in a stepping, check. Stepping 2 is westmere
+ elsif ($model =~ /^(25|2C|2F)$/){
+ $arch = 'Westmere'; # die shrink of nehalem
+ $process = 'Intel 32nm';
+ $year = '2010-11';}
+ elsif ($model =~ /^(27|35|36)$/){
+ $arch = 'Saltwell';
+ $process = 'Intel 32nm';
+ $year = '2011-13';}
+ elsif ($model =~ /^(2A|2D)$/){
+ $arch = 'Sandy Bridge';
+ $process = 'Intel 32nm';
+ $year = '2010-12';}
+ elsif ($model =~ /^(37|4A|4D|5A|5D)$/){
+ $arch = 'Silvermont';
+ $process = 'Intel 22nm';
+ $year = '2013-15';}
+ elsif ($model =~ /^(3A|3E)$/){
+ $arch = 'Ivy Bridge';
+ $process = 'Intel 22nm';
+ $year = '2012-15';}
+ elsif ($model =~ /^(3C|3F|45|46)$/){
+ $arch = 'Haswell';
+ $process = 'Intel 22nm';
+ $year = '2013-15';}
+ elsif ($model =~ /^(3D|47|4F|56)$/){
+ $arch = 'Broadwell';
+ $process = 'Intel 14nm';
+ $year = '2015-18';}
+ elsif ($model =~ /^(4C)$/){
+ $arch = 'Airmont';
+ $process = 'Intel 14nm';
+ $year = '2015-17';}
+ elsif ($model =~ /^(4E)$/){
+ $arch = 'Skylake';
+ $process = 'Intel 14nm';
+ $year = '2015';}
+ # need to find stepping for these, guessing stepping 4 is last for SL
+ elsif ($model =~ /^(55)$/){
+ if ($stepping >= 5 && $stepping <= 7){
+ $arch = 'Cascade Lake';
+ $process = 'Intel 14nm';
+ $year = '2019';}
+ elsif ($stepping >= 8){
+ $arch = 'Cooper Lake'; # 55:A:14nm
+ $process = 'Intel 14nm';
+ $year = '2020';}
+ else {
+ $arch = 'Skylake';
+ $process = 'Intel 14nm';
+ $year = '';}}
+ elsif ($model =~ /^(57)$/){
+ $arch = 'Knights Landing';
+ $process = 'Intel 14nm';
+ $year = '2016+';}
+ elsif ($model =~ /^(5C|5F)$/){
+ $arch = 'Goldmont';
+ $process = 'Intel 14nm';
+ $year = '2016';}
+ elsif ($model =~ /^(5E)$/){
+ $arch = 'Skylake-S';
+ $process = 'Intel 14nm';
+ $year = '2015';}
+ elsif ($model =~ /^(66|67)$/){
+ $arch = 'Cannon Lake';
+ $process = 'Intel 10nm';
+ $year = '2018';}
+ # 6 are servers, 7 not
+ elsif ($model =~ /^(6A|6C|7D|7E|9F)$/){
+ $arch = 'Ice Lake';
+ $process = 'Intel 10nm';
+ $year = '2019-21';}
+ elsif ($model =~ /^(7A)$/){
+ $arch = 'Goldmont Plus';
+ $process = 'Intel 14nm';
+ $year = '2017';}
+ elsif ($model =~ /^(85)$/){
+ $arch = 'Knights Mill';
+ $process = 'Intel 14nm';
+ $year = '2017-19';}
+ elsif ($model =~ /^(86)$/){
+ $arch = 'Tremont Snow Ridge'; # embedded
+ $process = 'Intel 10nm';
+ $year = '2020';}
+ elsif ($model =~ /^(87)$/){
+ $arch = 'Tremont Parker Ridge'; # embedded
+ $process = 'Intel 10nm';
+ $year = '2022';}
+ elsif ($model =~ /^(8A)$/){
+ $arch = 'Tremont Lakefield';
+ $process = 'Intel 10nm';
+ $year = '2020';} # ?
+ elsif ($model =~ /^(96)$/){
+ $arch = 'Tremont Elkhart Lake';
+ $process = 'Intel 10nm';
+ $year = '2020';} # ?
+ elsif ($model =~ /^(8C|8D)$/){
+ $arch = 'Tiger Lake';
+ $process = 'Intel 10nm';
+ $year = '2020';}
+ elsif ($model =~ /^(8E)$/){
+ # can be AmberL or KabyL
+ if ($stepping == 9){
+ $arch = 'Amber/Kaby Lake';
+ $note = $check;
+ $process = 'Intel 14nm';
+ $year = '2017';}
+ elsif ($stepping == 10){
+ $arch = 'Coffee Lake';
+ $process = 'Intel 14nm';
+ $year = '2017';}
+ elsif ($stepping == 11){
+ $arch = 'Whiskey Lake';
+ $process = 'Intel 14nm';
+ $year = '2018';}
+ # can be WhiskeyL or CometL
+ elsif ($stepping == 12){
+ $arch = 'Comet/Whiskey Lake';
+ $note = $check;
+ $process = 'Intel 14nm';
+ $year = '2018';}
+ # note: had it as > 13, but 0xC seems to be CL
+ elsif ($stepping >= 13){
+ $arch = 'Comet Lake'; # 10 gen
+ $process = 'Intel 14nm';
+ $year = '2019-20';}
+ # NOTE: not enough info to lock this down
+ else {
+ $arch = 'Kaby Lake';
+ $note = $check;
+ $process = 'Intel 14nm';
+ $year = '~2018-20';}
+ }
+ elsif ($model =~ /^(8F|95)$/){
+ $arch = 'Sapphire Rapids';
+ $process = 'Intel 7 (10nm ESF)';
+ $year = '2023+';} # server
+ elsif ($model =~ /^(97|9A|9C|BE)$/){
+ $arch = 'Alder Lake'; # socket LG 1700
+ $process = 'Intel 7 (10nm ESF)';
+ $year = '2021+';}
+ elsif ($model =~ /^(9E)$/){
+ if ($stepping == 9){
+ $arch = 'Kaby Lake';
+ $process = 'Intel 14nm';
+ $year = '2018';}
+ elsif ($stepping >= 10 && $stepping <= 13){
+ $arch = 'Coffee Lake'; # 9E:A,B,C,D
+ $process = 'Intel 14nm';
+ $year = '2018';}
+ else {
+ $arch = 'Kaby Lake';
+ $note = $check;
+ $process = 'Intel 14nm';
+ $year = '2018';}
+ }
+ elsif ($model =~ /^(A5|A6)$/){
+ $arch = 'Comet Lake'; # 10 gen; stepping 0-5
+ $process = 'Intel 14nm';
+ $year = '2020';}
+ elsif ($model =~ /^(A7|A8)$/){
+ $arch = 'Rocket Lake'; # 11 gen; stepping 1
+ $process = 'Intel 14nm';
+ $year = '2021+';}
+ # More info: comet: shares family/model, need to find stepping numbers
+ # Coming: meteor lake; granite rapids; emerald rapids, diamond rapids
+ ## IDS UNKNOWN, release late 2022
+ elsif ($model =~ /^(AA|AB|AC|B5)$/){
+ $arch = 'Meteor Lake'; # 14 gen
+ $process = 'Intel 4 (7nm)';
+ $year = '2023+';}
+ elsif ($model =~ /^(AD|AE)$/){
+ $arch = 'Granite Rapids'; # ?
+ $process = 'Intel 3 (7nm+)'; # confirm
+ $year = '2024+';}
+ elsif ($model =~ /^(B6)$/){
+ $arch = 'Grand Ridge'; # 14 gen
+ $process = 'Intel 4 (7nm)'; # confirm
+ $year = '2023+';}
+ elsif ($model =~ /^(B7|BA|BF)$/){
+ $arch = 'Raptor Lake'; # 13 gen, socket LG 1700,1800
+ $process = 'Intel 7 (10nm)';
+ $year = '2022+';}
+ elsif ($model =~ /^(BC|BD)$/){
+ $arch = 'Lunar Lake'; # 15 gn
+ $process = 'Intel 18a (1.8nm)';
+ $year = '2024+';} # seen APU IDs, so out there
+ # Meteor Lake-S maybe cancelled, replaced by arrow
+ elsif ($model =~ /^(C5|C6)$/){
+ $arch = 'Arrow Lake'; # 15 gen; igpu battleimage 3/4nm
+ # gfx tile is TSMC 3nm
+ $process = 'Intel 20a (2nm)';# TSMC 3nm (corei3-5)/Intel 20A 2nm (core i5-9)
+ $year = '2024+';} # check when actually in production
+ elsif ($model =~ /^(CC)$/){
+ $arch = 'Panther Lake'; # 17 gen
+ $process = 'Intel 18a (1.8nm)';
+ $year = '2025+';}
+ elsif ($model =~ /^(CF)$/){
+ $arch = 'Emerald Rapids'; # 5th gen xeon
+ $process = 'Intel 7 (10nm)';
+ $year = '2023+';}
+ ## roadmaps: check and update, since Intel misses their targets often
+ # Sapphire Rapids: 13 gen (?), Intel 7 (10nm), 2023
+ # Emerald Rapids: Intel 7 (10nm), 2023
+ # Granite Rapids: Intel 3 (7nm+), 2024
+ # Diamond Rapids: Intel 3 (7nm+), 2025
+ # Raptor Lake: 13 gen, Intel 7 (10nm), 2022
+ # Meteor Lake: 14 gen, Intel 4 (7nm+)
+ # Arrow Lake: 15 gen, TSMC 3nm (corei3-5)/Intel 20A 2nm (core i5-9), 2024
+ # Arrow Lake: 16 gen, TSMC 3nm (corei3-5)/Intel 20A 2nm (core i5-9), 2024, refresh
+ # Lunar Lake: 15 gen, TSMC’s 3nm (N3B), 2024-5
+ # Panther Lake:17 gen, ?, late 2025, cougar cove Xe3 Celestial GPU architecture
+ # Beast Lake: 16 gen, ?, 2026?
+ # Nova Lake: 18 gen, Intel 14A (1.4nm), 2026
+ }
+ # itanium 1 family 7 all recalled
+ elsif ($family eq 'B'){
+ if ($model =~ /^(0)$/){
+ $arch = 'Knights Ferry';
+ $process = 'Intel 45nm';
+ $year = '2010-11';}
+ if ($model =~ /^(1)$/){
+ $arch = 'Knights Corner';
+ $process = 'Intel 22nm';
+ $year = '2012-13';}
+ }
+ # pentium 4
+ elsif ($family eq 'F'){
+ if ($model =~ /^(0|1)$/){
+ $arch = 'Netburst Willamette';
+ $process = 'Intel 180nm';
+ $year = '2000-01';}
+ elsif ($model =~ /^(2)$/){
+ if ($stepping <= 4 || $stepping > 6){
+ $arch = 'Netburst Northwood';}
+ elsif ($stepping == 5){
+ $arch = 'Netburst Gallatin';}
+ else {
+ $arch = 'Netburst';}
+ $process = 'Intel 130nm';
+ $year = '2002-03';}
+ elsif ($model =~ /^(3)$/){
+ $arch = 'Netburst Prescott';
+ $process = 'Intel 90nm';
+ $year = '2004-06';} # 6? Nocona
+ elsif ($model =~ /^(4)$/){
+ # these are vague, and same stepping can have > 1 core names
+ if ($stepping < 10){
+ $arch = 'Netburst Prescott'; # 4:1,9:prescott
+ $process = 'Intel 90nm';
+ $year = '2004-06';}
+ else {
+ $arch = 'Netburst Smithfield';
+ $process = 'Intel 90nm';
+ $year = '2005-06';} # 6? Nocona
+ }
+ elsif ($model =~ /^(6)$/){
+ $arch = 'Netburst Presler'; # 6:2,4,5:presler
+ $process = 'Intel 65nm';
+ $year = '2006';}
+ else {
+ $arch = 'Netburst';
+ $process = 'Intel 90-180nm';
+ $year = '2000-06';}
+ }
+ # this is not going to e accurate, WhiskyL or Kaby L can ID as Skylake
+ # but if it's a new cpu microarch not handled yet, it may give better
+ # than nothing result. This is intel only
+ # This is probably the gcc/clang -march/-mtune value, which is not
+ # necessarily the same as actual microarch, and varies between gcc/clang versions
+ if (!$arch){
+ my $file = '/sys/devices/cpu/caps/pmu_name';
+ $arch = main::reader($file,'strip',0) if -r $file;
+ $note = $check if $arch;
+ }
+ # gen 1 had no gen, only 3 digits: Core i5-661 Core i5-655K; Core i5 M 520
+ # EXCEPT gen 1: Core i7-720QM Core i7-740QM Core i7-840QM
+ # 2nd: Core i5-2390T Core i7-11700F Core i5-8400
+ # 2nd variants: Core i7-1165G7
+ if ($name){
+ if ($name =~ /\bi[357][\s-]([A-Z][\s-]?)?(\d{3}([^\d]|\b)|[78][24]00M)/){
+ $gen = ($gen) ? "$gen (core 1)": 'core 1';
+ }
+ elsif ($name =~ /\bi[3579][\s-]([A-Z][\s-]?)?([2-9]|1[0-4])(\d{3}|\d{2}[A-Z]\d)/){
+ $gen = ($gen) ? "$gen (core $2)" : "core $2";
}
}
}
- #print join '; ', @speeds, "\n";
eval $end if $b_log;
- return @speeds;
+ return [$arch,$note,$process,$gen,$year];
}
-sub set_cpu_speeds_sys {
+## END CPU ARCH ##
+
+# Only AMD/Intel 64 bit cpus
+sub cp_cpu_level {
eval $start if $b_log;
- my (@max_freq,@min_freq,@policies,%speeds);
- my $sys = '/sys/devices/system/cpu/cpufreq/policy0';
- my $sys2 = '/sys/devices/system/cpu/cpu0/cpufreq/';
- my ($cur,$min,$max) = ('scaling_cur_freq','scaling_min_freq','scaling_max_freq');
- if (!-d $sys && -d $sys2){
- $sys = $sys2;
- ($cur,$min,$max) = ('scaling_cur_freq','cpuinfo_min_freq','cpuinfo_max_freq');
- }
- if (-d $sys){
- # corner cases, android, will have the files but they may be unreadable
- if (-r "$sys/$cur"){
- $speeds{'cur-freq'} = (main::reader("$sys/$cur"))[0] ;
- $speeds{'cur-freq'} = speed_cleaner($speeds{'cur-freq'},'khz');
- }
- if (-r "$sys/$min"){
- $speeds{'min-freq'} = (main::reader("$sys/$min"))[0];
- $speeds{'min-freq'} = speed_cleaner($speeds{'min-freq'},'khz');
- }
- if (-r "$sys/$max"){
- $speeds{'max-freq'} = (main::reader("$sys/$max"))[0];
- $speeds{'max-freq'} = speed_cleaner($speeds{'max-freq'},'khz');
- }
- if ($b_arm || $b_mips){
- @policies = main::globber('/sys/devices/system/cpu/cpufreq/policy*/');
- # there are arm chips with two dies, that run at different min max speeds!!
- # see: https://github.com/smxi/inxi/issues/128
- # it would be slick to show both die min/max/cur speeds, but this is
- # ok for now.
- if (scalar @policies > 1){
- my ($current,$cur_temp,$max,$max_temp,$min,$min_temp) = (0,0,0,0,0,0);
- foreach (@policies){
- $_ =~ s/\/$//; # strip off last slash in case globs have them
- $max_temp = (-r "$_/cpuinfo_max_freq") ? (main::reader("$_/cpuinfo_max_freq"))[0] : 0;
- if ($max_temp){
- $max_temp = speed_cleaner($max_temp,'khz');
- push @max_freq, $max_temp;
- }
- $max = $max_temp if ($max_temp > $max);
- $min_temp = (-r "$_/cpuinfo_min_freq") ? (main::reader("$_/cpuinfo_min_freq"))[0] : 0;
- if ($min_temp){
- $min_temp = speed_cleaner($min_temp,'khz');
- push @min_freq, $min_temp;
- }
- $min = $min_temp if ($min_temp < $min || $min == 0);
- $cur_temp = (-r "$_/scaling_cur_freq") ? (main::reader("$_/scaling_cur_freq"))[0] : 0;
- $cur_temp = speed_cleaner($cur_temp,'khz') if $cur_temp;
- if ($cur_temp > $current){
- $current = $cur_temp;
- }
- }
- if (@max_freq){
- @max_freq = main::uniq(@max_freq);
- $max = join ':', @max_freq;
- }
- if (@min_freq){
- @min_freq = main::uniq(@min_freq);
- $min = join ':', @min_freq;
+ my %flags = map {$_ =>1} split(/\s+/,$_[0]);
+ my ($level,$note,@found);
+ # note, each later cpu level must contain all subsequent cpu flags
+ # baseline: all x86_64 cpus lm cmov cx8 fpu fxsr mmx syscall sse2
+ my @l1 = qw(cmov cx8 fpu fxsr lm mmx syscall sse2);
+ my @l2 = qw(cx16 lahf_lm popcnt sse4_1 sse4_2 ssse3);
+ my @l3 = qw(abm avx avx2 bmi1 bmi2 f16c fma movbe xsave);
+ my @l4 = qw(avx512f avx512bw avx512cd avx512dq avx512vl);
+ if ((@found = grep {$flags{$_}} @l1) && scalar(@found) == scalar(@l1)){
+ $level = 'v1';
+ # print 'v1: ', Data::Dumper::Dumper \@found;
+ if ((@found = grep {$flags{$_}} @l2) && scalar(@found) == scalar(@l2)){
+ $level = 'v2';
+ # print 'v2: ', Data::Dumper::Dumper \@found;
+ # It's not 100% certain that if flags exist v3/v4 supported. flags don't
+ # give full possible outcomes in these cases. See: docs/inxi-cpu.txt
+ if ((@found = grep {$flags{$_}} @l3) && scalar(@found) == scalar(@l3)){
+ $level = 'v3';
+ # print 'v3: ', Data::Dumper::Dumper \@found;
+ $note = main::message('note-check');
+ if ((@found = grep {$flags{$_}} @l4) && scalar(@found) == scalar(@l4)){
+ $level = 'v4';
+ # print 'v4: ', Data::Dumper::Dumper \@found;
}
- $speeds{'cur-freq'} = $current if $current;
- $speeds{'max-freq'} = $max if $max;
- $speeds{'min-freq'} = $min if $min;
}
}
- # policy4/cpuinfo_max_freq:["2000000"] policy0/cpuinfo_max_freq:["1500000"]
- # policy4/cpuinfo_min_freq:["200000"]
- if ( (scalar @max_freq < 2 && scalar @min_freq < 2 ) &&
- (defined $speeds{'min-freq'} && defined $speeds{'max-freq'}) &&
- ($speeds{'min-freq'} > $speeds{'max-freq'} || $speeds{'min-freq'} == $speeds{'max-freq'} )){
- $speeds{'min-freq'} = 0;
- }
}
- main::log_data('dump','%speeds',\%speeds) if $b_log;
+ $level = [$level,$note] if $level;
eval $end if $b_log;
- return %speeds;
+ return $level;
}
-# right now only using this for ARM cpus, this is not the same in intel/amd
-sub cpu_dies_sys {
- eval $start if $b_log;
- my @data = main::globber('/sys/devices/system/cpu/cpu*/topology/core_siblings_list');
- my (@dies);
- foreach (@data){
- my $siblings = (main::reader($_))[0];
- if (! grep {/$siblings/} @dies){
- push @dies, $siblings;
- }
- }
- my $die_count = scalar @dies;
- eval $end if $b_log;
- return $die_count;
-}
-# needed because no physical_id in cpuinfo, but > 1 cpu systems exist
-# returns: 0 - per cpu cores; 1 - phys cpu count; 2 - override model defaul names
-sub elbrus_data {
- eval $start if $b_log;
- my ($model_id,$count,$arch) = @_;
- # 0: cores
- my @cores;
- my @return = (0,1,$arch);
- $cores[1] = 1;
- $cores[2] = 1;
- $cores[3] = 4;
- $cores[4] = 2;
- $cores[6] = 1;
- $cores[7] = 8;
- $cores[8] = 1;
- $cores[9] = 8;
- $cores[10] = 12;
- $cores[11] = 16;
- $cores[12] = 2;
- if (main::is_numeric($model_id) && $cores[$model_id]){
- $return[0] = $cores[$model_id] ;
- }
- if ($return[0]){
- $return[1] = ($count % $return[0]) ? int($count/$return[0]) + 1 : $count/$return[0];
- }
- eval $end if $b_log;
- return @return;
-}
-sub cpu_flags_bsd {
- eval $start if $b_log;
- my ($flags,$sep) = ('','');
- # this will be null if it was not readable
- my $file = main::system_files('dmesg-boot');
- if ( @dmesg_boot){
- foreach (@dmesg_boot){
- if ( /Features/ || ( $bsd_type eq "openbsd" && /^cpu0:\s*[a-z0-9]{2,3}(\s|,)[a-z0-9]{2,3}(\s|,)/i ) ) {
- my @line = split /:\s*/, lc($_);
- # free bsd has to have weird syntax: <....<b23>,<b34>>
- # Features2=0x1e98220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,POPCNT,AESNI,XSAVE,OSXSAVE,AVX>
- $line[1] =~ s/^[^<]*<|>[^>]*$//g;
- # then get rid of <b23> stuff
- $line[1] =~ s/<[^>]+>//g;
- # and replace commas with spaces
- $line[1] =~ s/,/ /g;
- $flags .= $sep . $line[1];
- $sep = ' ';
+sub cp_cpu_topology {
+ my ($counts,$topology) = @_;
+ my @alpha = qw(Single Dual Triple Quad);
+ my ($sep) = ('');
+ my (%keys,%done);
+ my @tests = ('x'); # prefill [0] because iterator runs before 'next' test.
+ if ($counts->{'cpu-topo'}){
+ # first we want to find out how many of each physical variant there are
+ foreach my $topo (@{$counts->{'cpu-topo'}}){
+ # turn sorted hash into string
+ my $test = join('::', map{$_ . ':' . $topo->{$_}} sort keys %$topo);
+ if ($keys{$test}){
+ $keys{$test}++;
}
- elsif (/real mem/){
- last;
+ else {
+ $keys{$test} = 1;
}
+ push(@tests,$test);
}
- if ($flags){
- $flags =~ s/\s+/ /g;
- $flags =~ s/^\s+|\s+$//g;
+ my ($i,$j) = (0,0);
+ # then we build up the topology data per variant
+ foreach my $topo (@{$counts->{'cpu-topo'}}){
+ my $key = '';
+ $i++;
+ next if $done{$tests[$i]};
+ $done{$tests[$i]} = 1;
+ if ($b_admin && $type eq 'full'){
+ $topology->{'full'}[$j]{'cpus'} = $keys{$tests[$i]};
+ $topology->{'full'}[$j]{'cores'} = $topo->{'cores'};
+ if ($topo->{'threads'} && $topo->{'cores'} != $topo->{'threads'}){
+ $topology->{'full'}[$j]{'threads'} = $topo->{'threads'};
+ }
+ if ($topo->{'dies'} && $topo->{'dies'} > 1){
+ $topology->{'full'}[$j]{'dies'} = $topo->{'dies'};
+ }
+ if ($counts->{'struct-mt'}){
+ $topology->{'full'}[$j]{'cores-mt'} = $topo->{'cores-mt'};
+ }
+ if ($counts->{'struct-st'}){
+ $topology->{'full'}[$j]{'cores-st'} = $topo->{'cores-st'};
+ }
+ if ($counts->{'struct-max'} || $counts->{'struct-min'}){
+ $topology->{'full'}[$j]{'max'} = $topo->{'max'};
+ $topology->{'full'}[$j]{'min'} = $topo->{'min'};
+ }
+ if ($topo->{'smt'}){
+ $topology->{'full'}[$j]{'smt'} = $topo->{'smt'};
+ }
+ if ($topo->{'tpc'}){
+ $topology->{'full'}[$j]{'tpc'} = $topo->{'tpc'};
+ }
+ $j++;
+ }
+ else {
+ # start building string
+ $topology->{'string'} .= $sep;
+ $sep = ',';
+ if ($counts->{'physical'} > 1) {
+ my $phys = ($topology->{'struct-cores'}) ? $keys{$tests[$i]} : $counts->{'physical'};
+ $topology->{'string'} .= $phys . 'x ';
+ $topology->{'string'} .= $topo->{'cores'} . '-core';
+ }
+ else {
+ $topology->{'string'} .= cp_cpu_alpha($topo->{'cores'});
+ }
+ # alder lake type cpu
+ if ($topo->{'cores-st'} && $topo->{'cores-mt'}){
+ $topology->{'string'} .= ' (' . $topo->{'cores-mt'} . '-mt/';
+ $topology->{'string'} .= $topo->{'cores-st'} . '-st)';
+ }
+ # we only want to show > 1 phys short form basic if cpus have different
+ # core counts, not different min/max frequencies
+ last if !$topology->{'struct-cores'};
+ }
}
}
else {
- if ( $file && ! -r $file ){
- $flags = main::row_defaults('dmesg-boot-permissions');
+ if ($counts->{'physical'} > 1) {
+ $topology->{'string'} = $counts->{'physical'} . 'x ';
+ $topology->{'string'} .= $counts->{'cpu-cores'} . '-core';
+ }
+ else {
+ $topology->{'string'} = cp_cpu_alpha($counts->{'cpu-cores'});
}
}
- eval $end if $b_log;
- return $flags;
+ $topology->{'string'} ||= '';
}
-sub cpu_vendor {
- eval $start if $b_log;
- my ($string) = @_;
- my ($vendor) = ('');
- $string = lc($string);
- if ($string =~ /intel/) {
- $vendor = "intel"
- }
- elsif ($string =~ /amd/){
- $vendor = "amd"
+sub cp_cpu_alpha {
+ my $cores = $_[0];
+ my $string = '';
+ if ($cores > 4){
+ $string = $cores . '-core';
}
- # via
- elsif ($string =~ /centaur/){
- $vendor = "centaur"
+ elsif ($cores == 0){
+ $string = main::message('unknown-cpu-topology');
}
- elsif ($string =~ /e2k/){
- $vendor = "elbrus"
+ else {
+ my @alpha = qw(single dual triple quad);
+ $string = $alpha[$cores-1] . ' core';
}
- eval $end if $b_log;
- return $vendor;
+ return $string;
}
-sub get_boost_status {
+
+# Logic:
+# if > 1 processor && processor id (physical id) == core id then Multi threaded (MT)
+# if siblings > 1 && siblings == 2 * num_of_cores ($cpu->{'cores'}) then Multi threaded (MT)
+# if > 1 processor && processor id (physical id) != core id then Multi-Core Processors (MCP)
+# if > 1 processor && processor ids (physical id) > 1 then Symmetric Multi Processing (SMP)
+# if = 1 processor then single core/processor Uni-Processor (UP)
+sub cp_cpu_type {
eval $start if $b_log;
- my ($boost);
- my $path = '/sys/devices/system/cpu/cpufreq/boost';
- if (-f $path){
- $boost = (main::reader($path))[0];
- if (defined $boost && $boost =~/^[01]$/){
- $boost = ($boost) ? 'enabled' : 'disabled';
+ my ($counts,$cpu,$tests) = @_;
+ my $cpu_type = '';
+ if ($counts->{'processors'} > 1 ||
+ (defined $tests->{'intel'} && $tests->{'intel'} && $cpu->{'siblings'} > 0)){
+ # cpu_sys detected MT
+ if ($counts->{'struct-mt'}){
+ if ($counts->{'struct-mt'} && $counts->{'struct-st'}){
+ $cpu_type .= 'MST';
+ }
+ else {
+ $cpu_type .= 'MT';
+ }
+ }
+ # handle case of OpenBSD that has hw.smt but no other meaningful topology
+ elsif ($cpu->{'smt'}){
+ $cpu_type .= 'MT' if $cpu->{'smt'} eq 'enabled';
+ }
+ # non-multicore MT, with 2 or more threads per core
+ elsif ($counts->{'processors'} && $counts->{'physical'} &&
+ $counts->{'cpu-cores'} &&
+ $counts->{'processors'}/($counts->{'physical'} * $counts->{'cpu-cores'}) >= 2){
+ # print "mt:1\n";
+ $cpu_type .= 'MT';
+ }
+ # 2 or more siblings per cpu real core
+ elsif ($cpu->{'siblings'} > 1 && $cpu->{'siblings'}/$counts->{'cpu-cores'} >= 2){
+ # print "mt:3\n";
+ $cpu_type .= 'MT';
+ }
+ # non-MT multi-core or MT multi-core
+ if ($counts->{'cpu-cores'} > 1){
+ if ($counts->{'struct-mt'} && $counts->{'struct-st'}){
+ $cpu_type .= ' AMCP';
+ }
+ else {
+ $cpu_type .= ' MCP';
+ }
+ }
+ # only solidly known > 1 die cpus will use this
+ if ($cpu->{'dies'} > 1){
+ $cpu_type .= ' MCM';
}
+ # >1 cpu sockets active: Symetric Multi Processing
+ if ($counts->{'physical'} > 1){
+ if ($counts->{'struct-cores'} || $counts->{'struct-max'} ||
+ $counts->{'struct-min'}){
+ $cpu_type .= ' AMP';
+ }
+ else {
+ $cpu_type .= ' SMP';
+ }
+ }
+ $cpu_type =~ s/^\s+//;
+ }
+ else {
+ $cpu_type = 'UP';
}
eval $end if $b_log;
- return $boost;
+ return $cpu_type;
}
-sub system_cpu_name {
+
+# Legacy: this data should be comfing from the /sys tool now.
+# Was needed because no physical_id in cpuinfo, but > 1 cpu systems exist
+# returns: 0: per cpu cores; 1: phys cpu count; 2: override model defaul names
+sub cp_elbrus_data {
eval $start if $b_log;
- my (%cpus,$compat,@working);
- if (@working = main::globber('/sys/firmware/devicetree/base/cpus/cpu@*/compatible')){
- foreach my $file (@working){
- $compat = (main::reader($file))[0];
- # these can have non printing ascii... why? As long as we only have the
- # splits for: null 00/start header 01/start text 02/end text 03
- $compat = (split /\x01|\x02|\x03|\x00/, $compat)[0] if $compat;
- $compat = (split /,\s*/, $compat)[-1] if $compat;
- $cpus{$compat} = ($cpus{$compat}) ? ++$cpus{$compat}: 1;
- }
- }
- # synthesize it, [4] will be like: cortex-a15-timer; sunxi-timer
- # so far all with this directory show soc name, not cpu name for timer
- elsif (! -d '/sys/firmware/devicetree/base' && @devices_timer){
- foreach my $ref (@devices_timer){
- @working = @$ref;
- next if $working[0] ne 'timer' || !$working[4];
- $working[4] =~ s/(-system)?-timer$//;
- $compat = $working[4];
- $cpus{$compat} = ($cpus{$compat}) ? ++$cpus{$compat}: 1;
- }
+ my ($family_id,$model_id,$count,$arch) = @_;
+ # 0: cores
+ my $return = [0,1,$arch];
+ my %cores = (
+ # key=family id + model id
+ '41' => 1,
+ '42' => 1,
+ '43' => 4,
+ '44' => 2,
+ '46' => 1,
+ '47' => 8,
+ '48' => 1,
+ '49' => 8,
+ '59' => 8,
+ '4A' => 12,
+ '4B' => 16,
+ '4C' => 2,
+ '6A' => 12,
+ '6B' => 16,
+ '6C' => 2,
+ );
+ $return->[0] = $cores{$family_id . $model_id} if $cores{$family_id . $model_id};
+ if ($return->[0]){
+ $return->[1] = ($count % $return->[0]) ? int($count/$return->[0]) + 1 : $count/$return->[0];
}
- main::log_data('dump','%cpus',\%cpus) if $b_log;
eval $end if $b_log;
- return %cpus;
+ return $return;
}
-sub cpu_arch {
+sub cp_speed_data {
eval $start if $b_log;
- my ($type,$family,$model,$stepping) = @_;
- $stepping = 0 if !main::is_numeric($stepping);
- my $arch = '';
- # See: docs/inxi-resources.txt
- # print "$type;$family;$model\n";
- if ( $type eq 'amd'){
- if ($family eq '4'){
- if ( $model =~ /^(3|7|8|9|A)$/ ) {$arch = 'Am486'}
- elsif ( $model =~ /^(E|F)$/ ) {$arch = 'Am5x86'}
+ my ($cpu,$cpu_sys) = @_;
+ my $info = {};
+ if (defined $cpu_sys->{'data'}){
+ if (defined $cpu_sys->{'data'}{'speeds'}{'min-freq'}){
+ $cpu->{'min-freq'} = $cpu_sys->{'data'}{'speeds'}{'min-freq'};
}
- elsif ($family eq '5'){
- if ( $model =~ /^(0|1|2|3)$/ ) {$arch = 'K5'}
- elsif ( $model =~ /^(6|7)$/ ) {$arch = 'K6'}
- elsif ( $model =~ /^(8)$/ ) {$arch = 'K6-2'}
- elsif ( $model =~ /^(9|D)$/ ) {$arch = 'K6-3'}
- elsif ( $model =~ /^(A)$/ ) {$arch = 'Geode'}
- }
- elsif ($family eq '6'){
- if ( $model =~ /^(1|2)$/ ) {$arch = 'K7'}
- elsif ( $model =~ /^(3|4)$/ ) {$arch = 'K7 Thunderbird'}
- elsif ( $model =~ /^(6|7|8|A)$/ ) {$arch = 'K7 Palomino+'}
- else {$arch = 'K7'}
+ if (defined $cpu_sys->{'data'}{'speeds'}{'max-freq'}){
+ $cpu->{'max-freq'} = $cpu_sys->{'data'}{'speeds'}{'max-freq'};
}
- elsif ($family eq 'F'){
- if ( $model =~ /^(4|5|7|8|B|C|E|F|14|15|17|18|1B|1C|1F)$/ ) {$arch = 'K8'}
- elsif ( $model =~ /^(21|23|24|25|27|28|2C|2F)$/ ) {$arch = 'K8 rev.E'}
- elsif ( $model =~ /^(41|43|48|4B|4C|4F|5D|5F|68|6B|6C|6F|7C|7F|C1)$/ ) {$arch = 'K8 rev.F+'}
- else {$arch = 'K8'}
+ if (defined $cpu_sys->{'data'}{'speeds'}{'scaling-min-freq'}){
+ $cpu->{'scaling-min-freq'} = $cpu_sys->{'data'}{'speeds'}{'scaling-min-freq'};
}
- elsif ($family eq '10'){
- if ( $model =~ /^(2|4|5|6|8|9|A)$/ ) {$arch = 'K10'}
- else {$arch = 'K10'}
+ if (defined $cpu_sys->{'data'}{'speeds'}{'scaling-max-freq'}){
+ $cpu->{'scaling-max-freq'} = $cpu_sys->{'data'}{'speeds'}{'scaling-max-freq'};
}
- elsif ($family eq '11'){
- if ( $model =~ /^(3)$/ ) {$arch = 'Turion X2 Ultra'}
+ # we don't need to see these if they are the same
+ if ($cpu->{'min-freq'} && $cpu->{'max-freq'} &&
+ $cpu->{'scaling-min-freq'} && $cpu->{'scaling-max-freq'} &&
+ $cpu->{'min-freq'} eq $cpu->{'scaling-min-freq'} &&
+ $cpu->{'max-freq'} eq $cpu->{'scaling-max-freq'}){
+ undef $cpu->{'scaling-min-freq'};
+ undef $cpu->{'scaling-max-freq'};
}
- # might also need cache handling like 14/16
- elsif ($family eq '12'){
- if ( $model =~ /^(1)$/ ) {$arch = 'Fusion'}
- else {$arch = 'Fusion'}
- }
- # SOC, apu
- elsif ($family eq '14'){
- if ( $model =~ /^(1|2)$/ ) {$arch = 'Bobcat'}
- else {$arch = 'Bobcat'}
+ 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 ((grep {$_} @{$cpu_sys->{'data'}{'speeds'}{'all'}}) ||
+ !@{$cpu->{'processors'}}){
+ $cpu->{'processors'} = $cpu_sys->{'data'}{'speeds'}{'all'};
+ }
}
- elsif ($family eq '15'){
- if ( $model =~ /^(0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F)$/ ) {$arch = 'Bulldozer'}
- elsif ( $model =~ /^(10|11|12|13|14|15|16|17|18|19|1A|1B|1C|1D|1E|1F)$/ ) {$arch = 'Piledriver'}
- elsif ( $model =~ /^(30|31|32|33|34|35|36|37|38|39|3A|3B|3C|3D|3E|3F)$/ ) {$arch = 'Steamroller'}
- elsif ( $model =~ /^(60|61|62|63|64|65|66|67|68|69|6A|6B|6C|6D|6E|6F|70|71|72|73|74|75|76|77|78|79|7A|7B|7C|7D|7E|7F)$/ ) {$arch = 'Excavator'}
- else {$arch = 'Bulldozer'}
+ if (defined $cpu_sys->{'data'}{'cpufreq-boost'}){
+ $cpu->{'boost'} = $cpu_sys->{'data'}{'cpufreq-boost'};
}
- # SOC, apu
- elsif ($family eq '16'){
- if ( $model =~ /^(0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F)$/ ) {$arch = 'Jaguar'}
- elsif ( $model =~ /^(30|31|32|33|34|35|36|37|38|39|3A|3B|3C|3D|3E|3F)$/ ) {$arch = 'Puma'}
- else {$arch = 'Jaguar'}
- }
- elsif ($family eq '17'){
- if ( $model =~ /^(1|11)$/ ) {$arch = 'Zen'}
- elsif ( $model =~ /^(8|18)$/ ) {$arch = 'Zen+'}
- # not positive about 2x, main resource shows only 31 and 71 hex
- elsif ( $model =~ /^(2[0123456789ABCDEF]|31|71)$/ ) {$arch = 'Zen 2'}
- # no info on these yet, but they are coming and are scheduled
- # elsif ( $model =~ /^()$/ ) {$arch = 'Zen 3'}
- # elsif ( $model =~ /^()$/ ) {$arch = 'Zen 4'}
- else {$arch = 'Zen'}
- }
- elsif ($family eq '18'){
- # model #s not known yet
- $arch = 'Hygon Dhyana';
- }
- elsif ($family eq '19'){
- # model #s not known yet
- $arch = 'Zen 3';
- }
- # note: family 20 may be Zen 4 but not known for sure yet
- }
- elsif ( $type eq 'arm'){
- if ($family ne ''){$arch="ARMv$family";}
- else {$arch='ARM';}
- }
-# elsif ( $type eq 'ppc'){
-# $arch='PPC';
-# }
- # aka VIA
- elsif ( $type eq 'centaur'){
- if ($family eq '5'){
- if ( $model =~ /^(4)$/ ) {$arch = 'WinChip C6'}
- elsif ( $model =~ /^(8)$/ ) {$arch = 'WinChip 2'}
- elsif ( $model =~ /^(9)$/ ) {$arch = 'WinChip 3'}
+ }
+ if (defined $cpu->{'processors'}){
+ if (scalar @{$cpu->{'processors'}} > 1){
+ my ($agg,$high) = (0,0);
+ for (@{$cpu->{'processors'}}){
+ next if !$_; # bsds might have 0 or undef value, that's junk
+ $agg += $_;
+ $high = $_ if $_ > $high;
+ }
+ if ($agg){
+ $cpu->{'avg-freq'} = int($agg/scalar @{$cpu->{'processors'}});
+ $cpu->{'cur-freq'} = $high;
+ $info->{'avg-speed-key'} = 'avg';
+ $info->{'speed'} = $cpu->{'avg-freq'};
+ if ($high > $cpu->{'avg-freq'}){
+ $cpu->{'high-freq'} = $high;
+ $info->{'high-speed-key'} = 'high';
+ }
+ }
}
- elsif ($family eq '6'){
- if ( $model =~ /^(6)$/ ) {$arch = 'WinChip-based'}
- elsif ( $model =~ /^(7|8)$/ ) {$arch = 'C3'}
- elsif ( $model =~ /^(9)$/ ) {$arch = 'C3-2'}
- elsif ( $model =~ /^(A|D)$/ ) {$arch = 'C7'}
- elsif ( $model =~ /^(F)$/ ) {$arch = 'Isaiah'}
+ elsif ($cpu->{'processors'}[0]) {
+ $cpu->{'cur-freq'} = $cpu->{'processors'}[0];
+ $info->{'speed'} = $cpu->{'cur-freq'};
}
}
- elsif ( $type eq 'elbrus'){
- if ($family eq '4'){
- if ( $model eq '1' ) {$arch = 'Elbrus'}
- elsif ( $model eq '2' ) {$arch = 'Elbrus-S'}
- elsif ( $model eq '3' ) {$arch = 'Elbrus-4C'}
- elsif ( $model eq '4' ) {$arch = 'Elbrus-2C+'}
- elsif ( $model eq '6' ) {$arch = 'Elbrus-2CM'}
- elsif ( $model eq '7' ) {
- if ($stepping >= 2) {$arch = 'Elbrus-8C1';}
- else {$arch = 'Elbrus-8C';}
- } # note: stepping > 1 may be 8C1
- elsif ( $model eq '8' ) {$arch = 'Elbrus-1C+'}
- elsif ( $model eq '9' ) {$arch = 'Elbrus-8CV'}
- elsif ( $model eq '10' ) {$arch = 'Elbrus-12C'}
- elsif ( $model eq '11' ) {$arch = 'Elbrus-16C'}
- elsif ( $model eq '12' ) {$arch = 'Elbrus-2C3'}
- else {$arch = 'Elbrus-??';}
- }
+ # BSDs generally will have processors count, but not per core speeds
+ if ($cpu->{'cur-freq'} && !$info->{'speed'}){
+ $info->{'speed'} = $cpu->{'cur-freq'};
}
- elsif ( $type eq 'intel'){
- if ($family eq '4'){
- if ( $model =~ /^(0|1|2|3|4|5|6|7|8|9)$/ ) {$arch = '486'}
- }
- elsif ($family eq '5'){
- if ( $model =~ /^(1|2|3|7)$/ ) {$arch = 'P5'}
- elsif ( $model =~ /^(4|8)$/ ) {$arch = 'P5'} # MMX
- elsif ( $model =~ /^(9)$/ ) {$arch = 'Quark'}
+ if ($cpu->{'min-freq'} || $cpu->{'max-freq'}){
+ ($info->{'min-max'},$info->{'min-max-key'}) = cp_speed_min_max(
+ $cpu->{'min-freq'},
+ $cpu->{'max-freq'});
+ }
+ if ($cpu->{'scaling-min-freq'} || $cpu->{'scaling-max-freq'}){
+ ($info->{'scaling-min-max'},$info->{'scaling-min-max-key'}) = cp_speed_min_max(
+ $cpu->{'scaling-min-freq'},
+ $cpu->{'scaling-max-freq'},
+ 'sc');
+ }
+ if ($cpu->{'cur-freq'}){
+ if ($show{'short'}){
+ $info->{'speed-key'} = 'speed';
}
- elsif ($family eq '6'){
- if ( $model =~ /^(1)$/ ) {$arch = 'P6 Pro'}
- elsif ( $model =~ /^(15)$/ ) {$arch = 'M Tolapai'} # pentium M system on chip
- elsif ( $model =~ /^(3)$/ ) {$arch = 'P6 II Klamath'}
- elsif ( $model =~ /^(5)$/ ) {$arch = 'P6 II Deschutes'}
- elsif ( $model =~ /^(6)$/ ) {$arch = 'P6 II Mendocino'}
- elsif ( $model =~ /^(7)$/ ) {$arch = 'P6 III Katmai'}
- elsif ( $model =~ /^(8)$/ ) {$arch = 'P6 III Coppermine'}
- elsif ( $model =~ /^(9)$/ ) {$arch = 'M Banias'} # pentium M
- elsif ( $model =~ /^(A)$/ ) {$arch = 'P6 III Xeon'}
- elsif ( $model =~ /^(B)$/ ) {$arch = 'P6 III Tualitin'}
- elsif ( $model =~ /^(D)$/ ) {$arch = 'M Dothan'} # Pentium M
- elsif ( $model =~ /^(E)$/ ) {$arch = 'M Yonah'}
- elsif ( $model =~ /^(F|16)$/ ) {$arch = 'Core Merom'}
- elsif ( $model =~ /^(17|1D)$/ ) {$arch = 'Penryn'}
- elsif ( $model =~ /^(1A|1E|1F|2E|25|2C|2F)$/ ) {$arch = 'Nehalem'}
- elsif ( $model =~ /^(26|1C)$/ ) {$arch = 'Bonnell'} # atom Bonnell? 27?
- elsif ( $model =~ /^(27|35|36)$/ ) {$arch = 'Saltwell'}
- elsif ( $model =~ /^(25|2C|2F)$/ ) {$arch = 'Westmere'}
- elsif ( $model =~ /^(2A|2D)$/ ) {$arch = 'Sandy Bridge'}
- elsif ( $model =~ /^(37|4A|4D|5A|5D)$/ ) {$arch = 'Silvermont'}
- elsif ( $model =~ /^(3A|3E)$/ ) {$arch = 'Ivy Bridge'}
- elsif ( $model =~ /^(3C|3F|45|46)$/ ) {$arch = 'Haswell'}
- elsif ( $model =~ /^(3D|47|4F|56)$/ ) {$arch = 'Broadwell'}
- elsif ( $model =~ /^(4E)$/ ) {$arch = 'Skylake'} # had 9E, cascade lake also 55
- # need to find stepping for cl, guessing stepping 4 is last for sl
- elsif ( $model =~ /^(55)$/ ) {
- if ($stepping > 4){$arch = 'Cascade Lake'}
- else {$arch = 'Skylake'} }
- elsif ( $model =~ /^(5C|5F)$/ ) {$arch = 'Goldmont'}
- elsif ( $model =~ /^(5E)$/ ) {$arch = 'Skylake-S'}
- elsif ( $model =~ /^(4C)$/ ) {$arch = 'Airmont'}
- elsif ( $model =~ /^(7A)$/ ) {$arch = 'Goldmont Plus'}
- elsif ( $model =~ /^(7D|7E)$/ ) {$arch = 'Ice Lake'}
- elsif ( $model =~ /^(8C)$/ ) {$arch = 'Tiger Lake'}
- elsif ( $model =~ /^(8E|9E)$/ ) {
- if ($model eq '9E' && ($stepping == 10 || $stepping == 11 || $stepping == 12 || $stepping == 13)){$arch = 'Coffee Lake'}
- elsif ($model eq '8E' && $stepping == 10){$arch = 'Coffee Lake'}
- elsif ($model eq '8E' && ($stepping == 11 || $stepping == 12)){$arch = 'Whiskey Lake'}
- elsif ($model eq '8E' && $stepping == 9){$arch = 'Amber Lake'}
- elsif ($stepping > 13){$arch = 'Comet Lake'} # guess, have not seen docs yet
- # elsif ($stepping > 9 && $stepping < 14){$arch = 'Coffee Lake'}
- # NOTE: kaby lake is 8E 9 but so is Amber Lake
- else {$arch = 'Kaby Lake'} }
- #elsif ( $model =~ /^(9E)$/ ) {$arch = 'Coffee Lake'}
- elsif ( $model =~ /^(57)$/ ) {$arch = 'Knights Landing'}
- elsif ( $model =~ /^(66)$/ ) {$arch = 'Cannon Lake'}
- elsif ( $model =~ /^(85)$/ ) {$arch = 'Knights Mill'}
- elsif ( $model =~ /^(86)$/ ) {$arch = 'Tremont'}
- # More info: comet: shares family/model, need to find stepping numbers
- # Coming: meteor lake; alder lake; cooper lake; granite rapids; meteor lake; saphire rapids;
+ elsif ($show{'cpu-basic'}){
+ $info->{'speed-key'} = 'speed (MHz)';
}
- # itanium 1 family 7 all recalled
- elsif ($family eq 'B'){
- if ( $model =~ /^(0)$/ ) {$arch = 'Knights Ferry'}
- if ( $model =~ /^(1)$/ ) {$arch = 'Knights Corner'}
+ else {
+ $info->{'speed-key'} = 'Speed (MHz)';
}
- elsif ($family eq 'F'){
- if ( $model =~ /^(0|1)$/ ) {$arch = 'Netburst Willamette'}
- elsif ( $model =~ /^(2)$/ ) {$arch = 'Netburst Northwood'}
- elsif ( $model =~ /^(3)$/ ) {$arch = 'Netburst Prescott'} # 6? Nocona
- elsif ( $model =~ /^(4)$/ ) {$arch = 'Netburst Smithfield'} # 6? Nocona
- elsif ( $model =~ /^(6)$/ ) {$arch = 'Netburst Presler'}
- else {$arch = 'Netburst'}
+ }
+ eval $end if $b_log;
+ return $info;
+}
+
+sub cp_speed_min_max {
+ my ($min,$max,$type) = @_;
+ my ($min_max,$key);
+ if ($min && $max){
+ $min_max = "$min/$max";
+ $key = "min/max";
+ }
+ elsif ($max){
+ $min_max = $max;
+ $key = "max";
+ }
+ elsif ($min){
+ $min_max = $min;
+ $key = "min";
+ }
+ $key = $type . '-' . $key if $type && $key;
+ return ($min_max,$key);
+}
+
+# args: 0: cpu, by ref; 1: update $tests by reference
+sub cp_test_types {
+ my ($cpu,$tests) = @_;
+ if ($cpu->{'type'} eq 'intel'){
+ $$tests{'intel'} = 1;
+ $$tests{'xeon'} = 1 if $cpu->{'model_name'} =~ /Xeon/i;
+ }
+ elsif ($cpu->{'type'} eq 'amd'){
+ if ($cpu->{'family'} && $cpu->{'family'} eq '17'){
+ $$tests{'amd-zen'} = 1;
+ if ($cpu->{'model_name'}){
+ if ($cpu->{'model_name'} =~ /Ryzen/i){
+ $$tests{'ryzen'} = 1;
+ }
+ elsif ($cpu->{'model_name'} =~ /EPYC/i){
+ $$tests{'epyc'} = 1;
+ }
+ }
}
}
- eval $end if $b_log;
- return $arch;
+ elsif ($cpu->{'type'} eq 'elbrus'){
+ $$tests{'elbrus'} = 1;
+ }
}
-sub count_alpha {
- my ($count) = @_;
- #print "$count\n";
- my @alpha = qw(Single Dual Triple Quad);
- if ($count > 4){
- $count .= '-';
+## CPU UTILITIES ##
+# only elbrus ID is actually used live
+sub cpu_vendor {
+ eval $start if $b_log;
+ my ($string) = @_;
+ my ($vendor) = ('');
+ $string = lc($string);
+ if ($string =~ /intel/){
+ $vendor = "intel";
}
- else {
- $count = $alpha[$count-1] . ' ' if $count > 0;
+ elsif ($string =~ /amd/){
+ $vendor = "amd";
}
- return $count;
+ # via/centaur/zhaoxin branding
+ elsif ($string =~ /centaur|zhaoxin/){
+ $vendor = "centaur";
+ }
+ elsif ($string eq 'elbrus'){
+ $vendor = "elbrus";
+ }
+ eval $end if $b_log;
+ return $vendor;
}
+
+# do not define model-id, stepping, or revision, those can be 0 valid value
sub set_cpu_data {
- my %cpu = (
+ ${$_[0]} = {
'arch' => '',
+ 'avg-freq' => 0, # MHz
'bogomips' => 0,
'cores' => 0,
- 'cur-freq' => 0,
+ 'cur-freq' => 0, # MHz
'dies' => 0,
'family' => '',
'flags' => '',
@@ -8470,30 +12525,61 @@ sub set_cpu_data {
'l1-cache' => 0, # store in KB
'l2-cache' => 0, # store in KB
'l3-cache' => 0, # store in KB
- 'max-freq' => 0,
- 'min-freq' => 0,
- 'model_id' => '',
+ 'max-freq' => 0, # MHz
+ 'min-freq' => 0, # MHz
'model_name' => '',
'processors' => [],
- 'rev' => '',
'scalings' => [],
'siblings' => 0,
'type' => '',
- );
- return %cpu;
+ };
+}
+
+sub system_cpu_name {
+ eval $start if $b_log;
+ my ($compat,@working);
+ my $cpus = {};
+ if (@working = main::globber('/sys/firmware/devicetree/base/cpus/cpu@*/compatible')){
+ foreach my $file (@working){
+ $compat = main::reader($file,'',0);
+ next if $compat =~ /timer/; # seen on android
+ # these can have non printing ascii... why? As long as we only have the
+ # splits for: null 00/start header 01/start text 02/end text 03
+ $compat = (split(/\x01|\x02|\x03|\x00/, $compat))[0] if $compat;
+ $compat = (split(/,\s*/, $compat))[-1] if $compat;
+ $cpus->{$compat} = ($cpus->{$compat}) ? ++$cpus->{$compat}: 1;
+ }
+ }
+ # synthesize it, [4] will be like: cortex-a15-timer; sunxi-timer
+ # so far all with this directory show soc name, not cpu name for timer
+ elsif (! -d '/sys/firmware/devicetree/base' && $devices{'timer'}){
+ foreach my $working (@{$devices{'timer'}}){
+ next if $working->[0] ne 'timer' || !$working->[4] || $working->[4] =~ /timer-mem$/;
+ $working->[4] =~ s/(-system)?-timer$//;
+ $compat = $working->[4];
+ $cpus->{$compat} = ($cpus->{$compat}) ? ++$cpus->{$compat}: 1;
+ }
+ }
+ main::log_data('dump','%$cpus',$cpus) if $b_log;
+ eval $end if $b_log;
+ return $cpus;
}
+
+## CLEANERS/OUTPUT HANDLERS ##
# MHZ - cell cpus
-sub speed_cleaner {
+sub clean_speed {
my ($speed,$opt) = @_;
- return if ! $speed || $speed eq '0';
+ # eq '0' might be for string typing; value can be: <unknown>
+ return if !$speed || $speed eq '0' || $speed =~ /^\D/;
$speed =~ s/[GMK]HZ$//gi;
$speed = ($speed/1000) if $opt && $opt eq 'khz';
- $speed = sprintf "%.0f", $speed;
+ $speed = sprintf("%.0f", $speed);
return $speed;
}
-sub cpu_cleaner {
+
+sub clean_cpu {
my ($cpu) = @_;
- return if ! $cpu;
+ return if !$cpu;
my $filters = '@|cpu |cpu deca|([0-9]+|single|dual|two|triple|three|tri|quad|four|';
$filters .= 'penta|five|hepta|six|hexa|seven|octa|eight|multi)[ -]core|';
$filters .= 'ennea|genuine|multi|processor|single|triple|[0-9\.]+ *[MmGg][Hh][Zz]';
@@ -8502,10 +12588,16 @@ sub cpu_cleaner {
$cpu =~ s/^\s+|\s+$//g;
return $cpu;
}
+
sub hex_and_decimal {
my ($data) = @_;
- if ($data){
- $data .= ' (' . hex($data) . ')' if hex($data) ne $data;
+ $data = '' if !defined $data;
+ if ($data =~ /\S/){
+ # only handle if a short hex number!! No need to prepend 0x to 0-9
+ if ($data =~ /^[0-9a-f]{1,3}$/i && hex($data) ne $data){
+ $data .= ' (' . hex($data) . ')';
+ $data = '0x' . $data;
+ }
}
else {
$data = 'N/A';
@@ -8514,424 +12606,401 @@ sub hex_and_decimal {
}
}
-## DiskData
+## DriveItem
{
-package DiskData;
-my ($b_hddtemp,$b_nvme,$smartctl_missing);
+package DriveItem;
+my ($b_hddtemp,$b_nvme,$smartctl_missing,$vendors);
my ($hddtemp,$nvme) = ('','');
-my (@by_id,@by_path,@vendors);
+my (@by_id,@by_path);
my ($debugger_dir);
-# main::writer("$debugger_dir/system-repo-data-urpmq.txt",@data2) if $debugger_dir;
+# main::writer("$debugger_dir/system-repo-data-urpmq.txt",\@data2) if $debugger_dir;
+
sub get {
eval $start if $b_log;
- my (@data,@rows,$key1,$val1);
my ($type) = @_;
$type ||= 'standard';
+ my ($key1,$val1);
+ my $rows = [];
my $num = 0;
- @data = disk_data($type);
+ my $data = drive_data($type);
# NOTE:
- if (@data){
+ if (@$data){
if ($type eq 'standard'){
- @data = create_output(@data);
- @rows = (@rows,@data);
- if ( $bsd_type && !@dm_boot_disk && $type eq 'standard' && $show{'disk'} ){
+ storage_output($rows,$data);
+ drive_output($rows,$data) if $show{'disk'};
+ if ($bsd_type && !$dboot{'disk'} && $type eq 'standard' && $show{'disk'}){
$key1 = 'Drive Report';
- my $file = main::system_files('dmesg-boot');
- if ( $file && ! -r $file){
- $val1 = main::row_defaults('dmesg-boot-permissions');
+ my $file = $system_files{'dmesg-boot'};
+ if ($file && ! -r $file){
+ $val1 = main::message('dmesg-boot-permissions');
}
elsif (!$file){
- $val1 = main::row_defaults('dmesg-boot-missing');
+ $val1 = main::message('dmesg-boot-missing');
}
else {
- $val1 = main::row_defaults('disk-data-bsd');
+ $val1 = main::message('disk-data-bsd');
}
- @data = ({main::key($num++,0,1,$key1) => $val1,});
- @rows = (@rows,@data);
+ push(@$rows,{main::key($num++,0,1,$key1) => $val1,});
}
}
+ # used by short form, raw data returned
else {
- @rows = @data;
- # print Data::Dumper::Dumper \@rows;
+ $rows = $data;
+ # print Data::Dumper::Dumper $rows;
}
}
else {
$key1 = 'Message';
- $val1 = main::row_defaults('disk-data');
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ $val1 = main::message('disk-data');
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
- if (!@rows){
+ if (!@$rows){
$key1 = 'Message';
- $val1 = main::row_defaults('disk-data');
- @data = ({main::key($num++,0,1,$key1) => $val1,});
+ $val1 = main::message('disk-data');
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
- #@rows = (@rows,@data);
- @data = ();
+ # push(@rows,@data);
if ($show{'optical'} || $show{'optical-basic'}){
- @data = OpticalData::get();
- @rows = (@rows,@data);
+ OpticalItem::get($rows);
}
- ($b_hddtemp,$b_nvme,$hddtemp,$nvme) = (undef,undef,undef,undef);
- (@by_id,@by_path) = (undef,undef);
+ ($b_hddtemp,$b_nvme,$hddtemp,$nvme,$vendors) = ();
+ (@by_id,@by_path) = ();
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub create_output {
+
+sub storage_output {
eval $start if $b_log;
- my (@disks) = @_;
- #print Data::Dumper::Dumper \@disks;
- my ($b_oldage,$b_prefail,$b_smart,$b_smart_permissions,@data,@rows);
+ my ($rows,$disks) = @_;
my ($num,$j) = (0,0);
- my ($id,$model,$size,$used,$percent,$size_holder,
- $used_holder) = ('','','','','','','');
- my @smart_basic =(
- ['smart','SMART'],
- ['smart-error','SMART Message'],
- ['smart-support','state'],
- ['smart-status','health'],
- ['smart-power-on-hours','on'],
- ['smart-cycles','cycles'],
- ['smart-units-read','read-units'],
- ['smart-units-written','written-units'],
- ['smart-read','read'],
- ['smart-written','written'],
- );
- my @smart_age =(
- ['smart-gsense-error-rate-r','g-sense error rate'],
- ['smart-media-wearout-v','media wearout'],
- ['smart-media-wearout-t','threshold'],
- ['smart-media-wearout-f','alert'],
- ['smart-multizone-errors-v','write error rate'],
- ['smart-multizone-errors-t','threshold'],
- ['smart-udma-crc-errors-r','UDMA CRC errors'],
- ['smart-udma-crc-errors-f','alert'],
- );
- my @smart_fail =(
- ['smart-end-to-end-v','end-to-end'],
- ['smart-end-to-end-t','threshold'],
- ['smart-end-to-end-f','alert'],
- ['smart-raw-read-error-rate-v','read error rate'],
- ['smart-raw-read-error-rate-t','threshold'],
- ['smart-raw-read-error-rate-f','alert'],
- ['smart-reallocated-sectors-v','reallocated sector'],
- ['smart-reallocated-sectors-t','threshold'],
- ['smart-reallocated-sectors-f','alert'],
- ['smart-retired-blocks-v','retired block'],
- ['smart-retired-blocks-t','threshold'],
- ['smart-retired-blocks-f','alert'],
- ['smart-runtime-bad-block-v','runtime bad block'],
- ['smart-runtime-bad-block-t','threshold'],
- ['smart-runtime-bad-block-f','alert'],
- ['smart-seek-error-rate-v', 'seek error rate'],
- ['smart-seek-error-rate-t', 'threshold'],
- ['smart-seek-error-rate-f', 'alert'],
- ['smart-spinup-time-v','spin-up time'],
- ['smart-spinup-time-t','threshold'],
- ['smart-spinup-time-f','alert'],
- ['smart-ssd-life-left-v','life left'],
- ['smart-ssd-life-left-t','threshold'],
- ['smart-ssd-life-left-f','alert'],
- ['smart-unused-reserve-block-v','unused reserve block'],
- ['smart-unused-reserve-block-t','threshold'],
- ['smart-unused-reserve-blockf','alert'],
- ['smart-used-reserve-block-v','used reserve block'],
- ['smart-used-reserve-block-t','threshold'],
- ['smart-used-reserve-block-f','alert'],
- ['smart-unknown-1-a','attribute'],
- ['smart-unknown-1-v','value'],
- ['smart-unknown-1-w','worst'],
- ['smart-unknown-1-t','threshold'],
- ['smart-unknown-1-f','alert'],
- ['smart-unknown-2-a','attribute'],
- ['smart-unknown-2-v','value'],
- ['smart-unknown-2-w','worst'],
- ['smart-unknown-2-t','threshold'],
- ['smart-unknown-2-f','alert'],
- ['smart-unknown-3-a','attribute'],
- ['smart-unknown-3-v','value'],
- ['smart-unknown-3-w','worst'],
- ['smart-unknown-3-t','threshold'],
- ['smart-unknown-4-f','alert'],
- ['smart-unknown-4-a','attribute'],
- ['smart-unknown-4-v','value'],
- ['smart-unknown-4-w','worst'],
- ['smart-unknown-4-t','threshold'],
- ['smart-unknown-4-f','alert'],
- );
- my @sizing = main::get_size($disks[0]{'size'}) if $disks[0]{'size'};
- #print Data::Dumper::Dumper \@disks;
- if (@sizing){
- $size = $sizing[0];
- # note: if a string is returned there will be no Size unit so just use string.
- if (defined $sizing[0] && $sizing[1]){
- $size .= ' ' . $sizing[1];
- }
- }
- $size ||= 'N/A';
- @sizing = ();
- @sizing = main::get_size($disks[0]{'used'}) if defined $disks[0]{'used'};
- if (@sizing){
- $used = $sizing[0];
- if (defined $sizing[0] && $sizing[1]){
- $used .= ' ' . $sizing[1];
- if (( $disks[0]{'size'} && $disks[0]{'size'} =~ /^[0-9]/ ) &&
- ( $disks[0]{'used'} =~ /^[0-9]/ ) ){
- $used = $used . ' (' . sprintf("%0.1f", $disks[0]{'used'}/$disks[0]{'size'}*100) . '%)';
- }
- }
- }
- $used ||= 'N/A';
- @data = ({
+ my ($size,$size_value,$used) = ('','','');
+ push(@$rows, {
main::key($num++,1,1,'Local Storage') => '',
- main::key($num++,0,2,'total') => $size,
- main::key($num++,0,2,'used') => $used,
});
- @rows = (@rows,@data);
- shift @disks;
+ # print Data::Dumper::Dumper $disks;
+ $size = main::get_size($disks->[0]{'size'},'string','N/A');
+ if ($disks->[0]{'logical-size'}){
+ $rows->[$j]{main::key($num++,1,2,'total')} = '';
+ $rows->[$j]{main::key($num++,0,3,'raw')} = $size;
+ $size = main::get_size($disks->[0]{'logical-size'},'string');
+ $size_value = $disks->[0]{'logical-size'};
+ # print Data::Dumper::Dumper $disks;
+ $rows->[$j]{main::key($num++,1,3,'usable')} = $size;
+ }
+ else {
+ $size_value = $disks->[0]{'size'} if $disks->[0]{'size'};
+ $rows->[$j]{main::key($num++,0,2,'total')} = $size;
+ }
+ $used = main::get_size($disks->[0]{'used'},'string','N/A');
+ if ($extra > 0 && $disks->[0]{'logical-free'}){
+ $size = main::get_size($disks->[0]{'logical-free'},'string');
+ $rows->[$j]{main::key($num++,0,4,'lvm-free')} = $size;
+ }
+ if (($size_value && $size_value =~ /^[0-9]/) &&
+ ($used && $disks->[0]{'used'} =~ /^[0-9]/)){
+ $used = $used . ' (' . sprintf("%0.1f", $disks->[0]{'used'}/$size_value*100) . '%)';
+ }
+ $rows->[$j]{main::key($num++,0,2,'used')} = $used;
+ shift @$disks;
+ eval $end if $b_log;
+}
+
+sub drive_output {
+ eval $start if $b_log;
+ my ($rows,$disks) = @_;
+ # print Data::Dumper::Dumper $disks;
+ my ($b_smart_permissions,$block,$smart_age,$smart_basic,$smart_fail);
+ my ($num,$j) = (0,0);
+ my ($id,$model,$size) = ('','','');
+ # note: specific smartctl non-missing errors handled inside loop
if ($smartctl_missing){
- $j = scalar @rows;
- $rows[$j]{main::key($num++,0,1,'SMART Message')} = $smartctl_missing;
- }
- if ( $show{'disk'} && @disks){
- @disks = sort { $a->{'id'} cmp $b->{'id'} } @disks;
- foreach my $ref (@disks){
- ($b_oldage,$b_prefail,$b_smart,$id,$model,$size) = (0,0,0,'','','');
- my %row = %$ref;
- $num = 1;
- $model = ($row{'model'}) ? $row{'model'}: 'N/A';
- $id = ($row{'id'}) ? "/dev/$row{'id'}":'N/A';
- my @sizing = main::get_size($row{'size'});
- #print Data::Dumper::Dumper \@disks;
- if (@sizing){
- $size = $sizing[0];
- # note: if a string is returned there will be no Size unit so just use string.
- if (defined $sizing[0] && $sizing[1]){
- $size .= ' ' . $sizing[1];
- $size_holder = $sizing[0];
- }
- $size ||= 'N/A';
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,0,1,'SMART Message')} = $smartctl_missing;
+ }
+ elsif ($b_admin){
+ my $result = smartctl_fields();
+ ($smart_age,$smart_basic,$smart_fail) = @$result;
+ }
+ foreach my $row (sort { $a->{'id'} cmp $b->{'id'} } @$disks){
+ ($id,$model,$size) = ('','','');
+ $num = 1;
+ $model = ($row->{'model'}) ? $row->{'model'}: 'N/A';
+ $id = ($row->{'id'}) ? "/dev/$row->{'id'}":'N/A';
+ $size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : 'N/A';
+ # print Data::Dumper::Dumper $disks;
+ $j = scalar @$rows;
+ if (!$b_smart_permissions && $row->{'smart-permissions'}){
+ $b_smart_permissions = 1;
+ $rows->[$j]{main::key($num++,0,1,'SMART Message')} = $row->{'smart-permissions'};
+ $j = scalar @$rows;
+ }
+ push(@$rows, {
+ main::key($num++,1,1,'ID') => $id,
+ });
+ if ($b_admin && $row->{'maj-min'}){
+ $rows->[$j]{main::key($num++,0,2,'maj-min')} = $row->{'maj-min'};
+ }
+
+ if ($row->{'vendor'}){
+ $rows->[$j]{main::key($num++,0,2,'vendor')} = $row->{'vendor'};
+ }
+ $rows->[$j]{main::key($num++,0,2,'model')} = $model;
+ if ($row->{'drive-vendor'}){
+ $rows->[$j]{main::key($num++,0,2,'drive vendor')} = $row->{'drive-vendor'};
+ }
+ if ($row->{'drive-model'}){
+ $rows->[$j]{main::key($num++,0,2,'drive model')} = $row->{'drive-model'};
+ }
+ if ($row->{'family'}){
+ $rows->[$j]{main::key($num++,0,2,'family')} = $row->{'family'};
+ }
+ $rows->[$j]{main::key($num++,0,2,'size')} = $size;
+ if ($b_admin && $row->{'block-physical'}){
+ $rows->[$j]{main::key($num++,1,2,'block-size')} = '';
+ $rows->[$j]{main::key($num++,0,3,'physical')} = "$row->{'block-physical'} B";
+ $block = ($row->{'block-logical'}) ? "$row->{'block-logical'} B" : 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'logical')} = $block;
+ }
+ if ($row->{'type'}){
+ $rows->[$j]{main::key($num++,1,2,'type')} = $row->{'type'};
+ if ($extra > 1 && $row->{'type'} eq 'USB' && $row->{'abs-path'} &&
+ $usb{'disk'}){
+ foreach my $device (@{$usb{'disk'}}){
+ if ($device->[8] && $device->[26] &&
+ $row->{'abs-path'} =~ /^$device->[26]/){
+ $rows->[$j]{main::key($num++,0,3,'rev')} = $device->[8];
+ if ($device->[17]){
+ $rows->[$j]{main::key($num++,0,3,'spd')} = $device->[17];
+ }
+ if ($device->[24]){
+ $rows->[$j]{main::key($num++,0,3,'lanes')} = $device->[24];
+ }
+ if ($b_admin && $device->[22]){
+ $rows->[$j]{main::key($num++,0,3,'mode')} = $device->[22];
+ }
+ last;
+ }
+ }
}
- else {
- $size = 'N/A';
+ }
+ if ($extra > 1 && $row->{'speed'}){
+ if ($row->{'sata'}){
+ $rows->[$j]{main::key($num++,0,2,'sata')} = $row->{'sata'};
}
- $j = scalar @rows;
- if (!$b_smart_permissions && $row{'smart-permissions'}){
- $b_smart_permissions = 1;
- $rows[$j]{main::key($num++,0,1,'SMART Message')} = $row{'smart-permissions'};
- $j = scalar @rows;
+ $rows->[$j]{main::key($num++,0,2,'speed')} = $row->{'speed'};
+ $rows->[$j]{main::key($num++,0,2,'lanes')} = $row->{'lanes'} if $row->{'lanes'};
+ }
+ if ($extra > 2){
+ $row->{'tech'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,2,'tech')} = $row->{'tech'};
+ if ($row->{'rotation'}){
+ $rows->[$j]{main::key($num++,0,2,'rpm')} = $row->{'rotation'};
}
- @data = ({
- main::key($num++,1,1,'ID') => $id,
- });
- @rows = (@rows,@data);
- if ($row{'type'}){
- $rows[$j]{main::key($num++,0,2,'type')} = $row{'type'};
+ }
+ if ($extra > 1){
+ if (!$row->{'serial'} && $alerts{'bioctl'} &&
+ $alerts{'bioctl'}->{'action'} eq 'permissions'){
+ $row->{'serial'} = main::message('root-required');
}
- if ($row{'vendor'}){
- $rows[$j]{main::key($num++,0,2,'vendor')} = $row{'vendor'};
+ else {
+ $row->{'serial'} = main::filter($row->{'serial'});
}
- $rows[$j]{main::key($num++,0,2,'model')} = $model;
- if ($row{'drive-vendor'}){
- $rows[$j]{main::key($num++,0,2,'drive vendor')} = $row{'drive-vendor'};
+ $rows->[$j]{main::key($num++,0,2,'serial')} = $row->{'serial'};
+ if ($row->{'drive-serial'}){
+ $rows->[$j]{main::key($num++,0,2,'drive serial')} = main::filter($row->{'drive-serial'});
}
- if ($row{'drive-model'}){
- $rows[$j]{main::key($num++,0,2,'drive model')} = $row{'drive-model'};
+ if ($row->{'firmware'}){
+ $rows->[$j]{main::key($num++,0,2,'fw-rev')} = $row->{'firmware'};
}
- if ($row{'family'}){
- $rows[$j]{main::key($num++,0,2,'family')} = $row{'family'};
+ if ($row->{'drive-firmware'}){
+ $rows->[$j]{main::key($num++,0,2,'drive-rev')} = $row->{'drive-firmware'};
}
- $rows[$j]{main::key($num++,0,2,'size')} = $size;
- if ($b_admin && $row{'block-physical'}){
- $rows[$j]{main::key($num++,1,2,'block size')} = '';
- $rows[$j]{main::key($num++,0,3,'physical')} = $row{'block-physical'} . ' B';
- $rows[$j]{main::key($num++,0,3,'logical')} = ($row{'block-logical'}) ? $row{'block-logical'} . ' B' : 'N/A';
+ }
+ if ($extra > 0 && $row->{'temp'}){
+ $rows->[$j]{main::key($num++,0,2,'temp')} = $row->{'temp'} . ' C';
+ }
+ if ($extra > 1 && $alerts{'bioctl'}){
+ if (!$row->{'duid'} && $alerts{'bioctl'}->{'action'} eq 'permissions'){
+ $rows->[$j]{main::key($num++,0,2,'duid')} = main::message('root-required');
}
- if ($extra > 1 && $row{'speed'}){
- if ($row{'sata'}){
- $rows[$j]{main::key($num++,0,2,'sata')} = $row{'sata'};
- }
- $rows[$j]{main::key($num++,0,2,'speed')} = $row{'speed'};
- $rows[$j]{main::key($num++,0,2,'lanes')} = $row{'lanes'} if $row{'lanes'};
+ elsif ($row->{'duid'}){
+ $rows->[$j]{main::key($num++,0,2,'duid')} = main::filter($row->{'duid'});
}
- if ($extra > 2 && $row{'rotation'}){
- $rows[$j]{main::key($num++,0,2,'rotation')} = $row{'rotation'};
+ }
+ # Extra level tests already done
+ if (defined $row->{'partition-table'}){
+ $rows->[$j]{main::key($num++,0,2,'scheme')} = $row->{'partition-table'};
+ }
+ if ($row->{'smart'} || $row->{'smart-error'}){
+ $j = scalar @$rows;
+ ## Basic SMART and drive info ##
+ smart_output('basic',$smart_basic,$row,$j,\$num,$rows);
+ ## Old-Age errors ##
+ smart_output('age',$smart_age,$row,$j,\$num,$rows);
+ ## Pre-Fail errors ##
+ smart_output('fail',$smart_fail,$row,$j,\$num,$rows);
+ }
+ }
+ eval $end if $b_log;
+}
+
+# args: $num and $rows passed by reference
+sub smart_output {
+ eval $start if $b_log;
+ my ($type,$smart_data,$row,$j,$num,$rows) = @_;
+ my ($b_found);
+ my ($l,$m,$p) = ($type eq 'basic') ? (2,3,0) : (3,4,0);
+ my ($m_h,$p_h) = ($m,$p);
+ for (my $i = 0; $i < scalar @$smart_data;$i++){
+ if ($row->{$smart_data->[$i][0]}){
+ if (!$b_found){
+ my ($key,$support) = ('','');
+ if ($type eq 'basic'){
+ $support = ($row->{'smart'}) ? $row->{'smart'}: $row->{'smart-error'};
+ $key = $smart_data->[$i][1];
+ }
+ elsif ($type eq 'age'){$key = 'Old-Age';}
+ elsif ($type eq 'fail'){$key = 'Pre-Fail';}
+ $rows->[$j]{main::key($$num++,1,$l,$key)} = $support;
+ $b_found = 1;
+ next if $type eq 'basic';
}
- if ($extra > 1){
- my $serial = main::apply_filter($row{'serial'});
- $rows[$j]{main::key($num++,0,2,'serial')} = $serial;
- if ($row{'drive-serial'}){
- $rows[$j]{main::key($num++,0,2,'drive serial')} = main::apply_filter($row{'drive-serial'});
- }
- if ($row{'firmware'}){
- $rows[$j]{main::key($num++,0,2,'rev')} = $row{'firmware'};
- }
- if ($row{'drive-firmware'}){
- $rows[$j]{main::key($num++,0,2,'drive rev')} = $row{'drive-firmware'};
- }
- }
- if ($extra > 0 && $row{'temp'}){
- $rows[$j]{main::key($num++,0,2,'temp')} = $row{'temp'} . ' C';
- }
- # extra level tests already done
- if (defined $row{'partition-table'}){
- $rows[$j]{main::key($num++,0,2,'scheme')} = $row{'partition-table'};
- }
- if ($row{'smart'} || $row{'smart-error'}){
- $j = scalar @rows;
- ## Basic SMART and drive info ##
- for (my $i = 0; $i < scalar @smart_basic;$i++){
- if ($row{$smart_basic[$i][0]}){
- if (!$b_smart){
- my $support = ($row{'smart'}) ? $row{'smart'}: $row{'smart-error'};
- $rows[$j]{main::key($num++,1,2,$smart_basic[$i][1])} = $support;
- $b_smart = 1;
- next;
- }
- $rows[$j]{main::key($num++,0,3,$smart_basic[$i][1])} = $row{$smart_basic[$i][0]};
- }
+ if ($type ne 'basic'){
+ if ($smart_data->[$i][0] =~ /-a[vr]?$/){
+ ($p,$m) = (1,$m_h);
}
- ## Old-Age errors ##
- for (my $i = 0; $i < scalar @smart_age;$i++){
- if ($row{$smart_age[$i][0]}){
- if (!$b_oldage){
- $rows[$j]{main::key($num++,1,3,'Old-Age')} = '';
- $b_oldage = 1;
- }
- $rows[$j]{main::key($num++,0,4,$smart_age[$i][1])} = $row{$smart_age[$i][0]};
- }
+ elsif ($smart_data->[$i][0] =~ /-[ftvw]$/){
+ ($p,$m) = (0,5);
}
- ## Pre-Fail errors ##
- for (my $i = 0; $i < scalar @smart_fail;$i++){
- if ($row{$smart_fail[$i][0]}){
- if (!$b_prefail){
- $rows[$j]{main::key($num++,1,3,'Pre-Fail')} = '';
- $b_prefail = 1;
- }
- $rows[$j]{main::key($num++,0,4,$smart_fail[$i][1])} = $row{$smart_fail[$i][0]};
- }
+ else {
+ ($p,$m) = ($p_h,$m_h);
}
}
+ $rows->[$j]{main::key($$num++,$p,$m,$smart_data->[$i][1])} = $row->{$smart_data->[$i][0]};
}
}
eval $end if $b_log;
- return @rows;
}
-sub disk_data {
+
+sub drive_data {
eval $start if $b_log;
my ($type) = @_;
- my (@rows,@data,@devs);
+ my ($data,@devs);
my $num = 0;
my ($used) = (0);
- PartitionData::partition_data() if !$b_partitions;
- foreach my $ref (@partitions){
- my %row = %$ref;
- # don't count remote used, also, some cases mount
- # panfs is parallel NAS volume manager, need more data
- next if ($row{'fs'} && $row{'fs'} =~ /cifs|iso9660|nfs|panfs|sshfs|smbfs|unionfs/);
- # don't count zfs or file type swap
- next if ($row{'swap-type'} && $row{'swap-type'} ne 'partition');
+ PartitionItem::set_partitions() if !$loaded{'set-partitions'};
+ RaidItem::raid_data() if !$loaded{'raid'};
+ # see docs/inxi-partitions.txt > FILE SYSTEMS for more on remote/fuse fs
+ my $fs_skip = PartitionItem::get_filters('fs-exclude');
+ foreach my $row (@partitions){
+ # don't count remote/distributed/union type fs towards used
+ next if ($row->{'fs'} && $row->{'fs'} =~ /^$fs_skip$/);
+ # don't count non partition swap
+ next if ($row->{'swap-type'} && $row->{'swap-type'} ne 'partition');
# in some cases, like redhat, mounted cdrom/dvds show up in partition data
- next if ($row{'dev-base'} && $row{'dev-base'} =~ /^sr[0-9]+$/);
+ next if ($row->{'dev-base'} && $row->{'dev-base'} =~ /^sr[0-9]+$/);
# this is used for specific cases where bind, or incorrect multiple mounts
# to same partitions, or btrfs sub volume mounts, is present. The value is
# searched for an earlier appearance of that partition and if it is present,
# the data is not added into the partition used size.
- if ( $row{'dev-base'} !~ /^\/\/|:\// && ! (grep {/$row{'dev-base'}/} @devs) ){
- $used += $row{'used'} if $row{'used'};
- push @devs, $row{'dev-base'};
+ if ($row->{'dev-base'} !~ /^(\/\/|:\/)/ && !(grep {/$row->{'dev-base'}/} @devs)){
+ $used += $row->{'used'} if $row->{'used'};
+ push(@devs, $row->{'dev-base'});
}
}
if (!$bsd_type){
- @data = proc_data($used);
+ $data = proc_data($used);
}
else {
- @data = dmesg_boot_data($used);
+ $data = bsd_data($used);
}
if ($b_admin){
- my $ref = $alerts{'smartctl'};
- if ( $ref && $$ref{'action'} eq 'use'){
- @data = smartctl_data(@data);
+ if ($alerts{'smartctl'} && $alerts{'smartctl'}->{'action'} eq 'use'){
+ smartctl_data($data);
}
else {
- $smartctl_missing = $$ref{'missing'};
+ $smartctl_missing = $alerts{'smartctl'}->{'message'};
}
}
- print Data::Dumper::Dumper \@data if $test[13];;
+ print Data::Dumper::Dumper $data if $dbg[13];
main::log_data('data',"used: $used") if $b_log;
eval $end if $b_log;
- return @data;
+ return $data;
}
+
sub proc_data {
eval $start if $b_log;
my ($used) = @_;
- my (@data,@drives);
- my ($b_hdx,$size,$drive_size) = (0,0,0);
- set_proc_partitions() if !$b_proc_partitions;
- foreach (@proc_partitions){
- next if (/^\s*$/);
- my @row = split /\s+/, $_;
- if ( $row[-1] =~ /^([hsv]d[a-z]+|(ada|mmcblk|n[b]?d|nvme[0-9]+n)[0-9]+)$/) {
- $drive_size = $row[2];
- $b_hdx = 1 if $row[-1] =~ /^hd[a-z]/;
- @data = ({
+ my (@drives);
+ my ($b_hdx,$logical_size,$size) = (0,0,0);
+ PartitionData::set() if !$bsd_type && !$loaded{'partition-data'};
+ foreach my $row (@proc_partitions){
+ if ($row->[-1] =~ /^(fio[a-z]+|[hsv]d[a-z]+|(ada|mmcblk|n[b]?d|nvme[0-9]+n)[0-9]+)$/){
+ $b_hdx = 1 if $row->[-1] =~ /^hd[a-z]/;
+ push(@drives, {
'firmware' => '',
- 'id' => $row[-1],
+ 'id' => $row->[-1],
+ 'maj-min' => $row->[0] . ':' . $row->[1],
'model' => '',
'serial' => '',
- 'size' => $drive_size,
+ 'size' => $row->[2],
'spec' => '',
'speed' => '',
'temp' => '',
'type' => '',
'vendor' => '',
});
- @drives = (@drives,@data);
}
# See http://lanana.org/docs/device-list/devices-2.6+.txt for major numbers used below
# See https://www.mjmwired.net/kernel/Documentation/devices.txt for kernel 4.x device numbers
- # if ( $row[0] =~ /^(3|22|33|8)$/ && $row[1] % 16 == 0 ) {
- # $size += $row[2];
+ # if ($row->[0] =~ /^(3|22|33|8)$/ && $row->[1] % 16 == 0) {
+ # $size += $row->[2];
# }
# special case from this data: 8 0 156290904 sda
# 43 0 48828124 nbd0
# note: known starters: vm: 252/253/254; grsec: 202; nvme: 259 mmcblk: 179
- if ( $row[0] =~ /^(3|8|22|33|43|179|202|252|253|254|259)$/ &&
- $row[-1] =~ /(mmcblk[0-9]+|n[b]?d[0-9]+|nvme[0-9]+n[0-9]+|[hsv]d[a-z]+)$/ &&
- ( $row[1] % 16 == 0 || $row[1] % 16 == 8 ) ) {
- $size += $row[2];
- }
+ # Note: with > 1 nvme drives, the minor number no longer passes the modulus tests,
+ # It appears to just increase randomly from the first 0 minor of the first nvme to
+ # nvme partitions to next nvme, so it only passes the test for the first nvme drive.
+ # note: 66 16 9766436864 sdah ; 65 240 9766436864 sdaf[maybe special case when double letters?
+ # Check /proc/devices for major number matches
+ if ($row->[0] =~ /^(3|8|22|33|43|6[5-9]|7[12]|12[89]|13[0-5]|179|202|252|253|254|259)$/ &&
+ $row->[-1] =~ /(mmcblk[0-9]+|n[b]?d[0-9]+|nvme[0-9]+n[0-9]+|fio[a-z]+|[hsv]d[a-z]+)$/ &&
+ ($row->[1] % 16 == 0 || $row->[1] % 16 == 8 || $row->[-1] =~ /(nvme[0-9]+n[0-9]+)$/)){
+ $size += $row->[2];
+ }
+ }
+ # raw_logical[0] is total of all logical raid/lvm found
+ # raw_logical[1] is total of all components found. If this totally fails,
+ # and we end up with raw logical less than used, give up
+ if (@raw_logical && $raw_logical[0] && (!$used || $raw_logical[0] > $used)){
+ $logical_size = ($size - $raw_logical[1] + $raw_logical[0]);
}
# print Data::Dumper::Dumper \@drives;
main::log_data('data',"size: $size") if $b_log;
- @data = ({
+ my $result = [{
+ 'logical-size' => $logical_size,
+ 'logical-free' => $raw_logical[2],
'size' => $size,
'used' => $used,
- });
- #print Data::Dumper::Dumper \@data;
- if ( $show{'disk'} ){
- @drives = (@data,@drives);
- # print 'drives:', Data::Dumper::Dumper \@drives;
- @data = proc_data_advanced($b_hdx,@drives);
- }
- main::log_data('dump','@data',\@data) if $b_log;
+ }];
# print Data::Dumper::Dumper \@data;
- eval $end if $b_log;
- return @data;
-}
-sub set_proc_partitions {
- eval $start if $b_log;
- $b_proc_partitions = 1;
- if (my $file = main::system_files('partitions')){
- @proc_partitions = main::reader($file,'strip');
- shift @proc_partitions;
+ if ($show{'disk'}){
+ unshift(@drives,@$result);
+ # print 'drives:', Data::Dumper::Dumper \@drives;
+ $result = proc_data_advanced($b_hdx,\@drives);
}
+ main::log_data('dump','@$result',$result) if $b_log;
+ print Data::Dumper::Dumper $result if $dbg[24];
eval $end if $b_log;
+ return $result;
}
+
sub proc_data_advanced {
eval $start if $b_log;
- my ($b_hdx,@drives) = @_;
+ my ($b_hdx,$drives) = @_;
my ($i) = (0);
- my (@data,@disk_data,@rows,@scsi,@temp,@working);
+ my ($disk_data,$scsi,@temp,@working);
my ($pt_cmd) = ('unset');
my ($block_type,$file,$firmware,$model,$path,
$partition_scheme,$serial,$vendor,$working_path);
@@ -8942,74 +13011,69 @@ sub proc_data_advanced {
# we also don't need the partition items
my $pattern = '^\/dev\/disk\/by-id\/(md-|lvm-|dm-|wwn-|nvme-eui|raid-|scsi-([0-9]ATA|SATA))|-part[0-9]+$';
@by_id = grep {!/$pattern/} @by_id if @by_id;
- # print join "\n", @by_id, "\n";
+ # print join("\n", @by_id), "\n";
@by_path = main::globber('/dev/disk/by-path/*');
## check for all ide type drives, non libata, only do it if hdx is in array
## this is now being updated for new /sys type paths, this may handle that ok too
## skip the first rows in the loops since that's the basic size/used data
if ($b_hdx){
- for ($i = 1; $i < scalar @drives; $i++){
- $file = "/proc/ide/$drives[$i]{'id'}/model";
- if ( $drives[$i]{'id'} =~ /^hd[a-z]/ && -e $file){
- $model = (main::reader($file,'strip'))[0];
- $drives[$i]{'model'} = $model;
+ for ($i = 1; $i < scalar @$drives; $i++){
+ $file = "/proc/ide/$drives->[$i]{'id'}/model";
+ if ($drives->[$i]{'id'} =~ /^hd[a-z]/ && -e $file){
+ $model = main::reader($file,'strip',0);
+ $drives->[$i]{'model'} = $model;
}
}
}
# scsi stuff
- if ($file = main::system_files('scsi')){
- @scsi = scsi_data($file);
+ if ($file = $system_files{'proc-scsi'}){
+ $scsi = scsi_data($file);
}
- # print 'drives:', Data::Dumper::Dumper \@drives;
- for ($i = 1; $i < scalar @drives; $i++){
- #next if $drives[$i]{'id'} =~ /^hd[a-z]/;
+ # print 'drives:', Data::Dumper::Dumper $drives;
+ for ($i = 1; $i < scalar @$drives; $i++){
+ #next if $drives->[$i]{'id'} =~ /^hd[a-z]/;
($block_type,$firmware,$model,$partition_scheme,
$serial,$vendor,$working_path) = ('','','','','','','');
- if ($extra > 2){
- @data = advanced_disk_data($pt_cmd,$drives[$i]{'id'});
- $pt_cmd = $data[0];
- $drives[$i]{'partition-table'} = uc($data[1]) if $data[1];
- $drives[$i]{'rotation'} = "$data[2] rpm" if $data[2];
- }
- #print "$drives[$i]{'id'}\n";
- @disk_data = disk_data_by_id("/dev/$drives[$i]{'id'}");
- main::log_data('dump','@disk_data', \@disk_data) if $b_log;
- if ($drives[$i]{'id'} =~ /[sv]d[a-z]/){
+ # print "$drives->[$i]{'id'}\n";
+ $disk_data = disk_data_by_id("/dev/$drives->[$i]{'id'}");
+ main::log_data('dump','@$disk_data', $disk_data) if $b_log;
+ if ($drives->[$i]{'id'} =~ /[sv]d[a-z]/){
$block_type = 'sdx';
- $working_path = "/sys/block/$drives[$i]{'id'}/device/";
+ $working_path = "/sys/block/$drives->[$i]{'id'}/device/";
}
- elsif ($drives[$i]{'id'} =~ /mmcblk/){
+ elsif ($drives->[$i]{'id'} =~ /mmcblk/){
$block_type = 'mmc';
- $working_path = "/sys/block/$drives[$i]{'id'}/device/";
+ $working_path = "/sys/block/$drives->[$i]{'id'}/device/";
}
- elsif ($drives[$i]{'id'} =~ /nvme/){
+ elsif ($drives->[$i]{'id'} =~ /nvme/){
$block_type = 'nvme';
# this results in:
# /sys/devices/pci0000:00/0000:00:03.2/0000:06:00.0/nvme/nvme0/nvme0n1
# but we want to go one level down so slice off trailing nvme0n1
- $working_path = Cwd::abs_path("/sys/block/$drives[$i]{'id'}");
+ $working_path = Cwd::abs_path("/sys/block/$drives->[$i]{'id'}");
$working_path =~ s/nvme[^\/]*$//;
}
+ if ($working_path){
+ $drives->[$i]{'abs-path'} = Cwd::abs_path($working_path);
+ }
main::log_data('data',"working path: $working_path") if $b_log;
if ($b_admin && -e "/sys/block/"){
- my @working = block_data($drives[$i]{'id'});
- $drives[$i]{'block-logical'} = $working[0];
- $drives[$i]{'block-physical'} = $working[1];
+ ($drives->[$i]{'block-logical'},$drives->[$i]{'block-physical'}) = @{block_data($drives->[$i]{'id'})};
}
- if ($block_type && @scsi && @by_id && ! -e "${working_path}model" && ! -e "${working_path}name"){
+ if ($block_type && $scsi && @$scsi && @by_id && ! -e "${working_path}model" &&
+ ! -e "${working_path}name"){
## ok, ok, it's incomprehensible, search /dev/disk/by-id for a line that contains the
# discovered disk name AND ends with the correct identifier, sdx
# get rid of whitespace for some drive names and ids, and extra data after - in name
SCSI:
- foreach my $ref (@scsi){
- my %row = %$ref;
- if ($row{'model'}){
- $row{'model'} = (split /\s*-\s*/,$row{'model'})[0];
+ foreach my $row (@$scsi){
+ if ($row->{'model'}){
+ $row->{'model'} = (split(/\s*-\s*/,$row->{'model'}))[0];
foreach my $id (@by_id){
- if ($id =~ /$row{'model'}/ && "/dev/$drives[$i]{'id'}" eq Cwd::abs_path($id)){
- $drives[$i]{'firmware'} = $row{'firmware'};
- $drives[$i]{'model'} = $row{'model'};
- $drives[$i]{'vendor'} = $row{'vendor'};
+ if ($id =~ /$row->{'model'}/ && "/dev/$drives->[$i]{'id'}" eq Cwd::abs_path($id)){
+ $drives->[$i]{'firmware'} = $row->{'firmware'};
+ $drives->[$i]{'model'} = $row->{'model'};
+ $drives->[$i]{'vendor'} = $row->{'vendor'};
last SCSI;
}
}
@@ -9018,201 +13082,301 @@ sub proc_data_advanced {
}
# note: an entire class of model names gets truncated by /sys so that should be the last
# in priority re tests.
- elsif ( (!@disk_data || !$disk_data[0] ) && $block_type){
+ elsif ((!@$disk_data || !$disk_data->[0]) && $block_type){
# NOTE: while path ${working_path}vendor exists, it contains junk value, like: ATA
$path = "${working_path}model";
- if ( -e $path){
- $model = (main::reader($path,'strip'))[0];
- if ($model){
- $drives[$i]{'model'} = $model;
- }
+ if (-r $path){
+ $model = main::reader($path,'strip',0);
+ $drives->[$i]{'model'} = $model if $model;
}
- elsif ($block_type eq 'mmc' && -e "${working_path}name"){
+ elsif ($block_type eq 'mmc' && -r "${working_path}name"){
$path = "${working_path}name";
- $model = (main::reader($path,'strip'))[0];
- if ($model){
- $drives[$i]{'model'} = $model;
- }
+ $model = main::reader($path,'strip',0);
+ $drives->[$i]{'model'} = $model if $model;
}
}
- if (!$drives[$i]{'model'} && @disk_data){
- $drives[$i]{'model'} = $disk_data[0] if $disk_data[0];
- $drives[$i]{'vendor'} = $disk_data[1] if $disk_data[1];
+ if (!$drives->[$i]{'model'} && @$disk_data){
+ $drives->[$i]{'model'} = $disk_data->[0] if $disk_data->[0];
+ $drives->[$i]{'vendor'} = $disk_data->[1] if $disk_data->[1];
}
# maybe rework logic if find good scsi data example, but for now use this
- elsif ($drives[$i]{'model'} && !$drives[$i]{'vendor'}) {
- $drives[$i]{'model'} = main::disk_cleaner($drives[$i]{'model'});
- my @device_data = device_vendor($drives[$i]{'model'},'');
- $drives[$i]{'model'} = $device_data[1] if $device_data[1];
- $drives[$i]{'vendor'} = $device_data[0] if $device_data[0];
+ elsif ($drives->[$i]{'model'} && !$drives->[$i]{'vendor'}){
+ $drives->[$i]{'model'} = main::clean_disk($drives->[$i]{'model'});
+ my $result = disk_vendor($drives->[$i]{'model'},'');
+ $drives->[$i]{'model'} = $result->[1] if $result->[1];
+ $drives->[$i]{'vendor'} = $result->[0] if $result->[0];
}
if ($working_path){
$path = "${working_path}removable";
- $drives[$i]{'type'} = 'Removable' if -e $path && (main::reader($path,'strip'))[0]; # 0/1 value
+ if (-r $path && main::reader($path,'strip',0)){
+ $drives->[$i]{'type'} = 'Removable' ; # 0/1 value
+ }
}
- my $peripheral = peripheral_data($drives[$i]{'id'});
+ my $peripheral = peripheral_data($drives->[$i]{'id'});
# note: we only want to update type if we found a peripheral, otherwise preserve value
- $drives[$i]{'type'} = $peripheral if $peripheral;
- # print "type:$drives[$i]{'type'}\n";
+ $drives->[$i]{'type'} = $peripheral if $peripheral;
+ # print "type:$drives->[$i]{'type'}\n";
if ($extra > 0){
- $drives[$i]{'temp'} = hdd_temp("/dev/$drives[$i]{'id'}");
+ $drives->[$i]{'temp'} = hdd_temp("$drives->[$i]{'id'}");
if ($extra > 1){
- my @speed_data = device_speed($drives[$i]{'id'});
- $drives[$i]{'speed'} = $speed_data[0] if $speed_data[0];
- $drives[$i]{'lanes'} = $speed_data[1] if $speed_data[1];
- if (@disk_data && $disk_data[2]){
- $drives[$i]{'serial'} = $disk_data[2];
+ my $speed_data = drive_speed($drives->[$i]{'id'});
+ # only assign if defined / not 0
+ $drives->[$i]{'speed'} = $speed_data->[0] if $speed_data->[0];
+ $drives->[$i]{'lanes'} = $speed_data->[1] if $speed_data->[1];
+ if (@$disk_data && $disk_data->[2]){
+ $drives->[$i]{'serial'} = $disk_data->[2];
}
else {
$path = "${working_path}serial";
- if ( -e $path){
- $serial = (main::reader($path,'strip'))[0];
- $drives[$i]{'serial'} = $serial if $serial;
+ if (-r $path){
+ $serial = main::reader($path,'strip',0);
+ $drives->[$i]{'serial'} = $serial if $serial;
}
}
- if ($extra > 2 && !$drives[$i]{'firmware'} ){
+ if ($extra > 2 && !$drives->[$i]{'firmware'}){
my @fm = ('rev','fmrev','firmware_rev'); # 0 ~ default; 1 ~ mmc; 2 ~ nvme
foreach my $firmware (@fm){
$path = "${working_path}$firmware";
- if ( -e $path){
- $drives[$i]{'firmware'} = (main::reader($path,'strip'))[0];
+ if (-r $path){
+ $drives->[$i]{'firmware'} = main::reader($path,'strip',0);
last;
}
}
}
}
}
+ if ($extra > 2){
+ my $result = disk_data_advanced($pt_cmd,$drives->[$i]{'id'});
+ $pt_cmd = $result->[0];
+ $drives->[$i]{'partition-table'} = uc($result->[1]) if $result->[1];
+ if ($result->[2]){
+ $drives->[$i]{'rotation'} = $result->[2];
+ $drives->[$i]{'tech'} = 'HDD';
+ }
+ elsif (($block_type && $block_type ne 'sdx') ||
+ # note: this case could conceivabley be wrong for a spun down HDD
+ (defined $result->[2] && $result->[2] eq '0') ||
+ ($drives->[$i]{'model'} &&
+ $drives->[$i]{'model'} =~ /(flash|mmc|msata|\bm[\.-]?2\b|nvme|ssd|solid\s?state)/i)){
+ $drives->[$i]{'tech'} = 'SSD';
+ }
+ }
}
- # print Data::Dumper::Dumper \@drives;
+ main::log_data('dump','$drives',$drives) if $b_log;
+ print Data::Dumper::Dumper $drives if $dbg[24];
eval $end if $b_log;
- return @drives;
+ return $drives;
}
+
# camcontrol identify <device> |grep ^serial (this might be (S)ATA specific)
# smartcl -i <device> |grep ^Serial
# see smartctl; camcontrol devlist; gptid status;
-sub dmesg_boot_data {
+sub bsd_data {
eval $start if $b_log;
my ($used) = @_;
- my (@data,@drives,@temp);
- my ($id_holder,$i,$size,$working) = ('',0,0,0);
- my $file = main::system_files('dmesg-boot');
- if (@dm_boot_disk){
- foreach (@dm_boot_disk){
- my @row = split /:\s*/, $_;
- next if ! defined $row[1];
- if ($id_holder ne $row[0]){
- $i++ if $id_holder;
- # print "$i $id_holder $row[0]\n";
- $id_holder = $row[0];
- }
- # no dots, note: ada2: 2861588MB BUT: ada2: 600.000MB/s
- if (! exists $drives[$i]){
- $drives[$i] = ({});
- $drives[$i]{'id'} = $row[0];
- $drives[$i]{'firmware'} = '';
- $drives[$i]{'temp'} = '';
- $drives[$i]{'type'} = '';
- $drives[$i]{'vendor'} = '';
- }
- #print "$i\n";
- if ($bsd_type eq 'openbsd'){
- if ($row[1] =~ /(^|,\s*)([0-9\.]+[MGTPE][B]?),.*\ssectors$|^</){
- $working = main::translate_size($2);
- $size += $working if $working;
- $drives[$i]{'size'} = $working;
- }
- if ($row[2] && $row[2] =~ /<([^>]+)>/){
- $drives[$i]{'model'} = $1 if $1;
- $drives[$i]{'type'} = 'removable' if $_ =~ /removable$/;
- # <Generic-, Compact Flash, 1.00>
- my $count = ($drives[$i]{'model'} =~ tr/,//);
- if ($count && $count > 1){
- @temp = split /,\s*/, $drives[$i]{'model'};
- $drives[$i]{'model'} = $temp[1];
- }
- }
- # print "openbsd\n";
+ my (@drives,@softraid,@temp);
+ my ($i,$logical_size,$size,$working) = (0,0,0,0);
+ my $file = $system_files{'dmesg-boot'};
+ DiskDataBSD::set() if !$loaded{'disk-data-bsd'};
+ # we don't want non dboot disk data from gpart or disklabel
+ if ($file && ! -r $file){
+ $size = main::message('dmesg-boot-permissions');
+ }
+ elsif (!$file){
+ $size = main::message('dmesg-boot-missing');
+ }
+ elsif (%disks_bsd){
+ if ($sysctl{'softraid'}){
+ @softraid = map {$_ =~ s/.*\(([^\)]+)\).*/$1/;$_} @{$sysctl{'softraid'}};
+ }
+ foreach my $id (sort keys %disks_bsd){
+ next if !$disks_bsd{$id} || !$disks_bsd{$id}->{'size'};
+ $drives[$i]->{'id'} = $id;
+ $drives[$i]->{'firmware'} = '';
+ $drives[$i]->{'temp'} = '';
+ $drives[$i]->{'type'} = '';
+ $drives[$i]->{'vendor'} = '';
+ $drives[$i]->{'block-logical'} = $disks_bsd{$id}->{'block-logical'};
+ $drives[$i]->{'block-physical'} = $disks_bsd{$id}->{'block-physical'};
+ $drives[$i]->{'partition-table'} = $disks_bsd{$id}->{'scheme'};
+ $drives[$i]->{'serial'} = $disks_bsd{$id}->{'serial'};
+ $drives[$i]->{'size'} = $disks_bsd{$id}->{'size'};
+ # don't count OpenBSD RAID/CRYPTO virtual disks!
+ if ($drives[$i]->{'size'} && (!@softraid || !(grep {$id eq $_} @softraid))){
+ $size += $drives[$i]->{'size'} if $drives[$i]->{'size'};
+ }
+ $drives[$i]->{'spec'} = $disks_bsd{$id}->{'spec'};
+ $drives[$i]->{'speed'} = $disks_bsd{$id}->{'speed'};
+ $drives[$i]->{'type'} = $disks_bsd{$id}->{'type'};
+ # generate the synthetic model/vendor data
+ $drives[$i]->{'model'} = $disks_bsd{$id}->{'model'};
+ if ($drives[$i]->{'model'}){
+ my $result = disk_vendor($drives[$i]->{'model'},'');
+ $drives[$i]->{'vendor'} = $result->[0] if $result->[0];
+ $drives[$i]->{'model'} = $result->[1] if $result->[1];
+ }
+ if ($disks_bsd{$id}->{'duid'}){
+ $drives[$i]->{'duid'} = $disks_bsd{$id}->{'duid'};
+ }
+ if ($disks_bsd{$id}->{'partition-table'}){
+ $drives[$i]->{'partition-table'} = $disks_bsd{$id}->{'partition-table'};
}
- else {
- if ($row[1] =~ /^([0-9]+[KMGTPE][B]?)\s/){
- $working = main::translate_size($1);
- $size += $working if $working;
- $drives[$i]{'size'} = $working;
- }
- if ($row[1] =~ /device$|^</){
- $row[1] =~ s/\sdevice$//g;
- $row[1] =~ /<([^>]*)>\s(.*)/;
- $drives[$i]{'model'} = $1 if $1;
- $drives[$i]{'spec'} = $2 if $2;
- }
- if ($row[1] =~ /^Serial\sNumber\s(.*)/){
- $drives[$i]{'serial'} = $1;
- }
- if ($row[1] =~ /^([0-9\.]+[MG][B]?\/s)/){
- $drives[$i]{'speed'} = $1;
- $drives[$i]{'speed'} =~ s/\.[0-9]+// if $drives[$i]{'speed'};
- }
- }
- $drives[$i]{'model'} = main::disk_cleaner($drives[$i]{'model'});
- my @device_data = device_vendor($drives[$i]{'model'},'');
- $drives[$i]{'vendor'} = $device_data[0] if $device_data[0];
- $drives[$i]{'model'} = $device_data[1] if $device_data[1];
+ $i++;
+ }
+ # raw_logical[0] is total of all logical raid/lvm found
+ # raw_logical[1] is total of all components found. If this totally fails,
+ # and we end up with raw logical less than used, give up
+ if (@raw_logical && $size && $raw_logical[0] &&
+ (!$used || $raw_logical[0] > $used)){
+ $logical_size = ($size - $raw_logical[1] + $raw_logical[0]);
}
if (!$size){
- $size = main::row_defaults('data-bsd');
+ $size = main::message('data-bsd');
}
}
- elsif ( $file && ! -r $file ){
- $size = main::row_defaults('dmesg-boot-permissions');
- }
- elsif (!$file ){
- $size = main::row_defaults('dmesg-boot-missing');
- }
- @data = ({
+ my $result = [{
+ 'logical-size' => $logical_size,
+ 'logical-free' => $raw_logical[2],
'size' => $size,
'used' => $used,
- });
- #main::log_data('dump','@data',\@data) if $b_log;
- if ( $show{'disk'} ){
- @data = (@data,@drives);
- # print 'drives:', Data::Dumper::Dumper \@drives;
+ }];
+ #main::log_data('dump','$data',\@data) if $b_log;
+ if ($show{'disk'}){
+ push(@$result,@drives);
+ # print 'data:', Data::Dumper::Dumper \@data;
}
- # print Data::Dumper::Dumper \@data;
+ main::log_data('dump','$result',$result) if $b_log;
+ print Data::Dumper::Dumper $result if $dbg[24];
eval $end if $b_log;
- return @data;
+ return $result;
+}
+
+# return indexes: 0 - age; 1 - basic; 2 - fail
+# make sure to update if fields added in smartctl_data()
+sub smartctl_fields {
+ eval $start if $b_log;
+ my $data = [
+ [ # age
+ ['smart-gsense-error-rate-ar','g-sense error rate'],
+ ['smart-media-wearout-a','media wearout'],
+ ['smart-media-wearout-t','threshold'],
+ ['smart-media-wearout-f','alert'],
+ ['smart-multizone-errors-av','write error rate'],
+ ['smart-multizone-errors-t','threshold'],
+ ['smart-udma-crc-errors-ar','UDMA CRC errors'],
+ ['smart-udma-crc-errors-f','alert'],
+ ],
+ [ # basic
+ ['smart','SMART'],
+ ['smart-error','SMART Message'],
+ ['smart-support','state'],
+ ['smart-status','health'],
+ ['smart-power-on-hours','on'],
+ ['smart-cycles','cycles'],
+ ['smart-units-read','read-units'],
+ ['smart-units-written','written-units'],
+ ['smart-read','read'],
+ ['smart-written','written'],
+ ],
+ [ # fail
+ ['smart-end-to-end-av','end-to-end'],
+ ['smart-end-to-end-t','threshold'],
+ ['smart-end-to-end-f','alert'],
+ ['smart-raw-read-error-rate-av','read error rate'],
+ ['smart-raw-read-error-rate-t','threshold'],
+ ['smart-raw-read-error-rate-f','alert'],
+ ['smart-reallocated-sectors-av','reallocated sector'],
+ ['smart-reallocated-sectors-t','threshold'],
+ ['smart-reallocated-sectors-f','alert'],
+ ['smart-retired-blocks-av','retired block'],
+ ['smart-retired-blocks-t','threshold'],
+ ['smart-retired-blocks-f','alert'],
+ ['smart-runtime-bad-block-av','runtime bad block'],
+ ['smart-runtime-bad-block-t','threshold'],
+ ['smart-runtime-bad-block-f','alert'],
+ ['smart-seek-error-rate-av', 'seek error rate'],
+ ['smart-seek-error-rate-t', 'threshold'],
+ ['smart-seek-error-rate-f', 'alert'],
+ ['smart-spinup-time-av','spin-up time'],
+ ['smart-spinup-time-t','threshold'],
+ ['smart-spinup-time-f','alert'],
+ ['smart-ssd-life-left-av','life left'],
+ ['smart-ssd-life-left-t','threshold'],
+ ['smart-ssd-life-left-f','alert'],
+ ['smart-unused-reserve-block-av','unused reserve block'],
+ ['smart-unused-reserve-block-t','threshold'],
+ ['smart-unused-reserve-block-f','alert'],
+ ['smart-used-reserve-block-av','used reserve block'],
+ ['smart-used-reserve-block-t','threshold'],
+ ['smart-used-reserve-block-f','alert'],
+ ['smart-unknown-1-a','attribute'],
+ ['smart-unknown-1-v','value'],
+ ['smart-unknown-1-w','worst'],
+ ['smart-unknown-1-t','threshold'],
+ ['smart-unknown-1-f','alert'],
+ ['smart-unknown-2-a','attribute'],
+ ['smart-unknown-2-v','value'],
+ ['smart-unknown-2-w','worst'],
+ ['smart-unknown-2-t','threshold'],
+ ['smart-unknown-2-f','alert'],
+ ['smart-unknown-3-a','attribute'],
+ ['smart-unknown-3-v','value'],
+ ['smart-unknown-3-w','worst'],
+ ['smart-unknown-3-t','threshold'],
+ ['smart-unknown-4-f','alert'],
+ ['smart-unknown-4-a','attribute'],
+ ['smart-unknown-4-v','value'],
+ ['smart-unknown-4-w','worst'],
+ ['smart-unknown-4-t','threshold'],
+ ['smart-unknown-4-f','alert'],
+ ['smart-unknown-5-f','alert'],
+ ['smart-unknown-5-a','attribute'],
+ ['smart-unknown-5-v','value'],
+ ['smart-unknown-5-w','worst'],
+ ['smart-unknown-5-t','threshold'],
+ ['smart-unknown-5-f','alert'],
+ ]
+ ];
+ eval $end if $b_log;
+ return $data;
}
sub smartctl_data {
eval $start if $b_log;
- my (@data) = @_;
+ my ($data) = @_;
my ($b_attributes,$b_intel,$b_kingston,$cmd,%holder,$id,@working,@result,@split);
- my ($splitter,$num,$a,$f,$r,$t,$v,$w,$y) = (':\s*',0,0,8,1,5,3,4,6); # $y is type, $t threashold, etc
- my $smartctl = main::check_program('smartctl');
- for (my $i = 0; $i < scalar @data; $i++){
- next if !$data[$i]{'id'};
+ my ($splitter,$num,$a,$f,$r,$t,$v,$w,$y) = (':\s*',0,0,8,1,5,3,4,6); # $y is type, $t threshold, etc
+ for (my $i = 0; $i < scalar @$data; $i++){
+ next if !$data->[$i]{'id'};
($b_attributes,$b_intel,$b_kingston,$splitter,$num,$a,$r) = (0,0,0,':\s*',0,0,1);
%holder = ();
- #print $data[$i]{'id'},"\n";
+ # print $data->[$i]{'id'},"\n";
# m2 nvme failed on nvme0n1 drive id:
- $id = $data[$i]{'id'};
+ $id = $data->[$i]{'id'};
$id =~ s/n[0-9]+$// if $id =~ /^nvme/;
- $cmd = "$smartctl -AHi /dev/" . $id . ' 2>/dev/null';
- @result = main::grabber("$cmd", '', 'strip');
+ # openbsd needs the 'c' partition, which is the entire disk
+ $id .= 'c' if $bsd_type && $bsd_type eq 'openbsd';
+ $cmd = $alerts{'smartctl'}->{'path'} . " -AHi /dev/" . $id . ' 2>/dev/null';
+ @result = main::grabber($cmd, '', 'strip');
main::log_data('dump','@result', \@result) if $b_log; # log before cleanup
@result = grep {!/^(smartctl|Copyright|==)/} @result;
- print 'Drive:/dev/' . $id . ":\n", Data::Dumper::Dumper\@result if $test[12];
- if (scalar @result < 4 ){
+ print 'Drive:/dev/' . $id . ":\n", Data::Dumper::Dumper\@result if $dbg[12];
+ if (scalar @result < 5){
if (grep {/failed: permission denied/i} @result){
- $data[$i]{'smart-permissions'} = main::row_defaults('smartctl-root');
+ $data->[$i]{'smart-permissions'} = main::message('tool-permissions','smartctl');
}
elsif (grep {/unknown usb bridge/i} @result){
- $data[$i]{'smart-error'} = main::row_defaults('smartctl-usb');
+ $data->[$i]{'smart-error'} = main::message('smartctl-usb');
}
+ # can come later in output too
elsif (grep {/A mandatory SMART command failed/i} @result){
- $data[$i]{'smart-error'} = main::row_defaults('smartctl-command-failed');
+ $data->[$i]{'smart-error'} = main::message('smartctl-command');
+ }
+ elsif (grep {/open device.*Operation not supported by device/i} @result){
+ $data->[$i]{'smart-error'} = main::message('smartctl-open');
}
else {
- $data[$i]{'smart-error'} = main::row_defaults('smartctl-unknown');
+ $data->[$i]{'smart-error'} = main::message('tool-unknown-error','smartctl');
}
next;
}
@@ -9225,7 +13389,7 @@ sub smartctl_data {
$r = 9;
next;
}
- @split = split /$splitter/, $row;
+ @split = split(/$splitter/, $row);
next if !$b_attributes && ! defined $split[$r];
# some cases where drive not in db threshhold will be: ---
# value is usually 0 padded which confuses perl. However this will
@@ -9234,81 +13398,103 @@ sub smartctl_data {
$split[$t] = (main::is_numeric($split[$t])) ? int($split[$t]) : 0;
$split[$v] = (main::is_numeric($split[$v])) ? int($split[$v]) : 0;
}
+ # can occur later in output so retest it here
+ if ($split[$a] =~ /A mandatory SMART command failed/i){
+ $data->[$i]{'smart-error'} = main::message('smartctl-command');
+ }
## DEVICE INFO ##
if ($split[$a] eq 'Device Model'){
$b_intel = 1 if $split[$r] =~/\bintel\b/i;
$b_kingston = 1 if $split[$r] =~/kingston/i;
- # usb/firewire/thunderbolt
- if ($data[$i]{'type'}){
- @working = device_vendor("$split[$r]");
- $data[$i]{'drive-model'} = $working[1] if $data[$i]{'model'} && $data[$i]{'model'} ne $working[1];
- $data[$i]{'drive-vendor'} = $working[0] if $data[$i]{'vendor'} && $data[$i]{'vendor'} ne $working[0];
+ # usb/firewire/thunderbolt enclosure id method
+ if ($data->[$i]{'type'}){
+ my $result = disk_vendor("$split[$r]");
+ if ($data->[$i]{'model'} && $data->[$i]{'model'} ne $result->[1]){
+ $data->[$i]{'drive-model'} = $result->[1];
+ }
+ if ($data->[$i]{'vendor'} && $data->[$i]{'vendor'} ne $result->[0]){
+ $data->[$i]{'drive-vendor'} = $result->[0];
+ }
+ }
+ # fallback for very corner cases where primary model id failed
+ if (!$data->[$i]{'model'} && $split[$r]){
+ my $result = disk_vendor("$split[$r]");
+ $data->[$i]{'model'} = $result->[1] if $result->[1];
+ $data->[$i]{'vendor'} = $result->[0] if $result->[0] && !$data->[$i]{'vendor'};
}
}
elsif ($split[$a] eq 'Model Family'){
- @working = device_vendor("$split[$r]");
- $data[$i]{'family'} = $working[1];
- # $data[$i]{'family'} =~ s/$data[$i]{'vendor'}\s*// if $data[$i]{'vendor'};
+ my $result = disk_vendor("$split[$r]");
+ $data->[$i]{'family'} = $result->[1] if $result->[1];
+ # $data->[$i]{'family'} =~ s/$data->[$i]{'vendor'}\s*// if $data->[$i]{'vendor'};
}
elsif ($split[$a] eq 'Firmware Version'){
# 01.01A01 vs 1A01
- if ($data[$i]{'firmware'} && $split[$r] !~ /$data[$i]{'firmware'}/){
- $data[$i]{'drive-firmware'} = $split[$r];
+ if ($data->[$i]{'firmware'} && $split[$r] !~ /$data->[$i]{'firmware'}/){
+ $data->[$i]{'drive-firmware'} = $split[$r];
}
- elsif (!$data[$i]{'firmware'}){
- $data[$i]{'firmware'} = $split[$r];
+ elsif (!$data->[$i]{'firmware'}){
+ $data->[$i]{'firmware'} = $split[$r];
}
}
elsif ($split[$a] eq 'Rotation Rate'){
- $data[$i]{'rotation'} = $split[$r] if $split[$r] !~ /^Solid/;
+ if ($split[$r] !~ /^Solid/){
+ $data->[$i]{'rotation'} = $split[$r];
+ $data->[$i]{'rotation'} =~ s/\s*rpm$//i;
+ $data->[$i]{'tech'} = 'HDD';
+ }
+ else {
+ $data->[$i]{'tech'} = 'SSD';
+ }
}
elsif ($split[$a] eq 'Serial Number'){
- if ( !$data[$i]{'serial'}){
- $data[$i]{'serial'} = $split[$r];
+ if (!$data->[$i]{'serial'}){
+ $data->[$i]{'serial'} = $split[$r];
}
- elsif ($data[$i]{'type'} && $split[$r] ne $data[$i]{'serial'}){
- $data[$i]{'drive-serial'} = $split[$r];
+ elsif ($data->[$i]{'type'} && $split[$r] ne $data->[$i]{'serial'}){
+ $data->[$i]{'drive-serial'} = $split[$r];
}
}
elsif ($split[$a] eq 'SATA Version is'){
- if ( $split[$r] =~ /SATA ([0-9.]+), ([0-9.]+ [^\s]+)( \(current: ([1-9.]+ [^\s]+)\))?/){
- $data[$i]{'sata'} = $1;
- $data[$i]{'speed'} = $2 if !$data[$i]{'speed'};
+ if ($split[$r] =~ /SATA ([0-9.]+), ([0-9.]+ [^\s]+)(\(current: ([1-9.]+ [^\s]+)\))?/){
+ $data->[$i]{'sata'} = $1;
+ $data->[$i]{'speed'} = $2 if !$data->[$i]{'speed'};
}
}
- elsif ($split[$a] eq 'Sector Sizes'){
- if( $data[$i]{'type'} || !$data[$i]{'block-logical'} || !$data[$i]{'block-physical'} ){
- if ($split[$r] =~ m|^([0-9]+) bytes logical/physical| ){
- $data[$i]{'block-logical'} = $1;
- $data[$i]{'block-physical'} = $1;
+ # seen both Size and Sizes. Linux will usually have both, BSDs not physical
+ elsif ($split[$a] =~ /^Sector Sizes?$/){
+ if ($data->[$i]{'type'} || !$data->[$i]{'block-logical'} || !$data->[$i]{'block-physical'}){
+ if ($split[$r] =~ m|^([0-9]+) bytes logical/physical|){
+ $data->[$i]{'block-logical'} = $1;
+ $data->[$i]{'block-physical'} = $1;
}
# 512 bytes logical, 4096 bytes physical
elsif ($split[$r] =~ m|^([0-9]+) bytes logical, ([0-9]+) bytes physical|){
- $data[$i]{'block-logical'} = $1;
- $data[$i]{'block-physical'} = $2;
+ $data->[$i]{'block-logical'} = $1;
+ $data->[$i]{'block-physical'} = $2;
}
}
}
## SMART STATUS/HEALTH ##
elsif ($split[$a] eq 'SMART support is'){
if ($split[$r] =~ /^(Available|Unavailable) /){
- $data[$i]{'smart'} = $1;
- $data[$i]{'smart'} = ($data[$i]{'smart'} eq 'Unavailable') ? 'no' : 'yes';
+ $data->[$i]{'smart'} = $1;
+ $data->[$i]{'smart'} = ($data->[$i]{'smart'} eq 'Unavailable') ? 'no' : 'yes';
}
- elsif ($split[$r] =~ /^(Enabled|Disabled)/ ){
- $data[$i]{'smart-support'} = lc($1);
+ elsif ($split[$r] =~ /^(Enabled|Disabled)/){
+ $data->[$i]{'smart-support'} = lc($1);
}
}
- elsif ($split[$a] eq 'SMART overall-health self-assessment test result' ){
- $data[$i]{'smart-status'} = $split[$r];
+ elsif ($split[$a] eq 'SMART overall-health self-assessment test result'){
+ $data->[$i]{'smart-status'} = $split[$r];
# seen nvme that only report smart health, not smart support
- $data[$i]{'smart'} = 'yes' if !$data[$i]{'smart'};
+ $data->[$i]{'smart'} = 'yes' if !$data->[$i]{'smart'};
}
## DEVICE CONDITION: temp/read/write/power on/cycles ##
# Attributes data fields, sometimes are same syntax as info block:...
- elsif ( $split[$a] eq 'Power_Cycle_Count' || $split[$a] eq 'Power Cycles' ){
- $data[$i]{'smart-cycles'} = $split[$r] if $split[$r];
+ elsif ($split[$a] eq 'Power_Cycle_Count' || $split[$a] eq 'Power Cycles'){
+ $data->[$i]{'smart-cycles'} = $split[$r] if $split[$r];
}
elsif ($split[$a] eq 'Power_On_Hours' || $split[$a] eq 'Power On Hours' ||
$split[$a] eq 'Power_On_Hours_and_Msec'){
@@ -9319,48 +13505,48 @@ sub smartctl_data {
# $split[$r] = 43;
if ($split[$r] =~ /^([0-9]+)$/){
if ($1 > 9000){
- $data[$i]{'smart-power-on-hours'} = int($1/(24*365)) . 'y ' . int($1/24)%365 . 'd ' . $1%24 . 'h';
+ $data->[$i]{'smart-power-on-hours'} = int($1/(24*365)) . 'y ' . int($1/24)%365 . 'd ' . $1%24 . 'h';
}
elsif ($1 > 100){
- $data[$i]{'smart-power-on-hours'} = int($1/24) . 'd ' . $1%24 . 'h';
+ $data->[$i]{'smart-power-on-hours'} = int($1/24) . 'd ' . $1%24 . 'h';
}
else {
- $data[$i]{'smart-power-on-hours'} = $split[$r] . ' hrs';
+ $data->[$i]{'smart-power-on-hours'} = $split[$r] . ' hrs';
}
}
else {
- $data[$i]{'smart-power-on-hours'} = $split[$r];
+ $data->[$i]{'smart-power-on-hours'} = $split[$r];
}
}
}
# 'Airflow_Temperature_Cel' like: 29 (Min/Max 14/43) so can't use -1 index
# Temperature like 29 Celsisu
- elsif ( $split[$a] eq 'Temperature_Celsius' || $split[$a] eq 'Temperature' ||
- $split[$a] eq 'Airflow_Temperature_Cel' ) {
- if (!$data[$i]{'temp'} && $split[$r]){
- $data[$i]{'temp'} = $split[$r];
+ elsif ($split[$a] eq 'Temperature_Celsius' || $split[$a] eq 'Temperature' ||
+ $split[$a] eq 'Airflow_Temperature_Cel'){
+ if (!$data->[$i]{'temp'} && $split[$r]){
+ $data->[$i]{'temp'} = $split[$r];
}
}
## DEVICE USE: Reads/Writes ##
elsif ($split[$a] eq 'Data Units Read'){
- $data[$i]{'smart-units-read'} = $split[$r];
+ $data->[$i]{'smart-units-read'} = $split[$r];
}
elsif ($split[$a] eq 'Data Units Written'){
- $data[$i]{'smart-units-written'} = $split[$r];
+ $data->[$i]{'smart-units-written'} = $split[$r];
}
elsif ($split[$a] eq 'Host_Reads_32MiB'){
$split[$r] = $split[$r] * 32 * 1024;
- $data[$i]{'smart-read'} = join ' ', main::get_size($split[$r]);
+ $data->[$i]{'smart-read'} = main::get_size($split[$r],'string');
}
elsif ($split[$a] eq 'Host_Writes_32MiB'){
$split[$r] = $split[$r] * 32 * 1024;
- $data[$i]{'smart-written'} = join ' ', main::get_size($split[$r]);
+ $data->[$i]{'smart-written'} = main::get_size($split[$r],'string');
}
elsif ($split[$a] eq 'Lifetime_Reads_GiB'){
- $data[$i]{'smart-read'} = $split[$r] . ' GiB';
+ $data->[$i]{'smart-read'} = $split[$r] . ' GiB';
}
elsif ($split[$a] eq 'Lifetime_Writes_GiB'){
- $data[$i]{'smart-written'} = $split[$r] . ' GiB';
+ $data->[$i]{'smart-written'} = $split[$r] . ' GiB';
}
elsif ($split[$a] eq 'Total_LBAs_Read'){
if (main::is_numeric($split[$r])){
@@ -9373,17 +13559,20 @@ sub smartctl_data {
elsif ($b_kingston){
$split[$r] = $split[$r] * 1024 * 1024;
}
+ # rare fringe cases, cygwin run as user, block size will not be found
# this is what it's supposed to refer to
- else {
- $split[$r] = int($data[$i]{'block-logical'} * $split[$r] / 1024);
+ elsif ($data->[$i]{'block-logical'}) {
+ $split[$r] = int($data->[$i]{'block-logical'} * $split[$r] / 1024);
+ }
+ if ($b_intel || $b_kingston || $data->[$i]{'block-logical'}){
+ $data->[$i]{'smart-read'} = main::get_size($split[$r],'string');
}
- $data[$i]{'smart-read'} = join ' ', main::get_size($split[$r]);
}
}
elsif ($split[$a] eq 'Total_LBAs_Written'){
- if (main::is_numeric($split[$r])){
+ if (main::is_numeric($split[$r]) && $data->[$i]{'block-logical'}){
# blocks in bytes, so convert to KiB, the internal unit here
- # reports in 32MoB units, sigh
+ # reports in 32MiB units, sigh
if ($b_intel){
$split[$r] = $split[$r] * 32 * 1024;
}
@@ -9391,52 +13580,57 @@ sub smartctl_data {
elsif ($b_kingston){
$split[$r] = $split[$r] * 1024 * 1024;
}
+ # rare fringe cases, cygwin run as user, block size will not be found
# this is what it's supposed to refer to, in byte blocks
- else {
- $split[$r] = int($data[$i]{'block-logical'} * $split[$r] / 1024);
+ elsif ($data->[$i]{'block-logical'}) {
+ $split[$r] = int($data->[$i]{'block-logical'} * $split[$r] / 1024);
+ }
+ if ($b_intel || $b_kingston || $data->[$i]{'block-logical'}){
+ $data->[$i]{'smart-written'} = main::get_size($split[$r],'string');
}
- $data[$i]{'smart-written'} = join ' ', main::get_size($split[$r]);
}
}
-
## DEVICE OLD AGE ##
# 191 G-Sense_Error_Rate 0x0032 001 001 000 Old_age Always - 291
elsif ($split[$a] eq 'G-Sense_Error_Rate'){
- # $data[$i]{'smart-media-wearout'} = $split[$r];
+ # $data->[$i]{'smart-media-wearout'} = $split[$r];
if ($b_attributes && $split[$r] > 100){
- $data[$i]{'smart-gsense-error-rate-r'} = $split[$r];
+ $data->[$i]{'smart-gsense-error-rate-ar'} = $split[$r];
}
}
elsif ($split[$a] eq 'Media_Wearout_Indicator'){
- # $data[$i]{'smart-media-wearout'} = $split[$r];
- if ($b_attributes && $split[$r] > 0){
- $data[$i]{'smart-media-wearout-v'} = $split[$v];
- $data[$i]{'smart-media-wearout-t'} = $split[$t];
- $data[$i]{'smart-media-wearout-f'} = $split[$f] if $split[$f] ne '-';
+ # $data->[$i]{'smart-media-wearout'} = $split[$r];
+ # seen case where they used hex numbers because values
+ # were in 47 billion range in hex. You can't hand perl an unquoted
+ # hex number that is > 2^32 without tripping a perl warning
+ if ($b_attributes && $split[$r] && !main::is_hex("$split[$r]") && $split[$r] > 0){
+ $data->[$i]{'smart-media-wearout-av'} = $split[$v];
+ $data->[$i]{'smart-media-wearout-t'} = $split[$t];
+ $data->[$i]{'smart-media-wearout-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'Multi_Zone_Error_Rate'){
# note: all t values are 0 that I have seen
- if ( ($split[$v] - $split[$t]) < 50){
- $data[$i]{'smart-multizone-errors-v'} = $split[$v];
- $data[$i]{'smart-multizone-errors-t'} = $split[$v];
+ if (($split[$v] - $split[$t]) < 50){
+ $data->[$i]{'smart-multizone-errors-av'} = $split[$v];
+ $data->[$i]{'smart-multizone-errors-t'} = $split[$v];
}
}
elsif ($split[$a] eq 'UDMA_CRC_Error_Count'){
if (main::is_numeric($split[$r]) && $split[$r] > 50){
- $data[$i]{'smart-udma-crc-errors-r'} = $split[$r];
- $data[$i]{'smart-udma-crc-errors-f'} = main::row_defaults('smartctl-udma-crc') if $split[$r] > 500;
+ $data->[$i]{'smart-udma-crc-errors-ar'} = $split[$r];
+ $data->[$i]{'smart-udma-crc-errors-f'} = main::message('smartctl-udma-crc') if $split[$r] > 500;
}
}
## DEVICE PRE-FAIL ##
elsif ($split[$a] eq 'Available_Reservd_Space'){
- # $data[$i]{'smart-available-reserved-space'} = $split[$r];
+ # $data->[$i]{'smart-available-reserved-space'} = $split[$r];
if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
- $data[$i]{'smart-available-reserved-space-v'} = $split[$v];
- $data[$i]{'smart-available-reserved-space-t'} = $split[$t];
- $data[$i]{'smart-available-reserved-space-f'} = $split[$f] if $split[$f] ne '-';
+ $data->[$i]{'smart-available-reserved-space-av'} = $split[$v];
+ $data->[$i]{'smart-available-reserved-space-t'} = $split[$t];
+ $data->[$i]{'smart-available-reserved-space-f'} = $split[$f] if $split[$f] ne '-';
}
}
## nvme splits these into two field/value sets
@@ -9446,116 +13640,115 @@ sub smartctl_data {
}
elsif ($split[$a] eq 'Available Spare Threshold'){
$split[$r] =~ s/%$//;
- if ($holder{'spare'} && main::is_numeric($split[$r]) && $split[$r]/$holder{'spare'} > 0.92 ){
- $data[$i]{'smart-available-reserved-space-v'} = $holder{'spare'};
- $data[$i]{'smart-available-reserved-space-t'} = int($split[$r]);
+ if ($holder{'spare'} && main::is_numeric($split[$r]) && $split[$r]/$holder{'spare'} > 0.92){
+ $data->[$i]{'smart-available-reserved-space-ar'} = $holder{'spare'};
+ $data->[$i]{'smart-available-reserved-space-t'} = int($split[$r]);
}
}
elsif ($split[$a] eq 'End-to-End_Error'){
if ($b_attributes && int($split[$r]) > 0 && $split[$t]){
- $data[$i]{'smart-end-to-end-v'} = $split[$v];
- $data[$i]{'smart-end-to-end-t'} = $split[$t];
- $data[$i]{'smart-end-to-end-f'} = $split[$f] if $split[$f] ne '-';
+ $data->[$i]{'smart-end-to-end-av'} = $split[$v];
+ $data->[$i]{'smart-end-to-end-t'} = $split[$t];
+ $data->[$i]{'smart-end-to-end-f'} = $split[$f] if $split[$f] ne '-';
}
}
# seen raw value: 0/8415644
elsif ($split[$a] eq 'Raw_Read_Error_Rate'){
if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
- $data[$i]{'smart-raw-read-error-rate-v'} = $split[$v];
- $data[$i]{'smart-raw-read-error-rate-t'} = $split[$t];
- $data[$i]{'smart-raw-read-error-rate-f'} = $split[$f] if $split[$f] ne '-';
+ $data->[$i]{'smart-raw-read-error-rate-av'} = $split[$v];
+ $data->[$i]{'smart-raw-read-error-rate-t'} = $split[$t];
+ $data->[$i]{'smart-raw-read-error-rate-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'Reallocated_Sector_Ct'){
if ($b_attributes && int($split[$r]) > 0 && $split[$t]){
- $data[$i]{'smart-reallocated-sectors-v'} = $split[$v];
- $data[$i]{'smart-reallocated-sectors-t'} = $split[$t];
- $data[$i]{'smart-reallocated-sectors-f'} = $split[$f] if $split[$f] ne '-';
+ $data->[$i]{'smart-reallocated-sectors-av'} = $split[$v];
+ $data->[$i]{'smart-reallocated-sectors-t'} = $split[$t];
+ $data->[$i]{'smart-reallocated-sectors-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'Retired_Block_Count'){
if ($b_attributes && int($split[$r]) > 0 && $split[$t]){
- $data[$i]{'smart-retired-blocks-v'} = $split[$v];
- $data[$i]{'smart-retired-blocks-t'} = $split[$t];
- $data[$i]{'smart-retired-blocks-f'} = $split[$f] if $split[$f] ne '-';
+ $data->[$i]{'smart-retired-blocks-av'} = $split[$v];
+ $data->[$i]{'smart-retired-blocks-t'} = $split[$t];
+ $data->[$i]{'smart-retired-blocks-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'Runtime_Bad_Block'){
- if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
- $data[$i]{'smart-runtime-bad-block-v'} = $split[$v];
- $data[$i]{'smart-runtime-bad-block-t'} = $split[$t];
- $data[$i]{'smart-runtime-bad-block-f'} = $split[$f] if $split[$f] ne '-';
+ if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
+ $data->[$i]{'smart-runtime-bad-block-av'} = $split[$v];
+ $data->[$i]{'smart-runtime-bad-block-t'} = $split[$t];
+ $data->[$i]{'smart-runtime-bad-block-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'Seek_Error_Rate'){
# value 72; threshold either 000 or 30
- if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
- $data[$i]{'smart-seek-error-rate-v'} = $split[$v];
- $data[$i]{'smart-seek-error-rate-t'} = $split[$t];
- $data[$i]{'smart-seek-error-rate-f'} = $split[$f] if $split[$f] ne '-';
+ if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
+ $data->[$i]{'smart-seek-error-rate-av'} = $split[$v];
+ $data->[$i]{'smart-seek-error-rate-t'} = $split[$t];
+ $data->[$i]{'smart-seek-error-rate-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'Spin_Up_Time'){
# raw will always be > 0 on spinning disks
- if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
- $data[$i]{'smart-spinup-time-v'} = $split[$v];
- $data[$i]{'smart-spinup-time-t'} = $split[$t];
- $data[$i]{'smart-spinup-time-f'} = $split[$f] if $split[$f] ne '-';
+ if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
+ $data->[$i]{'smart-spinup-time-av'} = $split[$v];
+ $data->[$i]{'smart-spinup-time-t'} = $split[$t];
+ $data->[$i]{'smart-spinup-time-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'SSD_Life_Left'){
# raw will always be > 0 on spinning disks
- if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
- $data[$i]{'smart-ssd-life-left-v'} = $split[$v];
- $data[$i]{'smart-ssd-life-left-t'} = $split[$t];
- $data[$i]{'smart-ssd-life-left-f'} = $split[$f] if $split[$f] ne '-';
+ if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
+ $data->[$i]{'smart-ssd-life-left-av'} = $split[$v];
+ $data->[$i]{'smart-ssd-life-left-t'} = $split[$t];
+ $data->[$i]{'smart-ssd-life-left-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'Unused_Rsvd_Blk_Cnt_Tot'){
# raw will always be > 0 on spinning disks
- if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
- $data[$i]{'smart-unused-reserve-block-v'} = $split[$v];
- $data[$i]{'smart-unused-reserve-block-t'} = $split[$t];
- $data[$i]{'smart-unused-reserve-block-f'} = $split[$f] if $split[$f] ne '-';
+ if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
+ $data->[$i]{'smart-unused-reserve-block-av'} = $split[$v];
+ $data->[$i]{'smart-unused-reserve-block-t'} = $split[$t];
+ $data->[$i]{'smart-unused-reserve-block-f'} = $split[$f] if $split[$f] ne '-';
}
}
elsif ($split[$a] eq 'Used_Rsvd_Blk_Cnt_Tot'){
# raw will always be > 0 on spinning disks
- if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
- $data[$i]{'smart-used-reserve-block-v'} = $split[$v];
- $data[$i]{'smart-used-reserve-block-t'} = $split[$t];
- $data[$i]{'smart-used-reserve-block-f'} = $split[$f] if $split[$f] ne '-';
+ if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
+ $data->[$i]{'smart-used-reserve-block-av'} = $split[$v];
+ $data->[$i]{'smart-used-reserve-block-t'} = $split[$t];
+ $data->[$i]{'smart-used-reserve-block-f'} = $split[$f] if $split[$f] ne '-';
}
}
- elsif ($b_attributes ){
- if ( $split[$y] eq 'Pre-fail' && ($split[$f] ne '-' ||
- ($split[$t] && $split[$v] && $split[$t]/$split[$v] > 0.92 ))) {
+ elsif ($b_attributes){
+ if ($split[$y] eq 'Pre-fail' && ($split[$f] ne '-' ||
+ ($split[$t] && $split[$v] && $split[$t]/$split[$v] > 0.92))){
$num++;
- $data[$i]{'smart-unknown-' . $num . '-a'} = $split[$a];
- $data[$i]{'smart-unknown-' . $num . '-v'} = $split[$v];
- $data[$i]{'smart-unknown-' . $num . '-w'} = $split[$v];
- $data[$i]{'smart-unknown-' . $num . '-t'} = $split[$t];
- $data[$i]{'smart-unknown-' . $num . '-f'} = $split[$f] if $split[$f] ne '-';
+ $data->[$i]{'smart-unknown-' . $num . '-a'} = $split[$a];
+ $data->[$i]{'smart-unknown-' . $num . '-v'} = $split[$v];
+ $data->[$i]{'smart-unknown-' . $num . '-w'} = $split[$v];
+ $data->[$i]{'smart-unknown-' . $num . '-t'} = $split[$t];
+ $data->[$i]{'smart-unknown-' . $num . '-f'} = $split[$f] if $split[$f] ne '-';
}
}
}
}
}
- #print Data::Dumper::Dumper\@data;
+ print Data::Dumper::Dumper $data if $dbg[19];
eval $end if $b_log;
- return @data;
}
-# check for usb/firewire/[and thunderwire when data found]
+# check for usb/firewire/[and thunderbolt when data found]
sub peripheral_data {
eval $start if $b_log;
my ($id) = @_;
my ($type) = ('');
# print "$id here\n";
if (@by_id){
- foreach (@by_id) {
+ foreach (@by_id){
if ("/dev/$id" eq Cwd::abs_path($_)){
- #print "$id here\n";
+ # print "$id here\n";
if (/usb-/i){
$type = 'USB';
}
@@ -9568,7 +13761,7 @@ sub peripheral_data {
}
# note: sometimes with wwn- numbering usb does not appear in by-id but it does in by-path
if (!$type && @by_path){
- foreach (@by_path) {
+ foreach (@by_path){
if ("/dev/$id" eq Cwd::abs_path($_)){
if (/usb-/i){
$type = 'USB';
@@ -9583,32 +13776,34 @@ sub peripheral_data {
eval $end if $b_log;
return $type;
}
-sub advanced_disk_data {
+
+sub disk_data_advanced {
eval $start if $b_log;
my ($set_cmd,$id) = @_;
- my ($cmd,$pt,$program,@data,@return);
+ my ($cmd,$pt,$program,@data);
+ my $advanced = [];
if ($set_cmd ne 'unset'){
- $return[0] = $set_cmd;
+ $advanced->[0] = $set_cmd;
}
else {
# runs as user, but is SLOW: udisksctl info -b /dev/sda
# line: org.freedesktop.UDisks2.PartitionTable:
# Type: dos
if ($program = main::check_program('udevadm')){
- $return[0] = "$program info -q property -n ";
+ $advanced->[0] = "$program info -q property -n ";
}
- elsif ($b_root && -e "/lib/udev/udisks-part-id") {
- $return[0] = "/lib/udev/udisks-part-id /dev/";
+ elsif ($b_root && -e "/lib/udev/udisks-part-id"){
+ $advanced->[0] = "/lib/udev/udisks-part-id /dev/";
}
- elsif ($b_root && ($program = main::check_program('fdisk'))) {
- $return[0] = "$program -l /dev/";
+ elsif ($b_root && ($program = main::check_program('fdisk'))){
+ $advanced->[0] = "$program -l /dev/";
}
- if (!$return[0]) {
- $return[0] = 'na'
+ if (!$advanced->[0]){
+ $advanced->[0] = 'na'
}
}
- if ($return[0] ne 'na'){
- $cmd = "$return[0]$id 2>&1";
+ if ($advanced->[0] ne 'na'){
+ $cmd = "$advanced->[0]$id 2>&1";
main::log_data('cmd',$cmd) if $b_log;
@data = main::grabber($cmd);
# for pre ~ 2.30 fdisk did not show gpt, but did show gpt scheme error, so
@@ -9616,39 +13811,40 @@ sub advanced_disk_data {
if ($cmd =~ /fdisk/){
foreach (@data){
if (/^WARNING:\s+GPT/){
- $return[1] = 'gpt';
+ $advanced->[1] = 'gpt';
last;
}
elsif (/^Disklabel\stype:\s*(.+)/i){
- $return[1] = $1;
+ $advanced->[1] = $1;
last;
}
}
- $return[1] = 'dos' if !$return[1];
+ $advanced->[1] = 'dos' if !$advanced->[1];
}
else {
foreach (@data){
- if ( /^(UDISKS_PARTITION_TABLE_SCHEME|ID_PART_TABLE_TYPE)/ ){
- my @working = split /=/, $_;
- $return[1] = $working[1];
+ if (/^(UDISKS_PARTITION_TABLE_SCHEME|ID_PART_TABLE_TYPE)/){
+ my @working = split('=', $_);
+ $advanced->[1] = $working[1];
}
elsif (/^ID_ATA_ROTATION_RATE_RPM/){
- my @working = split /=/, $_;
- $return[2] = $working[1];
+ my @working = split('=', $_);
+ $advanced->[2] = $working[1];
}
- last if $return[1] && $return[2];
+ last if defined $advanced->[1] && defined $advanced->[2];
}
}
- $return[1] = 'mbr' if $return[1] && lc($return[1]) eq 'dos';
+ $advanced->[1] = 'mbr' if $advanced->[1] && lc($advanced->[1]) eq 'dos';
}
eval $end if $b_log;
- return @return;
+ return $advanced;
}
+
sub scsi_data {
eval $start if $b_log;
my ($file) = @_;
my @temp = main::reader($file);
- my (@scsi);
+ my $scsi = [];
my ($firmware,$model,$vendor) = ('','','');
foreach (@temp){
if (/Vendor:\s*(.*)\s+Model:\s*(.*)\s+Rev:\s*(.*)/i){
@@ -9658,365 +13854,682 @@ sub scsi_data {
}
if (/Type:/i){
if (/Type:\s*Direct-Access/i){
- my @working = ({
+ push(@$scsi, {
'vendor' => $vendor,
'model' => $model,
'firmware' => $firmware,
});
- @scsi = (@scsi,@working);
}
else {
($firmware,$model,$vendor) = ('','','');
}
}
}
- main::log_data('dump','@scsi', \@scsi) if $b_log;
+ main::log_data('dump','@$scsi', $scsi) if $b_log;
eval $end if $b_log;
- return @scsi;
+ return $scsi;
}
+
# @b_id has already been cleaned of partitions, wwn-, nvme-eui
sub disk_data_by_id {
eval $start if $b_log;
my ($device) = @_;
my ($model,$serial,$vendor) = ('','','');
- my (@disk_data);
+ my $disk_data = [];
foreach (@by_id){
if ($device eq Cwd::abs_path($_)){
- my @data = split /_/, $_;
- my @device_data = ();
+ my @data = split('_', $_);
last if scalar @data < 2; # scsi-3600508e000000000876995df43efa500
$serial = pop @data if @data;
# usb-PNY_USB_3.0_FD_3715202280-0:0
$serial =~ s/-[0-9]+:[0-9]+$//;
- $model = join ' ', @data;
+ $model = join(' ', @data);
# get rid of the ata-|nvme-|mmc- etc
$model =~ s/^\/dev\/disk\/by-id\/([^-]+-)?//;
- $model = main::disk_cleaner($model);
- @device_data = device_vendor($model,$serial);
- $vendor = $device_data[0] if $device_data[0];
- $model = $device_data[1] if $device_data[1];
+ $model = main::clean_disk($model);
+ my $result = disk_vendor($model,$serial);
+ $vendor = $result->[0] if $result->[0];
+ $model = $result->[1] if $result->[1];
# print $device, '::', Cwd::abs_path($_),'::', $model, '::', $vendor, '::', $serial, "\n";
- (@disk_data) = ($model,$vendor,$serial);
+ @$disk_data = ($model,$vendor,$serial);
last;
}
}
eval $end if $b_log;
- return @disk_data;
+ return $disk_data;
}
+
+## START DISK VENDOR BLOCK ##
# 0 - match pattern; 1 - replace pattern; 2 - vendor print; 3 - serial pattern
-sub set_vendors {
- eval $start if $b_log;
- @vendors = (
- ## These go first because they are the most likely and common ##
- ['(Crucial|^(FC)?CT|-CT|^M4\b|Gizmo!)','Crucial','Crucial',''],
- ['^(INTEL|SSD(PAM|SA2))','^INTEL','Intel',''],
- # note: S[AV][1-9][0-9] can trigger false positives
- ['(KINGSTON|DataTraveler|DT\s?(DUO|Microduo|101)|^SMS|^SHS|^SS0|^SUV|^Ultimate CF|HyperX|^S[AV][1234]00)','KINGSTON','Kingston',''], # maybe SHS: SHSS37A SKC SUV
+sub set_disk_vendors {
+ eval $start if $b_log;
+ $vendors = [
+ ## MOST LIKELY/COMMON MATCHES ##
+ ['(Crucial|^(C[34]00$|(C300-)?CTF|(FC)?CT|DDAC|M4(\b|SSD))|-CT|Gizmo!)','Crucial','Crucial',''],
+ # H10 HBRPEKNX0202A NVMe INTEL 512GB
+ ['(\bINTEL\b|^(SSD(PAM|SA2)|HBR|(MEM|SSD)PEB?K|SSD(MCE|S[AC])))','\bINTEL\b','Intel',''],
+ ['^(Intel[\s_-]?)?SRCSAS?','^Intel','Intel RAID',''],
+ # note: S[AV][1-9]\d can trigger false positives
+ ['(K(ING)?STON|^(OM8P|RBU|S[AV][1234]00|S[HMN]S|SK[CY]|SQ5|SS200|SVP|SS0|SUV|SNV|T52|T[AB]29|Ultimate CF)|V100|DataTraveler|DT\s?(DUO|Microduo|101)|HyperX|13fe\b)','(KINGSTON|13fe)','Kingston',''], # maybe SHS: SHSS37A SKC SUV
# must come before samsung MU. NOTE: toshiba can have: TOSHIBA_MK6475GSX: mush: MKNSSDCR120GB_
['(^MKN|Mushkin)','Mushkin','Mushkin',''], # MKNS
# MU = Multiple_Flash_Reader too risky: |M[UZ][^L] HD103SI HD start risky
- # HM320II HM320II
- ['(SAMSUNG|^MCG[0-9]+GC|^MCC|^MCBOE|^[GS]2 Portable|^[DG]3 Station|^DUO\b|^P3|^BGN|^BJ[NT]|^BWB|^(HM|SP)[0-9]{2}|^MZMPC|^HD[0-9]{3}[A-Z]{2}$)','SAMSUNG','Samsung',''], # maybe ^SM, ^HM
- # Android UMS Composite?
- ['(SanDisk|^SDS[S]?[DQ]|^SL([0-9]+)G|^AFGCE|^ABLCD|^SDW[1-9]|^U3\b|ULTRA\sFIT|Clip Sport|Cruzer|^Extreme)','SanDisk','SanDisk',''],
- ['^STEC\b','^STEC\b','STEC',''], # ssd drive, must come before seagate ST test
- # real, SSEAGATE Backup+; XP1600HE30002 | 024 HN (spinpoint)
- ['(^ST[^T]|[S]?SEAGATE|^X[AFP]|^5AS|^BUP|Expansion Desk|^Expansion|FreeAgent|GoFlex|Backup(\+|\s?Plus)\s?(Hub)?|OneTouch)','[S]?SEAGATE','Seagate',''],
- ['^(WD|WL[0]9]|Western Digital|My (Book|Passport)|\d*LPCX|Elements|easystore|MD0|M000|EARX|EFRX|\d*EAVS|0JD|JPVX|[0-9]+(BEV|(00)?AAK|AAV|AZL|EA[CD]S)|3200[AB]|2500[BJ]|5000[AB]|6400[AB]|7500[AB]|i HTS)','(^WDC|Western\s?Digital)','Western Digital',''],
- ## Then better known ones ##
- ['^(A-DATA|ADATA|AX[MN]|CH11|HV[1-9]|IM2)','^(A-DATA|ADATA)','A-Data',''],
- ['^ADTRON','^(ADTRON)','Adtron',''],
- ['^ASUS','^ASUS','ASUS',''],
+ # HM320II HM320II HM
+ ['(SAMSUNG|^(AWMB|[BC]DS20|[BC]WB|BJ[NT]|[BC]GND|CJ[NT]|CKT|CUT|[DG]3 Station|DUO\b|DUT|EB\dMW|E[CS]\d[A-Z]\d|FD\d[A-Z]\dGE4S5|[GS]2 Portable|GN|HD\d{3}[A-Z]{2}$|(HM|SP)\d{2}|HS\d|M[AB]G\d[FG]|MCC|MCBOE|MCG\d+GC|[CD]JN|MZ|^G[CD][1-9][QS]|P[BM]\d|(SSD\s?)?SM\s?841)|^SSD\s?[89]\d{2}\s(DCT|PRO|QVD|\d+[GT]B)|\bEVO\b|SV\d|[BE][A-Z][1-9]QT|YP\b|[CH]N-M|MMC[QR]E)','SAMSUNG','Samsung',''], # maybe ^SM, ^HM
+ # Android UMS Composite?U1
+ ['(SanDisk|0781|^(A[BCD]LC[DE]|AFGCE|D[AB]4|DX[1-9]|Extreme|Firebird|S[CD]\d{2}G|SC\d{3,4}|SD(CF|S[S]?[ADQ]|SL\d+G|SU\d|U\d|\sUltra)|SDW[1-9]|SE\d{2}|SEM\d{2}|\d[STU]|U(3\b|1\d0))|Clip Sport|Cruzer|iXpand|SN(\d+G|128|256)|SSD (Plus|U1[01]0) [1-9]|ULTRA\s(FIT|trek|II)|X[1-6]\d{2})','(SanDisk|0781)','SanDisk',''],
+ # these are HP/Sandisk cobranded. DX110064A5xnNMRI ids as HP and Sandisc
+ ['(^DX[1-9])','^(HP\b|SANDDISK)','Sandisk/HP',''], # ssd drive, must come before seagate ST test
+ # real, SSEAGATE Backup+; XP1600HE30002 | 024 HN (spinpoint) ; possible usb: 24AS
+ # ST[numbers] excludes other ST starting devices
+ ['([S]?SEAGATE|^((Barra|Fire)Cuda|BUP|EM\d{3}|Expansion|(ATA\s|HDD\s)?ST\d{2}|5AS|X[AFP])|Backup(\+|\s?Plus)\s?(Hub)?|DS2\d|Expansion Desk|FreeAgent|GoFlex|INIC|IronWolf|OneTouch|Slim\s?BK)','[S]?SEAGATE','Seagate',''],
+ ['^(WD|WL[0]9]|Western Digital|My (Book|Passport)|\d*LPCX|Elements|easystore|EA[A-Z]S|EARX|EFRX|EZRX|\d*EAVS|G[\s-]Drive|i HTS|0JD|JP[CV]|MD0|M000|\d+(BEV|(00)?AAK|AAV|AZL|EA[CD]S)|PC\sSN|SN530|SPZX|3200[AB]|2500[BJ]|20G2|5000[AB]|6400[AB]|7500[AB]|00[ABL][A-Z]{2}|SSC\b)','(^WDC|Western\s?Digital)','Western Digital',''],
+ # rare cases WDC is in middle of string
+ ['(\bWDC\b|1002FAEX)','','Western Digital',''],
+
+ ## THEN BETTER KNOWN ONES ##
+ ['^(AccelStor|GS\d{3,})','^AccelStor','AccelStor',''],
+ ['^Acer','^Acer','Acer',''],
+ # A-Data can be in middle of string
+ ['^(.*\bA-?DATA|ASP\d|AX[MN]|CH11|FX63|HV[1-9]|IM2|HD[1-9]|HDD\s?CH|IUM|SX\d|Swordfish)','A-?DATA','A-Data',''],
+ ['^(ASUS|ROG)','^ASUS','ASUS',''], # ROG ESD-S1C
# ATCS05 can be hitachi travelstar but not sure
- ['^ATP','^ATP[\s-]','ATP',''],
+ ['^ATP','^ATP\b','ATP',''],
+ ['^(BlueRay|SSD\d+GM)','^BlueRay','BlueRay',''],
# Force MP500
- ['^(Corsair|Force\s|(Flash\s*)?(Survivor|Voyager))','^Corsair','Corsair',''],
- ['^(FUJITSU|MJA|MH[TVWYZ][0-9]|MP|MAP[0-9])','^FUJITSU','Fujitsu',''],
+ ['^(Corsair|Force\s|(Flash\s*)?(Survivor|Voyager)|Neutron|Padlock)','^Corsair','Corsair',''],
+ ['^(FUJITSU|MJA|MH[RTVWYZ]\d|MP|MAP\d|F\d00s?-)','^FUJITSU','Fujitsu',''],
+ # MAB3045SP shows as HP or Fujitsu, probably HP branded fujitsu
+ ['^(MAB\d)','^(HP\b|FUJITSU)','Fujitsu/HP',''],
# note: 2012: wdc bought hgst
- ['^(HGST|Touro|54[15]0|7250)','^HGST','HGST (Hitachi)',''], # HGST HUA
- ['^(Hitachi|HCS|HD[PST]|DK[0-9]|IC|HT|HU|HMS)','^Hitachi','Hitachi',''],
+ ['^(DKR|HGST|Touro|54[15]0|7250|HC[CT]\d)','^HGST','HGST (Hitachi)',''], # HGST HUA
+ ['^((ATA\s)?Hitachi|HCS|HD[PST]|DK\d|IC|(HDD\s)?HT|HU|HMS|HDE|0G\d|IHAT)','Hitachi','Hitachi',''],
# vb: VB0250EAVER but clashes with vbox; HP_SSD_S700_120G ;GB0500EAFYL GB starter too generic?
- # DX110064A5xnNMRI ids as HP and Sandisc, same ID, made by sandisc for hp? not sure
- ['^(HP\b|[MV]B[0-6]|G[BJ][01]|DF[FK|012]|v[0-9]{3}[bgorw]$|x[0-9]{3}[w]$)','^HP','HP',''],
- ['^(LSD|Lexar|JumpDrive|JD\s?Firefly|WorkFlow)','^Lexar','Lexar',''], # mmc-LEXAR_0xb016546c; JD Firefly;
+ ['^(HP\b|c350|DF\d|EG0\d{3}|EX9\d\d|G[BJ]\d|F[BK]|0-9]|HC[CPY]\d|MM\d{4}|[MV]B[0-6]|PSS|VO0|VK0|v\d{3}[bgorw]$|x\d{3}[w]$|XR\d{4})','^HP','HP',''],
+ ['^(Lexar|LSD|JumpDrive|JD\s?Firefly|LX\d|WorkFlow)','^Lexar','Lexar',''], # mmc-LEXAR_0xb016546c; JD Firefly;
+ # these must come before maxtor because STM
+ ['^STmagic','^STmagic','STmagic',''],
+ ['^(STMicro|SMI|CBA)','^(STMicroelectronics|SMI)','SMI (STMicroelectronics)',''],
+ # note M2 M3 is usually maxtor, but can be samsung. Can conflict with Team: TM\d{4}|
+ ['^(MAXTOR|Atlas|4R\d{2}|E0\d0L|L(250|500)|[KL]0[1-9]|Y\d{3}[A-Z]|STM\d|F\d{3}L)','^MAXTOR','Maxtor',''],
# OCZSSD2-2VTXE120G is OCZ-VERTEX2_3.5
- ['^(OCZ|APOC|D2|DEN|DEN|DRSAK|EC188|FTNC|GFGC|MANG|MMOC|NIMC|NIMR|PSIR|RALLY2|TALOS2|TMSC|TRSAK)','^OCZ[\s-]','OCZ',''],
- ['^OWC','^OWC[\s-]','OWC',''],
+ ['^(OCZ|Agility|APOC|D2|DEN|DEN|DRSAK|EC188|FTNC|GFGC|MANG|MMOC|NIMC|NIMR|PSIR|RALLY2|TALOS2|TMSC|TRSAK|VERTEX|Trion|Onyx|Vector[\s-]?15)','^OCZ[\s-]','OCZ',''],
+ ['^(OWC|Aura|Mercury[\s-]?(Electra|Extreme))','^OWC\b','OWC',''],
['^(Philips|GoGear)','^Philips','Philips',''],
['^PIONEER','^PIONEER','Pioneer',''],
- ['^(PNY|Hook\s?Attache|SSD2SC)','^PNY\s','PNY','','^PNY'],
+ ['^(PNY|Hook\s?Attache|SSD2SC|(SSD7?)?EP7|CS\d{3}|Elite\s?P)','^PNY\s','PNY','','^PNY'],
# note: get rid of: M[DGK] becasue mushkin starts with MK
- # note: seen: KXG50ZNV512G NVMe TOSHIBA 512GB | THNSN51T02DUK NVMe TOSHIBA 1024GB
- ['(^[S]?TOS|^THN|TOSHIBA|TransMemory|^M[GKQ][0-9]|KBG4)','[S]?TOSHIBA','Toshiba',''], # scsi-STOSHIBA_STOR.E_EDITION_
- ## These go last because they are short and could lead to false ID, or are unlikely ##
+ # note: seen: KXG50ZNV512G NVMe TOSHIBA 512GB | THNSN51T02DUK NVMe TOSHIBA 1024GB
+ ['(TOSHIBA|TransMemory|KBG4|^((A\s)?DT01A|M[GKQ]\d|HDW|SA\d{2}G$|(008|016|032|064|128)G[379E][0-9A]$|[S]?TOS|THN)|0930|KSG\d)','S?(TOSHIBA|0930)','Toshiba',''], # scsi-STOSHIBA_STOR.E_EDITION_
+
+ ## LAST: THEY ARE SHORT AND COULD LEAD TO FALSE ID, OR ARE UNLIKELY ##
# unknown: AL25744_12345678; ADP may be usb 2.5" adapter; udisk unknown: Z1E6FTKJ 00AAKS
# SSD2SC240G726A10 MRS020A128GTS25C EHSAJM0016GB
+ ['^2[\s-]?Power','^2[\s-]?Power','2-Power',''],
+ ['^(3ware|9650SE)','^3ware','3ware (controller)',''],
['^5ACE','^5ACE','5ACE',''], # could be seagate: ST316021 5ACE
- ['^(AbonMax|ASU[0-9])','^AbonMax','AbonMax',''],
+ ['^(Aar(vex)?|AX\d{2})','^AARVEX','AARVEX',''],
+ ['^(AbonMax|ASU\d)','^AbonMax','AbonMax',''],
+ ['^Acasis','^Acasis','Acasis (hub)',''],
+ ['^Acclamator','^Acclamator','Acclamator',''],
+ ['^(Actions|HS USB Flash|10d6)','^(Actions|10d6)','Actions',''],
+ ['^(A-?DATA|ED\d{3}|NH01|Swordfish|SU\d{3}|SX\d{3}|XM\d{2})','^A-?DATA','ADATA',''],
['^Addlink','^Addlink','Addlink',''],
+ ['^(ADplus|SuperVer\b)','^ADplus','ADplus',''],
+ ['^ADTRON','^ADTRON','Adtron',''],
+ ['^(Advantech|SQF)','^Advantech','Advantech',''],
+ ['^AEGO','^AEGO','AEGO',''],
+ ['^AFOX','^AFOX','AFOX',''],
+ ['^AFTERSHOCK','^AFTERSHOCK','AFTERSHOCK',''],
+ ['^(Agile|AGI)','^(AGI|Agile\s?Gear\s?Int[a-z]*)','AGI',''],
+ ['^Aigo','^Aigo','Aigo',''],
+ ['^AirDisk','^AirDisk','AirDisk',''],
['^Aireye','^Aireye','Aireye',''],
+ ['^Alcatel','^Alcatel','Alcatel',''],
+ ['^(Alcor(\s?Micro)?|058F)','^(Alcor(\s?Micro)?|058F)','Alcor Micro',''],
['^Alfawise','^Alfawise','Alfawise',''],
- ['^Android','^Android','Android',''],
+ ['(^ALKETRON|FireWizard)','^ALKETRON','ALKETRON',''],
['^ANACOMDA','^ANACOMDA','ANACOMDA',''],
+ ['^Android','^Android','Android',''],
+ ['^ANK','^Anker','Anker',''],
+ ['^Ant[\s_-]?Esports','^Ant[\s_-]?Esports','Ant Esports',''],
+ ['^Anucell','^Anucell','Anucell',''],
['^Apotop','^Apotop','Apotop',''],
# must come before AP|Apacer
- ['^(APPLE|iPod)','^APPLE','Apple',''],
+ ['^(APPLE|iPod|SSD\sSM\d+[CEGT])','^APPLE','Apple',''],
['^(AP|Apacer)','^Apacer','Apacer',''],
+ ['^(Apricom|SATAWire)','^Apricom','Apricom',''],
['^(A-?RAM|ARSSD)','^A-?RAM','A-RAM',''],
['^Arch','^Arch(\s*Memory)?','Arch Memory',''],
+ ['^(Asenno|AS[1-9])','^Asenno','Asenno',''],
['^Asgard','^Asgard','Asgard',''],
+ ['^ASint','^ASint','ASint',''],
+ ['^(ASL|\d+[A-Z]{1,2}\d+-ASL\b)','^ASL','ASL',''], # 99IB3321-ASL
['^(ASM|2115)','^ASM','ASMedia',''],#asm1153e
+ ['^ASolid','^ASolid','ASolid',''],
+ # ASTC (Advanced Storage Technology Consortium)
['^(AVEXIR|AVSSD)','^AVEXIR','Avexir',''],
['^Axiom','^Axiom','Axiom',''],
+ ['^(Baititon|BT\d)','^Baititon','Baititon',''],
+ ['^Bamba','^Bamba','Bamba',''],
+ ['^(Beckhoff)','^Beckhoff','Beckhoff',''],
['^Bell\b','^Bell','Packard Bell',''],
['^(BelovedkaiAE|GhostPen)','^BelovedkaiAE','BelovedkaiAE',''],
- ['^BHT','^BHT','BHT',''],
+ ['^BHM\b','^BHM','BHM',''],
+ ['^(BHT|WR20)','^BHT','BHT',''],
+ ['^(Big\s?Reservoir|B[RG][_\s-])','^Big\s?Reservoir','Big Reservoir',''],
['^BIOSTAR','^BIOSTAR','Biostar',''],
['^BIWIN','^BIWIN','BIWIN',''],
['^Blackpcs','^Blackpcs','Blackpcs',''],
+ ['^(BlitzWolf|BW-?PSSD)','^BlitzWolf','BlitzWolf',''],
+ ['^(BlueRay|SDM\d)','^BlueRay','BlueRay',''],
+ ['^Bory','^Bory','Bory',''],
['^Braveeagle','^Braveeagle','BraveEagle',''],
['^(BUFFALO|BSC)','^BUFFALO','Buffalo',''], # usb: BSCR05TU2
+ ['^Bugatek','^Bugatek','Bugatek',''],
['^Bulldozer','^Bulldozer','Bulldozer',''],
['^BUSlink','^BUSlink','BUSlink',''],
+ ['^(Canon|MP49)','^Canon','Canon',''],
['^Centerm','^Centerm','Centerm',''],
- ['^Centon','^Centon','Centon',''],
- ['^CHN\b','','Zheino',''],
+ ['^(Centon|DS pro)','^Centon','Centon',''],
+ ['^(CFD|CSSD)','^CFD','CFD',''],
+ ['^CHIPAL','^CHIPAL','CHIPAL',''],
+ ['^(Chipsbank|CHIPSBNK)','^Chipsbank','Chipsbank',''],
+ ['^(Chipfancie)','^Chipfancier','Chipfancier',''],
['^Clover','^Clover','Clover',''],
+ ['^CODi','^CODi','CODi',''],
['^Colorful\b','^Colorful','Colorful',''],
+ ['^CONSISTENT','^CONSISTENT','Consistent',''],
# note: www.cornbuy.com is both a brand and also sells other brands, like newegg
# addlink; colorful; goldenfir; kodkak; maxson; netac; teclast; vaseky
['^Corn','^Corn','Corn',''],
['^CnMemory|Spaceloop','^CnMemory','CnMemory',''],
+ ['^(Creative|(Nomad\s?)?MuVo)','^Creative','Creative',''],
['^CSD','^CSD','CSD',''],
+ ['^CYX\b','^CYX','CYX',''],
['^(Dane-?Elec|Z Mate)','^Dane-?Elec','DaneElec',''],
['^DATABAR','^DATABAR','DataBar',''],
# Daplink vfs is an ARM software thing
+ ['^(Data\s?Memory\s?Systems|DMS)','^Data\s?Memory\s?Systems','Data Memory Systems',''],
['^Dataram','^Dataram','Dataram',''],
+ ['^DELAIHE','^DELAIHE','DELAIHE',''],
# DataStation can be Trekstore or I/O gear
['^Dell\b','^Dell','Dell',''],
['^DeLOCK','^Delock(\s?products)?','Delock',''],
['^Derler','^Derler','Derler',''],
['^detech','^detech','DETech',''],
+ ['^DEXP','^DEXP','DEXP',''],
['^DGM','^DGM\b','DGM',''],
+ ['^(DICOM|MAESTRO)','^DICOM','DICOM',''],
['^Digifast','^Digifast','Digifast',''],
['^DIGITAL\s?FILM','DIGITAL\s?FILM','Digital Film',''],
- ['^(Dogfish|Shark)','^Dogfish(\s*Technology)?','Dogfish Technolgy',''],
+ ['^(Digma|Run(\sY2)?\b)','^Digma','Digma',''],
+ ['^Dikom','^Dikom','Dikom',''],
+ ['^DINGGE','^DINGGE','DINGGE',''],
+ ['^Disain','^Disain','Disain',''],
+ ['^(Disco|Go-Infinity)','^Disco','Disco',''],
+ ['^(Disk2go|Three[\s_-]?O)','^Disk2go','Disk2go',''],
+ ['^(Disney|PIX[\s]?JR)','^Disney','Disney',''],
+ ['^(Doggo|DQ-|Sendisk|Shenchu)','^(doggo|Sendisk(.?Shenchu)?|Shenchu(.?Sendisk)?)','Doggo (SENDISK/Shenchu)',''],
+ ['^(Dogfish|M\.2 2242|Shark)','^Dogfish(\s*Technology)?','Dogfish Technology',''],
['^DragonDiamond','^DragonDiamond','DragonDiamond',''],
- ['^DREVO\b','^DREVO','Drevo',''],
+ ['^(DREVO\b|X1\s\d+[GT])','^DREVO','Drevo',''],
+ ['^DSS','^DSS DAHUA','DSS DAHUA',''],
+ ['^(Duex|DX\b)','^Duex','Duex',''], # DX\d may be starter for sandisk string
+ ['^(Dynabook|AE[1-3]00)','^Dynabook','Dynabook',''],
# DX1100 is probably sandisk, but could be HP, or it could be hp branded sandisk
['^(Eaget|V8$)','^Eaget','Eaget',''],
+ ['^(Easy[\s-]?Memory)','^Easy[\s-]?Memory','Easy Memory',''],
['^EDGE','^EDGE','EDGE Tech',''],
+ ['^(EDILOCA|ES\d+\b)','^EDILOCA','Ediloca',''],
['^Elecom','^Elecom','Elecom',''],
['^Eluktro','^Eluktronics','Eluktronics',''],
['^Emperor','^Emperor','Emperor',''],
['^Emtec','^Emtec','Emtec',''],
- ['^EXCELSTOR','^EXCELSTOR( TECHNO(LOGY)?)?','ExcelStor',''],
+ ['^ENE\b','^ENE','ENE',''],
+ ['^Energy','^Energy','Energy',''],
+ ['^eNova','^eNOVA','eNOVA',''],
+ ['^Epson','^Epson','Epson',''],
+ ['^(Etelcom|SSD051)','^Etelcom','Etelcom',''],
+ ['^(Shenzhen\s)?Etopso(\sTechnology)?','^(Shenzhen\s)?Etopso(\sTechnology)?','Etopso',''],
+ ['^EURS','^EURS','EURS',''],
+ ['^eVAULT','^eVAULT','eVAULT',''],
+ ['^EVM','^EVM','EVM',''],
+ ['^eVtran','^eVtran','eVtran',''],
+ # NOTE: ESA3... may be IBM PCIe SAD card/drives
+ ['^(EXCELSTOR|r technology)','^EXCELSTOR( TECHNO(LOGY)?)?','ExcelStor',''],
+ ['^EXRAM','^EXRAM','EXRAM',''],
+ ['^EYOTA','^EYOTA','EYOTA',''],
+ ['^EZCOOL','^EZCOOL','EZCOOL',''],
['^EZLINK','^EZLINK','EZLINK',''],
['^Fantom','^Fantom( Drive[s]?)?','Fantom Drives',''],
- ['^Faspeed','^Faspeed','Faspeed',''],
+ ['^Fanxiang','^Fanxiang','Fanxiang',''],
+ ['^(Faspeed|K3[\s-])','^Faspeed','Faspeed',''],
['^FASTDISK','^FASTDISK','FASTDISK',''],
+ ['^Festtive','^Festtive','Festtive',''],
+ ['^FiiO','^FiiO','FiiO',''],
+ ['^FixMeStick','^FixMeStick','FixMeStick',''],
+ ['^(FIKWOT|FS\d{3})','^FIKWOT','Kikwot',''],
['^Fordisk','^Fordisk','Fordisk',''],
# FK0032CAAZP/FB160C4081 FK or FV can be HP but can be other things
- ['^FORESEE','^FORESEE','Foresee',''],
- ['^FOXLINE','^FOXLINE','Foxline',''], # russian vendor?
- ['^(GALAX\b|Gamer\s?L)','^GALAX','GALAX',''],
+ ['^(FORESEE|B[123]0)|P900F|S900M','^FORESEE','Foresee',''],
+ ['^Founder','^Founder','Founder',''],
+ ['^(FOXLINE|FLD)','^FOXLINE','Foxline',''], # russian vendor?
+ ['^(Gateway|W800S)','^Gateway','Gateway',''],
+ ['^Freecom','^Freecom(\sFreecom)?','Freecom',''],
+ ['^(FronTech)','^FronTech','Frontech',''],
+ ['^(Fuhler|FL-D\d{3})','^Fuhler','Fuhler',''],
+ ['^Gaiver','^Gaiver','Gaiver',''],
+ ['^(GALAX\b|Gamer\s?L|TA\dD|Gamer[\s-]?V)','^GALAX','GALAX',''],
['^Galaxy\b','^Galaxy','Galaxy',''],
+ ['^Gamer[_\s-]?Black','^Gamer[_\s-]?Black','Gamer Black',''],
['^(Garmin|Fenix|Nuvi|Zumo)','^Garmin','Garmin',''],
['^Geil','^Geil','Geil',''],
- ['^Generic','^Generic','Generic',''],
- ['^Gigabyte','^Gigabyte','Gigabyte',''], # SSD
+ ['^GelL','^GelL','GelL',''], # typo for Geil? GelL ZENITH R3 120GB
+ ['^(Generic|A3A|G1J3|M0S00|SCA\d{2}|SCY|SLD|S0J\d|UY[567])','^Generic','Generic',''],
+ ['^(Genesis(\s?Logic)?|05e3)','(Genesis(\s?Logic)?|05e3)','Genesis Logic',''],
+ ['^Geonix','^Geonix','Geonix',''],
+ ['^Getrich','^Getrich','Getrich',''],
+ ['^(Gigabyte|GP-G)','^Gigabyte','Gigabyte',''], # SSD
['^Gigastone','^Gigastone','Gigastone',''],
- ['^Gloway','^Gloway','Gloway',''],
+ ['^Gigaware','^Gigaware','Gigaware',''],
+ ['^GJN','^GJN\b','GJN',''],
+ ['^(Gloway|FER\d)','^Gloway','Gloway',''],
+ ['^GLOWY','^GLOWY','Glowy',''],
['^Goldendisk','^Goldendisk','Goldendisk',''],
['^Goldenfir','^Goldenfir','Goldenfir',''],
+ ['^(Goldkey|GKH\d)','^Goldkey','Goldkey',''],
+ ['^Golden[\s_-]?Memory','^Golden[\s_-]?Memory','Golden Memory',''],
+ ['^(Goldkey|GKP)','^Goldkey','GoldKey',''],
+ ['^(Goline)','^Goline','Goline',''],
# Wilk Elektronik SA, poland
- ['^(Wilk\s*)?(GOODRAM|GOODDRIVE|IR SSD|IRP|SSDPR)','^GOODRAM','GOODRAM',''],
+ ['^((Wilk|WE)\s*)?(GOODRAM|GOODDRIVE|IR[\s-]?SSD|IRP|SSDPR|Iridium)','^GOODRAM','GOODRAM',''],
+ ['^(GreatWall|GW\d{3})','^GreatWall','GreatWall',''],
+ ['^(GreenHouse|GH\b)','^GreenHouse','GreenHouse',''],
+ ['^Gritronix','^Gritronixx?','Gritronix',''],
# supertalent also has FM: |FM
['^(G[\.]?SKILL)','^G[\.]?SKILL','G.SKILL',''],
- ['^G[\s-]*Tech','^G[\s-]*Technology','G-Technology',''],
+ ['^G[\s-]*Tech','^G[\s-]*Tech(nology)?','G-Technology',''],
+ ['^(Gudga|GIM\d+|G[NV](R\d|\d{2,4}\b))','^Gudga','Gudga',''],
+ ['^(Hajaan|HS[1-9])','^Haajan','Haajan',''],
+ ['^Haizhide','^Haizhide','Haizhide',''],
+ ['^(Hama|FlashPen\s?Fancy)','^Hama','Hama',''],
+ ['^(Hanye|Q60)','^Hanye','Hanye',''],
['^HDC','^HDC\b','HDC',''],
['^Hectron','^Hectron','Hectron',''],
- ['^(Hikvision|HKVSN)','^Hikvision','Hikvision',''],
+ ['^HEMA','^HEMA','HEMA',''],
+ ['(HEORIADY|^HX-0)','^HEORIADY','HEORIADY',''],
+ ['^(Hikvision|HKVSN|HS-SSD)','^Hikvision','Hikvision',''],
+ ['^Hi[\s-]?Level ','^Hi[\s-]?Level ','Hi-Level',''], # ^HI\b with no Level?
+ ['^(Hisense|H8G)','^Hisense','Hisense',''],
['^Hoodisk','^Hoodisk','Hoodisk',''],
- ['^HUAWEI','^HUAWEI','Huawei',''],
+ ['^(HUAWEI|HWE)','^HUAWEI','Huawei',''],
+ ['^Hypertec','^Hypertec','Hypertec',''],
['^HyperX','^HyperX','HyperX',''],
- ['^Hyundai','^Hyundai','Hyundai',''],
- ['^(IBM|DT)','^IBM','IBM',''],
+ ['^(HYSSD|HY-)','^HYSSD','HYSSD',''],
+ ['^(Hyundai|C2S\d|Sapphire)','^Hyundai','Hyundai',''],
+ ['^iMRAM','^iMRAM','iMRA',''],
+ ['^(IBM|DT|ESA[1-9]|ServeRaid)','^IBM','IBM',''], # M5110 too common
['^IEI Tech','^IEI Tech(\.|nology)?( Corp(\.|oration)?)?','IEI Technology',''],
+ ['^(IGEL|UD Pocket)','^IGEL','IGEL',''],
['^(Imation|Nano\s?Pro|HQT)','^Imation(\sImation)?','Imation',''], # Imation_ImationFlashDrive; TF20 is imation/tdk
+ ['^(IMC|Kanguru)','^IMC\b','IMC',''],
+ ['^(Inateck|FE20)','^Inateck','Inateck',''],
['^(Inca\b|Npenterprise)','^Inca','Inca',''],
+ ['^(Indilinx|IND-)','^Indilinx','Indilinx',''],
['^INDMEM','^INDMEM','INDMEM',''],
+ ['^(Infokit)','^Infokit','Infokit',''],
+ # note: Initio default controller, means master/slave jumper is off/wrong, not a vendor
['^Inland','^Inland','Inland',''],
- ['^(InnoDisk|Innolite)','^InnoDisk( Corp.)?','InnoDisk',''],
- ['^Innostor','^Innostor','Innostor',''],
- ['^Innovation','^Innovation','Innovation',''],
+ ['^(InnoDisk|DEM\d|Innolite|SATA\s?Slim|DRPS)','^InnoDisk( Corp.)?','InnoDisk',''],
+ ['(Innostor|1f75)','(Innostor|1f75)','Innostor',''],
+ ['(^Innovation|Innovation\s?IT)','Innovation(\s*IT)?','Innovation IT',''],
['^Innovera','^Innovera','Innovera',''],
+ ['^(I\.?norys|INO-?IH])','^I\.?norys','I.norys','']
+ ,['(^Insignia|NS[\s-]?PCNV)','^Insignia','Insignia',''],
['^Intaiel','^Intaiel','Intaiel',''],
['^(INM|Integral|V\s?Series)','^Integral(\s?Memory)?','Integral Memory',''],
- ['^(lntenso|Intenso|(Alu|Basic|Business|Micro|Mobile|Rainbow|Speed|Twister) Line|Rainbow)','^Intenso','Intenso',''],
+ ['^(lntenso|Intenso|(Alu|Basic|Business|Micro|c?Mobile|Premium|Rainbow|Slim|Speed|Twister|Ultra) Line|Rainbow)','^Intenso','Intenso',''],
+ ['^(I-?O Data|HDCL)','^I-?O Data','I-O Data',''],
+ ['^(INO-|i\.?norys)','^i\.?norys','i.norys',''],
+ ['^(Integrated[\s-]?Technology|IT\d+)','^Integrated[\s-]?Technology','Integrated Technology',''],
['^(Iomega|ZIP\b|Clik!)','^Iomega','Iomega',''],
+ ['^(i[\s_-]?portable\b|ATCS)','^i[\s_-]?portable','i-Portable',''],
+ ['^ISOCOM','^ISOCOM','ISOCOM (Shenzhen Longsys Electronics)',''],
+ ['^iTE[\s-]*Tech','^iTE[\s-]*Tech(nology)?','iTE Tech',''],
+ ['^(James[\s-]?Donkey|JD\d)','^James[\s-]?Donkey','James Donkey',''],
+ ['^(Jaster|JS\d)','^Jaster','Jaster',''],
['^JingX','^JingX','JingX',''], #JingX 120G SSD - not confirmed, but guessing
['^Jingyi','^Jingyi','Jingyi',''],
# NOTE: ITY2 120GB hard to find
['^JMicron','^JMicron(\s?Tech(nology)?)?','JMicron Tech',''], #JMicron H/W raid
+ ['^JSYERA','^JSYERA','Jsyera',''],
+ ['^(Jual|RX7)','^Jual','Jual',''],
+ ['^(J\.?ZAO|JZ)','^J\.?ZAO','J.ZAO',''],
+ ['^Kazuk','^Kazuk','Kazuk',''],
+ ['(\bKDI\b|^OM3P)','\bKDI\b','KDI',''],
+ ['^KEEPDATA','^KEEPDATA','KeepData',''],
+ ['^KLLISRE','^KLLISRE','KLLISRE',''],
['^KimMIDI','^KimMIDI','KimMIDI',''],
+ ['^Kimtigo','^Kimtigo','Kimtigo',''],
+ ['^Kingbank','^Kingbank','Kingbank',''],
+ ['^(KingCell|KC\b)','^KingCell','KingCell',''],
['^Kingchux[\s-]?ing','^Kingchux[\s-]?ing','Kingchuxing',''],
- ['^KingDian','^KingDian','KingDian',''],
- ['^Kingfast','^Kingfast','Kingfast',''],
+ ['^(KINGCOMP|KCSSD)','^KINGCOMP','KingComp',''],
+ ['(KingDian|^NGF|S(280|400))','KingDian','KingDian',''],
+ ['^(Kingfast|TYFS)','^Kingfast','Kingfast',''],
['^KingMAX','^KingMAX','KingMAX',''],
- ['^KING\s?SHARE','^KING\s?SHARE','KingShare',''],
- ['^(KingSpec|ACSC)','^KingSpec','KingSpec',''],
+ ['^Kingrich','^Kingrich','Kingrich',''],
+ ['^Kingsand','^Kingsand','Kingsand',''],
+ ['KING\s?SHA\s?RE','KING\s?SHA\s?RE','KingShare',''],
+ ['^(KingSpec|ACSC|C3000|KS[DQ]|MSH|N[ET]-\d|NX-\d{2,4}|P3$|P4\b|PA[_-]?(18|25)|Q-180|SPK|T-(3260|64|128)|Z(\d\s|F\d))','^KingSpec','KingSpec',''],
+ ['^KingSSD','^KingSSD','KingSSD',''],
# kingwin docking, not actual drive
['^(EZD|EZ-Dock)','','Kingwin Docking Station',''],
- ['^KLEVV','^KLEVV','KLEVV',''],
- ['^Kodak','^Kodak','Kodak',''],
+ ['^Kingwin','^Kingwin','Kingwin',''],
+ ['^KLLISRE','^KLLISRE','KLLISRE',''],
+ ['(KIOXIA|^K[BX]G\d)','KIOXIA','KIOXIA',''], # company name comes after product ID
+ ['^(KLEVV|NEO\sN|CRAS)','^KLEVV','KLEVV',''],
+ ['^(Kodak|Memory\s?Saver)','^Kodak','Kodak',''],
+ ['^(KOOTION)','^KOOTION','KOOTION',''],
+ ['^(KUAIKAI|MSAM)','^KUAIKAI','KuaKai',''],
+ ['(KUIJIA|DAHUA)','^KUIJIA','KUIJIA',''],
+ ['^KUNUP','^KUNUP','KUNUP',''],
+ ['^KUU','^KUU\b','KUU',''], # KUU-128GB
['^(Lacie|P92|itsaKey|iamaKey)','^Lacie','LaCie',''],
['^LANBO','^LANBO','LANBO',''],
+ ['^LankXin','^LankXin','LankXin',''],
+ ['^LANTIC','^LANTIC','Lantic',''],
+ ['^Lapcare','^Lapcare','Lapcare',''],
+ ['^(Lazos|L-?ISS)','^Lazos','Lazos',''],
['^LDLC','^LDLC','LDLC',''],
- # LENSE30512GMSP34MEAT3TA
- ['^LEN','^Lenovo','Lenovo',''],
+ # LENSE30512GMSP34MEAT3TA / UMIS RPITJ256PED2MWX
+ ['^(LEN|UMIS|Think)','^Lenovo','Lenovo',''],
['^RPFT','','Lenovo O.E.M.',''],
- ['^LG\b','^LG','LG',''],
- ['^(LITE[-\s]?ON[\s-]?IT)','^LITE[-]?ON[\s-]?IT','LITE-ON IT',''], # LITEONIT_LSS-24L6G
- ['^(LITE[-\s]?ON|PH[1-9])','^LITE[-]?ON','LITE-ON',''], # PH6-CE240-L
+ # JAJS300M120C JAJM600M256C JAJS600M1024C JAJS600M256C JAJMS600M128G
+ ['^(Leven|JAJ[MS])','^Leven','Leven',''],
+ ['^(LEQIXIANG)','^LEQIXIANG','Leqixiang',''],
+ ['^(LG\b|Xtick)','^LG','LG',''],
+ ['^Lidermix','Lidermix','Lidermix',''],
+ ['(LITE[-\s]?ON[\s-]?IT)','LITE[-]?ON[\s-]?IT','LITE-ON IT',''], # LITEONIT_LSS-24L6G
+ # PH6-CE240-L; CL1-3D256-Q11 NVMe LITEON 256GB
+ ['(LITE[-\s]?ON|^PH[1-9]|^DMT|^CV\d-|L(8[HT]|AT|C[HST]|JH|M[HST]|S[ST])-|^S900)','LITE[-]?ON','LITE-ON',''],
['^LONDISK','^LONDISK','LONDISK',''],
- ['^M-Systems','^M-Systems','M-Systems',''],
- ['^(Mach\s*Xtreme|MXSSD|MXU)','^Mach\s*Xtreme','Mach Xtreme',''],
+ ['^Longline','^Longline','Longline',''],
+ ['^LuminouTek','^LuminouTek','LuminouTek',''],
+ ['^Lunatic','^Lunatic','Lunatic',''],
+ ['^(LSI|MegaRAID|MR\d{3,4}\b)','^LSI\b','LSI',''],
+ ['^(M-Systems|DiskOnKey)','^M-Systems','M-Systems',''],
+ ['^(Mach\s*Xtreme|MXSSD|MXU|MX[\s-])','^Mach\s*Xtreme','Mach Xtreme',''],
+ ['^(MacroVIP|MV(\d|GLD))','^MacroVIP','MacroVIP',''], # maybe MV alone
+ ['^Mainic','^Mainic','Mainic',''],
+ ['^(MARSHAL\b|MAL\d)','^MARSHAL','Marshal',''],
+ ['^Maxell','^Maxell','Maxell',''],
['^Maximus','^Maximus','Maximus',''],
- ['^(MAXTOR|Atlas|TM[0-9]{4})','^MAXTOR','Maxtor',''], # note M2 M3 is usually maxtor, but can be samsung
- ['^(Memorex|TravelDrive|TD\s?Classic)','^Memorex','Memorex',''],
- # note: C300/400 can be either micron or crucial, but C400 is M4 from crucial
- ['(^MT|^M5|^Micron|00-MT|C[34]00)','^Micron','Micron',''],# C400-MTFDDAK128MAM
- ['^(MARSHAL\b|MAL[0-9])','^MARSHAL','Marshal',''],
+ ['^MAXIO','^MAXIO','Maxio',''],
+ ['^Maxmem','^Maxmem','Maxmem',''],
+ ['^Maxone','^Maxone','Maxone',''],
['^MARVELL','^MARVELL','Marvell',''],
['^Maxsun','^Maxsun','Maxsun',''],
['^MDT\b','^MDT','MDT (rebuilt WD/Seagate)',''], # mdt rebuilds wd/seagate hdd
# MD1TBLSSHD, careful with this MD starter!!
['^MD[1-9]','^Max\s*Digital','MaxDigital',''],
['^Medion','^Medion','Medion',''],
- ['^(MEDIAMAX|WL[0-9]{2})','^MEDIAMAX','MediaMax',''],
+ ['^(MEDIAMAX|WL\d{2})','^MEDIAMAX','MediaMax',''],
+ ['^(Memorex|TravelDrive|TD\s?Classic)','^Memorex','Memorex',''],
['^Mengmi','^Mengmi','Mengmi',''],
+ ['^MicroFrom','^MicroFrom','MicroFrom',''],
+ ['^MGTEC','^MGTEC','MGTEC',''],
+ # must come before micron
+ ['^(Mtron|MSP)','^Mtron','Mtron',''],
+ # note: C300/400 can be either micron or crucial, but C400 is M4 from crucial
+ ['(^(Micron|2200[SV]|MT|M5|(\d+|[CM]\d+)\sMTF)|00-MT)','^Micron','Micron',''],# C400-MTFDDAK128MAM
+ ['^(Microsoft|S31)','^Microsoft','Microsoft',''],
+ ['^MidasForce','^MidasForce','MidasForce',''],
+ ['^Milan','^Milan','Milan',''],
+ ['^(Mimoco|Mimobot)','^Mimoco','Mimoco',''],
['^MINIX','^MINIX','MINIX',''],
['^Miracle','^Miracle','Miracle',''],
+ ['^MLLSE','^MLLSE','MLLSE',''],
+ ['^Moba','^Moba','Moba',''],
# Monster MONSTER DIGITAL
- ['^(Monster\s)+Digital','^(Monster\s)+Digital','Monster Digital',''],
+ ['^(Monster\s)+(Digital)?|OD[\s-]?ADVANCE','^(Monster\s)+(Digital)?','Monster Digital',''],
['^Morebeck','^Morebeck','Morebeck',''],
- ['^Motorola','^Motorola','Motorola',''],
+ ['^(Moser\s?Bear|MBIL)','^Moser\s?Bear','Moser Bear',''],
+ ['^(Motile|SSM\d)','^Motile','Motile',''],
+ ['^(Motorola|XT\d{4}|Moto[\s-]?[EG])','^Motorola','Motorola',''],
['^Moweek','^Moweek','Moweek',''],
+ ['^(Move[\s-]?Speed|YSSD)','^Move[\s-]?Speed','Move Speed',''],
#MRMAD4B128GC9M2C
['^(MRMA|Memoright)','^Memoright','Memoright',''],
+ ['^MSI\b','^MSI\b','MSI',''],
['^MTASE','^MTASE','MTASE',''],
['^MTRON','^MTRON','MTRON',''],
- ['^Neo\s*Forza','^Neo\s*Forza','Neo Forza',''],
- ['^Netac','^Netac','Netac',''],
+ ['^(MyDigitalSSD|BP[4X])','^MyDigitalSSD','MyDigitalSSD',''], # BP4 = BulletProof4
+ ['^MyMedia','^MyMedia','MyMedia',''],
+ ['^(Myson)','^Myson([\s-]?Century)?([\s-]?Inc\.?)?','Myson Century',''],
+ ['^(Natusun|i-flashdisk)','^Natusun','Natusun',''],
+ ['^(Neo\s*Forza|NFS\d)','^Neo\s*Forza','Neo Forza',''],
+ ['^(Netac|NS\d{3}|OnlyDisk|S535N)','^Netac','Netac',''],
+ ['^Newsmy','^Newsmy','Newsmy',''],
+ ['^NFHK','^NFHK','NFHK',''],
+ # NGFF is a type, like msata, sata
['^Nik','^Nikimi','Nikimi',''],
+ ['^NOREL','^NOREL(SYS)?','NorelSys',''],
+ ['^(N[\s-]?Tech|NT\d)','^N[\s-]?Tec','N Tech',''], # coudl be ^NT alone
+ ['^NXTech','^NXTech','NXTech',''],
+ ['^ODYS','^ODYS','ODYS',''],
+ ['^Olympus','^Olympus','Olympus',''],
['^Orico','^Orico','Orico',''],
- ['^OWC','^OWC\b','OWC',''],
+ ['^Ortial','^Ortial','Ortial',''],
+ ['^OSC','^OSC\b','OSC',''],
+ ['^(Ovation)','^Ovation','Ovation',''],
['^oyunkey','^oyunkey','Oyunkey',''],
['^PALIT','PALIT','Palit',''], # ssd
+ ['^Panram','^Panram','Panram',''], # ssd
+ ['^(Parker|TP00)','^Parker','Parker',''],
+ ['^(Pasoul|OASD)','^Pasoul','Pasoul',''],
+ ['^(Patriot|PS[8F]|P2\d{2}|PBT|VPN|Viper|Burst|Blast|Blaze|Pyro|Ignite)','^Patriot([-\s]?Memory)?','Patriot',''],#Viper M.2 VPN100
['^PERC\b','','Dell PowerEdge RAID Card',''], # ssd
- ['^(PS[8F]|Patriot)','^Patriot([-\s]?Memory)?','Patriot',''],
- ['PHISON[\s-]?','PHISON[\s-]?','Phison',''],# E12-256G-PHISON-SSD-B3-BB1
+ ['(PHISON[\s-]?|ESR\d|PSE)','PHISON[\s-]?','Phison',''],# E12-256G-PHISON-SSD-B3-BB1
+ ['^(Pichau[\s-]?Gaming|PG\d{2})','^Pichau[\s-]?Gaming','Pichau Gaming',''],
['^Pioneer','Pioneer','Pioneer',''],
- ['^PIX[\s]?JR','^PIX[\s]?JR','Disney',''],
+ ['^Platinet','Platinet','Platinet',''],
['^(PLEXTOR|PX-)','^PLEXTOR','Plextor',''],
- ['^(PQI|Intelligent\s?Stick)','^PQI','PQI',''],
- ['^Pretec','Pretec','Pretec',''],
- ['QEMU','^[0-9]*QEMU( QEMU)?','QEMU',''], # 0QUEMU QEMU HARDDISK
+ ['^(Polion)','^Polion','Polion',''],
+ ['^(PQI|Intelligent\s?Stick|Cool\s?Drive)','^PQI','PQI',''],
+ ['^(Premiertek|QSSD|Quaroni)','^Premiertek','Premiertek',''],
+ ['^(-?Pretec|UltimateGuard)','-?Pretec','Pretec',''],
+ ['^(Prolific)','^Prolific( Technolgy Inc\.)?','Prolific',''],
+ # PS3109S9 is the result of an error condition with ssd controller: Phison PS3109
+ ['^PUSKILL','^PUSKILL','Puskill',''],
+ ['QEMU','^\d*QEMU( QEMU)?','QEMU',''], # 0QUEMU QEMU HARDDISK
['(^Quantum|Fireball)','^Quantum','Quantum',''],
- ['^QUMO','^QUMO','Qumo',''],
- ['^(R3|AMD\s?(RADEON)?)','AMD\s?(RADEON)?','AMD Radeon',''], # ssd
- ['^(Ramaxel|RT|RM|RPF)','^Ramaxel','Ramaxel',''],
+ ['(^QOOTEC|QMT)','^QOOTEC','QOOTEC',''],
+ ['^(QUMO|Q\dDT)','^QUMO','Qumo',''],
+ ['^QOPP','^QOPP','Qopp',''],
+ ['^Qunion','^Qunion','Qunion',''],
+ ['^(R[3-9]|AMD\s?(RADEON)?|Radeon)','AMD\s?(RADEON)?','AMD Radeon',''], # ssd
+ ['^(Ramaxel|RT|RM|RPF|RDM)','^Ramaxel','Ramaxel',''],
+ ['^(Ramsta|RT|SSD\d+GBS8)','^Ramsta','Ramsta',''],
+ ['^RAMOS','^RAMOS','RAmos',''],
+ ['^(Ramsta|R[1-9])','^Ramsta','Ramsta',''],
+ ['^RCESSD','^RCESSD','RCESSD',''],
+ ['^(Realtek|RTL)','^Realtek','Realtek',''],
+ ['^(Reletech)','^Reletech','Reletech',''], # id: P400 but that's too short
['^RENICE','^RENICE','Renice',''],
+ ['^RevuAhn','^RevuAhn','RevuAhn',''],
['^(Ricoh|R5)','^Ricoh','Ricoh',''],
['^RIM[\s]','^RIM','RIM',''],
+ ['^(Rococo|ITE\b|IT\d{4})','^Rococo','Rococo',''],
#RTDMA008RAV2BWL comes with lenovo but don't know brand
['^Runcore','^Runcore','Runcore',''],
- ['^Sabrent','^Sabrent','Sabrent',''],
+ ['^Rundisk','^Rundisk','RunDisk',''],
+ ['^RZX','^RZX\b','RZX',''],
+ ['^(S3Plus|S3\s?SSD)','^S3Plus','S3Plus',''],
+ ['^(Sabrent|Rocket)','^Sabrent','Sabrent',''],
['^Sage','^Sage(\s?Micro)?','Sage Micro',''],
+ ['^SAMSWEET','^SAMSWEET','Samsweet',''],
['^SandForce','^SandForce','SandForce',''],
['^Sannobel','^Sannobel','Sannobel',''],
+ ['^(Sansa|fuse\b)','^Sansa','Sansa',''],
+ # SATADOM can be innodisk or supermirco: dom == disk on module
+ # SATAFIRM is an ssd failure message
+ ['^SCUDA','^SCUDA','SCUDA',''],
+ ['^(Sea\s?Tech|Transformer)','^Sea\s?Tech','Sea Tech',''],
['^SigmaTel','^SigmaTel','SigmaTel',''],
# DIAMOND_040_GB
- ['^(SILICON\s?MOTION|SM[0-9])','^SILICON\s?MOTION','Silicon Motion',''],
- ['(Silicon[\s-]?Power|^SP[CP]C|^Silicon|^Diamond|^Haspeed)','Silicon[\s-]?Power','Silicon Power',''],
+ ['^(SILICON\s?MOTION|SM\d|090c)','^(SILICON\s?MOTION|090c)','Silicon Motion',''],
+ ['(Silicon[\s-]?Power|^SP[CP]C|^Silicon|^Diamond|^HasTopSunlightpeed)','Silicon[\s-]?Power','Silicon Power',''],
+ # simple drive could also maybe be hgst
+ ['^(Simple\s?Tech|Simple[\s-]?Drive)','^Simple\s?Tech','SimpleTech',''],
+ ['^(Simmtronics?|S[79]\d{2}|ZipX)','^Simmtronics?','Simmtronics',''],
['^SINTECHI?','^SINTECHI?','SinTech (adapter)',''],
+ ['^SiS\b','^SiS','SiS',''],
['Smartbuy','\s?Smartbuy','Smartbuy',''], # SSD Smartbuy 60GB; mSata Smartbuy 3
# HFS128G39TND-N210A; seen nvme with name in middle
- ['(SK\s?HYNIX|^HF[MS]|^H[BC]G)','\s?SK\s?HYNIX','SK Hynix',''],
- ['hynix','hynix','Hynix',''],# nvme middle of string, must be after sk hynix
+ ['(SK\s?HYNIX|^HF[MS]|^H[BC]G|^HFB|^BC\d{3}|^SC[234]\d\d\sm?SATA|^SK[\s-]?\d{2,4})','\s?SK\s?HYNIX','SK Hynix',''],
+ ['(hynix|^HAG\d|h[BC]8aP|PC\d{3})','hynix','Hynix',''],# nvme middle of string, must be after sk hynix
['^SH','','Smart Modular Tech.',''],
['^Skill','^Skill','Skill',''],
['^(SMART( Storage Systems)?|TX)','^(SMART( Storage Systems)?)','Smart Storage Systems',''],
- ['^(S[FR]-|Sony)','^Sony','Sony',''],
+ ['^Sobetter','^Sobetter','Sobetter',''],
+ ['^Solidata','^Solidata','Solidata',''],
+ ['^(SOLIDIGM|SSDPFK)','^SOLIDIGM\b','solidgm',''],
+ ['^(Sony|IM9|Microvalut|S[FR]-)','^Sony','Sony',''],
+ ['^SSK\b','^SSK','SSK',''],
+ ['^(SSSTC|CL1-)','^SSSTC','SSSTC',''],
+ ['^(SST|SG[AN])','^SST\b','SST',''],
['^STE[CK]','^STE[CK]','sTec',''], # wd bought this one
- ['^STmagic','^STmagic','STmagic',''],
['^STORFLY','^STORFLY','StorFly',''],
+ ['\dSUN\d','^SUN(\sMicrosystems)?','Sun Microsystems',''],
+ ['^Sundisk','^Sundisk','Sundisk',''],
['^SUNEAST','^SUNEAST','SunEast',''],
+ ['^SuperMicro','^SuperMicro','SuperMicro',''],
+ ['^Supersonic','^Supersonic','Supersonic',''],
['^SuperSSpeed','^SuperSSpeed','SuperSSpeed',''],
# NOTE: F[MNETU] not reliable, g.skill starts with FM too:
# Seagate ST skips STT.
- ['^(Super\s*Talent|STT|F[HT]M[0-9]|PicoDrive|Teranova)','','Super Talent',''],
+ ['^(Super\s*Talent|STT|F[HTZ]M\d|PicoDrive|Teranova)','','Super Talent',''],
['^(SF|Swissbit)','^Swissbit','Swissbit',''],
# ['^(SUPERSPEED)','^SUPERSPEED','SuperSpeed',''], # superspeed is a generic term
+ ['^(SXMicro|NF8)','^SXMicro','SXMicro',''],
+ ['^Taisu','^Taisu','Taisu',''],
['^(TakeMS|ColorLine)','^TakeMS','TakeMS',''],
['^Tammuz','^Tammuz','Tammuz',''],
['^TANDBERG','^TANDBERG','Tanberg',''],
- ['^TC[\s-]*SUNBOW','^TC[\s-]*SUNBOW','TCSunBow',''],
- ['^(TDK|TF[1-9][0-9])','^TDK','TDK',''],
+ ['^(TC[\s-]*SUNBOW|X3\s\d+[GT])','^TC[\s-]*SUNBOW','TCSunBow',''],
+ ['^(TDK|TF[1-9]\d|LoR)','^TDK','TDK',''],
['^TEAC','^TEAC','TEAC',''],
- ['^TEAM','^TEAM(\s*Group)?','TeamGroup',''],
+ ['^(TEAM|T[\s-]?Create|CX[12]\b|L\d\s?Lite|T\d{3,}[A-Z]|TM\d|(Dark\s?)?L3\b|T[\s-]?Force)','^TEAM(\s*Group)?','TeamGroup',''],
['^(Teclast|CoolFlash)','^Teclast','Teclast',''],
+ ['^(tecmiyo)','^tecmiyo','TECMIYO',''],
+ ['^Teelkoou','^Teelkoou','Teelkoou',''],
+ ['^Tele2','^Tele2','Tele2',''],
['^Teleplan','^Teleplan','Teleplan',''],
['^TEUTONS','^TEUTONS','TEUTONS',''],
+ ['^(Textorm)','^Textorm','Textorm',''], # B5 too short
+ ['^(T(&|\s?and\s?)?G\d{3})','^T&G\b','T&G',''],
+ ['^THU','^THU','THU',''],
+ ['^Tiger[\s_-]?Jet','^Tiger[\s_-]?Jet','TigerJet',''],
['^Tigo','^Tigo','Tigo',''],
- ['^Timetec','^Timetec','Timetec',''],
+ ['^(Timetec|35TT)','^Timetec','Timetec',''],
['^TKD','^TKD','TKD',''],
['^TopSunligt','^TopSunligt','TopSunligt',''], # is this a typo? hard to know
['^TopSunlight','^TopSunlight','TopSunlight',''],
- ['^([F]?TS|Transcend|JetDrive|JetFlash|USDU)','^Transcend','Transcend',''],
- ['^(TrekStor|DS maxi)','^TrekStor','TrekStor',''],
+ ['^TOROSUS','^TOROSUS','Torosus',''],
+ ['(Transcend|^((SSD\s|F)?TS|ESD\d|EZEX|USDU)|1307|JetDrive|JetFlash)','\b(Transcend|1307)\b','Transcend',''],
+ ['^(TrekStor|DS (maxi|pocket)|DataStation)','^TrekStor','TrekStor',''],
+ ['^Turbox','^Turbox','Turbox',''],
+ ['^TurXun','^TurXun','TurXun',''],
+ ['^(TwinMOS|TW\d)','^TwinMOS','TwinMOS',''],
+ # note: udisk means usb disk, it's not a vendor ID
['^UDinfo','^UDinfo','UDinfo',''],
+ ['^UMAX','^UMAX','UMAX',''],
+ ['^UpGamer','^UpGamer','UpGamer',''],
+ ['^(UMIS|RP[IJ]TJ)','^UMIS','UMIS',''],
['^USBTech','^USBTech','USBTech',''],
+ ['^(UNIC2)','^UNIC2','UNIC2',''],
['^(UG|Unigen)','^Unigen','Unigen',''],
+ ['^(UNIREX)','^UNIREX','UNIREX',''],
+ ['^(UNITEK)','^UNITEK','UNITEK',''],
+ ['^(USBest|UT16)','^USBest','USBest',''],
['^(OOS[1-9]|Utania)','Utania','Utania',''],
['^U-TECH','U-TECH','U-Tech',''],
+ ['^(Value\s?Tech|VTP\d)','^Value\s?Tech','ValueTech',''],
['^VBOX','','VirtualBox',''],
- ['^(Verbatim|STORE N GO)','^Verbatim','Verbatim',''],
- ['^V-GEN','^V-GEN','V-Gen',''],
+ ['^(Veno|Scorp)','^Veno','Veno',''],
+ ['^(Verbatim|STORE\s?\'?N\'?\s?(FLIP|GO)|Vi[1-9]|OTG\s?Tiny)','^Verbatim','Verbatim',''],
+ ['^V-?GEN','^V-?GEN','V-Gen',''],
+ ['^VICK','VICK','VICK',''],
+ ['^V[\s-]?(7|Seven)','^V[\s-]?(7|Seven)\b','VSeven',''],
['^(Victorinox|Swissflash)','^Victorinox','Victorinox',''],
+ ['^(Virtium|VTD)','^Virtium','Virtium',''],
['^(Visipro|SDVP)','^Visipro','Visipro',''],
['^VISIONTEK','^VISIONTEK','VisionTek',''],
['^VMware','^VMware','VMware',''],
- ['^(Vseky|Vaseky)','^Vaseky','Vaseky',''], # ata-Vseky_V880_350G_
+ ['^(Vseky|Vaseky|V8\d{2})','^Vaseky','Vaseky',''], # ata-Vseky_V880_350G_
+ ['^(Walgreen|Infinitive)','^Walgreen','Walgreen',''],
+ ['^Walram','^Walram','WALRAM',''],
+ ['^Walton','^Walton','Walton',''],
+ ['^(Wearable|Air-?Stash)','^Wearable','Wearable',''],
+ ['^Wellcomm','^Wellcomm','Wellcomm',''],
+ ['^(wicgtyp|[MN][V]?900)','^wicgtyp','wicgtyp',''],
['^Wilk','^Wilk','Wilk',''],
+ ['^(WinMemory|SWG\d)','^WinMemory','WinMemory',''],
+ ['^(Winton|WT\d{2})','^Winton','Winton',''],
+ ['^(WISE)','^WISE','WISE',''],
+ ['^WPC','^WPC','WPC',''], # WPC-240GB
+ ['^(Wortmann(\sAG)?|Terra\s?US)','^Wortmann(\sAG)?','Wortmann AG',''],
+ ['^(XDisk|X9\b)','^XDisk','XDisk',''],
+ ['^(XinTop|XT-)','^XinTop','XinTop',''],
['^Xintor','^Xintor','Xintor',''],
['^XPG','^XPG','XPG',''],
+ ['^XrayDisk','^XrayDisk','XrayDisk',''],
+ ['^Xstar','^Xstar','Xstar',''],
+ ['^(Xtigo)','^Xtigo','Xtigo',''],
+ ['^(XUM|HX\d)','^XUM','XUM',''],
['^XUNZHE','^XUNZHE','XUNZHE',''],
+ ['^(Yangtze|ZhiTai|PC00[5-9]|SC00[1-9])','^Yangtze(\s*Memory)?','Yangtze Memory',''],
+ ['^(Yeyian|valk)','^Yeyian','Yeyian',''],
+ ['^(YingChu|YGC)','^YingChu','YingChu',''],
+ ['^YongzhenWeiye','^YongzhenWeiye','YongzhenWeiye',''],
['^(YUCUN|R880)','^YUCUN','YUCUN',''],
+ ['^(ZALMAN|ZM\b)','^ZALMAN','Zalman',''],
+ # Zao/J.Zau: marvell ssd controller
+ ['^ZXIC','^ZXIC','ZXIC',''],
+ ['^(Zebronics|ZEB)','^Zebronics','Zebronics',''],
+ ['^Zenfast','^Zenfast','Zenfast',''],
+ ['^Zenith','^Zenith','Zenith',''],
['^ZEUSLAP','^ZEUSLAP','ZEUSLAP',''],
- ['^(Zheino|CHN[0-9]|CNM)','^Zheino','Zheino',''],
+ ['^ZEUSS','^ZEUSS','Zeuss',''],
+ ['^(Zheino|CHN|CNM)','^Zheino','Zheino',''],
['^(Zotac|ZTSSD)','^Zotac','Zotac',''],
+ ['^ZOZT','^ZOZT','ZOZT',''],
['^ZSPEED','^ZSPEED','ZSpeed',''],
['^ZTC','^ZTC','ZTC',''],
+ ['^ZTE','^ZTE','ZTE',''],
+ ['^(ZY|ZhanYao)','^ZhanYao([\s-]?data)','ZhanYao',''],
['^(ASMT|2115)','^ASMT','ASMT (case)',''],
- );
+ ];
eval $end if $b_log;
}
+## END DISK VENDOR BLOCK ##
# receives space separated string that may or may not contain vendor data
-sub device_vendor {
+sub disk_vendor {
eval $start if $b_log;
my ($model,$serial) = @_;
my ($vendor) = ('');
- my (@data);
return if !$model;
- set_vendors() if !@vendors;
# 0 - match pattern; 1 - replace pattern; 2 - vendor print; 3 - serial pattern
- # Data URLs: inxi-resources.txt Section: DiskData device_vendor()
- # $model = 'MEDIAMAX ';
- # $model = 'Patriot Memory';
- foreach my $row (@vendors){
+ # Data URLs: inxi-resources.txt Section: DriveItem device_vendor()
+ # $model = 'H10 HBRPEKNX0202A NVMe INTEL 512GB';
+ # $model = 'SD Ultra 3D 1TB';
+ set_disk_vendors() if !$vendors;
+ # prefilter this one, some usb enclosurs and wrong master/slave hdd show default
+ $model =~ s/^Initio[\s_]//i;
+ foreach my $row (@$vendors){
if ($model =~ /$row->[0]/i || ($row->[3] && $serial && $serial =~ /$row->[3]/)){
$vendor = $row->[2];
# Usually we want to assign N/A at output phase, maybe do this logic there?
@@ -10030,87 +14543,162 @@ sub device_vendor {
}
$model =~ s/^[\/\[\s_-]+|[\/\s_-]+$//g;
$model =~ s/\s\s/ /g;
- @data = ($vendor,$model);
last;
}
}
eval $end if $b_log;
- return @data;
+ return [$vendor,$model];
}
# Normally hddtemp requires root, but you can set user rights in /etc/sudoers.
-# args: $1 - /dev/<disk> to be tested for
+# args: 0: /dev/<disk> to be tested for
sub hdd_temp {
eval $start if $b_log;
my ($device) = @_;
my ($path) = ('');
my (@data,$hdd_temp);
- if ($device =~ /nvme/i){
- if (!$b_nvme){
- $b_nvme = 1;
- if ($path = main::check_program('nvme')) {
- $nvme = $path;
+ $hdd_temp = hdd_temp_sys($device) if !$force{'hddtemp'} && -e "/sys/block/$device";
+ if (!$hdd_temp){
+ $device = "/dev/$device";
+ if ($device =~ /nvme/i){
+ if (!$b_nvme){
+ $b_nvme = 1;
+ if ($path = main::check_program('nvme')){
+ $nvme = $path;
+ }
+ }
+ if ($nvme){
+ $device =~ s/n[0-9]//;
+ @data = main::grabber("$sudoas$nvme smart-log $device 2>/dev/null");
+ foreach (@data){
+ my @row = split(/\s*:\s*/, $_);
+ next if !$row[0];
+ # other rows may have: Temperature sensor 1 :
+ if ($row[0] eq 'temperature'){
+ $row[1] =~ s/\s*C//;
+ $hdd_temp = $row[1];
+ last;
+ }
+ }
}
}
- if ($nvme){
- $device =~ s/n[0-9]//;
- @data = main::grabber("$sudo$nvme smart-log $device 2>/dev/null");
- foreach (@data){
- my @row = split /\s*:\s*/, $_;
- next if !$row[0];
- # other rows may have: Temperature sensor 1 :
- if ( $row[0] eq 'temperature') {
- $row[1] =~ s/\s*C//;
- $hdd_temp = $row[1];
- last;
+ else {
+ if (!$b_hddtemp){
+ $b_hddtemp = 1;
+ if ($path = main::check_program('hddtemp')){
+ $hddtemp = $path;
}
}
+ if ($hddtemp){
+ $hdd_temp = (main::grabber("$sudoas$hddtemp -nq -u C $device 2>/dev/null"))[0];
+ }
}
+ $hdd_temp =~ s/\s?(Celsius|C)$// if $hdd_temp;
}
+ eval $end if $b_log;
+ return $hdd_temp;
+}
+
+sub hdd_temp_sys {
+ eval $start if $b_log;
+ my ($device) = @_;
+ my ($hdd_temp,$hdd_temp_alt,%sensors,@data,@working);
+ my ($holder,$index) = ('','');
+ my $path = "/sys/block/$device/device";
+ my $path_trimmed = Cwd::abs_path("/sys/block/$device");
+ # slice out the part of path that gives us hwmon in earlier kernel drivetemp
+ $path_trimmed =~ s%/(block|nvme)/.*$%% if $path_trimmed;
+ print "device: $device path: $path\n path_trimmed: $path_trimmed\n" if $dbg[21];
+ return if ! -e $path && (!$path_trimmed || ! -e "$path_trimmed/hwmon");
+ # first type, trimmed block,nvme (ata and nvme), 5.9 kernel:
+ # /sys/devices/pci0000:10/0000:10:08.1/0000:16:00.2/ata8/host7/target7:0:0/7:0:0:0/hwmon/hwmon5/
+ # /sys/devices/pci0000:10/0000:10:01.2/0000:13:00.0/hwmon/hwmon0/ < nvme
+ # /sys/devices/pci0000:00/0000:00:01.3/0000:01:00.1/ata2/host1/target1:0:0/1:0:0:0/hwmon/hwmon3/
+ # second type, 5.10+ kernel:
+ # /sys/devices/pci0000:20/0000:20:03.1/0000:21:00.0/nvme/nvme0/nvme0n1/device/hwmon1
+ # /sys/devices/pci0000:00/0000:00:08.1/0000:0b:00.2/ata12/host11/target11:0:0/11:0:0:0/block/sdd/device/hwmon/hwmon1
+ # we don't want these items: crit|max|min|lowest|highest
+ # original kernel 5.8/9 match for nvme and sd, 5.10+ match for sd
+ if (-e "$path_trimmed/hwmon/"){
+ @data = main::globber("$path_trimmed/hwmon/hwmon*/temp*_{input,label}");
+ }
+ # this case only happens if path_trimmed case isn't there, but leave in case
+ elsif (-e "$path/hwmon/"){
+ @data = main::globber("$path/hwmon/hwmon*/temp*_{input,label}");
+ }
+ # current match for nvme, but fails for 5.8/9 kernel nvme
else {
- if (!$b_hddtemp){
- $b_hddtemp = 1;
- if ($path = main::check_program('hddtemp')) {
- $hddtemp = $path;
- }
+ @data = main::globber("$path/hwmon*/temp*_{input,label}");
+ }
+ # seeing long lag to read temp input files for some reason
+ foreach (sort @data){
+ # print "file: $_\n";
+ # print(main::reader($_,'',0),"\n");
+ $path = $_;
+ # cleanup everything in front of temp, the path
+ $path =~ s/^.*\///;
+ @working = split('_', $path);
+ if ($holder ne $working[0]){
+ $holder = $working[0];
}
- if ($hddtemp){
- $hdd_temp = (main::grabber("$sudo$hddtemp -nq -u C $device 2>/dev/null"))[0];
+ $sensors{$holder}->{$working[1]} = main::reader($_,'strip',0);
+ }
+ return if !%sensors;
+ if (keys %sensors == 1){
+ if ($sensors{$holder}->{'input'} && main::is_numeric($sensors{$holder}->{'input'})){
+ $hdd_temp = $sensors{$holder}->{'input'};
}
}
+ else {
+ # nvme drives can have > 1 temp types, but composite is the one we want if there
+ foreach (keys %sensors){
+ next if !$sensors{$_}->{'input'} || !main::is_numeric($sensors{$_}->{'input'});
+ if ($sensors{$_}->{'label'} && $sensors{$_}->{'label'} eq 'Composite'){
+ $hdd_temp = $sensors{$_}->{'input'};
+ last;
+ }
+ else{
+ $hdd_temp_alt = $sensors{$_}->{'input'};
+ }
+ }
+ $hdd_temp = $hdd_temp_alt if !defined $hdd_temp && defined $hdd_temp_alt;
+ }
+ $hdd_temp = sprintf("%.1f", $hdd_temp/1000) if $hdd_temp;
+ main::log_data('data',"device: $device temp: $hdd_temp") if $b_log;
+ main::log_data('dump','%sensors',\%sensors) if $b_log;
+ print Data::Dumper::Dumper \%sensors if $dbg[21];
eval $end if $b_log;
return $hdd_temp;
}
-# args: 1: block id
+
+# args: 0: block id
sub block_data {
eval $start if $b_log;
my ($id) = @_;
# 0: logical block size 1: disk physical block size/partition block size;
- my @blocks = (0,0);
my ($block_log,$block_size) = (0,0);
- #my $path_size = "/sys/block/$id/size";
+ # my $path_size = "/sys/block/$id/size";
my $path_log_block = "/sys/block/$id/queue/logical_block_size";
my $path_phy_block = "/sys/block/$id/queue/physical_block_size";
# legacy system path
- if (! -e $path_phy_block && -r "/sys/block/$id/queue/hw_sector_size" ){
+ if (! -e $path_phy_block && -e "/sys/block/$id/queue/hw_sector_size"){
$path_phy_block = "/sys/block/$id/queue/hw_sector_size";
}
- if ( -r $path_log_block || -r $path_phy_block ){
- $block_log = (main::reader($path_log_block))[0] if -r $path_log_block;
- $block_size = (main::reader($path_phy_block))[0] if -r $path_phy_block;
- }
+ $block_log = main::reader($path_log_block,'',0) if -r $path_log_block;
+ $block_size = main::reader($path_phy_block,'',0) if -r $path_phy_block;
# print "l-b: $block_log p-b: $block_size raw: $size_raw\n";
- @blocks = ($block_log,$block_size);
- main::log_data('dump','@blocks',\@blocks) if $b_log;
+ my $blocks = [$block_log,$block_size];
+ main::log_data('dump','@blocks',$blocks) if $b_log;
eval $end if $b_log;
- return @blocks;
+ return $blocks;
}
-sub device_speed {
+
+sub drive_speed {
eval $start if $b_log;
my ($device) = @_;
- my ($b_nvme,$lanes,$speed,@data);
+ my ($b_nvme,$lanes,$speed);
my $working = Cwd::abs_path("/sys/class/block/$device");
- #print "$working\n";
+ # print "$working\n";
if ($working){
my ($id);
# slice out the ata id:
@@ -10136,17 +14724,17 @@ sub device_speed {
if (defined $id){
if ($b_nvme){
$working = "/sys/class/nvme/$id/device/max_link_speed";
- $speed = (main::reader($working))[0] if -f $working;
- if ($speed =~ /([0-9\.]+)\sGT\/s/){
+ $speed = main::reader($working,'',0) if -r $working;
+ if (defined $speed && $speed =~ /([0-9\.]+)\sGT\/s/){
$speed = $1;
# pcie1: 2.5 GT/s; pcie2: 5.0 GT/s; pci3: 8 GT/s
# NOTE: PCIe 3 stopped using the 8b/10b encoding but a sample pcie3 nvme has
# rated speed of GT/s * .8 anyway. GT/s * (128b/130b)
- $speed = ($speed <= 5 ) ? $speed * .8 : $speed * 128/130;
+ $speed = ($speed <= 5) ? $speed * .8 : $speed * 128/130;
$speed = sprintf("%.1f",$speed) if $speed;
$working = "/sys/class/nvme/$id/device/max_link_width";
- $lanes = (main::reader($working))[0] if -f $working;
- $lanes = 1 if !$lanes;
+ $lanes = main::reader($working,'',0) if -r $working;
+ $lanes ||= 1;
# https://www.edn.com/electronics-news/4380071/What-does-GT-s-mean-anyway-
# https://www.anandtech.com/show/2412/2
# http://www.tested.com/tech/457440-theoretical-vs-actual-bandwidth-pci-express-and-thunderbolt/
@@ -10157,846 +14745,2869 @@ sub device_speed {
}
else {
$working = "/sys/class/ata_link/link$id/sata_spd";
- $speed = (main::reader($working))[0] if -f $working;
- $speed = main::disk_cleaner($speed) if $speed;
+ $speed = main::reader($working,'',0) if -r $working;
+ $speed = main::clean_disk($speed) if $speed;
$speed =~ s/Gbps/Gb\/s/ if $speed;
}
}
}
- @data = ($speed,$lanes);
- #print "$working $speed\n";
- eval $end if $b_log;
- return @data;
-}
-# gptid/c5e940f1-5ce2-11e6-9eeb-d05099ac4dc2 N/A ada0p1
-sub match_glabel {
- eval $start if $b_log;
- my ($gptid) = @_;
- return if !@glabel || ! $gptid;
- #$gptid =~ s/s[0-9]+$//;
- my ($dev_id) = ('');
- foreach (@glabel){
- my @temp = split /\s+/, $_;
- my $gptid_trimmed = $gptid;
- # slice off s[0-9] from end in case they use slice syntax
- $gptid_trimmed =~ s/s[0-9]+$//;
- if (defined $temp[0] && ($temp[0] eq $gptid || $temp[0] eq $gptid_trimmed ) ){
- $dev_id = $temp[2];
- last;
- }
- }
- $dev_id ||= $gptid; # no match? return full string
- eval $end if $b_log;
- return $dev_id;
-}
-sub set_glabel {
- eval $start if $b_log;
- $b_glabel = 1;
- if (my $path = main::check_program('glabel')){
- @glabel = main::grabber("$path status 2>/dev/null");
- }
- main::log_data('dump','@glabel:with Headers',\@glabel) if $b_log;
- # get rid of first header line
- shift @glabel;
+ # print "$working $speed\n";
eval $end if $b_log;
+ return [$speed,$lanes];
}
}
-## GraphicData
+## GraphicItem
{
-package GraphicData;
-my $driver = ''; # we need this as a fallback in case no xorg log found
-my %graphics;
+package GraphicItem;
+my ($b_primary,$b_wayland_data,%graphics,%mesa_drivers,
+$monitor_ids,$monitor_map);
+my ($gpu_amd,$gpu_intel,$gpu_nv);
+
sub get {
eval $start if $b_log;
- my (@data,@rows);
+ my $rows = [];
my $num = 0;
- if (($b_arm || $b_mips) && !$b_soc_gfx && !$b_pci_tool){
- my $type = ($b_arm) ? 'arm' : 'mips';
+ if (%risc && !$use{'soc-gfx'} && !$use{'pci-tool'}){
my $key = 'Message';
- @data = ({
- main::key($num++,0,1,$key) => main::row_defaults($type . '-pci',''),
- },);
- @rows = (@rows,@data);
+ @$rows = ({
+ main::key($num++,0,1,$key) => main::message('risc-pci',$risc{'id'})
+ });
}
else {
- @data = card_data();
- @rows = (@rows,@data);
- if (!@rows){
+ device_output($rows);
+ ($gpu_amd,$gpu_intel,$gpu_nv) = ();
+ if (!@$rows){
my $key = 'Message';
+ my $message = '';
my $type = 'pci-card-data';
- if ($pci_tool && ${$alerts{$pci_tool}}{'action'} eq 'permissions'){
+ if ($pci_tool && $alerts{$pci_tool}->{'action'} eq 'permissions'){
$type = 'pci-card-data-root';
}
- @data = ({
- main::key($num++,0,1,$key) => main::row_defaults($type,''),
- },);
- @rows = (@rows,@data);
+ elsif (!$bsd_type && !%risc && !$pci_tool &&
+ $alerts{'lspci'}->{'action'} &&
+ $alerts{'lspci'}->{'action'} eq 'missing'){
+ $message = $alerts{'lspci'}->{'message'};
+ }
+ $message = main::message($type,'') if !$message;
+ @$rows = ({
+ main::key($num++,0,1,$key) => $message
+ });
}
}
# note: not perfect, but we need usb gfx to show for all types, soc, pci, etc
- @data = usb_data();
- @rows = (@rows,@data);
- @data = display_data();
- @rows = (@rows,@data);
- @data = gl_data();
- @rows = (@rows,@data);
+ usb_output($rows);
+ display_output($rows);
+ display_api($rows);
+ (%graphics,$monitor_ids,$monitor_map) = ();
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub card_data {
+## DEVICE OUTPUT ##
+sub device_output {
eval $start if $b_log;
- my (@rows,@data);
+ return if !$devices{'graphics'};
+ my $rows = $_[0];
my ($j,$num) = (0,1);
- foreach (@devices_graphics){
+ my ($bus_id);
+ set_monitors_sys() if !$monitor_ids && -e '/sys/class/drm';
+ foreach my $row (@{$devices{'graphics'}}){
$num = 1;
- my @row = @$_;
- #print "$row[0] $row[3]\n";
+ # print "$row->[0] $row->[3]\n";
# not using 3D controller yet, needs research: |3D controller |display controller
# note: this is strange, but all of these can be either a separate or the same
# card. However, by comparing bus id, say: 00:02.0 we can determine that the
# cards are either the same or different. We want only the .0 version as a valid
# card. .1 would be for example: Display Adapter with bus id x:xx.1, not the right one
- next if $row[3] != 0;
- #print "$row[0] $row[3]\n";
- $j = scalar @rows;
- $driver = $row[9];
- $driver ||= 'N/A';
- my $card = main::trimmer($row[4]);
- $card = ($card) ? main::pci_cleaner($card,'output') : 'N/A';
+ next if $row->[3] != 0;
+ # print "$row->[0] $row->[3]\n";
+ $j = scalar @$rows;
+ my $device = main::trimmer($row->[4]);
+ ($bus_id) = ();
+ $device = ($device) ? main::clean_pci($device,'output') : 'N/A';
# have seen absurdly verbose card descriptions, with non related data etc
- if (length($card) > 85 || $size{'max'} < 110){
- $card = main::pci_long_filter($card);
+ if (length($device) > 85 || $size{'max-cols'} < 110){
+ $device = main::filter_pci_long($device);
}
- @data = ({
- main::key($num++,1,1,'Device') => $card,
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $device,
},);
- @rows = (@rows,@data);
- if ($extra > 0 && $b_pci_tool && $row[12]){
- my $item = main::get_pci_vendor($row[4],$row[12]);
- $rows[$j]{main::key($num++,0,2,'vendor')} = $item if $item;
- }
- $rows[$j]{main::key($num++,1,2,'driver')} = $driver;
- if ($row[9] && !$bsd_type){
- my $version = main::get_module_version($row[9]);
+ if ($extra > 0 && $use{'pci-tool'} && $row->[12]){
+ my $item = main::get_pci_vendor($row->[4],$row->[12]);
+ $rows->[$j]{main::key($num++,0,2,'vendor')} = $item if $item;
+ }
+ push(@{$graphics{'gpu-drivers'}},$row->[9]) if $row->[9];
+ my $driver = ($row->[9]) ? $row->[9]:'N/A';
+ $rows->[$j]{main::key($num++,1,2,'driver')} = $driver;
+ if ($row->[9] && !$bsd_type){
+ my $version = main::get_module_version($row->[9]);
$version ||= 'N/A';
- $rows[$j]{main::key($num++,0,3,'v')} = $version;
- }
- if ($b_admin && $row[10]){
- $row[10] = main::get_driver_modules($row[9],$row[10]);
- $rows[$j]{main::key($num++,0,3,'alternate')} = $row[10] if $row[10];
+ $rows->[$j]{main::key($num++,0,3,'v')} = $version;
+ }
+ if ($b_admin && $row->[10]){
+ $row->[10] = main::get_driver_modules($row->[9],$row->[10]);
+ $rows->[$j]{main::key($num++,0,3,'alternate')} = $row->[10] if $row->[10];
+ }
+ if ($extra > 0 && $row->[5] && $row->[6] &&
+ $row->[5] =~ /^(1002|10de|12d2|8086)$/){
+ # legacy: 1180 0df7 0029 current: 13bc 1c8d 24b1 regex: H100, RTX 4000
+ # ($row->[5],$row->[6],$row->[4]) = ('12de','0029','');
+ my ($gpu_data,$b_nv) = gpu_data($row->[5],$row->[6],$row->[4]);
+ if (!$bsd_type && $b_nv && $b_admin){
+ if ($gpu_data->{'legacy'}){
+ $rows->[$j]{main::key($num++,1,3,'non-free')} = '';
+ $rows->[$j]{main::key($num++,0,4,'series')} = $gpu_data->{'series'};
+ $rows->[$j]{main::key($num++,0,4,'status')} = $gpu_data->{'status'};
+ if ($gpu_data->{'xorg'}){
+ $rows->[$j]{main::key($num++,1,4,'last')} = '';
+ $rows->[$j]{main::key($num++,0,5,'release')} = $gpu_data->{'release'};
+ $rows->[$j]{main::key($num++,0,5,'kernel')} = $gpu_data->{'kernel'};
+ $rows->[$j]{main::key($num++,0,5,'xorg')} = $gpu_data->{'xorg'};
+ }
+ }
+ else {
+ $gpu_data->{'series'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,3,'non-free')} = $gpu_data->{'series'};
+ $rows->[$j]{main::key($num++,0,4,'status')} = $gpu_data->{'status'};
+ }
+ }
+ if ($gpu_data->{'arch'}){
+ $rows->[$j]{main::key($num++,1,2,'arch')} = $gpu_data->{'arch'};
+ # we don't need to see repeated values here, but usually code is different.
+ if ($b_admin && $gpu_data->{'code'} &&
+ $gpu_data->{'code'} ne $gpu_data->{'arch'}){
+ $rows->[$j]{main::key($num++,0,3,'code')} = $gpu_data->{'code'};
+ }
+ if ($b_admin && $gpu_data->{'process'}){
+ $rows->[$j]{main::key($num++,0,3,'process')} = $gpu_data->{'process'};
+ }
+ if ($b_admin && $gpu_data->{'years'}){
+ $rows->[$j]{main::key($num++,0,3,'built')} = $gpu_data->{'years'};
+ }
+ }
}
if ($extra > 0){
- $rows[$j]{main::key($num++,0,2,'bus ID')} = (!$row[2] && !$row[3]) ? 'N/A' : "$row[2].$row[3]";
+ $bus_id = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
+ if ($extra > 1 && $bus_id ne 'N/A'){
+ main::get_pcie_data($bus_id,$j,$rows,\$num,'gpu');
+ }
+ if ($extra > 1 && $monitor_ids){
+ port_output($bus_id,$j,$rows,\$num);
+ }
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = $bus_id;
}
if ($extra > 1){
- $rows[$j]{main::key($num++,0,2,'chip ID')} = ($row[5]) ? "$row[5]:$row[6]" : $row[6];
+ my $chip_id = main::get_chip_id($row->[5],$row->[6]);
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $chip_id;
+ }
+ if ($extra > 2 && $row->[1]){
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = $row->[1];
}
- #print "$row[0]\n";
+ if (!$bsd_type && $extra > 0 && $bus_id ne 'N/A' && $bus_id =~ /\.0$/){
+ my $temp = main::get_device_temp($bus_id);
+ if ($temp){
+ $rows->[$j]{main::key($num++,0,2,'temp')} = $temp . ' C';
+ }
+ }
+ # print "$row->[0]\n";
}
- #my $ref = $pci[-1];
- #print $$ref[0],"\n";
eval $end if $b_log;
- return @rows;
}
-sub usb_data {
+
+sub usb_output {
eval $start if $b_log;
- my (@rows,@data,@ids,$driver,$path_id,$product,@temp2);
+ my $rows = $_[0];
+ my (@ids,$driver,$path_id,$product,@temp2);
my ($j,$num) = (0,1);
- return if !@usb;
- foreach my $ref (@usb){
- my @row = @$ref;
+ return if !$usb{'graphics'};
+ foreach my $row (@{$usb{'graphics'}}){
# these tests only work for /sys based usb data for now
- if ($row[14] && ($row[14] eq 'Audio-Video' || $row[14] eq 'Video' ) ){
- $num = 1;
- $j = scalar @rows;
- # makre sure to reset, or second device trips last flag
- ($driver,$path_id,$product) = ('','','');
- $product = main::cleaner($row[13]) if $row[13];
- $driver = $row[15] if $row[15];
- $path_id = $row[2] if $row[2];
- $product ||= 'N/A';
- # note: for real usb video out, no generic drivers? webcams may have one though
- if (!$driver){
- if ($row[14] eq 'Audio-Video'){
- $driver = 'N/A';
+ $num = 1;
+ $j = scalar @$rows;
+ # make sure to reset, or second device trips last flag
+ ($driver,$path_id,$product) = ('','','');
+ $product = main::clean($row->[13]) if $row->[13];
+ $driver = $row->[15] if $row->[15];
+ $path_id = $row->[2] if $row->[2];
+ $product ||= 'N/A';
+ # note: for real usb video out, no generic drivers? webcams may have one though
+ if (!$driver){
+ if ($row->[14] eq 'audio-video'){
+ $driver = 'N/A';
+ }
+ else {
+ $driver = 'N/A';
+ }
+ }
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $product,
+ main::key($num++,0,2,'driver') => $driver,
+ main::key($num++,1,2,'type') => 'USB',
+ },);
+ if ($extra > 0){
+ if ($extra > 1){
+ $row->[8] ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'rev')} = $row->[8];
+ if ($row->[17]){
+ $rows->[$j]{main::key($num++,0,3,'speed')} = $row->[17];
}
- else {
- $driver = 'N/A';
+ if ($row->[24]){
+ $rows->[$j]{main::key($num++,0,3,'lanes')} = $row->[24];
+ }
+ if ($b_admin && $row->[22]){
+ $rows->[$j]{main::key($num++,0,3,'mode')} = $row->[22];
}
}
- @data = ({
- main::key($num++,1,1,'Device') => $product,
- main::key($num++,0,2,'type') => 'USB',
- main::key($num++,0,2,'driver') => $driver,
- },);
- @rows = (@rows,@data);
- if ($extra > 0){
- $rows[$j]{main::key($num++,0,2,'bus ID')} = "$path_id:$row[1]";
+ my $bus_id = "$path_id:$row->[1]";
+ if ($monitor_ids){
+ port_output($bus_id,$j,$rows,\$num);
}
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = $bus_id;
if ($extra > 1){
- $row[7] ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'chip ID')} = $row[7];
+ $row->[7] ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $row->[7];
}
- if ($extra > 2 && $row[16]){
- $rows[$j]{main::key($num++,0,2,'serial')} = main::apply_filter($row[16]);
+ if ($extra > 2){
+ if (defined $row->[5] && $row->[5] ne ''){
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = "$row->[4]$row->[5]";
+ }
+ if ($row->[16]){
+ $rows->[$j]{main::key($num++,0,2,'serial')} = main::filter($row->[16]);
+ }
}
}
}
eval $end if $b_log;
- return @rows;
}
-sub display_data(){
+
+# args: $rows, $num by ref
+sub port_output {
+ my ($bus_id,$j,$rows,$num) = @_;
+ my (@connected,@disabled,@empty);
+ foreach my $id (keys %$monitor_ids){
+ next if !$monitor_ids->{$id}{'status'};
+ if ($monitor_ids->{$id}{'path'} =~ m|\Q$bus_id/drm/\E|){
+ # status can be: connected|disconnected|unknown
+ if ($monitor_ids->{$id}{'status'} eq 'connected'){
+ if ($monitor_ids->{$id}{'enabled'} eq 'enabled'){
+ push(@connected,$id);
+ }
+ else {
+ push(@disabled,$id);
+ }
+ }
+ else {
+ push(@empty,$id);
+ }
+ }
+ }
+ if (@connected || @empty || @disabled){
+ my ($off,$active,$unused);
+ my $split = ','; # add space if many to allow for wrapping
+ $rows->[$j]{main::key($$num++,1,2,'ports')} = '';
+ $split = ', ' if scalar @connected > 3;
+ $active = (@connected) ? join($split,sort @connected) : 'none';
+ $rows->[$j]{main::key($$num++,0,3,'active')} = $active;
+ if (@disabled){
+ $split = (scalar @disabled > 3) ? ', ' : ',';
+ $off = join($split,sort @disabled);
+ $rows->[$j]{main::key($$num++,0,3,'off')} = $off;
+ }
+ $split = (scalar @empty > 3) ? ', ' : ',';
+ $unused = (@empty) ? join($split,sort @empty) : 'none';
+ $rows->[$j]{main::key($$num++,0,3,'empty')} = $unused;
+ }
+}
+
+## DISPLAY OUTPUT ##
+sub display_output(){
eval $start if $b_log;
- my (@row);
- my ($num,$protocol) = (0,'');
+ my $rows = $_[0];
+ my ($num,$j) = (0,scalar @$rows);
# note: these may not always be set, they won't be out of X, for example
- $protocol = get_protocol();
+ display_protocol();
+ # get rid of all inactive or disabled monitor port ids
+ set_active_monitors() if $monitor_ids;
+ $graphics{'protocol'} = 'wayland' if $force{'wayland'};
# note, since the compositor is the server with wayland, always show it
- if ($extra > 1 || $protocol eq 'wayland'){
- set_compositor($protocol);
+ if ($extra > 1 || $graphics{'protocol'} eq 'wayland'){
+ set_compositor_data();
}
- if ( $b_display){
- x_display_data();
- # currently barebones, wayland needs a lot more work
- if ($protocol && $protocol eq 'wayland' && !$graphics{'screens'}){
- wayland_display_data();
- # it worked! we got screen data
- $graphics{'no-xdpyinfo'} = undef if $graphics{'screens'};
+ if ($b_display){
+ # Add compositors as data sources found
+ if ($graphics{'protocol'} eq 'wayland'){
+ display_data_wayland();
+ }
+ if (!$b_wayland_data){
+ display_data_x() if !$force{'wayland'};
}
}
else {
$graphics{'tty'} = tty_data();
}
- # this gives better output than the failure last case, which would only show:
- # for example: X.org: 1.9 instead of: X.org: 1.9.0
- $graphics{'x-version'} = $graphics{'xorg-version'} if $graphics{'xorg-version'};;
- $graphics{'x-version'} = x_version() if !$graphics{'x-version'};
- $graphics{'x-version'} = $graphics{'x-version-id'} if !$graphics{'x-version'};
- #print Data::Dumper::Dumper \%graphics;
+ # no xdpyinfo installed
+ # undef $graphics{'x-server'};
+ # Completes X server data if no previous detections, tests/adds xwayland
+ display_server_data();
+ if (!defined $graphics{'display-id'} && defined $ENV{'DISPLAY'}){
+ $graphics{'display-id'} = $ENV{'DISPLAY'};
+ }
+ # print Data::Dumper::Dumper $graphics{'x-server'};
+ # print Data::Dumper::Dumper \%graphics;
if (%graphics){
- my ($driver_missing,$resolution,$server_string) = ('','','');
- # print "$graphics{'x-vendor'} $graphics{'x-version'} $graphics{'x-vendor-release'}","\n";
- if ($graphics{'x-vendor'}){
- my $version = ($graphics{'x-version'}) ? " $graphics{'x-version'}" : '';
- #$version = (!$version && $graphics{'x-vendor-release'}) ? " $graphics{'x-vendor-release'}" : '';
- $server_string = "$graphics{'x-vendor'}$version";
- #print "$server_string\n";
- }
- elsif ($graphics{'x-version'}) {
- if ($graphics{'x-version'} =~ /^Xvesa/){
- $server_string = $graphics{'x-version'};
- }
- else {
- $server_string = "X.org $graphics{'x-version'}";
- }
- }
- my @drivers = x_drivers();
- if (!$protocol && !$server_string && !$graphics{'x-vendor'} && !@drivers){
- $server_string = main::row_defaults('display-server');
- @row = ({
+ my ($driver_note,$resolution,$server_string) = ('','','');
+ my ($b_screen_monitors);
+ my $x_drivers = (!$force{'wayland'}) ? display_drivers_x() : [];
+ # print 'result: ', Data::Dumper::Dumper $x_drivers;
+ # print "$graphics{'x-server'} $graphics{'x-version'} $graphics{'x-vendor-release'}","\n";
+ if ($graphics{'x-server'}){
+ $server_string = $graphics{'x-server'}->[0][0];
+ # print "$server_string\n";
+ }
+ if (!$graphics{'protocol'} && !$server_string && !$graphics{'x-server'} &&
+ !@$x_drivers && !$graphics{'compositors'}){
+ $server_string = main::message('display-server');
+ push(@$rows,{
main::key($num++,1,1,'Display') => '',
main::key($num++,0,2,'server') => $server_string,
});
}
else {
$server_string ||= 'N/A';
- @row = ({
- main::key($num++,1,1,'Display') => $protocol,
- main::key($num++,0,2,'server') => $server_string,
+ push(@$rows, {
+ main::key($num++,1,1,'Display') => $graphics{'protocol'},
+ main::key($num++,1,2,'server') => $server_string,
});
- if ($graphics{'compositor'}){
- $row[0]{main::key($num++,0,2,'compositor')} = $graphics{'compositor'};
- if ($graphics{'compositor-version'}){
- $row[0]{main::key($num++,0,3,'v')} = $graphics{'compositor-version'};
+ if ($graphics{'x-server'} && $graphics{'x-server'}->[0][1]){
+ $rows->[$j]{main::key($num++,0,3,'v')} = $graphics{'x-server'}->[0][1];
+ }
+ if ($graphics{'x-server'} && $graphics{'x-server'}->[1][0]){
+ $rows->[$j]{main::key($num++,1,3,'with')} = $graphics{'x-server'}->[1][0];
+ if ($graphics{'x-server'}->[1][1]){
+ $rows->[$j]{main::key($num++,0,4,'v')} = $graphics{'x-server'}->[1][1];
+ }
+ }
+ if ($graphics{'compositors'}){
+ if (scalar @{$graphics{'compositors'}} == 1){
+ $rows->[$j]{main::key($num++,1,2,'compositor')} = $graphics{'compositors'}->[0][0];
+ if ($graphics{'compositors'}->[0][1]){
+ $rows->[$j]{main::key($num++,0,3,'v')} = $graphics{'compositors'}->[0][1];
+ }
+ }
+ else {
+ my $i =1;
+ $rows->[$j]{main::key($num++,1,2,'compositors')} = '';
+ foreach (@{$graphics{'compositors'}}){
+ $rows->[$j]{main::key($num++,1,3,$i)} = $_->[0];
+ if ($_->[1]){
+ $rows->[$j]{main::key($num++,0,4,'v')} = $_->[1];
+ }
+ $i++;
+ }
}
}
# note: if no xorg log, and if wayland, there will be no xorg drivers,
- # obviously, so we use the last driver found on the card section in that case.
- # those come from lscpi kernel drivers so there should be no xorg/wayland issues.
- if (!$drivers[0]){
- # Fallback: specific case: in Arch/Manjaro gdm run systems, their Xorg.0.log is
+ # obviously, so we use the driver(s) found in the card section.
+ # Those come from lspci kernel drivers so should be no xorg/wayland issues.
+ if (!@$x_drivers || !$x_drivers->[0]){
+ # Fallback: specific case: in Arch/Manjaro gdm run systems, Xorg.0.log is
# located inside this directory, which is not readable unless you are root
# Normally Arch gdm log is here: ~/.local/share/xorg/Xorg.1.log
- # $driver comes from the Device lines, and is just last fallback.
- if ($driver){
- if (-e '/var/lib/gdm' && !$b_root ){
- $driver_missing = main::row_defaults('display-driver-na') . ' - ' . main::row_defaults('root-suggested');
+ if (!$graphics{'protocol'} || $graphics{'protocol'} ne 'wayland'){
+ # Problem: as root, wayland has no info anyway, including wayland detection.
+ if (-e '/var/lib/gdm' && !$b_root){
+ if ($graphics{'gpu-drivers'}){
+ $driver_note = main::message('display-driver-na-try-root');
+ }
+ else {
+ $driver_note = main::message('root-suggested');
+ }
+ }
+ }
+ }
+ # if TinyX, will always have display-driver set
+ if ($graphics{'tinyx'} && $graphics{'display-driver'}){
+ $rows->[$j]{main::key($num++,0,2,'driver')} = join(',',@{$graphics{'display-driver'}});
+ }
+ else {
+ my $gpu_drivers = gpu_drivers_sys('all');
+ my $note_indent = 4;
+ if (@$gpu_drivers || $graphics{'dri-drivers'} || @$x_drivers){
+ $rows->[$j]{main::key($num++,1,2,'driver')} = '';
+ # The only wayland setups with x drivers have xorg, transitional that is.
+ if (@$x_drivers){
+ $rows->[$j]{main::key($num++,1,3,'X')} = '';
+ my $driver = ($x_drivers->[0]) ? join(',',@{$x_drivers->[0]}) : 'N/A';
+ $rows->[$j]{main::key($num++,1,4,'loaded')} = $driver;
+ if ($x_drivers->[1]){
+ $rows->[$j]{main::key($num++,0,4,'unloaded')} = join(',',@{$x_drivers->[1]});
+ }
+ if ($x_drivers->[2]){
+ $rows->[$j]{main::key($num++,0,4,'failed')} = join(',',@{$x_drivers->[2]});
+ }
+ if ($extra > 1 && $x_drivers->[3]){
+ $rows->[$j]{main::key($num++,0,4,'alternate')} = join(',',@{$x_drivers->[3]});
+ }
+ }
+ if ($graphics{'dri-drivers'}){
+ # note: if want to exclude if matches gpu/x driver, loop through and test.
+ # Here using all dri drivers found.
+ $rows->[$j]{main::key($num++,1,3,'dri')} = join(',',@{$graphics{'dri-drivers'}});
+ }
+ my $drivers;
+ if (@$gpu_drivers){
+ $drivers = join(',',@$gpu_drivers);
}
else {
- $driver_missing = main::row_defaults('display-driver-na');
+ $drivers = ($graphics{'gpu-drivers'}) ? join(',',@{$graphics{'gpu-drivers'}}): 'N/A';
}
+ $rows->[$j]{main::key($num++,1,3,'gpu')} = $drivers;
}
else {
- $driver_missing = main::row_defaults('root-suggested') if -e '/var/lib/gdm' && !$b_root;
+ $note_indent = 3;
+ $rows->[$j]{main::key($num++,1,2,'driver')} = 'N/A';
+ }
+ if ($driver_note){
+ $rows->[$j]{main::key($num++,0,$note_indent,'note')} = $driver_note;
}
}
- else {
- $driver = $drivers[0];
- }
- $driver ||= 'N/A';
- $row[0]{main::key($num++,0,2,'driver')} = $driver;
- if ($driver_missing){
- $row[0]{main::key($num++,0,3,'note')} = $driver_missing;
- }
- if ($drivers[2]){
- $row[0]{main::key($num++,0,3,'FAILED')} = $drivers[2];
- }
- if ($drivers[1]){
- $row[0]{main::key($num++,0,3,'unloaded')} = $drivers[1];
- }
- if ($extra > 1 && $drivers[3]){
- $row[0]{main::key($num++,0,3,'alternate')} = $drivers[3];
- }
}
- if ($b_admin ){
+ if (!$show{'graphic-basic'} && $extra > 1 && $graphics{'display-rect'}){
+ $rows->[$j]{main::key($num++,0,2,'d-rect')} = $graphics{'display-rect'};
+ }
+ if (!$show{'graphic-basic'} && $extra > 1){
if (defined $graphics{'display-id'}){
- $row[0]{main::key($num++,0,2,'display ID')} = $graphics{'display-id'};
+ $rows->[$j]{main::key($num++,0,2,'display-ID')} = $graphics{'display-id'};
}
if (defined $graphics{'display-screens'}){
- $row[0]{main::key($num++,0,2,'screens')} = $graphics{'display-screens'};
+ $rows->[$j]{main::key($num++,0,2,'screens')} = $graphics{'display-screens'};
}
if (defined $graphics{'display-default-screen'} &&
$graphics{'display-screens'} && $graphics{'display-screens'} > 1){
- $row[0]{main::key($num++,0,2,'default screen')} = $graphics{'display-default-screen'};
+ $rows->[$j]{main::key($num++,0,2,'default screen')} = $graphics{'display-default-screen'};
}
}
- if ($graphics{'no-xdpyinfo'}){
- $row[0]{main::key($num++,0,2,'resolution')} = $graphics{'no-xdpyinfo'};
+ # TinyX may pack actual resolution data into no-screens if it was found
+ if ($graphics{'no-screens'}){
+ my $res = (!$show{'graphic-basic'} && $extra > 1 && !$graphics{'tinyx'}) ? 'note' : 'resolution';
+ $rows->[$j]{main::key($num++,0,2,$res)} = $graphics{'no-screens'};
}
elsif ($graphics{'screens'}){
my ($diag,$dpi,$hz,$size);
- my ($m_count,$basic_count,$row_key,$screen_count) = (0,0,0,0);
+ my ($m_count,$basic_count,$screen_count) = (0,0,0);
my $s_count = ($graphics{'screens'}) ? scalar @{$graphics{'screens'}}: 0;
- foreach (@{$graphics{'screens'}}){
- my %main = %$_;
- $m_count = scalar @{$main{'monitors'}} if $main{'monitors'};
+ foreach my $main (@{$graphics{'screens'}}){
+ $m_count = scalar keys %{$main->{'monitors'}} if $main->{'monitors'};
$screen_count++;
- ($diag,$dpi,$hz,$resolution,$size) = (undef);
- $row_key++ if !$show{'graphic-basic'};
- if ( !$show{'graphic-basic'} || $m_count == 0 ){
- if ( !$show{'graphic-basic'} && defined $main{'screen'} ){
- $row[$row_key]{main::key($num++,1,2,'Screen')} = $main{'screen'};
+ ($diag,$dpi,$hz,$resolution,$size) = ();
+ $j++ if !$show{'graphic-basic'};
+ if (!$show{'graphic-basic'} || $m_count == 0){
+ if (!$show{'graphic-basic'} && defined $main->{'screen'}){
+ $rows->[$j]{main::key($num++,1,2,'Screen')} = $main->{'screen'};
+ }
+ if ($main->{'res-x'} && $main->{'res-y'}){
+ $resolution = $main->{'res-x'} . 'x' . $main->{'res-y'};
+ if ($main->{'hz'} && $show{'graphic-basic'}){
+ $resolution .= '~' . $main->{'hz'} . 'Hz';
+ }
}
- $resolution = $main{'res-x'} . 'x' . $main{'res-y'} if $main{'res-x'} && $main{'res-y'};
- $resolution .= '~' . $main{'hz'} . 'Hz' if $show{'graphic-basic'} && $main{'hz'} && $resolution;
$resolution ||= 'N/A';
if ($s_count == 1 || !$show{'graphic-basic'}){
- $row[$row_key]{main::key($num++,0,3,'s-res')} = $resolution;
+ $rows->[$j]{main::key($num++,0,3,'s-res')} = $resolution;
}
- elsif ($show{'graphic-basic'}) {
- $row[$row_key]{main::key($num++,0,3,'s-res')} = '' if $screen_count == 1;
- $row[$row_key]{main::key($num++,0,3,$screen_count)} = $resolution;
+ elsif ($show{'graphic-basic'}){
+ $rows->[$j]{main::key($num++,0,3,'s-res')} = '' if $screen_count == 1;
+ $rows->[$j]{main::key($num++,0,3,$screen_count)} = $resolution;
}
- $resolution = '';
- if ($main{'s-dpi'} && (!$show{'graphic-basic'} || $extra > 1)){
- $row[$row_key]{main::key($num++,0,3,'s-dpi')} = $main{'s-dpi'};
+ if ($main->{'s-dpi'} && (!$show{'graphic-basic'} && $extra > 1)){
+ $rows->[$j]{main::key($num++,0,3,'s-dpi')} = $main->{'s-dpi'};
}
- if ( !$show{'graphic-basic'} ){
- if ($main{'size-x'} && $main{'size-y'}){
- $size = $main{'size-x'} . 'x' . $main{'size-y'} .
- 'mm ('. $main{'size-x-i'} . 'x' . $main{'size-y-i'} . '")';
+ if (!$show{'graphic-basic'} && $extra > 2){
+ if ($main->{'size-missing'}){
+ $rows->[$j]{main::key($num++,0,3,'s-size')} = $main->{'size-missing'};
}
- $size ||= '';
- $row[$row_key]{main::key($num++,0,3,'s-size')} = $size if $size;
- if ($main{'diagonal'}){
- $diag = $main{'diagonal-m'} . 'mm ('. $main{'diagonal'} . '")';
+ else {
+ if ($main->{'size-x'} && $main->{'size-y'}){
+ $size = $main->{'size-x'} . 'x' . $main->{'size-y'} .
+ 'mm ('. $main->{'size-x-i'} . 'x' . $main->{'size-y-i'} . '")';
+ $rows->[$j]{main::key($num++,0,3,'s-size')} = $size;
+ }
+ if ($main->{'diagonal'}){
+ $diag = $main->{'diagonal-m'} . 'mm ('. $main->{'diagonal'} . '")';
+ $rows->[$j]{main::key($num++,0,3,'s-diag')} = $diag;
+ }
}
- $diag ||= '';
- $row[$row_key]{main::key($num++,0,3,'s-diag')} = $diag if $diag;
}
}
- if ($main{'monitors'}){
- #print $basic_count . '::' . $m_count, "\n";
- foreach my $ref2 (@{$main{'monitors'}}){
- my %monitor = %$ref2;
- ($diag,$dpi,$hz,$resolution,$size) = (undef);
- if ($show{'graphic-basic'}){
- $basic_count++;
- if ($monitor{'res-x'} && $monitor{'res-y'}){
- $resolution = $monitor{'res-x'} . 'x' . $monitor{'res-y'};
+ if ($main->{'monitors'}){
+ # print $basic_count . '::' . $m_count, "\n";
+ $b_screen_monitors = 1;
+ if ($show{'graphic-basic'}){
+ monitors_output_basic('screen',$main->{'monitors'},
+ $main->{'s-dpi'},$j,$rows,\$num);
+ }
+ else {
+ monitors_output_full('screen',$main->{'monitors'},
+ \$j,$rows,\$num);
+ }
+ }
+ elsif (!$show{'graphic-basic'} && $graphics{'no-monitors'}){
+ $rows->[$j]{main::key($num++,0,4,'monitors')} = $graphics{'no-monitors'};
+ }
+ }
+ }
+ elsif (!$b_display){
+ $graphics{'tty'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'tty')} = $graphics{'tty'};
+ }
+ # fallback, if no xrandr/xdpyinfo, if wayland, if console. Note we've
+ # deleted each key used in advanced_monitor_data() so those won't show again
+ if (!$b_screen_monitors && $monitor_ids && %$monitor_ids){
+ if ($show{'graphic-basic'}){
+ monitors_output_basic('monitor',$monitor_ids,'',$j,$rows,\$num);
+ }
+ else {
+ monitors_output_full('monitor',$monitor_ids,\$j,$rows,\$num);
+ }
+ }
+ }
+ eval $end if $b_log;
+}
+
+sub monitors_output_basic {
+ eval $start if $b_log;
+ my ($type,$monitors,$s_dpi,$j,$row,$num) = @_;
+ my ($dpi,$resolution);
+ my ($basic_count,$m_count) = (0,scalar keys %{$monitors});
+ foreach my $key (sort keys %{$monitors}){
+ if ($type eq 'monitor' && (!$monitors->{$key}{'res-x'} ||
+ !$monitors->{$key}{'res-y'})){
+ next;
+ }
+ ($dpi,$resolution) = ();
+ $basic_count++;
+ if ($monitors->{$key}{'res-x'} && $monitors->{$key}{'res-y'}){
+ $resolution = $monitors->{$key}{'res-x'} . 'x' . $monitors->{$key}{'res-y'};
+ }
+ # using main, not monitor, dpi because we want xorg dpi, not physical screen dpi
+ $dpi = $s_dpi if $resolution && $extra > 1 && $s_dpi;
+ if ($monitors->{$key}{'hz'} && $resolution){
+ $resolution .= '~' . $monitors->{$key}{'hz'} . 'Hz';
+ }
+ $resolution ||= 'N/A';
+ if ($basic_count == 1 && $m_count == 1){
+ $row->[$j]{main::key($$num++,0,2,'resolution')} = $resolution;
+ }
+ else {
+ if ($basic_count == 1){
+ $row->[$j]{main::key($$num++,1,2,'resolution')} = '';
+ }
+ $row->[$j]{main::key($$num++,0,3,$basic_count)} = $resolution;
+ }
+ if (!$show{'graphic-basic'} && $m_count == $basic_count && $dpi){
+ $row->[$j]{main::key($$num++,0,2,'s-dpi')} = $dpi;
+ }
+ }
+ eval $end if $b_log;
+}
+
+# args: $j, $row, $num passed by ref
+sub monitors_output_full {
+ eval $start if $b_log;
+ my ($type,$monitors,$j,$rows,$num) = @_;
+ my ($b_no_size,$resolution);
+ my ($m1,$m2,$m3,$m4) = ($type eq 'screen') ? (3,4,5,6) : (2,3,4,5);
+ # note: in case where mapped id != sys id, the key will not match 'monitor'
+ foreach my $key (sort keys %{$monitors}){
+ $$j++;
+ $rows->[$$j]{main::key($$num++,1,$m1,'Monitor')} = $monitors->{$key}{'monitor'};
+ if ($monitors->{$key}{'monitor-mapped'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'mapped')} = $monitors->{$key}{'monitor-mapped'};
+ }
+ if ($monitors->{$key}{'disabled'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'note')} = $monitors->{$key}{'disabled'};
+ }
+ if ($monitors->{$key}{'position'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'pos')} = $monitors->{$key}{'position'};
+ }
+ if ($monitors->{$key}{'model'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'model')} = $monitors->{$key}{'model'};
+ }
+ elsif ($monitors->{$key}{'model-id'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'model-id')} = $monitors->{$key}{'model-id'};
+ }
+ if ($extra > 2 && $monitors->{$key}{'serial'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'serial')} = main::filter($monitors->{$key}{'serial'});
+ }
+ if ($b_admin && $monitors->{$key}{'build-date'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'built')} = $monitors->{$key}{'build-date'};
+ }
+ if ($monitors->{$key}{'res-x'} || $monitors->{$key}{'res-y'} ||
+ $monitors->{$key}{'hz'} || $monitors->{$key}{'size-x'} ||
+ $monitors->{$key}{'size-y'}){
+ if ($monitors->{$key}{'res-x'} && $monitors->{$key}{'res-y'}){
+ $resolution = $monitors->{$key}{'res-x'} . 'x' . $monitors->{$key}{'res-y'};
+ }
+ $resolution ||= 'N/A';
+ $rows->[$$j]{main::key($$num++,0,$m2,'res')} = $resolution;
+ }
+ else {
+ if ($b_display){
+ $resolution = main::message('monitor-na');
+ }
+ else {
+ $resolution = main::message('monitor-console');
+ }
+ $b_no_size = 1;
+ $rows->[$$j]{main::key($$num++,0,$m2,'size-res')} = $resolution;
+ }
+ if ($extra > 2 && $monitors->{$key}{'hz'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'hz')} = $monitors->{$key}{'hz'};
+ }
+ if ($monitors->{$key}{'dpi'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'dpi')} = $monitors->{$key}{'dpi'};
+ }
+ if ($b_admin && $monitors->{$key}{'gamma'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'gamma')} = $monitors->{$key}{'gamma'};
+ }
+ if ($show{'edid'} && $monitors->{$key}{'colors'}){
+ $rows->[$$j]{main::key($$num++,1,$m2,'chroma')} = '';
+ $rows->[$$j]{main::key($$num++,1,$m3,'red')} = '';
+ $rows->[$$j]{main::key($$num++,0,$m4,'x')} = $monitors->{$key}{'colors'}{'red_x'};
+ $rows->[$$j]{main::key($$num++,0,$m4,'y')} = $monitors->{$key}{'colors'}{'red_y'};
+ $rows->[$$j]{main::key($$num++,1,$m3,'green')} = '';
+ $rows->[$$j]{main::key($$num++,0,$m4,'x')} = $monitors->{$key}{'colors'}{'green_x'};
+ $rows->[$$j]{main::key($$num++,0,$m4,'y')} = $monitors->{$key}{'colors'}{'green_y'};
+ $rows->[$$j]{main::key($$num++,1,$m3,'blue')} = '';
+ $rows->[$$j]{main::key($$num++,0,$m4,'x')} = $monitors->{$key}{'colors'}{'blue_x'};
+ $rows->[$$j]{main::key($$num++,0,$m4,'y')} = $monitors->{$key}{'colors'}{'blue_y'};
+ $rows->[$$j]{main::key($$num++,1,$m3,'white')} = '';
+ $rows->[$$j]{main::key($$num++,0,$m4,'x')} = $monitors->{$key}{'colors'}{'white_x'};
+ $rows->[$$j]{main::key($$num++,0,$m4,'y')} = $monitors->{$key}{'colors'}{'white_y'};
+ }
+ if ($extra > 2 && $monitors->{$key}{'scale'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'scale')} = $monitors->{$key}{'scale'};
+ }
+ if ($extra > 2 && $monitors->{$key}{'size-x'} && $monitors->{$key}{'size-y'}){
+ my $size = $monitors->{$key}{'size-x'} . 'x' . $monitors->{$key}{'size-y'} .
+ 'mm ('. $monitors->{$key}{'size-x-i'} . 'x' . $monitors->{$key}{'size-y-i'} . '")';
+ $rows->[$$j]{main::key($$num++,0,$m2,'size')} = $size;
+ }
+ if ($monitors->{$key}{'diagonal'}){
+ my $diag = $monitors->{$key}{'diagonal-m'} . 'mm ('. $monitors->{$key}{'diagonal'} . '")';
+ $rows->[$$j]{main::key($$num++,0,$m2,'diag')} = $diag;
+ }
+ elsif ($b_display && !$b_no_size && !$monitors->{$key}{'size-x'} &&
+ !$monitors->{$key}{'size-y'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'size')} = main::message('monitor-na');;
+ }
+ if ($b_admin && $monitors->{$key}{'ratio'}){
+ $rows->[$$j]{main::key($$num++,0,$m2,'ratio')} = $monitors->{$key}{'ratio'};
+ }
+ if ($extra > 2){
+ if (!$monitors->{$key}{'modes'} || !@{$monitors->{$key}{'modes'}}){
+ $monitors->{$key}{'modes'} = ['N/A'];
+ }
+ my $cnt = scalar @{$monitors->{$key}{'modes'}};
+ if ($cnt == 1 || ($cnt > 2 && $show{'edid'})){
+ $rows->[$$j]{main::key($$num++,0,$m2,'modes')} = join(', ', @{$monitors->{$key}{'modes'}});
+ }
+ else {
+ $rows->[$$j]{main::key($$num++,1,$m2,'modes')} = '';
+ $rows->[$$j]{main::key($$num++,0,$m3,'max')} = ${$monitors->{$key}{'modes'}}[0];
+ $rows->[$$j]{main::key($$num++,0,$m3,'min')} = ${$monitors->{$key}{'modes'}}[-1];
+ }
+ }
+ if ($show{'edid'}){
+ if ($monitors->{$key}{'edid-errors'}){
+ $$j++;
+ my $cnt = 1;
+ $rows->[$$j]{main::key($$num++,1,$m2,'EDID-Errors')} = '';
+ foreach my $err (@{$monitors->{$key}{'edid-errors'}}){
+ $rows->[$$j]{main::key($$num++,0,$m3,$cnt)} = $err;
+ $cnt++;
+ }
+ }
+ if ($monitors->{$key}{'edid-warnings'}){
+ $$j++;
+ my $cnt = 1;
+ $rows->[$$j]{main::key($$num++,1,$m2,'EDID-Warnings')} = '';
+ foreach my $warn (@{$monitors->{$key}{'edid-warnings'}}){
+ $rows->[$$j]{main::key($$num++,0,$m3,$cnt)} = $warn;
+ $cnt++;
+ }
+ }
+ }
+ }
+ # we only want to see gpu drivers for wayland since otherwise it's x drivers.
+# if ($b_display && $b_admin && $graphics{'protocol'} &&
+# $graphics{'protocol'} eq 'wayland' && $monitors->{$key}{'drivers'}){
+# $driver = join(',',@{$monitors->{$key}{'drivers'}});
+# $rows->[$j]{main::key($$num++,0,$m2,'driver')} = $driver;
+# }
+ eval $end if $b_log;
+}
+
+## DISPLAY API ##
+
+# API Output #
+
+# GLX/OpenGL EGL Vulkan XVesa
+sub display_api {
+ eval $start if $b_log;
+ my $rows = $_[0];
+ # print ("$b_display : $b_root\n");
+ # xvesa is absolute, if it's there, it works in or out of display
+ if ($graphics{'xvesa'}){
+ xvesa_output($rows);
+ return;
+ }
+ my ($b_egl,$b_egl_print,$b_glx,$b_glx_print,$b_vulkan,$api,$program,$type);
+ my $gl = {};
+ if ($fake{'egl'} || ($program = main::check_program('eglinfo'))){
+ gl_data('egl',$program,$rows,$gl);
+ $b_egl = 1;
+ }
+ if ($fake{'glx'} || ($program = main::check_program('glxinfo'))){
+ gl_data('glx',$program,$rows,$gl) if $b_display;
+ $b_glx = 1;
+ }
+ # Note: we let gl/egl output handle null or root null data issues
+ if ($gl->{'glx'}){
+ process_glx_data($gl->{'glx'},$b_glx);
+ }
+ # egl/vulkan give data out of display, and for root
+ # if ($b_egl}){
+ if ($b_egl && ($show{'graphic-full'} || !$gl->{'glx'})){
+ egl_output($rows,$gl);
+ $b_egl_print = 1;
+ }
+ # fill in whatever was missing from eglinfo, or if legacy system/no eglinfo
+ # if ($b_glx || $gl->{'glx'}){
+ if (($show{'graphic-full'} && ($b_glx || $gl->{'glx'})) ||
+ (!$show{'graphic-full'} && !$b_egl_print && ($b_glx || $gl->{'glx'}))){
+ opengl_output($rows,$gl);
+ $b_glx = 1;
+ $b_glx_print = 1;
+ }
+ # if ($fake{'vulkan'} || ($program = main::check_program('vulkaninfo'))){
+ if (($fake{'vulkan'} || ($program = main::check_program('vulkaninfo'))) &&
+ ($show{'graphic-full'} || (!$b_egl_print && !$b_glx_print))){
+ vulkan_output($program,$rows);
+ $b_vulkan = 1;
+ }
+ if ($show{'graphic-full'} || (!$b_egl_print && !$b_glx_print)){
+ # remember, sudo/root usually has empty $DISPLAY as well
+ if ($b_display){
+ # first do positive tests, won't be set for sudo/root
+ if (!$b_glx && $graphics{'protocol'} eq 'x11'){
+ $api = 'OpenGL';
+ $type = 'glx-missing';
+ }
+ elsif (!$b_egl && $graphics{'protocol'} eq 'wayland'){
+ $api = 'EGL'; # /GBM
+ $type = 'egl-missing';
+ }
+ elsif (!$b_glx &&
+ (main::check_program('X') || main::check_program('Xorg'))){
+ $api = 'OpenGL';
+ $type = 'glx-missing';
+ }
+ elsif (!$b_egl && main::check_program('Xwayland')){
+ $api = 'EGL';
+ $type = 'egl-missing';
+ }
+ elsif (!$b_egl && !$b_glx && !$b_vulkan) {
+ $api = 'N/A';
+ $type = 'gfx-api';
+ }
+ }
+ else {
+ if (!$b_glx &&
+ (main::check_program('X') || main::check_program('Xorg'))){
+ $api = 'OpenGL';
+ $type = 'glx-missing-console';
+ }
+ elsif (!$b_egl && main::check_program('Xwayland')){
+ $api = 'EGL';
+ $type = 'egl-missing-console';
+ }
+ # we don't know what it is, headless system, non xwayland wayland
+ elsif (!$b_egl && !$b_glx && !$b_vulkan) {
+ $api = 'N/A';
+ $type = 'gfx-api-console';
+ }
+ }
+ no_data_output($api,$type,$rows) if $type;
+ }
+ eval $end if $b_log;
+}
+
+sub no_data_output {
+ eval $start if $b_log;
+ my ($api,$type,$rows) = @_;
+ my $num = 0;
+ push(@$rows, {
+ main::key($num++,1,1,'API') => $api,
+ main::key($num++,0,2,'Message') => main::message($type)
+ });
+ eval $end if $b_log;
+}
+
+sub egl_output {
+ eval $start if $b_log;
+ my ($rows,$gl) = @_;
+ if (!$gl->{'egl'}){
+ my $api = 'EGL';
+ my $type = 'egl-null';
+ no_data_output($api,$type,$rows);
+ return 0;
+ }
+ my ($i,$j,$num) = (0,scalar @$rows,0);
+ my ($value);
+ my $ref;
+ my $data = $gl->{'egl'}{'data'};
+ my $plat = $gl->{'egl'}{'platforms'};
+ push(@$rows, {
+ main::key($num++,1,1,'API') => 'EGL',
+ });
+ if ($extra < 2){
+ $value = ($data->{'versions'}) ? join(',',sort keys %{$data->{'versions'}}): 'N/A';
+ }
+ else {
+ $value = ($data->{'version'}) ? $data->{'version'}: 'N/A';
+ }
+ $rows->[$j]{main::key($num++,0,2,'v')} = $value;
+ if ($extra < 2){
+ $value = ($data->{'drivers'}) ? join(',',sort keys %{$data->{'drivers'}}): 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'drivers')} = $value;
+ $value = ($data->{'platforms'}{'active'}) ? join(',',@{$data->{'platforms'}{'active'}}) : 'N/A';
+ if ($extra < 1){
+ $rows->[$j]{main::key($num++,0,2,'platforms')} = $value;
+ }
+ else {
+ $rows->[$j]{main::key($num++,1,2,'platforms')} = '';
+ $rows->[$j]{main::key($num++,0,3,'active')} = $value;
+ $value = ($data->{'platforms'}{'inactive'}) ? join(',',@{$data->{'platforms'}{'inactive'}}) : 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'inactive')} = $value;
+ }
+ }
+ else {
+ if ($extra > 2 && $data->{'hw'}){
+ $i = 0;
+ $rows->[$j]{main::key($num++,1,2,'hw')} = '';
+ foreach my $key (sort keys %{$data->{'hw'}}){
+ $value = ($key ne $data->{'hw'}{$key}) ? $data->{'hw'}{$key} . ' ' . $key: $key;
+ $rows->[$j]{main::key($num++,0,3,'drv')} = $value;
+ }
+ }
+ $rows->[$j]{main::key($num++,1,2,'platforms')} = '';
+ $data->{'version'} ||= 0;
+ $i = 0;
+ foreach my $key (sort keys %$plat){
+ next if !$plat->{$key}{'status'} || $plat->{$key}{'status'} eq 'inactive';
+ if ($key eq 'device'){
+ foreach my $id (sort keys %{$plat->{$key}}){
+ next if ref $plat->{$key}{$id} ne 'HASH';
+ $rows->[$j]{main::key($num++,1,3,$key)} = $id;
+ $ref = $plat->{$key}{$id}{'egl'};
+ egl_advanced_output($rows,$ref,\$num,$j,4,$data->{'version'});
+ }
+ }
+ else {
+ $rows->[$j]{main::key($num++,1,3,$key)} = '';
+ $ref = $plat->{$key}{'egl'};
+ egl_advanced_output($rows,$ref,\$num,$j,4,$data->{'version'});
+ }
+ }
+ if (!$data->{'platforms'}{'active'}){
+ $rows->[$j]{main::key($num++,0,3,'active')} = 'N/A';
+ }
+ if ($data->{'platforms'}{'inactive'}){
+ $rows->[$j]{main::key($num++,0,3,'inactive')} = join(',',@{$data->{'platforms'}{'inactive'}});
+ }
+ }
+ eval $end if $b_log;
+}
+
+# args: 0: $rows; 1: data ref; 2: \$num; 3: $j; 4: indent; 5: $b_plat_v
+sub egl_advanced_output {
+ my ($rows,$ref,$num,$j,$ind,$version) = @_;
+ my $value;
+ # version is set to 0 for math
+ if ($version && (!$ref->{'version'} || $version != $ref->{'version'})){
+ $value = ($ref->{'version'}) ? $ref->{'version'} : 'N/A';
+ $rows->[$j]{main::key($$num++,0,$ind,'egl')} = $value;
+ undef $value;
+ }
+ if ($ref->{'driver'}){
+ $value = $ref->{'driver'};
+ }
+ else {
+ if ($ref->{'vendor'} && $ref->{'vendor'} ne 'mesa'){
+ $value = $ref->{'vendor'};
+ }
+ $value ||= 'N/A';
+ }
+ $rows->[$j]{main::key($$num++,0,$ind,'drv')} = $value;
+}
+
+sub opengl_output {
+ eval $start if $b_log;
+ my ($rows,$gl) = @_;
+ # egl will have set $glx if present
+ if (!$gl->{'glx'}){
+ my $api = 'OpenGL';
+ my $type;
+ if ($b_display){
+ $type = ($b_root) ? 'glx-display-root': 'glx-null';
+ }
+ else {
+ $type = ($b_root) ? 'glx-console-root' : 'glx-console-try';
+ }
+ no_data_output($api,$type,$rows);
+ return 0;
+ }
+ my ($j,$num) = (scalar @$rows,0);
+ my $value;
+ # print join("\n", %$gl),"\n";
+ my $glx = $gl->{'glx'};
+ $glx->{'opengl'}{'version'} ||= 'N/A';
+ push(@$rows, {
+ main::key($num++,1,1,'API') => 'OpenGL',
+ main::key($num++,0,2,'v') => $glx->{'opengl'}{'version'},
+ });
+ if ($glx->{'opengl'}{'compatibility'}{'version'}){
+ $rows->[$j]{main::key($num++,0,2,'compat-v')} = $glx->{'opengl'}{'compatibility'}{'version'};
+ }
+ if ($glx->{'opengl'}{'vendor'}){
+ $rows->[$j]{main::key($num++,1,2,'vendor')} = $glx->{'opengl'}{'vendor'};
+ $glx->{'opengl'}{'driver'}{'version'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'v')} = $glx->{'opengl'}{'driver'}{'version'};
+ }
+ if ($extra > 0 && $glx->{'glx-version'}){
+ $rows->[$j]{main::key($num++,0,2,'glx-v')} = $glx->{'glx-version'};
+ }
+ if ($extra > 1 && $glx->{'es'}{'version'}){
+ $rows->[$j]{main::key($num++,0,2,'es-v')} = $glx->{'es'}{'version'};;
+ }
+ if ($glx->{'note'}){
+ $rows->[$j]{main::key($num++,0,2,'note')} = $glx->{'note'};
+ }
+ if ($extra > 0 && (!$glx->{'note'} || $glx->{'direct-render'})){
+ $glx->{'direct-render'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'direct-render')} = $glx->{'direct-render'};
+ }
+ if (!$glx->{'note'} || $glx->{'opengl'}{'renderer'}){
+ $glx->{'opengl'}{'renderer'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'renderer')} = $glx->{'opengl'}{'renderer'};
+ }
+ if ($extra > 1 && $glx->{'info'}){
+ if ($glx->{'info'}{'vendor-id'} && $glx->{'info'}{'device-id'}){
+ $value = $glx->{'info'}{'vendor-id'} . ':' . $glx->{'info'}{'device-id'};
+ $rows->[$j]{main::key($num++,0,2,'device-ID')} = $value;
+ }
+ if ($b_admin && $glx->{'info'}{'device-memory'}){
+ $rows->[$j]{main::key($num++,1,2,'memory')} = $glx->{'info'}{'device-memory'};
+ if ($glx->{'info'}{'unified-memory'}){
+ $rows->[$j]{main::key($num++,0,3,'unified')} = $glx->{'info'}{'unified-memory'};
+ }
+ }
+ # display id depends on xdpyinfo in Display line, which may not be present,
+ if (!$graphics{'display-id'} && $glx->{'display-id'} && $extra > 1){
+ $rows->[$j]{main::key($num++,0,2,'display-ID')} = $glx->{'display-id'};
+ }
+ }
+ eval $end if $b_log;
+}
+
+sub vulkan_output {
+ eval $start if $b_log;
+ my ($program,$rows) = @_;
+ my $vulkan = {};
+ vulkan_data($program,$vulkan);
+ if (!%$vulkan){
+ my $api = 'Vulkan';
+ my $type = 'vulkan-null';
+ no_data_output($api,$type,$rows);
+ return 0;
+ }
+ my $num = 0;
+ my $j = scalar @$rows;
+ my ($value);
+ my $data = $vulkan->{'data'};
+ my $devices = $vulkan->{'devices'};
+ $data->{'version'} ||= 'N/A';
+ push(@$rows,{
+ main::key($num++,1,1,'API') => 'Vulkan',
+ main::key($num++,0,2,'v') => $data->{'version'},
+ });
+ # this will be expanded with -a to a full device report
+ if ($extra < 2){
+ $value = ($data->{'drivers'}) ? join(',',@{$data->{'drivers'}}): 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'drivers')} = $value;
+ }
+ if ($extra > 2){
+ $data->{'layers'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'layers')} = $data->{'layers'};
+ }
+ if (!$b_admin){
+ $value = ($data->{'surfaces'}) ? join(',',@{$data->{'surfaces'}}) : 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'surfaces')} = $value;
+ }
+ if ($extra > 0){
+ if (!$devices){
+ $rows->[$j]{main::key($num++,0,2,'devices')} = 'N/A';
+ }
+ else {
+ if ($extra < 2){
+ $value = scalar keys %{$devices};
+ $rows->[$j]{main::key($num++,0,2,'devices')} = $value;
+ }
+ else {
+ foreach my $id (sort keys %$devices){
+ $rows->[$j]{main::key($num++,1,2,'device')} = $id;
+ $devices->{$id}{'device-type'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'type')} = $devices->{$id}{'device-type'};
+ if ((($extra == 3 && !$b_admin) ||
+ ($extra > 2 && !$devices->{$id}{'device-name'})) &&
+ $devices->{$id}{'hw'} && $devices->{$id}{'hw'} ne 'nvidia'){
+ $rows->[$j]{main::key($num++,0,3,'hw')} = $devices->{$id}{'hw'};
+ }
+ if ($b_admin){
+ $value = ($devices->{$id}{'device-name'}) ?
+ $devices->{$id}{'device-name'}: 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'name')} = $value;
+ }
+ if ($extra > 1){
+ if ($devices->{$id}{'driver-name'}){
+ $value = $devices->{$id}{'driver-name'};
+ if ($devices->{$id}{'mesa'} && $value ne 'mesa'){
+ $value = 'mesa ' . $value;
}
- # using main, noit monitor, dpi because we want xorg dpi, not physical screen dpi
- $dpi = $main{'s-dpi'} if $resolution && $extra > 1 && $main{'s-dpi'};
- $resolution .= '~' . $monitor{'hz'} . 'Hz' if $monitor{'hz'} && $resolution;
- $resolution ||= 'N/A';
- if ($basic_count == 1 && $m_count == 1){
- $row[$row_key]{main::key($num++,0,2,'resolution')} = $resolution;
+ $rows->[$j]{main::key($num++,1,3,'driver')} = $value;
+ if ($b_admin && $devices->{$id}{'driver-info'}){
+ $rows->[$j]{main::key($num++,0,4,'v')} = $devices->{$id}{'driver-info'};
}
- else {
- $row[$row_key]{main::key($num++,1,2,'resolution')} = '' if $basic_count == 1;
- $row[$row_key]{main::key($num++,0,3,$basic_count)} = $resolution;
+ }
+ else {
+ $rows->[$j]{main::key($num++,0,3,'driver')} = 'N/A';
+ }
+ $value = ($devices->{$id}{'device-id'} && $devices->{$id}{'vendor-id'}) ?
+ $devices->{$id}{'vendor-id'} . ':' . $devices->{$id}{'device-id'} : 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'device-ID')} = $value;
+ if ($b_admin){
+ $value = ($devices->{$id}{'surfaces'}) ?
+ join(',',@{$devices->{$id}{'surfaces'}}): 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'surfaces')} = $value;
+ }
+ }
+ }
+ }
+ }
+ }
+ eval $end if $b_log;
+}
+
+sub xvesa_output {
+ eval $start if $b_log;
+ my ($rows) = @_;
+ my ($controller,$dac,$interface,$ram,$source,$version);
+ # note: goes to stderr, not stdout
+ my @data = main::grabber($graphics{'xvesa'} . ' -listmodes 2>&1');
+ my $j = scalar @$rows;
+ my $num = 0;
+ # gop replaced uga, both for uefi
+ # WARNING! Never seen a GOP type UEFI, needs more data
+ if ($data[0] && $data[0] =~ /^(VBE|GOP|UGA)\s+version\s+(\S+)\s\(([^)]+)\)/i){
+ $interface = $1;
+ $version = $2;
+ $source = $3;
+ }
+ if ($data[1] && $data[1] =~ /^DAC is ([^,]+), controller is ([^,]+)/i){
+ $dac = $1;
+ $controller = $2;
+ }
+ if ($data[2] && $data[2] =~ /^Total memory:\s+(\d+)\s/i){
+ $ram = $1;
+ $ram = main::get_size($ram,'string');
+ }
+ if (!$interface){
+ $rows->[$j]{main::key($num++,1,1,'API')} = 'VBE/GOP';
+ $rows->[$j]{main::key($num++,0,2,'Message')} = main::message('xvesa-null');
+ }
+ else {
+ $rows->[$j]{main::key($num++,1,1,'API')} = $interface;
+ $rows->[$j]{main::key($num++,0,2,'v')} = ($version) ? $version : 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'source')} = ($source) ? $source : 'N/A';
+ if ($dac){
+ $rows->[$j]{main::key($num++,0,2,'dac')} = $dac;
+ $rows->[$j]{main::key($num++,0,2,'controller')} = $controller;
+ }
+ if ($ram){
+ $rows->[$j]{main::key($num++,0,2,'ram')} = $ram;
+ }
+ }
+ eval $end if $b_log;
+}
+
+# API Data #
+sub gl_data {
+ eval $start if $b_log;
+ my ($source,$program,$rows,$gl) = @_;
+ my ($b_opengl,$msg);
+ my ($gl_data,$results) = ([],[]);
+ # only check these if no eglinfo or eglinfo had no opengl data
+ $b_opengl = 1 if ($source eq 'egl' || !$gl->{'glx'});
+ # NOTE: glxinfo -B is not always available, unfortunately
+ if ($dbg[56] || $b_log){
+ $msg = "${line1}GL Source: $source\n${line3}";
+ print $msg if $dbg[56];
+ push(@$results,$msg) if $b_log;
+ }
+ if ($source eq 'glx'){
+ if (!$fake{'glx'}){
+ $gl_data = main::grabber("$program $display_opt 2>/dev/null",'','','ref');
+ }
+ else {
+ my $file;
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-2012-nvidia-glx1.4.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-ssh-centos.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxiinfo-t420-intel-1.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-mali-allwinner-lima-1.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-partial-intel-5500-1.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-vbox-debian-etch-1.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-x11-neomagic-lenny-1.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-nvidia-gl4.6-chr.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-intel-atom-dell_studio-bm.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-asus_1025c-atom-bm.txt";
+ # $file = "$fake_data_dir/graphics/glxinfo/glxinfo-2011-nvidia-glx1.4.txt";
+ $gl_data= main::reader($file,'','ref');
+ }
+ }
+ else {
+ if (!$fake{'egl'}){
+ $gl_data = main::grabber("$program 2>/dev/null",'','','ref');
+ }
+ else {
+ my $file;
+ # $file = "$fake_data_dir/graphics/egl-es/eglinfo-x11-3.txt";
+ # $file = "$fake_data_dir/graphics/egl-es/eglinfo-wayland-intel-c30.txt";
+ # $file = "$fake_data_dir/grapOhics/egl-es/eglinfo-2022-x11-nvidia-egl1.5.txt";
+ # $file = "$fake_data_dir/graphics/egl-es/eglinfo-wayland-intel-nvidia-radu.txt";
+ # $file = "$fake_data_dir/graphics/egl-es/eglinfo-intel-atom-dell_studio-bm.txt";
+ # $file = "$fake_data_dir/graphics/egl-es/eglinfo-asus_1025c-atom-bm.txt";
+ # $file = "$fake_data_dir/graphics/egl-es/eglinfo-x11-amd-raphael-1.txt";
+ $file = "$fake_data_dir/graphics/egl-es/eglinfo-x11-vm-version-odd.txt";
+ $gl_data = main::reader($file,'','ref');
+ }
+ }
+ # print join("\n", @$gl_data),"\n";
+ if (!$gl_data || !@$gl_data){
+ if ($dbg[56] || $b_log){
+ $msg = "No data found for GL Source: $source" if $dbg[56];
+ print "$msg\n" if $dbg[56];
+ push(@$results,$msg) if $b_log;
+ }
+ return 0;
+ }
+ # some error cases have only a few top value but not empty
+ elsif ($source eq 'glx' && scalar @$gl_data > 5){
+ $gl->{'glx'}{'source'} = $source;
+ }
+ set_mesa_drivers() if $source eq 'egl' && !%mesa_drivers;
+ my ($b_device,$b_platform,$b_mem_info,$b_rend_info,$device,$platform,
+ $value,$value2,@working);
+ foreach my $line (@$gl_data){
+ next if (!$b_rend_info && !$b_mem_info) && $line =~ /^(\s|0x)/;
+ if (($b_rend_info || $b_mem_info) && $line =~ /^\S/){
+ ($b_mem_info,$b_rend_info) = ();
+ }
+ @working = split(/\s*:\s*/,$line,2);
+ next if !@working;
+ if ($dbg[56] || $b_log){
+ $msg = $line;
+ print "$msg\n" if $dbg[56];
+ push(@$results,$msg) if $b_log;
+ }
+ if ($source eq 'egl'){
+ # eglinfo: eglInitialize failed
+ # This is first line after platform fail for devices, but for Device
+ # it would be the second or later line. The Device platform can fail, or
+ # specific device can fail
+ if ($b_platform){
+ $value = ($line =~ /Initialize failed/) ? 'inactive': 'active';
+ push(@{$gl->{'egl'}{'data'}{'platforms'}{$value}},$platform);
+ $gl->{'egl'}{'platforms'}{$platform}{'status'} = $value;
+ $b_platform = 0;
+ }
+ # note: can be sub item: Platform Device platform:; Platform Device:
+ elsif ($working[0] =~ /^(\S+) platform/i){
+ $platform = lc($1);
+ undef $device;
+ $b_platform = 1;
+ }
+ if ($platform && defined $device && $working[0] eq 'eglinfo'){
+ push(@{$gl->{'egl'}{'data'}{'platforms'}{'inactive'}},"$platform-$device");
+ undef $device;
+ }
+ if ($platform && $platform eq 'device' && $working[0] =~ /^Device #(\d+)/){
+ $device = $1;
+ }
+ if ($working[0] eq 'EGL API version'){
+ if (!defined $platform){
+ $gl->{'egl'}{'data'}{'api-version'} = $working[1];
+ }
+ elsif (defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'egl'}{'api-version'} = $working[1];
+ }
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{'egl'}{'api-version'} = $working[1];
+ }
+ }
+ elsif ($working[0] eq 'EGL version string'){
+ # seen case of: 1.4 (DRI2)
+ $working[1] =~ s/^([\d\.]+)(\s.*)?/$1/;
+ if (!defined $platform){
+ $gl->{'egl'}{'data'}{'version'} = $working[1];
+ }
+ elsif (defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'egl'}{'version'} = $working[1];
+ }
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{'egl'}{'version'} = $working[1];
+ }
+ $value = (defined $device) ? "$platform-$device": $platform;
+ push(@{$gl->{'egl'}{'data'}{'versions'}{$working[1]}},$value);
+ if (!$gl->{'egl'}{'data'}{'version'} ||
+ $working[1] > $gl->{'egl'}{'data'}{'version'}){
+ $gl->{'egl'}{'data'}{'version'} = $working[1];
+ }
+ }
+ elsif ($working[0] eq 'EGL vendor string'){
+ $working[1] = lc($working[1]);
+ $working[1] =~ s/^(\S+)(\s.+|$)/$1/;
+ if (!defined $platform){
+ $gl->{'egl'}{'data'}{'vendor'} = $working[1];
+ }
+ elsif (defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'egl'}{'vendor'} = $working[1];
+ if ($working[1] eq 'nvidia'){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'egl'}{'driver'} = $working[1];
+ }
+ }
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{'egl'}{'vendor'} = $working[1];
+ if ($working[1] eq 'nvidia'){
+ $gl->{'egl'}{'platforms'}{$platform}{'egl'}{'driver'} = $working[1];
+ }
+ }
+ push(@{$gl->{'egl'}{'data'}{'vendors'}},$working[1]);
+ if ($platform && $working[1] eq 'nvidia'){
+ $value = (defined $device) ? "$platform-$device": $platform;
+ push(@{$gl->{'egl'}{'data'}{'drivers'}{$working[1]}},$value);
+ $gl->{'egl'}{'data'}{'hw'}{$working[1]} = $working[1];
+ }
+ }
+ elsif ($platform && $working[0] eq 'EGL driver name'){
+ if (!defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{'egl'}{'driver'} = $working[1];
+ if ($mesa_drivers{$working[1]}){
+ $gl->{'egl'}{'platforms'}{$platform}{'egl'}{'hw'} = $mesa_drivers{$working[1]};
+ }
+ }
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'egl'}{'driver'} = $working[1];
+ if ($mesa_drivers{$working[1]}){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'egl'}{'hw'} = $mesa_drivers{$working[1]};
+ }
+ }
+ $value = (defined $device) ? "$platform-$device": $platform;
+ push(@{$gl->{'egl'}{'data'}{'drivers'}{$working[1]}},$value);
+ if ($mesa_drivers{$working[1]}){
+ $gl->{'egl'}{'data'}{'hw'}{$working[1]} = $mesa_drivers{$working[1]};
+ }
+ }
+ if ($platform && $working[0] eq 'EGL client APIs'){
+ if (defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'egl'}{'client-apis'} = [split(/\s+/,$working[1])];
+ }
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{'egl'}{'client-apis'} = [split(/\s+/,$working[1])];
+ }
+ }
+ }
+ # glx specific values, only found in glxinfo
+ else {
+ if (lc($working[0]) eq 'direct rendering'){
+ $working[1] = lc($working[1]);
+ if (!$gl->{'glx'}{'direct-renderers'} ||
+ !(grep {$_ eq $working[1]} @{$gl->{'glx'}{'direct-renders'}})){
+ push(@{$gl->{'glx'}{'direct-renders'}}, $working[1]);
+ }
+ }
+ # name of display: does not always list the screen number
+ elsif (lc($working[0]) eq 'display'){
+ if ($working[1] =~ /^(:\d+)\s+screen:\s+(\d+)/){
+ $gl->{'glx'}{'display-id'} = $1 . '.' . $2;
+ }
+ }
+ elsif (lc($working[0]) eq 'glx version'){
+ if (!$gl->{'glx'}{'glx-version'}){
+ $gl->{'glx'}{'glx-version'} = $working[1];
+ }
+ }
+ elsif (!$b_rend_info && $working[0] =~ /^Extended renderer info/i){
+ $b_rend_info = 1;
+ }
+ # only check Memory info if no prior device memory found
+ elsif (!$b_mem_info && $working[0] =~ /^Memory info/i){
+ $b_mem_info = (!$gl->{'glx'}{'info'} || !$gl->{'glx'}{'info'}{'device-memory'}) ? 1 : 0;
+ }
+ elsif ($b_rend_info){
+ if ($line =~ /^\s+Vendor:\s+.*?\(0x([\da-f]+)\)$/){
+ $gl->{'glx'}{'info'}{'vendor-id'} = sprintf("%04s",$1);
+ }
+ elsif ($line =~ /^\s+Device:\s+.*?\(0x([\da-f]+)\)$/){
+ $gl->{'glx'}{'info'}{'device-id'} = sprintf("%04s",$1);
+ }
+ elsif ($line =~ /^\s+Video memory:\s+(\d+\s?[MG]B)$/){
+ my $size = main::translate_size($1);
+ $gl->{'glx'}{'info'}{'device-memory'} = main::get_size($size,'string');
+ }
+ elsif ($line =~ /^\s+Unified memory:\s+(\S+)$/){
+ $gl->{'glx'}{'info'}{'unified-memory'} = lc($1);
+ }
+ }
+ elsif ($b_mem_info){
+ # fallback, nvidia does not seem to have Extended renderer info
+ if ($line =~ /^\s+Dedicated video memory:\s+(\d+\s?[MG]B)$/){
+ my $size = main::translate_size($1);
+ $gl->{'glx'}{'info'}{'device-memory'} = main::get_size($size,'string');
+ $b_mem_info = 0;
+ }
+ # we're in the wrong memory block!
+ elsif ($line =~ /^\s+(VBO|Texture)/){
+ $b_mem_info = 0;
+ }
+ }
+ elsif (lc($working[0]) eq 'opengl vendor string'){
+ if ($working[1] =~ /^([^\s]+)(\s+\S+)?/){
+ my $vendor = lc($1);
+ $vendor =~ s/(^mesa\/|[\.,]$)//; # Seen Mesa/X.org
+ if (!$gl->{'glx'}{'opengl'}{'vendor'}){
+ $gl->{'glx'}{'opengl'}{'vendor'} = $vendor;
+ }
+ }
+ }
+ elsif (lc($working[0]) eq 'opengl renderer string'){
+ if ($working[1]){
+ $working[1] = main::clean($working[1]);
+ }
+ # note: seen cases where gl drivers are missing, with empty field value.
+ else {
+ $gl->{'glx'}{'no-gl'} = 1;
+ $working[1] = main::message('glx-value-empty');
+ }
+ if (!$gl->{'glx'}{'opengl'}{'renderers'} ||
+ !(grep {$_ eq $working[1]} @{$gl->{'glx'}{'opengl'}{'renderers'}})){
+ push(@{$gl->{'glx'}{'opengl'}{'renderers'}}, $working[1]) ;
+ }
+ }
+ # Dropping all conditions from this test to just show full mesa information
+ # there is a user case where not f and mesa apply, atom mobo
+ # This can be the compatibility version, or just the version the hardware
+ # supports. Core version will override always if present.
+ elsif (lc($working[0]) eq 'opengl version string'){
+ if ($working[1]){
+ # first grab the actual gl version
+ # non free drivers like nvidia may only show their driver version info
+ if ($working[1] =~ /^(\S+)(\s|$)/){
+ push(@{$gl->{'glx'}{'opengl'}{'versions'}}, $1);
+ }
+ # handle legacy format: 1.2 (1.5 Mesa 6.5.1) as well as more current:
+ # 4.5 (Compatibility Profile) Mesa 22.3.6
+ # Note: legacy: fglrx starting adding compat strings but they don't
+ # change this result:
+ # 4.5 Compatibility Profile Context Mesa 15.3.6
+ if ($working[1] =~ /(Mesa|NVIDIA)\s(\S+?)\)?$/i){
+ if ($1 && $2 && !$gl->{'glx'}{'opengl'}{'driver'}){
+ $gl->{'glx'}{'opengl'}{'driver'}{'vendor'} = lc($1);
+ $gl->{'glx'}{'opengl'}{'driver'}{'version'} = $2;
+ }
+ }
+ }
+ elsif (!$gl->{'glx'}{'no-gl'}){
+ $gl->{'glx'}{'no-gl'} = 1;
+ push(@{$gl->{'glx'}{'opengl'}{'versions'}},main::message('glx-value-empty'));
+ }
+ }
+ # if -B was always available, we could skip this, but it is not
+ elsif ($line =~ /GLX Visuals/){
+ last;
+ }
+ }
+ # eglinfo/glxinfo share these
+ if ($b_opengl){
+ if ($working[0] =~ /^OpenGL (compatibility|core) profile version( string)?$/){
+ $value = lc($1);
+ # note: no need to apply empty message here since we don't have the data
+ # anyway
+ if ($working[1]){
+ # non free drivers like nvidia only show their driver version info
+ if ($working[1] =~ /^(\S+)(\s|$)/){
+ push(@{$gl->{'glx'}{'opengl'}{$value}{'versions'}}, $1);
+ }
+ # fglrx started appearing with this extra string, does not appear
+ # to communicate anything of value
+ if ($working[1] =~ /\s+(Mesa|NVIDIA)\s+(\S+)$/){
+ if ($1 && $2 && !$gl->{'glx'}{'opengl'}{$value}{'vendor'}){
+ $gl->{'glx'}{'opengl'}{$value}{'driver'}{'vendor'} = lc($1);
+ $gl->{'glx'}{'opengl'}{$value}{'driver'}{'version'} = $2;
+ }
+ if ($source eq 'egl' && $platform){
+ if (defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'opengl'}{$value}{'vendor'} = lc($1);
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'opengl'}{$value}{'version'} = $2;
}
- if ($m_count == $basic_count){
- $row[$row_key]{main::key($num++,0,2,'s-dpi')} = $dpi if $dpi;
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{'opengl'}{$value}{'vendor'} = lc($1);
+ $gl->{'egl'}{'platforms'}{$platform}{'opengl'}{$value}{'version'} = $2;
}
- next;
}
- $row_key++;
- $row[$row_key]{main::key($num++,0,3,'Monitor')} = $monitor{'monitor'};
- if ($monitor{'res-x'} && $monitor{'res-y'}){
- $resolution = $monitor{'res-x'} . 'x' . $monitor{'res-y'};
- }
- $resolution ||= 'N/A';
- $row[$row_key]{main::key($num++,0,4,'res')} = $resolution;
- $hz = ($monitor{'hz'}) ? $monitor{'hz'} : '';
- $row[$row_key]{main::key($num++,0,4,'hz')} = $hz if $hz;
- $dpi = ($monitor{'dpi'}) ? $monitor{'dpi'} : '';
- $row[$row_key]{main::key($num++,0,4,'dpi')} = $dpi if $dpi;
- #print "$dpi :: $main{'s-dpi'}\n";
- if ($monitor{'size-x'} && $monitor{'size-y'}){
- $size = $monitor{'size-x'} . 'x' . $monitor{'size-y'} .
- 'mm ('. $monitor{'size-x-i'} . 'x' . $monitor{'size-y-i'} . '")';
+ }
+ }
+ }
+ elsif ($working[0] =~ /^OpenGL (compatibility|core) profile renderer?$/){
+ $value = lc($1);
+ if ($working[1]){
+ $working[1] = main::clean($working[1]);
+ }
+ # note: seen cases where gl drivers are missing, with empty field value.
+ else {
+ $gl->{'glx'}{'no-gl'} = 1;
+ $working[1] = main::message('glx-value-empty');
+ }
+ if (!$gl->{'glx'}{'opengl'}{$value}{'renderers'} ||
+ !(grep {$_ eq $working[1]} @{$gl->{'glx'}{'opengl'}{$value}{'renderers'}})){
+ push(@{$gl->{'glx'}{'opengl'}{$value}{'renderers'}}, $working[1]) ;
+ }
+ if ($source eq 'egl' && $platform){
+ if ($value eq 'core'){
+ $value2 = (defined $device) ? "$platform-$device": $platform;
+ push(@{$gl->{'egl'}{'data'}{'renderers'}{$working[1]}},$value2);
+ }
+ if (defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'opengl'}{$value}{'renderer'} = $working[1];
+ }
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{'opengl'}{$value}{'renderer'} = $working[1];
+ }
+ }
+ }
+ elsif ($working[0] =~ /^OpenGL (compatibility|core) profile vendor$/){
+ $value = lc($1);
+ if (!$gl->{'glx'}{'opengl'}{$value}{'vendors'} ||
+ !(grep {$_ eq $working[1]} @{$gl->{'glx'}{'opengl'}{$value}{'vendors'}})){
+ push(@{$gl->{'glx'}{'opengl'}{$value}{'vendors'}}, $working[1]) ;
+ }
+ if ($source eq 'egl' && $platform){
+ if (defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'opengl'}{$value}{'vendor'} = $working[1];
+ }
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{'opengl'}{$value}{'vendor'} = $working[1];
+ }
+
+ }
+ }
+ elsif (lc($working[0]) eq 'opengl es profile version string'){
+ if ($working[1] && !$gl->{'glx'}{'es-version'}){
+ # OpenGL ES 3.2 Mesa 23.0.3
+ if ($working[1] =~ /^OpenGL ES (\S+) Mesa (\S+)/){
+ $gl->{'glx'}{'es'}{'version'} = $1;
+ if ($2 && !$gl->{'glx'}{'es'}{'mesa-version'}){
+ $gl->{'glx'}{'es'}{'mesa-version'} = $2;
}
- $size ||= '';
- $row[$row_key]{main::key($num++,0,4,'size')} = $size if $size;
- if ($monitor{'diagonal'}){
- $diag = $monitor{'diagonal-m'} . 'mm ('. $monitor{'diagonal'} . '")';
+ if ($source eq 'egl' && $platform){
+ if (defined $device){
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'opengl'}{'es'}{'vendor'} = 'mesa';
+ $gl->{'egl'}{'platforms'}{$platform}{$device}{'opengl'}{'es'}{'version'} = $working[1];
+ }
+ else {
+ $gl->{'egl'}{'platforms'}{$platform}{'opengl'}{'es'}{'vendor'} = 'mesa';
+ $gl->{'egl'}{'platforms'}{$platform}{'opengl'}{'es'}{'version'} = $working[1];
+ }
}
- $diag ||= '';
- $row[$row_key]{main::key($num++,0,4,'diag')} = $diag if $diag;
}
}
}
}
+ }
+ main::log_data('dump',"$source \$results",$results) if $b_log;
+ if ($source eq 'egl'){
+ print "GL Data: $source: ", Data::Dumper::Dumper $gl if $dbg[57];
+ main::log_data('dump',"GL data: $source:",$gl) if $b_log;
+ }
+ else {
+ print "GL Data: $source: ", Data::Dumper::Dumper $gl->{'glx'} if $dbg[57];
+ main::log_data('dump',"GLX data: $source:",$gl->{'glx'}) if $b_log;
+ }
+ eval $end if $b_log;
+}
+
+sub process_glx_data {
+ eval $start if $b_log;
+ my ($glx,$b_glx) = @_;
+ my $value;
+ # Remember: if you test for a hash ref hash ref, you create the first hash ref!
+ if ($glx->{'direct-renders'}){
+ $glx->{'direct-render'} = join(', ', @{$glx->{'direct-renders'}});
+ }
+ if (!$glx->{'opengl'}{'renderers'} && $glx->{'opengl'}{'compatibility'} &&
+ $glx->{'opengl'}{'compatibility'}{'renderers'}){
+ $glx->{'opengl'}{'renderers'} = $glx->{'opengl'}{'compatibility'}{'renderers'};
+ }
+ # This is tricky, GLX OpenGL version string can be compatibility version,
+ # but usually they are the same. Just in case, try this. Note these are
+ # x.y.z type numbering formats generally so use string compare
+ if ($glx->{'opengl'}{'core'} && $glx->{'opengl'}{'core'}{'versions'}){
+ $glx->{'opengl'}{'version'} = (sort @{$glx->{'opengl'}{'core'}{'versions'}})[-1];
+ }
+ elsif ($glx->{'opengl'}{'versions'}){
+ $glx->{'opengl'}{'version'} = (sort @{$glx->{'opengl'}{'versions'}})[-1];
+ }
+ if ($glx->{'opengl'}{'version'} &&
+ ($glx->{'opengl'}{'compatibility'} || $glx->{'opengl'}{'versions'})){
+ # print "v: $glx->{'opengl'}{'version'}\n";
+ # print Data::Dumper::Dumper $glx->{'opengl'}{'versions'};
+ # print 'v1: ', (sort @{$glx->{'opengl'}{'versions'}})[0], "\n";
+ # here we look for different versions, and determine most likely compat one
+ if ($glx->{'opengl'}{'compatibility'} &&
+ $glx->{'opengl'}{'compatibility'}{'versions'} &&
+ (sort @{$glx->{'opengl'}{'compatibility'}{'versions'}})[0] ne $glx->{'opengl'}{'version'}){
+ $value = (sort @{$glx->{'opengl'}{'compatibility'}{'versions'}})[0];
+ $glx->{'opengl'}{'compatibility'}{'version'} = $value;
+ }
+ elsif ($glx->{'opengl'}{'versions'} &&
+ (sort @{$glx->{'opengl'}{'versions'}})[0] ne $glx->{'opengl'}{'version'}){
+ $value = (sort @{$glx->{'opengl'}{'versions'}})[0];
+ $glx->{'opengl'}{'compatibility'}{'version'} = $value;
+ }
+ }
+ if ($glx->{'opengl'}{'renderers'}){
+ $glx->{'opengl'}{'renderer'} = join(', ', @{$glx->{'opengl'}{'renderers'}});
+ }
+ # likely eglinfo or advanced glxinfo
+ if ($glx->{'opengl'}{'vendor'} &&
+ $glx->{'opengl'}{'core'} &&
+ $glx->{'opengl'}{'core'}{'driver'} &&
+ $glx->{'opengl'}{'core'}{'driver'}{'vendor'} &&
+ $glx->{'opengl'}{'core'}{'driver'}{'vendor'} eq 'mesa' &&
+ $glx->{'opengl'}{'vendor'} ne $glx->{'opengl'}{'core'}{'driver'}{'vendor'}){
+ $value = $glx->{'opengl'}{'vendor'} . ' ';
+ $value .= $glx->{'opengl'}{'core'}{'driver'}{'vendor'};
+ $glx->{'opengl'}{'vendor'} = $value;
+ }
+ # this can be glxinfo only case, no eglinfo
+ elsif ($glx->{'opengl'}{'vendor'} &&
+ $glx->{'opengl'}{'driver'} &&
+ $glx->{'opengl'}{'driver'}{'vendor'} &&
+ $glx->{'opengl'}{'driver'}{'vendor'} eq 'mesa' &&
+ $glx->{'opengl'}{'vendor'} ne $glx->{'opengl'}{'driver'}{'vendor'}){
+ $value = $glx->{'opengl'}{'vendor'} . ' ';
+ $value .= $glx->{'opengl'}{'driver'}{'vendor'};
+ $glx->{'opengl'}{'vendor'} = $value;
+ }
+ elsif (!$glx->{'opengl'}{'vendor'} &&
+ $glx->{'opengl'}{'core'} && $glx->{'opengl'}{'core'}{'driver'} &&
+ $glx->{'opengl'}{'core'}{'driver'}{'vendor'}){
+ $glx->{'opengl'}{'vendor'} = $glx->{'opengl'}{'core'}{'driver'}{'vendor'};
+ }
+ if ((!$glx->{'opengl'}{'driver'} ||
+ !$glx->{'opengl'}{'driver'}{'version'}) &&
+ $glx->{'opengl'}{'core'} &&
+ $glx->{'opengl'}{'core'}{'driver'} &&
+ $glx->{'opengl'}{'core'}{'driver'}{'version'}){
+ $value = $glx->{'opengl'}{'core'}{'driver'}{'version'};
+ $glx->{'opengl'}{'driver'}{'version'} = $value;
+ }
+ # only tripped when glx filled by eglinfo
+ if (!$glx->{'source'}){
+ my $type;
+ if (!$b_glx){
+ $type = 'glx-egl-missing';
+ }
+ elsif ($b_display){
+ $type = 'glx-egl';
+ }
else {
- $graphics{'tty'} ||= 'N/A';
- $row[0]{main::key($num++,0,2,'tty')} = $graphics{'tty'};
+ $type = 'glx-egl-console';
}
+ $glx->{'note'} = main::message($type);
}
+ print "GLX Data: ", Data::Dumper::Dumper $glx if $dbg[57];
+ main::log_data('dump',"GLX data:",$glx) if $b_log;
eval $end if $b_log;
- return @row;
}
-sub x_display_data {
+sub vulkan_data {
eval $start if $b_log;
- # X vendor and version detection.
- # new method added since radeon and X.org and the disappearance of
- # <X server name> version : ...etc. Later on, the normal textual version string
- # returned, e.g. like: X.Org version: 6.8.2
- # A failover mechanism is in place: if $version empty, release number parsed instead
- if (my $program = main::check_program('xdpyinfo')){
- my ($diagonal,$diagonal_m,$dpi) = ('','','');
- my ($screen_id,$screen,@working);
- my ($res_x,$res_x_i,$res_y,$res_y_i,$size_x,$size_x_i,$size_y,$size_y_i);
- my @xdpyinfo = main::grabber("$program $display_opt 2>/dev/null","\n",'strip');
- #@xdpyinfo = map {s/^\s+//;$_} @xdpyinfo if @xdpyinfo;
- #print join "\n",@xdpyinfo, "\n";
- foreach (@xdpyinfo){
- @working = split /:\s+/, $_;
- next if ( ($graphics{'screens'} && $working[0] !~ /^(dimensions$|screen\s#)/ ) || !$working[0] );
- #print "$_\n";
- if ($working[0] eq 'vendor string'){
- $working[1] =~ s/The\s|\sFoundation//g;
- # some distros, like fedora, report themselves as the xorg vendor,
- # so quick check here to make sure the vendor string includes Xorg in string
- if ($working[1] !~ /x/i){
- $working[1] .= ' X.org';
- }
- $graphics{'x-vendor'} = $working[1];
- }
- elsif ($working[0] eq 'name of display'){
- $graphics{'display-id'} = $working[1];
- }
- elsif ($working[0] eq 'version number'){
- $graphics{'x-version-id'} = $working[1];
- }
- # note used, fix that
- elsif ($working[0] eq 'vendor release number'){
- $graphics{'x-vendor-release'} = $working[1];
- }
- elsif ($working[0] eq 'X.Org version'){
- $graphics{'xorg-version'} = $working[1];
- }
- elsif ($working[0] eq 'default screen number'){
- $graphics{'display-default-screen'} = $working[1];
- }
- elsif ($working[0] eq 'number of screens'){
- $graphics{'display-screens'} = $working[1];
- }
- elsif ($working[0] =~ /^screen #([0-9]+):/){
- $screen_id = $1;
- $graphics{'screens'} = () if !$graphics{'screens'};
- }
- elsif ($working[0] eq 'resolution'){
- $working[1] =~ s/^([0-9]+)x/$1/;
- $graphics{'s-dpi'} = $working[1];
- }
- elsif ($working[0] eq 'dimensions'){
- ($dpi,$res_x,$res_y,$size_x,$size_y) = (undef,undef,undef,undef,undef);
- if ($working[1] =~ /([0-9]+)\s*x\s*([0-9]+)\s+pixels\s+\(([0-9]+)\s*x\s*([0-9]+)\s*millimeters\)/){
- $res_x = $1;
- $res_y = $2;
- $size_x = $3;
- $size_y = $4;
- $res_x_i = ($1) ? sprintf("%.1f", ($1/25.4)) : 0;
- $res_y_i = ($2) ? sprintf("%.1f", ($2/25.4)) : 0;
- $size_x_i = ($3) ? sprintf("%.1f", ($3/25.4)) : 0;
- $size_y_i = ($4) ? sprintf("%.1f", ($4/25.4)) : 0;
- $dpi = ($res_x && $size_x) ? sprintf("%.0f", ($res_x*25.4/$size_x)) : '';
- $diagonal = ($res_x && $size_x) ? sprintf("%.1f", (sqrt($size_x**2 + $size_y**2)/25.4 )) : '';
- $diagonal += 0 if $diagonal;# trick to get rid of decimal 0
- $diagonal_m = ($res_x && $size_x) ? sprintf("%.0f", (sqrt($size_x**2 + $size_y**2))) : '';
- }
- $screen = {
- 'screen' => $screen_id,
- 'res-x' => $res_x,
- 'res-x-i' => $res_x_i,
- 'res-y' => $res_y,
- 'res-y-i' => $res_y_i,
- 'size-x' => $size_x,
- 'size-x-i' => $size_x_i,
- 'size-y' => $size_y,
- 'size-y-i' => $size_y_i,
- 's-dpi' => $dpi,
- 'diagonal' => $diagonal,
- 'diagonal-m' => $diagonal_m,
- };
- push @{$graphics{'screens'}}, $screen;
- }
- }
- #print Data::Dumper::Dumper $graphics{'screens'};
- if (my $program = main::check_program('xrandr')){
- ($diagonal,$diagonal_m,$dpi) = (undef);
- ($screen_id,$screen,@working) = (undef);
- ($res_x,$res_x_i,$res_y,$res_y_i,$size_x,$size_x_i,$size_y,$size_y_i) = (undef);
- my ($monitor,@monitors,$monitor_id,$screen,$screen_id,@xrandr_screens);
- my @xrandr = main::grabber("$program $display_opt 2>/dev/null",'','strip');
- #$graphics{'dimensions'} = (\@dimensions);
- # we get a bit more info from xrandr than xdpyinfo, but xrandr fails to handle
- # multiple screens from different video cards
- foreach (@xrandr){
- if (/^Screen ([0-9]+):/){
- $screen_id = $1;
- push @xrandr_screens, \@monitors if @monitors;
- @monitors = ();
- }
- if (/^([^\s]+)\s+connected\s(primary\s)?([0-9]+)\s*x\s*([0-9]+)\+[0-9+]+(\s\([^)]+\))?(\s([0-9]+)mm\sx\s([0-9]+)mm)?/){
- $monitor_id = $1;
- $res_x = $3;
- $res_y = $4;
- $size_x = $7;
- $size_y = $8;
- $res_x_i = ($3) ? sprintf("%.1f", ($3/25.4)) : 0;
- $res_y_i = ($4) ? sprintf("%.1f", ($4/25.4)) : 0;
- $size_x_i = ($7) ? sprintf("%.1f", ($7/25.4)) : 0;
- $size_y_i = ($8) ? sprintf("%.1f", ($8/25.4)) : 0;
- $dpi = ($res_x && $size_x) ? sprintf("%.0f", $res_x * 25.4 / $size_x) : '';
- $diagonal = ($res_x && $size_x) ? sprintf("%.1f", (sqrt($size_x**2 + $size_y**2)/25.4 )) : '';
- $diagonal += 0 if $diagonal; # trick to get rid of decimal 0
- $diagonal_m = ($res_x && $size_x) ? sprintf("%.0f", (sqrt($size_x**2 + $size_y**2))) : '';
- $monitor = {
- 'screen' => $screen_id,
- 'monitor' => $monitor_id,
- 'res-x' => $res_x,
- 'res-x-i' => $res_x_i,
- 'res-y' => $res_y,
- 'res-y-i' => $res_y_i,
- 'size-x' => $size_x,
- 'size-x-i' => $size_x_i,
- 'size-y' => $size_y,
- 'size-y-i' => $size_y_i,
- 'dpi' => $dpi,
- 'diagonal' => $diagonal,
- 'diagonal-m' => $diagonal_m,
- };
- push @monitors, $monitor;
- # print "x:$size_x y:$size_y rx:$res_x ry:$res_y dpi:$dpi\n";
- ($res_x,$res_x_i,$res_y,$res_y_i,$size_x,$size_x_i,$size_y,$size_y_i) = (0,0,0,0,0,0,0,0);
-
+ my ($program,$vulkan) = @_;
+ my ($data,$msg,@working);
+ my ($results) = ([]);
+ if ($dbg[56] || $b_log){
+ $msg = "${line1}Vulkan Data\n${line3}";
+ print $msg if $dbg[56];
+ push(@$results,$msg) if $b_log;
+ }
+ if (!$fake{'vulkan'}){
+ $data = main::grabber("$program 2>/dev/null",'','','ref');
+ }
+ else {
+ my $file;
+ $file = "$fake_data_dir/graphics/vulkan/vulkaninfo-intel-llvm-1.txt";
+ $file = "$fake_data_dir/graphics/vulkan/vulkaninfo-nvidia-1.txt";
+ $file = "$fake_data_dir/graphics/vulkan/vulkaninfo-intel-1.txt";
+ $file = "$fake_data_dir/graphics/vulkan/vulkaninfo-amd-dz.txt";
+ $file = "$fake_data_dir/graphics/vulkan/vulkaninfo-mali-3.txt";
+ $data = main::reader($file,'','ref');
+ }
+ if (!$data){
+ if ($dbg[56] || $b_log){
+ $msg = "No Vulkan data found" if $dbg[56];
+ print "$msg\n" if $dbg[56];
+ push(@$results,$msg) if $b_log;
+ }
+ return 0;
+ }
+ set_mesa_drivers() if !%mesa_drivers;
+ my ($id,%active);
+ foreach my $line (@$data){
+ next if $line =~ /^(\s*|-+|=+)$/;
+ @working = split(/\s*:\s*/,$line,2);
+ next if !@working;
+ if ($line =~ /^\S/){
+ if ($active{'start'}){undef $active{'start'}}
+ if ($active{'layers'}){undef $active{'layers'}}
+ if ($active{'groups'}){undef $active{'groups'}}
+ if ($active{'limits'}){undef $active{'limits'}}
+ if ($active{'features'}){undef $active{'features'}}
+ if ($active{'extensions'}){undef $active{'extensions'}}
+ if ($active{'format'}){undef $active{'format'}}
+ if ($active{'driver'}){($active{'driver'},$id) = ()}
+ }
+ next if $active{'start'};
+ next if $active{'groups'};
+ next if $active{'limits'};
+ next if $active{'features'};
+ next if $active{'extensions'};
+ next if $active{'format'};
+ if ($dbg[56] || $b_log){
+ $msg = $line;
+ print "$msg\n" if $dbg[56];
+ push(@$results,$msg) if $b_log;
+ }
+ if ($working[0] eq 'Vulkan Instance Version'){
+ $vulkan->{'data'}{'version'} = $working[1];
+ $active{'start'} = 1;
+ }
+ elsif ($working[0] eq 'Layers'){
+ if ($working[1] =~ /count\s*=\s*(\d+)/){
+ $vulkan->{'data'}{'layers'} = $1;
+ }
+ $active{'layers'} = 1;
+ }
+ # note: can't close this because Intel didn't use proper indentation
+ elsif ($working[0] eq 'Presentable Surfaces'){
+ $active{'surfaces'} = 1;
+ }
+ elsif ($working[0] eq 'Device Groups'){
+ $active{'groups'} = 1;
+ $active{'surfaces'} = 0;
+ }
+ elsif ($working[0] eq 'Device Properties and Extensions'){
+ $active{'devices'} = 1;
+ $active{'surfaces'} = 0;
+ undef $id;
+ }
+ elsif ($working[0] eq 'VkPhysicalDeviceProperties'){
+ $active{'props'} = 1;
+ }
+ elsif ($working[0] eq 'VkPhysicalDeviceDriverProperties'){
+ $active{'driver'} = 1;
+ }
+ elsif ($working[0] =~ /^\S+Features/i){
+ $active{'features'} = 1;
+ }
+ # seen as line starter string or inner VkPhysicalDeviceProperties
+ elsif ($working[0] =~ /^\s*\S+Limits/i){
+ $active{'limits'} = 1;
+ }
+ elsif ($working[0] =~ /^FORMAT_/){
+ $active{'format'} = 1;
+ }
+ elsif ($working[0] =~ /^(Device|Instance) Extensions/){
+ $active{'extensions'} = 1;
+ }
+ if ($active{'surfaces'}){
+ if ($working[0] eq 'GPU id'){
+ if ($working[1] =~ /^(\d+)\s+\((.*?)\):?$/){
+ $id = $1;
+ $vulkan->{'devices'}{$id}{'model'} = main::clean($2);
}
- my @working = split /\s+/,$_;
- # print join "$_\n";
- if ($working[1] =~ /\*/){
- $working[1] =~ s/\*|\+//g;
- $working[1] = sprintf("%.0f",$working[1]);
- $monitors[scalar @monitors - 1]{'hz'} = $working[1] if @monitors;
- ($diagonal,$dpi) = ('','');
- # print Data::Dumper::Dumper \@monitors;
- }
- }
- push @xrandr_screens, \@monitors if @monitors;
- #print "xrand: " . Data::Dumper::Dumper \@xrandr_screens;
- my ($i) = (0);
- foreach (@{$graphics{'screens'}}){
- my %main = %$_;
- # print "h: " . Data::Dumper::Dumper \%main;
- #print $main{'screen'}, "\n";
- foreach my $ref2 (@xrandr_screens){
- my @screens = @$ref2;
- # print "d: " . Data::Dumper::Dumper \@screens;
- if ($screens[0]{'screen'} eq $main{'screen'}){
- ${$graphics{'screens'}}[$i]{'monitors'} = \@screens;
- last;
+ }
+ if (defined $id){
+ # seen leading space, no leading space
+ if ($line =~ /^\s*Surface type/){
+ $active{'surface-type'} = 1;
+ }
+ if ($active{'surface-type'} && $line =~ /\S+_(\S+)_surface$/){
+ if (!$vulkan->{'devices'}{$id}{'surfaces'} ||
+ !(grep {$_ eq $1} @{$vulkan->{'devices'}{$id}{'surfaces'}})){
+ push(@{$vulkan->{'devices'}{$id}{'surfaces'}},$1);
+ }
+ if (!$vulkan->{'data'}{'surfaces'} ||
+ !(grep {$_ eq $1} @{$vulkan->{'data'}{'surfaces'}})){
+ push(@{$vulkan->{'data'}{'surfaces'}},$1);
}
}
- $i++;
+ if ($working[0] =~ /^\s*Formats/){
+ undef $active{'surface-type'};
+ }
}
- if (!$graphics{'screens'}) {
- $graphics{'tty'} = tty_data();
+ }
+ if ($active{'devices'}){
+ if ($working[0] =~ /^GPU(\d+)/){
+ $id = $1;
+ }
+ elsif (defined $id){
+ # apiVersion=4194528 (1.0.224); 1.3.246 (4206838); 79695971 (0x4c01063)
+ if ($line =~ /^\s+apiVersion\s*=\s*(\S+)(\s+\(([^)]+)\))?/i){
+ my ($a,$b) = ($1,$3);
+ my $api = (!$b || $b =~ /^(0x)?\d+$/) ? $a : $b;
+ $vulkan->{'devices'}{$id}{'device-api-version'} = $api;
+ }
+ elsif ($line =~ /^\s+driverVersion\s*=\s*(\S+)/i){
+ $vulkan->{'devices'}{$id}{'device-driver-version'} = $1;
+ }
+ elsif ($line =~ /^\s+vendorID\s*=\s*0x(\S+)/i){
+ $vulkan->{'devices'}{$id}{'vendor-id'} = $1;
+ }
+ elsif ($line =~ /^\s+deviceID\s*=\s*0x(\S+)/i){
+ $vulkan->{'devices'}{$id}{'device-id'} = $1;
+ }
+ # deviceType=DISCRETE_GPU; PHYSICAL_DEVICE_TYPE_DISCRETE_GPU
+ elsif ($line =~ /^\s+deviceType\s*=\s*(\S+?_TYPE_)?(\S+)$/i){
+ $vulkan->{'devices'}{$id}{'device-type'} = lc($2);
+ $vulkan->{'devices'}{$id}{'device-type'} =~ s/_/-/g;
+ }
+ # deviceName=AMD Radeon RX 6700 XT (RADV NAVI22); AMD RADV HAWAII
+ # lvmpipe (LLVM 15.0.6, 256 bits); NVIDIA GeForce GTX 1650 Ti
+ elsif ($line =~ /^\s+deviceName\s*=\s*(\S+)(\s.*|$)/i){
+ $vulkan->{'devices'}{$id}{'device-vendor'} = main::clean(lc($1));
+ $vulkan->{'devices'}{$id}{'device-name'} = main::clean($1 . $2);
+ }
+ }
+ }
+ if ($active{'driver'}){
+ if (defined $id){
+ # driverName=llvmpipe; radv;
+ if ($line =~ /^\s+driverName\s*=\s*(\S+)(\s|$)/i){
+ my $driver = lc($1);
+ if ($mesa_drivers{$driver}){
+ $vulkan->{'devices'}{$id}{'hw'} = $mesa_drivers{$driver};
+ }
+ $vulkan->{'devices'}{$id}{'driver-name'} = $driver;
+ if (!$vulkan->{'data'}{'drivers'} ||
+ !(grep {$_ eq $driver} @{$vulkan->{'data'}{'drivers'}})){
+ push(@{$vulkan->{'data'}{'drivers'}},$driver);
+ }
+ }
+ # driverInfo=Mesa 23.1.3 (LLVM 15.0.7); 525.89.02; Mesa 23.1.3
+ elsif ($line =~ /^\s+driverInfo\s*=\s*((Mesa)\s)?(.*)/i){
+ $vulkan->{'devices'}{$id}{'mesa'} = lc($2) if $2;
+ $vulkan->{'devices'}{$id}{'driver-info'} = $3;
+ }
}
}
}
- else {
- $graphics{'no-xdpyinfo'} = main::row_defaults('xdpyinfo-missing');
- }
- print 'last: ', Data::Dumper::Dumper $graphics{'screens'} if $test[17];
- main::log_data('dump','$graphics{screens}',$graphics{'screens'}) if $b_log;
+ main::log_data('dump','$results',$results) if $b_log;
+ print 'Vulkan Data: ', Data::Dumper::Dumper $vulkan if $dbg[57];
+ main::log_data('dump','$vulkan',$vulkan) if $b_log;
eval $end if $b_log;
}
-sub wayland_display_data {
+
+## DISPLAY DATA WAYLAND ##
+sub display_data_wayland {
eval $start if $b_log;
+ my ($b_skip_pos,$program);
if ($ENV{'WAYLAND_DISPLAY'}){
$graphics{'display-id'} = $ENV{'WAYLAND_DISPLAY'};
# return as wayland-0 or 0?
$graphics{'display-id'} =~ s/wayland-?//i;
}
- #print 'last: ', Data::Dumper::Dumper $graphics{'screens'} if $test[17];
- #main::log_data('dump','@graphics{screens}',$graphics{'screens'}) if $b_log;
+ if ($fake{'swaymsg'} || ($program = main::check_program('swaymsg'))){
+ swaymsg_data($program);
+ }
+ # until we get data proving otherwise, assuming these have same output
+ elsif ($fake{'wl-info'} || (($program = main::check_program('wayland-info')) ||
+ ($program = main::check_program('weston-info')))){
+ wlinfo_data($program);
+ }
+ elsif ($fake{'wlr-randr'} || ($program = main::check_program('wlr-randr'))){
+ wlrrandr_data($program);
+ }
+ # make sure we got enough for advanced position data, might be from /sys
+ if ($extra > 1 && $monitor_ids){
+ $b_skip_pos = check_wayland_data();
+ }
+ if ($extra > 1 && $monitor_ids && $b_wayland_data){
+ # map_monitor_ids([keys %$monitors]); # not required, but leave in case.
+ wayland_data_advanced($b_skip_pos);
+ }
+ print 'Wayland monitors: ', Data::Dumper::Dumper $monitor_ids if $dbg[17];
+ main::log_data('dump','$monitor_ids',$monitor_ids) if $b_log;
eval $end if $b_log;
}
-sub set_compositor {
+
+# If we didn't get explicit tool for wayland data, check to see if we got most
+# of the data from /sys/class/drm edid and then skip xrandr to avoid gunking up
+# the data, in that case, all we get from xrandr would be the position, which is
+# nice but not a must-have. We've already cleared out all disabled ports.
+sub check_wayland_data {
eval $start if $b_log;
- my ($protocol) = @_;
- # initial tests, if wayland, it is certainly a compositor
- $protocol = lc($protocol) if $protocol;
- $graphics{'compositor'} = display_compositor($protocol);
- # gnome-shell is incredibly slow to return version
- if (($extra > 2 || $protocol eq 'wayland') && $graphics{'compositor'} &&
- ( !$show{'system'} || $graphics{'compositor'} ne 'gnome-shell' ) ){
- $graphics{'compositor-version'} = (main::program_data($graphics{'compositor'},$graphics{'compositor'},3))[1];
+ my ($b_skip_pos,$b_invalid);
+ foreach my $key (keys %$monitor_ids){
+ # we need these 4 items to construct the grid rectangle
+ if (!defined $monitor_ids->{$key}{'pos-x'} ||
+ !defined $monitor_ids->{$key}{'pos-y'} ||
+ !$monitor_ids->{$key}{'res-x'} || !$monitor_ids->{$key}{'res-y'}){
+ $b_skip_pos = 1;
+ }
+ if (!$monitor_ids->{$key}{'res-x'} || !$monitor_ids->{$key}{'res-y'}){
+ $b_invalid = 1;
+ }
}
+ # ok, we have enough, we don't need to do fallback xrandr checks
+ $b_wayland_data = 1 if !$b_invalid;
eval $end if $b_log;
+ return $b_skip_pos;
}
-sub get_protocol {
+
+# Set Display rect size for > 1 monitors, monitor positions, size-i, diag
+sub wayland_data_advanced {
eval $start if $b_log;
- my ($protocol) = ('');
- $protocol = $ENV{'XDG_SESSION_TYPE'} if $ENV{'XDG_SESSION_TYPE'};
- $protocol = $ENV{'WAYLAND_DISPLAY'} if (!$protocol && $ENV{'WAYLAND_DISPLAY'});
- # can show as wayland-0
- $protocol = 'wayland' if $protocol && $protocol =~ /wayland/i;
- # yes, I've seen this in 2019 distros, sigh
- $protocol = '' if $protocol eq 'tty';
- # need to confirm that there's a point to this test, I believe no, fails out of x
- # loginctl also results in the session id
- if (!$protocol && $b_display && $b_force_display){
- if (my $program = main::check_program('loginctl')){
- my $id = '';
- # $id = $ENV{'XDG_SESSION_ID'}; # returns tty session in console
- my @data = main::grabber("$program --no-pager --no-legend 2>/dev/null",'','strip');
- foreach (@data){
- next if /tty[v]?[0-6]$/; # freebsd: ttyv3
- $id = (split /\s+/, $_)[0];
- last; # multiuser? too bad, we'll go for the first one
+ my ($b_skip_pos) = @_;
+ my (%x_pos,%y_pos);
+ my ($x_max,$y_max) = (0,0);
+ my @keys = keys %$monitor_ids;
+ foreach my $key (@keys){
+ if (!$b_skip_pos){
+ if ($monitor_ids->{$key}{'res-x'} && $monitor_ids->{$key}{'res-x'} > $x_max){
+ $x_max = $monitor_ids->{$key}{'res-x'};
}
- if ($id ){
- my $temp = (main::grabber("$program show-session $id -p Type --no-pager --no-legend 2>/dev/null"))[0];
- $temp =~ s/Type=// if $temp;
- # ssh will not show /dev/ttyx so would have passed the first test
- $protocol = $temp if $temp && $temp ne 'tty';
+ if ($monitor_ids->{$key}{'res-y'} && $monitor_ids->{$key}{'res-y'} > $y_max){
+ $y_max = $monitor_ids->{$key}{'res-y'};
+ }
+ # Now we'll add the detected x, y res to the trackers
+ if (!defined $x_pos{$monitor_ids->{$key}{'pos-x'}}){
+ $x_pos{$monitor_ids->{$key}{'pos-x'}} = $monitor_ids->{$key}{'res-x'};
+ }
+ if (!defined $y_pos{$monitor_ids->{$key}{'pos-y'}}){
+ $y_pos{$monitor_ids->{$key}{'pos-y'}} += $monitor_ids->{$key}{'res-y'};
+ }
+ }
+ # this means we failed to get EDID real data, and are using just the wayland
+ # tool to get this info, eg. with BSD without compositor data.
+ if ($monitor_ids->{$key}{'size-x'} && $monitor_ids->{$key}{'size-y'} &&
+ (!$monitor_ids->{$key}{'size-x-i'} || !$monitor_ids->{$key}{'size-y-i'} ||
+ !$monitor_ids->{$key}{'dpi'} || !$monitor_ids->{$key}{'diagonal'})){
+ my $size_x = $monitor_ids->{$key}{'size-x'};
+ my $size_y = $monitor_ids->{$key}{'size-y'};
+ $monitor_ids->{$key}{'size-x-i'} = sprintf("%.2f", ($size_x/25.4)) + 0;
+ $monitor_ids->{$key}{'size-y-i'} = sprintf("%.2f", ($size_y/25.4)) + 0;
+ $monitor_ids->{$key}{'diagonal'} = sprintf("%.2f", (sqrt($size_x**2 + $size_y**2)/25.4)) + 0;
+ $monitor_ids->{$key}{'diagonal-m'} = sprintf("%.0f", (sqrt($size_x**2 + $size_y**2)));
+ if ($monitor_ids->{$key}{'res-x'}){
+ my $res_x = $monitor_ids->{$key}{'res-x'};
+ $monitor_ids->{$key}{'dpi'} = sprintf("%.0f", $res_x * 25.4 / $size_x);
}
}
}
+ if (!$b_skip_pos){
+ if (scalar @keys > 1 && %x_pos && %y_pos){
+ my ($x,$y) = (0,0);
+ foreach (keys %x_pos){$x += $x_pos{$_}}
+ foreach (keys %y_pos){$y += $y_pos{$_}}
+ # handle cases with one tall portrait mode > 2 short landscapes, etc.
+ $x = $x_max if $x_max > $x;
+ $y = $y_max if $y_max > $y;
+ $graphics{'display-rect'} = $x . 'x' . $y;
+ }
+ my $layouts = [];
+ set_monitor_layouts($layouts);
+ # only update position, we already have all the rest of the data
+ advanced_monitor_data($monitor_ids,$layouts);
+ undef $layouts;
+ }
eval $end if $b_log;
- return $protocol;
}
-sub gl_data(){
+
+## WAYLAND COMPOSITOR DATA TOOLS ##
+# NOTE: These patterns are VERY fragile, and depend on no changes at all to
+# the data structure, and more important, the order. Something I would put
+# almost no money on being able to count on.
+sub wlinfo_data {
eval $start if $b_log;
- my $num = 0;
- my (@row,$arg);
- #print ("$b_display : $b_root\n");
- if ( $b_display){
- if (my $program = main::check_program('glxinfo')){
- # NOTE: glxinfo -B is not always available, unfortunately
- my @glxinfo = main::grabber("$program $display_opt 2>/dev/null");
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/graphics/glxinfo/glxinfo-ssh-centos.txt";
- #my @glxinfo = main::reader($file);
- if (!@glxinfo){
- my $type = 'display-console';
- if ($b_root){
- $type = 'display-root-x';
+ my ($program) = @_;
+ my ($data,%mon,@temp,$ref);
+ my ($b_iwlo,$b_izxdg,$file,$hz,$id,$pos_x,$pos_y,$res_x,$res_y,$scale);
+ if (!$fake{'wl-info'}){
+ undef $monitor_ids;
+ $data = main::grabber("$program 2>/dev/null",'','strip','ref');
+ }
+ else {
+ $file = "$fake_data_dir/graphics/wayland/weston-info-2-mon-1.txt";
+ $file = "$fake_data_dir/graphics/wayland/wayland-info-weston-vm-sparky.txt";
+ $data = main::reader($file,'strip','ref');
+ }
+ print 'wayland/weston-info raw: ', Data::Dumper::Dumper $data if $dbg[46];
+ main::log_data('dump','@$data', $data) if $b_log;
+ foreach (@$data){
+ # print 'l: ', $_,"\n";
+ if (/^interface: 'wl_output', version: \d+, name: (\d+)$/){
+ $b_iwlo = 1;
+ $id = $1;
+ }
+ elsif (/^interface: 'zxdg_output/){
+ $b_izxdg = 1;
+ $b_iwlo = 0;
+ }
+ if ($b_iwlo){
+ if (/^x: (\d+), y: (\d+), scale: ([\d\.]+)/){
+ $mon{$id}->{'pos-x'} = $1;
+ $mon{$id}->{'pos-y'} = $2;
+ $mon{$id}->{'scale'} = $3;
+ }
+ elsif (/^physical_width: (\d+) mm, physical_height: (\d+) mm/){
+ $mon{$id}->{'size-x'} = $1 if $1; # can be 0 if edid data n/a
+ $mon{$id}->{'size-y'} = $2 if $2; # can be 0 if edid data n/a
+ }
+ elsif (/^make: '([^']+)', model: '([^']+)'/){
+ my $make = main::clean($1);
+ my $model = main::clean($2);
+ $mon{$id}->{'model'} = $make;
+ if ($make && $model){
+ $mon{$id}->{'model'} = $make . ' ' . $model;
}
- else {
- $type = 'display-null';
+ elsif ($model) {
+ $mon{$id}->{'model'} = $model;
}
- @row = ({
- main::key($num++,0,1,'Message') => main::row_defaults($type),
- });
- return @row;
- }
- #print join "\n",@glxinfo,"\n";
- my $compat_version = '';
- my ($b_compat,$b_nogl,@core_profile_version,@direct_render,@renderer,
- @opengl_version,@working);
- foreach (@glxinfo){
- next if /^\s/;
- if (/^opengl renderer/i){
- @working = split /:\s*/, $_;
- if ($working[1]){
- $working[1] = main::cleaner($working[1]);
- # Allow all mesas
- #if ($working[1] =~ /mesa/i){
- #
- #}
- }
- # note: there are cases where gl drivers are missing and empty
- # field value occurs.
- else {
- $b_nogl = 1;
- $working[1] = main::row_defaults('gl-empty');
+ elsif ($make) {
+ $mon{$id}->{'model'} = $make;
+ }
+ # includes remove duplicates and remove unset
+ if ($mon{$id}->{'model'}){
+ $mon{$id}->{'model'} = main::clean_dmi($mon{$id}->{'model'});
+ }
+ }
+ elsif (/^width: (\d+) px, height: (\d+) px, refresh: ([\d\.]+) Hz,/){
+ $mon{$id}->{'res-x'} = $1;
+ $mon{$id}->{'res-y'} = $2;
+ $mon{$id}->{'hz'} = sprintf('%.0f',$3);
+ }
+ }
+ # note: we don't want to use the 'description' field because that doesn't
+ # always contain make/model data, sometimes it's: Built-in/Unknown Display
+ elsif ($b_izxdg){
+ if (/^output: (\d+)/){
+ $id = $1;
+ }
+ elsif (/^name: '([^']+)'$/){
+ $mon{$id}->{'monitor'} = $1;
+ }
+ elsif (/^logical_x: (\d+), logical_y: (\d+)/){
+ $mon{$id}->{'log-pos-x'} = $1;
+ $mon{$id}->{'log-pos-y'} = $2;
+ }
+ elsif (/^logical_width: (\d+), logical_height: (\d+)/){
+ $mon{$id}->{'log-x'} = $1;
+ $mon{$id}->{'log-y'} = $2;
+ }
+ }
+ if ($b_izxdg && /^interface: '(?!zxdg_output)/){
+ last;
+ }
+ }
+ # now we need to map %mon back to $monitor_ids
+ if (%mon){
+ $b_wayland_data = 1;
+ foreach my $key (keys %mon){
+ next if !$mon{$key}->{'monitor'}; # no way to know what it is, sorry
+ $id = $mon{$key}->{'monitor'};
+ $monitor_ids->{$id}{'monitor'} = $id;
+ $monitor_ids->{$id}{'log-x'} = $mon{$key}->{'log-x'} if defined $mon{$key}->{'log-x'};
+ $monitor_ids->{$id}{'log-y'} = $mon{$key}->{'log-y'} if defined $mon{$key}->{'log-y'};
+ $monitor_ids->{$id}{'pos-x'} = $mon{$key}->{'pos-x'} if defined $mon{$key}->{'pos-x'};
+ $monitor_ids->{$id}{'pos-y'} = $mon{$key}->{'pos-y'} if defined $mon{$key}->{'pos-y'};
+ $monitor_ids->{$id}{'res-x'} = $mon{$key}->{'res-x'} if defined $mon{$key}->{'res-x'};
+ $monitor_ids->{$id}{'res-y'} = $mon{$key}->{'res-y'} if defined $mon{$key}->{'res-y'};
+ $monitor_ids->{$id}{'size-x'} = $mon{$key}->{'size-x'} if defined $mon{$key}->{'size-x'};
+ $monitor_ids->{$id}{'size-y'} = $mon{$key}->{'size-y'} if defined $mon{$key}->{'size-y'};
+ $monitor_ids->{$id}{'hz'} = $mon{$key}->{'hz'} if defined $mon{$key}->{'hz'};
+ if (defined $mon{$key}->{'model'} && !$monitor_ids->{$id}{'model'}){
+ $monitor_ids->{$id}{'model'} = $mon{$key}->{'model'};
+ }
+ $monitor_ids->{$id}{'scale'} = $mon{$key}->{'scale'} if defined $mon{$key}->{'scale'};
+ # fallbacks in case wl_output block is not present, which happens
+ if (!defined $mon{$key}->{'pos-x'} && defined $mon{$key}->{'log-pos-x'}){
+ $monitor_ids->{$id}{'pos-x'} = $mon{$key}->{'log-pos-x'};
+ }
+ if (!defined $mon{$key}->{'pos-y'} && defined $mon{$key}->{'log-pos-y'}){
+ $monitor_ids->{$id}{'pos-y'} = $mon{$key}->{'log-pos-y'};
+ }
+ if (!defined $mon{$key}->{'res-x'} && defined $mon{$key}->{'log-x'}){
+ $monitor_ids->{$id}{'res-x'} = $mon{$key}->{'log-x'};
+ }
+ if (!defined $mon{$key}->{'res-y'} && defined $mon{$key}->{'log-y'}){
+ $monitor_ids->{$id}{'res-y'} = $mon{$key}->{'log-y'};
+ }
+ }
+ }
+ print '%mon: ', Data::Dumper::Dumper \%mon if $dbg[46];
+ main::log_data('dump','%mon', \%mon) if $b_log;
+ print 'wayland/weston-info: monitor_ids: ', Data::Dumper::Dumper $monitor_ids if $dbg[46];
+ eval $end if $b_log;
+}
+
+# Note; since not all systems will have /sys data, we'll repack it if it's
+# missing here.
+sub swaymsg_data {
+ eval $start if $b_log;
+ my ($program) = @_;
+ my (@data,%json,@temp,$ref);
+ my ($b_json,$file,$hz,$id,$model,$pos_x,$pos_y,$res_x,$res_y,$scale,$serial);
+ if (!$fake{'swaymsg'}){
+ main::load_json() if !$loaded{'json'};
+ if ($use{'json'}){
+ my $result = qx($program -t get_outputs -r 2>/dev/null);
+ # returns array of monitors found
+ @data = &{$use{'json'}->{'decode'}}($result) if $result;
+ $b_json = 1;
+ print "$use{'json'}->{'type'}: " if $dbg[46];
+ # print "using: $use{'json'}->{'type'}\n";
+ }
+ else {
+ @data = main::grabber("$program -t get_outputs -p 2>/dev/null",'','strip');
+ }
+ }
+ else {
+ undef $monitor_ids;
+ $file = "$fake_data_dir/graphics/wayland/swaymsg-2-monitor-1.txt";
+ @data = main::reader($file,'strip');
+ }
+ print 'swaymsg: ', Data::Dumper::Dumper \@data if $dbg[46];
+ main::log_data('dump','@data', \@data) if $b_log;
+ # print Data::Dumper::Dumper \@data;
+ if ($b_json){
+ $b_wayland_data = 1 if scalar @data > 0;
+ foreach my $display (@data){
+ foreach my $mon (@$display){
+ ($hz,$pos_x,$pos_y,$res_x,$res_y,$scale) = ();
+ $id = $mon->{'name'};
+ if (!$monitor_ids->{$id}{'monitor'}){
+ $monitor_ids->{$id}{'monitor'} = $mon->{'name'};
+ }
+ # we don't want to overwrite good edid model data if we already got it
+ if (!$monitor_ids->{$id}{'model'} && $mon->{'make'}){
+ $monitor_ids->{$id}{'model'} = main::clean($mon->{'make'});
+ if ($mon->{'model'}){
+ $monitor_ids->{$id}{'model'} .= ' ' . main::clean($mon->{'model'});
}
- push @renderer, $working[1];
- }
- # dropping all conditions from this test to just show full mesa information
- # there is a user case where not f and mesa apply, atom mobo
- # /opengl version/ && ( f || $2 !~ /mesa/ ) {
- elsif (/^opengl version/i){
- @working = split /:\s*/, $_;
- if ($working[1]){
- # fglrx started appearing with this extra string, does not appear
- # to communicate anything of value
- $working[1] =~ s/(Compatibility Profile Context|\(Compatibility Profile\))//;
- $working[1] =~ s/\s\s/ /g;
- $working[1] =~ s/^\s+|\s+$//;
- push @opengl_version, $working[1];
- # note: this is going to be off if ever multi opengl versions appear,
- # never seen one
- @working = split /\s+/, $working[1];
- $compat_version = $working[0];
+ $monitor_ids->{$id}{'model'} = main::remove_duplicates($monitor_ids->{$id}{'model'});
+ }
+ if ($monitor_ids->{$id}{'primary'}){
+ if ($monitor_ids->{$id}{'primary'} ne 'false'){
+ $monitor_ids->{$id}{'primary'} = $id;
+ $b_primary = 1;
}
- elsif (!$b_nogl) {
- push @opengl_version, main::row_defaults('gl-empty');
+ else {
+ $monitor_ids->{$id}{'primary'} = undef;
}
}
- elsif (/^opengl core profile version/i){
- @working = split /:\s*/, $_;
- # note: no need to apply empty message here since we don't have the data
- # anyway
- if ($working[1]){
- # fglrx started appearing with this extra string, does not appear
- # to communicate anything of value
- $working[1] =~ s/(Compatibility Profile Context|\((Compatibility|Core) Profile\))//;
- $working[1] =~ s/\s\s/ /g;
- $working[1] =~ s/^\s+|\s+$//;
- push @core_profile_version, $working[1];
+ if (!$monitor_ids->{$id}{'serial'}){
+ $monitor_ids->{$id}{'serial'} = main::clean_dmi($mon->{'serial'});
+ }
+ # sys data will only have edid type info, not active state res/pos/hz
+ if ($mon->{'current_mode'}){
+ if ($hz = $mon->{'current_mode'}{'refresh'}){
+ $hz = sprintf('%.0f',($mon->{'current_mode'}{'refresh'}/1000));
+ $monitor_ids->{$id}{'hz'} = $hz;
}
+ $monitor_ids->{$id}{'res-x'} = $mon->{'current_mode'}{'width'};
+ $monitor_ids->{$id}{'res-y'} = $mon->{'current_mode'}{'height'};
}
- elsif (/direct rendering/){
- @working = split /:\s*/, $_;
- push @direct_render, $working[1];
+ if ($mon->{'rect'}){
+ $monitor_ids->{$id}{'pos-x'} = $mon->{'rect'}{'x'};
+ $monitor_ids->{$id}{'pos-y'} = $mon->{'rect'}{'y'};
}
- # if -B was always available, we could skip this, but it is not
- elsif (/GLX Visuals/){
- last;
+ if ($mon->{'scale'}){
+ $monitor_ids->{$id}{'scale'} =$mon->{'scale'};
}
}
- my ($direct_render,$renderer,$version) = ('N/A','N/A','N/A');
- $direct_render = join ', ', @direct_render if @direct_render;
- # non free drivers once filtered and cleaned show the same for core and compat
- # but this stopped for some reason at 4.5/4.6 nvidia
- if (@core_profile_version && @opengl_version &&
- join ('', @core_profile_version) ne join( '', @opengl_version) &&
- !(grep {/nvidia/i} @opengl_version ) ){
- @opengl_version = @core_profile_version;
- $b_compat = 1;
- }
- $version = join ', ', @opengl_version if @opengl_version;
- $renderer = join ', ', @renderer if @renderer;
- @row = ({
- main::key($num++,1,1,'OpenGL') => '',
- main::key($num++,1,2,'renderer') => ($renderer) ? $renderer : 'N/A',
- main::key($num++,0,2,'v') => ($version) ? $version : 'N/A',
- });
- if ($b_compat && $extra > 1 && $compat_version){
- $row[0]{main::key($num++,0,2,'compat-v')} = $compat_version;
+ }
+ }
+ else {
+ foreach (@data){
+ push(@temp,'~~') if /^Output/i;
+ push(@temp,$_);
+ }
+ push(@temp,'~~') if @temp;
+ @data = @temp;
+ $b_wayland_data = 1 if scalar @data > 8;
+ foreach (@data){
+ if ($_ eq '~~' && $id){
+ $monitor_ids->{$id}{'hz'} = $hz;
+ $monitor_ids->{$id}{'model'} = $model if $model;
+ $monitor_ids->{$id}{'monitor'} = $id;
+ $monitor_ids->{$id}{'pos-x'} = $pos_x;
+ $monitor_ids->{$id}{'pos-y'} = $pos_y;
+ $monitor_ids->{$id}{'res-x'} = $res_x;
+ $monitor_ids->{$id}{'res-y'} = $res_y;
+ $monitor_ids->{$id}{'scale'} = $scale;
+ $monitor_ids->{$id}{'serial'} = $serial if $serial;
+ ($hz,$model,$pos_x,$pos_y,$res_x,$res_y,$scale,$serial) = ();
+ $b_wayland_data = 1;
}
- if ($extra > 0){
- $row[0]{main::key($num++,0,2,'direct render')} = $direct_render;
+ # Output VGA-1 '<Unknown> <Unknown> ' (focused)
+ # unknown how 'primary' is shown, if it shows in this output
+ if (/^Output (\S+) '([^']+)'/i){
+ $id = $1;
+ if ($2 && !$monitor_ids->{$id}{'model'}){
+ ($model,$serial) = get_model_serial($2);
+ }
+ }
+ elsif (/^Current mode:\s+(\d+)x(\d+)\s+\@\s+([\d\.]+)\s+Hz/i){
+ $res_x = $1;
+ $res_y = $2;
+ $hz = (sprintf('%.0f',($3/1000)) + 0) if $3;
+ }
+ elsif (/^Position:\s+(\d+),(\d+)/i){
+ $pos_x = $1;
+ $pos_y = $2;
+ }
+ elsif (/^Scale factor:\s+([\d\.]+)/i){
+ $scale = $1 + 0;
}
}
- else {
- @row = ({
- main::key($num++,0,1,'Message') => main::row_defaults('glxinfo-missing'),
+ }
+ print 'swaymsg: ', Data::Dumper::Dumper $monitor_ids if $dbg[46];
+ eval $end if $b_log;
+}
+
+# Like a basic stripped down swaymsg -t get_outputs -p, less data though
+# This is EXTREMELY LIKELY TO FAIL! Any tiny syntax change will break this.
+sub wlrrandr_data {
+ eval $start if $b_log;
+ my ($program) = @_;
+ my ($file,$hz,$id,$info,$model,$pos_x,$pos_y,$res_x,$res_y,$scale,$serial);
+ my ($data,@temp);
+ if (!$fake{'wlr-randr'}){
+ $data = main::grabber("$program 2>/dev/null",'','strip','ref');
+ }
+ else {
+ undef $monitor_ids;
+ $file = "$fake_data_dir/graphics/wayland/wlr-randr-2-monitor-1.txt";
+ $data = main::reader($file,'strip','ref');
+ }
+ foreach (@$data){
+ push(@temp,'~~') if /^([A-Z]+-[ABID\d-]+)\s['"]/i;
+ push(@temp,$_);
+ }
+ push(@temp,'~~') if @temp;
+ @$data = @temp;
+ $b_wayland_data = 1 if scalar @$data > 4;
+ print 'wlr-randr: ', Data::Dumper::Dumper $data if $dbg[46];
+ main::log_data('dump','@$data', $data) if $b_log;
+ foreach (@$data){
+ if ($_ eq '~~' && $id){
+ $monitor_ids->{$id}{'hz'} = $hz;
+ $monitor_ids->{$id}{'model'} = $model if $model && !$monitor_ids->{$id}{'model'};
+ $monitor_ids->{$id}{'monitor'} = $id;
+ $monitor_ids->{$id}{'pos-x'} = $pos_x;
+ $monitor_ids->{$id}{'pos-y'} = $pos_y;
+ $monitor_ids->{$id}{'res-x'} = $res_x;
+ $monitor_ids->{$id}{'res-y'} = $res_y;
+ $monitor_ids->{$id}{'scale'} = $scale;
+ $monitor_ids->{$id}{'serial'} = $serial if $serial && !$monitor_ids->{$id}{'serial'};
+ ($hz,$info,$model,$pos_x,$pos_y,$res_x,$res_y,$scale,$serial) = ();
+ $b_wayland_data = 1;
+ }
+ # Output: VGA-1 '<Unknown> <Unknown> ' (focused)
+ # DVI-I-1 'Samsung Electric Company SyncMaster H9NX843762' (focused)
+ # unknown how 'primary' is shown, if it shows in this output
+ if (/^([A-Z]+-[ABID\d-]+)\s([']([^']+)['])?/i){
+ $id = $1;
+ # if model is set, we got edid data
+ if ($3 && !$monitor_ids->{$id}{'model'}){
+ ($model,$serial) = get_model_serial($3);
+ }
+ }
+ elsif (/^(\d+)x(\d+)\s+px,\s+([\d\.]+)\s+Hz \([^\)]*?current\)/i){
+ $res_x = $1;
+ $res_y = $2;
+ $hz = sprintf('%.0f',$3) if $3;
+ }
+ elsif (/^Position:\s+(\d+),(\d+)/i){
+ $pos_x = $1;
+ $pos_y = $2;
+ }
+ elsif (/^Scale:\s+([\d\.]+)/i){
+ $scale = $1 + 0;
+ }
+ }
+ print 'wlr-randr: ', Data::Dumper::Dumper $monitor_ids if $dbg[46];
+ eval $end if $b_log;
+}
+
+# Return model/serial for those horrible string type values we have to process
+# in swaymsg -t get_outputs -p and wlr-randr default output
+sub get_model_serial {
+ eval $start if $b_log;
+ my $info = $_[0];
+ my ($model,$serial);
+ $info = main::clean($info);
+ return if !$info;
+ my @parts = split(/\s+/, $info);
+ # Perl Madness, lol: the last just checks how many integers in string
+ if (scalar @parts > 1 && (length($parts[-1]) > 7) &&
+ (($parts[-1] =~ tr/[0-9]//) > 4)){
+ $serial = pop @parts;
+ $serial = main::clean_dmi($serial); # clears out 0x00000 type non data
+ }
+ # we're assuming that we'll never get a serial without make/model data too.
+ $model = join(' ',@parts) if @parts;
+ $model = main::remove_duplicates($model) if $model && scalar @parts > 1;
+ eval $end if $b_log;
+ return ($model,$serial);
+}
+
+# DISPLAY DATA X.org ##
+sub display_data_x {
+ eval $start if $b_log;
+ my ($prog_xdpyinfo,$prog_xdriinfo,$prog_xrandr);
+ if ($prog_xdpyinfo = main::check_program('xdpyinfo')){
+ xdpyinfo_data($prog_xdpyinfo);
+ }
+ # print Data::Dumper::Dumper $graphics{'screens'};
+ if ($prog_xrandr = main::check_program('xrandr')){
+ xrandr_data($prog_xrandr);
+ }
+ # if tool not installed, falls back to testing Xorg log file
+ if ($prog_xdriinfo = main::check_program('xdriinfo')){
+ xdriinfo_data($prog_xdriinfo);
+ }
+ if (!$graphics{'screens'}){
+ $graphics{'tty'} = tty_data();
+ }
+ if (!$prog_xrandr){
+ $graphics{'no-monitors'} = main::message('tool-missing-basic','xrandr');
+ if (!$prog_xdpyinfo){
+ if ($graphics{'protocol'} eq 'wayland'){
+ $graphics{'no-screens'} = main::message('screen-wayland');
+ }
+ else {
+ $graphics{'no-screens'} = main::message('tool-missing-basic','xdpyinfo/xrandr');
+ }
+ }
+ }
+ print 'Final display x: ', Data::Dumper::Dumper $graphics{'screens'} if $dbg[17];
+ main::log_data('dump','$graphics{screens}',$graphics{'screens'}) if $b_log;
+ eval $end if $b_log;
+}
+
+sub xdriinfo_data {
+ eval $start if $b_log;
+ my $program = $_[0];
+ my (%dri_drivers,$screen,$xdriinfo);
+ if (!$fake{'xdriinfo'}){
+ $xdriinfo = main::grabber("$program $display_opt 2>/dev/null",'','strip','ref');
+ }
+ else {
+ # $xdriinfo = main::reader("$fake_data_dir/xrandr/xrandr-test-1.txt",'strip','ref');
+ }
+ foreach $screen (@$xdriinfo){
+ if ($screen =~ /^Screen (\d+):\s+(\S+)/){
+ $dri_drivers{$1} = $2 if $2 !~ /^not\b/;
+ }
+ }
+ if ($graphics{'screens'}){
+ # assign to the screen if it's found
+ foreach $screen (@{$graphics{'screens'}}){
+ if (defined $dri_drivers{$screen->{'screen'}} ){
+ $screen->{'dri-driver'} = $dri_drivers{$screen->{'screen'}};
+ }
+ }
+ }
+ # now the display drivers
+ foreach $screen (sort keys %dri_drivers){
+ if (!$graphics{'dri-drivers'} ||
+ !(grep {$dri_drivers{$screen} eq $_} @{$graphics{'dri-drivers'}})){
+ push (@{$graphics{'dri-drivers'}},$dri_drivers{$screen});
+ }
+ }
+ print 'x dri driver: ', Data::Dumper::Dumper \%dri_drivers if $dbg[17];
+ main::log_data('dump','%dri_drivers',\%dri_drivers) if $b_log;
+ eval $end if $b_log;
+}
+
+sub xdpyinfo_data {
+ eval $start if $b_log;
+ my ($program) = @_;
+ my ($diagonal,$diagonal_m,$dpi) = ('','','');
+ my ($screen_id,$xdpyinfo,@working);
+ my ($res_x,$res_y,$size_x,$size_x_i,$size_y,$size_y_i);
+ if (!$fake{'xdpyinfo'}){
+ $xdpyinfo = main::grabber("$program $display_opt 2>/dev/null","\n",'strip','ref');
+ }
+ else {
+ # my $file;
+ # $file = "$fake_data_dir/xdpyinfo/xdpyinfo-1-screen-2-in-inxi.txt";
+ # $xdpyinfo = main::reader($file,'strip','ref');
+ }
+ # @$xdpyinfo = map {s/^\s+//;$_} @$xdpyinfo if @$xdpyinfo;
+ # print join("\n",@$xdpyinfo), "\n";
+ # X vendor and version detection.
+ # new method added since radeon and X.org and the disappearance of
+ # <X server name> version : ...etc. Later on, the normal textual version string
+ # returned, e.g. like: X.Org version: 6.8.2
+ # A failover mechanism is in place: if $version empty, release number parsed instead
+ foreach (@$xdpyinfo){
+ @working = split(/:\s+/, $_);
+ next if (($graphics{'screens'} && $working[0] !~ /^(dimensions$|screen\s#)/) || !$working[0]);
+ # print "$_\n";
+ if ($working[0] eq 'vendor string'){
+ $working[1] =~ s/The\s|\sFoundation//g;
+ # some distros, like fedora, report themselves as the xorg vendor,
+ # so quick check here to make sure the vendor string includes Xorg in string
+ if ($working[1] !~ /x/i){
+ $working[1] .= ' X.org';
+ }
+ $graphics{'x-server'} = [[$working[1]]];
+ }
+ elsif ($working[0] eq 'name of display'){
+ $graphics{'display-id'} = $working[1];
+ }
+ # this is the x protocol version
+ elsif ($working[0] eq 'version number'){
+ $graphics{'x-protocol-version'} = $working[1];
+ }
+ # not used, but might be good for something?
+ elsif ($working[0] eq 'vendor release number'){
+ $graphics{'x-vendor-release'} = $working[1];
+ }
+ # the real X.org version string
+ elsif ($working[0] eq 'X.Org version'){
+ push(@{$graphics{'x-server'}->[0]},$working[1]);
+ }
+ elsif ($working[0] eq 'default screen number'){
+ $graphics{'display-default-screen'} = $working[1];
+ }
+ elsif ($working[0] eq 'number of screens'){
+ $graphics{'display-screens'} = $working[1];
+ }
+ elsif ($working[0] =~ /^screen #([0-9]+):/){
+ $screen_id = $1;
+ }
+ elsif ($working[0] eq 'resolution'){
+ $working[1] =~ s/^([0-9]+)x/$1/;
+ $graphics{'s-dpi'} = $working[1];
+ }
+ # This is Screen, not monitor: dimensions: 2560x1024 pixels (677x270 millimeters)
+ elsif ($working[0] eq 'dimensions'){
+ ($dpi,$res_x,$res_y,$size_x,$size_y) = ();
+ if ($working[1] =~ /([0-9]+)\s*x\s*([0-9]+)\s+pixels\s+\(([0-9]+)\s*x\s*([0-9]+)\s*millimeters\)/){
+ $res_x = $1;
+ $res_y = $2;
+ $size_x = $3;
+ $size_y = $4;
+ # flip size x,y if don't roughly match res x/y ratio
+ if ($size_x && $size_y && $res_y){
+ flip_size_x_y(\$size_x,\$size_y,\$res_x,\$res_y);
+ }
+ $size_x_i = ($size_x) ? sprintf("%.2f", ($size_x/25.4)) : 0;
+ $size_y_i = ($size_y) ? sprintf("%.2f", ($size_y/25.4)) : 0;
+ $dpi = ($res_x && $size_x) ? sprintf("%.0f", ($res_x*25.4/$size_x)) : '';
+ $diagonal = ($size_x && $size_y) ? sprintf("%.2f", (sqrt($size_x**2 + $size_y**2)/25.4)) + 0 : '';
+ $diagonal_m = ($size_x && $size_y) ? sprintf("%.0f", (sqrt($size_x**2 + $size_y**2))) : '';
+ }
+ push(@{$graphics{'screens'}}, {
+ 'diagonal' => $diagonal,
+ 'diagonal-m' => $diagonal_m,
+ 'res-x' => $res_x,
+ 'res-y' => $res_y,
+ 'screen' => $screen_id,
+ 's-dpi' => $dpi,
+ 'size-x' => $size_x,
+ 'size-x-i' => $size_x_i,
+ 'size-y' => $size_y,
+ 'size-y-i' => $size_y_i,
+ 'source' => 'xdpyinfo',
});
}
}
+ print 'Data: xdpyinfo: ', Data::Dumper::Dumper $graphics{'screens'} if $dbg[17];
+ main::log_data('dump','$graphics{screens}',$graphics{'screens'}) if $b_log;
+ eval $end if $b_log;
+}
+
+sub xrandr_data {
+ eval $end if $b_log;
+ my ($program) = @_;
+ my ($diagonal,$diagonal_m,$dpi,$monitor_id,$pos_x,$pos_y,$primary);
+ my ($res_x,$res_x_max,$res_y,$res_y_max);
+ my ($screen_id,$set_as,$size_x,$size_x_i,$size_y,$size_y_i);
+ my (@ids,%monitors,@xrandr,@xrandr_screens);
+ if (!$fake{'xrandr'}){
+ # @xrandr = main::grabber("$program $display_opt 2>/dev/null",'','strip','arr');
+ # note: --prop support added v 1.2, ~2009 in distros
+ @xrandr = qx($program --prop $display_opt 2>&1);
+ if ($? > 0){
+ # we only want to rerun if unsupported option
+ if (grep {/unrecognized/} @xrandr){
+ @xrandr = qx($program $display_opt 2>/dev/null);
+ }
+ else {
+ @xrandr = ();
+ }
+ }
+ chomp(@xrandr) if @xrandr;
+ }
else {
- my $type = 'display-console';
- if (!main::check_program('glxinfo')){
- $type = 'glxinfo-missing';
+ # my $file;
+ # $file = "$fake_data_dir/xrandr/xrandr-4-displays-1.txt";
+ # $file = "$fake_data_dir/xrandr/xrandr-3-display-primary-issue.txt";
+ # $file = "$fake_data_dir/xrandr/xrandr-test-1.txt";
+ # $file = "$fake_data_dir/xrandr/xrandr-test-2.txt";
+ # $file = "$fake_data_dir/xrandr/xrandr-1-screen-2-in-inxi.txt";
+ # @xrandr = main::reader($file,'strip','arr');
+ }
+ # $graphics{'dimensions'} = (\@dimensions);
+ # we get a bit more info from xrandr than xdpyinfo, but xrandr fails to handle
+ # multiple screens from different video cards
+ # $graphics{'screens'} = undef;
+ foreach (@xrandr){
+ # note: no mm as with xdpyinfo
+ # Screen 0: minimum 320 x 200, current 2560 x 1024, maximum 8192 x 8192
+ if (/^Screen ([0-9]+):/){
+ $screen_id = $1;
+ # handle no xdpyinfo Screen data, multiple xscreens, etc
+ if (check_screens($screen_id) &&
+ /:\s.*?current\s+(\d+)\s*x\s*(\d+),\smaximum\s+(\d+)\s*x\s*(\d+)/){
+ $res_x = $1;
+ $res_y = $2;
+ $res_x_max = $3;
+ $res_y_max = $4;
+ push(@{$graphics{'screens'}}, {
+ 'diagonal' => undef,
+ 'diagonal-m' => undef,
+ 'res-x' => $res_x,
+ 'res-y' => $res_y,
+ 'screen' => $screen_id,
+ 's-dpi' => undef,
+ 'size-x' => undef,
+ 'size-x-i' => undef,
+ 'size-y' => undef,
+ 'size-y-i' => undef,
+ 'source' => 'xrandr',
+ });
+ }
+ if (%monitors){
+ push(@xrandr_screens,{%monitors});
+ %monitors = ();
+ }
+ }
+ # HDMI-2 connected 1920x1200+1080+0 (normal left inverted right x axis y axis) 519mm x 324mm
+ # DP-1 connected primary 2560x1440+1080+1200 (normal left inverted right x axis y axis) 598mm x 336mm
+ # HDMI-1 connected 1080x1920+0+0 left (normal left inverted right x axis y axis) 160mm x 90mm
+ # disabled but connected: VGA-1 connected (normal left inverted right x axis y axis)
+ elsif (/^([\S]+)\s+connected\s(primary\s)?/){
+ $monitor_id = $1;
+ $set_as = $2;
+ if (/^[^\s]+\s+connected\s(primary\s)?([0-9]+)\s*x\s*([0-9]+)\+([0-9]+)\+([0-9]+)(\s[^(]*\([^)]+\))?(\s([0-9]+)mm\sx\s([0-9]+)mm)?/){
+ $res_x = $2;
+ $res_y = $3;
+ $pos_x = $4;
+ $pos_y = $5;
+ $size_x = $8;
+ $size_y = $9;
+ # flip size x,y if don't roughly match res x/y ratio
+ if ($size_x && $size_y && $res_y){
+ flip_size_x_y(\$size_x,\$size_y,\$res_x,\$res_y);
+ }
+ $size_x_i = ($size_x) ? sprintf("%.2f", ($size_x/25.4)) + 0 : 0;
+ $size_y_i = ($size_y) ? sprintf("%.2f", ($size_y/25.4)) + 0 : 0;
+ $dpi = ($res_x && $size_x) ? sprintf("%.0f", $res_x * 25.4 / $size_x) : '';
+ $diagonal = ($res_x && $size_x) ? sprintf("%.2f", (sqrt($size_x**2 + $size_y**2)/25.4)) + 0 : '';
+ $diagonal_m = ($res_x && $size_x) ? sprintf("%.0f", (sqrt($size_x**2 + $size_y**2))) : '';
+ }
+ else {
+ ($res_x,$res_y,$pos_x,$pos_y,$size_x,$size_x_i,$size_y,$size_y_i,$dpi,$diagonal,$diagonal_m) = ()
+ }
+ undef $primary;
+ push(@ids,[$monitor_id]);
+ if ($set_as){
+ $primary = $monitor_id;
+ $set_as =~ s/\s$//;
+ $b_primary = 1;
+ }
+ $monitors{$monitor_id} = {
+ 'screen' => $screen_id,
+ 'monitor' => $monitor_id,
+ 'pos-x' => $pos_x,
+ 'pos-y' => $pos_y,
+ 'primary' => $primary,
+ 'res-x' => $res_x,
+ 'res-y' => $res_y,
+ 'size-x' => $size_x,
+ 'size-x-i' => $size_x_i,
+ 'size-y' => $size_y,
+ 'size-y-i' => $size_y_i,
+ 'dpi' => $dpi,
+ 'diagonal' => $diagonal,
+ 'diagonal-m' => $diagonal_m,
+ 'position' => $set_as,
+ };
+ # print "x:$size_x y:$size_y rx:$res_x ry:$res_y dpi:$dpi\n";
+ ($res_x,$res_y,$size_x,$size_x_i,$size_y,$size_y_i,$set_as) = (0,0,0,0,0,0,0,0,undef);
+ }
+ elsif (/^([\S]+)\s+disconnected\s/){
+ undef $monitor_id;
+ }
+ elsif ($monitor_id && %monitors) {
+ my @working = split(/\s+/,$_);
+ # this is the monitor current dimensions
+ # 5120x1440 59.98* 29.98
+ # print Data::Dumper::Dumper \@working;
+ next if !$working[2];
+ if ($working[2] =~ /\*/){
+ # print "$working[1] :: $working[2]\n";
+ $working[2] =~ s/\*|\+//g;
+ $working[2] = sprintf("%.0f",$working[2]);
+ $monitors{$monitor_id}->{'hz'} = $working[2];
+ ($diagonal,$dpi) = ('','');
+ # print Data::Dumper::Dumper \@monitors;
+ }
+ # \tCONNECTOR_ID: 52
+ elsif ($working[1] eq 'CONNECTOR_ID:'){
+ # print "$working[1] :: $working[2]\n";
+ if (!$monitors{$monitor_id}->{'connector-id'}){
+ push(@{$ids[$#ids]},$working[2]);
+ $monitors{$monitor_id}->{'connector-id'} = $working[2];
+ }
+ }
+ }
+ }
+ if (%monitors){
+ push(@xrandr_screens,{%monitors});
+ }
+ my $i = 0;
+ my $layouts;
+ # corner cases, xrandr screens > xdpyinfo screen, no xdpyinfo counts
+ if ($graphics{'screens'} && (!defined $graphics{'display-screens'} ||
+ $graphics{'display-screens'} < scalar @{$graphics{'screens'}})){
+ $graphics{'display-screens'} = scalar @{$graphics{'screens'}};
+ }
+ map_monitor_ids(\@ids) if @ids;
+ # print "xrandr_screens 1: " . Data::Dumper::Dumper \@xrandr_screens;
+ foreach my $main (@{$graphics{'screens'}}){
+ # print "h: " . Data::Dumper::Dumper $main;
+ # print "h: " . Data::Dumper::Dumper @xrandr_screens;
+ # print $main->{'screen'}, "\n";
+ foreach my $x_screen (@xrandr_screens){
+ # print "d: " . Data::Dumper::Dumper $x_screen;
+ my @keys = sort keys %$x_screen;
+ if ($x_screen->{$keys[0]}{'screen'} eq $main->{'screen'} &&
+ !defined $graphics{'screens'}->[$i]{'monitors'}){
+ $graphics{'screens'}->[$i]{'monitors'} = $x_screen;
+ }
+ if ($extra > 1){
+ if (!$layouts){
+ $layouts = [];
+ set_monitor_layouts($layouts);
+ }
+ advanced_monitor_data($x_screen,$layouts);
+ }
+ if (!defined $main->{'size-x'}){
+ $graphics{'screens'}->[$i]{'size-missing'} = main::message('tool-missing-basic','xdpyinfo');
+ }
+ }
+ $i++;
+ }
+ undef $layouts;
+ # print "xrandr_screens 2: " . Data::Dumper::Dumper \@xrandr_screens;
+ print 'Data: xrandr: ', Data::Dumper::Dumper $graphics{'screens'} if $dbg[17];
+ main::log_data('dump','$graphics{screens}',$graphics{'screens'}) if $b_log;
+ eval $end if $b_log;
+}
+
+# Handle some strange corner cases with more robust testing
+sub check_screens {
+ my ($id) = @_;
+ my $b_use;
+ # used: scalar @{$graphics{'screens'}} != (scalar @$xrandr_screens + 1)
+ # before but that test can fail in some cases.
+ # no screens set in xdpyinfo. If xrandr has > 1 xscreen, this would be false
+ if (!$graphics{'screens'}){
+ $b_use = 1;
+ }
+ # verify that any xscreen set so far does not exist in $graphics{'screens'}
+ else {
+ my $b_detected;
+ foreach my $screen (@{$graphics{'screens'}}){
+ if ($screen->{'screen'} eq $id){
+ $b_detected = 1;
+ last;
+ }
+ }
+ $b_use = 1 if !$b_detected;
+ }
+ return $b_use;
+}
+
+# Case where no xpdyinfo display server/version data exists, or to set Wayland
+# Xwayland version, or Xvesa data.
+sub display_server_data {
+ eval $start if $b_log;
+ my ($program);
+ # load the extra X paths, it's important that these are first, because
+ # later Xorg versions show error if run in console or ssh if the true path
+ # is not used.
+ @paths = (qw(/usr/lib /usr/lib/xorg /usr/lib/xorg-server /usr/libexec), @paths);
+ my (@data,$server,$version);
+ if (!$graphics{'x-server'} || !$graphics{'x-server'}->[0][1]){
+ # IMPORTANT: both commands send version data to stderr!
+ if ($program = main::check_program('Xorg')){
+ @data = main::grabber("$program -version 2>&1",'','strip');
+ $server = 'X.org';
+ }
+ elsif ($program = main::check_program('X')){
+ @data = main::grabber("$program -version 2>&1",'','strip');
+ $server = 'X.org';
}
else {
- if ($b_root){
- $type = 'display-root';
+ tinyx_data(\$server,\$version);
+ }
+ # print join('^ ', @paths), " :: $program\n";
+ # print Data::Dumper::Dumper \@data;
+ if ($data[0]){
+ if ($data[0] =~ /X.org X server (\S+)/i){
+ $version = $1;
}
- else {
- $type = 'display-try';
+ elsif ($data[0] =~ /XFree86 Version (\S+)/i){
+ $version = $1;
+ $server = 'XFree86';
+ }
+ elsif ($data[0] =~ /X Window System Version (\S+)/i){
+ $version = $1;
+ }
+ }
+ $graphics{'x-server'} = [[$server,$version]] if $server;
+ }
+ if ($program = main::check_program('Xwayland')){
+ undef $version;
+ @data = main::grabber("$program -version 2>&1",'','strip');
+ # Slackware Linux Project Xwayland Version 21.1.4 (12101004)
+ # The X.Org Foundation Xwayland Version 21.1.4 (12101004)
+ if (@data){
+ $data[0] =~ /Xwayland Version (\S+)/;
+ $version = $1;
+ }
+ $graphics{'x-server'} = [] if !$graphics{'x-server'};
+ push(@{$graphics{'x-server'}},['Xwayland',$version]);
+ }
+ # remove extra X paths from global @paths
+ @paths = grep { !/^\/usr\/lib|xorg|libexec/ } @paths;
+ eval $end if $b_log;
+}
+
+# args: 0: $server; 1: $version - both by ref
+sub tinyx_data {
+ eval $start if $b_log;
+ my ($server,$version) = @_;
+ # ordered by likelihood, Xmodesetting proposted by tinycore. Others were
+ # supported by DSL. Existed: Xigs Xipaq Xneomagic Xmga
+ my $tinies = 'vesa|fbdev|modesetting|chips|i810|igs|ipaq|mach64|mga|';
+ $tinies .= 'neomagic|savage|sis530|trident|trio|ts300';
+ # these run as a process, and sometimes also have screen resolution
+ if (my @result = (grep {/^(|\/\S+\/)X($tinies)\b/i} @ps_cmd)){
+ if ($result[0] =~ /^(|\/\S+\/)X($tinies)\b/i){
+ my $driver = $2;
+ my $vsize;
+ if ($result[0] =~ /\s-screen\s+(\d+(x\d+)+)\s/){
+ $vsize = $1;
+ }
+ my $tinyx = $graphics{'tinyx'} = 'X' . $driver;
+ $$server = "TinyX $tinyx";
+ $graphics{'display-driver'} = [$driver];
+ # not all tinyx had -version, DSL did not.
+ if (my $program = main::check_program($tinyx)){
+ $graphics{'xvesa'} = $program if $driver eq 'vesa';
+ my @data = main::grabber("$program -version 2>&1",'','strip');
+ if (@data && $data[0] =~ /$tinyx from tinyx (\S+)/i){
+ $$version = $1;
+ }
+ }
+ # should never happen but just in case
+ if (!$graphics{'screens'}){
+ # no-screens will store either res or tinyx res missing message
+ if ($vsize){
+ $graphics{'no-screens'} = $vsize;
+ }
+ else {
+ if (-d '/sys/devices/platform/'){
+ my @size = main::globber('/sys/devices/platform/*/graphics/*/virtual_size');
+ if (@size && (my $vsize = main::reader($size[0],'strip',0))){
+ $vsize =~ s/,/x/g;
+ $graphics{'no-screens'} = $vsize;
+ }
+ }
+ if (!$graphics{'no-screens'}){
+ $graphics{'no-screens'} = main::message('screen-tinyx',$driver);
+ }
+ }
}
}
- @row = ({
- main::key($num++,0,1,'Message') => main::row_defaults($type),
- });
}
eval $end if $b_log;
- return @row;
}
-sub tty_data(){
+
+sub display_protocol {
eval $start if $b_log;
- my ($tty);
- if ($size{'term-cols'}){
- $tty = "$size{'term-cols'}x$size{'term-lines'}";
+ $graphics{'protocol'} = '';
+ if ($ENV{'XDG_SESSION_TYPE'}){
+ $graphics{'protocol'} = $ENV{'XDG_SESSION_TYPE'};
}
- elsif ($b_irc && $client{'console-irc'}){
- my $tty_working = main::get_tty_console_irc('tty');
- if (my $program = main::check_program('stty')){
- my $tty_arg = ($bsd_type) ? '-f' : '-F';
- $tty = (main::grabber("$program $tty_arg /dev/pts/$tty_working size 2>/dev/null"))[0];
- if ($tty){
- my @temp = split /\s+/, $tty;
- $tty = "$temp[1]x$temp[0]";
+ if (!$graphics{'protocol'} && $ENV{'WAYLAND_DISPLAY'}){
+ $graphics{'protocol'} = $ENV{'WAYLAND_DISPLAY'};
+ }
+ # can show as wayland-0
+ if ($graphics{'protocol'} && $graphics{'protocol'} =~ /wayland/i){
+ $graphics{'protocol'} = 'wayland';
+ }
+ # yes, I've seen this in 2019 distros, sigh
+ elsif ($graphics{'protocol'} eq 'tty'){
+ $graphics{'protocol'} = '';
+ }
+ # If no other source, get user session id, then grab session type.
+ # loginctl also results in the session id
+ # undef $graphics{'protocol'};
+ if (!$graphics{'protocol'}){
+ if (my $program = main::check_program('loginctl')){
+ my $id = '';
+ # $id = $ENV{'XDG_SESSION_ID'}; # returns tty session in console
+ my @data = main::grabber("$program --no-pager --no-legend 2>/dev/null",'','strip');
+ foreach (@data){
+ # some systems show empty or ??? for TTY field, but whoami should do ok
+ next if /(ttyv?\d|pts\/)/; # freebsd: ttyv3
+ # in display, root doesn't show in the logins
+ next if $client{'whoami'} && $client{'whoami'} ne 'root' && !/\b$client{'whoami'}\b/;
+ $id = (split(/\s+/, $_))[0];
+ # multiuser? too bad, we'll go for the first one that isn't a tty/pts
+ last;
+ }
+ if ($id){
+ my $temp = (main::grabber("$program show-session $id -p Type --no-pager --no-legend 2>/dev/null"))[0];
+ $temp =~ s/Type=// if $temp;
+ # ssh will not show /dev/ttyx so would have passed the first test
+ $graphics{'protocol'} = $temp if $temp && $temp ne 'tty';
}
}
}
+ $graphics{'protocol'} = lc($graphics{'protocol'}) if $graphics{'protocol'};
eval $end if $b_log;
- return $tty;
}
-sub x_drivers {
- eval $start if $b_log;
- my ($driver,@driver_data,,%drivers);
- my ($alternate,$failed,$loaded,$sep,$unloaded) = ('','','','','');
- if (my $log = main::system_files('xorg-log')){
- # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/Xorg.0-voyager-serena.log";
- # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/loading-unload-failed-all41-mint.txt";
- # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/loading-unload-failed-phd21-mint.txt";
- # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/Xorg.0-gm10.log";
- # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/xorg-multi-driver-1.log";
- my @xorg = main::reader($log);
- # list is from sgfxi plus non-free drivers, plus ARM drivers
- my $list = join '|',qw(amdgpu apm ark armsoc atimisc ati
- chips cirrus cyrix fbdev fbturbo fglrx geode glide glint
+
+## DRIVER DATA ##
+# for wayland display/monitor drivers, or if no display drivers found for x
+sub gpu_drivers_sys {
+ eval $start if $b_log;
+ my ($id) = @_;
+ my ($driver);
+ my $drivers = [];
+ # we only want list of drivers for cards with a connected monitor, and inactive
+ # ports are already removed by the 'all' stage.
+ foreach my $port (keys %{$monitor_ids}){
+ if (!$monitor_ids->{$port}{'drivers'} ||
+ ($id ne 'all' && $id ne $port) ||
+ !$monitor_ids->{$port}{'status'} ||
+ $monitor_ids->{$port}{'status'} ne 'connected'){
+ next;
+ }
+ else {
+ foreach $driver (@{$monitor_ids->{$port}{'drivers'}}){
+ push(@$drivers,$driver);
+ }
+ }
+ }
+ if (@$drivers){
+ @$drivers = sort(@$drivers);
+ main::uniq($drivers);
+ }
+ eval $end if $b_log;
+ return $drivers;
+}
+
+sub display_drivers_x {
+ eval $start if $b_log;
+ my $driver_data = [];
+ # print 'x-log: ' . $system_files{'xorg-log'} . "\n";
+ if (my $log = $system_files{'xorg-log'}){
+ if ($fake{'xorg-log'}){
+ # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/Xorg.0-voyager-serena.log";
+ # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/loading-unload-failed-all41-mint.txt";
+ # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/loading-unload-failed-phd21-mint.txt";
+ # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/Xorg.0-gm10.log";
+ # $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/xorg-multi-driver-1.log";
+ }
+ my $x_log = main::reader($log,'','ref');
+ # list is from sgfxi plus non-free drivers, plus ARM drivers.
+ # Don't use ati. It's just a wrapper for: r128, mach64, radeon
+ my $list = join('|', qw(amdgpu apm ark armsoc atimisc
+ chips cirrus cyrix etnaviv fbdev fbturbo fglrx geode glide glint
i128 i740 i810-dec100 i810e i810 i815 i830 i845 i855 i865 i915 i945 i965
- iftv imstt intel ivtv mach64 mesa mga modesetting
- neomagic newport nouveau nsc nvidia nv openchrome r128 radeonhd radeon
- rendition s3virge s3 savage siliconmotion sisimedia sisusb sis
- sunbw2 suncg14 suncg3 suncg6 sunffb sunleo suntcx
- tdfx tga trident tseng unichrome v4l vboxvideo vesa vga via vmware vmwgfx
- voodoo);
+ iftv igs imstt intel ipaq ivtv mach64 mesa mga m68k modesetting neomagic
+ newport nouveau nsc nvidia nv openchrome r128 radeonhd radeon rendition
+ s3virge s3 savage siliconmotion sisimedia sisusb sis sis530 sunbw2 suncg14
+ suncg3 suncg6 sunffb sunleo suntcx tdfx tga trident trio ts300 tseng
+ unichrome v4l vboxvideo vesa vga via vmware vmwgfx voodoo));
+ # $list = qr/$list/i; # qr/../i only added perl 5.14, fails on older perls
+ my ($b_use_dri,$dri,$driver,%drivers);
+ my ($alternate,$failed,$loaded,$unloaded);
+ my $pattern = 'Failed|Unload|Loading';
+ # preferred source xdriinfo because it's current and accurate, but fallback here
+ if (!$graphics{'dri-drivers'}){
+ $b_use_dri = 1;
+ $pattern .= '|DRI driver:';
+ }
+ # $pattern = qr/$pattern/i; # qr/../i only added perl 5.14, fails on older perls
# it's much cheaper to grab the simple pattern match then do the expensive one
# in the main loop.
- #@xorg = grep {/Failed|Unload|Loading/} @xorg;
- foreach (@xorg){
- next if !/Failed|Unload|Loading/;
- # print "$_\n";
- # note that in file names, driver is always lower case
- if (/\sLoading.*($list)_drv.so$/i ) {
+ # @$x_log = grep {/Failed|Unload|Loading/} @$x_log;
+ foreach my $line (@$x_log){
+ next if $line !~ /$pattern/i;
+ # print "$line\n";
+ # note that in file names, driver is always lower case. Legacy _drv.o
+ if ($line =~ /\sLoading.*($list)_drv\.s?o$/i){
$driver=lc($1);
# we get all the actually loaded drivers first, we will use this to compare the
# failed/unloaded, which have not always actually been truly loaded
$drivers{$driver}='loaded';
}
# openbsd uses UnloadModule:
- elsif (/(Unloading\s|UnloadModule).*\"?($list)(_drv.so)?\"?$/i ) {
+ elsif ($line =~ /(Unloading\s|UnloadModule).*\"?($list)(_drv\.s?o)?\"?$/i){
$driver=lc($2);
# we get all the actually loaded drivers first, we will use this to compare the
# failed/unloaded, which have not always actually been truly loaded
@@ -11008,18 +17619,18 @@ sub x_drivers {
# which can occur. This is the driver that is actually driving the display.
# note that xorg will often load several modules, like modesetting,fbdev,nouveau
# NOTE:
- #(II) UnloadModule: "nouveau"
- #(II) Unloading nouveau
- #(II) Failed to load module "nouveau" (already loaded, 0)
- #(II) LoadModule: "modesetting"
- elsif (/Failed.*($list)\"?.*$/i ) {
+ # (II) UnloadModule: "nouveau"
+ # (II) Unloading nouveau
+ # (II) Failed to load module "nouveau" (already loaded, 0)
+ # (II) LoadModule: "modesetting"
+ elsif ($line =~ /Failed.*($list)\"?.*$/i){
# Set driver to lower case because sometimes it will show as
# RADEON or NVIDIA in the actual x start
$driver=lc($1);
# we need to make sure that the driver has already been truly loaded,
# not just discussed
if (exists $drivers{$driver} && $drivers{$driver} ne 'alternate'){
- if ( $_ !~ /\(already loaded/){
+ if ($line !~ /\(already loaded/){
$drivers{$driver}='failed';
}
# reset the previous line's 'unloaded' to 'loaded' as well
@@ -11027,485 +17638,2253 @@ sub x_drivers {
$drivers{$driver}='loaded';
}
}
- elsif ($_ =~ /module does not exist/){
+ elsif ($line =~ /module does not exist/){
$drivers{$driver}='alternate';
}
}
+ elsif ($b_use_dri && $line =~ /DRI driver:\s*(\S+)/i){
+ $dri = $1;
+ if (!$graphics{'dri-drivers'} ||
+ !(grep {$dri eq $_} @{$graphics{'dri-drivers'}})){
+ push(@{$graphics{'dri-drivers'}},$dri);
+ }
+ }
}
- my $sep = '';
+ # print 'drivers: ', Data::Dumper::Dumper \%drivers;
foreach (sort keys %drivers){
- if ($drivers{$_} eq 'loaded') {
- $sep = ($loaded) ? ',' : '';
- $loaded .= $sep . $_;
+ if ($drivers{$_} eq 'loaded'){
+ push(@$loaded,$_);
}
- elsif ($drivers{$_} eq 'unloaded') {
- $sep = ($unloaded) ? ',' : '';
- $unloaded .= $sep . $_;
+ elsif ($drivers{$_} eq 'unloaded'){
+ push(@$unloaded,$_);
}
- elsif ($drivers{$_} eq 'failed') {
- $sep = ($failed) ? ',' : '';
- $failed .= $sep . $_;
+ elsif ($drivers{$_} eq 'failed'){
+ push(@$failed,$_);
}
- elsif ($drivers{$_} eq 'alternate') {
- $sep = ($alternate) ? ',' : '';
- $alternate .= $sep . $_;
+ elsif ($drivers{$_} eq 'alternate'){
+ push(@$alternate,$_);
}
}
- @driver_data = ($loaded,$unloaded,$failed,$alternate);
+ if ($loaded || $unloaded || $failed || $alternate){
+ $driver_data = [$loaded,$unloaded,$failed,$alternate];
+ }
}
eval $end if $b_log;
- return @driver_data;
+ # print 'source: ', Data::Dumper::Dumper $driver_data;
+ return $driver_data;
+}
+
+sub set_mesa_drivers {
+ %mesa_drivers = (
+ 'anv' => 'intel',
+ 'crocus' => 'intel',
+ 'etnaviv' => 'vivante',
+ 'freedreno' => 'qualcomm',
+ 'i915' => 'intel',
+ 'i965' => 'intel',
+ 'iris' => 'intel',
+ 'lima' => 'mali',
+ 'nouveau' => 'nvidia',
+ 'panfrost' => 'mali/bifrost',
+ 'r200' => 'amd',
+ 'r300' => 'amd',
+ 'r600' => 'amd',
+ 'radeonsi' => 'amd',
+ 'radv' => 'amd',
+ 'svga3d' => 'vmware',
+ 'v3d' => 'broadcom',
+ 'v3dv' => 'broadcom',
+ 'vc4' => 'broadcom',
+ );
}
-# fallback if no glx x version data found
-sub x_version {
+
+## GPU DATA ##
+sub set_amd_data {
+ $gpu_amd = [
+ # no ids
+ {'arch' => 'Wonder',
+ 'ids' => '',
+ 'code' => 'Wonder',
+ 'process' => 'NEC 800nm',
+ 'years' => '1986-92',
+ },
+ {'arch' => 'Mach',
+ 'ids' => '4158|4354|4358|4554|4654|4754|4755|4758|4c42|4c49|4c50|4c54|5354|' .
+ '5654|5655|5656',
+ 'code' => 'Mach64',
+ 'process' => 'TSMC 500-600nm',
+ 'years' => '1992-97',
+ },
+ {'arch' => 'Rage-2',
+ 'ids' => '4756|4757|4759|475a|4c47',
+ 'code' => 'Rage-2',
+ 'process' => 'TSMC 500nm',
+ 'years' => '1996',
+ },
+ {'arch' => 'Rage-3',
+ 'ids' => '4742|4744|4749|474d|474f|4750|4752',
+ 'code' => 'Rage-3',
+ 'process' => 'TSMC 350nm',
+ 'years' => '1997-99',
+ },
+ {'arch' => 'Rage-4',
+ 'ids' => '474e|4753|4c46|4c4d|4c4e|4c52|4d46|5044|5046|5050|5052|5245|5246|' .
+ '524b|524c|534d|5446|5452',
+ 'code' => 'Rage-4',
+ 'process' => 'TSMC 250-350nm',
+ 'years' => '1998-99',
+ },
+ # vendor 1014 IBM, subvendor: 1092
+ # 0172|0173|0174|0184
+ # {'arch' => 'IBM',
+ # 'code' => 'Fire GL',
+ # 'process' => 'IBM 156-250nm',
+ # 'years' => '1999-2001',
+ # },
+ # rage 5 was game cube flipper chip
+# rage 5 was game cube flipper chip 2000
+ {'arch' => 'Rage-6',
+ 'ids' => '4137|4337|4437|4c59|5144|5159|515e',
+ 'code' => 'R100',
+ 'process' => 'TSMC 180nm',
+ 'years' => '2000-07',
+ },
+ # |Radeon (7[3-9]{2}|8d{3}|9[5-9]d{2}
+ {'arch' => 'Rage-7',
+ 'ids' => '4136|4150|4152|4170|4172|4242|4336|4966|496e|4c57|4c58|4c66|4c6e|' .
+ '4e51|4f72|4f73|5148|514c|514d|5157|5834|5835|5940|5941|5944|5960|5961|5962|' .
+ '5964|5965|5b63|5b72|5b73|5c61|5c63|5d44|5d45|7100|7101|7102|7109|710a|710b|' .
+ '7120|7129|7140|7142|7143|7145|7146|7147|7149|714a|715f|7162|7163|7166|7167|' .
+ '7181|7183|7186|7187|718b|718c|718d|7193|7196|719f|71a0|71a1|71a3|71a7|71c0|' .
+ '71c1|71c2|71c3|71c5|71c6|71c7|71ce|71d5|71d6|71de|71e0|71e1|71e2|71e6|71e7|' .
+ '7240|7244|7248|7249|724b|7269|726b|7280|7288|7291|7293|72a0|72a8|72b1|72b3|' .
+ '7834|7835|791e',
+ 'code' => 'R200',
+ 'process' => 'TSMC 150nm',
+ 'years' => '2001-06',
+ },
+ {'arch' => 'Rage-8',
+ 'ids' => '4144|4146|4147|4148|4151|4153|4154|4155|4157|4164|4165|4166|4168|' .
+ '4171|4173|4e44|4e45|4e46|4e47|4e48|4e49|4e4b|4e50|4e52|4e54|4e64|4e65|4e66|' .
+ '4e67|4e68|4e69|4e6a|4e71|5a41|5a42|5a61|5a62',
+ 'code' => 'R300',
+ 'process' => 'TSMC 130nm',
+ 'years' => '2002-07',
+ },
+ {'arch' => 'Rage-9',
+ 'ids' => '3150|3151|3152|3154|3155|3171|3e50|3e54|3e70|4e4a|4e56|5460|5461|' .
+ '5462|5464|5657|5854|5874|5954|5955|5974|5975|5b60|5b62|5b64|5b65|5b66|5b70|' .
+ '5b74|5b75',
+ 'code' => 'Radeon IGP',
+ 'process' => 'TSMC 110nm',
+ 'years' => '2003-08',
+ },
+ {'arch' => 'R400',
+ 'ids' => '4a49|4a4a|4a4b|4a4d|4a4e|4a4f|4a50|4a54|4a69|4a6a|4a6b|4a70|4a74|' .
+ '4b49|4b4b|4b4c|4b69|4b6b|4b6c|5549|554a|554b|554d|554e|554f|5550|5551|5569|' .
+ '556b|556d|556f|5571|564b|564f|5652|5653|5d48|5d49|5d4a|5d4d|5d4e|5d4f|5d50|' .
+ '5d52|5d57|5d6d|5d6f|5d72|5d77|5e48|5e49|5e4a|5e4b|5e4c|5e4d|5e4f|5e6b|5e6d|' .
+ '5f57|791f|793f|7941|7942|796e',
+ 'code' => 'R400',
+ 'process' => 'TSMC 55-130nm',
+ 'years' => '2004-08',
+ },
+ {'arch' => 'R500',
+ 'ids' => '7104|710e|710f|7124|712e|712f|7152|7153|7172|7173|7188|718a|719b|' .
+ '71bb|71c4|71d2|71d4|71f2|7210|7211|724e|726e|940f|94c8|94c9|9511|9581|9583|' .
+ '958b|958d',
+ 'code' => 'R500',
+ 'process' => 'TSMC 90nm',
+ 'years' => '2005-07',
+ },
+ # process: tsmc 55nm, 65nm, xbox 360s at 40nm
+ {'arch' => 'TeraScale',
+ 'ids' => '4346|4630|4631|9400|9401|9403|9405|940a|940b|9440|9441|9442|9443|' .
+ '9444|9446|944a|944b|944c|944e|9450|9452|9456|945a|9460|9462|946a|9480|9488|' .
+ '9489|9490|9491|9495|9498|949c|949e|949f|94a0|94a1|94a3|94b3|94b4|94c1|94c3|' .
+ '94c4|94c5|94c7|94cb|94cc|9500|9501|9504|9505|9506|9507|9508|9509|950f|9513|' .
+ '9515|9519|9540|954f|9552|9553|9555|9557|955f|9580|9586|9587|9588|9589|958a|' .
+ '958c|9591|9593|9595|9596|9597|9598|9599|95c0|95c2|95c4|95c5|95c6|95c9|95cc|' .
+ '95cd|95cf|9610|9611|9612|9613|9614|9615|9616|9710|9712|9713|9714|9715',
+ 'code' => 'R6xx/RV6xx/RV7xx',
+ 'process' => 'TSMC 55-65nm',
+ 'years' => '2005-13',
+ },
+ {'arch' => 'TeraScale-2',
+ 'ids' => '6720|6738|6739|673e|6740|6741|6742|6743|6749|674a|6750|6751|6758|' .
+ '6759|675b|675d|675f|6760|6761|6763|6764|6765|6766|6767|6768|6770|6771|6772|' .
+ '6778|6779|677b|6840|6841|6842|6843|6880|6888|6889|688a|688c|688d|6898|6899|' .
+ '689b|689c|689d|689e|68a0|68a1|68a8|68a9|68b8|68b9|68ba|68be|68bf|68c0|68c1|' .
+ '68c7|68c8|68c9|68d8|68d9|68da|68de|68e0|68e1|68e4|68e5|68e8|68e9|68f1|68f2|' .
+ '68f8|68f9|68fa|68fe|9640|9641|9642|9643|9644|9645|9647|9648|9649|964a|964b|' .
+ '964c|964e|964f|9802|9803|9804|9805|9806|9807|9808|9809|980a|9925|9926',
+ 'code' => 'Evergreen',
+ 'process' => 'TSMC 32-40nm',
+ 'years' => '2009-15',
+ },
+ {'arch' => 'TeraScale-3',
+ 'ids' => '6704|6707|6718|6719|671c|671d|671f|9900|9901|9903|9904|9905|9906|' .
+ '9907|9908|9909|990a|990b|990c|990d|990e|990f|9910|9913|9917|9918|9919|9990|' .
+ '9991|9992|9993|9994|9995|9996|9997|9998|9999|999a|999b|999c|999d|99a0|99a2|' .
+ '99a4',
+ 'code' => 'Northern Islands',
+ 'process' => 'TSMC 32nm',
+ 'years' => '2010-13',
+ },
+ {'arch' => 'GCN-1',
+ 'ids' => '154c|6600|6601|6604|6605|6606|6607|6608|6609|6610|6611|6613|6617|' .
+ '6631|6660|6663|6664|6665|6666|6667|666f|6780|6784|6788|678a|6798|6799|679a|' .
+ '679b|679e|679f|6800|6801|6802|6806|6808|6809|6810|6811|6816|6817|6818|6819|' .
+ '6820|6821|6822|6823|6825|6826|6827|6828|6829|682a|682b|682c|682d|682f|6830|' .
+ '6831|6835|6837|683d|683f|684c',
+ 'code' => 'Southern Islands',
+ 'process' => 'TSMC 28nm',
+ 'years' => '2011-20',
+ },
+ # process: both TSMC and GlobalFoundries
+ {'arch' => 'GCN-2',
+ 'ids' => '1304|1305|1306|1307|1309|130a|130b|130c|130d|130e|130f|1310|1311|' .
+ '1312|1313|1315|1316|1317|1318|131b|131c|131d|6640|6641|6646|6647|6649|664d|' .
+ '6650|6651|6658|665c|665d|665f|67a0|67a1|67a2|67a8|67a9|67aa|67b0|67b1|67b8|' .
+ '67b9|67be|9830|9831|9832|9833|9834|9835|9836|9837|9838|9839|983d|9850|9851|' .
+ '9852|9853|9854|9855|9856|9857|9858|9859|985a|985b|985c|985d|985e|985f|991e|' .
+ '9920|9922',
+ 'code' => 'Sea Islands',
+ 'process' => 'GF/TSMC 16-28nm',
+ 'years' => '2013-17',
+ },
+ {'arch' => 'GCN-3',
+ 'ids' => '6900|6901|6902|6907|6920|6921|6929|692b|692f|6930|6938|6939|693b|' .
+ '7300|730f|9874|98c0|98e4',
+ 'code' => 'Volcanic Islands',
+ 'process' => 'TSMC 28nm',
+ 'years' => '2014-19',
+ },
+ {'arch' => 'GCN-4',
+ 'ids' => '154e|1551|1552|1561|67c0|67c1|67c2|67c4|67c7|67ca|67cc|67cf|67d0|' .
+ '67d4|67d7|67df|67e0|67e1|67e3|67e8|67e9|67eb|67ef|67ff|694c|694e|694f|6980|' .
+ '6981|6984|6985|6986|6987|698f|6995|6997|699f|6fdf|9924|9925',
+ 'code' => 'Arctic Islands',
+ 'process' => 'GF 14nm',
+ 'years' => '2016-20',
+ },
+ {'arch' => 'GCN-5.1',
+ 'ids' => '15d8|15dd|15df|15e7|1636|1638|164c|66a0|66a1|66a2|66a3|66a7|66af|' .
+ '69af',
+ 'code' => 'Vega-2',
+ 'process' => 'TSMC n7 (7nm)',
+ 'years' => '2018-22+',
+ },
+ {'arch' => 'GCN-5',
+ 'ids' => '15d8|15d9|15dd|15e7|15ff|1636|1638|164c|66a0|66a1|66a2|66a3|66a4|' .
+ '66a7|66af|6860|6861|6862|6863|6864|6867|6868|6869|686a|686b|686c|686d|686e|' .
+ '687f|69a0|69a1|69a2|69a3|69af',
+ 'code' => 'Vega',
+ 'process' => 'GF 14nm',
+ 'years' => '2017-20',
+ },
+ {'arch' => 'RDNA-1',
+ 'ids' => '13e9|13f9|13fe|1478|1479|1607|7310|7312|7318|7319|731a|731b|731e|' .
+ '731f|7340|7341|7343|7347|734f|7360|7362',
+ 'code' => 'Navi-1x',
+ 'process' => 'TSMC n7 (7nm)',
+ 'years' => '2019-20',
+ },
+ {'arch' => 'RDNA-2',
+ 'ids' => '1435|1506|163f|164d|164e|1681|73a0|73a1|73a2|73a3|73a5|73ab|73ae|' .
+ '73af|73bf|73c0|73c1|73c3|73ce|73df|73e0|73e1|73e3|73ef|73ff|7420|7421|7422|' .
+ '7423|7424|743f',
+ 'code' => 'Navi-2x',
+ 'process' => 'TSMC n7 (7nm)',
+ 'years' => '2020-22',
+ },
+ {'arch' => 'RDNA-3',
+ 'ids' => '73a8|73c4|73c5|73c8|7448|744c|745e|7460|7461|7470|7478|747e',
+ 'code' => 'Navi-3x',
+ 'process' => 'TSMC n5 (5nm)',
+ 'years' => '2022+',
+ },
+ {'arch' => 'RDNA-3',
+ 'ids' => '73f0|7480|7481|7483|7487|7489|748b|749f',
+ 'code' => 'Navi-33',-
+ 'process' => 'TSMC n6 (6nm)',
+ 'years' => '2023+',
+ },
+ {'arch' => 'RDNA-3',
+ 'ids' => '15bf|15c8|164f|1900|1901',
+ 'code' => 'Phoenix',
+ 'process' => 'TSMC n4 (4nm)',
+ 'years' => '2023+',
+ },
+ {'arch' => 'CDNA-1',
+ 'ids' => '7388|738c|738e',
+ 'code' => 'Instinct-MI1xx',
+ 'process' => 'TSMC n7 (7nm)',
+ 'years' => '2020',
+ },
+ {'arch' => 'CDNA-2',
+ 'ids' => '7408|740c|740f',
+ 'code' => 'Instinct-MI2xx',
+ 'process' => 'TSMC n6 (6nm)',
+ 'years' => '2021-22+',
+ },
+ {'arch' => 'CDNA-3',
+ 'ids' => '74a0|74a1',
+ 'code' => 'Instinct-MI3xx',
+ 'process' => 'TSMC n5 (5nm)',
+ 'years' => '2023+',
+ },
+ ];
+}
+
+sub set_intel_data {
+ $gpu_intel = [
+ {'arch' => 'Gen-1',
+ 'ids' => '1132|7120|7121|7122|7123|7124|7125|7126|7128|712a',
+ 'code' => '',
+ 'process' => 'Intel 150nm',
+ 'years' => '1998-2002',
+ },
+ # ill-fated standalone gfx card
+ {'arch' => 'i740',
+ 'ids' => '7800',
+ 'code' => '',
+ 'process' => 'Intel 150nm',
+ 'years' => '1998',
+ },
+ {'arch' => 'Gen-2',
+ 'ids' => '2562|2572|3577|3582|358e',
+ 'code' => '',
+ 'process' => 'Intel 130nm',
+ 'years' => '2002-03',
+ },
+ {'arch' => 'Gen-3',
+ 'ids' => '2582|2592|2780|2782|2792',
+ 'code' => 'Intel 130nm',
+ 'process' => '',
+ 'years' => '2004-05',
+ },
+ {'arch' => 'Gen-3.5',
+ 'ids' => '2772|2776|27a2|27a6|27ae|2972|2973',
+ 'code' => '',
+ 'process' => 'Intel 90nm',
+ 'years' => '2005-06',
+ },
+ {'arch' => 'Gen-4',
+ 'ids' => '2982|2983|2992|2993|29a2|29a3|29b2|29b3|29c2|29c3|29d2|29d3|2a02|' .
+ '2a03|2a12|2a13',
+ 'code' => '',
+ 'process' => 'Intel 65n',
+ 'years' => '2006-07',
+ },
+ {'arch' => 'PowerVR SGX535',
+ 'ids' => '4100|8108|8109|a001|a002|a011|a012',
+ 'code' => '',
+ 'process' => 'Intel 45-130nm',
+ 'year' => '2008-10',
+ },
+ {'arch' => 'Gen-5',
+ 'ids' => '2a41|2a42|2a43|2e02|2e03|2e12|2e13|2e22|2e23|2e32|2e33|2e42|2e43|' .
+ '2e92|2e93',
+ 'code' => '',
+ 'process' => 'Intel 45nm',
+ 'years' => '2008',
+ },
+ {'arch' => 'PowerVR SGX545',
+ 'ids' => '0be0|0be1|0be2|0be3|0be4|0be5|0be6|0be7|0be8|0be9|0bea|0beb|0bec|' .
+ '0bed|0bee|0bef',
+ 'code' => '',
+ 'process' => 'Intel 65nm',
+ 'years' => '2008-10',
+ },
+ {'arch' => 'Gen-5.75',
+ 'ids' => '0042|0046|004a|0402|0412|0416',
+ 'code' => '',
+ 'process' => 'Intel 45nm',
+ 'years' => '2010',
+ },
+ {'arch' => 'Knights',
+ 'ids' => '',
+ 'code' => '',
+ 'process' => 'Intel 22nm',
+ 'years' => '2012-13',
+ },
+ {'arch' => 'Gen-6',
+ 'ids' => '0102|0106|010a|010b|010e|0112|0116|0122|0126|08cf',
+ 'code' => 'Sandybridge',
+ 'process' => 'Intel 32nm',
+ 'years' => '2011',
+ },
+ {'arch' => 'Gen-7.5',
+ 'ids' => '0402|0406|040a|040b|040e|0412|0416|041a|041b|041e|0422|0426|042a|' .
+ '042b|042e|0a02|0a06|0a0a|0a0b|0a0e|0a12|0a16|0a1a|0a1b|0a1e|0a22|0a26|0a2a|' .
+ '0a2b|0a2e|0c02|0c06|0c0a|0c0b|0c0e|0c12|0c16|0c1a|0c1b|0c1e|0c22|0c26|0c2a|' .
+ '0c2b|0c2e|0d02|0d06|0d0a|0d0b|0d0e|0d12|0d16|0d1a|0d1b|0d1e|0d22|0d26|0d2a|' .
+ '0d2b|0d2e',
+ 'code' => '',
+ 'process' => 'Intel 22nm',
+ 'years' => '2013',
+ },
+ {'arch' => 'Gen-7',
+ 'ids' => '0152|0155|0156|0157|015a|015e|0162|0166|016a|0172|0176|0f31|0f32|' .
+ '0f33',
+ 'code' => '',
+ 'process' => 'Intel 22nm',
+ 'years' => '2012-13',
+ },
+ {'arch' => 'Gen-8',
+ 'ids' => '1602|1606|160a|160b|160d|160e|1612|1616|161a|161b|161d|161e|1622|' .
+ '1626|162a|162b|162d|162e|1632|1636|163a|163b|163d|163e|22b0|22b1|22b2|22b3',
+ 'code' => '',
+ 'process' => 'Intel 14nm',
+ 'years' => '2014-15',
+ },
+ {'arch' => 'Gen-9.5',
+ 'ids' => '3184|3185|3e90|3e91|3e92|3e93|3e94|3e96|3e98|3e99|3e9a|3e9b|3e9c|' .
+ '3ea0|3ea1|3ea2|3ea3|3ea4|3ea5|3ea6|3ea7|3ea8|3ea9|5902|5906|5908|590a|590b|' .
+ '590e|5912|5913|5915|5916|5917|591a|591b|591c|591d|591e|5921|5923|5926|5927|' .
+ '593b|87c0|87ca|9b21|9b41|9ba0|9ba2|9ba4|9ba5|9ba8|9baa|9bab|9bac|9bc0|9bc2|' .
+ '9bc4|9bc5|9bc6|9bc8|9bca|9bcb|9bcc|9be6|9bf6',
+ 'code' => '',
+ 'process' => 'Intel 14nm',
+ 'years' => '2016-20',
+ },
+ {'arch' => 'Gen-9',
+ 'ids' => '0a84|1902|1906|190a|190b|190e|1912|1913|1915|1916|1917|191a|191b|' .
+ '191d|191e|1921|1923|1926|1927|192a|192b|192d|1932|193a|193b|193d|1a84|1a85|' .
+ '5a84|5a85',
+ 'code' => '',
+ 'process' => 'Intel 14n',
+ 'years' => '2015-16',
+ },
+ # gen10 was cancelled.,
+ {'arch' => 'Gen-11',
+ 'ids' => '0d16|0d26|0d36|4541|4551|4555|4557|4571|4e51|4e55|4e57|4e61|4e71|' .
+ '8a50|8a51|8a52|8a53|8a54|8a56|8a57|8a58|8a59|8a5a|8a5b|8a5c|8a5d|8a70|8a71|' .
+ '9840|9841',
+ 'code' => '',
+ 'process' => 'Intel 10nm',
+ 'years' => '2019-21',
+ },
+ {'arch' => 'Gen-12.1',
+ 'ids' => '4905|4907|4908|4c80|4c8a|4c8b|4c8c|4c90|4c9a|9a40|9a49|9a59|9a60|' .
+ '9a68|9a70|9a78|9ac0|9ac9|9ad9|9af8',
+ 'code' => '',
+ 'process' => 'Intel 10nm',
+ 'years' => '2020-21',
+ },
+ {'arch' => 'Gen-12.2',
+ 'ids' => '4626|4628|462a|4636|4638|463a|4682|4688|468a|468b|4690|4692|4693|' .
+ '46a3|46a6|46a8|46aa|46b0|46b1|46b3|46b6|46b8|46ba|46c1|46c3|46d0|46d1|46d2',
+ 'code' => '',
+ 'process' => 'Intel 10nm',
+ 'years' => '2021-22+',
+ },
+ {'arch' => 'Gen-12.5',
+ 'ids' => '0bd0|0bd5|0bd6|0bd7|0bd9|0bda|0bdb',
+ 'code' => '',
+ 'process' => 'Intel 10nm',
+ 'years' => '2021-23+',
+ },
+ # Jupiter Sound cancelled?
+ {'arch' => 'Gen-12.7',
+ 'ids' => '4f80|4f81|4f82|4f83|4f84|4f85|4f86|4f87|4f88|5690|5691|5692|5693|' .
+ '5694|5695|5696|5697|5698|56a0|56a1|56a3|56a4|56a5|56a6|56a7|56a8|56a9|56b0|' .
+ '56b1|56b2|56b3|56ba|56bb|56bc|56bd',
+ 'code' => 'Alchemist',
+ 'process' => 'TSMC n6 (7nm)',
+ 'years' => '2022+',
+ },
+ {'arch' => 'Gen-12.7',
+ 'ids' => '56c0|56c1',
+ 'code' => '',
+ 'process' => 'TSMC n6 (7nm)',
+ 'years' => '2022+',
+ },
+ {'arch' => 'Gen-13',
+ 'ids' => 'a720|a721|a74d|a780|a781|a782|a783|a788|a789|a78a|a78b|a7a0|a7a1|' .
+ 'a7a8|a7a9|a7aa|a7ab|a7ac|a7ad',
+ 'code' => '',
+ 'process' => 'Intel 7 (10nm)',
+ 'years' => '2022+',
+ },
+ {'arch' => 'Gen-14',
+ 'ids' => '7d40|7d45|7d55|7d60|7dd5',
+ 'code' => '',
+ 'process' => 'Intel 4 (7nm+)',
+ 'years' => '2023+',
+ },
+ {'arch' => 'Gen-15',
+ 'ids' => '7d51|7d67|7dd1',
+ 'code' => '',
+ 'process' => 'TSMC 3nm',
+ 'years' => '2024+',
+ },
+ ];
+}
+
+sub set_nv_data {
+ # this is vendor id: 12d2, nv1/riva/tnt type cards
+ # 0008|0009|0010|0018|0019
+ # and these are vendor id: 10de for 73.14
+ # 0020|0028|0029|002c|002d|00a0|0100|0101|0103|0150|0151|0152|0153
+ # generic fallback if we don't have the actual EOL termination date
+ my $date = $self_date;
+ $date =~ s/-\d+$//;
+ my $status_current = main::message('nv-current',$date);
+ # load legacy data, note, if there are 2 or more arch in 1 legacy, it has 1
+ # item per arch. kernel/last/xorg support either from nvidia or sgfxi
+ ## Legacy 71.86.xx
+ $gpu_nv = [
+ {'arch' => 'Fahrenheit',
+ 'ids' => '0008|0009|0010|0018|0019|0020|0028|0029|002c|002d|00a0',
+ 'code' => 'NVx',
+ 'kernel' => '2.6.38',
+ 'legacy' => 1,
+ 'process' => 'TSMC 220-350nm',
+ 'release' => '71.86.15',
+ 'series' => '71.86.xx',
+ 'status' => main::message('nv-legacy-eol','2011-08-xx'),
+ 'xorg' => '1.7',
+ 'years' => '1998-2000',
+ },
+ {'arch' => 'Celsius',
+ 'ids' => '0100|0101|0103|0150|0151|0152|0153',
+ 'code' => 'NV1x',
+ 'kernel' => '2.6.38',
+ 'legacy' => 1,
+ 'process' => 'TSMC 150-220nm',
+ 'release' => '71.86.15',
+ 'series' => '71.86.xx',
+ 'status' => main::message('nv-legacy-eol','2011-08-xx'),
+ 'xorg' => '1.7',
+ 'years' => '1999-2005',
+ },
+ ## Legacy 96.43.xx
+ {'arch' => 'Celsius',
+ 'ids' => '0110|0111|0112|0113|01a0',
+ 'code' => 'NV1x',
+ 'kernel' => '3.6',
+ 'legacy' => 1,
+ 'process' => 'TSMC 150-220nm',
+ 'release' => '96.43.23',
+ 'series' => '96.43.xx',
+ 'status' => main::message('nv-legacy-eol','2012-09-xx'),
+ 'xorg' => '1.12',
+ 'years' => '1999-2005',
+ },
+ {'arch' => 'Kelvin',
+ 'ids' => '0170|0171|0172|0173|0174|0175|0176|0177|0178|0179|017a|017c|017d|' .
+ '0181|0182|0183|0185|0188|018a|018b|018c|01f0|0200|0201|0202|0203|0250|0251|' .
+ '0253|0258|0259|025b|0280|0281|0282|0286|0288|0289|028c',
+ 'code' => 'NV2x',
+ 'kernel' => '3.6',
+ 'legacy' => 1,
+ 'process' => 'TSMC 150nm',
+ 'release' => '96.43.23',
+ 'series' => '96.43.xx',
+ 'status' => main::message('nv-legacy-eol','2012-09-xx'),
+ 'xorg' => '1.12',
+ 'years' => '2001-2003',
+ },
+ ## Legacy 173.14.xx
+ # process: IBM 130, TSMC 130-150
+ {'arch' => 'Rankine',
+ 'ids' => '00fa|00fb|00fc|00fd|00fe|0301|0302|0308|0309|0311|0312|0314|031a|' .
+ '031b|031c|0320|0321|0322|0323|0324|0325|0326|0327|0328|032a|032b|032c|032d|' .
+ '0330|0331|0332|0333|0334|0338|033f|0341|0342|0343|0344|0347|0348|034c|034e',
+ 'code' => 'NV3x',
+ 'kernel' => '3.12',
+ 'legacy' => 1,
+ 'process' => '130-150nm',
+ 'release' => '173.14.39',
+ 'series' => '173.14.xx',
+ 'status' => main::message('nv-legacy-eol','2013-12-xx'),
+ 'xorg' => '1.15',
+ 'years' => '2003-2005',
+ },
+ ## Legacy 304.xx
+ # code: hard to get these, roughly MCP[567]x/NV4x/G7x
+ # process: IBM 130, TSMC 90-110
+ {'arch' => 'Curie',
+ 'ids' => '0040|0041|0042|0043|0044|0045|0046|0047|0048|004e|0090|0091|0092|' .
+ '0093|0095|0098|0099|009d|00c0|00c1|00c2|00c3|00c8|00c9|00cc|00cd|00ce|00f1|' .
+ '00f2|00f3|00f4|00f5|00f6|00f8|00f9|0140|0141|0142|0143|0144|0145|0146|0147|' .
+ '0148|0149|014a|014c|014d|014e|014f|0160|0161|0162|0163|0164|0165|0166|0167|' .
+ '0168|0169|016a|01d0|01d1|01d2|01d3|01d6|01d7|01d8|01da|01db|01dc|01dd|01de|' .
+ '01df|0211|0212|0215|0218|0221|0222|0240|0241|0242|0244|0245|0247|0290|0291|' .
+ '0292|0293|0294|0295|0297|0298|0299|029a|029b|029c|029d|029e|029f|02e0|02e1|' .
+ '02e2|02e3|02e4|038b|0390|0391|0392|0393|0394|0395|0397|0398|0399|039c|039e|' .
+ '03d0|03d1|03d2|03d5|03d6|0531|0533|053a|053b|053e|07e0|07e1|07e2|07e3|07e5',
+ 'code' => '',
+ 'kernel' => '4.13',
+ 'legacy' => 1,
+ 'process' => '90-130nm',
+ 'release' => '304.137',
+ 'series' => '304.xx',
+ 'status' => main::message('nv-legacy-eol','2017-09-xx'),
+ 'xorg' => '1.19',
+ 'years' => '2003-2013',
+ },
+ ## Legacy 340.xx
+ # these are both Tesla and Tesla 2.0
+ # code: not clear, 8800/GT2xx/maybe G7x
+ # years: 2006-2010 Tesla 2007-2013 Tesla 2.0
+ {'arch' => 'Tesla',
+ 'ids' => '0191|0193|0194|0197|019d|019e|0400|0401|0402|0403|0404|0405|0406|' .
+ '0407|0408|0409|040a|040b|040c|040d|040e|040f|0410|0420|0421|0422|0423|0424|' .
+ '0425|0426|0427|0428|0429|042a|042b|042c|042d|042e|042f|05e0|05e1|05e2|05e3|' .
+ '05e6|05e7|05ea|05eb|05ed|05f8|05f9|05fd|05fe|05ff|0600|0601|0602|0603|0604|' .
+ '0605|0606|0607|0608|0609|060a|060b|060c|060d|060f|0610|0611|0612|0613|0614|' .
+ '0615|0617|0618|0619|061a|061b|061c|061d|061e|061f|0621|0622|0623|0625|0626|' .
+ '0627|0628|062a|062b|062c|062d|062e|0630|0631|0632|0635|0637|0638|063a|0640|' .
+ '0641|0643|0644|0645|0646|0647|0648|0649|064a|064b|064c|0651|0652|0653|0654|' .
+ '0655|0656|0658|0659|065a|065b|065c|06e0|06e1|06e2|06e3|06e4|06e5|06e6|06e7|' .
+ '06e8|06e9|06ea|06eb|06ec|06ef|06f1|06f8|06f9|06fa|06fb|06fd|06ff|0840|0844|' .
+ '0845|0846|0847|0848|0849|084a|084b|084c|084d|084f|0860|0861|0862|0863|0864|' .
+ '0865|0866|0867|0868|0869|086a|086c|086d|086e|086f|0870|0871|0872|0873|0874|' .
+ '0876|087a|087d|087e|087f|08a0|08a2|08a3|08a4|08a5|0a20|0a22|0a23|0a26|0a27|' .
+ '0a28|0a29|0a2a|0a2b|0a2c|0a2d|0a32|0a34|0a35|0a38|0a3c|0a60|0a62|0a63|0a64|' .
+ '0a65|0a66|0a67|0a68|0a69|0a6a|0a6c|0a6e|0a6f|0a70|0a71|0a72|0a73|0a74|0a75|' .
+ '0a76|0a78|0a7a|0a7c|0ca0|0ca2|0ca3|0ca4|0ca5|0ca7|0ca8|0ca9|0cac|0caf|0cb0|' .
+ '0cb1|0cbc|10c0|10c3|10c5|10d8',
+ 'code' => '',
+ 'kernel' => '5.4',
+ 'legacy' => 1,
+ 'process' => '40-80nm',
+ 'release' => '340.108',
+ 'series' => '340.xx',
+ 'status' => main::message('nv-legacy-eol','2019-12-xx'),
+ 'xorg' => '1.20',
+ 'years' => '2006-2013',
+ },
+ ## Legacy 367.xx
+ {'arch' => 'Kepler',
+ 'ids' => '0fef|0ff2|11bf',
+ 'code' => 'GKxxx',
+ 'kernel' => '5.4',
+ 'legacy' => 1,
+ 'process' => 'TSMC 28nm',
+ 'release' => '',
+ 'series' => '367.xx',
+ 'status' => main::message('nv-legacy-eol','2017'),
+ 'xorg' => '1.20',
+ 'years' => '2012-2018',
+ },
+ ## Legacy 390.xx
+ # this is Fermi, Fermi 2.0
+ {'arch' => 'Fermi',
+ 'ids' => '06c0|06c4|06ca|06cd|06d1|06d2|06d8|06d9|06da|06dc|06dd|06de|06df|' .
+ '0dc0|0dc4|0dc5|0dc6|0dcd|0dce|0dd1|0dd2|0dd3|0dd6|0dd8|0dda|0de0|0de1|0de2|' .
+ '0de3|0de4|0de5|0de7|0de8|0de9|0dea|0deb|0dec|0ded|0dee|0def|0df0|0df1|0df2|' .
+ '0df3|0df4|0df5|0df6|0df7|0df8|0df9|0dfa|0dfc|0e22|0e23|0e24|0e30|0e31|0e3a|' .
+ '0e3b|0f00|0f01|0f02|0f03|1040|1042|1048|1049|104a|104b|104c|1050|1051|1052|' .
+ '1054|1055|1056|1057|1058|1059|105a|105b|107c|107d|1080|1081|1082|1084|1086|' .
+ '1087|1088|1089|108b|1091|1094|1096|109a|109b|1140|1200|1201|1203|1205|1206|' .
+ '1207|1208|1210|1211|1212|1213|1241|1243|1244|1245|1246|1247|1248|1249|124b|' .
+ '124d|1251',
+ 'code' => 'GF1xx',
+ 'kernel' => '6.0',
+ 'legacy' => 1,
+ 'process' => '40/28nm',
+ 'release' => '390.157',
+ 'series' => '390.xx+',
+ 'status' => main::message('nv-legacy-eol','2022-11-22'),
+ 'xorg' => '1.21',
+ 'years' => '2010-2016',
+ },
+ ## Legacy 470.xx
+ {'arch' => 'Fermi 2',
+ 'ids' => '0fec|1281|1289|128b|1295|1298',
+ 'code' => 'GF119/GK208',
+ 'kernel' => '',
+ 'legacy' => 1,
+ 'process' => 'TSMC 28nm',
+ 'release' => '',
+ 'series' => '470.xx+',
+ 'status' => main::message('nv-legacy-active','2024-09-xx'),
+ 'xorg' => '',
+ 'years' => '2010-2016',
+ },
+ # GT 720M and 805A/810A are the same cpu id.
+ # years: 2012-2018 Kepler 2013-2015 Kepler 2.0
+ {'arch' => 'Kepler',
+ 'ids' => '0fc6|0fc8|0fc9|0fcd|0fce|0fd1|0fd2|0fd3|0fd4|0fd5|0fd8|0fd9|0fdf|' .
+ '0fe0|0fe1|0fe2|0fe3|0fe4|0fe9|0fea|0fed|0fee|0ff6|0ff8|0ff9|0ffa|0ffb|0ffc|' .
+ '0ffd|0ffe|0fff|1001|1004|1005|1007|1008|100a|100c|1021|1022|1023|1024|1026|' .
+ '1027|1028|1029|102a|102d|103a|103c|1180|1183|1184|1185|1187|1188|1189|118a|' .
+ '118e|118f|1193|1194|1195|1198|1199|119a|119d|119e|119f|11a0|11a1|11a2|11a3|' .
+ '11a7|11b4|11b6|11b7|11b8|11ba|11bc|11bd|11be|11c0|11c2|11c3|11c4|11c5|11c6|' .
+ '11c8|11cb|11e0|11e1|11e2|11e3|11fa|11fc|1280|1282|1284|1286|1287|1288|1290|' .
+ '1291|1292|1293|1295|1296|1299|129a|12b9|12ba',
+ 'code' => 'GKxxx',
+ 'kernel' => '',
+ 'legacy' => 1,
+ 'process' => 'TSMC 28nm',
+ 'release' => '',
+ 'series' => '470.xx+',
+ 'status' => main::message('nv-legacy-active','2024-09-xx'),
+ 'xorg' => '',
+ 'years' => '2012-2018',
+ },
+ ## Current Active Series
+ # load microarch data, as stuff goes legacy, these will form new legacy items.
+ {'arch' => 'Maxwell',
+ 'ids' => '1340|1341|1344|1346|1347|1348|1349|134b|134d|134e|134f|137a|137b|' .
+ '1380|1381|1382|1390|1391|1392|1393|1398|1399|139a|139b|139c|139d|13b0|13b1|' .
+ '13b2|13b3|13b4|13b6|13b9|13ba|13bb|13bc|13c0|13c2|13d7|13d8|13d9|13da|13f0|' .
+ '13f1|13f2|13f3|13f8|13f9|13fa|13fb|1401|1402|1406|1407|1427|1430|1431|1436|' .
+ '1617|1618|1619|161a|1667|174d|174e|179c|17c8|17f0|17f1|17fd|1c90|1d10|1d12',
+ 'code' => 'GMxxx',
+ 'kernel' => '',
+ 'legacy' => 0,
+ 'process' => 'TSMC 28nm',
+ 'release' => '',
+ 'series' => '545.xx+',
+ 'status' => main::message('nv-current-eol',$date,'2026-12-xx'),
+ 'xorg' => '',
+ 'years' => '2014-2019',
+ },
+ {'arch' => 'Pascal',
+ 'ids' => '15f0|15f7|15f8|15f9|17c2|1b00|1b02|1b06|1b30|1b38|1b80|1b81|1b82|' .
+ '1b83|1b84|1b87|1ba0|1ba1|1ba2|1bb0|1bb1|1bb3|1bb4|1bb5|1bb6|1bb7|1bb8|1bb9|' .
+ '1bbb|1bc7|1be0|1be1|1c02|1c03|1c04|1c06|1c07|1c09|1c20|1c21|1c22|1c23|1c30|' .
+ '1c31|1c60|1c61|1c62|1c81|1c82|1c83|1c8c|1c8d|1c8f|1c90|1c91|1c92|1c94|1c96|' .
+ '1cb1|1cb2|1cb3|1cb6|1cba|1cbb|1cbc|1cbd|1cfa|1cfb|1d01|1d02|1d11|1d13|1d16|' .
+ '1d33|1d34|1d52',
+ 'code' => 'GP10x',
+ 'kernel' => '',
+ 'legacy' => 0,
+ 'process' => 'TSMC 16nm',
+ 'release' => '',
+ 'series' => '545.xx+',
+ 'status' => main::message('nv-current-eol',$date,'2026-12-xx'),
+ 'xorg' => '',
+ 'years' => '2016-2021',
+ },
+ {'arch' => 'Volta',
+ 'ids' => '1d81|1db1|1db3|1db4|1db5|1db6|1db7|1db8|1dba|1df0|1df2|1df6|1fb0',
+ 'code' => 'GV1xx',
+ 'kernel' => '',
+ 'legacy' => 0,
+ 'process' => 'TSMC 12nm',
+ 'release' => '',
+ 'series' => '545.xx+',
+ 'status' => main::message('nv-current-eol',$date,'2026-12-xx'),
+ 'xorg' => '',
+ 'years' => '2017-2020',
+ },
+ {'arch' => 'Turing',
+ 'ids' => '1e02|1e04|1e07|1e09|1e30|1e36|1e78|1e81|1e82|1e84|1e87|1e89|1e90|' .
+ '1e91|1e93|1eb0|1eb1|1eb5|1eb6|1ec2|1ec7|1ed0|1ed1|1ed3|1ef5|1f02|1f03|1f06|' .
+ '1f07|1f08|1f0a|1f0b|1f10|1f11|1f12|1f14|1f15|1f36|1f42|1f47|1f50|1f51|1f54|' .
+ '1f55|1f76|1f82|1f83|1f91|1f95|1f96|1f97|1f98|1f99|1f9c|1f9d|1f9f|1fa0|1fb0|' .
+ '1fb1|1fb2|1fb6|1fb7|1fb8|1fb9|1fba|1fbb|1fbc|1fdd|1ff0|1ff2|1ff9|2182|2184|' .
+ '2187|2188|2189|2191|2192|21c4|21d1|25a6|25a7|25a9|25aa|25ad|25ed|28b8|28f8',
+ 'code' => 'TUxxx',
+ 'kernel' => '',
+ 'legacy' => 0,
+ 'process' => 'TSMC 12nm FF',
+ 'release' => '',
+ 'series' => '545.xx+',
+ 'status' => main::message('nv-current-eol',$date,'2026-12-xx'),
+ 'xorg' => '',
+ 'years' => '2018-2022',
+ },
+ {'arch' => 'Ampere',
+ 'ids' => '20b0|20b2|20b3|20b5|20b6|20b7|20bd|20f1|20f3|20f5|20f6|20fd|2203|' .
+ '2204|2206|2207|2208|220a|220d|2216|2230|2231|2232|2233|2235|2236|2237|2238|' .
+ '2414|2420|2438|2460|2482|2484|2486|2487|2488|2489|248a|249c|249d|24a0|24b0|' .
+ '24b1|24b6|24b7|24b8|24b9|24ba|24bb|24c7|24c9|24dc|24dd|24e0|24fa|2503|2504|' .
+ '2507|2508|2520|2521|2523|2531|2544|2560|2563|2571|2582|25a0|25a2|25a5|25ab|' .
+ '25ac|25b6|25b8|25b9|25ba|25bb|25bc|25bd|25e0|25e2|25e5|25ec|25f9|25fa|25fb|' .
+ '2838',
+ 'code' => 'GAxxx',
+ 'kernel' => '',
+ 'legacy' => 0,
+ 'process' => 'TSMC n7 (7nm)',
+ 'release' => '',
+ 'series' => '545.xx+',
+ 'status' => main::message('nv-current-eol',$date,'2026-12-xx'),
+ 'xorg' => '',
+ 'years' => '2020-2023',
+ },
+ {'arch' => 'Hopper',
+ 'ids' => '2321|2322|2324|2330|2331|2339|233a|2342',
+ 'code' => 'GH1xx',
+ 'kernel' => '',
+ 'legacy' => 0,
+ 'process' => 'TSMC n4 (5nm)',
+ 'release' => '',
+ 'series' => '545.xx+',
+ 'status' => $status_current,
+ 'xorg' => '',
+ 'years' => '2022+',
+ },
+ {'arch' => 'Lovelace',
+ 'ids' => '2684|2685|26b1|26b2|26b3|26b5|26b9|26ba|2704|2705|2717|2730|2757|' .
+ '2770|2782|2783|2786|27a0|27b0|27b1|27b2|27b6|27b8|27ba|27bb|27e0|27fb|2803|' .
+ '2805|2820|2860|2882|28a0|28a1|28e0|28e1',
+ 'code' => 'AD1xx',
+ 'kernel' => '',
+ 'legacy' => 0,
+ 'process' => 'TSMC n4 (5nm)',
+ 'release' => '',
+ 'series' => '545.xx+',
+ 'status' => $status_current,
+ 'xorg' => '',
+ 'years' => '2022+',
+ },
+ ],
+}
+
+sub gpu_data {
eval $start if $b_log;
- my ($version,@data,$program);
- # load the extra X paths, it's important that these are first, because
- # later Xorg versions show error if run in console or ssh if the true path
- # is not used.
- @paths = ( qw(/usr/lib /usr/lib/xorg /usr/lib/xorg-server /usr/libexec /usr/X11R6/bin), @paths );
- # IMPORTANT: both commands send version data to stderr!
- if ($program = main::check_program('Xorg')){
- @data = main::grabber("$program -version 2>&1");
+ my ($v_id,$p_id,$name) = @_;
+ my ($gpu,$gpu_data,$b_nv);
+ if ($v_id eq '1002'){
+ set_amd_data() if !$gpu_amd;
+ $gpu = $gpu_amd;
+ }
+ elsif ($v_id eq '8086'){
+ set_intel_data() if !$gpu_intel;
+ $gpu = $gpu_intel;
}
- elsif ($program = main::check_program('X')){
- @data = main::grabber("$program -version 2>&1");
+ else {
+ set_nv_data() if !$gpu_nv;
+ $gpu = $gpu_nv;
+ $b_nv = 1;
+ }
+ $gpu_data = get_gpu_data($gpu,$p_id,$name);
+ eval $end if $b_log;
+ return ($gpu_data,$b_nv);
+}
+
+sub get_gpu_data {
+ eval $start if $b_log;
+ my ($gpu,$p_id,$name) = @_;
+ my ($info);
+ # Don't use reverse because if product ID is matched, we want that, not a looser
+ # regex match. Tried with reverse and led to false matches.
+ foreach my $item (reverse @$gpu){
+ next if !$item->{'ids'} && (!$item->{'pattern'} || !$name);
+ if (($item->{'ids'} && $p_id =~ /^($item->{'ids'})$/) ||
+ (!$item->{'ids'} && $item->{'pattern'} &&
+ $name =~ /\b($item->{'pattern'})\b/)){
+ $info = {
+ 'arch' => $item->{'arch'},
+ 'code' => $item->{'code'},
+ 'kernel' => $item->{'kernel'},
+ 'legacy' => $item->{'legacy'},
+ 'process' => $item->{'process'},
+ 'release' => $item->{'release'},
+ 'series' => $item->{'series'},
+ 'status' => $item->{'status'},
+ 'xorg' => $item->{'xorg'},
+ 'years' => $item->{'years'},
+ };
+ last;
+ }
}
- elsif ($program = main::check_program('Xvesa')){
- @data = main::grabber("$program -version 2>&1");
+ if (!$info){
+ $info->{'status'} = main::message('unknown-device-id');
}
- #print join('^ ', @paths), " :: $program\n";
- #print Data::Dumper::Dumper \@data;
- if (@data){
- foreach (@data){
- if (/^X.org X server/i){
- $version = (split /\s+/, $_)[3];
- last;
+ main::log_data('dump','%info',$info) if $b_log;
+ print "Raw \$info data: ", Data::Dumper::Dumper $info if $dbg[49];
+ eval $end if $b_log;
+ return $info;
+}
+
+## MONITOR DATA ##
+sub set_monitors_sys {
+ eval $start if $b_log;
+ my $pattern = '/sys/class/drm/card[0-9]/device/driver/module/drivers/*';
+ my @cards_glob = main::globber($pattern);
+ $pattern = '/sys/class/drm/card*-*/{connector_id,edid,enabled,status,modes}';
+ my @ports_glob = main::globber($pattern);
+ # print Data::Dumper::Dumper \@cards_glob;
+ # print Data::Dumper::Dumper \@ports_glob;
+ my ($card,%cards,@data,$file,$item,$path,$port);
+ foreach $file (@cards_glob){
+ next if ! -e $file;
+ if ($file =~ m|^/sys/class/drm/(card\d+)/.+?/drivers/(\S+):(\S+)$|){
+ push(@{$cards{$1}},[$2,$3]);
+ }
+ }
+ # print Data::Dumper::Dumper \%cards;
+ foreach $file (sort @ports_glob){
+ next if ! -r $file;
+ $item = $file;
+ $item =~ s|(/.*/(card\d+)-([^/]+))/(.+)||;
+ $path = $1;
+ $card = $2;
+ $port = $3;
+ $item = $4;
+ next if !$1;
+ $monitor_ids = {} if !$monitor_ids;
+ $monitor_ids->{$port}{'monitor'} = $port;
+ if (!$monitor_ids->{$port}{'drivers'} && $cards{$card}){
+ foreach my $info (@{$cards{$card}}){
+ push(@{$monitor_ids->{$port}{'drivers'}},$info->[1]);
}
- elsif (/^X Window System Version/i) {
- $version = (split /\s+/, $_)[4];
- last;
+ }
+ $monitor_ids->{$port}{'path'} = readlink($path);
+ $monitor_ids->{$port}{'path'} =~ s|^\.\./\.\.|/sys|;
+ if ($item eq 'status' || $item eq 'enabled'){
+ # print "$file\n";
+ $monitor_ids->{$port}{$item} = main::reader($file,'strip',0);
+ }
+ elsif ($item eq 'connector_id'){
+ $monitor_ids->{$port}{'connector-id'} = main::reader($file,'strip',0);
+ }
+ # arm: U:1680x1050p-0
+ elsif ($item eq 'modes'){
+ @data = main::reader($file,'strip');
+ next if !@data;
+ # modes has repeat values, probably because kernel doesn't show hz
+ main::uniq(\@data);
+ $monitor_ids->{$port}{'modes'} = [@data];
+ }
+ elsif ($item eq 'edid'){
+ next if -s $file;
+ monitor_edid_data($file,$port);
+ }
+ }
+ main::log_data('dump','$ports ref',$monitor_ids) if $b_log;
+ print 'monitor_sys_data(): ', Data::Dumper::Dumper $monitor_ids if $dbg[44];
+ eval $end if $b_log;
+}
+
+sub monitor_edid_data {
+ eval $start if $b_log;
+ my ($file,$port) = @_;
+ my (@data);
+ open my $fh, '<:raw', $file or return; # it failed, give up, we don't care why
+ my $edid_raw = do { local $/; <$fh> };
+ return if !$edid_raw;
+ my $edid = ParseEDID::parse_edid($edid_raw,$dbg[47]);
+ main::log_data('dump','Parse::EDID',$edid) if $b_log;
+ print 'parse_edid(): ', Data::Dumper::Dumper $edid if $dbg[44];
+ return if !$edid || ref $edid ne 'HASH' || !%$edid;
+ $monitor_ids->{$port}{'build-date'} = $edid->{'year'};
+ if ($edid->{'color_characteristics'}){
+ $monitor_ids->{$port}{'colors'} = $edid->{'color_characteristics'};
+ }
+ if ($edid->{'gamma'}){
+ $monitor_ids->{$port}{'gamma'} = ($edid->{'gamma'}/100 + 0);
+ }
+ if ($edid->{'monitor_name'} || $edid->{'manufacturer_name_nice'}){
+ my $model = '';
+ if ($edid->{'manufacturer_name_nice'}){
+ $model = $edid->{'manufacturer_name_nice'};
+ }
+ if ($edid->{'monitor_name'}){
+ $model .= ' ' if $model;
+ $model .= $edid->{'monitor_name'};
+ }
+ elsif ($model && $edid->{'product_code_h'}){
+ $model .= ' ' . $edid->{'product_code_h'};
+ }
+ $monitor_ids->{$port}{'model'} = main::remove_duplicates(main::clean($model));
+ }
+ elsif ($edid->{'manufacturer_name'} && $edid->{'product_code_h'}){
+ $monitor_ids->{$port}{'model-id'} = $edid->{'manufacturer_name'} . ' ';
+ $monitor_ids->{$port}{'model-id'} .= $edid->{'product_code_h'};
+ }
+ # construct to match xorg values
+ if ($edid->{'manufacturer_name'} && $edid->{'product_code'}){
+ my $id = $edid->{'manufacturer_name'} . sprintf('%x',$edid->{'product_code'});
+ $monitor_ids->{$port}{$id} = ($edid->{'serial_number'}) ? $edid->{'serial_number'}: '';
+ }
+ if ($edid->{'diagonal_size'}){
+ $monitor_ids->{$port}{'diagonal-m'} = sprintf('%.0f',($edid->{'diagonal_size'}*25.4)) + 0;
+ $monitor_ids->{$port}{'diagonal'} = sprintf('%.1f',$edid->{'diagonal_size'}) + 0;
+ }
+ if ($edid->{'ratios'}){
+ $monitor_ids->{$port}{'ratio'} = join(', ', @{$edid->{'ratios'}});
+ }
+ if ($edid->{'detailed_timings'}){
+ if ($edid->{'detailed_timings'}[0]{'horizontal_active'}){
+ $monitor_ids->{$port}{'res-x'} = $edid->{'detailed_timings'}[0]{'horizontal_active'};
+ }
+ if ($edid->{'detailed_timings'}[0]{'vertical_active'}){
+ $monitor_ids->{$port}{'res-y'} = $edid->{'detailed_timings'}[0]{'vertical_active'};
+ }
+ if ($edid->{'detailed_timings'}[0]{'horizontal_image_size'}){
+ $monitor_ids->{$port}{'size-x'} = $edid->{'detailed_timings'}[0]{'horizontal_image_size'};
+ $monitor_ids->{$port}{'size-x-i'} = $edid->{'detailed_timings'}[0]{'horizontal_image_size_i'};
+ }
+ if ($edid->{'detailed_timings'}[0]{'vertical_image_size'}){
+ $monitor_ids->{$port}{'size-y'} = $edid->{'detailed_timings'}[0]{'vertical_image_size'};
+ $monitor_ids->{$port}{'size-y-i'} = $edid->{'detailed_timings'}[0]{'vertical_image_size_i'};
+ }
+ if ($edid->{'detailed_timings'}[0]{'horizontal_dpi'}){
+ $monitor_ids->{$port}{'dpi'} = sprintf('%.0f',$edid->{'detailed_timings'}[0]{'horizontal_dpi'}) + 0;
+ }
+ }
+ if ($edid->{'serial_number'} || $edid->{'serial_number2'}){
+ # this looks much more like a real serial than the default: serial_number
+ if ($edid->{'serial_number2'} && @{$edid->{'serial_number2'}}){
+ $monitor_ids->{$port}{'serial'} = main::clean_dmi($edid->{'serial_number2'}[0]);
+ }
+ elsif ($edid->{'serial_number'}){
+ $monitor_ids->{$port}{'serial'} = main::clean_dmi($edid->{'serial_number'});
+ }
+ }
+ # this will be an array reference of one or more edid errors
+ if ($edid->{'edid_errors'}){
+ $monitor_ids->{$port}{'edid-errors'} = $edid->{'edid_errors'};
+ }
+ # this will be an array reference of one or more edid warnings
+ if ($edid->{'edid_warnings'}){
+ $monitor_ids->{$port}{'edid-warnings'} = $edid->{'edid_warnings'};
+ }
+ eval $end if $b_log;
+}
+
+sub advanced_monitor_data {
+ eval $start if $b_log;
+ my ($monitors,$layouts) = @_;
+ my (@horiz,@vert);
+ my $position = '';
+ # then see if we can locate a default position primary monitor
+ foreach my $key (keys %$monitors){
+ next if !defined $monitors->{$key}{'pos-x'} || !defined $monitors->{$key}{'pos-y'};
+ # this is the only scenario we can guess at if no primary detected
+ if (!$b_primary && !$monitors->{$key}{'primary'} &&
+ $monitors->{$key}{'pos-x'} == 0 && $monitors->{$key}{'pos-y'} == 0){
+ $monitors->{$key}{'position'} = 'primary';
+ $monitors->{$key}{'primary'} = $monitors->{$key}{'monitor'};
+ }
+ if (!grep {$monitors->{$key}{'pos-x'} == $_} @horiz){
+ push(@horiz,$monitors->{$key}{'pos-x'});
+ }
+ if (!grep {$monitors->{$key}{'pos-y'} == $_} @vert){
+ push(@vert,$monitors->{$key}{'pos-y'});
+ }
+ }
+ # we need NUMERIC sort, because positions can be less than 1000!
+ @horiz = sort {$a <=> $b} @horiz;
+ @vert =sort {$a <=> $b} @vert;
+ my ($h,$v) = (scalar(@horiz),scalar(@vert));
+ # print Data::Dumper::Dumper \@horiz;
+ # print Data::Dumper::Dumper \@vert;
+ # print Data::Dumper::Dumper $layouts;
+ # print 'mon advanced monitor_map: ', Data::Dumper::Dumper $monitor_map;
+ foreach my $key (keys %$monitors){
+ # disabled monitor may not have pos-x/pos-y, so skip
+ if (@horiz && @vert && (scalar @horiz > 1 || scalar @vert > 1) &&
+ defined $monitors->{$key}{'pos-x'} && defined $monitors->{$key}{'pos-y'}){
+ $monitors->{$key}{'position'} ||= '';
+ $position = '';
+ $position = get_monitor_position($monitors->{$key},\@horiz,\@vert);
+ $position = $layouts->[$v][$h]{$position} if $layouts->[$v][$h]{$position};
+ $monitors->{$key}{'position'} .= ',' if $monitors->{$key}{'position'};
+ $monitors->{$key}{'position'} .= $position;
+ }
+ my $mon_mapped = ($monitor_map) ? $monitor_map->{$monitors->{$key}{'monitor'}} : undef;
+ # these are already set for monitor_ids, only need this for Xorg data.
+ if ($mon_mapped && $monitor_ids->{$mon_mapped}){
+ # note: xorg drivers can be different than gpu drivers
+ $monitors->{$key}{'drivers'} = gpu_drivers_sys($mon_mapped);
+ $monitors->{$key}{'build-date'} = $monitor_ids->{$mon_mapped}{'build-date'};
+ $monitors->{$key}{'colors'} = $monitor_ids->{$mon_mapped}{'colors'};
+ $monitors->{$key}{'diagonal'} = $monitor_ids->{$mon_mapped}{'diagonal'};
+ $monitors->{$key}{'diagonal-m'} = $monitor_ids->{$mon_mapped}{'diagonal-m'};
+ $monitors->{$key}{'gamma'} = $monitor_ids->{$mon_mapped}{'gamma'};
+ $monitors->{$key}{'modes'} = $monitor_ids->{$mon_mapped}{'modes'};
+ $monitors->{$key}{'model'} = $monitor_ids->{$mon_mapped}{'model'};
+ $monitors->{$key}{'color-characteristics'} = $monitor_ids->{$mon_mapped}{'color-characteristics'};
+ if (!defined $monitors->{$key}{'size-x'} && $monitor_ids->{$mon_mapped}{'size-x'}){
+ $monitors->{$key}{'size-x'} = $monitor_ids->{$mon_mapped}{'size-x'};
+ $monitors->{$key}{'size-x-i'} = $monitor_ids->{$mon_mapped}{'size-x-i'};
}
- elsif (/^Xvesa from/i) {
- $version = (split /\s+/, $_)[3];
- $version = "Xvesa $version" if $version;
- last;
+ if (!defined $monitors->{$key}{'size-y'} && $monitor_ids->{$mon_mapped}{'size-y'}){
+ $monitors->{$key}{'size-y'} = $monitor_ids->{$mon_mapped}{'size-y'};
+ $monitors->{$key}{'size-y-i'} = $monitor_ids->{$mon_mapped}{'size-y-i'};
}
+ if (!defined $monitors->{$key}{'dpi'} && $monitor_ids->{$mon_mapped}{'dpi'}){
+ $monitors->{$key}{'dpi'} = $monitor_ids->{$mon_mapped}{'dpi'};
+ }
+ if ($monitor_ids->{$mon_mapped}{'model-id'}){
+ $monitors->{$key}{'model-id'} = $monitor_ids->{$mon_mapped}{'model-id'};
+ }
+ if ($monitor_ids->{$mon_mapped}{'edid-errors'}){
+ $monitors->{$key}{'edid-errors'} = $monitor_ids->{$mon_mapped}{'edid-errors'};
+ }
+ if ($monitor_ids->{$mon_mapped}{'edid-warnings'}){
+ $monitors->{$key}{'edid-warnings'} = $monitor_ids->{$mon_mapped}{'edid-warnings'};
+ }
+ if ($monitor_ids->{$mon_mapped}{'enabled'} &&
+ $monitor_ids->{$mon_mapped}{'enabled'} eq 'disabled'){
+ $monitors->{$key}{'disabled'} = $monitor_ids->{$mon_mapped}{'enabled'};
+ }
+ $monitors->{$key}{'ratio'} = $monitor_ids->{$mon_mapped}{'ratio'};
+ $monitors->{$key}{'serial'} = $monitor_ids->{$mon_mapped}{'serial'};
+ }
+ # now swap the drm id for the display server id if they don't match
+ if ($mon_mapped && $mon_mapped ne $monitors->{$key}{'monitor'}){
+ $monitors->{$key}{'monitor-mapped'} = $monitors->{$key}{'monitor'};
+ $monitors->{$key}{'monitor'} = $mon_mapped;
}
}
- # remove extra X paths
- @paths = grep { !/^\/usr\/lib|xorg|X11R6|libexec/ } @paths;
+ # not printing out primary if Screen has only 1 Monitor
+ if (scalar keys %$monitors == 1){
+ my @keys = keys %$monitors;
+ $monitors->{$keys[0]}{'position'} = undef;
+ }
+ print Data::Dumper::Dumper $monitors if $dbg[45];
eval $end if $b_log;
- return $version;
}
-# $1 - protocol: wayland|x11
-sub display_compositor {
- eval $start if $b_log;
- my ($protocol) = @_;
- my ($compositor) = ('');
- main::set_ps_gui() if !$b_ps_gui;
- if (@ps_gui){
- # 1 check program; 2 search; 3 unused version; 4 print
- my @compositors = (
- ['asc','asc','','asc'],
- ['budgie-wm','budgie-wm','','budgie-wm'],
- # owned by: compiz-core in debian
- ['compiz','compiz','','compiz'],
- ['compton','compton','','compton'],
- # as of version 20 is wayland compositor
- ['enlightenment','enlightenment','','enlightenment'],
- ['gnome-shell','gnome-shell','','gnome-shell'],
- ['kwin_wayland','kwin_wayland','','kwin_wayland'],
- ['kwin_x11','kwin_x11','','kwin_x11'],
- #['kwin','kwin','','kwin'],
- ['marco','marco','','marco'],
- ['muffin','muffin','','muffin'],
- ['mutter','mutter','','mutter'],
- ['weston','weston','','weston'],
- # these are more obscure, so check for them last
- ['3dwm','3dwm','','3dwm'],
- ['dcompmgr','dcompmgr','','dcompmgr'],
- ['dwc','dwc','','dwc'],
- ['fireplace','fireplace','','fireplace'],
- ['grefson','grefson','','grefson'],
- ['kmscon','kmscon','','kmscon'],
- ['liri','liri','','liri'],
- ['metisse','metisse','','metisse'],
- ['mir','mir','','mir'],
- ['moblin','moblin','','moblin'],
- ['motorcar','motorcar','','motorcar'],
- ['orbital','orbital','','orbital'],
- ['papyros','papyros','','papyros'],
- ['perceptia','perceptia','','perceptia'],
- ['picom','picom','','picom'],
- ['rustland','rustland','','rustland'],
- ['sommelier','sommelier','','sommelier'],
- ['sway','sway','','sway'],
- ['swc','swc','','swc'],
- ['ukwm','ukwm','','ukwm'],
- ['unagi','unagi','','unagi'],
- ['unity-system-compositor','unity-system-compositor','','unity-system-compositor'],
- ['way-cooler','way-cooler','','way-cooler'],
- ['wavy','wavy','','wavy'],
- ['wayfire','wayfire','','wayfire'],
- ['wayhouse','wayhouse','','wayhouse'],
- ['westford','westford','','westford'],
- ['xcompmgr','xcompmgr','','xcompmgr'],
+
+# Clear out all disabled or not connected monitor ports
+sub set_active_monitors {
+ eval $start if $b_log;
+ foreach my $key (keys %$monitor_ids){
+ if (!$monitor_ids->{$key}{'status'} ||
+ $monitor_ids->{$key}{'status'} ne 'connected'){
+ delete $monitor_ids->{$key};
+ }
+ }
+ # print 'active monitors: ', Data::Dumper::Dumper $monitor_ids;
+ eval $end if $b_log;
+}
+
+sub get_monitor_position {
+ eval $start if $b_log;
+ my ($monitor,$horiz,$vert) = @_;
+ my ($i,$position) = (1,'');
+ foreach (@$vert){
+ if ($_ == $monitor->{'pos-y'}){
+ $position = $i . '-';
+ last;
+ }
+ $i++;
+ }
+ $i = 1;
+ foreach (@$horiz){
+ if ($_ == $monitor->{'pos-x'}){
+ $position .= $i;
+ last;
+ }
+ $i++;
+ }
+ main::log_data('data','pos-raw: ' . $position) if $b_log;
+ eval $end if $b_log;
+ return $position;
+}
+
+sub set_monitor_layouts {
+ my ($layouts) = @_;
+ $layouts->[1][2] = {'1-1' => 'left','1-2' => 'right'};
+ $layouts->[1][3] = {'1-1' => 'left','1-2' => 'center','1-3' => 'right'};
+ $layouts->[1][4] = {'1-1' => 'left','1-2' => 'center-l','1-3' => 'center-r',
+ '1-4' => 'right'};
+ $layouts->[2][1] = {'1-1' => 'top','2-1' => 'bottom'};
+ $layouts->[2][2] = {'1-1' => 'top-left','1-2' => 'top-right',
+ '2-1' => 'bottom-l','2-2' => 'bottom-r'};
+ $layouts->[2][3] = {'1-1' => 'top-left','1-2' => 'top-center','1-3' => 'top-right',
+ '2-1' => 'bottom-l','2-2' => 'bottom-c','2-3' => 'bottom-r'};
+ $layouts->[3][1] = {'1-1' => 'top','2-1' => 'middle','3-1' => 'bottom'};
+ $layouts->[3][2] = {'1-1' => 'top-left','1-2' => 'top-right',
+ '2-1' => 'middle-l','2-2' => 'middle-r',
+ '3-1' => 'bottom-l','3-2' => 'bottom-r'};
+ $layouts->[3][3] = {'1-1' => 'top-left','1-2' => 'top-center',,'1-3' => 'top-right',
+ '2-1' => 'middle-l','2-2' => 'middle-c','2-3' => 'middle-r',
+ '3-1' => 'bottom-l','3-2' => 'bottom-c','3-3' => 'bottom-r'};
+}
+
+# This is required to resolve the situation where some xorg drivers change
+# the kernel ID for the port to something slightly different, amdgpu in particular.
+# Note: connector_id if available from xrandr and /sys allow for matching.
+sub map_monitor_ids {
+ eval $start if $b_log;
+ my ($display_ids) = @_;
+ return if !$monitor_ids;
+ my (@sys_ids,@unmatched_display,@unmatched_sys);
+ @$display_ids = sort {lc($a->[0]) cmp lc($b->[0])} @$display_ids;
+ foreach my $d_id (@$display_ids){
+ push(@unmatched_display,$d_id->[0]);
+ }
+ foreach my $key (sort keys %$monitor_ids){
+ if ($monitor_ids->{$key}{'status'} eq 'connected'){
+ push(@sys_ids,[$key,$monitor_ids->{$key}{'connector-id'}]);
+ push(@unmatched_sys,$key);
+ }
+ }
+ # @sys_ids = ('DVI-I-1','eDP-1','VGA-1');
+ main::log_data('dump','@sys_ids',\@sys_ids) if $b_log;
+ main::log_data('dump','$xrandr_ids ref',$display_ids) if $b_log;
+ print 'sys: ', Data::Dumper::Dumper \@sys_ids if $dbg[45];
+ print 'display: ', Data::Dumper::Dumper $display_ids if $dbg[45];
+ return if scalar @sys_ids != scalar @$display_ids;
+ $monitor_map = {};
+ # known patterns: s: DP-1 d: DisplayPort-0; s: DP-1 d: DP1-1; s: DP-2 d: DP1-2;
+ # s: HDMI-A-2 d: HDMI-A-1; s: HDMI-A-2 d: HDMI-2; s: DVI-1 d: DVI1; s: HDMI-1 d: HDMI1
+ # s: DVI-I-1 d: DVI0; s: VGA-1 d: VGA1; s: DP-1-1; d: DP-1-1;
+ # s: eDP-1 d: eDP-1-1 (yes, reversed from normal deviation!); s: eDP-1 d: eDP
+ # worst: s: DP-6 d: DP-2-3 (2 banks of 3 according to X); s: eDP-1 d: DP-4;
+ # s: DP-3 d: DP-1-1; s: DP-4 d: DP-1-2
+ # s: DP-3 d: DP-4 [yes, +1, not -];
+ my ($d_1,$d_2,$d_m,$s_1,$s_2,$s_m);
+ my $b_single = (scalar @sys_ids == 1) ? 1 : 0;
+ my $pattern = '([A-Z]+)(-[A-Z]-\d+-\d+|-[A-Z]-\d+|-?\d+-\d+|-?\d+|)';
+ for (my $i=0; $i < scalar @$display_ids; $i++){
+ print "s: $sys_ids[$i]->[0] d: $display_ids->[$i][0]\n" if $dbg[45];
+ my $b_match;
+ # we're going for the connector match first
+ if ($display_ids->[$i][1]){
+ # for off case where they did not sort to same order
+ foreach my $sys (@sys_ids){
+ if (defined $sys->[1] && $sys->[1] == $display_ids->[$i][1]){
+ $b_match = 1;
+ $monitor_map->{$display_ids->[$i][0]} = $sys->[0];
+ @unmatched_display = grep {$_ ne $display_ids->[$i][0]} @unmatched_display;
+ @unmatched_sys = grep {$_ ne $sys->[0]} @unmatched_sys;
+ last;
+ }
+ }
+ }
+ # try 1: /^([A-Z]+)(-[AB]|-[ADI]|-[ADI]-\d+?|-\d+?)?(-)?(\d+)$/i
+ if (!$b_match && $display_ids->[$i][0] =~ /^$pattern$/i){
+ $d_1 = $1;
+ $d_2 = ($2) ? $2 : '';
+ $d_2 =~ /(\d+)?$/;
+ $d_m = ($1) ? $1 : 0;
+ $d_1 =~ s/^DisplayPort/DP/i; # amdgpu...
+ print " d1: $d_1 d2: $d_2 d3: $d_m\n" if $dbg[45];
+ if ($sys_ids[$i]->[0] =~ /^$pattern$/i){
+ $s_1 = $1;
+ $s_2 = ($2) ? $2 : '';
+ $s_2 =~ /(\d+)?$/;
+ $s_m = ($1) ? $1 : 0;
+ $d_1 = $s_1 if uc($d_1) eq 'XWAYLAND';
+ print " d1: $d_1 s1: $s_1 dm: $d_m sm: $s_m \n" if $dbg[45];
+ if ($d_1 eq $s_1 && ($d_m == $s_m || $d_m == ($s_m - 1))){
+ $monitor_map->{$display_ids->[$i][0]} = $sys_ids[$i]->[0];
+ @unmatched_display = grep {$_ ne $display_ids->[$i][0]} @unmatched_display;
+ @unmatched_sys = grep {$_ ne $sys_ids[$i]->[0]} @unmatched_sys;
+ }
+ }
+ }
+ # in case of one unmatched, we'll dump this, and use the actual unmatched
+ if (!$b_match && !$monitor_map->{$display_ids->[$i][0]}){
+ # we're not even going to try, if there's 1 sys and 1 display, just use it!
+ if ($b_single){
+ $monitor_map->{$display_ids->[$i][0]} = $sys_ids[$i]->[0];
+ (@unmatched_display,@unmatched_sys) = ();
+ }
+ else {
+ $monitor_map->{$display_ids->[$i][0]} = main::message('monitor-id');
+ }
+ }
+ }
+ # we don't care at all what the pattern is, if there is 1 unmatched display
+ # out of 1 sys ids, we'll assume that is the one. This can only be assumed in
+ # cases where only 1 monitor was not matched, otherwise it's just a guess.
+ # obviously, if one of the matches was wrong, this will also be wrong, but
+ # thats' life when dealing with irrational data. DP is a particular problem.
+ if (scalar @unmatched_sys == 1){
+ $monitor_map->{$unmatched_display[0]} = $unmatched_sys[0];
+ }
+ main::log_data('dump','$monitor_map ref',$monitor_map) if $b_log;
+ print Data::Dumper::Dumper $monitor_map if $dbg[45];
+ eval $end if $b_log;
+}
+
+# Handle case of monitor on left or right edge, vertical that is.
+# mm dimensiions are based on the default position of monitor as sold.
+# very old systems may not have non 0 value for size x or y
+# size, res x,y by reference
+sub flip_size_x_y {
+ eval $start if $b_log;
+ my ($size_x,$size_y,$res_x,$res_y) = @_;
+ if ((($$res_x/$$res_y > 1 && $$size_x/$$size_y < 1) ||
+ ($$res_x/$$res_y < 1 && $$size_x/$$size_y > 1))){
+ ($$size_x,$$size_y) = ($$size_y,$$size_x);
+ }
+ eval $end if $b_log;
+}
+
+## COMPOSITOR DATA ##
+sub set_compositor_data {
+ eval $start if $b_log;
+ my $compositors = get_compositors();
+ if (@$compositors){
+ # these use different spelling or command for full data.
+ my %custom = (
+ 'hyprland' => 'hyprctl',
);
- foreach my $item (@compositors){
- # no need to use check program with short list of ps_gui
- # if (main::check_program($item[0]) && (grep {/^$item[1]$/} @ps_gui ) ){
- if (grep {/^$item->[1]$/} @ps_gui){
- $compositor = $item->[3];
- last;
+ my @data;
+ foreach my $compositor (@$compositors){
+ # gnome-shell is incredibly slow to return version
+ if (($extra > 1 || $graphics{'protocol'} eq 'wayland' || $b_android) &&
+ (!$show{'system'} || $compositor ne 'gnome-shell')){
+ my $comp_lc = lc($compositor);
+ $graphics{'compositors'} = [] if !$graphics{'compositors'};
+ # if -S found wm/comp, this is already set so no need to run version again
+ # note: -Sxxx shows wm v:, but -Gxx OR WL shows comp + v.
+ if (!$comps{$comp_lc} || ($extra < 3 && !$comps{$comp_lc}->[1])){
+ my $comp = ($custom{$comp_lc}) ? $custom{$comp_lc}: $compositor;
+ push(@{$graphics{'compositors'}},[ProgramData::full($comp)]);
+ }
+ else {
+ push(@{$graphics{'compositors'}},$comps{$comp_lc}); # already array ref
+ }
+ }
+ else {
+ $graphics{'compositors'} = [] if !$graphics{'compositors'};
+ push(@{$graphics{'compositors'}},[(ProgramData::values($compositor))[3]]);
+ }
+ }
+ }
+ eval $end if $b_log;
+}
+
+sub get_compositors {
+ eval $start if $b_log;
+ PsData::set_de_wm() if !$loaded{'ps-gui'};
+ my $comps = [];
+ push(@$comps,@{$ps_data{'compositors-pure'}}) if @{$ps_data{'compositors-pure'}};
+ push(@$comps,@{$ps_data{'de-wm-compositors'}}) if @{$ps_data{'de-wm-compositors'}};
+ push(@$comps,@{$ps_data{'wm-compositors'}}) if @{$ps_data{'wm-compositors'}};
+ @$comps = sort(@$comps) if @$comps;
+ main::log_data('dump','$comps:', $comps) if $b_log;
+ eval $end if $b_log;
+ return $comps;
+}
+
+## UTILITIES ##
+sub tty_data {
+ eval $start if $b_log;
+ my ($tty);
+ if ($size{'term-cols'}){
+ $tty = "$size{'term-cols'}x$size{'term-lines'}";
+ }
+ # this is broken
+ elsif ($b_irc && $client{'console-irc'}){
+ ShellData::console_irc_tty() if !$loaded{'con-irc-tty'};
+ my $tty_working = $client{'con-irc-tty'};
+ if ($tty_working ne '' && (my $program = main::check_program('stty'))){
+ my $tty_arg = ($bsd_type) ? '-f' : '-F';
+ # handle vtnr integers, and tty ID with letters etc.
+ $tty_working = "tty$tty_working" if -e "/dev/tty$tty_working";
+ $tty = (main::grabber("$program $tty_arg /dev/$tty_working size 2>/dev/null"))[0];
+ if ($tty){
+ my @temp = split(/\s+/, $tty);
+ $tty = "$temp[1]x$temp[0]";
+ }
+ }
+ }
+ eval $end if $b_log;
+ return $tty;
+}
+}
+
+## LogicalItem
+{
+package LogicalItem;
+
+sub get {
+ eval $start if $b_log;
+ my ($key1,$val1);
+ my $rows = [];
+ my $num = 0;
+ if ($bsd_type){
+ $key1 = 'Message';
+ $val1 = main::message('logical-data-bsd',$uname[0]);
+ push(@$rows,{main::key($num++,0,1,$key1) => $val1});
+ }
+ else {
+ LsblkData::set() if !$loaded{'lsblk'};
+ if ($fake{'logical'} || $alerts{'lvs'}->{'action'} eq 'use'){
+ lvm_data() if !$loaded{'logical-data'};
+ if (!@lvm){
+ my $key = 'Message';
+ # note: arch linux has a bug where lvs returns 0 if non root start
+ my $message = ($use{'logical-lvm'}) ? main::message('tool-permissions','lvs') : main::message('logical-data','');
+ push(@$rows, {
+ main::key($num++,0,1,$key) => $message,
+ });
+ }
+ else {
+ lvm_output($rows,process_lvm_data());
+ }
+ }
+ elsif ($use{'logical-lvm'} && $alerts{'lvs'}->{'action'} eq 'permissions'){
+ my $key = 'Message';
+ push(@$rows, {
+ main::key($num++,0,1,$key) => $alerts{'lvs'}->{'message'},
+ });
+ }
+ elsif (@lsblk && !$use{'logical-lvm'} && ($alerts{'lvs'}->{'action'} eq 'permissions' ||
+ $alerts{'lvs'}->{'action'} eq 'missing')){
+ my $key = 'Message';
+ push(@$rows, {
+ main::key($num++,0,1,$key) => main::message('logical-data',''),
+ });
+ }
+ elsif ($alerts{'lvs'}->{'action'} ne 'use'){
+ $key1 = $alerts{'lvs'}->{'action'};
+ $val1 = $alerts{'lvs'}->{'message'};
+ $key1 = ucfirst($key1);
+ push(@$rows, {main::key($num++,0,1,$key1) => $val1});
+ }
+ if ($use{'logical-general'}){
+ my $general_data = general_data();
+ general_output($rows,$general_data) if @$general_data;
+ }
+ }
+ eval $end if $b_log;
+ return $rows;
+}
+
+sub general_output {
+ eval $start if $b_log;
+ my ($rows,$general_data) = @_;
+ my ($size);
+ my ($j,$num) = (0,0);
+ # cryptsetup status luks-a00baac5-44ff-4b48-b303-3bedb1f623ce
+ foreach my $item (sort {$a->{'type'} cmp $b->{'type'}} @$general_data){
+ $j = scalar @$rows;
+ $size = ($item->{'size'}) ? main::get_size($item->{'size'}, 'string') : 'N/A';
+ push(@$rows,{
+ main::key($num++,1,1,'Device') => $item->{'name'},
+ });
+ if ($b_admin){
+ $item->{'name'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'maj-min')} = $item->{'maj-min'};
+ }
+ $rows->[$j]{main::key($num++,0,2,'type')} = $item->{'type'};
+ if ($extra > 0 && $item->{'dm'}){
+ $rows->[$j]{main::key($num++,0,2,'dm')} = $item->{'dm'};
+ }
+ $rows->[$j]{main::key($num++,0,2,'size')} = $size;
+ my $b_fake;
+ components_output('general',\$j,\$num,$rows,\@{$item->{'components'}},\$b_fake);
+ }
+ eval $end if $b_log;
+}
+
+sub lvm_output {
+ eval $start if $b_log;
+ my ($rows,$lvm_data) = @_;
+ my ($size);
+ my ($j,$num) = (0,0);
+ foreach my $vg (sort keys %$lvm_data){
+ $j = scalar @$rows;
+ # print Data::Dumper::Dumper $lvm_data->{$vg};
+ $size = main::get_size($lvm_data->{$vg}{'vg-size'},'string','N/A');
+ push(@$rows,{
+ main::key($num++,1,1,'Device') => '',
+ main::key($num++,0,2,'VG') => $vg,
+ main::key($num++,0,2,'type') => uc($lvm_data->{$vg}{'vg-format'}),
+ main::key($num++,0,2,'size') => $size,
+ },);
+ $size = main::get_size($lvm_data->{$vg}{'vg-free'},'string','N/A');
+ $rows->[$j]{main::key($num++,0,2,'free')} = $size;
+ foreach my $lv (sort keys %{$lvm_data->{$vg}{'lvs'}}){
+ next if $extra < 2 && $lv =~ /^\[/; # it's an internal vg lv, raid meta/image
+ $j = scalar @$rows;
+ my $b_raid;
+ $size = main::get_size($lvm_data->{$vg}{'lvs'}{$lv}{'lv-size'},'string','N/A');
+ $rows->[$j]{main::key($num++,1,2,'LV')} = $lv;
+ if ($b_admin && $lvm_data->{$vg}{'lvs'}{$lv}{'maj-min'}){
+ $rows->[$j]{main::key($num++,0,3,'maj-min')} = $lvm_data->{$vg}{'lvs'}{$lv}{'maj-min'};
+ }
+ $rows->[$j]{main::key($num++,0,3,'type')} = $lvm_data->{$vg}{'lvs'}{$lv}{'lv-type'};
+ if ($extra > 0 && $lvm_data->{$vg}{'lvs'}{$lv}{'dm'}){
+ $rows->[$j]{main::key($num++,0,3,'dm')} = $lvm_data->{$vg}{'lvs'}{$lv}{'dm'};
+ }
+ $rows->[$j]{main::key($num++,0,3,'size')} = $size;
+ if ($extra > 1 && !($show{'raid'} || $show{'raid-basic'}) && $lvm_data->{$vg}{'lvs'}{$lv}{'raid'}){
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,1,3,'RAID')} = '';
+ $rows->[$j]{main::key($num++,0,4,'stripes')} = $lvm_data->{$vg}{'lvs'}{$lv}{'raid'}{'stripes'};
+ $rows->[$j]{main::key($num++,0,4,'sync')} = $lvm_data->{$vg}{'lvs'}{$lv}{'raid'}{'sync'};
+ my $copied = $lvm_data->{$vg}{'lvs'}{$lv}{'raid'}{'copied'};
+ $copied = (defined $copied) ? ($copied + 0) . '%': 'N/A';
+ $rows->[$j]{main::key($num++,0,4,'copied')} = $copied;
+ $rows->[$j]{main::key($num++,0,4,'mismatches')} = $lvm_data->{$vg}{'lvs'}{$lv}{'raid'}{'mismatches'};
+ $b_raid = 1;
+ }
+ components_output('lvm',\$j,\$num,$rows,\@{$lvm_data->{$vg}{'lvs'}{$lv}{'components'}},\$b_raid);
+ }
+ }
+ eval $end if $b_log;
+}
+
+sub components_output {
+ my ($type,$j,$num,$rows,$components,$b_raid) = @_;
+ my ($l1);
+ $$j = scalar @$rows if $$b_raid || $extra > 1;
+ $$b_raid = 0;
+ if ($type eq 'general'){
+ ($l1) = (2);
+ }
+ elsif ($type eq 'lvm'){
+ ($l1) = (3);
+ }
+ my $status = (!@$components) ? 'N/A': '';
+ $rows->[$$j]{main::key($$num++,1,$l1,'Components')} = $status;
+ components_recursive_output($type,$j,$num,$rows,$components,0,'c','p');
+}
+
+sub components_recursive_output {
+ my ($type,$j,$num,$rows,$components,$indent,$c,$p) = @_;
+ my ($l,$m,$size) = (1,1,0);
+ my ($l2,$l3);
+ if ($type eq 'general'){
+ ($l2,$l3) = (3+$indent,4+$indent) ;
+ }
+ elsif ($type eq 'lvm'){
+ ($l2,$l3) = (4+$indent,5+$indent);
+ }
+ # print 'outside: ', scalar @$component, "\n", Data::Dumper::Dumper $component;
+ foreach my $component (@$components){
+ # print "inside: -n", Data::Dumper::Dumper $component->[$i];
+ $$j = scalar @$rows if $b_admin;
+ my $id;
+ if ($component->[0] =~ /^(bcache|dm-|md)[0-9]/){
+ $id = $c .'-' . $m;
+ $m++;
+ }
+ else {
+ $id = $p . '-' . $l;
+ $l++;
+ }
+ $rows->[$$j]{main::key($$num++,1,$l2,$id)} = $component->[0];
+ if ($extra > 1){
+ if ($b_admin){
+ $component->[1] ||= 'N/A';
+ $rows->[$$j]{main::key($$num++,0,$l3,'maj-min')} = $component->[1];
+ $rows->[$$j]{main::key($$num++,0,$l3,'mapped')} = $component->[3] if $component->[3];
+ $size = main::get_size($component->[2],'string','N/A');
+ $rows->[$$j]{main::key($$num++,0,$l3,'size')} = $size;
+ }
+ #next if !$component->[$i][4];
+ for (my $i = 4; $i < scalar @$component; $i++){
+ components_recursive_output($type,$j,$num,$rows,$component->[$i],$indent+1,$c.'c',$p.'p');
+ }
+ }
+ }
+}
+
+# Note: type dm is seen in only one dataset, but it's a start
+sub general_data {
+ eval $start if $b_log;
+ my (@found,$parent,$parent_fs);
+ my $general_data = [];
+ PartitionData::set('proc') if !$loaded{'partition-data'};
+ main::set_mapper() if !$loaded{'mapper'};
+ foreach my $row (@lsblk){
+ # bcache doesn't have mapped name: !$mapper{$row->{'name'}} ||
+ next if !$row->{'parent'};
+ $parent = LsblkData::get($row->{'parent'});
+ next if !$parent->{'fs'};
+ if ($row->{'type'} && (($row->{'type'} eq 'crypt' ||
+ $row->{'type'} eq 'mpath' || $row->{'type'} eq 'multipath') ||
+ ($row->{'type'} eq 'dm' && $row->{'name'} =~ /veracrypt/i) ||
+ ($parent->{'fs'} eq 'bcache'))){
+ my (@full_components,$mapped,$type);
+ $mapped = $mapper{$row->{'name'}} if %mapper;
+ next if grep(/^$row->{'name'}$/, @found);
+ push(@found,$row->{'name'});
+ if ($parent->{'fs'} eq 'crypto_LUKS'){
+ $type = 'LUKS';
+ }
+ # note, testing name is random user string, and there is no other
+ # ID known, the parent FS is '', empty.
+ elsif ($row->{'type'} eq 'dm' && $row->{'name'} =~ /veracrypt/i){
+ $type = 'VeraCrypt';
+ }
+ elsif ($row->{'type'} eq 'crypt'){
+ $type = 'Crypto';
+ }
+ elsif ($parent->{'fs'} eq 'bcache'){
+ $type = 'bcache';
+ }
+ # probably only seen on older Redhat servers, LVM probably replaces
+ elsif ($row->{'type'} eq 'mpath' || $row->{'type'} eq 'multipath'){
+ $type = 'MultiPath';
+ }
+ elsif ($row->{'type'} eq 'crypt'){
+ $type = 'Crypt';
+ }
+ # my $name = ($use{'filter-uuid'}) ? "luks-$filter_string" : $row->{'name'};
+ component_data($row->{'maj-min'},\@full_components);
+ # print "$row->{'name'}\n", Data::Dumper::Dumper \@full_components;
+ push(@$general_data, {
+ 'components' => \@full_components,
+ 'dm' => $mapped,
+ 'maj-min' => $row->{'maj-min'},
+ 'name' => $row->{'name'},
+ 'size' => $row->{'size'},
+ 'type' => $type,
+ });
+ }
+ }
+ main::log_data('dump','luks @$general_data', $general_data);
+ print Data::Dumper::Dumper $general_data if $dbg[23];
+ eval $end if $b_log;
+ return $general_data;
+}
+
+# Note: called for disk totals, raid, and logical
+sub lvm_data {
+ eval $start if $b_log;
+ $loaded{'logical-data'} = 1;
+ my (@args,@data,%totals);
+ @args = qw(vg_name vg_fmt vg_size vg_free lv_name lv_layout lv_size
+ lv_kernel_major lv_kernel_minor segtype seg_count seg_start_pe seg_size_pe
+ stripes devices raid_mismatch_count raid_sync_action raid_write_behind
+ copy_percent);
+ my $num = 0;
+ PartitionData::set() if !$loaded{'partition-data'};
+ main::set_mapper() if !$loaded{'mapper'};
+ if ($fake{'logical'}){
+ # my $file = "$fake_data_dir/raid-logical/lvm/lvs-test-1.txt";
+ # @data = main::reader($file,'strip');
+ }
+ else {
+ # lv_full_name: ar0-home; lv_dm_path: /dev/mapper/ar0-home
+ # seg_size: unit location on volume where segement starts
+ # 2>/dev/null -unit k ---separator ^:
+ my $cmd = $alerts{'lvs'}->{'path'};
+ $cmd .= ' -aPv --unit k --separator "^:" --segments --noheadings -o ';
+ # $cmd .= ' -o +lv_size,pv_major,pv_minor 2>/dev/null';
+ $cmd .= join(',', @args) . ' 2>/dev/null';
+ @data = main::grabber($cmd,'','strip');
+ main::log_data('dump','lvm @data', \@data) if $b_log;
+ print "command: $cmd\n" if $dbg[22];
+ }
+ my $j = 0;
+ foreach (@data){
+ my @line = split(/\^:/, $_);
+ next if $_ =~ /^Partial mode/i; # sometimes 2>/dev/null doesn't catch this
+ for (my $i = 0; $i < scalar @args; $i++){
+ $line[$i] =~ s/k$// if $args[$i] =~ /_(free|size|used)$/;
+ $lvm[$j]->{$args[$i]} = $line[$i];
+ }
+ if (!$totals{'vgs'}->{$lvm[$j]->{'vg_name'}}){
+ $totals{'vgs'}->{$lvm[$j]->{'vg_name'}} = $lvm[$j]->{'vg_size'};
+ $raw_logical[2] += $lvm[$j]->{'vg_free'} if $lvm[$j]->{'vg_free'};
+ }
+ $j++;
+ }
+ # print Data::Dumper::Dumper \%totals, \@raw_logical;
+ main::log_data('dump','lvm @lvm', \@lvm) if $b_log;
+ print Data::Dumper::Dumper \@lvm if $dbg[22];
+ eval $end if $b_log;
+}
+
+sub process_lvm_data {
+ eval $start if $b_log;
+ my $processed = {};
+ foreach my $item (@lvm){
+ my (@components,@devices,$dm,$dm_tmp,$dm_mm,@full_components,$maj_min,%raid,@temp);
+ if (!$processed->{$item->{'vg_name'}}){
+ $processed->{$item->{'vg_name'}}->{'vg-size'} = $item->{'vg_size'};
+ $processed->{$item->{'vg_name'}}->{'vg-free'} = $item->{'vg_free'};
+ $processed->{$item->{'vg_name'}}->{'vg-format'} = $item->{'vg_fmt'};
+ }
+ if (!$processed->{$item->{'vg_name'}}->{'lvs'}{$item->{'lv_name'}}){
+ $processed->{$item->{'vg_name'}}->{'lvs'}{$item->{'lv_name'}}{'lv-size'} = $item->{'lv_size'};
+ $processed->{$item->{'vg_name'}}->{'lvs'}{$item->{'lv_name'}}{'lv-type'} = $item->{'segtype'};
+ $maj_min = $item->{'lv_kernel_major'} . ':' . $item->{'lv_kernel_minor'};
+ $processed->{$item->{'vg_name'}}->{'lvs'}{$item->{'lv_name'}}{'maj-min'} = $maj_min;
+ $dm_tmp = $item->{'vg_name'} . '-' . $item->{'lv_name'};
+ $dm_tmp =~ s/\[|\]$//g;
+ $dm = $mapper{$dm_tmp} if %mapper;
+ $processed->{$item->{'vg_name'}}->{'lvs'}{$item->{'lv_name'}}{'dm'} = $dm;
+ if ($item->{'segtype'} && $item->{'segtype'} ne 'linear' && $item->{'segtype'} =~ /^raid/){
+ $raid{'copied'} = $item->{'copy_percent'};
+ $raid{'mismatches'} = $item->{'raid_mismatch_count'};
+ $raid{'stripes'} = $item->{'stripes'};
+ $raid{'sync'} = $item->{'raid_sync_action'};
+ $raid{'type'} = $item->{'segtype'};
+ $processed->{$item->{'vg_name'}}->{'lvs'}{$item->{'lv_name'}}{'raid'} = \%raid;
}
+ component_data($maj_min,\@full_components);
+ # print "$item->{'lv_name'}\n", Data::Dumper::Dumper \@full_components;
+ $processed->{$item->{'vg_name'}}->{'lvs'}{$item->{'lv_name'}}{'components'} = \@full_components;
}
}
- main::log_data('data',"compositor: $compositor") if $b_log;
+ main::log_data('dump','lvm %$processed', $processed) if $b_log;
+ print Data::Dumper::Dumper $processed if $dbg[23];
eval $end if $b_log;
- return $compositor;
+ return $processed;
}
+
+sub component_data {
+ my ($maj_min,$full_components) = @_;
+ push(@$full_components, component_recursive_data($maj_min));
}
-## MachineData
+sub component_recursive_data {
+ eval $start if $b_log;
+ my ($maj_min) = @_;
+ my (@components,@devices);
+ @devices = main::globber("/sys/dev/block/$maj_min/slaves/*") if -e "/sys/dev/block/$maj_min/slaves";
+ @devices = map {$_ =~ s|^/.*/||; $_;} @devices if @devices;
+ # return @devices if !$b_admin;
+ foreach my $device (@devices){
+ my ($mapped,$mm2,$part);
+ $part = PartitionData::get($device) if @proc_partitions;
+ $mm2 = $part->[0] . ':' . $part->[1] if @$part;
+ if ($device =~ /^(bcache|dm-|md)[0-9]+$/){
+ $mapped = $dmmapper{$device};
+ $raw_logical[1] += $part->[2] if $mapped && $mapped =~ /_(cdata|cmeta)$/;
+ push(@components, [$device,$mm2,$part->[2],$mapped,[component_recursive_data($mm2)]]);
+ }
+ else {
+ push(@components,[$device,$mm2,$part->[2]]);
+ }
+ }
+ eval $end if $b_log;
+ return @components;
+}
+}
+
+## MachineItem
+# public methods: get(), is_vm()
{
-package MachineData;
+my $b_vm;
+package MachineItem;
sub get {
eval $start if $b_log;
- my (%soc_machine,@data,@rows,$key1,$val1,$which);
+ my (%soc_machine,$data,@rows,$key1,$val1,$which);
+ my $rows = [];
my $num = 0;
- if ($bsd_type && @sysctl_machine && !$b_dmidecode_force ){
- @data = machine_data_sysctl();
- if (!@data && !$key1){
+ if ($bsd_type && $sysctl{'machine'} && !$force{'dmidecode'}){
+ $data = machine_data_sysctl();
+ if (%$data){
+ machine_output($rows,$data);
+ }
+ elsif (!$key1){
$key1 = 'Message';
- $val1 = main::row_defaults('machine-data-force-dmidecode','');
+ $val1 = main::message('machine-data-force-dmidecode','');
}
}
- elsif ($bsd_type || $b_dmidecode_force){
- my $ref = $alerts{'dmidecode'};
- if ( !$b_fake_dmidecode && $$ref{'action'} ne 'use'){
- $key1 = $$ref{'action'};
- $val1 = $$ref{$key1};
+ elsif ($bsd_type || $force{'dmidecode'}){
+ if (!$fake{'dmidecode'} && $alerts{'dmidecode'}->{'action'} ne 'use'){
+ $key1 = $alerts{'dmidecode'}->{'action'};
+ $val1 = $alerts{'dmidecode'}->{'message'};
$key1 = ucfirst($key1);
}
else {
- @data = machine_data_dmi();
- if (!@data && !$key1){
+ $data = machine_data_dmi();
+ if (%$data){
+ machine_output($rows,$data);
+ }
+ elsif (!$key1){
$key1 = 'Message';
- $val1 = main::row_defaults('machine-data','');
+ $val1 = main::message('machine-data');
}
}
}
- elsif (-d '/sys/class/dmi/id/') {
- @data = machine_data_sys();
- if (!@data){
+ elsif (!$fake{'elbrus'} && -d '/sys/class/dmi/id/'){
+ $data = machine_data_sys();
+ if (%$data){
+ machine_output($rows,$data);
+ }
+ else {
$key1 = 'Message';
- $val1 = main::row_defaults('machine-data-dmidecode','');
+ if ($alerts{'dmidecode'}->{'action'} eq 'missing'){
+ $val1 = main::message('machine-data-dmidecode');
+ }
+ else {
+ $val1 = main::message('machine-data');
+ }
}
}
- elsif (!$bsd_type) {
+ elsif ($fake{'elbrus'} || $cpu_arch eq 'elbrus'){
+ if ($fake{'elbrus'} || (my $program = main::check_program('fruid_print'))){
+ $data = machine_data_fruid($program);
+ if (%$data){
+ machine_output($rows,$data);
+ }
+ elsif (!$key1){
+ $key1 = 'Message';
+ $val1 = main::message('machine-data-fruid');
+ }
+ }
+ }
+ elsif (!$bsd_type){
# this uses /proc/cpuinfo so only GNU/Linux
- if ($b_arm || $b_mips || $b_ppc){
- %soc_machine = machine_data_soc();
- @data = create_output_soc(%soc_machine) if %soc_machine;
+ if (%risc){
+ $data = machine_data_soc();
+ machine_soc_output($rows,$data) if %$data;
}
- if (!@data){
+ if (!$data || !%$data){
$key1 = 'Message';
- $val1 = main::row_defaults('machine-data-force-dmidecode','');
+ $val1 = main::message('machine-data-force-dmidecode','');
}
}
# if error case, null data, whatever
- if ($key1) {
- @data = ({main::key($num++,0,1,$key1) => $val1,});
+ if ($key1){
+ push(@$rows,{main::key($num++,0,1,$key1) => $val1,});
}
eval $end if $b_log;
- return @data;
+ return $rows;
+}
+
+sub is_vm {
+ return $b_vm;
}
+
## keys for machine data are:
-# 0-sys_vendor 1-product_name 2-product_version 3-product_serial 4-product_uuid
-# 5-board_vendor 6-board_name 7-board_version 8-board_serial
-# 9-bios_vendor 10-bios_version 11-bios_date
+# bios_vendor; bios_version; bios_date;
+# board_name; board_serial; board_sku; board_vendor; board_version;
+# product_name; product_version; product_serial; product_sku; product_uuid;
+# sys_vendor;
## with extra data:
-# 12-chassis_vendor 13-chassis_type 14-chassis_version 15-chassis_serial
-## unused: 16-bios_rev 17-bios_romsize 18 - firmware type
-sub create_output {
+# chassis_serial; chassis_type; chassis_vendor; chassis_version;
+## unused: bios_rev; bios_romsize; firmware type
+sub machine_output {
eval $start if $b_log;
- my ($ref) = @_;
- my (%data,@row,@rows);
- %data = %$ref;
+ my ($rows,$data) = @_;
my $firmware = 'BIOS';
my $num = 0;
my $j = 0;
my ($b_chassis,$b_skip_chassis,$b_skip_system);
my ($bios_date,$bios_rev,$bios_romsize,$bios_vendor,$bios_version,$chassis_serial,
- $chassis_type,$chassis_vendor,$chassis_version, $mobo_model,$mobo_serial,$mobo_vendor,
+ $chassis_type,$chassis_vendor,$chassis_version,$mobo_model,$mobo_serial,$mobo_vendor,
$mobo_version,$product_name,$product_serial,$product_version,$system_vendor);
-# foreach my $key (keys %data){
-# print "$key: $data{$key}\n";
-# }
- if (!$data{'sys_vendor'} || ($data{'board_vendor'} &&
- $data{'sys_vendor'} eq $data{'board_vendor'} && !$data{'product_name'} &&
- !$data{'product_version'} && !$data{'product_serial'})){
+ # foreach my $key (keys %data){
+ # print "$key: $data->{$key}\n";
+ # }
+ if (!$data->{'sys_vendor'} ||
+ ($data->{'board_vendor'} && $data->{'sys_vendor'} eq $data->{'board_vendor'} &&
+ !$data->{'product_name'} && !$data->{'product_version'} &&
+ !$data->{'product_serial'})){
$b_skip_system = 1;
}
+ # The goal here is to not show laptop/mobile devices
# found a case of battery existing but having nothing in it on desktop mobo
# not all laptops show the first. /proc/acpi/battery is deprecated.
- elsif ( !glob('/proc/acpi/battery/*') && !glob('/sys/class/power_supply/*') ){
+ elsif (!glob('/proc/acpi/battery/*') && !glob('/sys/class/power_supply/*')){
# ibm / ibm can be true; dell / quantum is false, so in other words, only do this
# in case where the vendor is the same and the version is the same and not null,
# otherwise the version information is going to be different in all cases I think
- if ( ($data{'sys_vendor'} && $data{'sys_vendor'} eq $data{'board_vendor'} ) &&
- ( ($data{'product_version'} && $data{'product_version'} eq $data{'board_version'} ) ||
- (!$data{'product_version'} && $data{'product_name'} && $data{'board_name'} &&
- $data{'product_name'} eq $data{'board_name'} ) ) ){
+ if (($data->{'sys_vendor'} && $data->{'board_vendor'} &&
+ $data->{'sys_vendor'} eq $data->{'board_vendor'}) &&
+ (($data->{'product_version'} && $data->{'board_version'} &&
+ $data->{'product_version'} eq $data->{'board_version'}) ||
+ (!$data->{'product_version'} && $data->{'product_name'} && $data->{'board_name'} &&
+ $data->{'product_name'} eq $data->{'board_name'}))){
$b_skip_system = 1;
}
}
- $data{'device'} ||= 'N/A';
- $j = scalar @rows;
- @row = ({
- main::key($num++,0,1,'Type') => ucfirst($data{'device'}),
+ $data->{'device'} ||= 'N/A';
+ $j = scalar @$rows;
+ push(@$rows, {
+ main::key($num++,0,1,'Type') => ucfirst($data->{'device'}),
},);
- @rows = (@rows,@row);
if (!$b_skip_system){
# this has already been tested for above so we know it's not null
- $system_vendor = main::cleaner($data{'sys_vendor'});
- $product_name = ($data{'product_name'}) ? $data{'product_name'}:'N/A';
- $product_version = ($data{'product_version'}) ? $data{'product_version'}:'N/A';
- $product_serial = main::apply_filter($data{'product_serial'});
- $rows[$j]{main::key($num++,1,1,'System')} = $system_vendor;
- $rows[$j]{main::key($num++,0,2,'product')} = $product_name;
- $rows[$j]{main::key($num++,0,2,'v')} = $product_version;
- $rows[$j]{main::key($num++,0,2,'serial')} = $product_serial;
+ $system_vendor = main::clean($data->{'sys_vendor'});
+ $product_name = ($data->{'product_name'}) ? $data->{'product_name'}:'N/A';
+ $product_version = ($data->{'product_version'}) ? $data->{'product_version'}:'N/A';
+ $product_serial = main::filter($data->{'product_serial'});
+ $rows->[$j]{main::key($num++,1,1,'System')} = $system_vendor;
+ $rows->[$j]{main::key($num++,1,2,'product')} = $product_name;
+ $rows->[$j]{main::key($num++,0,3,'v')} = $product_version;
+ $rows->[$j]{main::key($num++,0,3,'serial')} = $product_serial;
# no point in showing chassis if system isn't there, it's very unlikely that
# would be correct
if ($extra > 1){
- if ($data{'board_version'} && $data{'chassis_version'} eq $data{'board_version'}){
+ if ($data->{'board_version'} && $data->{'chassis_version'} &&
+ $data->{'chassis_version'} eq $data->{'board_version'}){
$b_skip_chassis = 1;
}
- if (!$b_skip_chassis && $data{'chassis_vendor'} ){
- if ($data{'chassis_vendor'} ne $data{'sys_vendor'} ){
- $chassis_vendor = $data{'chassis_vendor'};
+ if (!$b_skip_chassis && $data->{'chassis_vendor'}){
+ if ($data->{'chassis_vendor'} ne $data->{'sys_vendor'}){
+ $chassis_vendor = $data->{'chassis_vendor'};
}
# dmidecode can have these be the same
- if ($data{'chassis_type'} && $data{'device'} ne $data{'chassis_type'} ){
- $chassis_type = $data{'chassis_type'};
+ if ($data->{'chassis_type'} && $data->{'device'} ne $data->{'chassis_type'}){
+ $chassis_type = $data->{'chassis_type'};
}
- if ($data{'chassis_version'}){
- $chassis_version = $data{'chassis_version'};
+ if ($data->{'chassis_version'}){
+ $chassis_version = $data->{'chassis_version'};
$chassis_version =~ s/^v([0-9])/$1/i;
}
- $chassis_serial = main::apply_filter($data{'chassis_serial'});
+ $chassis_serial = main::filter($data->{'chassis_serial'});
$chassis_vendor ||= '';
$chassis_type ||= '';
- $rows[$j]{main::key($num++,1,1,'Chassis')} = $chassis_vendor;
+ $rows->[$j]{main::key($num++,1,1,'Chassis')} = $chassis_vendor;
if ($chassis_type){
- $rows[$j]{main::key($num++,0,2,'type')} = $chassis_type;
+ $rows->[$j]{main::key($num++,0,2,'type')} = $chassis_type;
}
if ($chassis_version){
- $rows[$j]{main::key($num++,0,2,'v')} = $chassis_version;
+ $rows->[$j]{main::key($num++,0,2,'v')} = $chassis_version;
}
- $rows[$j]{main::key($num++,0,2,'serial')} = $chassis_serial;
+ $rows->[$j]{main::key($num++,0,2,'serial')} = $chassis_serial;
}
}
$j++; # start new row
}
- if ($data{'firmware'}){
- $firmware = $data{'firmware'};
+ if ($data->{'firmware'}){
+ $firmware = $data->{'firmware'};
}
- $mobo_vendor = ($data{'board_vendor'}) ? main::cleaner($data{'board_vendor'}) : 'N/A';
- $mobo_model = ($data{'board_name'}) ? $data{'board_name'}: 'N/A';
- $mobo_version = ($data{'board_version'})? $data{'board_version'} : '';
- $mobo_serial = main::apply_filter($data{'board_serial'});
- $bios_vendor = ($data{'bios_vendor'}) ? main::cleaner($data{'bios_vendor'}) : 'N/A';
- if ($data{'bios_version'}){
- $bios_version = $data{'bios_version'};
+ $mobo_vendor = ($data->{'board_vendor'}) ? main::clean($data->{'board_vendor'}) : 'N/A';
+ $mobo_model = ($data->{'board_name'}) ? $data->{'board_name'}: 'N/A';
+ $mobo_version = ($data->{'board_version'})? $data->{'board_version'} : '';
+ $mobo_serial = main::filter($data->{'board_serial'});
+ $bios_vendor = ($data->{'bios_vendor'}) ? main::clean($data->{'bios_vendor'}) : 'N/A';
+ if ($data->{'bios_version'}){
+ $bios_version = $data->{'bios_version'};
$bios_version =~ s/^v([0-9])/$1/i;
- if ($data{'bios_rev'}){
- $bios_rev = $data{'bios_rev'};
+ if ($data->{'bios_rev'}){
+ $bios_rev = $data->{'bios_rev'};
}
}
$bios_version ||= 'N/A';
- if ($data{'bios_date'}){
- $bios_date = $data{'bios_date'};
+ if ($data->{'bios_date'}){
+ $bios_date = $data->{'bios_date'};
}
$bios_date ||= 'N/A';
- if ($extra > 1 && $data{'bios_romsize'}){
- $bios_romsize = $data{'bios_romsize'};
+ if ($extra > 1 && $data->{'bios_romsize'}){
+ $bios_romsize = $data->{'bios_romsize'};
}
- $rows[$j]{main::key($num++,1,1,'Mobo')} = $mobo_vendor;
- $rows[$j]{main::key($num++,0,2,'model')} = $mobo_model;
+ $rows->[$j]{main::key($num++,1,1,'Mobo')} = $mobo_vendor;
+ $rows->[$j]{main::key($num++,1,2,'model')} = $mobo_model;
if ($mobo_version){
- $rows[$j]{main::key($num++,0,2,'v')} = $mobo_version;
+ $rows->[$j]{main::key($num++,0,3,'v')} = $mobo_version;
+ }
+ $rows->[$j]{main::key($num++,0,3,'serial')} = $mobo_serial;
+ if ($extra > 1 && $data->{'product_sku'}){
+ $rows->[$j]{main::key($num++,0,3,'part-nu')} = $data->{'product_sku'};
}
- $rows[$j]{main::key($num++,0,2,'serial')} = $mobo_serial;
- if ($extra > 2 && $data{'board_uuid'}){
- $rows[$j]{main::key($num++,0,2,'uuid')} = $data{'board_uuid'};
+ if (($show{'uuid'} || $extra > 2) &&
+ ($data->{'product_uuid'} || $data->{'board_uuid'})){
+ my $uuid = ($data->{'product_uuid'}) ? $data->{'product_uuid'} : $data->{'board_uuid'};
+ $uuid = main::filter($uuid,'filter-uuid');
+ $rows->[$j]{main::key($num++,0,3,'uuid')} = $uuid;
}
- $rows[$j]{main::key($num++,1,1,$firmware)} = $bios_vendor;
- $rows[$j]{main::key($num++,0,2,'v')} = $bios_version;
+ if ($extra > 1 && $data->{'board_mfg_date'}){
+ $rows->[$j]{main::key($num++,0,3,'mfg-date')} = $data->{'board_mfg_date'};
+ }
+ $rows->[$j]{main::key($num++,1,1,$firmware)} = $bios_vendor;
+ $rows->[$j]{main::key($num++,0,2,'v')} = $bios_version;
if ($bios_rev){
- $rows[$j]{main::key($num++,0,2,'rev')} = $bios_rev;
+ $rows->[$j]{main::key($num++,0,2,'rev')} = $bios_rev;
}
- $rows[$j]{main::key($num++,0,2,'date')} = $bios_date;
+ $rows->[$j]{main::key($num++,0,2,'date')} = $bios_date;
if ($bios_romsize){
- $rows[$j]{main::key($num++,0,2,'rom size')} = $bios_romsize;
+ $rows->[$j]{main::key($num++,0,2,'rom size')} = $bios_romsize;
}
eval $end if $b_log;
- return @rows;
}
-sub create_output_soc {
- my (%soc_machine) = @_;
- my ($key,%data,@row,@rows);
+
+sub machine_soc_output {
+ my ($rows,$soc_machine) = @_;
+ my ($key);
my ($cont_sys,$ind_sys,$j,$num) = (1,1,0,0);
- #print Data::Dumper::Dumper \%soc_machine;
+ # print Data::Dumper::Dumper \%soc_machine;
# this is sketchy, /proc/device-tree/model may be similar to Hardware value from /proc/cpuinfo
# raspi: Hardware : BCM2835 model: Raspberry Pi Model B Rev 2
- if ($soc_machine{'device'} || $soc_machine{'model'}){
- if ($b_arm){$key = 'ARM Device'}
- elsif ($b_mips){$key = 'MIPS Device'}
- elsif ($b_ppc){$key = 'PowerPC Device'}
- $rows[$j]{main::key($num++,0,1,'Type')} = $key;
+ if ($soc_machine->{'device'} || $soc_machine->{'model'}){
+ $rows->[$j]{main::key($num++,0,1,'Type')} = uc($risc{'id'});
my $system = 'System';
- if (defined $soc_machine{'model'}){
- $rows[$j]{main::key($num++,1,1,'System')} = $soc_machine{'model'};
+ if (defined $soc_machine->{'model'}){
+ $rows->[$j]{main::key($num++,1,1,'System')} = $soc_machine->{'model'};
$system = 'details';
($cont_sys,$ind_sys) = (0,2);
}
- $soc_machine{'device'} ||= 'N/A';
- $rows[$j]{main::key($num++,$cont_sys,$ind_sys,$system)} = $soc_machine{'device'};
+ $soc_machine->{'device'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,$cont_sys,$ind_sys,$system)} = $soc_machine->{'device'};
+ }
+ if ($soc_machine->{'mobo'}){
+ $rows->[$j]{main::key($num++,1,1,'mobo')} = $soc_machine->{'mobo'};
}
# we're going to print N/A for 0000 values sine the item was there.
- if ($soc_machine{'firmware'}){
+ if ($soc_machine->{'firmware'}){
# most samples I've seen are like: 0000
- $soc_machine{'firmware'} =~ s/^[0]+$//;
- $soc_machine{'firmware'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'rev')} = $soc_machine{'firmware'};
+ $soc_machine->{'firmware'} =~ s/^[0]+$//;
+ $soc_machine->{'firmware'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'rev')} = $soc_machine->{'firmware'};
}
# sometimes has value like: 0000
- if (defined $soc_machine{'serial'}){
+ if (defined $soc_machine->{'serial'}){
# most samples I've seen are like: 0000
- $soc_machine{'serial'} =~ s/^[0]+$//;
- $rows[$j]{main::key($num++,0,2,'serial')} = main::apply_filter($soc_machine{'serial'});
+ $soc_machine->{'serial'} =~ s/^[0]+$//;
+ $rows->[$j]{main::key($num++,0,2,'serial')} = main::filter($soc_machine->{'serial'});
+ }
+ eval $end if $b_log;
+}
+
+sub machine_data_fruid {
+ eval $start if $b_log;
+ my ($program) = @_;
+ my ($b_start,$file,@fruid);
+ my $data = {};
+ if (!$fake{'elbrus'}){
+ @fruid = main::grabber("$program 2>/dev/null",'','strip');
+ }
+ else {
+ # $file = "$fake_data_dir/machine/elbrus/fruid/fruid-e801-1_full.txt";
+ $file = "$fake_data_dir/machine/elbrus/fruid/fruid-e804-1_full.txt";
+ @fruid = main::reader($file,'strip');
+ }
+ foreach (@fruid){
+ $b_start = 1 if /^Board info/;
+ next if !$b_start;
+ my @split = split(/\s*:\s+/,$_,2);
+ if ($split[0] eq 'Mfg. Date/Time'){
+ $data->{'board_mfg_date'} = $split[1];
+ $data->{'board_mfg_date'} =~ s/^(\d+:\d+)\s//;
+ }
+ elsif ($split[0] eq 'Board manufacturer'){
+ $data->{'board_vendor'} = $split[1];
+ }
+ elsif ($split[0] eq 'Board part number'){
+ $data->{'product_sku'} = $split[1];
+ }
+ elsif ($split[0] eq 'Board product name'){
+ $data->{'board_name'} = $split[1];
+ if ($split[1] =~ /(SWTX|^EL)/){
+ $data->{'device'} = 'server';
+ }
+ elsif ($split[1] =~ /(PC$)/){
+ $data->{'device'} = 'desktop';
+ }
+ }
+ elsif ($split[0] eq 'Board serial number'){
+ $data->{'board_serial'} = $split[1];
+ }
+ elsif ($split[0] eq 'Board product version'){
+ $data->{'board_version'} = $split[1];
+ }
+ }
+ if (%$data){
+ $data->{'bios_vendor'} = 'MCST';
+ $data->{'firmware'} = 'Boot';
+ }
+ if ($dbg[28]){
+ print 'fruid: $data: ', Data::Dumper::Dumper $data;
+ print 'fruid: @fruid: ', Data::Dumper::Dumper \@fruid;
+ }
+ if ($b_log){
+ main::log_data('dump','@fruid',\@fruid);
+ main::log_data('dump','%data',$data);
+ }
+ if ($fake{'elbrus'} || -e '/proc/bootdata'){
+ machine_data_bootdata($data);
+ }
+ eval $end if $b_log;
+ return $data;
+}
+
+# Note: fruid should get device, extra data here uuid, mac
+# Field names map to dmi/sys names.
+# args: 0: $data hash ref;
+sub machine_data_bootdata {
+ eval $start if $b_log;
+ my ($b_pairs,@bootdata,$file);
+ if (!$fake{'elbrus'}){
+ @bootdata = main::reader('/proc/bootdata','strip');
+ }
+ else {
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e2c3/desktop-e2c3.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e4c/server-e4c-x4-1.txt";
+ $file = "$fake_data_dir/machine/elbrus/bootdata/e4c/server-e4c-x4-2.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e8c/desktop-e8c.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e8c/server-e8c-x4-1.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e8c/server-e8c-x4-2.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e8c2/desktop-e8c2.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e8c2/server-e8c2-4x.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e8c2/server-e8c2.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e16c/server-e16c-1.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e16c/server-e16c-2.txt";
+ # $file = "$fake_data_dir/machine/elbrus/bootdata/e16c/server-e16c-3.txt";
+ @bootdata = main::reader($file,'strip');
+ }
+ foreach (@bootdata){
+ s/\s\s+/ /g; # spaces not consistent
+ my @line = split(/=/,$_,2);
+ # These only positive IDs, unreliable data source
+ if ($line[1]){
+ $line[1] =~ s/'//g;
+ $line[0] = lc($line[0]);
+ if ($line[0] eq 'mb_type'){
+ # unknown: unknown (0x0);
+ if ($line[1] =~ /([\/-]SWT|^EL)/){
+ $_[0]->{'device'} = 'server';
+ }
+ elsif ($line[1] =~ /([\/-]PC)/){
+ $_[0]->{'device'} = 'desktop';
+ }
+ }
+ elsif ($line[0] eq 'uuid'){
+ $_[0]->{'product_uuid'} = $line[1];
+ }
+ # fruid has mac address too, but in 0x.. form, this one is easier to read
+ elsif ($line[0] eq 'mac'){
+ $_[0]->{'board_mac'} = $line[1];
+ }
+ }
+ else {
+ if (/release-([\d\.A-Z-]+).*?\srevision\s([\d\.A-Z-]+)/i){
+ $_[0]->{'bios_version'} = $1;
+ $_[0]->{'bios_rev'} = $2;
+ }
+ elsif (/built\son\s(\S+\s\d+\s\d+)\b/){
+ $_[0]->{'bios_date'} = $1;
+ }
+ }
+ }
+ if ($dbg[28]){
+ print 'bootdata: $data: ', Data::Dumper::Dumper $_[0];
+ print 'bootdata: @bootdata: ', Data::Dumper::Dumper \@bootdata;
+ }
+ if ($b_log){
+ main::log_data('dump','@bootdata',\@bootdata);
+ main::log_data('dump','%data', $_[0]);
+ eval $end;
}
eval $end if $b_log;
- return @rows;
}
sub machine_data_sys {
eval $start if $b_log;
- my (%data,$path,$vm);
+ my ($path,$vm);
+ my $data = {};
my $sys_dir = '/sys/class/dmi/id/';
my $sys_dir_alt = '/sys/devices/virtual/dmi/id/';
my @sys_files = qw(bios_vendor bios_version bios_date
board_name board_serial board_vendor board_version chassis_type
- product_name product_serial product_uuid product_version sys_vendor
+ product_name product_serial product_sku product_uuid product_version
+ sys_vendor
);
if ($extra > 1){
- splice @sys_files, 0, 0, qw( chassis_serial chassis_vendor chassis_version);
+ splice(@sys_files, 0, 0, qw(chassis_serial chassis_vendor chassis_version));
}
- $data{'firmware'} = 'BIOS';
+ $data->{'firmware'} = 'BIOS';
# print Data::Dumper::Dumper \@sys_files;
- if (!-d $sys_dir ){
- if ( -d $sys_dir_alt){
+ if (!-d $sys_dir){
+ if (-d $sys_dir_alt){
$sys_dir = $sys_dir_alt;
}
else {
return 0;
}
}
- if ( -d '/sys/firmware/efi'){
- $data{'firmware'} = 'UEFI';
+ if (-d '/sys/firmware/efi'){
+ $data->{'firmware'} = 'UEFI';
}
- elsif ( glob('/sys/firmware/acpi/tables/UEFI*') ){
- $data{'firmware'} = 'UEFI [Legacy]';
+ elsif (glob('/sys/firmware/acpi/tables/UEFI*')){
+ $data->{'firmware'} = 'UEFI-[Legacy]';
}
foreach (@sys_files){
$path = "$sys_dir$_";
if (-r $path){
- $data{$_} = (main::reader($path))[0];
- $data{$_} = ($data{$_}) ? main::dmi_cleaner($data{$_}) : '';
+ $data->{$_} = main::reader($path,'',0);
+ $data->{$_} = ($data->{$_}) ? main::clean_dmi($data->{$_}) : '';
}
- elsif (!$b_root && -e $path && !-r $path ){
- $data{$_} = main::row_defaults('root-required');
+ elsif (!$b_root && -e $path && !-r $path){
+ $data->{$_} = main::message('root-required');
}
else {
- $data{$_} = '';
+ $data->{$_} = '';
}
}
- if ($data{'chassis_type'}){
- if ( $data{'chassis_type'} == 1){
- $data{'device'} = get_device_vm($data{'sys_vendor'},$data{'product_name'});
- $data{'device'} ||= 'other-vm?';
+ if ($data->{'chassis_type'}){
+ if ($data->{'chassis_type'} == 1){
+ $data->{'device'} = check_vm($data->{'sys_vendor'},$data->{'product_name'});
+ $data->{'device'} ||= 'other-vm?';
}
else {
- $data{'device'} = get_device_sys($data{'chassis_type'});
+ $data->{'device'} = get_device_sys($data->{'chassis_type'});
}
}
-# print "sys:\n";
-# foreach (keys %data){
-# print "$_: $data{$_}\n";
-# }
- main::log_data('dump','%data',\%data) if $b_log;
- my @rows = create_output(\%data);
+ # print "sys:\n";
+ # foreach (keys %data){
+ # print "$_: $data->{$_}\n";
+ # }
+ print Data::Dumper::Dumper $data if $dbg[28];
+ main::log_data('dump','%data',$data) if $b_log;
eval $end if $b_log;
- return @rows;
+ return $data;
}
-# this will create an alternate machine data source
+
+# This will create an alternate machine data source
# which will be used for alt ARM machine data in cases
# where no dmi data present, or by cpu data to guess at
# certain actions for arm only.
sub machine_data_soc {
eval $end if $b_log;
- my (%soc_machine,@temp);
- if (my $file = main::system_files('cpuinfo')){
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/arm-shevaplug-1.2ghz.txt";
- my @data = main::reader($file);
- foreach (@data){
- if (/^(Hardware|machine)\s*:/i){
- @temp = split /\s*:\s*/, $_;
- $temp[1] = main::arm_cleaner($temp[1]);
- $temp[1] = main::dmi_cleaner($temp[1]);
- $soc_machine{'device'} = main::cleaner($temp[1]);
- }
- elsif (/^(system type|model)\s*:/i){
- @temp = split /\s*:\s*/, $_;
- $temp[1] = main::dmi_cleaner($temp[1]);
- $soc_machine{'model'} = main::cleaner($temp[1]);
- }
- elsif (/^Revision/i){
- @temp = split /\s*:\s*/, $_;
- $soc_machine{'firmware'} = $temp[1];
- }
- elsif (/^Serial/i){
- @temp = split /\s*:\s*/, $_;
- $soc_machine{'serial'} = $temp[1];
+ my $data = {};
+ if (my $file = $system_files{'proc-cpuinfo'}){
+ CpuItem::cpuinfo_data_grabber($file) if !$loaded{'cpuinfo'};
+ # grabber sets keys to lower case to avoid error here
+ if ($cpuinfo_machine{'hardware'} || $cpuinfo_machine{'machine'}){
+ $data->{'device'} = main::get_defined($cpuinfo_machine{'hardware'},
+ $cpuinfo_machine{'machine'});
+ $data->{'device'} = main::clean_arm($data->{'device'});
+ $data->{'device'} = main::clean_dmi($data->{'device'});
+ $data->{'device'} = main::clean($data->{'device'});
+ }
+ if (defined $cpuinfo_machine{'system type'} || $cpuinfo_machine{'model'}){
+ $data->{'model'} = main::get_defined($cpuinfo_machine{'system type'},
+ $cpuinfo_machine{'model'});
+ $data->{'model'} = main::clean_dmi($data->{'model'});
+ $data->{'model'} = main::clean($data->{'model'});
+ }
+ # seen with PowerMac PPC
+ if (defined $cpuinfo_machine{'motherboard'}){
+ $data->{'mobo'} = $cpuinfo_machine{'motherboard'};
+ }
+ if (defined $cpuinfo_machine{'revision'}){
+ $data->{'firmware'} = $cpuinfo_machine{'revision'};
+ }
+ if (defined $cpuinfo_machine{'serial'}){
+ $data->{'serial'} = $cpuinfo_machine{'serial'};
+ }
+ undef %cpuinfo_machine; # we're done with it, don't need it anymore
+ }
+ if (!$data->{'model'} && $b_android){
+ main::set_build_prop() if !$loaded{'build-prop'};
+ if ($build_prop{'product-manufacturer'} && $build_prop{'product-model'}){
+ my $brand = '';
+ if ($build_prop{'product-brand'} &&
+ $build_prop{'product-brand'} ne $build_prop{'product-manufacturer'}){
+ $brand = $build_prop{'product-brand'} . ' ';
}
+ $data->{'model'} = $brand . $build_prop{'product-manufacturer'} . ' ' . $build_prop{'product-model'};
+ }
+ elsif ($build_prop{'product-device'}){
+ $data->{'model'} = $build_prop{'product-device'};
+ }
+ elsif ($build_prop{'product-name'}){
+ $data->{'model'} = $build_prop{'product-name'};
}
}
- if (!$soc_machine{'model'} && -f '/proc/device-tree/model'){
- my $model = (main::reader('/proc/device-tree/model'))[0];
+ if (!$data->{'model'} && -r '/proc/device-tree/model'){
+ my $model = main::reader('/proc/device-tree/model','',0);
main::log_data('data',"device-tree-model: $model") if $b_log;
- if ( $model ){
- $model = main::dmi_cleaner($model);
- $model = (split /\x01|\x02|\x03|\x00/, $model)[0] if $model;
- my $device_temp = main::regex_cleaner($soc_machine{'device'});
- if ( !$soc_machine{'device'} || ($model && $model !~ /\Q$device_temp\E/i) ){
- $model = main::arm_cleaner($model);
- $soc_machine{'model'} = $model;
+ if ($model){
+ $model = main::clean_dmi($model);
+ $model = (split(/\x01|\x02|\x03|\x00/, $model))[0] if $model;
+ my $device_temp = main::clean_regex($data->{'device'});
+ if (!$data->{'device'} || ($model && $model !~ /\Q$device_temp\E/i)){
+ $model = main::clean_arm($model);
+ $data->{'model'} = $model;
}
}
}
- if (!$soc_machine{'serial'} && -f '/proc/device-tree/serial-number'){
- my $serial = (main::reader('/proc/device-tree/serial-number'))[0];
- $serial = (split /\x01|\x02|\x03|\x00/, $serial)[0] if $serial;
+ if (!$data->{'serial'} && -f '/proc/device-tree/serial-number'){
+ my $serial = main::reader('/proc/device-tree/serial-number','',0);
+ $serial = (split(/\x01|\x02|\x03|\x00/, $serial))[0] if $serial;
main::log_data('data',"device-tree-serial: $serial") if $b_log;
- $soc_machine{'serial'} = $serial if $serial;
+ $data->{'serial'} = $serial if $serial;
}
- #print Data::Dumper::Dumper \%soc_machine;
+ print Data::Dumper::Dumper $data if $dbg[28];
+ main::log_data('dump','%data',$data) if $b_log;
eval $end if $b_log;
- return %soc_machine;
+ return $data;
}
# bios_date: 09/07/2010
@@ -11518,166 +19897,226 @@ sub machine_data_soc {
# board_vendor: ASRock
# board_version:
# chassis_serial:
+# chassis_sku:
# chassis_type: 3
# chassis_vendor:
# chassis_version:
# firmware:
# product_name:
# product_serial:
+# product_sku:
# product_uuid:
# product_version:
-# sys_uuid: dmi/sysctl only
+# uuid: dmi/sysctl only, map to product_uuid
# sys_vendor:
sub machine_data_dmi {
eval $start if $b_log;
- my (%data,$vm);
- return if ! @dmi;
- $data{'firmware'} = 'BIOS';
+ return if !@dmi;
+ my ($vm);
+ my $data = {};
+ $data->{'firmware'} = 'BIOS';
# dmi types:
# 0 bios; 1 system info; 2 board|base board info; 3 chassis info;
# 4 processor info, use to check for hypervisor
- foreach (@dmi){
- my @ref = @$_;
+ foreach my $row (@dmi){
# bios/firmware
- if ($ref[0] == 0){
+ if ($row->[0] == 0){
# skip first three row, we don't need that data
- splice @ref, 0, 3 if @ref;
- foreach my $item (@ref){
+ foreach my $item (@$row[3 .. $#$row]){
if ($item !~ /^~/){ # skip the indented rows
- my @value = split /:\s+/, $item;
- if ($value[0] eq 'Release Date') {$data{'bios_date'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Vendor') {$data{'bios_vendor'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Version') {$data{'bios_version'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'ROM Size') {$data{'bios_romsize'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'BIOS Revision') {$data{'bios_rev'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] =~ /^UEFI is supported/) {$data{'firmware'} = 'UEFI';}
+ my @value = split(/:\s+/, $item);
+ if ($value[0] eq 'Release Date'){
+ $data->{'bios_date'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Vendor'){
+ $data->{'bios_vendor'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Version'){
+ $data->{'bios_version'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'ROM Size'){
+ $data->{'bios_romsize'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'BIOS Revision'){
+ $data->{'bios_rev'} = main::clean_dmi($value[1]) }
+ }
+ else {
+ if ($item eq '~UEFI is supported'){
+ $data->{'firmware'} = 'UEFI';}
}
}
next;
}
# system information
- elsif ($ref[0] == 1){
+ elsif ($row->[0] == 1){
# skip first three row, we don't need that data
- splice @ref, 0, 3 if @ref;
- foreach my $item (@ref){
+ foreach my $item (@$row[3 .. $#$row]){
if ($item !~ /^~/){ # skip the indented rows
- my @value = split /:\s+/, $item;
- if ($value[0] eq 'Product Name') {$data{'product_name'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Version') {$data{'product_version'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Serial Number') {$data{'product_serial'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Manufacturer') {$data{'sys_vendor'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'UUID') {$data{'sys_uuid'} = main::dmi_cleaner($value[1]) }
+ my @value = split(/:\s+/, $item);
+ if ($value[0] eq 'Product Name'){
+ $data->{'product_name'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Version'){
+ $data->{'product_version'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Serial Number'){
+ $data->{'product_serial'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Manufacturer'){
+ $data->{'sys_vendor'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'SKU Number'){
+ $data->{'product_sku'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'UUID'){
+ $data->{'product_uuid'} = main::clean_dmi($value[1]) }
}
}
next;
}
# baseboard information
- elsif ($ref[0] == 2){
+ elsif ($row->[0] == 2){
# skip first three row, we don't need that data
- splice @ref, 0, 3 if @ref;
- foreach my $item (@ref){
+ foreach my $item (@$row[3 .. $#$row]){
if ($item !~ /^~/){ # skip the indented rows
- my @value = split /:\s+/, $item;
- if ($value[0] eq 'Product Name') {$data{'board_name'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Serial Number') {$data{'board_serial'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Manufacturer') {$data{'board_vendor'} = main::dmi_cleaner($value[1]) }
+ my @value = split(/:\s+/, $item);
+ if ($value[0] eq 'Product Name'){
+ $data->{'board_name'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Serial Number'){
+ $data->{'board_serial'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Manufacturer'){
+ $data->{'board_vendor'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Version'){
+ $data->{'board_version'} = main::clean_dmi($value[1]) }
}
}
next;
}
# chassis information
- elsif ($ref[0] == 3){
+ elsif ($row->[0] == 3){
# skip first three row, we don't need that data
- splice @ref, 0, 3 if @ref;
- foreach my $item (@ref){
+ foreach my $item (@$row[3 .. $#$row]){
if ($item !~ /^~/){ # skip the indented rows
- my @value = split /:\s+/, $item;
- if ($value[0] eq 'Serial Number') {$data{'chassis_serial'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Type') {$data{'chassis_type'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Manufacturer') {$data{'chassis_vendor'} = main::dmi_cleaner($value[1]) }
- elsif ($value[0] eq 'Version') {$data{'chassis_version'} = main::dmi_cleaner($value[1]) }
- }
- }
- if ( $data{'chassis_type'} && $data{'chassis_type'} ne 'Other' ){
- $data{'device'} = $data{'chassis_type'};
+ my @value = split(/:\s+/, $item);
+ if ($value[0] eq 'Serial Number'){
+ $data->{'chassis_serial'} = main::clean_dmi($value[1]) }
+ # not sure if this sku is same as system sku
+ elsif ($value[0] eq 'SKU Number'){
+ $data->{'chassis_sku'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Type'){
+ $data->{'chassis_type'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Manufacturer'){
+ $data->{'chassis_vendor'} = main::clean_dmi($value[1]) }
+ elsif ($value[0] eq 'Version'){
+ $data->{'chassis_version'} = main::clean_dmi($value[1]) }
+ }
+ }
+ if ($data->{'chassis_type'} && $data->{'chassis_type'} ne 'Other'){
+ $data->{'device'} = $data->{'chassis_type'};
}
next;
}
# this may catch some BSD and fringe Linux cases
# processor information: check for hypervisor
- elsif ($ref[0] == 4){
+ elsif ($row->[0] == 4){
# skip first three row, we don't need that data
- splice @ref, 0, 3 if @ref;
- if (!$data{'device'}){
- if (grep {/hypervisor/i} @ref){
- $data{'device'} = 'virtual-machine';
+ if (!$data->{'device'}){
+ if (grep {/hypervisor/i} @$row){
+ $data->{'device'} = 'virtual-machine';
+ $b_vm = 1;
}
}
last;
}
- elsif ($ref[0] > 4){
+ elsif ($row->[0] > 4){
last;
}
}
- if (!$data{'device'}){
- $data{'device'} = get_device_vm($data{'sys_vendor'},$data{'product_name'});
- $data{'device'} ||= 'other-vm?';
+ if (!$data->{'device'}){
+ $data->{'device'} = check_vm($data->{'sys_vendor'},$data->{'product_name'});
+ $data->{'device'} ||= 'other-vm?';
}
-# print "dmi:\n";
-# foreach (keys %data){
-# print "$_: $data{$_}\n";
-# }
- main::log_data('dump','%data',\%data) if $b_log;
- my @rows = create_output(\%data);
+ # print "dmi:\n";
+ # foreach (keys %data){
+ # print "$_: $data->{$_}\n";
+ # }
+ print Data::Dumper::Dumper $data if $dbg[28];
+ main::log_data('dump','%data',$data) if $b_log;
eval $end if $b_log;
- return @rows;
+ return $data;
}
+
# As far as I know, only OpenBSD supports this method.
# it uses hw. info from sysctl -a and bios info from dmesg.boot
sub machine_data_sysctl {
eval $start if $b_log;
- my (%data,$vm);
+ my ($product,$vendor,$vm);
+ my $data = {};
# ^hw\.(vendor|product|version|serialno|uuid)
- foreach (@sysctl_machine){
- next if ! $_;
- my @item = split /:/, $_;
- next if ! $item[1];
- if ($item[0] eq 'hw.vendor'){
- $data{'board_vendor'} = main::dmi_cleaner($item[1]);
+ foreach (@{$sysctl{'machine'}}){
+ next if !$_;
+ my @item = split(':', $_);
+ next if !$item[1];
+ if ($item[0] eq 'hw.vendor' || $item[0] eq 'machdep.dmi.board-vendor'){
+ $data->{'board_vendor'} = main::clean_dmi($item[1]);
}
- elsif ($item[0] eq 'hw.product'){
- $data{'board_name'} = main::dmi_cleaner($item[1]);
+ elsif ($item[0] eq 'hw.product' || $item[0] eq 'machdep.dmi.board-product'){
+ $data->{'board_name'} = main::clean_dmi($item[1]);
}
- elsif ($item[0] eq 'hw.version'){
- $data{'board_version'} = $item[1];
+ elsif ($item[0] eq 'hw.version' || $item[0] eq 'machdep.dmi.board-version'){
+ $data->{'board_version'} = main::clean_dmi($item[1]);
}
- elsif ($item[0] eq 'hw.serialno'){
- $data{'board_serial'} = $item[1];
+ elsif ($item[0] eq 'hw.serialno' || $item[0] eq 'machdep.dmi.board-serial'){
+ $data->{'board_serial'} = main::clean_dmi($item[1]);
}
elsif ($item[0] eq 'hw.serial'){
- $data{'board_serial'} = $item[1];
+ $data->{'board_serial'} = main::clean_dmi($item[1]);
}
elsif ($item[0] eq 'hw.uuid'){
- $data{'board_uuid'} = $item[1];
+ $data->{'board_uuid'} = main::clean_dmi($item[1]);
+ }
+ elsif ($item[0] eq 'machdep.dmi.system-vendor'){
+ $data->{'sys_vendor'} = main::clean_dmi($item[1]);
+ }
+ elsif ($item[0] eq 'machdep.dmi.system-product'){
+ $data->{'product_name'} = main::clean_dmi($item[1]);
+ }
+ elsif ($item[0] eq 'machdep.dmi.system-version'){
+ $data->{'product_version'} = main::clean_dmi($item[1]);
+ }
+ elsif ($item[0] eq 'machdep.dmi.system-serial'){
+ $data->{'product_serial'} = main::clean_dmi($item[1]);
+ }
+ elsif ($item[0] eq 'machdep.dmi.system-uuid'){
+ $data->{'product_uuid'} = main::clean_dmi($item[1]);
}
# bios0:at mainbus0: AT/286+ BIOS, date 06/30/06, BIOS32 rev. 0 @ 0xf2030, SMBIOS rev. 2.4 @ 0xf0000 (47 entries)
# bios0:vendor Phoenix Technologies, LTD version "3.00" date 06/30/2006
elsif ($item[0] =~ /^bios[0-9]/){
- if ($_ =~ /^^bios[0-9]:at\s.*\srev\.\s([\S]+)\s@.*/){
- $data{'bios_rev'} = $1;
- $data{'firmware'} = 'BIOS' if $_ =~ /BIOS/;
+ if ($_ =~ /^^bios[0-9]:at\s.*?\srev\.\s([\S]+)\s@.*/){
+ $data->{'bios_rev'} = $1;
+ $data->{'firmware'} = 'BIOS' if $_ =~ /BIOS/;
}
- elsif ($item[1] =~ /^vendor\s(.*)\sversion\s"?([\S]+)"?\sdate\s([\S]+)/ ){
- $data{'bios_vendor'} = $1;
- $data{'bios_version'} = $2;
- $data{'bios_date'} = $3;
- $data{'bios_version'} =~ s/^v//i if $data{'bios_version'} && $data{'bios_version'} !~ /vi/i;
+ elsif ($item[1] =~ /^vendor\s(.*?)\sversion\s(.*?)\sdate\s([\S]+)/){
+ $data->{'bios_vendor'} = $1;
+ $data->{'bios_version'} = $2;
+ $data->{'bios_date'} = $3;
+ $data->{'bios_version'} =~ s/^v//i if $data->{'bios_version'} && $data->{'bios_version'} !~ /vi/i;
}
}
+ elsif ($item[0] eq 'machdep.dmi.bios-vendor'){
+ $data->{'bios_vendor'} = main::clean_dmi($item[1]);
+ }
+ elsif ($item[0] eq 'machdep.dmi.bios-version'){
+ $data->{'bios_version'} = main::clean_dmi($item[1]);
+ }
+ elsif ($item[0] eq 'machdep.dmi.bios-date'){
+ $data->{'bios_date'} = main::clean_dmi($item[1]);
+ }
+ }
+ if ($data->{'board_vendor'} || $data->{'sys_vendor'} || $data->{'board_name'} || $data->{'product_name'}){
+ $vendor = $data->{'sys_vendor'};
+ $vendor = $data->{'board_vendor'} if !$vendor;
+ $product = $data->{'product_name'};
+ $product = $data->{'board_name'} if !$product;
}
- my @rows = create_output(\%data);
+ # detections can be from other sources.
+ $data->{'device'} = check_vm($vendor,$product);
+ print Data::Dumper::Dumper $data if $dbg[28];
+ main::log_data('dump','%data',$data) if $b_log;
eval $end if $b_log;
- return @rows;
+ return $data;
}
sub get_device_sys {
@@ -11729,23 +20168,25 @@ sub get_device_sys {
return $device;
}
-sub get_device_vm {
+sub check_vm {
eval $start if $b_log;
my ($manufacturer,$product_name) = @_;
+ $manufacturer ||= '';
+ $product_name ||= '';
my $vm;
- if ( my $program = main::check_program('systemd-detect-virt') ){
+ if (my $program = main::check_program('systemd-detect-virt')){
my $vm_test = (main::grabber("$program 2>/dev/null"))[0];
if ($vm_test){
# kvm vbox reports as oracle, usually, unless they change it
if (lc($vm_test) eq 'oracle'){
$vm = 'virtualbox';
}
- elsif ( $vm_test ne 'none'){
+ elsif ($vm_test ne 'none'){
$vm = $vm_test;
}
}
}
- if (!$vm || lc($vm) eq 'bochs') {
+ if (!$vm || lc($vm) eq 'bochs'){
if (-e '/proc/vz'){$vm = 'openvz'}
elsif (-e '/proc/xen'){$vm = 'xen'}
elsif (-e '/dev/vzfs'){$vm = 'virtuozzo'}
@@ -11753,37 +20194,53 @@ sub get_device_vm {
my @vm_data = main::grabber("$program 2>/dev/null");
if (@vm_data){
if (grep {/kqemu/i} @vm_data){$vm = 'kqemu'}
- elsif (grep {/kvm/i} @vm_data){$vm = 'kvm'}
+ elsif (grep {/kvm|qumranet/i} @vm_data){$vm = 'kvm'}
elsif (grep {/qemu/i} @vm_data){$vm = 'qemu'}
}
}
}
# this will catch many Linux systems and some BSDs
- if (!$vm || lc($vm) eq 'bochs' ) {
+ if (!$vm || lc($vm) eq 'bochs'){
# $device_vm is '' if nothing detected
- my @vm_data = (@sysctl,@dmesg_boot,$device_vm);
+ my @vm_data = ($device_vm);
+ push(@vm_data,@{$dboot{'machine-vm'}}) if $dboot{'machine-vm'};
if (-e '/dev/disk/by-id'){
my @dev = glob('/dev/disk/by-id/*');
- @vm_data = (@vm_data,@dev);
+ push(@vm_data,@dev);
}
- if ( grep {/innotek|vbox|virtualbox/i} @vm_data){
+ if (grep {/innotek|vbox|virtualbox/i} @vm_data){
$vm = 'virtualbox';
}
elsif (grep {/vmware/i} @vm_data){
$vm = 'vmware';
}
- elsif (grep {/Virtual HD/i} @vm_data){
+ # needs to be first, because contains virtio;qumranet, grabber only gets
+ # first instance then stops, so make sure patterns are right.
+ elsif (grep {/(openbsd[\s-]vmm)/i} @vm_data){
+ $vm = 'vmm';
+ }
+ elsif (grep {/(\bhvm\b)/i} @vm_data){
+ $vm = 'hvm';
+ }
+ elsif (grep {/(qemu)/i} @vm_data){
+ $vm = 'qemu';
+ }
+ elsif (grep {/(\bkvm\b|qumranet|virtio)/i} @vm_data){
+ $vm = 'kvm';
+ }
+ elsif (grep {/Virtual HD|Microsoft.*Virtual Machine/i} @vm_data){
$vm = 'hyper-v';
}
- if (!$vm && (my $file = main::system_files('cpuinfo'))){
+ if (!$vm && (my $file = $system_files{'proc-cpuinfo'})){
my @info = main::reader($file);
$vm = 'virtual-machine' if grep {/^flags.*hypervisor/} @info;
}
- if (!$vm && -e '/dev/vda' || -e '/dev/vdb' || -e '/dev/xvda' || -e '/dev/xvdb' ){
+ # this may be wrong, confirm it
+ if (!$vm && -e '/dev/vda' || -e '/dev/vdb' || -e '/dev/xvda' || -e '/dev/xvdb'){
$vm = 'virtual-machine';
}
}
- if (!$vm && $product_name){
+ if (!$vm && $product_name){
if ($product_name eq 'VMware'){
$vm = 'vmware';
}
@@ -11800,72 +20257,90 @@ sub get_device_vm {
if (!$vm && $manufacturer && $manufacturer eq 'Xen'){
$vm = 'xen';
}
+ $b_vm = 1 if $vm;
eval $end if $b_log;
return $vm;
}
-
}
-## NetworkData
+## NetworkItem
{
-package NetworkData;
+package NetworkItem;
my ($b_ip_run,@ifs_found);
+
sub get {
eval $start if $b_log;
- my (@data,@rows);
+ my $rows = [];
my $num = 0;
- if (($b_arm || $b_mips) && !$b_soc_net && !$b_pci_tool){
+ if (%risc && !$use{'soc-network'} && !$use{'pci-tool'}){
# do nothing, but keep the test conditions to force
# the non arm case to always run
}
else {
- @data = card_data();
- @rows = (@rows,@data) if @data;
- }
- @data = usb_data();
- @rows = (@rows,@data) if @data;
- # note: rasberry pi uses usb networking only
- if (!@rows && ($b_arm || $b_mips)){
- my $type = ($b_arm) ? 'arm' : 'mips';
- my $key = 'Message';
- @data = ({
- main::key($num++,0,1,$key) => main::row_defaults($type . '-pci',''),
- },);
- @rows = (@rows,@data);
+ device_output($rows);
}
+ # note: raspberry pi uses usb networking only
+ if (!@$rows){
+ if (%risc){
+ my $key = 'Message';
+ @$rows = ({
+ main::key($num++,0,1,$key) => main::message('risc-pci',$risc{'id'})
+ });
+ }
+ else {
+ my $key = 'Message';
+ my $message = '';
+ my $type = 'pci-card-data';
+ # for some reason, this was in device_output too redundantly
+ if ($pci_tool && $alerts{$pci_tool}->{'action'} eq 'permissions'){
+ $type = 'pci-card-data-root';
+ }
+ elsif (!$bsd_type && !%risc && !$pci_tool &&
+ $alerts{'lspci'}->{'action'} &&
+ $alerts{'lspci'}->{'action'} eq 'missing'){
+ $message = $alerts{'lspci'}->{'message'};
+ }
+ $message = main::message($type,'') if !$message;
+ @$rows = ({
+ main::key($num++,0,1,$key) => $message
+ });
+ }
+ }
+ usb_output($rows);
if ($show{'network-advanced'}){
# @ifs_found = ();
# shift @ifs_found;
# pop @ifs_found;
if (!$bsd_type){
- @data = advanced_data_sys('check','',0,'','','');
- @rows = (@rows,@data) if @data;
+ advanced_data_sys($rows,'check','',0,'','','');
}
else {
- @data = advanced_data_bsd('check');
- @rows = (@rows,@data) if @data;
+ advanced_data_bsd($rows,'check');
+ }
+ if ($b_admin){
+ info_data($rows);
}
}
if ($show{'ip'}){
- @data = wan_ip();
- @rows = (@rows,@data);
+ wan_ip($rows);
}
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub card_data {
+sub device_output {
eval $start if $b_log;
- my ($b_wifi,@rows,@data,%holder);
+ return if !$devices{'network'};
+ my $rows = $_[0];
+ my ($b_wifi,%holder);
my ($j,$num) = (0,1);
- foreach (@devices_network){
+ foreach my $row (@{$devices{'network'}}){
$num = 1;
- my @row = @$_;
- #print "$row[0] $row[3]\n";
- #print "$row[0] $row[3]\n";
- $j = scalar @rows;
- my $driver = $row[9];
- my $chip_id = "$row[5]:$row[6]";
+ # print "$row->[0] $row->[3]\n";
+ # print "$row->[0] $row->[3]\n";
+ $j = scalar @$rows;
+ my $driver = $row->[9];
+ my $chip_id = main::get_chip_id($row->[5],$row->[6]);
# working around a virtuo bug same chip id is used on two nics
if (!defined $holder{$chip_id}){
$holder{$chip_id} = 0;
@@ -11874,145 +20349,154 @@ sub card_data {
$holder{$chip_id}++;
}
# first check if it's a known wifi id'ed card, if so, no print of duplex/speed
- $b_wifi = check_wifi($row[4]);
- my $card = $row[4];
- $card = ($card) ? main::pci_cleaner($card,'output') : 'N/A';
- #$card ||= 'N/A';
+ $b_wifi = check_wifi($row->[4]);
+ my $device = $row->[4];
+ $device = ($device) ? main::clean_pci($device,'output') : 'N/A';
+ #$device ||= 'N/A';
$driver ||= 'N/A';
- @data = ({
- main::key($num++,1,1,'Device') => $card,
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $device,
},);
- @rows = (@rows,@data);
- if ($extra > 0 && $b_pci_tool && $row[12]){
- my $item = main::get_pci_vendor($row[4],$row[12]);
- $rows[$j]{main::key($num++,0,2,'vendor')} = $item if $item;
+ if ($extra > 0 && $use{'pci-tool'} && $row->[12]){
+ my $item = main::get_pci_vendor($row->[4],$row->[12]);
+ $rows->[$j]{main::key($num++,0,2,'vendor')} = $item if $item;
}
- if ($row[1] eq '0680'){
- $rows[$j]{main::key($num++,0,2,'type')} = 'network bridge';
+ if ($row->[1] eq '0680'){
+ $rows->[$j]{main::key($num++,0,2,'type')} = 'network bridge';
}
- $rows[$j]{main::key($num++,1,2,'driver')} = $driver;
+ $rows->[$j]{main::key($num++,1,2,'driver')} = $driver;
my $bus_id = 'N/A';
# note: for arm/mips we want to see the single item bus id, why not?
# note: we can have bus id: 0002 / 0 which is valid, but 0 / 0 is invalid
- if (defined $row[2] && $row[2] ne '0' && defined $row[3]){$bus_id = "$row[2].$row[3]"}
- elsif (defined $row[2] && $row[2] ne '0'){$bus_id = $row[2]}
- elsif (defined $row[3] && $row[3] ne '0'){$bus_id = $row[3]}
+ if (defined $row->[2] && $row->[2] ne '0' && defined $row->[3]){
+ $bus_id = "$row->[2].$row->[3]"}
+ elsif (defined $row->[2] && $row->[2] ne '0'){
+ $bus_id = $row->[2]}
+ elsif (defined $row->[3] && $row->[3] ne '0'){
+ $bus_id = $row->[3]}
if ($extra > 0){
- if ($row[9] && !$bsd_type){
- my $version = main::get_module_version($row[9]);
+ if ($row->[9] && !$bsd_type){
+ my $version = main::get_module_version($row->[9]);
$version ||= 'N/A';
- $rows[$j]{main::key($num++,0,3,'v')} = $version;
+ $rows->[$j]{main::key($num++,0,3,'v')} = $version;
}
- if ($b_admin && $row[10]){
- $row[10] = main::get_driver_modules($row[9],$row[10]);
- $rows[$j]{main::key($num++,0,3,'modules')} = $row[10] if $row[10];
+ if ($b_admin && $row->[10]){
+ $row->[10] = main::get_driver_modules($row->[9],$row->[10]);
+ $rows->[$j]{main::key($num++,0,3,'modules')} = $row->[10] if $row->[10];
+ }
+ $row->[8] ||= 'N/A';
+ if ($extra > 1 && $bus_id ne 'N/A'){
+ main::get_pcie_data($bus_id,$j,$rows,\$num);
}
- $row[8] ||= 'N/A';
# as far as I know, wifi has no port, but in case it does in future, use it
- $rows[$j]{main::key($num++,0,2,'port')} = $row[8] if (!$b_wifi || ( $b_wifi && $row[8] ne 'N/A') );
- $rows[$j]{main::key($num++,0,2,'bus ID')} = $bus_id;
+ if (!$b_wifi || ($b_wifi && $row->[8] ne 'N/A')){
+ $rows->[$j]{main::key($num++,0,2,'port')} = $row->[8];
+ }
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = $bus_id;
}
if ($extra > 1){
- $rows[$j]{main::key($num++,0,2,'chip ID')} = $chip_id;
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $chip_id;
+ }
+ if ($extra > 2 && $row->[1]){
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = $row->[1];
+ }
+ if (!$bsd_type && $extra > 0 && $bus_id ne 'N/A' && $bus_id =~ /\.0$/){
+ my $temp = main::get_device_temp($bus_id);
+ if ($temp){
+ $rows->[$j]{main::key($num++,0,2,'temp')} = $temp . ' C';
+ }
}
if ($show{'network-advanced'}){
- @data = ();
+ my @data;
if (!$bsd_type){
- @data = advanced_data_sys($row[5],$row[6],$holder{$chip_id},$b_wifi,'',$bus_id);
+ advanced_data_sys($rows,$row->[5],$row->[6],$holder{$chip_id},$b_wifi,'',$bus_id);
}
else {
- @data = advanced_data_bsd("$row[9]$row[11]",$b_wifi) if defined $row[9] && defined $row[11];
+ if (defined $row->[9] && defined $row->[11]){
+ advanced_data_bsd($rows,"$row->[9]$row->[11]",$b_wifi);
+ }
}
- @rows = (@rows,@data) if @data;
}
- #print "$row[0]\n";
+ # print "$row->[0]\n";
}
# @rows = ();
- # we want to handle ARM errors in main get
- if (!@rows && !$b_arm && !$b_mips){
- my $key = 'Message';
- my $type = 'pci-card-data';
- if ($pci_tool && ${$alerts{$pci_tool}}{'action'} eq 'permissions'){
- $type = 'pci-card-data-root';
- }
- @data = ({
- main::key($num++,0,1,$key) => main::row_defaults($type,''),
- },);
- @rows = (@rows,@data);
-
- }
- #my $ref = $pci[-1];
- #print $$ref[0],"\n";
eval $end if $b_log;
- return @rows;
}
-sub usb_data {
+
+sub usb_output {
eval $start if $b_log;
- my (@data,@rows,@temp2,$b_wifi,$driver,
- $path,$path_id,$product,$test,$type);
+ return if !$usb{'network'};
+ my $rows = $_[0];
+ my (@temp2,$b_wifi,$driver,$path,$path_id,$product,$type);
my ($j,$num) = (0,1);
- return if !@usb;
- foreach my $ref (@usb){
- my @row = @$ref;
- # a device will always be the second or > device on the bus, except for
- # daisychained hubs
- if ($row[1] > 1 && $row[4] ne '9'){
- $num = 1;
- ($driver,$path,$path_id,$product,$test,$type) = ('','','','','','');
- $product = main::cleaner($row[13]) if $row[13];
- $driver = $row[15] if $row[15];
- $path = $row[3] if $row[3];
- $path_id = $row[2] if $row[2];
- $type = $row[14] if $row[14];
- $test = "$driver $product $type";
- if ($product && network_device($test)){
- $driver ||= 'usb-network';
- @data = ({
- main::key($num++,1,1,'Device') => $product,
- main::key($num++,0,2,'type') => 'USB',
- main::key($num++,0,2,'driver') => $driver,
- },);
- $b_wifi = check_wifi($product);
- @rows = (@rows,@data);
- if ($extra > 0){
- $rows[$j]{main::key($num++,0,2,'bus ID')} = "$path_id:$row[1]";
+ foreach my $row (@{$usb{'network'}}){
+ $num = 1;
+ ($driver,$path,$path_id,$product,$type) = ('','','','','');
+ $product = main::clean($row->[13]) if $row->[13];
+ $driver = $row->[15] if $row->[15];
+ $path = $row->[3] if $row->[3];
+ $path_id = $row->[2] if $row->[2];
+ $type = $row->[14] if $row->[14];
+ $driver ||= 'N/A';
+ $j = scalar @$rows;
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $product,
+ main::key($num++,0,2,'driver') => $driver,
+ main::key($num++,1,2,'type') => 'USB',
+ },);
+ $b_wifi = check_wifi($product);
+ if ($extra > 0){
+ if ($extra > 1){
+ $row->[8] ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'rev')} = $row->[8];
+ if ($row->[17]){
+ $rows->[$j]{main::key($num++,0,3,'speed')} = $row->[17];
}
- if ($extra > 1){
- $rows[$j]{main::key($num++,0,2,'chip ID')} = $row[7];
- }
- if ($extra > 2 && $row[16]){
- $rows[$j]{main::key($num++,0,2,'serial')} = main::apply_filter($row[16]);
- }
- if ($show{'network-advanced'}){
- @data = ();
- if (!$bsd_type){
- my (@temp,$vendor,$chip);
- @temp = split (/:/, $row[7]) if $row[7];
- ($vendor,$chip) = ($temp[0],$temp[1]) if @temp;
- @data = advanced_data_sys($vendor,$chip,0,$b_wifi,$path,'');
- }
- # NOTE: we need the driver.number, like wlp0 to get a match, and
- # we can't get that from usb data, so we have to let it fall back down
- # to the check function for BSDs.
- #else {
- # @data = advanced_data_bsd($row[2],$b_wifi);
- #}
- @rows = (@rows,@data) if @data;
+ if ($row->[24]){
+ $rows->[$j]{main::key($num++,0,3,'lanes')} = $row->[24];
+ }
+ if ($b_admin && $row->[22]){
+ $rows->[$j]{main::key($num++,0,3,'mode')} = $row->[22];
+ }
+ }
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = "$path_id:$row->[1]";
+ if ($extra > 1){
+ $row->[7] ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $row->[7];
+ }
+ if ($extra > 2){
+ if (defined $row->[5] && $row->[5] ne ''){
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = "$row->[4]$row->[5]";
+ }
+ if ($row->[16]){
+ $rows->[$j]{main::key($num++,0,2,'serial')} = main::filter($row->[16]);
}
- $j = scalar @rows;
+ }
+ }
+ if ($show{'network-advanced'}){
+ if (!$bsd_type){
+ my (@temp,$vendor,$chip);
+ @temp = split(':', $row->[7]) if $row->[7];
+ ($vendor,$chip) = ($temp[0],$temp[1]) if @temp;
+ advanced_data_sys($rows,$vendor,$chip,0,$b_wifi,$path,'');
+ }
+ # NOTE: we need the driver + driver nu, like wlp0 to get a match,
+ else {
+ $driver .= $row->[21] if defined $row->[21];
+ advanced_data_bsd($rows,$driver,$b_wifi);
}
}
}
eval $end if $b_log;
- return @rows;
}
+
sub advanced_data_sys {
eval $start if $b_log;
return if ! -d '/sys/class/net';
- my ($vendor,$chip,$count,$b_wifi,$path_usb,$bus_id) = @_;
- my ($cont_if,$ind_if,$num) = (2,3,0);
+ my ($rows,$vendor,$chip,$count,$b_wifi,$path_usb,$bus_id) = @_;
+ my ($cont_if,$ind_if,$j,$num) = (2,3,0,0);
my $key = 'IF';
- my ($b_check,$b_usb,$if,$path,@paths,@row,@rows);
+ my ($b_check,$b_usb,$if,$path,@paths);
# ntoe: we've already gotten the base path, now we
# we just need to get the IF path, which is one level in:
# usb1/1-1/1-1:1.0/net/enp0s20f0u1/
@@ -12024,207 +20508,201 @@ sub advanced_data_sys {
@paths = main::globber('/sys/class/net/*');
}
@paths = grep {!/\/lo$/} @paths;
- if ( $count > 0 && $count < scalar @paths ){
- @paths = splice @paths, $count, scalar @paths;
+ # push(@paths,'/sys/class/net/ppp0'); # fake IF if needed to match test data
+ if ($count > 0 && $count < scalar @paths){
+ @paths = splice(@paths, $count, scalar @paths);
}
if ($vendor eq 'check'){
$b_check = 1;
$key = 'IF-ID';
($cont_if,$ind_if) = (1,2);
}
- #print join '; ', @paths, $count, "\n";
+ # print join('; ', @paths), $count, "\n";
foreach (@paths){
my ($data1,$data2,$duplex,$mac,$speed,$state);
+ $j = scalar @$rows;
# for usb, we already know where we are
if (!$b_usb){
- if (( !$b_arm && !$b_ppc) || $b_pci_tool ){
+ # pi mmcnr has pcitool and also these vendor/device paths.
+ if (!%risc || $use{'pci-tool'}){
$path = "$_/device/vendor";
- $data1 = (main::reader($path))[0] if -e $path;
+ $data1 = main::reader($path,'',0) if -r $path;
$data1 =~ s/^0x// if $data1;
$path = "$_/device/device";
- $data2 = (main::reader($path))[0] if -e $path;
+ $data2 = main::reader($path,'',0) if -r $path;
$data2 =~ s/^0x// if $data2;
# this is a fix for a redhat bug in virtio
$data2 = (defined $data2 && $data2 eq '0001' && defined $chip && $chip eq '1000') ? '1000' : $data2;
}
- elsif ($b_arm || $b_ppc) {
- $path = Cwd::abs_path($_);
- $path =~ /($chip)/;
- if ($1){
- $data1 = $vendor;
- $data2 = $chip;
- }
+ # there are cases where arm devices have a small pci bus
+ # or, with mmcnr devices, will show device/vendor info in data1/2
+ # which won't match with the path IDs
+ if (%risc && $chip && Cwd::abs_path($_) =~ /\b$chip\b/){
+ $data1 = $vendor;
+ $data2 = $chip;
}
}
# print "d1:$data1 v:$vendor d2:$data2 c:$chip bus_id: $bus_id\n";
# print Cwd::abs_path($_), "\n" if $bus_id;
- if ( $b_usb || $b_check || ( $data1 && $data2 && $data1 eq $vendor && $data2 eq $chip &&
- ( ($b_arm || $b_mips || $b_ppc || $b_sparc) || check_bus_id($_,$bus_id) ) ) ) {
+ if ($b_usb || $b_check || ($data1 && $data2 && $data1 eq $vendor && $data2 eq $chip &&
+ (%risc || check_bus_id($_,$bus_id)))){
$if = $_;
$if =~ s/^\/.+\///;
# print "top: if: $if ifs: @ifs_found\n";
next if ($b_check && grep {/$if/} @ifs_found);
$path = "$_/duplex";
- $duplex = (main::reader($path))[0] if -e $path;
+ $duplex = main::reader($path,'',0) if -r $path;
$duplex ||= 'N/A';
$path = "$_/address";
- $mac = (main::reader($path))[0] if -e $path;
- $mac = main::apply_filter($mac);
+ $mac = main::reader($path,'',0) if -r $path;
+ $mac = main::filter($mac);
$path = "$_/speed";
- $speed = (main::reader($path))[0] if -e $path;
+ $speed = main::reader($path,'',0) if -r $path;
$speed ||= 'N/A';
$path = "$_/operstate";
- $state = (main::reader($path))[0] if -e $path;
+ $state = main::reader($path,'',0) if -r $path;
$state ||= 'N/A';
- #print "$speed \n";
- @row = ({
+ # print "$speed \n";
+ push(@$rows,{
main::key($num++,1,$cont_if,$key) => $if,
- main::key($num++,0,$ind_if,'state') => $state,
- },);
- #my $j = scalar @row - 1;
- push (@ifs_found, $if) if (!$b_check && (! grep {/$if/} @ifs_found));
+ main::key($num++,0,$ind_if,'state') => $state
+ });
+ # my $j = scalar @row - 1;
+ push(@ifs_found, $if) if (!$b_check && (! grep {/$if/} @ifs_found));
# print "push: if: $if ifs: @ifs_found\n";
# no print out for wifi since it doesn't have duplex/speed data available
# note that some cards show 'unknown' for state, so only testing explicitly
# for 'down' string in that to skip showing speed/duplex
- # /sys/class/net/$if/wireless : nont always there, but worth a try: wlan/wl/ww/wlp
- $b_wifi = 1 if !$b_wifi && ( -e "$_$if/wireless" || $if =~ /^(wl|ww)/);
+ # /sys/class/net/$if/wireless : not always there, but worth a try: wlan/wl/ww/wlp
+ $b_wifi = 1 if !$b_wifi && (-e "$_$if/wireless" || $if =~ /^(wl|ww)/);
if (!$b_wifi && $state ne 'down' && $state ne 'no'){
# make sure the value is strictly numeric before appending Mbps
- $speed = ( main::is_int($speed) ) ? "$speed Mbps" : $speed;
- $row[0]{main::key($num++,0,$ind_if,'speed')} = $speed;
- $row[0]{main::key($num++,0,$ind_if,'duplex')} = $duplex;
- }
- $row[0]{main::key($num++,0,$ind_if,'mac')} = $mac;
- if ($b_check){
- @rows = (@rows,@row);
- }
- else {
- @rows = @row;
- }
+ $speed = (main::is_int($speed)) ? "$speed Mbps" : $speed;
+ $rows->[$j]{main::key($num++,0,$ind_if,'speed')} = $speed;
+ $rows->[$j]{main::key($num++,0,$ind_if,'duplex')} = $duplex;
+ }
+ $rows->[$j]{main::key($num++,0,$ind_if,'mac')} = $mac;
+ # if ($b_check){
+ # push(@rows,@row);
+ # }
+ # else {
+ # @rows = @row;
+ # }
if ($show{'ip'}){
- @row = if_ip($key,$if);
- @rows = (@rows,@row);
+ if_ip($rows,$key,$if);
}
last if !$b_check;
}
}
eval $end if $b_log;
- return @rows;
}
sub advanced_data_bsd {
eval $start if $b_log;
return if ! @ifs_bsd;
- my ($if,$b_wifi) = @_;
- my (@data,@row,@rows,$working_if);
+ my ($rows,$if,$b_wifi) = @_;
+ my ($data,$working_if);
my ($b_check,$state,$speed,$duplex,$mac);
- my ($cont_if,$ind_if,$num) = (2,3,0);
+ my ($cont_if,$ind_if,$j,$num) = (2,3,0,0);
my $key = 'IF';
- my $j = 0;
if ($if eq 'check'){
$b_check = 1;
$key = 'IF-ID';
($cont_if,$ind_if) = (1,2);
}
- foreach my $ref (@ifs_bsd){
- if (ref $ref ne 'ARRAY'){
- $working_if = $ref;
+ foreach my $item (@ifs_bsd){
+ if (ref $item ne 'ARRAY'){
+ $working_if = $item;
# print "$working_if\n";
next;
}
else {
- @data = @$ref;
+ $data = $item;
}
- if ( $b_check || $working_if eq $if){
+ if ($b_check || $working_if eq $if){
$if = $working_if if $b_check;
- # print "top: if: $if ifs: @ifs_found\n";
+ # print "top1: if: $if ifs: wif: $working_if @ifs_found\n";
next if ($b_check && grep {/$if/} @ifs_found);
- foreach my $line (@data){
- # ($state,$speed,$duplex,$mac)
- $duplex = $data[2];
- $duplex ||= 'N/A';
- $mac = main::apply_filter($data[3]);
- $speed = $data[1];
- $speed ||= 'N/A';
- $state = $data[0];
- $state ||= 'N/A';
- #print "$speed \n";
- @row = ({
- main::key($num++,1,$cont_if,$key) => $if,
- main::key($num++,0,$ind_if,'state') => $state,
- },);
- push (@ifs_found, $if) if (!$b_check && (! grep {/$if/} @ifs_found ));
- # print "push: if: $if ifs: @ifs_found\n";
- # no print out for wifi since it doesn't have duplex/speed data available
- # note that some cards show 'unknown' for state, so only testing explicitly
- # for 'down' string in that to skip showing speed/duplex
- if (!$b_wifi && $state ne 'down' && $state ne 'no'){
- # make sure the value is strictly numeric before appending Mbps
- $speed = ( main::is_int($speed) ) ? "$speed Mbps" : $speed;
- $row[0]{main::key($num++,0,$ind_if,'speed')} = $speed;
- $row[0]{main::key($num++,0,$ind_if,'duplex')} = $duplex;
- }
- $row[0]{main::key($num++,0,$ind_if,'mac')} = $mac;
- }
- @rows = (@rows,@row);
- if ($show{'ip'}){
- @row = if_ip($key,$if) if $if;
- @rows = (@rows,@row) if @row;
+ # print "top2: if: $if wif: $working_if ifs: @ifs_found\n";
+ # print Data::Dumper::Dumper $data;
+ # ($state,$speed,$duplex,$mac)
+ $duplex = $data->[2];
+ $duplex ||= 'N/A';
+ $mac = main::filter($data->[3]);
+ $speed = $data->[1];
+ $speed ||= 'N/A';
+ $state = $data->[0];
+ $state ||= 'N/A';
+ $j = scalar @$rows;
+ # print "$speed \n";
+ push(@$rows, {
+ main::key($num++,1,$cont_if,$key) => $if,
+ main::key($num++,0,$ind_if,'state') => $state,
+ });
+ push(@ifs_found, $if) if (!$b_check && (!grep {/$if/} @ifs_found));
+ # print "push: if: $if ifs: @ifs_found\n";
+ # no print out for wifi since it doesn't have duplex/speed data available
+ # note that some cards show 'unknown' for state, so only testing explicitly
+ # for 'down' string in that to skip showing speed/duplex
+ if (!$b_wifi && $state ne 'down' && $state ne 'no network'){
+ # make sure the value is strictly numeric before appending Mbps
+ $speed = (main::is_int($speed)) ? "$speed Mbps" : $speed;
+ $rows->[$j]{main::key($num++,0,$ind_if,'speed')} = $speed;
+ $rows->[$j]{main::key($num++,0,$ind_if,'duplex')} = $duplex;
+ }
+ $rows->[$j]{main::key($num++,0,$ind_if,'mac')} = $mac;
+ if ($show{'ip'} && $if){
+ if_ip($rows,$key,$if);
}
}
}
eval $end if $b_log;
- return @rows;
}
-## values:
-# 0 - ipv
-# 1 - ip
-# 2 - broadcast, if found
-# 3 - scope, if found
-# 4 - scope if, if different from if
+
+## Result values:
+# 0: ipv
+# 1: ip
+# 2: broadcast, if found
+# 3: scope, if found
+# 4: scope IF, if different from IF
sub if_ip {
eval $start if $b_log;
- my ($type,$if) = @_;
- my (@data,@row,@rows,$working_if);
- my ($cont_ip,$ind_ip) = (3,4);
- my $num = 0;
- my $j = 0;
+ my ($rows,$type,$if) = @_;
+ my ($working_if);
+ my ($cont_ip,$ind_ip,$if_cnt) = (3,4,0);
+ my ($j,$num) = (0,0);
$b_ip_run = 1;
if ($type eq 'IF-ID'){
($cont_ip,$ind_ip) = (2,3);
}
OUTER:
- foreach my $ref (@ifs){
- if (ref $ref ne 'ARRAY'){
- $working_if = $ref;
+ foreach my $item (@ifs){
+ if (ref $item ne 'ARRAY'){
+ $working_if = $item;
# print "if:$if wif:$working_if\n";
next;
}
- else {
- @data = @$ref;
- # print "ref:$ref\n";
- }
if ($working_if eq $if){
- foreach my $ref2 (@data){
- $j = scalar @rows;
+ $if_cnt = 0;
+ # print "if $if item:\n", Data::Dumper::Dumper $item;
+ foreach my $data2 (@$item){
+ $j = scalar @$rows;
$num = 1;
- if ($limit > 0 && $j >= $limit){
- @row = ({
- main::key($num++,0,$cont_ip,'Message') => main::row_defaults('output-limit',scalar @data),
- },);
- @rows = (@rows,@row);
+ $if_cnt++;
+ if ($limit > 0 && $if_cnt > $limit){
+ push(@$rows, {
+ main::key($num++,0,$cont_ip,'Message') => main::message('output-limit',scalar @$item),
+ });
last OUTER;
}
- my @data2 = @$ref2;
- #print "$data2[0] $data2[1]\n";
+ # print "$data2->[0] $data2->[1]\n";
my ($ipv,$ip,$broadcast,$scope,$scope_id);
- $ipv = ($data2[0])? $data2[0]: 'N/A';
- $ip = main::apply_filter($data2[1]);
- $scope = ($data2[3])? $data2[3]: 'N/A';
+ $ipv = ($data2->[0])? $data2->[0]: 'N/A';
+ $ip = main::filter($data2->[1]);
+ $scope = ($data2->[3])? $data2->[3]: 'N/A';
# note: where is this ever set to 'all'? Old test condition?
if ($if ne 'all'){
- if (defined $data2[4] && $working_if ne $data2[4]){
+ if (defined $data2->[4] && $working_if ne $data2->[4]){
# scope global temporary deprecated dynamic
# scope global dynamic
# scope global temporary deprecated dynamic
@@ -12235,126 +20713,138 @@ sub if_ip {
# scope site dynamic
# scope link
# trim off if at end of multi word string if found
- $data2[4] =~ s/\s$if$// if $data2[4] =~ /[^\s]+\s$if$/;
- my $key = ($data2[4] =~ /deprecated|dynamic|temporary|noprefixroute/ ) ? 'type':'virtual' ;
- @row = ({
+ $data2->[4] =~ s/\s$if$// if $data2->[4] =~ /[^\s]+\s$if$/;
+ my $key = ($data2->[4] =~ /deprecated|dynamic|temporary|noprefixroute/) ? 'type' : 'virtual';
+ push(@$rows, {
main::key($num++,1,$cont_ip,"IP v$ipv") => $ip,
- main::key($num++,0,$ind_ip,$key) => $data2[4],
+ main::key($num++,0,$ind_ip,$key) => $data2->[4],
main::key($num++,0,$ind_ip,'scope') => $scope,
- },);
+ });
}
else {
- @row = ({
+ push(@$rows, {
main::key($num++,1,$cont_ip,"IP v$ipv") => $ip,
main::key($num++,0,$ind_ip,'scope') => $scope,
- },);
+ });
}
}
else {
- @row = ({
- main::key($num++,1,($cont_ip - 1 ),'IF') => $if,
+ push(@$rows, {
+ main::key($num++,1,($cont_ip - 1),'IF') => $if,
main::key($num++,1,$cont_ip,"IP v$ipv") => $ip,
main::key($num++,0,$ind_ip,'scope') => $scope,
- },);
+ });
}
- @rows = (@rows,@row);
- if ($extra > 1 && $data2[2]){
- $broadcast = main::apply_filter($data2[2]);
- $rows[$j]{main::key($num++,0,$ind_ip,'broadcast')} = $broadcast;
+ if ($extra > 1 && $data2->[2]){
+ $broadcast = main::filter($data2->[2]);
+ $rows->[$j]{main::key($num++,0,$ind_ip,'broadcast')} = $broadcast;
}
}
}
}
eval $end if $b_log;
- return @rows;
}
-# get ip using downloader to stdout. This is a clean, text only IP output url,
+
+sub info_data {
+ eval $start if $b_log;
+ my ($rows) = @_;
+ my $j = scalar @$rows;
+ my $num = 0;
+ my $services;
+ PsData::set_cmd() if !$loaded{'ps-cmd'};
+ PsData::set_network();
+ if (@{$ps_data{'network-services'}}){
+ main::make_list_value($ps_data{'network-services'},\$services,',','sort');
+ }
+ else {
+ $services = main::message('network-services');
+ }
+
+ push(@$rows,{
+ main::key($num++,1,1,'Info') => '',
+ main::key($num++,0,2,'services') => $services,
+ });
+ eval $end if $b_log;
+}
+
+# Get ip using downloader to stdout. This is a clean, text only IP output url,
# single line only, ending in the ip address. May have to modify this in the future
# to handle ipv4 and ipv6 addresses but should not be necessary.
-# ip=$( echo 2001:0db8:85a3:0000:0000:8a2e:0370:7334 | gawk --re-interval '
-# ip=$( wget -q -O - $WAN_IP_URL | gawk --re-interval '
+# ip=$(echo 2001:0db8:85a3:0000:0000:8a2e:0370:7334 | gawk --re-interval '
+# ip=$(wget -q -O - $WAN_IP_URL | gawk --re-interval '
# this generates a direct dns based ipv4 ip address, but if opendns.com goes down,
# the fall backs will still work.
# note: consistently slower than domain based:
# dig +short +time=1 +tries=1 myip.opendns.com. A @208.67.222.222
sub wan_ip {
eval $start if $b_log;
- my (@data,$b_dig,$ip,$ua);
+ my $rows = $_[0];
+ my ($b_dig,$b_html,$ip,$ua);
my $num = 0;
# time: 0.06 - 0.07 seconds
- if (!$b_skip_dig && (my $program = main::check_program('dig') )){
- $ip = (main::grabber("$program +short +time=1 +tries=1 myip.opendns.com \@resolver1.opendns.com 2>/dev/null"))[0];
+ # Cisco opendns.com may be terminating supporting this one, sometimes works, sometimes not:
+ # use -4/6 to force ipv 4 or 6, but generally we want the 'natural' native ip returned.
+ # dig +short +time=1 +tries=1 myip.opendns.com @resolver1.opendns.com :: 0.021s
+ # Works but is slow:
+ # dig +short @ns1-1.akamaitech.net ANY whoami.akamai.net :: 0.156s
+ # This one can take forever, and sometimes requires explicit -4 or -6
+ # dig -4 TXT +short o-o.myaddr.l.google.com @ns1.google.com :: 0.026s; 1.087ss
+ if (!$force{'no-dig'} && (my $program = main::check_program('dig'))){
+ $ip = (main::grabber("$program +short +time=1 +tries=1 \@ns1-1.akamaitech.net ANY whoami.akamai.net 2>/dev/null"))[0];
+ $ip =~ s/"//g if $ip; # some return IP in quotes, when using TXT
$b_dig = 1;
}
- else {
- # note: tests: akamai: 0.055 - 0.065 icanhazip.com: 0.177 0.164
- # smxi: 0.525, so almost 10x slower. Dig is fast too
+ if (!$ip && !$force{'no-html-wan'}){
+ # if dig failed or is not installed, set downloader data if unset
+ if (!defined $dl{'no-ssl'}){
+ main::set_downloader();
+ }
+ # note: tests: akamai: 0.015 - 0.025 icanhazip.com: 0.020 0.030
+ # smxi: 0.230, so ~10x slower. Dig is not as fast as you'd expect
+ # dig: 0.167s 0.156s
# leaving smxi as last test because I know it will always be up.
# --wan-ip-url replaces values with user supplied arg
- my @urls = (!$wan_url) ? qw( http://whatismyip.akamai.com/
- http://icanhazip.com/ https://smxi.org/opt/ip.php) : ($wan_url);
+ # 0.020s: http://whatismyip.akamai.com/
+ # 0.136s: https://get.geojs.io/v1/ip
+ # 0.024s: http://icanhazip.com/
+ # 0.027s: ifconfig.io
+ # 0.230s: https://smxi.org/opt/ip.php
+ # 0.023s: https://api.ipify.org :: NOTE: hangs, widely variable times, don't use
+ my @urls = (!$wan_url) ? qw(http://whatismyip.akamai.com/
+ http://icanhazip.com/ https://smxi.org/opt/ip.php) : ($wan_url);
foreach (@urls){
$ua = 'ip' if $_ =~ /smxi/;
$ip = main::download_file('stdout',$_,'',$ua);
if ($ip){
# print "$_\n";
- chomp $ip;
- $ip = (split /\s+/, $ip)[-1];
+ chomp($ip);
+ $ip = (split(/\s+/, $ip))[-1];
last;
}
}
+ $b_html = 1;
}
if ($ip && $use{'filter'}){
$ip = $filter_string;
}
if (!$ip){
- $ip = ($b_dig) ? main::row_defaults('IP-dig', 'WAN IP') : main::row_defaults('IP', 'WAN IP');
+ # true case trips
+ if (!$b_dig){
+ $ip = main::message('IP-no-dig', 'WAN IP');
+ }
+ elsif ($b_dig && !$b_html){
+ $ip = main::message('IP-dig', 'WAN IP');
+ }
+ else {
+ $ip = main::message('IP', 'WAN IP');
+ }
}
- @data = ({
+ push(@$rows, {
main::key($num++,0,1,'WAN IP') => $ip,
- },);
+ });
eval $end if $b_log;
- return @data;
}
-### USB networking search string data, because some brands can have other products than
-### wifi/nic cards, they need further identifiers, with wildcards.
-### putting the most common and likely first, then the less common, then some specifics
-
-# Wi-Fi.*Adapter Wireless.*Adapter Ethernet.*Adapter WLAN.*Adapter
-# Network.*Adapter 802\.11 Atheros Atmel D-Link.*Adapter D-Link.*Wireless Linksys
-# Netgea Ralink Realtek.*Network Realtek.*Wireless Realtek.*WLAN Belkin.*Wireless
-# Belkin.*WLAN Belkin.*Network Actiontec.*Wireless Actiontec.*Network AirLink.*Wireless
-# Asus.*Network Asus.*Wireless Buffalo.*Wireless Davicom DWA-.*RangeBooster DWA-.*Wireless
-# ENUWI-.*Wireless LG.*Wi-Fi Rosewill.*Wireless RNX-.*Wireless Samsung.*LinkStick
-# Samsung.*Wireless Sony.*Wireless TEW-.*Wireless TP-Link.*Wireless
-# WG[0-9][0-9][0-9].*Wireless WNA[0-9][0-9][0-9] WNDA[0-9][0-9][0-9]
-# Zonet.*ZEW.*Wireless
-sub network_device {
- eval $start if $b_log;
- my ($device_string) = @_;
- my ($b_network);
- # belkin=050d; d-link=07d1; netgear=0846; ralink=148f; realtek=0bda;
- # Atmel makes other stuff. NOTE: exclude 'networks': IMC Networks
- my @tests = qw(wifi Wi-Fi.*Adapter Ethernet \bLAN\b WLAN Network\b Networking\b 802\.11
- Wireless.*Adapter 54\sMbps 100\/1000 Mobile\sBroadband Atheros D-Link.*Adapter
- Dell.*Wireless D-Link.*Wireless Linksys Netgea Ralink Realtek.*Network Realtek.*Wireless
- Belkin.*Wireless Actiontec.*Wireless AirLink.*Wireless Asus.*Wireless
- Buffalo.*Wireless Davicom DWA-.*RangeBooster DWA-.*Wireless
- ENUWI-.*Wireless LG.*Wi-Fi Rosewill.*Wireless RNX-.*Wireless Samsung.*LinkStick
- Samsung.*Wireless Sony.*Wireless TEW-.*Wireless TP-Link.*Wireless
- WG[0-9][0-9][0-9].*Wireless WNA[0-9][0-9][0-9] WNDA[0-9][0-9][0-9]
- Zonet.*ZEW.*Wireless 050d:935b 0bda:8189 0bda:8197
- );
- foreach (@tests){
- if ($device_string =~ /$_/i ){
- $b_network = 1;
- last;
- }
- }
- eval $end if $b_log;
- return $b_network;
-}
sub check_bus_id {
eval $start if $b_log;
my ($path,$bus_id) = @_;
@@ -12363,134 +20853,129 @@ sub check_bus_id {
# legacy, not link, but uevent has path:
# PHYSDEVPATH=/devices/pci0000:00/0000:00:0a.1/0000:05:00.0
if (Cwd::abs_path($path) =~ /$bus_id\// ||
- ( -r "$path/uevent" && -s "$path/uevent" &&
- (grep {/$bus_id/} main::reader("$path/uevent") ) ) ){
+ (-r "$path/uevent" && -s "$path/uevent" &&
+ (grep {/$bus_id/} main::reader("$path/uevent")))){
$b_valid = 1;
}
}
eval $end if $b_log;
return $b_valid;
}
+
sub check_wifi {
my ($item) = @_;
- my $b_wifi = ($item =~ /wireless|wifi|wi-fi|wlan|802\.11|centrino/i) ? 1 : 0;
+ my $b_wifi = ($item =~ /wireless|wi-?fi|wlan|802\.11|centrino/i) ? 1 : 0;
return $b_wifi;
}
}
-## OpticalData
+## OpticalItem
{
-package OpticalData;
+package OpticalItem;
sub get {
eval $start if $b_log;
- my (@data,@rows,$key1,$val1);
+ my $rows = $_[0];
+ my $rows_start = scalar @$rows;
+ my ($data,$val1);
my $num = 0;
if ($bsd_type){
- #@data = optical_data_bsd();
- $key1 = 'Optical Report';
- $val1 = main::row_defaults('optical-data-bsd');
- @data = ({main::key($num++,0,1,$key1) => $val1,});
- if ( @dm_boot_optical){
- @data = optical_data_bsd();
+ $val1 = main::message('optical-data-bsd');
+ if ($dboot{'optical'}){
+ $data = drive_data_bsd();
+ drive_output($rows,$data) if %$data;
}
else{
- my $file = main::system_files('dmesg-boot');
- if ( $file && ! -r $file ){
- $val1 = main::row_defaults('dmesg-boot-permissions');
+ my $file = $system_files{'dmesg-boot'};
+ if ($file && ! -r $file){
+ $val1 = main::message('dmesg-boot-permissions');
}
elsif (!$file){
- $val1 = main::row_defaults('dmesg-boot-missing');
+ $val1 = main::message('dmesg-boot-missing');
}
- else {
- $val1 = main::row_defaults('optical-data-bsd');
- }
- $key1 = 'Optical Report';
- @data = ({main::key($num++,0,1,$key1) => $val1,});
}
}
else {
- @data = optical_data_linux();
+ $val1 = main::message('optical-data');
+ $data = drive_data_linux();
+ drive_output($rows,$data) if %$data;
}
- if (!@data){
- $key1 = 'Message';
- $val1 = main::row_defaults('optical-data');
- @data = ({main::key($num++,0,1,$key1) => $val1,});
+ # if none of the above increased the row count, show the error message
+ if ($rows_start == scalar @$rows){
+ push(@$rows,{main::key($num++,0,1,'Message') => $val1});
}
- @rows = (@rows,@data);
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub create_output {
+
+sub drive_output {
eval $start if $b_log;
- my (%devices) = @_;
- my (@data,@rows);
+ my ($rows,$drives) = @_;
my $num = 0;
my $j = 0;
# build floppy if any
- foreach my $key (sort keys %devices){
- if ($devices{$key}{'type'} eq 'floppy'){
- @data = ({ main::key($num++,0,1,ucfirst($devices{$key}{'type'})) => "/dev/$key"});
- @rows = (@rows,@data);
- delete $devices{$key};
+ foreach my $key (sort keys %$drives){
+ if ($drives->{$key}{'type'} eq 'floppy'){
+ push(@$rows, {
+ main::key($num++,0,1,ucfirst($drives->{$key}{'type'})) => "/dev/$key",
+ });
+ delete $drives->{$key};
}
}
- foreach my $key (sort keys %devices){
- $j = scalar @rows;
+ foreach my $key (sort keys %$drives){
+ $j = scalar @$rows;
$num = 1;
- my $vendor = $devices{$key}{'vendor'};
+ my $vendor = $drives->{$key}{'vendor'};
$vendor ||= 'N/A';
- my $model = $devices{$key}{'model'};
+ my $model = $drives->{$key}{'model'};
$model ||= 'N/A';
- @data = ({
- main::key($num++,1,1,ucfirst($devices{$key}{'type'})) => "/dev/$key",
+ push(@$rows, {
+ main::key($num++,1,1,ucfirst($drives->{$key}{'type'})) => "/dev/$key",
main::key($num++,0,2,'vendor') => $vendor,
main::key($num++,0,2,'model') => $model,
});
- @rows = (@rows,@data);
if ($extra > 0){
- my $rev = $devices{$key}{'rev'};
+ my $rev = $drives->{$key}{'rev'};
$rev ||= 'N/A';
- $rows[$j]{ main::key($num++,0,2,'rev')} = $rev;
+ $rows->[$j]{ main::key($num++,0,2,'rev')} = $rev;
}
- if ($extra > 1 && $devices{$key}{'serial'}){
- $rows[$j]{ main::key($num++,0,2,'serial')} = main::apply_filter($devices{$key}{'serial'});
+ if ($extra > 1 && $drives->{$key}{'serial'}){
+ $rows->[$j]{ main::key($num++,0,2,'serial')} = main::filter($drives->{$key}{'serial'});
}
- my $ref = $devices{$key}{'links'};
- my $links = (@$ref) ? join ',', sort @$ref: 'N/A' ;
- $rows[$j]{ main::key($num++,0,2,'dev-links')} = $links;
+ my $links = (@{$drives->{$key}{'links'}}) ? join(',', sort @{$drives->{$key}{'links'}}) : 'N/A' ;
+ $rows->[$j]{ main::key($num++,0,2,'dev-links')} = $links;
if ($show{'optical'}){
- $j = scalar @rows;
- my $speed = $devices{$key}{'speed'};
+ $j = scalar @$rows;
+ my $speed = $drives->{$key}{'speed'};
$speed ||= 'N/A';
my ($audio,$multisession) = ('','');
- if (defined $devices{$key}{'multisession'}){
- $multisession = ( $devices{$key}{'multisession'} == 1 ) ? 'yes' : 'no' ;
+ if (defined $drives->{$key}{'multisession'}){
+ $multisession = ($drives->{$key}{'multisession'} == 1) ? 'yes' : 'no' ;
}
$multisession ||= 'N/A';
- if (defined $devices{$key}{'audio'}){
- $audio = ( $devices{$key}{'audio'} == 1 ) ? 'yes' : 'no' ;
+ if (defined $drives->{$key}{'audio'}){
+ $audio = ($drives->{$key}{'audio'} == 1) ? 'yes' : 'no' ;
}
$audio ||= 'N/A';
my $dvd = 'N/A';
my (@rw,$rws);
- if (defined $devices{$key}{'dvd'}){
- $dvd = ( $devices{$key}{'dvd'} == 1 ) ? 'yes' : 'no' ;
+ if (defined $drives->{$key}{'dvd'}){
+ $dvd = ($drives->{$key}{'dvd'} == 1) ? 'yes' : 'no' ;
}
- if ($devices{$key}{'cdr'}){
- push @rw, 'cd-r';
+ if ($drives->{$key}{'cdr'}){
+ push(@rw, 'cd-r');
}
- if ($devices{$key}{'cdrw'}){
- push @rw, 'cd-rw';
+ if ($drives->{$key}{'cdrw'}){
+ push(@rw, 'cd-rw');
}
- if ($devices{$key}{'dvdr'}){
- push @rw, 'dvd-r';
+ if ($drives->{$key}{'dvdr'}){
+ push(@rw, 'dvd-r');
}
- if ($devices{$key}{'dvdram'}){
- push @rw, 'dvd-ram';
+ if ($drives->{$key}{'dvdram'}){
+ push(@rw, 'dvd-ram');
}
- $rws = (@rw) ? join ',', @rw: 'none' ;
- @data = ({
+ $rws = (@rw) ? join(',', @rw) : 'none' ;
+ push(@$rows, {
main::key($num++,1,2,'Features') => '',
main::key($num++,0,3,'speed') => $speed,
main::key($num++,0,3,'multisession') => $multisession,
@@ -12498,127 +20983,125 @@ sub create_output {
main::key($num++,0,3,'dvd') => $dvd,
main::key($num++,0,3,'rw') => $rws,
});
- @rows = (@rows,@data);
- if ($extra > 0 ){
- my $state = $devices{$key}{'state'};
+ if ($extra > 0){
+ my $state = $drives->{$key}{'state'};
$state ||= 'N/A';
- $rows[$j]{ main::key($num++,0,3,'state')} = $state;
+ $rows->[$j]{ main::key($num++,0,3,'state')} = $state;
}
}
}
- #print Data::Dumper::Dumper \%devices;
+ # print Data::Dumper::Dumper $drives;
eval $end if $b_log;
- return @rows;
}
-sub optical_data_bsd {
+
+sub drive_data_bsd {
eval $start if $b_log;
- my (@data,%devices,@rows,@temp);
+ my (@rows,@temp);
+ my $drives = {};
my ($count,$i,$working) = (0,0,'');
- foreach (@dm_boot_optical){
+ foreach (@{$dboot{'optical'}}){
$_ =~ s/(cd[0-9]+)\(([^:]+):([0-9]+):([0-9]+)\):/$1:$2-$3.$4,/;
- my @row = split /:\s*/, $_;
+ my @row = split(/:\s*/, $_);
next if ! defined $row[1];
if ($working ne $row[0]){
# print "$id_holder $row[0]\n";
$working = $row[0];
}
# no dots, note: ada2: 2861588MB BUT: ada2: 600.000MB/s
- if (! exists $devices{$working}){
- $devices{$working} = ({});
- $devices{$working}{'links'} = ([]);
- $devices{$working}{'model'} = '';
- $devices{$working}{'rev'} = '';
- $devices{$working}{'state'} = '';
- $devices{$working}{'vendor'} = '';
- $devices{$working}{'temp'} = '';
- $devices{$working}{'type'} = ($working =~ /^cd/) ? 'optical' : 'unknown';
- }
- #print "$_\n";
- if ($bsd_type ne 'openbsd'){
+ if (!exists $drives->{$working}){
+ $drives->{$working}{'links'} = [];
+ $drives->{$working}{'model'} = '';
+ $drives->{$working}{'rev'} = '';
+ $drives->{$working}{'state'} = '';
+ $drives->{$working}{'vendor'} = '';
+ $drives->{$working}{'temp'} = '';
+ $drives->{$working}{'type'} = ($working =~ /^cd/) ? 'optical' : 'unknown';
+ }
+ # print "$_\n";
+ if ($bsd_type !~ /^(net|open)bsd$/){
if ($row[1] && $row[1] =~ /^<([^>]+)>/){
- $devices{$working}{'model'} = $1;
- $count = ($devices{$working}{'model'} =~ tr/ //);
+ $drives->{$working}{'model'} = $1;
+ $count = ($drives->{$working}{'model'} =~ tr/ //);
if ($count && $count > 1){
- @temp = split /\s+/, $devices{$working}{'model'};
- $devices{$working}{'vendor'} = $temp[0];
- my $index = ($#temp > 2 ) ? ($#temp - 1): $#temp;
- $devices{$working}{'model'} = join ' ', @temp[1..$index];
- $devices{$working}{'rev'} = $temp[-1] if $count > 2;
+ @temp = split(/\s+/, $drives->{$working}{'model'});
+ $drives->{$working}{'vendor'} = $temp[0];
+ my $index = ($#temp > 2) ? ($#temp - 1): $#temp;
+ $drives->{$working}{'model'} = join(' ', @temp[1..$index]);
+ $drives->{$working}{'rev'} = $temp[-1] if $count > 2;
}
if ($show{'optical'}){
if (/\bDVD\b/){
- $devices{$working}{'dvd'} = 1;
+ $drives->{$working}{'dvd'} = 1;
}
if (/\bRW\b/){
- $devices{$working}{'cdrw'} = 1;
- $devices{$working}{'dvdr'} = 1 if $devices{$working}{'dvd'};
+ $drives->{$working}{'cdrw'} = 1;
+ $drives->{$working}{'dvdr'} = 1 if $drives->{$working}{'dvd'};
}
}
}
if ($row[1] && $row[1] =~ /^Serial/){
- @temp = split /\s+/,$row[1];
- $devices{$working}{'serial'} = $temp[-1];
+ @temp = split(/\s+/,$row[1]);
+ $drives->{$working}{'serial'} = $temp[-1];
}
if ($show{'optical'}){
if ($row[1] =~ /^([0-9\.]+[MGTP][B]?\/s)/){
- $devices{$working}{'speed'} = $1;
- $devices{$working}{'speed'} =~ s/\.[0-9]+//;
+ $drives->{$working}{'speed'} = $1;
+ $drives->{$working}{'speed'} =~ s/\.[0-9]+//;
}
if (/\bDVD[-]?RAM\b/){
- $devices{$working}{'cdr'} = 1;
- $devices{$working}{'dvdram'} = 1;
+ $drives->{$working}{'cdr'} = 1;
+ $drives->{$working}{'dvdram'} = 1;
}
if ($row[2] && $row[2] =~ /,\s(.*)$/){
- $devices{$working}{'state'} = $1;
- $devices{$working}{'state'} =~ s/\s+-\s+/, /;
+ $drives->{$working}{'state'} = $1;
+ $drives->{$working}{'state'} =~ s/\s+-\s+/, /;
}
}
}
else {
if ($row[2] && $row[2] =~ /<([^>]+)>/){
- $devices{$working}{'model'} = $1;
- $count = ($devices{$working}{'model'} =~ tr/,//);
- #print "c: $count $row[2]\n";
+ $drives->{$working}{'model'} = $1;
+ $count = ($drives->{$working}{'model'} =~ tr/,//);
+ # print "c: $count $row[2]\n";
if ($count && $count > 1){
- @temp = split /,\s*/, $devices{$working}{'model'};
- $devices{$working}{'vendor'} = $temp[0];
- $devices{$working}{'model'} = $temp[1];
- $devices{$working}{'rev'} = $temp[2];
+ @temp = split(/,\s*/, $drives->{$working}{'model'});
+ $drives->{$working}{'vendor'} = $temp[0];
+ $drives->{$working}{'model'} = $temp[1];
+ $drives->{$working}{'rev'} = $temp[2];
}
if ($show{'optical'}){
if (/\bDVD\b/){
- $devices{$working}{'dvd'} = 1;
+ $drives->{$working}{'dvd'} = 1;
}
if (/\bRW\b/){
- $devices{$working}{'cdrw'} = 1;
- $devices{$working}{'dvdr'} = 1 if $devices{$working}{'dvd'};
+ $drives->{$working}{'cdrw'} = 1;
+ $drives->{$working}{'dvdr'} = 1 if $drives->{$working}{'dvd'};
}
if (/\bDVD[-]?RAM\b/){
- $devices{$working}{'cdr'} = 1;
- $devices{$working}{'dvdram'} = 1;
+ $drives->{$working}{'cdr'} = 1;
+ $drives->{$working}{'dvdram'} = 1;
}
}
}
if ($show{'optical'}){
- #print "$row[1]\n";
+ # print "$row[1]\n";
if (($row[1] =~ tr/,//) > 1){
- @temp = split /,\s*/, $row[1];
- $devices{$working}{'speed'} = $temp[2];
+ @temp = split(/,\s*/, $row[1]);
+ $drives->{$working}{'speed'} = $temp[2];
}
-
}
}
}
-
- main::log_data('dump','%devices',\%devices) if $b_log;
- #print Data::Dumper::Dumper \%devices;
- @rows = create_output(%devices) if %devices;
+ main::log_data('dump','%$drives',$drives) if $b_log;
+ # print Data::Dumper::Dumper $drives;
eval $end if $b_log;
- return @rows;
+ return $drives;
}
-sub optical_data_linux {
+
+sub drive_data_linux {
eval $start if $b_log;
- my (@data,%devices,@info,@rows);
+ my (@data,@info,@rows);
+ my $drives = {};
@data = main::globber('/dev/dvd* /dev/cdr* /dev/scd* /dev/sr* /dev/fd[0-9]');
# Newer kernel is NOT linking all optical drives. Some, but not all.
# Get the actual disk dev location, first try default which is easier to run,
@@ -12630,116 +21113,119 @@ sub optical_data_linux {
# possible fix: puppy has these in /mnt not /dev they say
$working =~ s/\/(dev|media|mnt)\///;
$_ =~ s/\/(dev|media|mnt)\///;
- if (! defined $devices{$working}){
- my @temp = ($_ ne $working) ? ([$_]) : ([]);
- $devices{$working} = ({'links' => @temp});
- $devices{$working}{'type'} = ($working =~ /^fd/) ? 'floppy' : 'optical' ;
+ if (!defined $drives->{$working}){
+ my @temp = ($_ ne $working) ? ($_) : ();
+ $drives->{$working}{'links'} = \@temp;
+ $drives->{$working}{'type'} = ($working =~ /^fd/) ? 'floppy' : 'optical' ;
}
else {
- my $ref = $devices{$working}{'links'};
- push @$ref, $_ if $_ ne $working;
+ push(@{$drives->{$working}{'links'}}, $_) if $_ ne $working;
}
- #print "$working\n";
+ # print "$working\n";
}
if ($show{'optical'} && -e '/proc/sys/dev/cdrom/info'){
@info = main::reader('/proc/sys/dev/cdrom/info','strip');
}
- #print join '; ', @data, "\n";
- foreach my $key (keys %devices){
- next if $devices{$key}{'type'} eq 'floppy';
+ # print join('; ', @data), "\n";
+ foreach my $key (keys %$drives){
+ next if $drives->{$key}{'type'} eq 'floppy';
my $device = "/sys/block/$key/device";
- if ( -d $device){
- if (-e "$device/vendor"){
- $devices{$key}{'vendor'} = (main::reader("$device/vendor"))[0];
- $devices{$key}{'vendor'} = main::cleaner($devices{$key}{'vendor'});
- $devices{$key}{'state'} = (main::reader("$device/state"))[0];
- $devices{$key}{'model'} = (main::reader("$device/model"))[0];
- $devices{$key}{'model'} = main::cleaner($devices{$key}{'model'});
- $devices{$key}{'rev'} = (main::reader("$device/rev"))[0];
+ if (-d $device){
+ if (-r "$device/vendor"){
+ $drives->{$key}{'vendor'} = main::reader("$device/vendor",'',0);
+ $drives->{$key}{'vendor'} = main::clean($drives->{$key}{'vendor'});
+ $drives->{$key}{'state'} = main::reader("$device/state",'',0);
+ $drives->{$key}{'model'} = main::reader("$device/model",'',0);
+ $drives->{$key}{'model'} = main::clean($drives->{$key}{'model'});
+ $drives->{$key}{'rev'} = main::reader("$device/rev",'',0);
}
}
- elsif ( -e "/proc/ide/$key/model"){
- $devices{$key}{'vendor'} = (main::reader("/proc/ide/$key/model"))[0];
- $devices{$key}{'vendor'} = main::cleaner($devices{$key}{'vendor'});
+ elsif (-r "/proc/ide/$key/model"){
+ $drives->{$key}{'vendor'} = main::reader("/proc/ide/$key/model",'',0);
+ $drives->{$key}{'vendor'} = main::clean($drives->{$key}{'vendor'});
}
if ($show{'optical'} && @info){
my $index = 0;
foreach my $item (@info){
next if $item =~ /^\s*$/;
- my @split = split '\s+', $item;
+ my @split = split(/\s+/, $item);
if ($item =~ /^drive name:/){
foreach my $id (@split){
last if ($id eq $key);
$index++;
}
- last if ! $index; # index will be > 0 if it was found
+ last if !$index; # index will be > 0 if it was found
}
- elsif ($item =~/^drive speed:/) {
- $devices{$key}{'speed'} = $split[$index];
+ elsif ($item =~/^drive speed:/){
+ $drives->{$key}{'speed'} = $split[$index];
}
- elsif ($item =~/^Can read multisession:/) {
- $devices{$key}{'multisession'}=$split[$index+1];
+ elsif ($item =~/^Can read multisession:/){
+ $drives->{$key}{'multisession'}=$split[$index+1];
}
- elsif ($item =~/^Can read MCN:/) {
- $devices{$key}{'mcn'}=$split[$index+1];
+ elsif ($item =~/^Can read MCN:/){
+ $drives->{$key}{'mcn'}=$split[$index+1];
}
- elsif ($item =~/^Can play audio:/) {
- $devices{$key}{'audio'}=$split[$index+1];
+ elsif ($item =~/^Can play audio:/){
+ $drives->{$key}{'audio'}=$split[$index+1];
}
- elsif ($item =~/^Can write CD-R:/) {
- $devices{$key}{'cdr'}=$split[$index+1];
+ elsif ($item =~/^Can write CD-R:/){
+ $drives->{$key}{'cdr'}=$split[$index+1];
}
- elsif ($item =~/^Can write CD-RW:/) {
- $devices{$key}{'cdrw'}=$split[$index+1];
+ elsif ($item =~/^Can write CD-RW:/){
+ $drives->{$key}{'cdrw'}=$split[$index+1];
}
- elsif ($item =~/^Can read DVD:/) {
- $devices{$key}{'dvd'}=$split[$index+1];
+ elsif ($item =~/^Can read DVD:/){
+ $drives->{$key}{'dvd'}=$split[$index+1];
}
- elsif ($item =~/^Can write DVD-R:/) {
- $devices{$key}{'dvdr'}=$split[$index+1];
+ elsif ($item =~/^Can write DVD-R:/){
+ $drives->{$key}{'dvdr'}=$split[$index+1];
}
- elsif ($item =~/^Can write DVD-RAM:/) {
- $devices{$key}{'dvdram'}=$split[$index+1];
+ elsif ($item =~/^Can write DVD-RAM:/){
+ $drives->{$key}{'dvdram'}=$split[$index+1];
}
}
}
}
- main::log_data('dump','%devices',\%devices) if $b_log;
- #print Data::Dumper::Dumper \%devices;
- @rows = create_output(%devices) if %devices;
+ main::log_data('dump','%$drives',$drives) if $b_log;
+ # print Data::Dumper::Dumper $drives;
eval $end if $b_log;
- return @rows;
+ return $drives;
}
-
}
-## PartitionData
+## PartitionItem
{
-package PartitionData;
+# these will be globally accessible via PartitionItem::filters()
+my ($fs_exclude,$fs_skip,$part_filter);
+package PartitionItem;
sub get {
eval $start if $b_log;
- my (@rows,$key1,$val1);
+ my ($key1,$val1);
+ my $rows = [];
my $num = 0;
- partition_data() if !$b_partitions;
- if (!@partitions) {
+ set_partitions() if !$loaded{'set-partitions'};
+ # Fails in corner case with zram but no other mounted filesystems
+ if (!@partitions){
$key1 = 'Message';
#$val1 = ($bsd_type && $bsd_type eq 'darwin') ?
- # main::row_defaults('darwin-feature') : main::row_defaults('partition-data');
- $val1 = main::row_defaults('partition-data');
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ # main::message('darwin-feature') : main::message('partition-data');
+ $val1 = main::message('partition-data');
+ @$rows = ({main::key($num++,0,1,$key1) => $val1,});
}
else {
- @rows = create_output();
+ create_output($rows);
}
eval $end if $b_log;
- return @rows;
+ return $rows;
}
+
sub create_output {
eval $start if $b_log;
+ my $rows = $_[0];
my $num = 0;
my $j = 0;
- my (@data,@data2,%part,@rows,$dev,$dev_type,$fs,$percent,$raw_size,$size,$used);
+ my ($dev,$dev_type,$fs,$percent,$raw_size,$size,$used);
# alpha sort for non numerics
if ($show{'partition-sort'} !~ /^(percent-used|size|used)$/){
@partitions = sort { $a->{$show{'partition-sort'}} cmp $b->{$show{'partition-sort'}} } @partitions;
@@ -12747,171 +21233,233 @@ sub create_output {
else {
@partitions = sort { $a->{$show{'partition-sort'}} <=> $b->{$show{'partition-sort'}} } @partitions;
}
- foreach my $ref (@partitions){
- my %row = %$ref;
+ my $fs_skip = get_filters('fs-skip');
+ foreach my $row (@partitions){
$num = 1;
- next if $row{'type'} eq 'secondary' && $show{'partition'};
- next if $show{'swap'} && $row{'fs'} && $row{'fs'} eq 'swap';
- next if $row{'swap-type'} && $row{'swap-type'} ne 'partition';
- if (!$row{'hidden'}){
- @data2 = main::get_size($row{'size'}) if (defined $row{'size'});
- $size = (@data2) ? $data2[0] . ' ' . $data2[1]: 'N/A';
- @data2 = main::get_size($row{'used'}) if (defined $row{'used'});
- $used = (@data2) ? $data2[0] . ' ' . $data2[1]: 'N/A';
- $percent = (defined $row{'percent-used'}) ? ' (' . $row{'percent-used'} . '%)' : '';
+ next if $row->{'type'} eq 'secondary' && $show{'partition'};
+ next if $show{'swap'} && $row->{'fs'} && $row->{'fs'} eq 'swap';
+ next if $row->{'swap-type'} && $row->{'swap-type'} ne 'partition';
+ if (!$row->{'hidden'}){
+ $size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : 'N/A';
+ $used = main::get_size($row->{'used'},'string','N/A'); # used can be 0
+ $percent = (defined $row->{'percent-used'}) ? ' (' . $row->{'percent-used'} . '%)' : '';
}
else {
$percent = '';
- $used = $size = (!$b_root) ? main::row_defaults('root-required') : main::row_defaults('partition-hidden');
- }
- %part = ();
- $fs = ($row{'fs'}) ? lc($row{'fs'}): 'N/A';
- $dev_type = ($row{'dev-type'}) ? $row{'dev-type'} : 'dev';
- $row{'dev-base'} = '/dev/' . $row{'dev-base'} if $dev_type eq 'dev' && $row{'dev-base'};
- $dev = ($row{'dev-base'}) ? $row{'dev-base'} : 'N/A';
- $row{'id'} =~ s|/home/[^/]+/(.*)|/home/$filter_string/$1| if $use{'filter'};
- $j = scalar @rows;
- @data = ({
- main::key($num++,1,1,'ID') => $row{'id'},
+ $used = $size = (!$b_root) ? main::message('root-required') : main::message('partition-hidden');
+ }
+ $fs = ($row->{'fs'}) ? lc($row->{'fs'}): 'N/A';
+ $dev_type = ($row->{'dev-type'}) ? $row->{'dev-type'} : 'dev';
+ $row->{'dev-base'} = '/dev/' . $row->{'dev-base'} if $dev_type eq 'dev' && $row->{'dev-base'};
+ $dev = ($row->{'dev-base'}) ? $row->{'dev-base'} : 'N/A';
+ $row->{'id'} =~ s|/home/[^/]+/(.*)|/home/$filter_string/$1| if $use{'filter'};
+ $j = scalar @$rows;
+ push(@$rows, {
+ main::key($num++,1,1,'ID') => $row->{'id'},
});
- @rows = (@rows,@data);
- if (($b_admin || $row{'hidden'}) && $row{'raw-size'} ){
+ if (($b_admin || $row->{'hidden'}) && $row->{'raw-size'}){
# It's an error! permissions or missing tool
- if (!main::is_numeric($row{'raw-size'})){
- $raw_size = $row{'raw-size'};
- }
- else {
- @data2 = main::get_size($row{'raw-size'});
- $raw_size = (@data2) ? $data2[0] . ' ' . $data2[1]: 'N/A';
- }
- $rows[$j]{main::key($num++,0,2,'raw size')} = $raw_size;
+ $raw_size = ($row->{'raw-size'}) ? main::get_size($row->{'raw-size'},'string') : 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'raw-size')} = $raw_size;
+ }
+ if ($b_admin && $row->{'raw-available'} && $size ne 'N/A'){
+ $size .= ' (' . $row->{'raw-available'} . '%)';
}
- if ($b_admin && $row{'raw-available'} && $size ne 'N/A'){
- $size .= ' (' . $row{'raw-available'} . '%)';
+ $rows->[$j]{main::key($num++,0,2,'size')} = $size;
+ $rows->[$j]{main::key($num++,0,2,'used')} = $used . $percent;
+ $rows->[$j]{main::key($num++,0,2,'fs')} = $fs;
+ if ($b_admin && $fs eq 'swap' && defined $row->{'swappiness'}){
+ $rows->[$j]{main::key($num++,0,2,'swappiness')} = $row->{'swappiness'};
}
- $rows[$j]{main::key($num++,0,2,'size')} = $size;
- $rows[$j]{main::key($num++,0,2,'used')} = $used . $percent;
- $rows[$j]{main::key($num++,0,2,'fs')} = $fs;
- if ($b_admin && $fs eq 'swap' && defined $row{'swappiness'}){
- $rows[$j]{main::key($num++,0,2,'swappiness')} = $row{'swappiness'};
+ if ($b_admin && $fs eq 'swap' && defined $row->{'cache-pressure'}){
+ $rows->[$j]{main::key($num++,0,2,'cache-pressure')} = $row->{'cache-pressure'};
}
- if ($b_admin && $fs eq 'swap' && defined $row{'cache-pressure'}){
- $rows[$j]{main::key($num++,0,2,'cache pressure')} = $row{'cache-pressure'};
+ if ($extra > 1 && $fs eq 'swap' && defined $row->{'priority'}){
+ $rows->[$j]{main::key($num++,0,2,'priority')} = $row->{'priority'};
}
- if ($extra > 1 && $fs eq 'swap' && defined $row{'priority'}){
- $rows[$j]{main::key($num++,0,2,'priority')} = $row{'priority'};
+ if ($b_admin && $row->{'block-size'}){
+ $rows->[$j]{main::key($num++,0,2,'block-size')} = $row->{'block-size'} . ' B';;
+ # $rows->[$j]{main::key($num++,0,2,'physical')} = $row->{'block-size'} . ' B';
+ # $rows->[$j]{main::key($num++,0,2,'logical')} = $row->{'block-logical'} . ' B';
}
- if ($b_admin && $row{'block-size'}){
- $rows[$j]{main::key($num++,0,2,'block size')} = $row{'block-size'} . ' B';;
- #$rows[$j]{main::key($num++,0,2,'physical')} = $row{'block-size'} . ' B';
- #$rows[$j]{main::key($num++,0,2,'logical')} = $row{'block-logical'} . ' B';
+ $rows->[$j]{main::key($num++,1,2,$dev_type)} = $dev;
+ if ($b_admin && $row->{'maj-min'}){
+ $rows->[$j]{main::key($num++,0,3,'maj-min')} = $row->{'maj-min'};
}
- $rows[$j]{main::key($num++,0,2,$dev_type)} = $dev;
- if ($show{'label'}){
- $row{'label'} = main::apply_partition_filter('part', $row{'label'}, '') if $use{'filter-label'};
- $rows[$j]{main::key($num++,0,2,'label')} = ($row{'label'}) ? $row{'label'}: 'N/A';
+ if ($extra > 0 && $row->{'dev-mapped'}){
+ $rows->[$j]{main::key($num++,0,3,'mapped')} = $row->{'dev-mapped'};
}
- if ($show{'uuid'}){
- $row{'uuid'} = main::apply_partition_filter('part', $row{'uuid'}, '') if $use{'filter-uuid'};
- $rows[$j]{main::key($num++,0,2,'uuid')} = ($row{'uuid'}) ? $row{'uuid'}: 'N/A';
+ # add fs known to not use label/uuid here
+ if (($show{'label'} || $show{'uuid'}) && $dev_type eq 'dev' &&
+ $fs !~ /^$fs_skip$/){
+ if ($show{'label'}){
+ if ($use{'filter-label'}){
+ $row->{'label'} = main::filter_partition('part', $row->{'label'}, '');
+ }
+ $row->{'label'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'label')} = $row->{'label'};
+ }
+ if ($show{'uuid'}){
+ if ($use{'filter-uuid'}){
+ $row->{'uuid'} = main::filter_partition('part', $row->{'uuid'}, '');
+ }
+ $row->{'uuid'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'uuid')} = $row->{'uuid'};
+ }
}
}
+ # Corner case, no partitions, but zram swap.
+ if (!@$rows){
+ @$rows = ({main::key($num++,0,1,'Message') => main::message('partition-data')});
+ }
eval $end if $b_log;
- return @rows;
}
-sub partition_data {
+sub set_partitions {
eval $start if $b_log;
- #return if $bsd_type && $bsd_type eq 'darwin'; # darwin has muated output, of course
- my (@data,@rows,@mapper,@mount,@partitions_working,%part,@working);
- my ($b_fake_map,$b_fs,$b_load,$b_space,$cols,$roots) = (0,1,0,0,6,0);
- my ($back_size,$back_used) = (4,3);
- my ($block_size,$blockdev,$dev_base,$dev_type,$fs,$id,$label,$percent_used,
- $raw_size,$replace,$size_available,$size,$test,$type,$uuid,$used);
- $b_partitions = 1;
+ # return if $bsd_type && $bsd_type eq 'darwin'; # darwin has mutated output
+ my (@data,@rows,@mount,@partitions_working,$part,@working);
+ my ($back_size,$back_used,$b_fs,$cols) = (4,3,1,6);
+ my ($b_dfp,$b_fake_map,$b_load,$b_logical,$b_space,);
+ my ($block_size,$blockdev,$dev_base,$dev_mapped,$dev_type,$fs,$id,$label,
+ $maj_min,$percent_used,$raw_size,$replace,$size_available,$size,$test,
+ $type,$uuid,$used);
+ $loaded{'set-partitions'} = 1;
if ($b_admin){
- # for partition block size
- $blockdev = main::check_program('blockdev');
- # for raw partition sizes
- DiskData::set_proc_partitions() if !$bsd_type && !$b_proc_partitions;
+ # For partition block size
+ $blockdev = $alerts{'blockdev'}->{'path'} if $alerts{'blockdev'}->{'path'};
}
- set_lsblk() if !$bsd_type && !$b_lsblk;
- # set labels, uuid, gpart
- set_label_uuid() if !$b_label_uuid;
- # most current OS support -T and -k, but -P means different things
- # in freebsd. However since most use is from linux, we make that default
+ # For raw partition sizes, maj_min
+ if ($bsd_type){
+ DiskDataBSD::set() if !$loaded{'disk-data-bsd'};
+ }
+ else {
+ PartitionData::set() if !$loaded{'partition-data'};
+ LsblkData::set() if !$loaded{'lsblk'};
+ }
+ # set @labels, @uuid
if (!$bsd_type){
- @partitions_working = main::grabber("df -P -T -k 2>/dev/null");
- if (-d '/dev/mapper'){
- @mapper = main::globber('/dev/mapper/*');
+ set_label_uuid() if !$loaded{'label-uuid'};
+ }
+ # Most current OS support -T and -k, but -P means different things
+ # in freebsd. However since most use is from linux, we make that default
+ # android 7 no -T support
+ if (!$fake{'partitions'}){
+ if (@partitions_working = main::grabber("df -P -T -k 2>/dev/null")){
+ main::set_mapper() if !$loaded{'mapper'} && !$bsd_type;
+ $b_dfp = 1;
+ }
+ elsif (@partitions_working = main::grabber("df -T -k 2>/dev/null")){
+ # Fine, it worked, could be bsd or linux
+ }
+ # Busybox supports -k and -P, older openbsd, darwin, solaris don't have -P
+ else {
+ if (@partitions_working = main::grabber("df -k -P 2>/dev/null")){
+ $b_dfp = 1;
+ }
+ else {
+ @partitions_working = main::grabber("df -k 2>/dev/null");
+ }
+ $b_fs = 0;
+ if (my $path = main::check_program('mount')){
+ @mount = main::grabber("$path 2>/dev/null");
+ }
}
}
else {
- # this is missing the file system data
- if ($bsd_type ne 'darwin'){
- @partitions_working = main::grabber("df -T -k 2>/dev/null");
+ my $file;
+ # $file = "$fake_data_dir/block-devices/df/df-kTP-cygwin-1.txt";
+ # $file = "$fake_data_dir/block-devices/df/df-kT-wrapped-1.txt";
+ # @partitions_working = main::reader($file);
+ }
+ # print Data::Dumper::Dumper \@partitions_working;
+ # Determine positions
+ if (@partitions_working){
+ my $row1 = shift @partitions_working;
+ $row1 =~ s/Mounted on/Mounted-on/i;
+ my @temp = split(/\s+/,$row1);
+ $cols = $#temp;
+ }
+ # NOTE: using -P fixes line wraps, otherwise look for hangs and reconnect
+ if (!$b_dfp){
+ my $holder = '';
+ my @part_temp;
+ foreach (@partitions_working){
+ my @columns= split(/\s+/,$_);
+ if ($#columns < $cols){
+ $holder = join('^^',@columns[0..$#columns]);
+ next;
+ }
+ if ($holder){ # reconnect hanging lines
+ $_ = $holder . ' ' . $_;
+ $holder = '';
+ }
+ push(@part_temp,$_);
}
- #Filesystem 1024-blocks Used Available Capacity iused ifree %iused Mounted on
- else {
- $cols = 8;
- ($back_size,$back_used) = (7,6);
+ @partitions_working = @part_temp;
+ }
+ if (!$bsd_type){
+ # New kernels/df have rootfs and / repeated, creating two entries for the
+ # same partition so check for two string endings of / then slice out the
+ # rootfs one, I could check for it before slicing it out, but doing that
+ # would require the same action twice re code execution.
+ my $roots = 0;
+ foreach (@partitions_working){
+ $roots++ if /\s\/$/;
}
+ @partitions_working = grep {!/^rootfs/} @partitions_working if $roots > 1;
+ }
+ else {
# turns out freebsd uses this junk too
$b_fake_map = 1;
- }
- # busybox only supports -k and -P, openbsd, darwin
- if (!@partitions_working){
- @partitions_working = main::grabber("df -k 2>/dev/null");
- $b_fs = 0;
- $cols = 5 if !$bsd_type || $bsd_type ne 'darwin';
- if (my $path = main::check_program('mount')){
- @mount = main::grabber("$path 2>/dev/null");
+ # darwin k: Filesystem 1024-blocks Used Available Capacity iused ifree %iused Mounted on
+ # linux kT: Filesystem Type 1K-blocks Used Available Use% Mounted on
+ # freebsd kT: Filesystem Type 1024-blocks Used Avail Capacity Mounted on
+ if ($bsd_type eq 'darwin'){
+ ($back_size,$back_used) = (7,6);
}
}
- # determine positions
- my $row1 = shift @partitions_working;
- # new kernels/df have rootfs and / repeated, creating two entries for the same partition
- # so check for two string endings of / then slice out the rootfs one, I could check for it
- # before slicing it out, but doing that would require the same action twice re code execution
- foreach (@partitions_working){
- $roots++ if /\s\/$/;
- }
- @partitions_working = grep {!/^rootfs/} @partitions_working if $roots > 1;
- # IMPORTANT: check the lsblk completer tool check_partition_data() for matching lsblck
- # filters.
- my $filters = 'aufs|cgroup.*|cgmfs|configfs|debugfs|\/dev|dev|\/dev\/loop[0-9]*|';
- $filters .= 'devfs|devtmpfs|fdescfs|iso9660|linprocfs|none|procfs|\/run(\/.*)?|';
- $filters .= 'run|shm|squashfs|sys|\/sys\/.*|sysfs|tmpfs|type|udev|unionfs|vartmp';
- #push @partitions_working, '//mafreebox.freebox.fr/Disque dur cifs 239216096 206434016 20607496 91% /freebox/Disque dur';
- #push @partitions_working, '//mafreebox.freebox.fr/AllPG cifs 436616192 316339304 120276888 73% /freebox/AllPG';
+ my $filters = get_filters('partition');
+ # These are local, not remote, iso, or overlay types:
+ my $fuse_fs = 'adb|apfs(-?fuse)?|archive(mount)?|gphoto|gv|gzip|ifuse|';
+ $fuse_fs .= '[^\.]*mtp|ntfs-?3g|[^\.]*ptp|vdfuse|vram|wim(mount)?|xb|xml';
+ # Just the common ones desktops might have
+ my $remote_fs = 'curlftp|gmail|g(oogle-?)?drive|pnfs|\bnfs|rclone|';
+ $remote_fs .= 's3fs|smb|ssh|vboxsf';
+ # push @partitions_working, '//mafreebox.freebox.fr/Disque dur cifs 239216096 206434016 20607496 91% /freebox/Disque dur';
+ # push @partitions_working, '//mafreebox.freebox.fr/AllPG cifs 436616192 316339304 120276888 73% /freebox/AllPG';
+ # push(@partitions_working,'/dev/loop0p1 iso9660 3424256 3424256 0 100% /media/jason/d-live nf 11.3.0 gn 6555 9555 amd64');
+ # push(@partitions_working,'drvfs 9p 511881212 115074772 396806440 23% /mnt/c');
+ # push(@partitions_working,'drivers 9p 511881212 115074772 396806440 23% /usr/lib/wsl/drivers');
foreach (@partitions_working){
+ ($dev_base,$dev_mapped,$dev_type,$fs,$id,$label,
+ $maj_min,$type,$uuid) = ('','','','','','','','','');
+ ($b_load,$b_space,$block_size,$percent_used,$raw_size,$size_available,
+ $size,$used) = (0,0,0,0,0,0,0,0);
+ undef $part;
# apple crap, maybe also freebsd?
$_ =~ s/^map\s+([\S]+)/map:\/$1/ if $b_fake_map;
- $b_space = 0;
# handle spaces in remote filesystem names
- # busybox df shows KM, sigh.
- if (/^(.*)(\s[\S]+)\s+[a-z][a-z0-9]+\s+[0-9]+/){
+ # busybox df shows KM, sigh; note: GoogleDrive Hogne: fuse.rclone 15728640 316339304 120276888 73%
+ if (/^(.*?)(\s[\S]+)\s+[a-z][a-z0-9\.]+(\s+[0-9]+){3}\s+[0-9]+%\s/){
$replace = $test = "$1$2";
- if ($test =~ /\s/){
+ if ($test =~ /\s/){ # paranoid test, but better safe than sorry
$b_space = 1;
$replace =~ s/\s/^^/g;
- #print ":$replace:\n";
+ # print ":$replace:\n";
$_ =~ s/^$test/$replace/;
- #print "$_\n";
+ # print "$_\n";
}
}
-
- my @row = split /\s+/, $_;
+ my @row = split(/\s+/, $_);
+ # print Data::Dumper::Dumper \@row;
+ $row[0] =~ s/\^\^/ /g if $b_space; # reset spaces in > 1 word fs name
# autofs is a bsd thing, has size 0
- if ($row[0] =~ /^($filters)$/ || $row[0] =~ /^ROOT/i ||
- ($b_fs && ($row[2] == 0 || $row[1] =~ /^(autofs|iso9660|tmpfs)$/ ) )){
+ if ($row[0] =~ /^$filters$/ || $row[0] =~ /^ROOT/i ||
+ ($b_fs && ($row[2] == 0 || $row[1] =~ /^(autofs|devtmpfs|iso9660|tmpfs)$/))){
next;
}
- ($dev_base,$dev_type,$fs,$id,$label,$type,$uuid) = ('','','','','','');
- ($b_load,$block_size,$percent_used,$raw_size,$size_available,
- $size,$used) = (0,0,0,0,0,0,0,0);
- %part = ();
- # NOTE: using -P for linux fixes line wraps, and for bsds, assuming they don't use such long file names
+ # cygwin C:\cygwin passes this test so has to be handled later
if ($row[0] =~ /^\/dev\/|:\/|\/\//){
# this could point to by-label or by-uuid so get that first. In theory, abs_path should
# drill down to get the real path, but it isn't always working.
@@ -12922,67 +21470,76 @@ sub partition_data {
if ($row[0] =~ /by-label|by-uuid/){
$row[0] = Cwd::abs_path($row[0]);
}
- elsif ($row[0] =~ /mapper\// && @mapper){
- $row[0] = get_mapper($row[0],@mapper);
+ elsif ($row[0] =~ /mapper\// && %mapper){
+ $dev_mapped = $row[0];
+ $dev_mapped =~ s|^/.*/||;
+ $row[0] = $mapper{$dev_mapped} if $mapper{$dev_mapped};
+ }
+ elsif ($row[0] =~ /\/dm-[0-9]+$/ && %dmmapper){
+ my $temp = $row[0];
+ $temp =~ s|^/.*/||;
+ $dev_mapped = $dmmapper{$temp};
}
$dev_base = $row[0];
- $dev_base =~ s/^\/dev\///;
- %part = check_lsblk($dev_base,0) if @lsblk;
+ $dev_base =~ s|^/.*/||;
+ $part = LsblkData::get($dev_base) if @lsblk;
+ $maj_min = get_maj_min($dev_base) if @proc_partitions;
}
# this handles zfs type devices/partitions, which do not start with / but contain /
# note: Main/jails/transmission_1 path can be > 1 deep
# Main zfs 3678031340 8156 3678023184 0% /mnt/Main
- if (!$dev_base && ($row[0] =~ /^([^\/]+\/)(.+)/ || ($row[0] =~ /^[^\/]+$/ && $row[1] =~ /^(btrfs|zfs)$/ ) ) ){
+ if (!$dev_base && ($row[0] =~ /^([^\/]+\/)(.+)/ ||
+ ($row[0] =~ /^[^\/]+$/ && $row[1] =~ /^(btrfs|hammer[2-9]?|zfs)$/)) ||
+ ($windows{'wsl'} && $row[0] eq 'drivers')){
$dev_base = $row[0];
- $dev_type = 'raid';
+ $dev_type = 'logical';
}
# this handles yet another fredforfaen special case where a mounted drive
- # has the search string in its name
- if ($row[-1] =~ /^\/$|^\/boot$|^\/var$|^\/var\/tmp$|^\/var\/log$|^\/home$|^\/opt$|^\/tmp$|^\/usr$|^\/usr\/home$/){
+ # has the search string in its name, includes / (|
+ if ($row[-1] =~ m%^/(|boot|boot/efi|home|opt|tmp|usr|usr/home|var|var/log|var/tmp)$% ||
+ ($b_android && $row[-1] =~ /^\/(cache|data|firmware|system)$/)){
$b_load = 1;
# note, older df in bsd do not have file system column
$type = 'main';
}
- elsif ($row[$cols] !~ /^\/$|^\/boot$|^\/var$|^\/var\/tmp$|^\/var\/log$|^\/home$|^\/opt$|^\/tmp$|^\/usr$|^\/usr\/home$|^filesystem/){
+ # $cols in case where mount point has space in name, we only care about the first part
+ elsif ($row[$cols] !~ m%^\/(|boot|boot/efi|home|opt|tmp|usr|usr/home|var|var/log|var/tmp)$% &&
+ $row[$cols] !~ /^filesystem/ &&
+ !($b_android && $row[$cols] =~ /^\/(cache|data|firmware|system)$/)){
$b_load = 1;
$type = 'secondary';
}
if ($b_load){
if (!$bsd_type){
if ($b_fs){
- $fs = (%part && $part{'fs'}) ? $part{'fs'} : $row[1];
+ $fs = ($part->{'fs'}) ? $part->{'fs'} : $row[1];
}
else {
- $fs = get_mounts_fs($row[0],@mount);
+ $fs = get_mounts_fs($row[0],\@mount);
}
- if ($show{'label'}) {
- if (%part && $part{'label'}) {
- $label = $part{'label'};
+ if ($show{'label'}){
+ if ($part->{'label'}){
+ $label = $part->{'label'};
}
- elsif ( @labels){
+ elsif (@labels){
$label = get_label($row[0]);
}
}
- if ($show{'uuid'}) {
- if (%part && $part{'uuid'}) {
- $uuid = $part{'uuid'};
+ if ($show{'uuid'}){
+ if ($part->{'uuid'}){
+ $uuid = $part->{'uuid'};
}
- elsif ( @uuids){
+ elsif (@uuids){
$uuid = get_uuid($row[0]);
}
}
}
else {
- $fs = ($b_fs) ? $row[1]: get_mounts_fs($row[0],@mount);
- if (@gpart && ($show{'label'} || $show{'uuid'} ) ){
- my @extra = get_bsd_label_uuid("$dev_base");
- if (@extra){
- $label = $extra[0];
- $uuid = $extra[1];
- }
- }
+ $fs = ($b_fs) ? $row[1]: get_mounts_fs($row[0],\@mount);
}
- $id = join ' ', @row[$cols .. $#row];
+ # assuming that all null/nullfs are parts of a logical fs
+ $b_logical = 1 if $fs && $fs =~ /^(btrfs|hammer|null|zfs)/;
+ $id = join(' ', @row[$cols .. $#row]);
$size = $row[$cols - $back_size];
if ($b_admin && -e "/sys/block/"){
@working = admin_data($blockdev,$dev_base,$size);
@@ -12990,86 +21547,123 @@ sub partition_data {
$size_available = $working[1];
$block_size = $working[2];
}
- $dev_base =~ s/\^\^/ /g if $b_space;
if (!$dev_type){
- if ($dev_base =~ /^map:\/(.*)/){
+ # C:/cygwin64, D:
+ if ($windows{'cygwin'} && $row[0] =~ /^[A-Z]+:/){
+ $dev_type = 'windows';
+ $dev_base = $row[0] if !$dev_base;
+ # looks weird if D:, yes, I know, windows uses \, but cygwin doesn't
+ $dev_base .= '/' if $dev_base =~ /:$/;
+ }
+ elsif ($windows{'wsl'} && $row[0] =~ /^(drvfs)/){
+ $dev_type = 'windows';
+ if ($id =~ m|^/mnt/([a-z])$|){
+ $dev_base = uc($1) . ':';
+ }
+ $dev_base = $row[0] if !$dev_base;
+ }
+ # need data set, this could maybe be converted to use
+ # dev-mapped and abspath but not without testing
+ elsif ($dev_base =~ /^map:\/(.*)/){
$dev_type = 'mapped';
$dev_base = $1;
}
- # note: I have seen this: beta:data/ for sshfs path
- elsif ($dev_base =~ /^\/\/|:\//){
+ # note: possible: sshfs path: beta:data/; remote: fuse.rclone
+ elsif ($dev_base =~ /^\/\/|:\// || ($fs && $fs =~ /($remote_fs)/i)){
$dev_type = 'remote';
+ $dev_base = $row[0] if !$dev_base; # only trips in fs test case
+ }
+ # a slice bsd system, zfs can't be detected this easily
+ elsif ($b_logical && $fs && $fs =~ /^null(fs)?$/){
+ $dev_type = 'logical';
+ $dev_base = $row[0] if !$dev_base;
}
- # an error has occurred almost for sure
elsif (!$dev_base){
- $dev_type = 'source';
- $dev_base = main::row_defaults('unknown-dev');
+ if ($fs && $fs =~ /^(fuse[\._-]?)?($fuse_fs)(fs)?/i){
+ $dev_base = $2;
+ $dev_type = 'fuse';
+ }
+ # Check dm-crypt, that may be real partition type, but no data.
+ # We've hit something inxi doesn't know about, or error has occured
+ else {
+ $dev_type = 'source';
+ $dev_base = main::message('unknown-dev');
+ }
}
else {
$dev_type = 'dev';
}
}
+ if ($bsd_type && $dev_type eq 'dev' && $row[0] &&
+ ($b_admin || $show{'label'} || $show{'uuid'})){
+ my $temp = DiskDataBSD::get($row[0]);
+ $block_size = $temp->{'logical-block-size'};
+ $label = $temp->{'label'};
+ $uuid = $temp->{'uuid'};
+ }
$used = $row[$cols - $back_used];
- $percent_used = sprintf( "%.1f", ( $used/$size )*100 ) if ($size && main::is_numeric($size) );
- @data = ({
+ $percent_used = sprintf("%.1f", ($used/$size)*100) if ($size && main::is_numeric($size));
+ push(@partitions,{
'block-size' => $block_size,
- 'id' => $id,
'dev-base' => $dev_base,
+ 'dev-mapped' => $dev_mapped,
'dev-type' => $dev_type,
'fs' => $fs,
+ 'id' => $id,
'label' => $label,
- 'raw-size' => $raw_size,
+ 'maj-min' => $maj_min,
+ 'percent-used' => $percent_used,
'raw-available' => $size_available,
+ 'raw-size' => $raw_size,
'size' => $size,
'type' => $type,
'used' => $used,
'uuid' => $uuid,
- 'percent-used' => $percent_used,
});
- @partitions = (@partitions,@data);
}
}
- @data = swap_data();
- @partitions = (@partitions,@data);
- # print Data::Dumper::Dumper \@partitions if $test[16];
+ swap_data() if !$loaded{'set-swap'};
+ push(@partitions,@swaps);
+ print Data::Dumper::Dumper \@partitions if $dbg[16];
if (!$bsd_type && @lsblk){
- @data = check_partition_data();
- @partitions = (@partitions,@data) if @data;
+ check_partition_data();# updates @partitions
}
main::log_data('dump','@partitions',\@partitions) if $b_log;
- print Data::Dumper::Dumper \@partitions if $test[16];
+ print Data::Dumper::Dumper \@partitions if $dbg[16];
eval $end if $b_log;
}
sub swap_data {
eval $start if $b_log;
- return @swaps if $b_swaps;
- $b_swaps = 1;
+ $loaded{'set-swap'} = 1;
my (@data,@working);
- my ($cache_pressure,$dev_base,$dev_type,$label,$mount,$path,
- $pattern1,$pattern2,$percent_used,$priority,$size,$swap_type,
- $swappiness,$used,$uuid);
+ my ($block_size,$cache_pressure,$dev_base,$dev_mapped,$dev_type,$label,
+ $maj_min,$mount,$path,$pattern1,$pattern2,$percent_used,$priority,
+ $size,$swap_type,$swappiness,$used,$uuid,$zram_comp,$zram_mcs,
+ $zswap_enabled,$zram_comp_avail,$zswap_comp,$zswap_mpp);
my ($s,$j,$size_id,$used_id) = (1,0,2,3);
if (!$bsd_type){
# faster, avoid subshell, same as swapon -s
- if ( -r '/proc/swaps'){
+ if (-r '/proc/swaps'){
@working = main::reader("/proc/swaps");
}
- elsif ( $path = main::check_program('swapon') ){
+ elsif ($path = main::check_program('swapon')){
# note: while -s is deprecated, --show --bytes is not supported
# on older systems
@working = main::grabber("$path -s 2>/dev/null");
}
if ($b_admin){
- @data = swap_advanced_data();
- $swappiness = $data[0];
- $cache_pressure = $data[1];
+ swap_advanced_data(\$swappiness,\$cache_pressure,\$zswap_enabled,
+ \$zswap_comp,\$zswap_mpp);
+ }
+ if (($show{'label'} || $show{'uuid'}) && !$loaded{'label-uuid'}){
+ set_label_uuid();
}
$pattern1 = 'partition|file|ram';
$pattern2 = '[^\s].*[^\s]';
}
else {
- if ( $path = main::check_program('swapctl') ){
+ if ($path = main::check_program('swapctl')){
# output in in KB blocks
@working = main::grabber("$path -l -k 2>/dev/null");
}
@@ -13082,13 +21676,20 @@ sub swap_data {
# data, it's the same exact output as swapon -s
foreach (@working){
#next if ! /^\/dev/ || /^\/dev\/(ramzwap|zram)/;
- next if /^(Device|Filename)/;
- ($dev_base,$dev_type,$label,$mount,$priority,
- $swap_type,$uuid) = ('','','','',undef,'partition','');
- @data = split /\s+/, $_;
- if (/^\/dev\/(compcache|ramzwap|zram)/i){
+ next if /^(Device|Filename|no swap)/;
+ ($block_size,$dev_base,$dev_mapped,$dev_type,$label,$maj_min,$mount,
+ $swap_type,$uuid) = ('','','','','','','','partition','');
+ ($priority,$zram_comp_avail,$zram_comp,$zram_mcs) = ();
+ @data = split(/\s+/, $_);
+ # /dev/zramX; ramzswapX == compcache, legacy version of zram.
+ # /run/initramfs/dev/zram0; /dev/ramzswap0
+ if (/^\/(dev|run).*?\/((compcache|ramzwap|zram)\d+)/i){
+ $dev_base = $2;
$swap_type = 'zram';
$dev_type = 'dev';
+ if ($b_admin){
+ zram_data($dev_base,\$zram_comp,\$zram_comp_avail,\$zram_mcs);
+ }
}
elsif ($data[1] && $data[1] eq 'ram'){
$swap_type = 'ram';
@@ -13097,20 +21698,27 @@ sub swap_data {
$swap_type = 'partition';
$dev_base = $data[0];
$dev_base =~ s|^/dev/||;
- if ($show{'label'} && @labels){
- $label = get_label($data[0]);
- }
- if ($show{'uuid'} && @uuids){
- $uuid = get_uuid($data[0]);
+ if (!$bsd_type){
+ if ($dev_base =~ /^dm-/ && %dmmapper){
+ $dev_mapped = $dmmapper{$dev_base};
+ }
+ if ($show{'label'} && @labels){
+ $label = get_label($data[0]);
+ }
+ if ($show{'uuid'} && @uuids){
+ $uuid = get_uuid($data[0]);
+ }
}
- if ($bsd_type && @gpart && ($show{'label'} || $show{'uuid'} ) ){
- my @extra = get_bsd_label_uuid("$dev_base");
- if (@extra){
- $label = $extra[0];
- $uuid = $extra[1];
+ else {
+ if ($show{'label'} || $show{'uuid'}){
+ my $temp = DiskDataBSD::get($data[0]);
+ $block_size = $temp->{'logical-block-size'};
+ $label = $temp->{'label'};
+ $uuid = $temp->{'uuid'};
}
}
$dev_type = 'dev';
+ $maj_min = get_maj_min($dev_base) if @proc_partitions;
}
elsif ($data[1] && $data[1] eq 'file' || m|^/|){
$swap_type = 'file';
@@ -13124,15 +21732,19 @@ sub swap_data {
}
$size = $data[$size_id];
$used = $data[$used_id];
- $percent_used = sprintf( "%.1f", ( $used/$size )*100 );
- @data = ({
+ $percent_used = sprintf("%.1f", ($used/$size)*100);
+ push(@swaps, {
+ 'block-size' => $block_size,
'cache-pressure' => $cache_pressure,
'dev-base' => $dev_base,
+ 'dev-mapped' => $dev_mapped,
'dev-type' => $dev_type,
'fs' => 'swap',
'id' => "swap-$s",
'label' => $label,
+ 'maj-min' => $maj_min,
'mount' => $mount,
+ 'percent-used' => $percent_used,
'priority' => $priority,
'size' => $size,
'swappiness' => $swappiness,
@@ -13140,215 +21752,250 @@ sub swap_data {
'swap-type' => $swap_type,
'used' => $used,
'uuid' => $uuid,
- 'percent-used' => $percent_used,
+ 'zram-comp' => $zram_comp,
+ 'zram-comp-avail' => $zram_comp_avail,
+ 'zram-max-comp-streams' => $zram_mcs,
+ 'zswap-enabled' => $zswap_enabled,
+ 'zswap-compressor' => $zswap_comp,
+ 'zswap-max-pool-percent' => $zswap_mpp,
});
- @swaps = (@swaps,@data);
$s++;
}
main::log_data('dump','@swaps',\@swaps) if $b_log;
- print Data::Dumper::Dumper \@swaps if $test[15];;
+ print Data::Dumper::Dumper \@swaps if $dbg[15];;
eval $end if $b_log;
- return @swaps;
}
+
+# Alll by ref: 0: $swappiness; 1: $cache_pressure; 2: $zswap_enabled;
+# 3: $zswap_comp; 4: $zswap_mpp
sub swap_advanced_data {
eval $start if $b_log;
- my ($swappiness,$cache_pressure) = (undef,undef);
- if (-r "/proc/sys/vm/swappiness"){
- $swappiness = (main::reader("/proc/sys/vm/swappiness"))[0];
- if (defined $swappiness){
- $swappiness .= ($swappiness == 60) ? ' (default)' : ' (default 60)' ;
+ if (-r '/proc/sys/vm/swappiness'){
+ ${$_[0]} = main::reader('/proc/sys/vm/swappiness','',0);
+ if (defined ${$_[0]}){
+ ${$_[0]} .= (${$_[0]} == 60) ? ' (default)' : ' (default 60)' ;
}
}
- if (-r "/proc/sys/vm/vfs_cache_pressure"){
- $cache_pressure = (main::reader("/proc/sys/vm/vfs_cache_pressure"))[0];
- if (defined $cache_pressure){
- $cache_pressure .= ($cache_pressure == 100) ? ' (default)' : ' (default 100)' ;
+ if (-r '/proc/sys/vm/vfs_cache_pressure'){
+ ${$_[1]} = main::reader('/proc/sys/vm/vfs_cache_pressure','',0);
+ if (defined ${$_[1]}){
+ ${$_[1]} .= (${$_[1]}== 100) ? ' (default)' : ' (default 100)' ;
}
}
- eval $end if $b_log;
- return ($swappiness,$cache_pressure);
-}
-sub get_mounts_fs {
- eval $start if $b_log;
- my ($item,@mount) = @_;
- $item =~ s/map:\/(\S+)/map $1/ if $bsd_type && $bsd_type eq 'darwin';
- return 'N/A' if ! @mount;
- my ($fs) = ('');
- # linux: /dev/sdb6 on /var/www/m type ext4 (rw,relatime,data=ordered)
- # /dev/sda3 on /root.dev/ugw type ext3 (rw,relatime,errors=continue,user_xattr,acl,barrier=1,data=journal)
- # bsd: /dev/ada0s1a on / (ufs, local, soft-updates)
- foreach (@mount){
- if ($bsd_type && $_ =~ /^$item\son.*\(([^,\s\)]+)[,\s]*.*\)/){
- $fs = $1;
- last;
- }
- elsif (!$bsd_type && $_ =~ /^$item\son.*\stype\s([\S]+)\s\([^\)]+\)/){
- $fs = $1;
- last;
- }
- }
- eval $end if $b_log;
- main::log_data('data',"fs: $fs") if $b_log;
- return $fs;
-}
-# 1. Name: ada1p1
-# label: (null)
-# label: ssd-root
-# rawuuid: b710678b-f196-11e1-98fd-021fc614aca9
-sub get_bsd_label_uuid {
- eval $start if $b_log;
- my ($item) = @_;
- my (@data,$b_found);
- foreach (@gpart){
- my @working = split /\s*:\s*/, $_;
- if ($_ =~ /^[0-9]+\.\sName:/ && $working[1] eq $item){
- $b_found = 1;
- }
- elsif ($_ =~ /^[0-9]+\.\sName:/ && $working[1] ne $item){
- $b_found = 0;
+ if (-r '/sys/module/zswap/parameters/enabled'){
+ ${$_[2]} = main::reader('/sys/module/zswap/parameters/enabled','',0);
+ if (${$_[2]} =~ /^(Y|yes|true|1)$/){
+ ${$_[2]} = 'yes';
}
- if ($b_found){
- if ($working[0] eq 'label'){
- $data[0] = $working[1];
- $data[0] =~ s/\(|\)//g; # eg: label:(null) - we want to show null
- }
- if ($working[0] eq 'rawuuid'){
- $data[1] = $working[1];
- $data[0] =~ s/\(|\)//g;
- }
- }
- }
- main::log_data('dump','@data',\@data) if $b_log;
- eval $end if $b_log;
- return @data;
-}
-sub set_label_uuid {
- eval $start if $b_log;
- $b_label_uuid = 1;
- if ( $show{'unmounted'} || $show{'label'} || $show{'uuid'} ){
- if (!$bsd_type){
- if (-d '/dev/disk/by-label'){
- @labels = main::globber('/dev/disk/by-label/*');
- }
- if (-d '/dev/disk/by-uuid'){
- @uuids = main::globber('/dev/disk/by-uuid/*');
- }
+ elsif (${$_[2]} =~ /^(N|no|false|0)$/){
+ ${$_[2]} = 'no';
}
else {
- if ( my $path = main::check_program('gpart')){
- @gpart = main::grabber("$path list 2>/dev/null",'strip');
- }
+ ${$_[2]} = 'unset';
}
}
- eval $end if $b_log;
-}
-sub set_lsblk {
- eval $start if $b_log;
- $b_lsblk = 1;
- my (@temp,@working);
- if (my $program = main::check_program('lsblk')){
- @working = main::grabber("$program -bP --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC 2>/dev/null");
- foreach (@working){
- if (/NAME="([^"]*)"\s+TYPE="([^"]*)"\s+RM="([^"]*)"\s+FSTYPE="([^"]*)"\s+SIZE="([^"]*)"\s+LABEL="([^"]*)"\s+UUID="([^"]*)"\s+SERIAL="([^"]*)"\s+MOUNTPOINT="([^"]*)"\s+PHY-SEC="([^"]*)"\s+LOG-SEC="([^"]*)"/){
- my $size = ($5) ? $5/1024: 0;
- # some versions of lsblk do not return serial, fs, uuid, or label
- @temp = ({
- 'name' => $1,
- 'type' => $2,
- 'rm' => $3,
- 'fs' => $4,
- 'size' => $size,
- 'label' => $6,
- 'uuid' => $7,
- 'serial' => $8,
- 'mount' => $9,
- 'block-physical' => $10,
- 'block-logical' => $11,
- });
- @lsblk = (@lsblk,@temp);
- }
- }
+ if (-r '/sys/module/zswap/parameters/compressor'){
+ ${$_[3]} = main::reader('/sys/module/zswap/parameters/compressor','',0);
+ }
+ if (-r '/sys/module/zswap/parameters/max_pool_percent'){
+ ${$_[4]} = main::reader('/sys/module/zswap/parameters/max_pool_percent','',0);
}
- #print Data::Dumper::Dumper \@lsblk;
- main::log_data('dump','@lsblk',\@lsblk) if $b_log;
eval $end if $b_log;
}
-sub check_lsblk {
- eval $start if $b_log;
- my ($name,$b_size) = @_;
- my (%part);
- foreach my $ref (@lsblk){
- my %row = %$ref;
- next if ! $row{'name'};
- if ($name eq $row{'name'}){
- %part = %row;
- last;
+
+# 0: device id [zram0]; by ref: 1: $zram_comp; 2: $zram_comp_avail; 3: $zram_mcs;
+sub zram_data {
+ if (-r "/sys/block/$_[0]/comp_algorithm"){
+ ${$_[2]} = main::reader("/sys/block/$_[0]/comp_algorithm",'',0);
+ # current is in [..] in list
+ if (${$_[2]} =~ /\[(\S+)\]/){
+ ${$_[1]} = $1;
+ # dump the active one, and leave the available
+ ${$_[2]} =~ s/\[${$_[1]}\]//;
+ ${$_[2]} =~ s/^\s+|\s+$//g;
+ ${$_[2]} =~ s/\s+/,/g;
}
}
- # print Data::Dumper::Dumper \%part;
- main::log_data('dump','%part',\%part) if $b_log;
- eval $end if $b_log;
- return %part;
+ if (-r "/sys/block/$_[0]/max_comp_streams"){
+ ${$_[3]} = main::reader("/sys/block/$_[0]/max_comp_streams",'',0);
+ }
}
-# handle cases of hidden file systems
+
+# Handle cases of hidden file systems
sub check_partition_data {
eval $start if $b_log;
- my ($b_found,@data,@temp);
- # NOTE: these filters must match the fs filters in the main partition data sub!!
- my $fs_filters = 'aufs|cgmfs|configfs|devfs|devtmpfs|';
- $fs_filters .= 'fdescfs|linprocfs|procfs|squashfs|swap|';
- $fs_filters .= 'sysfs|tmpfs|unionfs';
- foreach my $ref (@lsblk){
- my %row = %$ref;
+ my ($b_found,$dev_mapped,$temp);
+ my $filters = get_filters('partition');
+ foreach my $row (@lsblk){
$b_found = 0;
- if (!$row{'name'} || !$row{'mount'} || !$row{'type'} ||
- ($row{'fs'} && $row{'fs'} =~ /^($fs_filters)$/) ||
- ($row{'type'} =~ /^(disk|loop|rom)$/)){
+ $dev_mapped = '';
+ if (!$row->{'name'} || !$row->{'mount'} || !$row->{'type'} ||
+ ($row->{'fs'} && $row->{'fs'} =~ /^$filters$/) ||
+ ($row->{'type'} =~ /^(disk|loop|rom)$/)){
next;
}
- #print "$row{'name'} $row{'mount'}\n";
- foreach my $ref2 (@partitions){
- my %row2 = %$ref2;
- #print "m:$row{'mount'} id:$row2{'id'}\n";
- next if !$row2{'id'};
- if ($row{'mount'} eq $row2{'id'}){
+ # unmap so we can match name to dev-base
+ if (%mapper && $mapper{$row->{'name'}}){
+ $dev_mapped = $row->{'name'};
+ $row->{'name'} = $mapper{$row->{'name'}};
+ }
+ # print "$row->{'name'} $row->{'mount'}\n";
+ foreach my $row2 (@partitions){
+ # print "1: n:$row->{'name'} m:$row->{'mount'} db:$row2->{'dev-base'} id:$row2->{'id'}\n";
+ next if !$row2->{'id'};
+ # note: for swap mount point is [SWAP] in @lsblk, but swap-x in @partitions
+ if ($row->{'mount'} eq $row2->{'id'} || $row->{'name'} eq $row2->{'dev-base'}){
$b_found = 1;
last;
}
+ # print "m:$row->{'mount'} id:$row2->{'id'}\n";
}
if (!$b_found){
- #print "found: $row{'name'} $row{'mount'}\n";
- @temp = ({
- 'dev-base' => $row{'name'},
- 'fs' => $row{'fs'},
- 'id' => $row{'mount'},
+ # print "found: n:$row->{'name'} m:$row->{'mount'}\n";
+ $temp = {
+ 'block-logical' => $row->{'block-logical'},
+ 'dev-base' => $row->{'name'},
+ 'dev-mapped' => $dev_mapped,
+ 'fs' => $row->{'fs'},
+ 'id' => $row->{'mount'},
'hidden' => 1,
- 'label' => $row{'label'},
- 'raw-size' => $row{'size'},
+ 'label' => $row->{'label'},
+ 'maj-min' => $row->{'maj-min'},
+ 'percent-used' => 0,
+ 'raw-size' => $row->{'size'},
'size' => 0,
'type' => 'secondary',
'used' => 0,
- 'uuid' => $row{'uuid'},
- 'percent-used' => 0,
- });
- @partitions = (@partitions,@temp);
- main::log_data('dump','lsblk check: @temp',\@temp) if $b_log;
+ 'uuid' => $row->{'uuid'},
+ };
+ push(@partitions,$temp);
+ main::log_data('dump','lsblk check: @temp',$temp) if $b_log;
+ }
+ }
+ eval $end if $b_log;
+}
+
+# fs-exclude: Excludes fs size from disk used total;
+# fs-skip: do not display label/uuid fields from partition/unmounted/swap.
+# partition: do not use this partition in -p output.
+# args: 0: [fs-exclude|fs-skip|partition]
+sub get_filters {
+ set_filters() if !$fs_exclude;
+ if ($_[0] eq 'fs-exclude'){
+ return $fs_exclude;
+ }
+ elsif ($_[0] eq 'fs-skip'){
+ return $fs_skip;
+ }
+ elsif ($_[0] eq 'partition'){
+ return $part_filter;
+ }
+}
+
+# See docs/inxi-partitions.txt FILE SYSTEMS for specific fs info.
+# The filter string must match /^[regex]$/ exactly.
+sub set_filters {
+ # Notes: appimage/flatpak mount?; astreamfs reads remote http urls;
+ # avfs == fuse; cgmfs,vramfs in ram, like devfs, sysfs; gfs = googlefs;
+ # hdfs == hadoop; ifs == integrated fs; pvfs == orangefs; smb == cifs;
+ # null == hammer fs slice; kfs/kosmosfs == CloudStore;
+ # snap mounts with squashfs; swap is set in swap_data(); vdfs != vdfuse;
+ # vramfs == like zram except gpu ram;
+ # Some can be fuse mounts: fuse.sshfs.
+ # Distributed/Remote: 9p, (open-)?afs, alluxio, astreamfs, beegfs,
+ # cephfs, cfs, chironfs, cifs, cloudstore, dfs, davfs, dce,
+ # gdrivefs, gfarm, gfs\d{0,2}, gitfs, glusterfs, gmailfs, gpfs,
+ # hdfs, httpdirfs, hubicfuse, ipfs, juice, k(osmos)?fs, .*lafs, lizardfs,
+ # lustre, magma, mapr, moosefs, nfs[34], objective, ocfs\d{0,2}, onefs,
+ # orangefs, panfs, pnfs, pvfs\d{0,2}, rclone, restic, rozofs, s3fs, scality,
+ # sfs, sheepdogfs, spfs, sshfs, smbfs, v9fs, vboxsf, vdfs, vmfs, wekafs,
+ # xtreemfs
+ # Stackable/Union: aufs, e?cryptfs, encfs, erofs, gocryptfs, ifs, lofs,
+ # mergerfs, mhddfs, overla(id|y)(fs)?, squashfs, unionfs;
+ # ISO/Archive: archive(mount)?, atlas, avfs. borg, erofs, fuse-archive,
+ # fuseiso, gzipfs, iso9660, lofs, vdfuse, wimmountfs, xbfuse
+ # FUSE: adbfs, apfs-fuse, atomfs, gvfs, gvfs-mtp, ifuse, jmtpfs, mtpfs, ptpfs,
+ # puzzlefs, simple-mtpfs, vramfs, xmlfs
+ # System fs: cgmfs, configfs, debugfs, devfs, devtmpfs, efivarfs, fdescfs,
+ # hugetlbfs, kernfs, linprocfs, linsysfs, lxcfs, procfs, ptyfs, run,
+ # securityfs, shm, swap, sys, sysfs, tmpfs, tracefs, type, udev, vartmp
+ # System dir: /dev, /dev/(block/)?loop[0-9]+, /run(/.*)?, /sys/.*
+
+ ## These are global, all filters use these. ISO, encrypted/stacked
+ my @all = qw%au av e?crypt enc ero gocrypt i (fuse-?)?iso iso9660 lo merger
+ mhdd overla(id|y) splitview(-?fuse)? squash union vboxsf xbfuse%;
+ ## These are fuse/archive/distributed/remote/clustered mostly
+ my @exclude = (@all,qw%9p (open-?)?a adb archive(mount)? astream atlas atom
+ beeg borg c ceph chiron ci cloudstore curlftp d dav dce
+ g gdrive gfarm git gluster gmail gocrypt google-drive-ocaml gp gphoto gv gzip
+ hd httpd hubic ip juice k(osmos)? .*la lizard lustre magma mapr moose .*mtp
+ null p?n objective oc one orange pan .*ptp puzzle pv rclone restic rozo
+ s s3 scality sheepdog sp ssh smb v9 vd vm vram weka wim(mount)? xb xml
+ xtreem%);
+ # Various RAM based system FS
+ my @partition = (@all,qw%cgroup.* cgm config debug dev devtmp efivar fdesc
+ hugetlb kern linproc linsys lxc none proc pty run security shm swap sys
+ tmp trace type udev vartmp%);
+ my $begin = '(fuse(blk)?[\._-]?)?(';
+ my $end = ')([\._-]?fuse)?(fs)?\d{0,2}';
+ $fs_exclude = $begin . join('|',@exclude) . $end;
+ $fs_skip = $begin . join('|',@exclude,'f') . $end; # apfs?; BSD ffs has no u/l
+ $part_filter = '((' . join('|',@partition) . ')(fs)?|';
+ $part_filter .= '\/dev|\/dev\/(block\/)?loop[0-9]+|\/run(\/.*)?|\/sys\/.*)';
+ # print "$part_filter\n";
+}
+
+sub get_mounts_fs {
+ eval $start if $b_log;
+ my ($item,$mount) = @_;
+ $item =~ s/map:\/(\S+)/map $1/ if $bsd_type && $bsd_type eq 'darwin';
+ return 'N/A' if ! @$mount;
+ my ($fs) = ('');
+ # linux: /dev/sdb6 on /var/www/m type ext4 (rw,relatime,data=ordered)
+ # /dev/sda3 on /root.dev/ugw type ext3 (rw,relatime,errors=continue,user_xattr,acl,barrier=1,data=journal)
+ # bsd: /dev/ada0s1a on / (ufs, local, soft-updates)
+ # bsd 2: /dev/wd0g on /home type ffs (local, nodev, nosuid)
+ foreach (@$mount){
+ if ($_ =~ /^$item\s+on.*?\s+type\s+([\S]+)\s+\([^\)]+\)/){
+ $fs = $1;
+ last;
+ }
+ elsif ($_ =~ /^$item\s+on.*?\s+\(([^,\s\)]+?)[,\s]*.*\)/){
+ $fs = $1;
+ last;
}
}
eval $end if $b_log;
- return @data;
+ main::log_data('data',"fs: $fs") if $b_log;
+ return $fs;
}
-# args: 1: blockdev full path (part only); 2: block id; 3: size (part only)
+
+sub set_label_uuid {
+ eval $start if $b_log;
+ $loaded{'label-uuid'} = 1;
+ if ($show{'unmounted'} || $show{'label'} || $show{'swap'} || $show{'uuid'}){
+ if (-d '/dev/disk/by-label'){
+ @labels = main::globber('/dev/disk/by-label/*');
+ }
+ if (-d '/dev/disk/by-uuid'){
+ @uuids = main::globber('/dev/disk/by-uuid/*');
+ }
+ main::log_data('dump', '@labels', \@labels) if $b_log;
+ main::log_data('dump', '@uuids', \@uuids) if $b_log;
+ }
+ eval $end if $b_log;
+}
+
+# args: 0: blockdev full path (part only); 1: block id; 2: size (part only)
sub admin_data {
eval $start if $b_log;
my ($blockdev,$id,$size) = @_;
# 0: calc block 1: available percent 2: disk physical block size/partition block size;
my @sizes = (0,0,0);
my ($block_size,$percent,$size_raw) = (0,0,0);
- foreach (@proc_partitions){
- my @row = split /\s+/, $_;
- if ($row[-1] eq $id){
- $size_raw = $row[2];
+ foreach my $row (@proc_partitions){
+ if ($row->[-1] eq $id){
+ $size_raw = $row->[2];
last;
}
}
@@ -13358,7 +22005,7 @@ sub admin_data {
$size_raw = 'N/A';
}
else {
- $percent = sprintf("%.2f", ($size/$size_raw ) * 100) if $size && $size_raw;
+ $percent = sprintf("%.2f", ($size/$size_raw) * 100) if $size && $size_raw;
}
# print "$id size: $size %: $percent p-b: $block_size raw: $size_raw\n";
@sizes = ($size_raw,$percent,$block_size);
@@ -13366,6 +22013,21 @@ sub admin_data {
eval $end if $b_log;
return @sizes;
}
+
+sub get_maj_min {
+ eval $start if $b_log;
+ my ($id) = @_;
+ my ($maj_min,@working);
+ foreach my $row (@proc_partitions){
+ if ($id eq $row->[-1]){
+ $maj_min = $row->[0] . ':' . $row->[1];
+ last;
+ }
+ }
+ eval $end if $b_log;
+ return $maj_min;
+}
+
sub get_label {
eval $start if $b_log;
my ($item) = @_;
@@ -13383,24 +22045,7 @@ sub get_label {
eval $end if $b_log;
return $label;
}
-# args: $1 - dev item $2 - @mapper
-# check for mapper, then get actual dev item if mapped
-# /dev/mapper/ will usually be a symbolic link to the real /dev id
-sub get_mapper {
- eval $start if $b_log;
- my ($item,@mapper) = @_;
- my $mapped = '';
- foreach (@mapper){
- if ($item eq $_){
- my $temp = Cwd::abs_path($_);
- $mapped = $temp if $temp;
- last;
- }
- }
- $mapped ||= $item;
- eval $end if $b_log;
- return $mapped;
-}
+
sub get_root {
eval $start if $b_log;
my ($path) = ('/dev/root');
@@ -13444,621 +22089,1175 @@ sub get_uuid {
}
}
-## ProcessData
+## ProcessItem
{
-package ProcessData;
+package ProcessItem;
+# header:
+# 0: CMD
+# 1: PID
+# 2: %CPU
+# 3: %MEM
+# 4: RSS
+my $header;
sub get {
eval $start if $b_log;
my $num = 0;
- my (@processes,@rows);
+ my $rows = [];
if (@ps_aux){
+ $header = $ps_data{'header'}; # will always be set if @ps_aux
if ($show{'ps-cpu'}){
- @rows = cpu_processes();
- @processes = (@processes,@rows);
+ cpu_processes($rows);
}
if ($show{'ps-mem'}){
- @rows = mem_processes();
- @processes = (@processes,@rows);
+ mem_processes($rows);
}
}
else {
my $key = 'Message';
- @rows = ({
- main::key($num++,0,1,$key) => main::row_defaults('ps-data-null',''),
- },);
- @processes = (@processes,@rows);
+ push(@$rows, {
+ main::key($num++,0,1,$key) => main::message('ps-data-null','')
+ });
}
- return @processes;
eval $end if $b_log;
+ return $rows;
}
+
sub cpu_processes {
eval $start if $b_log;
+ my $rows = $_[0];
my ($j,$num,$cpu,$cpu_mem,$mem,$pid) = (0,0,'','','','');
- my ($pid_col,@processes,@rows);
- my $count = ($b_irc)? 5: $ps_count;
- if ($ps_cols >= 10){
- @rows = sort {
- my @a = split(/\s+/,$a);
- my @b = split(/\s+/,$b);
- $b[2] <=> $a[2] } @ps_aux;
- $pid_col = 1;
+ my (@ps_rows);
+ my $count = ($b_irc)? 5 : $ps_count;
+ if (defined $header->[2]){
+ @ps_rows = sort {
+ my @a = split(/\s+/, $a);
+ my @b = split(/\s+/, $b);
+ $b[$header->[2]] <=> $a[$header->[2]]
+ } @ps_aux;
}
else {
- @rows = @ps_aux;
- $pid_col = 0 if $ps_cols == 2;
+ @ps_rows = @ps_aux;
}
+ @ps_rows = splice(@ps_rows,0,$count);
+ $j = scalar @ps_rows;
# if there's a count limit, for irc, etc, only use that much of the data
- @rows = splice @rows,0,$count;
-
- $j = scalar @rows;
- # $cpu_mem = ' - Memory: MiB / % used' if $extra > 0;
- my $throttled = throttled($ps_count,$count,$j);
- #my $header = "CPU % used - Command - pid$cpu_mem - top";
- #my $header = "Top $count by CPU";
- my @data = ({
- main::key($num++,1,1,'CPU top') => "$count$throttled" . ' of ' . scalar @ps_aux,
- },);
- @processes = (@processes,@data);
+ my $throttled = throttled($ps_count,$count);
+ push(@$rows,{
+ main::key($num++,1,1,'CPU top') => "$count$throttled" . ' of ' . scalar @ps_aux
+ });
my $i = 1;
- foreach (@rows){
+ foreach (@ps_rows){
$num = 1;
- $j = scalar @processes;
- my @row = split /\s+/, $_;
- my @command = process_starter(scalar @row, $row[$ps_cols],$row[$ps_cols + 1]);
- $cpu = ($ps_cols >= 10 ) ? $row[2] . '%': 'N/A';
- @data = ({
+ $j = scalar @$rows;
+ my @row = split(/\s+/, $_);
+ my $command = process_starter(
+ scalar @row,
+ $row[$header->[0]],
+ $row[$header->[0] + 1]
+ );
+ $cpu = (defined $header->[2]) ? $row[$header->[2]] . '%': 'N/A';
+ push(@$rows,{
main::key($num++,1,2,$i++) => '',
main::key($num++,0,3,'cpu') => $cpu,
- main::key($num++,1,3,'command') => $command[0],
- },);
- @processes = (@processes,@data);
- if ($command[1]) {
- $processes[$j]{main::key($num++,0,4,'started by')} = $command[1];
+ main::key($num++,1,3,'command') => $command->[0],
+ });
+ if ($command->[1]){
+ $rows->[$j]{main::key($num++,0,4,'started-by')} = $command->[1];
}
- $pid = (defined $pid_col)? $row[$pid_col] : 'N/A';
- $processes[$j]{main::key($num++,0,3,'pid')} = $pid;
- if ($extra > 0 && $ps_cols >= 10){
- my $decimals = ($row[5]/1024 > 10 ) ? 1 : 2;
- $mem = (defined $row[5]) ? sprintf( "%.${decimals}f", $row[5]/1024 ) . ' MiB' : 'N/A';
- $mem .= ' (' . $row[3] . '%)';
- $processes[$j]{main::key($num++,0,3,'mem')} = $mem;
+ $pid = (defined $header->[1])? $row[$header->[1]] : 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'pid')} = $pid;
+ if ($extra > 0 && defined $header->[4]){
+ my $decimals = ($row[$header->[4]]/1024 > 10) ? 1 : 2;
+ $mem = (defined $row[$header->[4]]) ? sprintf("%.${decimals}f", $row[$header->[4]]/1024) . ' MiB' : 'N/A';
+ $mem .= ' (' . $row[$header->[3]] . '%)';
+ $rows->[$j]{main::key($num++,0,3,'mem')} = $mem;
}
- #print Data::Dumper::Dumper \@processes, "i: $i; j: $j ";
+ # print Data::Dumper::Dumper \@processes, "i: $i; j: $j ";
}
eval $end if $b_log;
- return @processes;
}
+
sub mem_processes {
eval $start if $b_log;
+ my $rows = $_[0];
my ($j,$num,$cpu,$cpu_mem,$mem,$pid) = (0,0,'','','','');
- my (@data,$pid_col,@processes,$memory,@rows);
- my $count = ($b_irc)? 5: $ps_count;
- if ($ps_cols >= 10){
- @rows = sort {
- my @a = split(/\s+/,$a);
- my @b = split(/\s+/,$b);
- $b[5] <=> $a[5] } @ps_aux; # 5
- #$a[1] <=> $b[1] } @ps_aux; # 5
- $pid_col = 1;
+ my (@data,$memory,@ps_rows);
+ my $count = ($b_irc)? 5 : $ps_count;
+ if (defined $header->[4]){
+ @ps_rows = sort {
+ my @a = split(/\s+/, $a);
+ my @b = split(/\s+/, $b);
+ $b[$header->[4]] <=> $a[$header->[4]]
+ } @ps_aux;
}
else {
- @rows = @ps_aux;
- $pid_col = 0 if $ps_cols == 2;
- }
- @rows = splice @rows,0,$count;
- #print Data::Dumper::Dumper \@rows;
- @processes = main::get_memory_data_full('process') if !$b_mem;
- $j = scalar @rows;
- my $throttled = throttled($ps_count,$count,$j);
- #$cpu_mem = ' - CPU: % used' if $extra > 0;
- #my $header = "Memory MiB/% used - Command - pid$cpu_mem - top";
- #my $header = "Top $count by Memory";
- @data = ({
- main::key($num++,1,1,'Memory top') => "$count$throttled" . ' of ' . scalar @ps_aux,
- },);
- @processes = (@processes,@data);
+ @ps_rows = @ps_aux;
+ }
+ @ps_rows = splice(@ps_rows,0,$count);
+ # print Data::Dumper::Dumper \@rows;
+ if (!$loaded{'memory'}){
+ my $row = {};
+ main::MemoryData::row('process',$row,\$num,1);
+ push(@$rows,$row);
+ $num = 0;
+ }
+ $j = scalar @$rows;
+ my $throttled = throttled($ps_count,$count);
+ push(@$rows, {
+ main::key($num++,1,1,'Memory top') => "$count$throttled" . ' of ' . scalar @ps_aux
+ });
my $i = 1;
- foreach (@rows){
+ foreach (@ps_rows){
$num = 1;
- $j = scalar @processes;
- my @row = split /\s+/, $_;
- if ($ps_cols >= 10){
- my $decimals = ($row[5]/1024 > 10 ) ? 1 : 2;
- $mem = (main::is_int($row[5])) ? sprintf( "%.${decimals}f", $row[5]/1024 ) . ' MiB' : 'N/A';
- $mem .= " (" . $row[3] . "%)";
+ $j = scalar @$rows;
+ my @row = split(/\s+/, $_);
+ if (defined $header->[4]){
+ my $decimals = ($row[$header->[4]]/1024 > 10) ? 1 : 2;
+ $mem = (main::is_int($row[$header->[4]])) ?
+ sprintf("%.${decimals}f", $row[$header->[4]]/1024) . ' MiB' : 'N/A';
+ $mem .= " (" . $row[$header->[3]] . "%)";
}
else {
$mem = 'N/A';
}
- my @command = process_starter(scalar @row, $row[$ps_cols],$row[$ps_cols + 1]);
- @data = ({
+ my $command = process_starter(scalar @row, $row[$header->[0]],$row[$header->[0] + 1]);
+ push(@$rows,{
main::key($num++,1,2,$i++) => '',
main::key($num++,0,3,'mem') => $mem,
- main::key($num++,1,3,'command') => $command[0],
- },);
- @processes = (@processes,@data);
- if ($command[1]) {
- $processes[$j]{main::key($num++,0,4,'started by')} = $command[1];
+ main::key($num++,1,3,'command') => $command->[0],
+ });
+ if ($command->[1]){
+ $rows->[$j]{main::key($num++,0,4,'started-by')} = $command->[1];
}
- $pid = (defined $pid_col)? $row[$pid_col] : 'N/A';
- $processes[$j]{main::key($num++,0,3,'pid')} = $pid;
- if ($extra > 0 && $ps_cols >= 10){
- $cpu = $row[2] . '%';
- $processes[$j]{main::key($num++,0,3,'cpu')} = $cpu;
+ $pid = (defined $header->[1])? $row[$header->[1]] : 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'pid')} = $pid;
+ if ($extra > 0 && defined $header->[2]){
+ $cpu = $row[$header->[2]] . '%';
+ $rows->[$j]{main::key($num++,0,3,'cpu')} = $cpu;
}
- #print Data::Dumper::Dumper \@processes, "i: $i; j: $j ";
+ # print Data::Dumper::Dumper \@processes, "i: $i; j: $j ";
}
eval $end if $b_log;
- return @processes;
}
+
sub process_starter {
my ($count, $row10, $row11) = @_;
- my (@return);
+ my $return = [];
# note: [migration/0] would clear with a simple basename
- if ($count > ($ps_cols + 1) && $row11 =~ /^\// && $row11 !~ /^\/(tmp|temp)/){
+ if ($count > ($header->[0] + 1) &&
+ $row11 =~ /^\// && $row11 !~ /^\/(tmp|temp)/){
$row11 =~ s/^\/.*\///;
- $return[0] = $row11;
+ $return->[0] = $row11;
$row10 =~ s/^\/.*\///;
- $return[1] = $row10;
+ $return->[1] = $row10;
}
else {
$row10 =~ s/^\/.*\///;
- $return[0] = $row10;
- $return[1] = '';
+ $return->[0] = $row10;
+ $return->[1] = '';
}
- return @return;
+ return $return;
}
+
+# args: 0: $ps_count; 1: $count
sub throttled {
- my ($ps_count,$count,$j) = @_;
- my $throttled = '';
- if ($count > $j){
- $throttled = " ( $j processes)"; # space to avoid emoji in irc
- }
- elsif ($count < $ps_count){
- $throttled = " (throttled from $ps_count)";
- }
- return $throttled;
+ return ($_[1] < $_[0]) ? " (throttled from $_[0])" : '';
}
}
-## RaidData
+## RaidItem
{
-package RaidData;
-# debugger switches
-my $b_md = 0;
-my $b_zfs = 0;
+package RaidItem;
sub get {
eval $start if $b_log;
- my (@rows,$key1,$val1);
+ my ($hardware_raid,$key1,$val1);
my $num = 0;
- raid_data() if !$b_raid;
- #print 'get: ', Data::Dumper::Dumper \@raid;
- if (!@raid && !@hardware_raid){
+ my $rows = [];
+ $hardware_raid = hw_data() if $use{'hardware-raid'} || $fake{'raid-hw'};
+ raid_data() if !$loaded{'raid'};
+ # print 'get btrfs: ', Data::Dumper::Dumper \@btrfs_raid;
+ # print 'get lvm: ', Data::Dumper::Dumper \@lvm_raid;
+ # print 'get md: ', Data::Dumper::Dumper \@md_raid;
+ # print 'get zfs: ', Data::Dumper::Dumper \@zfs_raid;
+ if (!@btrfs_raid && !@lvm_raid && !@md_raid && !@zfs_raid && !@soft_raid &&
+ !$hardware_raid){
if ($show{'raid-forced'}){
$key1 = 'Message';
- $val1 = main::row_defaults('raid-data');
+ $val1 = main::message('raid-data');
}
}
else {
- @rows = create_output();
+ if ($hardware_raid){
+ hw_output($rows,$hardware_raid);
+ }
+ if (@btrfs_raid){
+ btrfs_output($rows);
+ }
+ if (@lvm_raid){
+ lvm_output($rows);
+ }
+ if (@md_raid){
+ md_output($rows);
+ }
+ if (@soft_raid){
+ soft_output($rows);
+ }
+ if (@zfs_raid){
+ zfs_output($rows);
+ }
}
- if (!@rows && $key1){
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ if (!@$rows && $key1){
+ @$rows = ({main::key($num++,0,1,$key1) => $val1,});
}
eval $end if $b_log;
- ($b_md,$b_zfs,@hardware_raid) = undef;
- return @rows;
+ return $rows;
}
-sub create_output {
+
+sub hw_output {
eval $start if $b_log;
- my (@arrays,@arrays_holder,@components,@components_good,@data,@failed,@rows,
- @sizes,@spare,@temp);
- my ($allocated,$available,$blocks_avail,$chunk_raid,$component_string,$raid,
- $ref2,$ref3,$report_size,$size,$status);
- my ($b_row_1_sizes);
- my ($cont_arr,$i,$ind_arr,$j,$num,$status_id) = (2,0,3,0,0,0);
- #print Data::Dumper::Dumper \@raid;
- if (@hardware_raid){
- foreach my $ref (@hardware_raid){
- my %row = %$ref;
+ my ($rows,$hardware_raid) = @_;
+ my ($j,$num) = (0,0);
+ foreach my $row (@$hardware_raid){
+ $num = 1;
+ my $device = ($row->{'device'}) ? $row->{'device'}: 'N/A';
+ my $driver = ($row->{'driver'}) ? $row->{'driver'}: 'N/A';
+ push(@$rows, {
+ main::key($num++,1,1,'Hardware') => $device,
+ });
+ $j = scalar @$rows - 1;
+ $rows->[$j]{main::key($num++,0,2,'vendor')} = $row->{'vendor'} if $row->{'vendor'};
+ $rows->[$j]{main::key($num++,1,2,'driver')} = $driver;
+ if ($extra > 0){
+ $row->{'driver-version'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'v')} = $row->{'driver-version'};
+ if ($extra > 2){
+ my $port= ($row->{'port'}) ? $row->{'port'}: 'N/A' ;
+ $rows->[$j]{main::key($num++,0,2,'port')} = $port;
+ }
+ my $bus_id = (defined $row->{'bus-id'} && defined $row->{'sub-id'}) ? "$row->{'bus-id'}.$row->{'sub-id'}": 'N/A' ;
+ $rows->[$j]{main::key($num++,0,2,'bus-ID')} = $bus_id;
+ }
+ if ($extra > 1){
+ my $chip_id = main::get_chip_id($row->{'vendor-id'},$row->{'chip-id'});
+ $rows->[$j]{main::key($num++,0,2,'chip-ID')} = $chip_id;
+ }
+ if ($extra > 2){
+ $row->{'rev'} = 'N/A' if !defined $row->{'rev'}; # could be 0
+ $rows->[$j]{main::key($num++,0,2,'rev')} = $row->{'rev'};
+ $rows->[$j]{main::key($num++,0,2,'class-ID')} = $row->{'class-id'} if $row->{'class-id'};
+ }
+ }
+ eval $end if $b_log;
+ # print Data::Dumper::Dumper $rows;
+}
+
+sub btrfs_output {
+ eval $start if $b_log;
+ my $rows = $_[0];
+ my (@components,@good);
+ my ($size);
+ my ($j,$num) = (0,0);
+ foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @btrfs_raid){
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,1,2,'Components')} = '';
+ my $b_bump;
+ components_output('lvm','Online',$rows,\@good,\$j,\$num,\$b_bump);
+ components_output('lvm','Meta',$rows,\@components,\$j,\$num,\$b_bump);
+ }
+ eval $end if $b_log;
+ # print Data::Dumper::Dumper $rows;
+}
+
+sub lvm_output {
+ eval $start if $b_log;
+ my $rows = $_[0];
+ my (@components,@good,@components_meta);
+ my ($size);
+ my ($j,$num) = (0,0);
+ foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @lvm_raid){
+ $j = scalar @$rows;
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $row->{'id'},
+ });
+ if ($b_admin && $row->{'maj-min'}){
+ $rows->[$j]{main::key($num++,0,2,'maj-min')} = $row->{'maj-min'};
+ }
+ $rows->[$j]{main::key($num++,0,2,'type')} = $row->{'type'};
+ $rows->[$j]{main::key($num++,0,2,'level')} = $row->{'level'};
+ $size = ($row->{'size'}) ? main::get_size($row->{'size'},'string'): 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'size')} = $size;
+ if ($row->{'raid-sync'}){
+ $rows->[$j]{main::key($num++,0,2,'sync')} = $row->{'raid-sync'};
+ }
+ if ($extra > 0){
+ $j = scalar @$rows;
$num = 1;
- my $device = ($row{'device'}) ? $row{'device'}: 'N/A';
- my $driver = ($row{'driver'}) ? $row{'driver'}: 'N/A';
- @data = ({
- main::key($num++,1,1,'Hardware') => $device,
- });
- @rows = (@rows,@data);
- $j = scalar @rows - 1;
- $rows[$j]{main::key($num++,0,2,'vendor')} = $row{'vendor'} if $row{'vendor'};
- $rows[$j]{main::key($num++,1,2,'driver')} = $driver;
- if ($extra > 0){
- my $driver_version = ($row{'driver-version'}) ? $row{'driver-version'}: 'N/A' ;
- $rows[$j]{main::key($num++,0,3,'v')} = $driver_version;
- if ($extra > 2){
- my $port= ($row{'port'}) ? $row{'port'}: 'N/A' ;
- $rows[$j]{main::key($num++,0,2,'port')} = $port;
- }
- my $bus_id = (defined $row{'bus-id'} && defined $row{'sub-id'}) ? "$row{'bus-id'}.$row{'sub-id'}": 'N/A' ;
- $rows[$j]{main::key($num++,0,2,'bus ID')} = $bus_id;
+ $rows->[$j]{main::key($num++,1,2,'Info')} = '';
+ if (defined $row->{'stripes'}){
+ $rows->[$j]{main::key($num++,0,3,'stripes')} = $row->{'stripes'};
}
- if ($extra > 1){
- my $chip_id = (defined $row{'vendor-id'} && defined $row{'chip-id'}) ? "$row{'vendor-id'}.$row{'chip-id'}": 'N/A' ;
- $rows[$j]{main::key($num++,0,2,'chip ID')} = $chip_id;
+ if (defined $row->{'raid-mismatches'} && ($extra > 1 || $row->{'raid-mismatches'} > 0)){
+ $rows->[$j]{main::key($num++,0,3,'mismatches')} = $row->{'raid-mismatches'};
}
- if ($extra > 2){
- my $rev= (defined $row{'rev'} && $row{'rev'}) ? $row{'rev'}: 'N/A' ;
- $rows[$j]{main::key($num++,0,2,'rev')} = $rev;
+ if (defined $row->{'copy-percent'} && ($extra > 1 || $row->{'copy-percent'} < 100)){
+ $rows->[$j]{main::key($num++,0,3,'copied')} = ($row->{'copy-percent'} + 0) . '%';
+ }
+ if ($row->{'vg'}){
+ $rows->[$j]{main::key($num++,1,3,'v-group')} = $row->{'vg'};
}
+ $size = ($row->{'vg-size'}) ? main::get_size($row->{'vg-size'},'string') : 'N/A';
+ $rows->[$j]{main::key($num++,0,4,'vg-size')} = $size;
+ $size = ($row->{'vg-free'}) ? main::get_size($row->{'vg-free'},'string') : 'N/A';
+ $rows->[$j]{main::key($num++,0,4,'vg-free')} = $size;
}
+ @components = (ref $row->{'components'} eq 'ARRAY') ? @{$row->{'components'}} : ();
+ @good = ();
+ @components_meta = ();
+ foreach my $item (sort { $a->[0] cmp $b->[0]} @components){
+ if ($item->[4] =~ /_rmeta/){
+ push(@components_meta, $item);
+ }
+ else {
+ push(@good, $item);
+ }
+ }
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,1,2,'Components')} = '';
+ my $b_bump;
+ components_output('lvm','Online',$rows,\@good,\$j,\$num,\$b_bump);
+ components_output('lvm','Meta',$rows,\@components_meta,\$j,\$num,\$b_bump);
}
- if ($extra > 2 && $raid[0]{'system-supported'}){
- @data = ({
- main::key($num++,0,1,'Supported md-raid types') => $raid[0]{'system-supported'},
+ eval $end if $b_log;
+ # print Data::Dumper::Dumper $rows;
+}
+
+sub md_output {
+ eval $start if $b_log;
+ my $rows = $_[0];
+ my (@components,@good,@failed,@inactive,@spare,@temp);
+ my ($blocks,$chunk,$level,$report,$size,$status);
+ my ($j,$num) = (0,0);
+ # print Data::Dumper::Dumper \@md_raid;
+ if ($extra > 2 && $md_raid[0]->{'supported-levels'}){
+ push(@$rows, {
+ main::key($num++,0,1,'Supported mdraid levels') => $md_raid[0]->{'supported-levels'},
});
- @rows = (@rows,@data);
}
- foreach my $ref (@raid){
- $j = scalar @rows;
- my %row = %$ref;
- $b_row_1_sizes = 0;
- next if !%row;
+ foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @md_raid){
+ $j = scalar @$rows;
+ next if !%$row;
$num = 1;
- @data = ({
- main::key($num++,1,1,'Device') => $row{'id'},
- main::key($num++,0,2,'type') => $row{'type'},
- main::key($num++,0,2,'status') => $row{'status'},
+ $level = (defined $row->{'level'}) ? $row->{'level'} : 'linear';
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $row->{'id'},
});
- @rows = (@rows,@data);
- if ($row{'type'} eq 'mdraid'){
- $blocks_avail = 'blocks';
- $chunk_raid = 'chunk size';
- $report_size = 'report';
+ if ($b_admin && $row->{'maj-min'}){
+ $rows->[$j]{main::key($num++,0,2,'maj-min')} = $row->{'maj-min'};
+ }
+ $rows->[$j]{main::key($num++,0,2,'type')} = $row->{'type'};
+ $rows->[$j]{main::key($num++,0,2,'level')} = $level;
+ $rows->[$j]{main::key($num++,0,2,'status')} = $row->{'status'};
+ if ($row->{'details'}{'state'}){
+ $rows->[$j]{main::key($num++,0,2,'state')} = $row->{'details'}{'state'};
+ }
+ if ($row->{'size'}){
+ $size = main::get_size($row->{'size'},'string');
+ }
+ else {
+ $size = (!$b_root && !@lsblk) ? main::message('root-required'): 'N/A';
+ }
+ $rows->[$j]{main::key($num++,0,2,'size')} = $size;
+ $report = ($row->{'report'}) ? $row->{'report'}: '';
+ $report .= " $row->{'u-data'}" if $report;
+ $report ||= 'N/A';
+ if ($extra == 0){
+ # print "here 0\n";
+ $rows->[$j]{main::key($num++,0,2,'report')} = $report;
+ }
+ if ($extra > 0){
+ $j = scalar @$rows;
+ $num = 1;
+ $rows->[$j]{main::key($num++,1,2,'Info')} = '';
+ #$rows->[$j]{main::key($num++,0,3,'raid')} = $raid;
+ $rows->[$j]{main::key($num++,0,3,'report')} = $report;
+ $blocks = ($row->{'blocks'}) ? $row->{'blocks'} : 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'blocks')} = $blocks;
+ $chunk = ($row->{'chunk-size'}) ? $row->{'chunk-size'} : 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'chunk-size')} = $chunk;
+ if ($extra > 1){
+ if ($row->{'bitmap'}){
+ $rows->[$j]{main::key($num++,0,3,'bitmap')} = $row->{'bitmap'};
+ }
+ if ($row->{'super-block'}){
+ $rows->[$j]{main::key($num++,0,3,'super-blocks')} = $row->{'super-block'};
+ }
+ if ($row->{'algorithm'}){
+ $rows->[$j]{main::key($num++,0,3,'algorithm')} = $row->{'algorithm'};
+ }
+ }
+ }
+ @components = (ref $row->{'components'} eq 'ARRAY') ? @{$row->{'components'}} : ();
+ @good = ();
+ @failed = ();
+ @inactive = ();
+ @spare = ();
+ # @spare = split(/\s+/, $row->{'unused'}) if $row->{'unused'};
+ # print Data::Dumper::Dumper \@components;
+ foreach my $item (sort { $a->[1] <=> $b->[1]} @components){
+ if (defined $item->[2] && $item->[2] =~ /^(F)$/){
+ push(@failed,$item);
+ }
+ elsif (defined $item->[2] && $item->[2] =~ /(S)$/){
+ push(@spare,$item);
+ }
+ elsif ($row->{'status'} && $row->{'status'} eq 'inactive'){
+ push(@inactive,$item);
+ }
+ else {
+ push(@good,$item);
+ }
+ }
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,1,2,'Components')} = '';
+ my $b_bump;
+ components_output('mdraid','Online',$rows,\@good,\$j,\$num,\$b_bump);
+ components_output('mdraid','Failed',$rows,\@failed,\$j,\$num,\$b_bump);
+ components_output('mdraid','Inactive',$rows,\@inactive,\$j,\$num,\$b_bump);
+ components_output('mdraid','Spare',$rows,\@spare,\$j,\$num,\$b_bump);
+ if ($row->{'recovery-percent'}){
+ $j = scalar @$rows;
+ $num = 1;
+ my $percent = $row->{'recovery-percent'};
+ if ($extra > 1 && $row->{'progress-bar'}){
+ $percent .= " $row->{'progress-bar'}"
+ }
+ $rows->[$j]{main::key($num++,1,2,'Recovering')} = $percent;
+ my $finish = ($row->{'recovery-finish'})?$row->{'recovery-finish'} : 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'time-remaining')} = $finish;
if ($extra > 0){
- $available = ($row{'blocks'}) ? $row{'blocks'} : 'N/A';
+ if ($row->{'sectors-recovered'}){
+ $rows->[$j]{main::key($num++,0,3,'sectors')} = $row->{'sectors-recovered'};
+ }
+ }
+ if ($extra > 1 && $row->{'recovery-speed'}){
+ $rows->[$j]{main::key($num++,0,3,'speed')} = $row->{'recovery-speed'};
}
- $size = ($row{'report'}) ? $row{'report'}: '';
- $size .= " $row{'u-data'}" if $size;
- $size ||= 'N/A';
- $status_id = 2;
}
- else {
- $blocks_avail = 'free';
- $chunk_raid = 'allocated';
- $report_size = 'size';
- @sizes = ($row{'size'}) ? main::get_size($row{'size'}) : ();
- $size = (@sizes) ? "$sizes[0] $sizes[1]" : '';
- @sizes = ($row{'free'}) ? main::get_size($row{'free'}) : ();
- $available = (@sizes) ? "$sizes[0] $sizes[1]" : '';
- if ($extra > 2){
- @sizes = ($row{'allocated'}) ? main::get_size($row{'allocated'}) : ();
- $allocated = (@sizes) ? "$sizes[0] $sizes[1]" : '';
+ }
+ eval $end if $b_log;
+ # print Data::Dumper::Dumper $rows;
+}
+
+sub soft_output {
+ eval $start if $b_log;
+ my $rows = $_[0];
+ my (@components,@good,@failed,@offline,@rebuild,@temp);
+ my ($size);
+ my ($j,$num) = (0,0);
+ if (@soft_raid && $alerts{'bioctl'}->{'action'} eq 'permissions'){
+ push(@$rows,{
+ main::key($num++,1,1,'Message') => main::message('root-item-incomplete','softraid'),
+ });
+ }
+ # print Data::Dumper::Dumper \@soft_raid;
+ foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @soft_raid){
+ $j = scalar @$rows;
+ next if !%$row;
+ $num = 1;
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $row->{'id'},
+ });
+ $row->{'level'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'type')} = $row->{'type'};
+ $rows->[$j]{main::key($num++,0,2,'level')} = $row->{'level'};
+ $rows->[$j]{main::key($num++,0,2,'status')} = $row->{'status'};
+ if ($row->{'state'}){
+ $rows->[$j]{main::key($num++,0,2,'state')} = $row->{'state'};
+ }
+ if ($row->{'size'}){
+ $size = main::get_size($row->{'size'},'string');
+ }
+ $size ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'size')} = $size;
+ @components = (ref $row->{'components'} eq 'ARRAY') ? @{$row->{'components'}} : ();
+ @good = ();
+ @failed = ();
+ @offline = ();
+ @rebuild = ();
+ foreach my $item (sort { $a->[1] <=> $b->[1]} @components){
+ if (defined $item->[2] && $item->[2] eq 'failed'){
+ push(@failed,$item);
+ }
+ elsif (defined $item->[2] && $item->[2] eq 'offline'){
+ push(@offline,$item);
+ }
+ elsif (defined $item->[2] && $item->[2] eq 'rebuild'){
+ push(@rebuild,$item);
}
- $status_id = 1;
+ else {
+ push(@good,$item);
+ }
+ }
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,1,2,'Components')} = '';
+ my $b_bump;
+ components_output('softraid','Online',$rows,\@good,\$j,\$num,\$b_bump);
+ components_output('softraid','Failed',$rows,\@failed,\$j,\$num,\$b_bump);
+ components_output('softraid','Rebuild',$rows,\@rebuild,\$j,\$num,\$b_bump);
+ components_output('softraid','Offline',$rows,\@offline,\$j,\$num,\$b_bump);
+ }
+ eval $end if $b_log;
+ # print Data::Dumper::Dumper $rows;
+}
+
+sub zfs_output {
+ eval $start if $b_log;
+ my $rows = $_[0];
+ my (@arrays,@arrays_holder,@components,@good,@failed,@spare);
+ my ($allocated,$available,$level,$size,$status);
+ my ($b_row_1_sizes);
+ my ($j,$num) = (0,0);
+ # print Data::Dumper::Dumper \@zfs_raid;
+ foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @zfs_raid){
+ $j = scalar @$rows;
+ $b_row_1_sizes = 0;
+ next if !%$row;
+ $num = 1;
+ push(@$rows, {
+ main::key($num++,1,1,'Device') => $row->{'id'},
+ main::key($num++,0,2,'type') => $row->{'type'},
+ main::key($num++,0,2,'status') => $row->{'status'},
+ });
+ $size = ($row->{'raw-size'}) ? main::get_size($row->{'raw-size'},'string') : '';
+ $available = main::get_size($row->{'raw-free'},'string',''); # could be zero free
+ if ($extra > 2){
+ $allocated = ($row->{'raw-allocated'}) ? main::get_size($row->{'raw-allocated'},'string') : '';
}
- $ref2 = $row{'arrays'};
- @arrays = @$ref2;
+ @arrays = @{$row->{'arrays'}};
@arrays = grep {defined $_} @arrays;
@arrays_holder = @arrays;
- if (($row{'type'} eq 'mdraid' && $extra == 0 ) || !defined $arrays[0]{'raid'} ){
- $raid = (defined $arrays[0]{'raid'}) ? $arrays[0]{'raid'}: 'no-raid';
- $rows[$j]{main::key($num++,0,2,'raid')} = $raid;
+ my $count = scalar @arrays;
+ if (!defined $arrays[0]->{'level'}){
+ $level = 'linear';
+ $rows->[$j]{main::key($num++,0,2,'level')} = $level;
}
- if ( ( $row{'type'} eq 'zfs' || ($row{'type'} eq 'mdraid' && $extra == 0 ) ) && $size){
- #print "here 0\n";
- $rows[$j]{main::key($num++,0,2,$report_size)} = $size;
- $size = '';
- $b_row_1_sizes = 1;
+ elsif ($count < 2 && $arrays[0]->{'level'}){
+ $rows->[$j]{main::key($num++,0,2,'level')} = $arrays[0]->{'level'};
}
- if ( $row{'type'} eq 'zfs' && $available){
- $rows[$j]{main::key($num++,0,2,$blocks_avail)} = $available;
- $available = '';
- $b_row_1_sizes = 1;
+ if ($size || $available || $allocated){
+ $rows->[$j]{main::key($num++,1,2,'raw')} = '';
+ if ($size){
+ # print "here 0\n";
+ $rows->[$j]{main::key($num++,0,3,'size')} = $size;
+ $size = '';
+ $b_row_1_sizes = 1;
+ }
+ if ($available){
+ $rows->[$j]{main::key($num++,0,3,'free')} = $available;
+ $available = '';
+ $b_row_1_sizes = 1;
+ }
+ if ($allocated){
+ $rows->[$j]{main::key($num++,0,3,'allocated')} = $allocated;
+ $allocated = '';
+ }
}
- if ( $row{'type'} eq 'zfs' && $allocated){
- $rows[$j]{main::key($num++,0,2,$chunk_raid)} = $allocated;
- $allocated = '';
+ if ($row->{'zfs-size'}){
+ $rows->[$j]{main::key($num++,1,2,'zfs-fs')} = '';
+ $rows->[$j]{main::key($num++,0,3,'size')} = main::get_size($row->{'zfs-size'},'string');
+ $rows->[$j]{main::key($num++,0,3,'free')} = main::get_size($row->{'zfs-free'},'string');
}
- $i = 0;
- my $count = scalar @arrays;
- foreach $ref3 (@arrays){
- my %row2 = %$ref3;
- ($cont_arr,$ind_arr) = (2,3);
+ foreach my $row2 (@arrays){
if ($count > 1){
- ($cont_arr,$ind_arr) = (3,4);
- $j = scalar @rows;
+ $j = scalar @$rows;
$num = 1;
- @sizes = ($row2{'size'}) ? main::get_size($row2{'size'}) : ();
- $size = (@sizes) ? "$sizes[0] $sizes[1]" : 'N/A';
- @sizes = ($row2{'free'}) ? main::get_size($row2{'free'}) : ();
- $available = (@sizes) ? "$sizes[0] $sizes[1]" : '';
- $raid = (defined $row2{'raid'}) ? $row2{'raid'}: 'no-raid';
- $status = ($row2{'status'}) ? $row2{'status'}: 'N/A';
- @data = ({
- main::key($num++,1,2,'Array') => $raid,
+ $size = ($row2->{'raw-size'}) ? main::get_size($row2->{'raw-size'},'string') : 'N/A';
+ $available = ($row2->{'raw-free'}) ? main::get_size($row2->{'raw-free'},'string') : 'N/A';
+ $level = (defined $row2->{'level'}) ? $row2->{'level'}: 'linear';
+ $status = ($row2->{'status'}) ? $row2->{'status'}: 'N/A';
+ push(@$rows, {
+ main::key($num++,1,2,'Array') => $level,
main::key($num++,0,3,'status') => $status,
- main::key($num++,0,3,'size') => $size,
- main::key($num++,0,3,'free') => $available,
+ main::key($num++,1,3,'raw') => '',
+ main::key($num++,0,4,'size') => $size,
+ main::key($num++,0,4,'free') => $available,
});
- @rows = (@rows,@data);
}
# items like cache may have one component, with a size on that component
- elsif (!$b_row_1_sizes && $row{'type'} eq 'zfs'){
- #print "here $count\n";
- @sizes = ($row2{'size'}) ? main::get_size($row2{'size'}) : ();
- $size = (@sizes) ? "$sizes[0] $sizes[1]" : '';
- @sizes = ($row2{'free'}) ? main::get_size($row2{'free'}) : ();
- $available = (@sizes) ? "$sizes[0] $sizes[1]" : '';
- $rows[$j]{main::key($num++,0,2,'size')} = $size;
- $rows[$j]{main::key($num++,0,2,'free')} = $available;
+ elsif (!$b_row_1_sizes){
+ # print "here $count\n";
+ $size = ($row2->{'raw-size'}) ? main::get_size($row2->{'raw-size'},'string') : 'N/A';
+ $available = ($row2->{'raw-free'}) ? main::get_size($row2->{'raw-free'},'string') : 'N/A';
+ $rows->[$j]{main::key($num++,1,2,'raw')} = '';
+ $rows->[$j]{main::key($num++,0,3,'size')} = $size;
+ $rows->[$j]{main::key($num++,0,3,'free')} = $available;
if ($extra > 2){
- @sizes = ($row{'allocated'}) ? main::get_size($row2{'allocated'}) : ();
- $allocated = (@sizes) ? "$sizes[0] $sizes[1]" : '';
+ $allocated = ($row2->{'raw-allocated'}) ? main::get_size($row2->{'raw-allocated'},'string') : '';
if ($allocated){
- $rows[$j]{main::key($num++,0,2,$chunk_raid)} = $allocated;
+ $rows->[$j]{main::key($num++,0,3,'allocated')} = $allocated;
}
}
}
- $ref3 = $row2{'components'};
- @components = (ref $ref3 eq 'ARRAY') ? @$ref3 : ();
+ @components = (ref $row2->{'components'} eq 'ARRAY') ? @{$row2->{'components'}} : ();
@failed = ();
@spare = ();
- @components_good = ();
- # @spare = split(/\s+/, $row{'unused'}) if $row{'unused'};
- foreach my $item (@components){
- @temp = split /~/, $item;
- if (defined $temp[$status_id] && $temp[$status_id] =~ /^(F|DEGRADED|FAULTED|UNAVAIL)$/){
- $temp[0] = "$temp[0]~$temp[1]" if $status_id == 2;
- push @failed, $temp[0];
- }
- elsif (defined $temp[$status_id] && $temp[$status_id] =~ /(S|OFFLINE)$/){
- $temp[0] = "$temp[0]~$temp[1]" if $status_id == 2;
- push @spare, $temp[0];
+ @good = ();
+ # @spare = split(/\s+/, $row->{'unused'}) if $row->{'unused'};
+ foreach my $item (sort { $a->[0] cmp $b->[0]} @components){
+ if (defined $item->[3] && $item->[3] =~ /^(DEGRADED|FAULTED|UNAVAIL)$/){
+ push(@failed, $item);
}
- else {
- $temp[0] = ($status_id == 2) ? "$temp[0]~$temp[1]" : $temp[0];
- push @components_good, $temp[0];
+ elsif (defined $item->[3] && $item->[3] =~ /(AVAIL|OFFLINE|REMOVED)$/){
+ push(@spare, $item);
}
- }
- $component_string = (@components_good) ? join ' ', @components_good : 'N/A';
- $rows[$j]{main::key($num++,1,$cont_arr,'Components')} = '';
- $rows[$j]{main::key($num++,0,$ind_arr,'online')} = $component_string;
- if (@failed){
- $rows[$j]{main::key($num++,0,$ind_arr,'FAILED')} = join ' ', @failed;
- }
- if (@spare){
- $rows[$j]{main::key($num++,0,$ind_arr,'spare')} = join ' ', @spare;
- }
- if ($row{'type'} eq 'mdraid' && $extra > 0 ){
- $j = scalar @rows;
- $num = 1;
- #print Data::Dumper::Dumper \@arrays_holder;
- $rows[$j]{main::key($num++,1,$cont_arr,'Info')} = '';
- $raid = (defined $arrays_holder[0]{'raid'}) ? $arrays_holder[0]{'raid'}: 'no-raid';
- $rows[$j]{main::key($num++,0,$ind_arr,'raid')} = $raid;
- $rows[$j]{main::key($num++,0,$ind_arr,$blocks_avail)} = $available;
- if ($size){
- $rows[$j]{main::key($num++,0,$ind_arr,$report_size)} = $size;
- }
- my $chunk = ($row{'chunk-size'}) ? $row{'chunk-size'}: 'N/A';
- $rows[$j]{main::key($num++,0,$ind_arr,$chunk_raid)} = $chunk;
- if ($extra > 1){
- if ($row{'bitmap'}){
- $rows[$j]{main::key($num++,0,$ind_arr,'bitmap')} = $row{'bitmap'};
- }
- if ($row{'super-block'}){
- $rows[$j]{main::key($num++,0,$ind_arr,'super blocks')} = $row{'super-block'};
- }
- if ($row{'algorithm'}){
- $rows[$j]{main::key($num++,0,$ind_arr,'algorithm')} = $row{'algorithm'};
- }
+ # note: spares in use show: INUSE but technically it's still a spare,
+ # but since it's in use, consider it online.
+ else {
+ push(@good, $item);
}
}
- $i++;
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,1,3,'Components')} = '';
+ my $b_bump;
+ components_output('zfs','Online',$rows,\@good,\$j,\$num,\$b_bump);
+ components_output('zfs','Failed',$rows,\@failed,\$j,\$num,\$b_bump);
+ components_output('zfs','Available',$rows,\@spare,\$j,\$num,\$b_bump);
}
- if ($row{'recovery-percent'}){
- $j = scalar @rows;
- $num = 1;
- my $percent = $row{'recovery-percent'};
- if ($extra > 1 && $row{'progress-bar'}){
- $percent .= " $row{'progress-bar'}"
- }
- $rows[$j]{main::key($num++,1,$cont_arr,'Recovering')} = $percent;
- my $finish = ($row{'recovery-finish'})?$row{'recovery-finish'} : 'N/A';
- $rows[$j]{main::key($num++,0,$ind_arr,'time remaining')} = $finish;
- if ($extra > 0){
- if ($row{'sectors-recovered'}){
- $rows[$j]{main::key($num++,0,$ind_arr,'sectors')} = $row{'sectors-recovered'};
- }
- }
- if ($extra > 1 && $row{'recovery-speed'}){
- $rows[$j]{main::key($num++,0,$ind_arr,'speed')} = $row{'recovery-speed'};
- }
+ }
+ eval $end if $b_log;
+ # print Data::Dumper::Dumper $rows;
+}
+
+# Most key stuff passed by ref, and is changed on the fly
+sub components_output {
+ eval $start if $b_log;
+ my ($type,$item,$rows,$array,$j,$num,$b_bump) = @_;
+ return if !@$array && $item ne 'Online';
+ my ($extra1,$extra2,$f1,$f2,$f3,$f4,$f5,$k,$k1,$key1,$l1,$l2,$l3);
+ if ($type eq 'btrfs'){
+
+ }
+ elsif ($type eq 'lvm'){
+ ($f1,$f2,$f3,$f4,$f5,$l1,$l2,$l3) = (1,2,3,4,5,3,4,5);
+ $k = 1;
+ $extra1 = 'mapped';
+ $extra2 = 'dev';
+ }
+ elsif ($type eq 'mdraid'){
+ ($f1,$f2,$f3,$f4,$k1,$l1,$l2,$l3) = (3,4,5,6,1,3,4,5);
+ $extra1 = 'mapped';
+ $k = 1 if $item eq 'Inactive';
+ }
+ elsif ($type eq 'softraid'){
+ ($f1,$f2,$f3,$f4,$k1,$l1,$l2,$l3) = (1,10,10,3,5,3,4,5);
+ $extra1 = 'device';
+ $k = 1;
+ }
+ elsif ($type eq 'zfs'){
+ ($f1,$f2,$f3,$l1,$l2,$l3) = (1,2,3,4,5,6);
+ $k = 1;
+ }
+ # print "item: $item\n";
+ $$j++ if $$b_bump;
+ $$b_bump = 0;
+ my $good = ($item eq 'Online' && !@$array) ? 'N/A' : '';
+ $rows->[$$j]{main::key($$num++,1,$l1,$item)} = $good;
+ #$$j++ if $b_admin;
+ # print Data::Dumper::Dumper $array;
+ foreach my $device (@$array){
+ next if ref $device ne 'ARRAY';
+ # if ($b_admin && $device->[$f1] && $device->[$f2]){
+ if ($b_admin){
+ $$j++;
+ $$b_bump = 1;
+ $$num = 1;
+ }
+ $key1 = (defined $k1 && defined $device->[$k1]) ? $device->[$k1] : $k++;
+ $rows->[$$j]{main::key($$num++,1,$l2,$key1)} = $device->[0];
+ if ($b_admin && $device->[$f2]){
+ $rows->[$$j]{main::key($$num++,0,$l3,'maj-min')} = $device->[$f2];
+ }
+ if ($b_admin && $device->[$f1]){
+ my $size = main::get_size($device->[$f1],'string');
+ $rows->[$$j]{main::key($$num++,0,$l3,'size')} = $size;
+ }
+ if ($b_admin && $device->[$f3]){
+ $rows->[$$j]{main::key($$num++,0,$l3,'state')} = $device->[$f3];
+ }
+ if ($b_admin && $extra1 && $device->[$f4]){
+ $rows->[$$j]{main::key($$num++,0,$l3,$extra1)} = $device->[$f4];
+ }
+ if ($b_admin && $extra2 && $device->[$f5]){
+ $rows->[$$j]{main::key($$num++,0,$l3,$extra2)} = $device->[$f5];
}
}
eval $end if $b_log;
- #print Data::Dumper::Dumper \@rows;
- return @rows;
}
+
sub raid_data {
eval $start if $b_log;
+ LsblkData::set() if !$bsd_type && !$loaded{'lsblk'};
+ main::set_mapper() if !$bsd_type && !$loaded{'mapper'};
+ PartitionData::set() if !$bsd_type && !$loaded{'partition-data'};
my (@data);
- $b_raid = 1;
- if ($b_hardware_raid){
- hardware_raid();
- }
- if ($b_md || (my $file = main::system_files('mdstat') )){
- @data = mdraid_data($file);
- @raid = (@raid,@data) if @data;
- }
- if ($b_zfs || (my $path = main::check_program('zpool') )){
- @data = zfs_data($path);
- @raid = (@raid,@data) if @data;
- }
- main::log_data('dump','@raid',\@raid) if $b_log;
- #print Data::Dumper::Dumper \@raid;
- eval $end if $b_log;
-}
-# 0 type
-# 1 type_id
-# 2 bus_id
-# 3 sub_id
-# 4 device
-# 5 vendor_id
-# 6 chip_id
-# 7 rev
-# 8 port
-# 9 driver
-# 10 modules
-sub hardware_raid {
- eval $start if $b_log;
- my ($driver,$vendor,@data,@working);
- foreach my $ref (@devices_hwraid){
- @working = @$ref;
- $driver = ($working[9]) ? lc($working[9]): '';
+ $loaded{'raid'} = 1;
+ if ($fake{'raid-btrfs'} ||
+ ($alerts{'btrfs'}->{'action'} && $alerts{'btrfs'}->{'action'} eq 'use')){
+ @btrfs_raid = btrfs_data();
+ }
+ if ($fake{'raid-lvm'} ||
+ ($alerts{'lvs'}->{'action'} && $alerts{'lvs'}->{'action'} eq 'use')){
+ @lvm_raid = lvm_data();
+ }
+ if ($fake{'raid-md'} || (my $file = $system_files{'proc-mdstat'})){
+ @md_raid = md_data($file);
+ }
+ if ($fake{'raid-soft'} || $sysctl{'softraid'}){
+ DiskDataBSD::set() if !$loaded{'disk-data-bsd'};
+ @soft_raid = soft_data();
+ }
+ if ($fake{'raid-zfs'} || (my $path = main::check_program('zpool'))){
+ DiskDataBSD::set() if $bsd_type && !$loaded{'disk-data-bsd'};
+ @zfs_raid = zfs_data($path);
+ }
+ eval $end if $b_log;
+}
+
+# 0: type
+# 1: type_id
+# 2: bus_id
+# 3: sub_id
+# 4: device
+# 5: vendor_id
+# 6: chip_id
+# 7: rev
+# 8: port
+# 9: driver
+# 10: modules
+sub hw_data {
+ eval $start if $b_log;
+ return if !$devices{'hwraid'};
+ my ($driver,$vendor,$hardware_raid);
+ foreach my $working (@{$devices{'hwraid'}}){
+ $driver = ($working->[9]) ? lc($working->[9]): '';
$driver =~ s/-/_/g if $driver;
my $driver_version = ($driver) ? main::get_module_version($driver): '';
- if ($extra > 2 && $b_pci_tool && $working[11]){
- $vendor = main::get_pci_vendor($working[4],$working[11]);
- }
- @data = ({
- 'bus-id' => $working[2],
- 'chip-id' => $working[6],
- 'device' => $working[4],
+ if ($extra > 2 && $use{'pci-tool'} && $working->[11]){
+ $vendor = main::get_pci_vendor($working->[4],$working->[11]);
+ }
+ push(@$hardware_raid, {
+ 'class-id' => $working->[1],
+ 'bus-id' => $working->[2],
+ 'chip-id' => $working->[6],
+ 'device' => $working->[4],
'driver' => $driver,
'driver-version' => $driver_version,
- 'port' => $working[8],
- 'rev' => $working[7],
- 'sub-id' => $working[3],
- 'vendor-id' => $working[5],
+ 'port' => $working->[8],
+ 'rev' => $working->[7],
+ 'sub-id' => $working->[3],
+ 'vendor-id' => $working->[5],
'vendor' => $vendor,
});
- @hardware_raid = (@hardware_raid,@data);
}
- # print Data::Dumper::Dumper \@hardware_raid;
- main::log_data('dump','@hardware_raid',\@hardware_raid) if $b_log;
+ # print Data::Dumper::Dumper $hardware_raid;
+ main::log_data('dump','@$hardware_raid',$hardware_raid) if $b_log;
+ eval $end if $b_log;
+ return $hardware_raid;
+}
+
+# Placeholder, if they ever get useful tools
+sub btrfs_data {
+ eval $start if $b_log;
+ my (@btraid,@working);
+ if ($fake{'raid-btrfs'}){
+
+ }
+ else {
+
+ }
+ print Data::Dumper::Dumper \@working if $dbg[37];
+ print Data::Dumper::Dumper \@btraid if $dbg[37];
+ main::log_data('dump','@lvraid',\@btraid) if $b_log;
+ eval $end if $b_log;
+ return @btraid;
+}
+
+sub lvm_data {
+ eval $start if $b_log;
+ LogicalItem::lvm_data() if !$loaded{'logical-data'};
+ return if !@lvm;
+ my (@lvraid,$maj_min,$vg_used,@working);
+ foreach my $item (@lvm){
+ next if $item->{'segtype'} && $item->{'segtype'} !~ /^raid/;
+ my (@components,$dev,$maj_min,$vg_used);
+ # print Data::Dumper::Dumper $item;
+ if ($item->{'lv_kernel_major'} . ':' . $item->{'lv_kernel_minor'}){
+ $maj_min = $item->{'lv_kernel_major'} . ':' . $item->{'lv_kernel_minor'};
+ }
+ if (defined $item->{'vg_free'} && defined $item->{'vg_size'}){
+ $vg_used = ($item->{'vg_size'} - $item->{'vg_free'});
+ }
+ $raw_logical[0] += $item->{'lv_size'} if $item->{'lv_size'};
+ @working = main::globber("/sys/dev/block/$maj_min/slaves/*") if $maj_min;
+ @working = map {$_ =~ s|^/.*/||; $_;} @working if @working;
+ foreach my $part (@working){
+ my ($dev,$maj_min,$mapped,$size);
+ if (@proc_partitions){
+ my $info = PartitionData::get($part);
+ $maj_min = $info->[0] . ':' . $info->[1] if defined $info->[1];
+ $size = $info->[2];
+ $raw_logical[1] += $size if $part =~ /^dm-/ && $size;
+ my @data = main::globber("/sys/dev/block/$maj_min/slaves/*") if $maj_min;
+ @data = map {$_ =~ s|^/.*/||; $_;} @data if @data;
+ $dev = join(',', @data) if @data;
+ }
+ $mapped = $dmmapper{$part} if %dmmapper;
+ push(@components, [$part,$size,$maj_min,undef,$mapped,$dev],);
+ }
+ if ($item->{'segtype'}){
+ if ($item->{'segtype'} eq 'raid1'){$item->{'segtype'} = 'mirror';}
+ else {$item->{'segtype'} =~ s/^raid([0-9]+)/raid-$1/;}
+ }
+ push(@lvraid, {
+ 'components' => \@components,
+ 'copy-percent' => $item->{'copy_percent'},
+ 'id' => $item->{'lv_name'},
+ 'level' => $item->{'segtype'},
+ 'maj-min' => $maj_min,
+ 'raid-mismatches' => $item->{'raid_mismatch_count'},
+ 'raid-sync' => $item->{'raid_sync_action'},
+ 'size' => $item->{'lv_size'},
+ 'stripes' => $item->{'stripes'},
+ 'type' => $item->{'vg_fmt'},
+ 'vg' => $item->{'vg_name'},
+ 'vg-free' => $item->{'vg_free'},
+ 'vg-size' => $item->{'vg_size'},
+ 'vg-used' => $vg_used,
+ });
+ }
+ print Data::Dumper::Dumper \@lvraid if $dbg[37];
+ main::log_data('dump','@lvraid',\@lvraid) if $b_log;
eval $end if $b_log;
+ return @lvraid;
}
-sub mdraid_data {
+
+sub md_data {
eval $start if $b_log;
my ($mdstat) = @_;
my $j = 0;
- #$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-4-device-1.txt";
- #$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-rebuild-1.txt";
- #$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-2-mirror-fserver2-1.txt";
- #$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-2-raid10-abucodonosor.txt";
- #$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-2-raid10-ant.txt";
+ if ($fake{'raid-md'}){
+ #$mdstat = "$fake_data_dir/raid-logical/md/md-4-device-1.txt";
+ #$mdstat = "$fake_data_dir/raid-logical/md/md-rebuild-1.txt";
+ #$mdstat = "$fake_data_dir/raid-logical/md/md-2-mirror-fserver2-1.txt";
+ #$mdstat = "$fake_data_dir/raid-logical/md/md-2-raid10-abucodonosor.txt";
+ #$mdstat = "$fake_data_dir/raid-logical/md/md-2-raid10-ant.txt";
+ #$mdstat = "$fake_data_dir/raid-logical/md/md-inactive-weird-syntax.txt";
+ #$mdstat = "$fake_data_dir/raid-logical/md/md-inactive-active-syntax.txt";
+ #$mdstat = "$fake_data_dir/raid-logical/md/md-inactive-active-spare-syntax.txt";
+ }
my @working = main::reader($mdstat,'strip');
- #print Data::Dumper::Dumper \@working;
- my (@data,@mdraid,@temp,$b_found,$system,$unused);
- # NOTE: a system with empty mdstat will still show these values
+ # print Data::Dumper::Dumper \@working;
+ my (@mdraid,@temp,$b_found,$system,$unused);
+ # NOTE: a system with empty mdstat will not show these values
if ($working[0] && $working[0] =~ /^Personalities/){
- $system = ( split /:\s*/, $working[0])[1];
+ $system = (split(/:\s*/, $working[0]))[1];
$system =~ s/\[|\]//g if $system;
shift @working;
}
- if ($working[-1] && $working[-1] =~ /^used\sdevices/){
- $unused = ( split /:\s*/, $working[0])[1];
+ if ($working[-1] && $working[-1] =~ /^unused\sdevices/){
+ $unused = (split(/:\s*/, $working[-1]))[1];
$unused =~ s/<|>|none//g if $unused;
pop @working;
}
foreach (@working){
$_ =~ s/\s*:\s*/:/;
# print "$_\n";
- #md126 : active (auto-read-only) raid1 sdq1[0]
- if (/^(md[0-9]+)\s*:\s*([^\s]+)(\s\([^)]+\))?\s([^\s]+)\s(.*)/){
- my $id = $1;
- my $status = $2;
- my $raid = $4;
- my $component_string = $5;
+ # md0 : active raid1 sdb1[2] sda1[0]
+ # md126 : active (auto-read-only) raid1 sdq1[0]
+ # md127 : inactive sda0
+ # md1 : inactive sda1[0] sdd1[3] sdc1[2] sdb1[1]
+ # if (/^(md[0-9]+)\s*:\s*([^\s]+)(\s\([^)]+\))?\s([^\s]+)\s(.*)/){
+ if (/^(md[0-9]+)\s*:\s*([\S]+)(\s\([^)]+\))?/){
+ my ($component_string,$details,$device,$id,$level,$maj_min,$part,$size,$status);
+ my (@components);
+ $id = $1;
+ $status = $2;
+ if (/^(md[0-9]+)\s*:\s*([\S]+)(\s\([^)]+\))?\s((faulty|linear|multipath|raid)[\S]*)\s(.*)/){
+ $level = $4;
+ $component_string = $6;
+ $level =~ s/^raid1$/mirror/;
+ $level =~ s/^raid/raid-/;
+ $level = 'mirror' if $level eq '1';
+ }
+ elsif (/^(md[0-9]+)\s*:\s*([\S]+)(\s\([^)]+\))?\s(.*)/){
+ $component_string = $4;
+ $level = 'N/A';
+ }
@temp = ();
- $raid =~ s/^raid1$/mirror/;
- $raid =~ s/^raid/raid-/;
- $raid = 'mirror' if $raid eq '1';
+ # cascade of tests, light to cpu intense
+ if ((!$maj_min || !$size) && @proc_partitions){
+ $part = PartitionData::get($id);
+ if (@$part){
+ $maj_min = $part->[0] . ':' . $part->[1];
+ $size = $part->[2];
+ }
+ }
+ if ((!$maj_min || !$size) && @lsblk){
+ $device = LsblkData::get($id) if @lsblk;
+ $maj_min = $device->{'maj-min'} if $device->{'maj-min'};
+ $size = $device->{'size'} if $device->{'size'};
+ }
+ if ((!$size || $b_admin) && $alerts{'mdadm'}->{'action'} eq 'use'){
+ $details = md_details($id);
+ $size = $details->{'size'} if $details->{'size'};
+ }
+ $raw_logical[0] += $size if $size;
# remember, these include the [x] id, so remove that for disk/unmounted
- my @components = split /\s+/, $component_string;
- foreach my $component (@components){
- $component =~ /([\S]+)\[([0-9]+)\]\(?([SF])?\)?/;
- my $string = "$1~";
- $string .= (defined $2) ? "c$2" : '';
- $string .= (defined $3) ? "~$3" : '';
- push @temp, $string;
- }
- @components = @temp;
- #print "$component_string\n";
+ foreach my $component (split(/\s+/, $component_string)){
+ my (%data,$maj_min,$name,$number,$info,$mapped,$part_size,$state);
+ if ($component =~ /([\S]+)\[([0-9]+)\]\(?([SF])?\)?/){
+ ($name,$number,$info) = ($1,$2,$3);
+ }
+ elsif ($component =~ /([\S]+)/){
+ $name = $1;
+ }
+ next if !$name;
+ if ($details->{'devices'} && ref $details->{'devices'} eq 'HASH'){
+ $maj_min = $details->{'devices'}{$name}{'maj-min'};
+ $state = $details->{'devices'}{$name}{'state'};
+ }
+ if ((!$maj_min || !$part_size) && @proc_partitions){
+ $part = PartitionData::get($name);
+ if (@$part){
+ $maj_min = $part->[0] . ':' . $part->[1] if !$maj_min;
+ $part_size = $part->[2] if !$part_size;
+ }
+ }
+ if ((!$maj_min || !$part_size) && @lsblk){
+ %data= LsblkData::get($name);
+ $maj_min = $data{'maj-min'} if !$maj_min;
+ $part_size = $data{'size'}if !$part_size;
+ }
+ $mapped = $dmmapper{$name} if %dmmapper;
+ $raw_logical[1] += $part_size if $part_size;
+ $state = $info if !$state && $info;
+ push(@components,[$name,$number,$info,$part_size,$maj_min,$state,$mapped]);
+ }
+ # print "$component_string\n";
$j = scalar @mdraid;
- @data = ({
+ push(@mdraid, {
+ 'chunk-size' => $details->{'chunk-size'}, # if we got it, great, if not, further down
+ 'components' => \@components,
+ 'details' => $details,
'id' => $id,
- 'arrays' => ([],),
+ 'level' => $level,
+ 'maj-min' => $maj_min,
+ 'size' => $size,
'status' => $status,
'type' => 'mdraid',
});
- @mdraid = (@mdraid,@data);
- $mdraid[$j]{'arrays'}[0]{'raid'} = $raid;
- $mdraid[$j]{'arrays'}[0]{'components'} = \@components;
}
- #print "$_\n";
+ # print "$_\n";
if ($_ =~ /^([0-9]+)\sblocks/){
- $mdraid[$j]{'blocks'} = $1;
+ $mdraid[$j]->{'blocks'} = $1;
}
if ($_ =~ /super\s([0-9\.]+)\s/){
- $mdraid[$j]{'super-block'} = $1;
+ $mdraid[$j]->{'super-block'} = $1;
}
if ($_ =~ /algorithm\s([0-9\.]+)\s/){
- $mdraid[$j]{'algorithm'} = $1;
+ $mdraid[$j]->{'algorithm'} = $1;
}
if ($_ =~ /\[([0-9]+\/[0-9]+)\]\s\[([U_]+)\]/){
- $mdraid[$j]{'report'} = $1;
- $mdraid[$j]{'u-data'} = $2;
+ $mdraid[$j]->{'report'} = $1;
+ $mdraid[$j]->{'u-data'} = $2;
}
if ($_ =~ /resync=([\S]+)/){
- $mdraid[$j]{'resync'} = $1;
+ $mdraid[$j]->{'resync'} = $1;
}
if ($_ =~ /([0-9]+[km])\schunk/i){
- $mdraid[$j]{'chunk-size'} = $1;
+ $mdraid[$j]->{'chunk-size'} = $1;
}
if ($_ =~ /(\[[=]*>[\.]*\]).*(resync|recovery)\s*=\s*([0-9\.]+%)?(\s\(([0-9\/]+)\))?/){
- $mdraid[$j]{'progress-bar'} = $1;
- $mdraid[$j]{'recovery-percent'} = $3 if $3;
- $mdraid[$j]{'sectors-recovered'} = $5 if $5;
+ $mdraid[$j]->{'progress-bar'} = $1;
+ $mdraid[$j]->{'recovery-percent'} = $3 if $3;
+ $mdraid[$j]->{'sectors-recovered'} = $5 if $5;
}
if ($_ =~ /finish\s*=\s*([\S]+)\s+speed\s*=\s*([\S]+)/){
- $mdraid[$j]{'recovery-finish'} = $1;
- $mdraid[$j]{'recovery-speed'} = $2;
+ $mdraid[$j]->{'recovery-finish'} = $1;
+ $mdraid[$j]->{'recovery-speed'} = $2;
}
- #print 'mdraid loop: ', Data::Dumper::Dumper \@mdraid;
+ # print 'mdraid loop: ', Data::Dumper::Dumper \@mdraid;
}
if (@mdraid){
- $mdraid[0]{'system-supported'} = $system if $system;
- $mdraid[0]{'unused'} = $unused if $unused;
+ $mdraid[0]->{'supported-levels'} = $system if $system;
+ $mdraid[0]->{'unused'} = $unused if $unused;
}
- #print Data::Dumper::Dumper \@mdraid;
+ print Data::Dumper::Dumper \@mdraid if $dbg[37];
eval $end if $b_log;
return @mdraid;
}
+sub md_details {
+ eval $start if $b_log;
+ my ($id) = @_;
+ my (@working);
+ my $details = {};
+ my $cmd = $alerts{'mdadm'}->{'path'} . " --detail /dev/$id 2>/dev/null";
+ my @data = main::grabber($cmd,'','strip');
+ main::log_data('dump',"$id raw: \@data",\@data) if $b_log;
+ foreach (@data){
+ @working = split(/\s*:\s*/, $_, 2);
+ if (scalar @working == 2){
+ if ($working[0] eq 'Array Size' && $working[1] =~ /^([0-9]+)\s\(/){
+ $details->{'size'} = $1;
+ }
+ elsif ($working[0] eq 'Active Devices'){
+ $details->{'c-active'} = $working[1];
+ }
+ elsif ($working[0] eq 'Chunk Size'){
+ $details->{'chunk-size'} = $working[1];
+ }
+ elsif ($working[0] eq 'Failed Devices'){
+ $details->{'c-failed'} = $working[1];
+ }
+ elsif ($working[0] eq 'Raid Devices'){
+ $details->{'c-raid'} = $working[1];
+ }
+ elsif ($working[0] eq 'Spare Devices'){
+ $details->{'c-spare'} = $working[1];
+ }
+ elsif ($working[0] eq 'State'){
+ $details->{'state'} = $working[1];
+ }
+ elsif ($working[0] eq 'Total Devices'){
+ $details->{'c-total'} = $working[1];
+ }
+ elsif ($working[0] eq 'Used Dev Size' && $working[1] =~ /^([0-9]+)\s\(/){
+ $details->{'dev-size'} = $1;
+ }
+ elsif ($working[0] eq 'UUID'){
+ $details->{'uuid'} = $working[1];
+ }
+ elsif ($working[0] eq 'Working Devices'){
+ $details->{'c-working'} = $working[1];
+ }
+ }
+ # end component data lines
+ else {
+ @working = split(/\s+/,$_);
+ # 0 8 80 0 active sync /dev/sdf
+ # 2 8 128 - spare /dev/sdi
+ next if !@working || $working[0] eq 'Number' || scalar @working < 6;
+ $working[-1] =~ s|^/dev/(mapper/)?||;
+ $details->{'devices'}{$working[-1]} = {
+ 'maj-min' => $working[1] . ':' . $working[2],
+ 'number' => $working[0],
+ 'raid-device' => $working[3],
+ 'state' => join(' ', @working[4..($#working - 1)]),
+ };
+ }
+ }
+ # print Data::Dumper::Dumper $details;
+ main::log_data('dump',$id . ': %$details',$details) if $b_log;
+ eval $end if $b_log;
+ return $details;
+}
+
+sub soft_data {
+ eval $start if $b_log;
+ my ($cmd,$id,$state,$status,@data,@softraid,@working);
+ # already been set in DiskDataBSD but we know the device exists
+ foreach my $device (@{$sysctl{'softraid'}}){
+ if ($device =~ /\.drive[\d]+:([\S]+)\s\(([a-z0-9]+)\)[,\s]+(\S+)/){
+ my ($level,$size,@components);
+ $id = $2;
+ $status = $1;
+ $state = $3;
+ if ($alerts{'bioctl'}->{'action'} eq 'use'){
+ $cmd = $alerts{'bioctl'}->{'path'} . " $id 2>/dev/null";
+ @data = main::grabber($cmd,'','strip');
+ main::log_data('dump','softraid @data',\@data) if $b_log;
+ shift @data if @data; # get rid of headers
+ foreach my $row (@data){
+ @working = split(/\s+/,$row);
+ next if !defined $working[0];
+ if ($working[0] =~ /^softraid/){
+ if ($working[3] && main::is_numeric($working[3])){
+ $size = $working[3]/1024;# it's in bytes
+ $raw_logical[0] += $size;
+ }
+ $status = lc($working[2]) if $working[2];
+ $state = lc(join(' ', @working[6..$#working])) if $working[6];
+ $level = lc($working[5]) if $working[5];
+ }
+ elsif ($working[0] =~ /^[\d]{1,2}$/){
+ my ($c_id,$c_device,$c_size,$c_status);
+ if ($working[2] && main::is_numeric($working[2])){
+ $c_size = $working[2]/1024;# it's in bytes
+ $raw_logical[1] += $c_size;
+ }
+ $c_status = lc($working[1]) if $working[1];
+ if ($working[3] && $working[3] =~ /^([\d:\.]+)$/){
+ $c_device = $1;
+ }
+ if ($working[5] && $working[5] =~ /<([^>]+)>/){
+ $c_id = $1;
+ }
+ # when offline, there will be no $c_id, but we want to show device
+ if (!$c_id && $c_device){
+ $c_id = $c_device;
+ }
+ push(@components,[$c_id,$c_size,$c_status,$c_device]) if $c_id;
+ }
+ }
+ }
+ push(@softraid, {
+ 'components' => \@components,
+ 'id' => $id,
+ 'level' => $level,
+ 'size' => $size,
+ 'state' => $state,
+ 'status' => $status,
+ 'type' => 'softraid',
+ });
+ }
+ }
+ print Data::Dumper::Dumper \@softraid if $dbg[37];
+ main::log_data('dump','@softraid',\@softraid) if $b_log;
+ eval $end if $b_log;
+ return @softraid;
+}
+
sub zfs_data {
eval $start if $b_log;
my ($zpool) = @_;
- my (@components,@data,@zfs);
- my ($allocated,$free,$ref,$size,$status);
+ my (@components,@zfs);
+ my ($allocated,$free,$size,$size_holder,$status,$zfs_used,$zfs_avail,
+ $zfs_size,@working);
my $b_v = 1;
my ($i,$j,$k) = (0,0,0);
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-1-mirror-main-solestar.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-2-mirror-main-solestar.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-v-tank-1.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-v-gojev-1.txt";
- #my @working = main::reader($file);$zpool = '';
- my @working = main::grabber("$zpool list -v 2>/dev/null");
- DiskData::set_glabel() if $bsd_type && !$b_glabel;
+ if ($fake{'raid-zfs'}){
+ # my $file;
+ # $file = "$fake_data_dir/raid-logical/zfs/zpool-list-1-mirror-main-solestar.txt";
+ # $file = "$fake_data_dir/raid-logical/zfs/zpool-list-2-mirror-main-solestar.txt";
+ # $file = "$fake_data_dir/raid-logical/zfs/zpool-list-v-tank-1.txt";
+ # $file = "$fake_data_dir/raid-logical/zfs/zpool-list-v-gojev-1.txt";
+ # $file = "$fake_data_dir/raid-logical/zfs/zpool-list-v-w-spares-1.txt";
+ #@working = main::reader($file);$zpool = '';
+ }
+ else {
+ @working = main::grabber("$zpool list -v 2>/dev/null");
+ }
# bsd sed does not support inserting a true \n so use this trick
# some zfs does not have -v
if (!@working){
@working = main::grabber("$zpool list 2>/dev/null");
$b_v = 0;
}
- #print Data::Dumper::Dumper \@working;
+ my $zfs_path = main::check_program('zfs');
+ # print Data::Dumper::Dumper \@working;
main::log_data('dump','@working',\@working) if $b_log;
if (!@working){
main::log_data('data','no zpool list data') if $b_log;
@@ -14069,155 +23268,240 @@ sub zfs_data {
# NAME SIZE ALLOC FREE EXPANDSZ FRAG CAP DEDUP HEALTH ALTROOT
my $test = shift @working; # get rid of first header line
if ($test){
- foreach (split /\s+/, $test){
+ foreach (split(/\s+/, $test)){
last if $_ eq 'HEALTH';
$status_i++;
}
}
foreach (@working){
- my @row = split /\s+/, $_;
+ my @row = split(/\s+/, $_);
if (/^[\S]+/){
@components = ();
$i = 0;
- $size = ($row[1] && $row[1] ne '-')? main::translate_size($row[1]): '';
+ $size = ($row[1] && $row[1] ne '-') ? main::translate_size($row[1]): '';
$allocated = ($row[2] && $row[2] ne '-')? main::translate_size($row[2]): '';
$free = ($row[3] && $row[3] ne '-')? main::translate_size($row[3]): '';
+ ($zfs_used,$zfs_avail) = zfs_fs_sizes($zfs_path,$row[0]) if $zfs_path;
+ if (defined $zfs_used && defined $zfs_avail){
+ $zfs_size = $zfs_used + $zfs_avail;
+ $raw_logical[0] += $zfs_size;
+ }
+ else {
+ # must be BEFORE '$size_holder =' because only used if hits a new device
+ # AND unassigned via raid/mirror arrays. Corner case for > 1 device systems.
+ $raw_logical[0] += $size_holder if $size_holder;
+ $size_holder = $size;
+ }
$status = (defined $row[$status_i] && $row[$status_i] ne '') ? $row[$status_i]: 'no-status';
$j = scalar @zfs;
- @data = ({
+ push(@zfs, {
'id' => $row[0],
- 'allocated' => $allocated,
'arrays' => ([],),
- 'free' => $free,
- 'size' => $size,
+ 'raw-allocated' => $allocated,
+ 'raw-free' => $free,
+ 'raw-size' => $size,
+ 'zfs-free' => $zfs_avail,
+ 'zfs-size' => $zfs_size,
'status' => $status,
'type' => 'zfs',
});
- @zfs = (@zfs,@data);
}
- #print Data::Dumper::Dumper \@zfs;
+ # print Data::Dumper::Dumper \@zfs;
# raid level is the second item in the output, unless it is not, sometimes it is absent
- if ($row[1] =~ /raid|mirror/){
+ elsif ($row[1] =~ /raid|mirror/){
$row[1] =~ s/^raid1/mirror/;
#$row[1] =~ s/^raid/raid-/; # need to match in zpool status <device>
- $ref = $zfs[$j]{'arrays'};
- $k = scalar @$ref;
- $zfs[$j]{'arrays'}[$k]{'raid'} = $row[1];
+ $k = scalar @{$zfs[$j]->{'arrays'}};
+ $zfs[$j]->{'arrays'}[$k]{'level'} = $row[1];
$i = 0;
- $zfs[$j]{'arrays'}[$k]{'size'} = ($row[2] && $row[2] ne '-') ? main::translate_size($row[2]) : '';
- $zfs[$j]{'arrays'}[$k]{'allocated'} = ($row[3] && $row[3] ne '-') ? main::translate_size($row[3]) : '';
- $zfs[$j]{'arrays'}[$k]{'free'} = ($row[4] && $row[4] ne '-') ? main::translate_size($row[4]) : '';
+ $size = ($row[2] && $row[2] ne '-') ? main::translate_size($row[2]) : '';
+ if (!defined $zfs_used || !defined $zfs_avail){
+ $size_holder = 0;
+ $raw_logical[0] += $size if $size;
+ }
+ $zfs[$j]->{'arrays'}[$k]{'raw-allocated'} = ($row[3] && $row[3] ne '-') ? main::translate_size($row[3]) : '';
+ $zfs[$j]->{'arrays'}[$k]{'raw-free'} = ($row[4] && $row[4] ne '-') ? main::translate_size($row[4]) : '';
+ $zfs[$j]->{'arrays'}[$k]{'raw-size'} = $size;
}
# https://blogs.oracle.com/eschrock/entry/zfs_hot_spares
- elsif ($row[1] =~ /spares/){
+ elsif ($row[1] =~ /spares?/){
next;
}
- # the first is a member of a raid array
- # ada2 - - - - - -
- # this second is a single device not in an array
+ # A member of a raid array:
+ # ada2 - - - - - -
+ # A single device not in an array:
# ada0s2 25.9G 14.6G 11.3G - 0% 56%
# gptid/3838f796-5c46-11e6-a931-d05099ac4dc2 - - - - - -
- elsif ($row[1] =~ /^(sd[a-z]|[a-z0-9]+[0-9]+|([\S]+)\/.*)$/ &&
- ($row[2] eq '-' || $row[2] =~ /^[0-9\.]+[MGTP]$/ )){
- $row[1] =~ /^(sd[a-z]|[a-z0-9]+[0-9]+|([\S]+)\/.*)\s*(DEGRADED|FAULTED|OFFLINE)?$/;
+ # Using /dev/disk/by-id:
+ # ata-VBOX_HARDDISK_VB5b6350cd-06618d58
+ # Using /dev/disk/by-partuuid:
+ # ec399377-c03c-e844-a876-8c8b044124b8 - - - - - - ONLINE
+ # Spare in use:
+ # /home/fred/zvol/hdd-2-3 - - - - - - - - INUSE
+ elsif ($row[1] =~ /^(sd[a-z]+|[a-z0-9]+[0-9]+|([\S]+)\/.*|(ata|mmc|nvme|pci|scsi|wwn)-\S+|[a-f0-9]{4,}(-[a-f0-9]{4,}){3,})$/ &&
+ ($row[2] eq '-' || $row[2] =~ /^[0-9\.]+[MGTPE]$/)){
+ #print "r1:$row[1]",' :: ', Cwd::abs_path('/dev/disk/by-id/'.$row[1]), "\n";
+ $row[1] =~ /^(sd[a-z]+|[a-z0-9]+[0-9]+|([\S]+)\/.*|(ata|mmc|nvme|pci|scsi|wwn)-\S+|[a-f0-9]{4,}(-[a-f0-9]{4,}){3,})\s.*?(DEGRADED|FAULTED|INUSE|OFFLINE)?$/;
+ #my $working = '';
my $working = ($1) ? $1 : ''; # note: the negative case can never happen
- my $state = ($3) ? $3 : '';
- if ($working =~ /[\S]+\// && @glabel){
- $working = DiskData::match_glabel($working);
+ my $state = ($4) ? $4 : '';
+ my ($maj_min,$real,$part_size);
+ if ($bsd_type && $working =~ /[\S]+\//){
+ $working = GlabelData::get($working);
+ }
+ elsif (!$bsd_type && $row[1] =~ /^(ata|mmc|nvme|scsi|wwn)-/ &&
+ -e "/dev/disk/by-id/$row[1]" && ($real = Cwd::abs_path('/dev/disk/by-id/'.$row[1]))){
+ $real =~ s|/dev/||;
+ $working = $real;
+ }
+ elsif (!$bsd_type && $row[1] =~ /^(pci)-/ &&
+ -e "/dev/disk/by-path/$row[1]" && ($real = Cwd::abs_path('/dev/disk/by-path/'.$row[1]))){
+ $real =~ s|/dev/||;
+ $working = $real;
+ }
+ elsif (!$bsd_type && $row[1] =~ /^[a-f0-9]{4,}(-[a-f0-9]{4,}){3,}$/ &&
+ -e "/dev/disk/by-partuuid/$row[1]" && ($real = Cwd::abs_path('/dev/disk/by-partuuid/'.$row[1]))){
+ $real =~ s|/dev/||;
+ $working = $real;
}
# kind of a hack, things like cache may not show size/free
# data since they have no array row, but they might show it in
# component row:
# ada0s2 25.9G 19.6G 6.25G - 0% 75%
- if (!$zfs[$j]{'size'} && $row[2] && $row[2] ne '-') {
- $size = ($row[2])? main::translate_size($row[2]): '';
- $zfs[$j]{'arrays'}[$k]{'size'} = $size;
- }
- if (!$zfs[$j]{'allocated'} && $row[3] && $row[3] ne '-') {
- $allocated = ($row[3])? main::translate_size($row[3]): '';
- $zfs[$j]{'arrays'}[$k]{'allocated'} = $allocated;
- }
- if (!$zfs[$j]{'free'} && $row[4] && $row[4] ne '-') {
- $free = ($row[4])? main::translate_size($row[4]): '';
- $zfs[$j]{'arrays'}[$k]{'free'} = $free;
- }
- $zfs[$j]{'arrays'}[$k]{'components'}[$i] = $working . '~' . $state;
+ # ec399377-c03c-e844-a876-8c8b044124b8 1.88G 397M 1.49G - - 0% 20.7% - ONLINE
+ # keys were size/allocated/free but those keys don't exist, assume failed to add raw-
+ if (!$zfs[$j]->{'raw-size'} && $row[2] && $row[2] ne '-'){
+ $size = ($row[2]) ? main::translate_size($row[2]): '';
+ $size_holder = 0;
+ $zfs[$j]->{'arrays'}[$k]{'raw-size'} = $size;
+ $raw_logical[0] += $size if $size;
+ }
+ if (!$zfs[$j]->{'raw-allocated'} && $row[3] && $row[3] ne '-'){
+ $allocated = ($row[3]) ? main::translate_size($row[3]) : '';
+ $zfs[$j]->{'arrays'}[$k]{'raw-allocated'} = $allocated;
+ }
+ if (!$zfs[$j]->{'raw-free'} && $row[4] && $row[4] ne '-'){
+ $free = ($row[4]) ? main::translate_size($row[4]) : '';
+ $zfs[$j]->{'arrays'}[$k]{'raw-free'} = $free;
+ }
+ if ((!$maj_min || !$part_size) && $working && @proc_partitions){
+ my $part = PartitionData::get($working);
+ if (@$part){
+ $maj_min = $part->[0] . ':' . $part->[1];
+ $part_size = $part->[2];
+ }
+ }
+ if ((!$maj_min || !$part_size) && $working && @lsblk){
+ my $data= LsblkData::get($working);
+ $maj_min = $data->{'maj-min'};
+ $part_size = $data->{'size'};
+ }
+ if (!$part_size && $bsd_type && $working){
+ my $temp = DiskDataBSD::get($working);
+ $part_size = $temp->{'size'} if $temp->{'size'};
+ }
+ $raw_logical[1] += $part_size if $part_size;
+ $zfs[$j]->{'arrays'}[$k]{'components'}[$i] = [$working,$part_size,$maj_min,$state];
$i++;
}
}
+ $raw_logical[0] += $size_holder if $size_holder;
# print Data::Dumper::Dumper \@zfs;
# clear out undefined arrrays values
$j = 0;
- foreach $ref (@zfs){
- my %row = %$ref;
- my $ref2 = $row{'arrays'};
- my @arrays = (ref $ref2 eq 'ARRAY' ) ? @$ref2 : ();
+ foreach my $row (@zfs){
+ my @arrays = (ref $row->{'arrays'} eq 'ARRAY') ? @{$row->{'arrays'}} : ();
@arrays = grep {defined $_} @arrays;
- $zfs[$j]{'arrays'} = \@arrays;
+ $zfs[$j]->{'arrays'} = \@arrays;
$j++;
}
- @zfs = zfs_status($zpool,@zfs);
- # print Data::Dumper::Dumper \@zfs;
+ @zfs = zfs_status($zpool,\@zfs);
+ print Data::Dumper::Dumper \@zfs if $dbg[37];
eval $end if $b_log;
return @zfs;
}
+
+sub zfs_fs_sizes {
+ my ($path,$id) = @_;
+ eval $start if $b_log;
+ my @data;
+ my @result = main::grabber("$path list -pH $id 2>/dev/null",'','strip');
+ main::log_data('dump','zfs list @result',\@result) if $b_log;
+ print Data::Dumper::Dumper \@result if $dbg[37];
+ # some zfs devices do not have zfs data, lake spare storage devices
+ if (@result){
+ my @working = split(/\s+/,$result[0]);
+ $data[0] = $working[1]/1024 if $working[1];
+ $data[1] = $working[2]/1024 if $working[2];
+ }
+ elsif ($b_log || $dbg[37]) {
+ @result = main::grabber("$path list -pH $id 2>&1",'','strip');
+ main::log_data('dump','zfs list w/error @result',\@result) if $b_log;
+ print '@result w/error: ', Data::Dumper::Dumper \@result if $dbg[37];
+ }
+ eval $end if $b_log;
+ return @data;
+}
+
sub zfs_status {
eval $start if $b_log;
- my ($zpool,@zfs) = @_;
- my ($cmd,$status,$file,$raid,@arrays,@pool_status,@temp);
+ my ($zpool,$zfs) = @_;
+ my ($cmd,$level,$status,@pool_status,@temp);
my ($i,$j,$k,$l) = (0,0,0,0);
- foreach my $ref (@zfs){
- my %row = %$ref;
+ foreach my $row (@$zfs){
$i = 0;
$k = 0;
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-1-mirror-main-solestar.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-2-mirror-main-solestar.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-tank-1.txt";
- #@pool_status = main::reader($file,'strip');
- $cmd = "$zpool status $row{'id'} 2>/dev/null";
- @pool_status = main::grabber($cmd,"\n",'strip');
+ if ($fake{'raid-zfs'}){
+ my $file;
+ # $file = "$fake_data_dir/raid-logical/zfs/zpool-status-1-mirror-main-solestar.txt";
+ # $file = "$fake_data_dir/raid-logical/zfs/zpool-status-2-mirror-main-solestar.txt";
+ # $file = "$fake_data_dir/raid-logical/zfs/zpool-status-tank-1.txt";
+ #@pool_status = main::reader($file,'strip');
+ }
+ else {
+ $cmd = "$zpool status $row->{'id'} 2>/dev/null";
+ @pool_status = main::grabber($cmd,"\n",'strip');
+ }
main::log_data('cmd',$cmd) if $b_log;
- my $ref2 = $row{'arrays'};
- @arrays = (ref $ref2 eq 'ARRAY' ) ? @$ref2 : ();
- #print "$row{'id'} rs:$row{'status'}\n";
- $status = ($row{'status'} && $row{'status'} eq 'no-status') ? check_status($row{'id'},@pool_status): $row{'status'};
- $zfs[$j]{'status'} = $status if $status;
+ # @arrays = (ref $row->{'arrays'} eq 'ARRAY') ? @{$row->{'arrays'}} : ();
+ # print "$row->{'id'} rs:$row->{'status'}\n";
+ $status = ($row->{'status'} && $row->{'status'} eq 'no-status') ? check_zfs_status($row->{'id'},\@pool_status): $row->{'status'};
+ $zfs->[$j]{'status'} = $status if $status;
#@arrays = grep {defined $_} @arrays;
- #print "$row{id} $#arrays\n";
- #print Data::Dumper::Dumper \@arrays;
- foreach my $array (@arrays){
- #print 'ref: ', ref $array, "\n";
+ # print "$row->{id} $#arrays\n";
+ # print Data::Dumper::Dumper \@arrays;
+ foreach my $array (@{$row->{'arrays'}}){
+ # print 'ref: ', ref $array, "\n";
#next if ref $array ne 'HASH';
- my %row2 = %$array;
- my $ref3 = $row2{'components'};
- my @components = (ref $ref3 eq 'ARRAY') ? @$ref3 : ();
+ my @components = (ref $array->{'components'} eq 'ARRAY') ? @{$array->{'components'}} : ();
$l = 0;
# zpool status: mirror-0 ONLINE 2 0 0
- $raid = ($row2{'raid'}) ? "$row2{'raid'}-$i": $row2{'raid'};
- $status = ($raid) ? check_status($raid,@pool_status): '';
- $zfs[$j]{'arrays'}[$k]{'status'} = $status;
- #print "$raid i:$i j:$j k:$k $status\n";
+ $level = ($array->{'level'}) ? "$array->{'level'}-$i": $array->{'level'};
+ $status = ($level) ? check_zfs_status($level,\@pool_status): '';
+ $zfs->[$j]{'arrays'}[$k]{'status'} = $status;
+ # print "$level i:$i j:$j k:$k $status\n";
foreach my $component (@components){
- my @temp = split /~/, $component;
- $status = ($temp[0]) ? check_status($temp[0],@pool_status): '';
- $zfs[$j]{'arrays'}[$k]{'components'}[$l] .= $status if $status;
+ my @temp = split('~', $component);
+ $status = ($temp[0]) ? check_zfs_status($temp[0],\@pool_status): '';
+ $zfs->[$j]{'arrays'}[$k]{'components'}[$l] .= $status if $status;
$l++;
}
$k++;
- # haven't seen a raid5/6 type array yet
- $i++ if $row2{'raid'}; # && $row2{'raid'} eq 'mirror';
+ # haven't seen a raid5/6 type array yet, zfs uses z1,z2,and z3
+ $i++ if $array->{'level'}; # && $array->{'level'} eq 'mirror';
}
$j++;
}
eval $end if $b_log;
- return @zfs;
+ return @$zfs;
}
-sub check_status {
+
+sub check_zfs_status {
eval $start if $b_log;
- my ($item,@pool_status) = @_;
+ my ($item,$pool_status) = @_;
my ($status) = ('');
- foreach (@pool_status){
- my @temp = split /\s+/, $_;
+ foreach (@$pool_status){
+ my @temp = split(/\s+/, $_);
if ($temp[0] eq $item){
last if !$temp[1];
$status = $temp[1];
@@ -14229,278 +23513,605 @@ sub check_status {
}
}
-## RamData
+## RamItem
{
-package RamData;
-
+package RamItem;
+my ($speed_maps,$vendors,$vendor_ids);
+my $ram_total = 0;
sub get {
- my (@data,@rows,$key1,@ram,$val1);
+ my ($key1,$val1);
+ my ($ram,$rows) = ([],[]);
my $num = 0;
- my $ref = $alerts{'dmidecode'};
- @rows = main::get_memory_data_full('ram') if !$b_mem;
- if ( !$b_fake_dmidecode && $$ref{'action'} ne 'use'){
- $key1 = $$ref{'action'};
- $val1 = $$ref{$key1};
- @data = ({
- main::key($num++,1,1,'RAM Report') => '',
- main::key($num++,0,2,$key1) => $val1,
- });
- @rows = (@rows,@data);
+ if ($bsd_type && !$force{'dmidecode'} && ($dboot{'ram'} || $fake{'dboot'})){
+ dboot_data($ram);
+ if (@$ram){
+ ram_output($rows,$ram,'dboot');
+ }
+ else {
+ $key1 = 'message';
+ $val1 = main::message('ram-data-dmidecode');
+ push(@$rows, {
+ main::key($num++,1,1,'RAM Report') => '',
+ main::key($num++,0,2,$key1) => $val1,
+ });
+ }
}
- else {
- @ram = dmidecode_data();
- if (@ram){
- @data = create_output(@ram);
+ elsif (!$fake{'udevadm'} && !$force{'udevadm'} && ($fake{'dmidecode'} ||
+ $alerts{'dmidecode'}->{'action'} eq 'use')){
+ dmidecode_data($ram);
+ if (@$ram){
+ ram_output($rows,$ram,'dmidecode');
}
else {
$key1 = 'message';
- $val1 = main::row_defaults('ram-data');
- @data = ({
+ $val1 = main::message('ram-data','dmidecode');
+ push(@$rows, {
main::key($num++,1,1,'RAM Report') => '',
main::key($num++,0,2,$key1) => $val1,
});
}
- @rows = (@rows,@data);
}
+ elsif ($fake{'udevadm'} || $alerts{'udevadm'}->{'action'} eq 'use'){
+ udevadm_data($ram);
+ if (@$ram){
+ ram_output($rows,$ram,'udevadm');
+ }
+ else {
+ $key1 = 'message';
+ my ($n,$v) = ProgramData::full('udevadm'); # v will be null/numeric start
+ $v =~ s/^(\d+)([^\d].*)?/$1/ if $v;
+ if ($v && $v < 249){
+ $val1 = main::message('ram-udevadm-version',$v);
+ }
+ else {
+ $val1 = main::message('ram-data','udevadm');
+ }
+ push(@$rows, {
+ main::key($num++,1,1,'RAM Report') => '',
+ main::key($num++,0,2,$key1) => $val1,
+ });
+ }
+ }
+ if (!$key1 && !@$ram) {
+ $key1 = $alerts{'dmidecode'}->{'action'};
+ $val1 = $alerts{'dmidecode'}->{'message'};
+ push(@$rows, {
+ main::key($num++,1,1,'RAM Report') => '',
+ main::key($num++,0,2,$key1) => $val1,
+ });
+ }
+ # we want the real installed RAM total if detected so add this after.
+ if (!$loaded{'memory'}){
+ $num = 0;
+ my $system_ram = {};
+ MemoryData::row('ram',$system_ram,\$num,1);
+ unshift(@$rows,$system_ram);
+ }
+ ($vendors,$vendor_ids) = ();
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub create_output {
+sub ram_total {
+ return $ram_total;
+}
+
+sub ram_output {
eval $start if $b_log;
- my (@ram) = @_;
- return if !@ram;
+ my ($rows,$ram,$source) = @_;
+ return if !@$ram;
my $num = 0;
my $j = 0;
- my (@data,@rows,$b_non_system);
- my ($arrays,$modules,$slots,$type_holder) = (0,0,0,'');
- foreach (@ram){
- $j = scalar @rows;
- my %ref = %$_;
- if (!$show{'ram-short'}){
- $b_non_system = ($ref{'use'} && lc($ref{'use'}) ne 'system memory') ? 1:0 ;
- $num = 1;
- @data = ({
- main::key($num++,1,1,'Array') => '',
- main::key($num++,1,2,'capacity') => process_size($ref{'capacity'}),
+ my $arrays = {};
+ set_arrays_data($ram,$arrays);
+ my ($b_non_system);
+ if ($source eq 'dboot'){
+ push(@$rows, {
+ main::key($num++,0,1,'Message') => main::message('ram-data-complete'),
+ });
+ }
+ # really only volts are inaccurate, possibly configured speed? Servers have
+ # very poor data quality, so always show for udevadm and high slot counts
+ # don't need t show for risc since if not dmi data, not running ram_output()
+ if (!$show{'ram-short'} && $source eq 'udevadm' &&
+ ($extra > 1 || ($arrays->{'slots'} && $arrays->{'slots'} > 4))){
+ my $message;
+ if (!$b_root){
+ $message = main::message('ram-udevadm');
+ }
+ elsif ($b_root && $alerts{'dmidecode'}->{'action'} eq 'missing'){
+ $message = main::message('ram-udevadm-root');
+ }
+ if ($message){
+ push(@$rows, {
+ main::key($num++,1,1,'Message') => $message,
});
- @rows = (@rows,@data);
- if ($ref{'cap-qualifier'}){
- $rows[$j]{main::key($num++,0,3,'note')} = $ref{'cap-qualifier'};
- }
- $rows[$j]{main::key($num++,0,2,'use')} = $ref{'use'} if $b_non_system;
- $rows[$j]{main::key($num++,0,2,'slots')} = $ref{'slots'};
- $ref{'eec'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'EC')} = $ref{'eec'};
- if ($extra > 0 && (!$b_non_system ||
- ( main::is_numeric($ref{'max-module-size'}) && $ref{'max-module-size'} > 10 ) ) ){
- $rows[$j]{main::key($num++,1,2,'max module size')} = process_size($ref{'max-module-size'});
- if ($ref{'mod-qualifier'}){
- $rows[$j]{main::key($num++,0,3,'note')} = $ref{'mod-qualifier'};
- }
- }
}
- else {
- $slots += $ref{'slots'} if $ref{'slots'};
- $arrays++;
- }
- foreach my $ref2 ($ref{'modules'}){
- next if ref $ref2 ne 'ARRAY';
- my @modules = @$ref2;
- # print Data::Dumper::Dumper \@modules;
- foreach my $ref3 ( @modules){
+ }
+ if (scalar @$ram > 1 || $show{'ram-short'}){
+ arrays_output($rows,$ram,$arrays);
+ if ($show{'ram-short'}){
+ eval $end if $b_log;
+ return 0;
+ }
+ }
+ foreach my $item (@$ram){
+ $j = scalar @$rows;
+ $num = 1;
+ $b_non_system = ($item->{'use'} && lc($item->{'use'}) ne 'system memory') ? 1: 0;
+ push(@$rows, {
+ main::key($num++,1,1,'Array') => '',
+ main::key($num++,1,2,'capacity') => process_size($item->{'capacity'}),
+ });
+ if ($item->{'cap-qualifier'}){
+ $rows->[$j]{main::key($num++,0,3,'note')} = $item->{'cap-qualifier'};
+ }
+ # show if > 1 array otherwise shows in System RAM line.
+ if (scalar @$ram > 1){
+ $rows->[$j]{main::key($num++,0,2,'installed')} = process_size($item->{'used-capacity'});
+ }
+ $rows->[$j]{main::key($num++,0,2,'use')} = $item->{'use'} if $b_non_system;
+ $rows->[$j]{main::key($num++,1,2,'slots')} = $item->{'slots'};
+ if ($item->{'slots-qualifier'}){
+ $rows->[$j]{main::key($num++,0,3,'note')} = $item->{'slots-qualifier'};
+ }
+ $rows->[$j]{main::key($num++,0,2,'modules')} = $item->{'slots-active'};
+ $item->{'eec'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'EC')} = $item->{'eec'};
+ if ($extra > 0 && (!$b_non_system ||
+ (main::is_numeric($item->{'max-module-size'}) &&
+ $item->{'max-module-size'} > 10))){
+ $rows->[$j]{main::key($num++,1,2,'max-module-size')} = process_size($item->{'max-module-size'});
+ if ($item->{'mod-qualifier'}){
+ $rows->[$j]{main::key($num++,0,3,'note')} = $item->{'mod-qualifier'};
+ }
+ }
+ if ($extra > 1 && $item->{'voltage'}){
+ $rows->[$j]{main::key($num++,0,2,'voltage')} = $item->{'voltage'};
+ }
+ foreach my $entry ($item->{'modules'}){
+ next if ref $entry ne 'ARRAY';
+ # print Data::Dumper::Dumper $entry;
+ foreach my $mod (@$entry){
$num = 1;
- $j = scalar @rows;
- # multi array setups will start index at next from previous array
- next if ref $ref3 ne 'HASH';
- my %mod = %$ref3;
- if ($show{'ram-short'}){
- $modules++ if ($mod{'size'} =~ /^\d/);
- $type_holder = $mod{'device-type'} if $mod{'device-type'};
+ $j = scalar @$rows;
+ # Multi array setups will start index at next from previous array
+ next if ref $mod ne 'HASH';
+ next if ($show{'ram-modules'} && $mod->{'size'} =~ /\D/);
+ $mod->{'locator'} ||= 'N/A';
+ push(@$rows, {
+ main::key($num++,1,2,'Device') => $mod->{'locator'},
+ });
+ # This will contain the no module string
+ if ($mod->{'size'} =~ /\D/){
+ $rows->[$j]{main::key($num++,0,3,'type')} = lc($mod->{'size'});
next;
}
- next if ($show{'ram-modules'} && $mod{'size'} =~ /\D/);
- $mod{'locator'} ||= 'N/A';
- @data = ({
- main::key($num++,1,2,'Device') => $mod{'locator'},
- main::key($num++,0,3,'size') => process_size($mod{'size'}),
- });
- @rows = (@rows,@data);
- next if ($mod{'size'} =~ /\D/);
- if ($extra > 1 && $mod{'type'} ){
- $rows[$j]{main::key($num++,0,3,'info')} = $mod{'type'};
- }
- $rows[$j]{main::key($num++,0,3,'speed')} = $mod{'speed'};
- if ($extra > 0 ){
- $mod{'device-type'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,3,'type')} = $mod{'device-type'};
- if ($extra > 2 && $mod{'device-type'} ne 'N/A'){
- $mod{'device-type-detail'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,3,'detail')} = $mod{'device-type-detail'};
+ if ($extra > 1 && $mod->{'type'}){
+ $rows->[$j]{main::key($num++,0,3,'info')} = $mod->{'type'};
+ }
+ $mod->{'device-type'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,3,'type')} = $mod->{'device-type'};
+ if ($extra > 2 && $mod->{'device-type'} ne 'N/A'){
+ $mod->{'device-type-detail'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,4,'detail')} = $mod->{'device-type-detail'};
+ }
+ $rows->[$j]{main::key($num++,0,3,'size')} = process_size($mod->{'size'});
+ if ($mod->{'speed'} && $mod->{'configured-clock-speed'} &&
+ $mod->{'speed'} ne $mod->{'configured-clock-speed'}){
+ $rows->[$j]{main::key($num++,1,3,'speed')} = '';
+ $rows->[$j]{main::key($num++,0,4,'spec')} = $mod->{'speed'};
+ if ($mod->{'speed-note'}){
+ $rows->[$j]{main::key($num++,0,4,'note')} = $mod->{'speed-note'};
+ }
+ $rows->[$j]{main::key($num++,0,4,'actual')} = $mod->{'configured-clock-speed'};
+ if ($mod->{'configured-note'}){
+ $rows->[$j]{main::key($num++,0,5,'note')} = $mod->{'configured-note'};
}
}
- if ($extra > 2 ){
- $mod{'data-width'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,3,'bus width')} = $mod{'data-width'};
- $mod{'total-width'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,3,'total')} = $mod{'total-width'};
+ else {
+ if (!$mod->{'speed'} && $mod->{'configured-clock-speed'}){
+ if ($mod->{'configured-clock-speed'}){
+ $mod->{'speed'} = $mod->{'configured-clock-speed'};
+ if ($mod->{'configured-note'}){
+ $mod->{'speed-note'} = $mod->{'configured-note'};
+ }
+ }
+ }
+ # Rare instances, dmi type 6, no speed, dboot also no speed
+ $mod->{'speed'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,3,'speed')} = $mod->{'speed'};
+ if ($mod->{'speed-note'}){
+ $rows->[$j]{main::key($num++,0,4,'note')} = $mod->{'speed-note'};
+ }
}
- if ($extra > 1 ){
- $mod{'manufacturer'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,3,'manufacturer')} = $mod{'manufacturer'};
- $mod{'part-number'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,3,'part-no')} = $mod{'part-number'};
+ # Handle cases where -xx or -xxx and no voltage data (common) or voltages
+ # are all the same.
+ if ($extra > 1){
+ if (($mod->{'voltage-config'} || $mod->{'voltage-max'} ||
+ $mod->{'voltage-min'}) && ($b_admin || (
+ ($mod->{'voltage-config'} && $mod->{'voltage-max'} &&
+ $mod->{'voltage-config'} ne $mod->{'voltage-max'}) ||
+ ($mod->{'voltage-config'} && $mod->{'voltage-min'} &&
+ $mod->{'voltage-config'} ne $mod->{'voltage-min'}) ||
+ ($mod->{'voltage-min'} && $mod->{'voltage-max'} &&
+ $mod->{'voltage-max'} ne $mod->{'voltage-min'})
+ ))){
+ $rows->[$j]{main::key($num++,1,3,'volts')} = '';
+ if ($mod->{'voltage-note'}){
+ $rows->[$j]{main::key($num++,0,4,'note')} = $mod->{'voltage-note'};
+ }
+ if ($mod->{'voltage-config'}){
+ $rows->[$j]{main::key($num++,0,4,'curr')} = $mod->{'voltage-config'};
+ }
+ if ($mod->{'voltage-min'}){
+ $rows->[$j]{main::key($num++,0,4,'min')} = $mod->{'voltage-min'};
+ }
+ if ($mod->{'voltage-max'}){
+ $rows->[$j]{main::key($num++,0,4,'max')} = $mod->{'voltage-max'};
+ }
+ }
+ else {
+ $mod->{'voltage-config'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,3,'volts')} = $mod->{'voltage-config'};
+ if ($mod->{'voltage-note'}){
+ $rows->[$j]{main::key($num++,0,4,'note')} = $mod->{'voltage-note'};
+ }
+ }
}
- if ($extra > 2 ){
- $mod{'serial'} = main::apply_filter($mod{'serial'});
- $rows[$j]{main::key($num++,0,3,'serial')} = $mod{'serial'};
+ if ($source ne 'dboot'){
+ if ($extra > 2){
+ if (!$mod->{'data-width'} && !$mod->{'total-width'}){
+ $rows->[$j]{main::key($num++,0,3,'width')} = 'N/A';
+ }
+ else {
+ $rows->[$j]{main::key($num++,1,3,'width (bits)')} = '';
+ $mod->{'data-width'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,4,'data')} = $mod->{'data-width'};
+ $mod->{'total-width'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,4,'total')} = $mod->{'total-width'};
+ }
+ }
+ if ($extra > 1){
+ $mod->{'manufacturer'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'manufacturer')} = $mod->{'manufacturer'};
+ $mod->{'part-number'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,3,'part-no')} = $mod->{'part-number'};
+ }
+ if ($b_admin && $mod->{'firmware'}){
+ $rows->[$j]{main::key($num++,0,3,'firmware')} = $mod->{'firmware'};
+ }
+ if ($extra > 2){
+ $mod->{'serial'} = main::filter($mod->{'serial'});
+ $rows->[$j]{main::key($num++,0,3,'serial')} = $mod->{'serial'};
+ }
}
}
}
}
- if ($show{'ram-short'}){
- $num = 1;
- $type_holder ||= 'N/A';
- @data = ({
- main::key($num++,1,1,'Report') => '',
- main::key($num++,0,2,'arrays') => $arrays,
- main::key($num++,0,2,'slots') => $slots,
- main::key($num++,0,2,'modules') => $modules,
- main::key($num++,0,2,'type') => $type_holder,
- });
- @rows = (@rows,@data);
+ eval $end if $b_log;
+}
+
+# args: 0: $rows ref; 1: $ram ref;
+sub arrays_output {
+ eval $end if $b_log;
+ my ($rows,$ram,$arrays) = @_;
+ my $num = 1;
+ $arrays->{'arrays'} ||= 'N/A';
+ $arrays->{'capacity'} ||= 'N/A';
+ $arrays->{'used-capacity'} ||= 'N/A';
+ $arrays->{'eec'} ||= 'N/A';
+ $arrays->{'slots'} ||= 'N/A';
+ $arrays->{'slots-active'} ||= 'N/A';
+ $arrays->{'device-type'} ||= 'N/A';
+ push(@$rows, {
+ main::key($num++,1,1,'Report') => '',
+ main::key($num++,1,2,'arrays') => $arrays->{'arrays'},
+ main::key($num++,1,2,'capacity') => process_size($arrays->{'capacity'}),
+ main::key($num++,0,3,'installed') => process_size($arrays->{'used-capacity'}),
+ main::key($num++,1,2,'slots') => $arrays->{'slots'},
+ main::key($num++,0,3,'active') => $arrays->{'slots-active'},
+ main::key($num++,0,2,'type') => $arrays->{'device-type'},
+ main::key($num++,0,2,'eec') => $arrays->{'eec'},
+ });
+ eval $end if $b_log;
+}
+
+sub set_arrays_data {
+ my ($ram,$arrays) = @_;
+ $arrays->{'arrays'} = 0;
+ $arrays->{'capacity'} = 0;
+ $arrays->{'used-capacity'} = 0;
+ $arrays->{'slots'} = 0;
+ $arrays->{'slots-active'} = 0;
+ foreach my $array (@$ram){
+ $arrays->{'arrays'}++;
+ $arrays->{'capacity'} += $array->{'capacity'} if $array->{'capacity'};
+ $arrays->{'used-capacity'} += $array->{'used-capacity'} if $array->{'used-capacity'};
+ $arrays->{'eec'} = $array->{'eec'} if !$arrays->{'eec'} && $array->{'eec'};
+ $arrays->{'slots'} += $array->{'slots'} if $array->{'slots'};
+ $arrays->{'slots-active'} += $array->{'slots-active'} if $array->{'slots-active'};
+ $arrays->{'device-type'} = $array->{'device-type'} if !$arrays->{'device-type'} && $array->{'device-type'};
+ }
+}
+
+# args: 0: $ram ref;
+sub dboot_data {
+ eval $start if $b_log;
+ my $ram = $_[0];
+ my $est = main::message('note-est');
+ my ($arr,$derived_module_size,$subtract) = (0,0,0);
+ my ($holder,@slots_active);
+ foreach (@{$dboot{'ram'}}){
+ my ($addr,$detail,$device_detail,$ecc,$iic,$locator,$size,$speed,$type);
+ # Note: seen a netbsd with multiline spdmem0/1 etc but not consistent, don't use
+ if (/^(spdmem([\d]+)):at iic([\d]+)(\saddr 0x([0-9a-f]+))?/){
+ $iic = $3;
+ $locator = $1;
+ $holder = $iic if !defined $holder; # prime for first use
+ # Note: seen iic2 as only device
+ if ($iic != $holder){
+ if ($ram->[$arr] && $ram->[$arr]{'slots-16'}){
+ $subtract += $ram->[$arr]{'slots-16'};
+ }
+ $holder = $iic;
+ # Then since we are on a new iic device, assume new ram array.
+ # This needs more data to confirm this guess.
+ $arr++;
+ $slots_active[$arr] = 0;
+ }
+ if ($5){
+ $addr = hex($5);
+ }
+ if (/(non?[\s-]parity)/i){
+ $device_detail = $1;
+ $ecc = 'None';
+ }
+ elsif (/EEC/i){
+ $device_detail = 'EEC';
+ $ecc = 'EEC';
+ }
+ # Possible: PC2700CL2.5 PC3-10600
+ if (/\b(PC([2-9]?-|)\d{4,})[^\d]/){
+ $speed = $1;
+ $speed =~ s/PC/PC-/ if $speed =~ /^PC\d{4}/;
+ my $temp = speed_mapper($speed);
+ if ($temp ne $speed){
+ $detail = $speed;
+ $speed = $temp;
+ }
+ }
+ # We want to avoid netbsd trying to complete @ram without real data.
+ if (/:(\d+[MGT])B?\s(DDR[0-9]*)\b/){
+ $size = main::translate_size($1); # mbfix: /1024
+ $type = $2;
+ if ($addr){
+ $ram->[$arr]{'slots-16'} = $addr - 80 + 1 - $subtract;
+ $locator = 'Slot-' . $ram->[$arr]{'slots-16'};
+ }
+ $slots_active[$arr]++;
+ $derived_module_size = $size if $size > $derived_module_size;
+ $ram->[$arr]{'derived-module-size'} = $derived_module_size;
+ $ram->[$arr]{'device-count-found'}++;
+ $ram->[$arr]{'eec'} = $ecc if !$ram->[$arr]{'eec'} && $ecc;
+ # Build up actual capacity found for override tests
+ $ram->[$arr]{'max-capacity-16'} += $size;
+ $ram->[$arr]{'max-cap-qualifier'} = $est;
+ $ram->[$arr]{'slots-16'}++ if !$addr;
+ $ram->[$arr]{'slots-active'} = $slots_active[$arr];
+ $ram->[$arr]{'slots-qualifier'} = $est;
+ $ram->[$arr]{'type'} = $type;
+ $ram->[$arr]{'used-capacity'} += $size;
+ if (!$ram->[$arr]{'device-type'} && $type){
+ $ram->[$arr]{'device-type'} = $type;
+ }
+ push(@{$ram->[$arr]{'modules'}},{
+ 'device-type' => $type,
+ 'device-type-detail' => $detail,
+ 'locator' => $locator,
+ 'size' => $size,
+ 'speed' => $speed,
+ });
+ }
+ }
+ }
+ for (my $i = 0; $i++ ;scalar @$ram){
+ next if ref $ram->[$i] ne 'HASH';
+ # 1 slot is possible, but 3 is very unlikely due to dual channel ddr
+ if ($ram->[$i]{'slots'} && $ram->[$i]{'slots'} > 2 && $ram->[$i]{'slots'} % 2 == 1){
+ $ram->[$i]{'slots'}++;
+ }
}
+ print 'dboot pre process_data: ', Data::Dumper::Dumper $ram if $dbg[36];
+ main::log_data('dump','@$ram',$ram) if $b_log;
+ process_data($ram) if @$ram;
+ main::log_data('dump','@$ram',$ram) if $b_log;
+ print 'dboot post process_data: ', Data::Dumper::Dumper $ram if $dbg[36];
eval $end if $b_log;
- return @rows;
}
+# args: 0: $ram ref;
sub dmidecode_data {
eval $start if $b_log;
- my ($b_5,$handle,@ram,@temp);
+ my $ram = $_[0];
+ my ($b_5,$handle,@slots_active,@temp);
my ($derived_module_size,$max_cap_5,$max_cap_16,$max_module_size) = (0,0,0,0);
my ($i,$j,$k) = (0,0,0);
- foreach (@dmi){
- my @ref = @$_;
- ## NOTE: do NOT reset these values, that causes failures
+ my $check = main::message('note-check');
+ # print Data::Dumper::Dumper \@dmi;
+ foreach my $entry (@dmi){
+ ## Note: do NOT reset these values, that causes failures
# ($derived_module_size,$max_cap_5,$max_cap_16,$max_module_size) = (0,0,0,0);
- if ($ref[0] == 5){
- $ram[$k] = ({}) if !$ram[$k];
- foreach my $item (@ref){
- @temp = split /:\s*/, $item;
- next if ! $temp[1];
+ if ($entry->[0] == 5){
+ $slots_active[$k] = 0;
+ foreach my $item (@$entry){
+ @temp = split(/:\s*/, $item, 2);
+ next if !$temp[1];
if ($temp[0] eq 'Maximum Memory Module Size'){
$max_module_size = calculate_size($temp[1],$max_module_size);
- $ram[$k]{'max-module-size'} = $max_module_size;
+ $ram->[$k]{'max-module-size'} = $max_module_size;
}
elsif ($temp[0] eq 'Maximum Total Memory Size'){
$max_cap_5 = calculate_size($temp[1],$max_cap_5);
- $ram[$k]{'max-capacity-5'} = $max_cap_5;
+ $ram->[$k]{'max-capacity-5'} = $max_cap_5;
}
elsif ($temp[0] eq 'Memory Module Voltage'){
- $temp[1] =~ s/\s*V.*$//;
- $ram[$k]{'voltage'} = $temp[1];
+ $temp[1] =~ s/\s*V.*$//; # seen: 5.0 V 3.3 V
+ $ram->[$k]{'voltage'} = $temp[1];
}
elsif ($temp[0] eq 'Associated Memory Slots'){
- $ram[$k]{'slots-5'} = $temp[1];
+ $ram->[$k]{'slots-5'} = $temp[1];
+ }
+ elsif ($temp[0] eq 'Error Detecting Method'){
+ $temp[1] ||= 'None';
+ $ram->[$k]{'eec'} = $temp[1] if !$ram->[$k]{'eec'} && $temp[1];
}
}
- $ram[$k]{'modules'} = ([],);
- #print Data::Dumper::Dumper \@ram;
+ $ram->[$k]{'modules'} = [];
+ # print Data::Dumper::Dumper \@ram;
$b_5 = 1;
}
- elsif ($ref[0] == 6){
+ elsif ($entry->[0] == 6){
my ($size,$speed,$type) = (0,0,0);
- foreach my $item (@ref){
- @temp = split /:\s*/, $item;
- next if ! $temp[1];
+ my ($bank_locator,$device_type,$locator,$main_locator) = ('','','','');
+ foreach my $item (@$entry){
+ @temp = split(/:\s*/, $item, 2);
+ next if !$temp[1];
if ($temp[0] eq 'Installed Size'){
- # get module size
+ # Get module size
$size = calculate_size($temp[1],0);
- # get data after module size
+ # Using this causes issues, really only works for 16
+ # if ($size =~ /^[0-9][0-9]+$/){
+ # $ram->[$k]{'device-count-found'}++;
+ # $ram->[$k]{'used-capacity'} += $size;
+ # }
+ # Get data after module size
$temp[1] =~ s/ Connection\)?//;
$temp[1] =~ s/^[0-9]+\s*[KkMGTP]B\s*\(?//;
$type = lc($temp[1]);
+ $slots_active[$k]++;
}
elsif ($temp[0] eq 'Current Speed'){
- $speed = $temp[1];
+ $speed = main::clean_dmi($temp[1]);
+ }
+ elsif ($temp[0] eq 'Locator' || $temp[0] eq 'Socket Designation'){
+ $temp[1] =~ s/D?RAM slot #?/Slot/i; # can be with or without #
+ $locator = $temp[1];
}
+ elsif ($temp[0] eq 'Bank Locator'){
+ $bank_locator = $temp[1];
+ }
+ elsif ($temp[0] eq 'Type'){
+ $device_type = main::clean_dmi($temp[1]);
+ }
+ }
+ # Because of the wide range of bank/slot type data, we will just use
+ # the one that seems most likely to be right. Some have:
+ # 'Bank: SO DIMM 0 slot: J6A' so we dump the useless data and use the
+ # one most likely to be visibly correct
+ if ($bank_locator =~ /DIMM/){
+ $main_locator = $bank_locator;
}
- $ram[$k]{'modules'}[$j] = ({
+ else {
+ $main_locator = $locator;
+ }
+ $ram->[$k]{'modules'}[$j] = {
+ 'slots-active' => $slots_active[$k],
+ 'device-type' => $device_type,
+ 'locator' => $main_locator,
'size' => $size,
- 'speed-ns' => $speed,
+ 'speed' => $speed,
'type' => $type,
- });
- #print Data::Dumper::Dumper \@ram;
+ };
+ if (!$ram->[$k]{'device-type'} && $device_type){
+ $ram->[$k]{'device-type'} = $device_type;
+ }
+ # print Data::Dumper::Dumper \@ram;
$j++;
}
- elsif ($ref[0] == 16){
- $handle = $ref[1];
- $ram[$handle] = $ram[$k] if $ram[$k];
- $ram[$k] = undef;
- $ram[$handle] = ({}) if !$ram[$handle];
+ elsif ($entry->[0] == 16){
+ $handle = $entry->[1];
+ $ram->[$handle] = $ram->[$k] if $ram->[$k];
+ $ram->[$k] = undef;
+ $slots_active[$handle] = 0;
# ($derived_module_size,$max_cap_16) = (0,0);
- foreach my $item (@ref){
- @temp = split /:\s*/, $item;
- next if ! $temp[1];
+ foreach my $item (@$entry){
+ @temp = split(/:\s*/, $item, 2);
+ next if !$temp[1];
if ($temp[0] eq 'Maximum Capacity'){
$max_cap_16 = calculate_size($temp[1],$max_cap_16);
- $ram[$handle]{'max-capacity-16'} = $max_cap_16;
+ $ram->[$handle]{'max-capacity-16'} = $max_cap_16;
}
- # note: these 3 have cleaned data in set_dmidecode_data, so replace stuff manually
+ # Note: these 3 have cleaned data in DmiData, so replace stuff manually
elsif ($temp[0] eq 'Location'){
$temp[1] =~ s/\sOr\sMotherboard//;
$temp[1] ||= 'System Board';
- $ram[$handle]{'location'} = $temp[1];
+ $ram->[$handle]{'location'} = $temp[1];
}
elsif ($temp[0] eq 'Use'){
$temp[1] ||= 'System Memory';
- $ram[$handle]{'use'} = $temp[1];
+ $ram->[$handle]{'use'} = $temp[1];
}
elsif ($temp[0] eq 'Error Correction Type'){
+ # seen <OUT OF SPEC>
+ if ($temp[1] && lc($temp[1]) ne 'none'){
+ $temp[1] = main::clean_dmi($temp[1]);
+ }
$temp[1] ||= 'None';
- $ram[$handle]{'eec'} = $temp[1];
+ if (!$ram->[$handle]{'eec'} && $temp[1]){
+ $ram->[$handle]{'eec'} = $temp[1];
+ }
}
elsif ($temp[0] eq 'Number Of Devices'){
- $ram[$handle]{'slots-16'} = $temp[1];
- }
- #print "0: $temp[0]\n";
- }
- $ram[$handle]{'derived-module-size'} = 0;
- $ram[$handle]{'device-count-found'} = 0;
- $ram[$handle]{'used-capacity'} = 0;
- #print "s16: $ram[$handle]{'slots-16'}\n";
- }
- elsif ($ref[0] == 17){
- my ($bank_locator,$configured_clock_speed,$data_width) = ('','','');
- my ($device_type,$device_type_detail,$form_factor,$locator,$main_locator) = ('','','','','');
- my ($manufacturer,$part_number,$serial,$speed,$total_width) = ('','','','','');
+ $ram->[$handle]{'slots-16'} = $temp[1];
+ }
+ # print "0: $temp[0]\n";
+ }
+ $ram->[$handle]{'derived-module-size'} = 0;
+ $ram->[$handle]{'device-count-found'} = 0;
+ $ram->[$handle]{'used-capacity'} = 0;
+ # print "s16: $ram->[$handle]{'slots-16'}\n";
+ }
+ elsif ($entry->[0] == 17){
+ my ($bank_locator,$configured_speed,$configured_note,
+ $data_width) = ('','','','');
+ my ($device_type,$device_type_detail,$firmware,$form_factor,$locator,
+ $main_locator) = ('','','','','','');
+ my ($manufacturer,$vendor_id,$part_number,$serial,$speed,$speed_note,
+ $total_width) = ('','','','','','','');
+ my ($voltage_config,$voltage_max,$voltage_min);
my ($device_size,$i_data,$i_total,$working_size) = (0,0,0,0);
- foreach my $item (@ref){
- @temp = split /:\s*/, $item;
- next if ! $temp[1];
+ foreach my $item (@$entry){
+ @temp = split(/:\s*/, $item, 2);
+ next if !$temp[1];
if ($temp[0] eq 'Array Handle'){
$handle = hex($temp[1]);
}
+ # These two can have 'none' or 'unknown' value
elsif ($temp[0] eq 'Data Width'){
- $data_width = $temp[1];
+ $data_width = main::clean_dmi($temp[1]);
+ $data_width =~ s/[\s_-]?bits// if $data_width;
}
elsif ($temp[0] eq 'Total Width'){
- $total_width = $temp[1];
+ $total_width = main::clean_dmi($temp[1]);
+ $total_width =~ s/[\s_-]?bits// if $total_width;
}
- # do not try to guess from installed modules, only use this to correct type 5 data
+ # Do not try to guess from installed modules, only use this to correct
+ # type 5 data
elsif ($temp[0] eq 'Size'){
# we want any non real size data to be preserved
- if ( $temp[1] =~ /^[0-9]+\s*[KkMTPG]B/ ) {
+ if ($temp[1] =~ /^[0-9]+\s*[KkMTPG]i?B/){
$derived_module_size = calculate_size($temp[1],$derived_module_size);
$working_size = calculate_size($temp[1],0);
$device_size = $working_size;
+ $slots_active[$handle]++;
}
else {
- $device_size = $temp[1];
+ $device_size = ($temp[1] =~ /no module/i) ? main::message('ram-no-module') : $temp[1];
}
}
elsif ($temp[0] eq 'Locator'){
- $temp[1] =~ s/RAM slot #/Slot/;
+ $temp[1] =~ s/D?RAM slot #?/Slot/i;
$locator = $temp[1];
}
elsif ($temp[0] eq 'Bank Locator'){
@@ -14509,49 +24120,84 @@ sub dmidecode_data {
elsif ($temp[0] eq 'Form Factor'){
$form_factor = $temp[1];
}
+ # these two can have 'none' or 'unknown' value
elsif ($temp[0] eq 'Type'){
- $device_type = $temp[1];
+ $device_type = main::clean_dmi($temp[1]);
}
elsif ($temp[0] eq 'Type Detail'){
- $device_type_detail = $temp[1];
+ $device_type_detail = main::clean_dmi($temp[1]);
}
elsif ($temp[0] eq 'Speed'){
- $speed = $temp[1];
+ my ($working,$unit);
+ $temp[1] = main::clean_dmi($temp[1]);
+ if ($temp[1] && $temp[1] =~ /^(\d+)\s*([GM]\S+)/){
+ $working = $1;
+ $unit = $2;
+ my $result = process_speed($unit,$working,$device_type,$check);
+ ($speed,$speed_note) = @$result;
+ }
+ else {
+ $speed = $temp[1];
+ }
}
- elsif ($temp[0] eq 'Configured Clock Speed'){
- $configured_clock_speed = $temp[1];
+ # This is the actual speed the system booted at, speed is hardcoded
+ # clock speed means MHz, memory speed MT/S
+ elsif ($temp[0] eq 'Configured Clock Speed' ||
+ $temp[0] eq 'Configured Memory Speed'){
+ my ($working,$unit);
+ $temp[1] = main::clean_dmi($temp[1]);
+ if ($temp[1] && $temp[1] =~ /^(\d+)\s*([GM]\S+)/){
+ $working = $1;
+ $unit = $2;
+ my $result = process_speed($unit,$working,$device_type,$check);
+ ($configured_speed,$configured_note) = @$result;
+ }
+ else {
+ $speed = $temp[1];
+ }
+ }
+ elsif ($temp[0] eq 'Firmware Version'){
+ $temp[1] = main::clean_dmi($temp[1]);
+ $firmware = $temp[1];
}
elsif ($temp[0] eq 'Manufacturer'){
- $temp[1] = main::dmi_cleaner($temp[1]);
+ $temp[1] = main::clean_dmi($temp[1]);
$manufacturer = $temp[1];
}
elsif ($temp[0] eq 'Part Number'){
- $temp[1] =~ s/(^[0]+$||.*Module.*|Undefined.*|PartNum.*|\[Empty\]|^To be filled.*)//g;
- $part_number = $temp[1];
+ $part_number = main::clean_unset($temp[1],'^[0]+$|.*Module.*|PartNum.*');
}
elsif ($temp[0] eq 'Serial Number'){
- $temp[1] =~ s/(^[0]+$|Undefined.*|SerNum.*|\[Empty\]|^To be filled.*)//g;
- $serial = $temp[1];
+ $serial = main::clean_unset($temp[1],'^[0]+$|SerNum.*');
+ }
+ elsif ($temp[0] eq 'Configured Voltage'){
+ if ($temp[1] =~ /^([\d\.]+)/){
+ $voltage_config = $1;
+ }
+ }
+ elsif ($temp[0] eq 'Maximum Voltage'){
+ if ($temp[1] =~ /^([\d\.]+)/){
+ $voltage_max = $1;
+ }
+ }
+ elsif ($temp[0] eq 'Minimum Voltage'){
+ if ($temp[1] =~ /^([\d\.]+)/){
+ $voltage_min = $1;
+ }
}
}
- # because of the wide range of bank/slot type data, we will just use
- # the one that seems most likely to be right. Some have: Bank: SO DIMM 0 slot: J6A
- # so we dump the useless data and use the one most likely to be visibly correct
- if ( $bank_locator =~ /DIMM/ ) {
- $main_locator = $bank_locator;
- }
- else {
- $main_locator = $locator;
- }
- if ($working_size =~ /^[0-9][0-9]+$/) {
- $ram[$handle]{'device-count-found'}++;
+ # locator data is not great or super reliable, so do our best
+ $main_locator = process_locator($locator,$bank_locator);
+ if ($working_size =~ /^[0-9][0-9]+$/){
+ $ram->[$handle]{'device-count-found'}++;
# build up actual capacity found for override tests
- $ram[$handle]{'used-capacity'} += $working_size;
+ $ram->[$handle]{'used-capacity'} += $working_size;
}
- # sometimes the data is just wrong, they reverse total/data. data I believe is
- # used for the actual memory bus width, total is some synthetic thing, sometimes missing.
- # note that we do not want a regular string comparison, because 128 bit memory buses are
- # in our future, and 128 bits < 64 bits with string compare
+ # Sometimes the data is just wrong, they reverse total/data. data I
+ # believe is used for the actual memory bus width, total is some synthetic
+ # thing, sometimes missing. Note that we do not want a regular string
+ # comparison, because 128 bit memory buses are in our future, and
+ # 128 bits < 64 bits with string compare.
$data_width =~ /(^[0-9]+).*/;
$i_data = $1;
$total_width =~ /(^[0-9]+).*/;
@@ -14561,318 +24207,935 @@ sub dmidecode_data {
$data_width = $total_width;
$total_width = $temp_width;
}
- $ram[$handle]{'derived-module-size'} = $derived_module_size;
- $ram[$handle]{'modules'}[$i]{'configured-clock-speed'} = $configured_clock_speed;
- $ram[$handle]{'modules'}[$i]{'data-width'} = $data_width;
- $ram[$handle]{'modules'}[$i]{'size'} = $device_size;
- $ram[$handle]{'modules'}[$i]{'device-type'} = $device_type;
- $ram[$handle]{'modules'}[$i]{'device-type-detail'} = lc($device_type_detail);
- $ram[$handle]{'modules'}[$i]{'form-factor'} = $form_factor;
- $ram[$handle]{'modules'}[$i]{'locator'} = $main_locator;
- $ram[$handle]{'modules'}[$i]{'manufacturer'} = $manufacturer;
- $ram[$handle]{'modules'}[$i]{'part-number'} = $part_number;
- $ram[$handle]{'modules'}[$i]{'serial'} = $serial;
- $ram[$handle]{'modules'}[$i]{'speed'} = $speed;
- $ram[$handle]{'modules'}[$i]{'total-width'} = $total_width;
+ ($manufacturer,$vendor_id,$part_number) = process_manufacturer(
+ $manufacturer,$part_number);
+ if (!$ram->[$handle]{'device-type'} && $device_type){
+ $ram->[$handle]{'device-type'} = $device_type;
+ }
+ $ram->[$handle]{'derived-module-size'} = $derived_module_size;
+ $ram->[$handle]{'slots-active'} = $slots_active[$handle];
+ $ram->[$handle]{'modules'}[$i]{'configured-clock-speed'} = $configured_speed;
+ $ram->[$handle]{'modules'}[$i]{'configured-note'} = $configured_note if $configured_note;
+ $ram->[$handle]{'modules'}[$i]{'data-width'} = $data_width;
+ $ram->[$handle]{'modules'}[$i]{'size'} = $device_size;
+ $ram->[$handle]{'modules'}[$i]{'device-type'} = $device_type;
+ $ram->[$handle]{'modules'}[$i]{'device-type-detail'} = lc($device_type_detail);
+ $ram->[$handle]{'modules'}[$i]{'firmware'} = $firmware;
+ $ram->[$handle]{'modules'}[$i]{'form-factor'} = $form_factor;
+ $ram->[$handle]{'modules'}[$i]{'locator'} = $main_locator;
+ $ram->[$handle]{'modules'}[$i]{'manufacturer'} = $manufacturer;
+ $ram->[$handle]{'modules'}[$i]{'vendor-id'} = $vendor_id;
+ $ram->[$handle]{'modules'}[$i]{'part-number'} = $part_number;
+ $ram->[$handle]{'modules'}[$i]{'serial'} = $serial;
+ $ram->[$handle]{'modules'}[$i]{'speed'} = $speed;
+ $ram->[$handle]{'modules'}[$i]{'speed-note'} = $speed_note if $speed_note;
+ $ram->[$handle]{'modules'}[$i]{'total-width'} = $total_width;
+ $ram->[$handle]{'modules'}[$i]{'voltage-config'} = $voltage_config;
+ $ram->[$handle]{'modules'}[$i]{'voltage-max'} = $voltage_max;
+ $ram->[$handle]{'modules'}[$i]{'voltage-min'} = $voltage_min;
$i++
}
- elsif ($ref[0] < 17 ){
+ elsif ($entry->[0] < 17){
next;
}
- elsif ($ref[0] > 17 ){
+ elsif ($entry->[0] > 17){
last;
}
}
- @ram = data_processor(@ram) if @ram;
- main::log_data('dump','@ram',\@ram) if $b_log;
- # print Data::Dumper::Dumper \@ram;
+ print 'dmidecode pre process_data: ', Data::Dumper::Dumper $ram if $dbg[36];
+ main::log_data('dump','pre @$ram',$ram) if $b_log;
+ process_data($ram) if @$ram;
+ main::log_data('dump','post @$ram',$ram) if $b_log;
+ print 'dmidecode post process_data: ', Data::Dumper::Dumper $ram if $dbg[36];
+ eval $end if $b_log;
+}
+
+# this contains a subset of dmi RAM data generated I believe at boot
+# args: 0: $ram ref;
+sub udevadm_data {
+ eval $start if $b_log;
+ my $ram = $_[0];
+ my ($b_arr_nu,$b_arr_set,$d_holder,@data,$key,@temp);
+ my ($a,$i) = (0,0);
+ my %array_ids;
+ if ($fake{'udevadm'}){
+ my $file;
+ # $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-1-array-2-slot-1.txt";
+ # $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-1-array-2-slot-2-barebones.txt";
+ # $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-1-array-2-slot-3-errors.txt";
+ # $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-1-array-4-slot-1.txt";
+ # $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-1-array-4-slot-2-volts.txt";
+ # $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-1-array-16-slot-1.txt";
+ # $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-1-array-16-slot-2.txt";
+ $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-2-array-24-slot-1.txt";
+ # $file = "$fake_data_dir/ram/udevadm/udevadm-dmi-4-array-12-slot-1.txt";
+ @data = main::reader($file,'strip');
+ }
+ else {
+ my $cmd = $alerts{'udevadm'}->{'path'} . ' info -p /devices/virtual/dmi/id 2>/dev/null';
+ @data = main::grabber($cmd,'','strip');
+ }
+ if (@data){
+ @data = map {s/^\S: //;$_ if /^MEMORY/;} @data;
+ # unknown if > 1 array output possible, do not sort in case they just stack it
+ @data = grep {/^ME/} @data;
+ }
+ main::log_data('dump','@data',\@data) if $b_log;
+ print Data::Dumper::Dumper \@data if $dbg[36];
+ foreach my $line (@data){
+ @temp = split(/=/,$line,2);
+ # there should be array numbering at least, but there isn't, not yet anyway
+ if ($temp[0] =~ /^MEMORY_ARRAY_((\d+)_)?(\S+)/){
+ $key = $3;
+ if ($2){
+ $b_arr_nu = 1;
+ $a = $2;
+ }
+ # this _should_ be first item, hoping > 1 arrays is stacked in order
+ if ($key eq 'LOCATION'){
+ $temp[1] =~ s/\sOr\sMotherboard//;
+ $temp[1] ||= 'System Board';
+ $a++ if !$b_arr_nu && $b_arr_set;
+ $ram->[$a]{'location'} = $temp[1];
+ $b_arr_set = 1;
+ }
+ elsif ($key eq 'EC_TYPE'){
+ if ($temp[1] && lc($temp[1]) ne 'none'){
+ $temp[1] = main::clean_dmi($temp[1]); # seen <OUT OF SPEC>
+ }
+ $temp[1] ||= 'None';
+ if (!$ram->[$a]{'eec'} && $temp[1]){
+ $ram->[$a]{'eec'} = $temp[1];
+ }
+ }
+ elsif ($key eq 'MAX_CAPACITY'){
+ # in bytes
+ $temp[1] = $temp[1]/1024 if $temp[1] =~ /^\d+$/;
+ $ram->[$a]{'max-capacity-16'} = $temp[1];
+ }
+ elsif ($key eq 'NUM_DEVICES'){
+ $ram->[$a]{'slots-16'} = $temp[1];
+ }
+ elsif ($key eq 'USE'){
+ $temp[1] ||= 'System Memory';
+ $ram->[$a]{'use'} = $temp[1];
+ }
+ }
+ elsif ($temp[0] =~ /^MEMORY_DEVICE_(\d+)_(\S+)$/){
+ $key = $2;
+ if (!defined $d_holder){
+ $d_holder = $1;
+ }
+ if ($d_holder ne $1){
+ $i++;
+ $d_holder = $1;
+ }
+ if ($key eq 'ASSET_TAG'){
+ $temp[1] = main::clean_dmi($temp[1]);
+ $ram->[$a]{'modules'}[$i]{'asset-tag'} = $temp[1] if $temp[1] ;
+ }
+ # only way to detect > 1 array systems is NODE[x] string.
+ elsif ($key eq 'BANK_LOCATOR'){
+ $ram->[$a]{'modules'}[$i]{'bank-locator'} = $temp[1];
+ # this is VERY unreliable, but better than nothing. Update if needed and
+ # new data sources available.
+ if ($temp[1] =~ /Node[\s_-]?(\d+)/i){
+ $ram->[$a]{'modules'}[$i]{'array-id'} = $1;
+ $array_ids{$1} = 1 if !defined $array_ids{$1};
+ }
+ }
+ elsif ($key eq 'CONFIGURED_SPEED_GTS'){
+ $ram->[$a]{'modules'}[$i]{'configured-clock-speed'} = $temp[1];
+ $ram->[$a]{'modules'}[$i]{'speed-unit'} = 'GT/s';
+ }
+ elsif ($key eq 'CONFIGURED_SPEED_MTS'){
+ $ram->[$a]{'modules'}[$i]{'configured-clock-speed'} = $temp[1];
+ $ram->[$a]{'modules'}[$i]{'speed-unit'} = 'MT/s';
+ }
+ elsif ($key eq 'CONFIGURED_VOLTAGE'){
+ if ($temp[1] =~ /^([\d\.]+)/){
+ $ram->[$a]{'modules'}[$i]{'voltage-config'} = $1;
+ }
+ }
+ elsif ($key eq 'DATA_WIDTH'){
+ $temp[1] = main::clean_dmi($temp[1]);
+ if ($temp[1]){
+ $temp[1] =~ s/[\s_-]?bits//;
+ $temp[1] =~ /(^[0-9]+).*/;
+ $ram->[$a]{'modules'}[$i]{'data-width'} = $1;
+ }
+ }
+ elsif ($key eq 'FIRMWARE_VERSION'){
+ $ram->[$a]{'modules'}[$i]{'firmware'} = main::clean_dmi($temp[1]);
+ }
+ elsif ($key eq 'FORM_FACTOR'){
+ $ram->[$a]{'modules'}[$i]{'form-factor'} = main::clean_dmi($temp[1]);
+ }
+ elsif ($key eq 'LOCATOR'){
+ $ram->[$a]{'modules'}[$i]{'locator'} = $temp[1];
+ }
+ elsif ($key eq 'MANUFACTURER'){
+ $temp[1] = main::clean_dmi($temp[1]);
+ $ram->[$a]{'modules'}[$i]{'manufacturer'} = $temp[1];
+ }
+ elsif ($key eq 'MAXIMUM_VOLTAGE'){
+ if ($temp[1] =~ /^([\d\.]+)/){
+ $ram->[$a]{'modules'}[$i]{'voltage-max'} = $1;
+ }
+ }
+ elsif ($key eq 'MINIMUM_VOLTAGE'){
+ if ($temp[1] =~ /^([\d\.]+)/){
+ $ram->[$a]{'modules'}[$i]{'voltage-min'} = $1;
+ }
+ }
+ elsif ($key eq 'PART_NUMBER'){
+ $ram->[$a]{'modules'}[$i]{'part-number'} = main::clean_unset($temp[1],'^[0]+$|.*Module.*|PartNum.*');
+ }
+ elsif ($key eq 'PRESENT'){
+ $ram->[$a]{'modules'}[$i]{'present'} = $temp[1]; # 0/1
+ }
+ elsif ($key eq 'RANK'){
+ $ram->[$a]{'modules'}[$i]{'rank'} = $temp[1];
+ }
+ elsif ($key eq 'SERIAL_NUMBER'){
+ $ram->[$a]{'modules'}[$i]{'serial'} = main::clean_unset($temp[1],'^[0]+$|SerNum.*');
+ }
+ # only seems to appear if occupied, handle no value in process
+ elsif ($key eq 'SIZE'){
+ if ($temp[1] =~ /^\d+$/){
+ $temp[1] = $temp[1]/1024;
+ $ram->[$a]{'modules'}[$i]{'size'} = $temp[1];
+ }
+ }
+ # maybe with DDR6 or 7?
+ elsif ($key eq 'SPEED_GTS'){
+ $ram->[$a]{'modules'}[$i]{'speed'} = $temp[1];
+ $ram->[$a]{'modules'}[$i]{'speed-unit'} = 'GT/s';
+ }
+ elsif ($key eq 'SPEED_MTS'){
+ $ram->[$a]{'modules'}[$i]{'speed'} = $temp[1];
+ $ram->[$a]{'modules'}[$i]{'speed-unit'} = 'MT/s';
+ }
+ elsif ($key eq 'TOTAL_WIDTH'){
+ $temp[1] = main::clean_dmi($temp[1]);
+ if ($temp[1]){
+ $temp[1] =~ s/[\s_-]?bits//;
+ $temp[1] =~ /(^[0-9]+).*/;
+ $ram->[$a]{'modules'}[$i]{'total-width'} = $1;
+ }
+ }
+ elsif ($key eq 'TYPE'){
+ $ram->[$a]{'modules'}[$i]{'device-type'} = main::clean_dmi($temp[1]);
+ if (!$ram->[$a]{'device-type'} && $ram->[$a]{'modules'}[$i]{'device-type'}){
+ $ram->[$a]{'device-type'} = $ram->[$a]{'modules'}[$i]{'device-type'};
+ }
+ }
+ elsif ($key eq 'TYPE_DETAIL'){
+ $ram->[$a]{'modules'}[$i]{'device-type-detail'} = lc(main::clean_dmi($temp[1]));
+ }
+ }
+ }
+ print 'udevadm pre process_data: ', Data::Dumper::Dumper $ram if $dbg[36];
+ main::log_data('dump','pre @$ram',$ram) if $b_log;
+ # bad quality output, for > 1 arrays, shows 1 array, > 1 nodes.
+ if (scalar @$ram == 1 && %array_ids && scalar keys %array_ids > 1){
+ udevadm_create_arrays($ram);
+ }
+ if (@$ram){
+ udevadm_data_process($ram);
+ }
+ process_data($ram) if @$ram;
+ main::log_data('dump','post @$ram',$ram) if $b_log;
+ print 'udevadm post process_data: ', Data::Dumper::Dumper $ram if $dbg[36];
eval $end if $b_log;
- return @ram;
}
-sub data_processor {
+
+# args: 0: $ram ref;
+sub udevadm_create_arrays {
eval $start if $b_log;
- my (@ram) = @_;
+ my $ram = $_[0];
+ my ($id,%working);
+ # rebuild the single array into set of arrays
+ my $arr = shift @$ram;
+ foreach my $module (@{$arr->{'modules'}}){
+ $id = $module->{'array-id'};
+ push(@{$working{$id}->{'modules'}},$module);
+ }
+ # print Data::Dumper::Dumper \%working;
+ my $i = 0;
+ foreach my $key (sort {$a <=> $b} keys %working){
+ $ram->[$i]{'modules'} = $working{$key}->{'modules'};
+ foreach my $key2 (%$arr){
+ next if $key2 eq 'modules' || $key2 eq 'slots-16';
+ $ram->[$i]{$key2} = $arr->{$key2};
+ }
+ $ram->[$i]{'slots-16'} = scalar @{$working{$key}->{'modules'}};
+ $i++;
+ }
+ # print Data::Dumper::Dumper $ram;
+ eval $end if $b_log;
+}
+
+# See comments on dmidecode_data modules for logic used here
+# args: 0: $ram ref;
+sub udevadm_data_process {
+ eval $start if $b_log;
+ my $ram = $_[0];
+ my ($derived_module_size) = (0);
+ my $check = main::message('note-check');
+ # print 'post udev create: ', Data::Dumper::Dumper $ram;
+ for (my $a=0; $a < scalar @$ram; $a++){
+ # set the working data
+ $ram->[$a]{'derived-module-size'} = 0;
+ $ram->[$a]{'device-count-found'} = 0;
+ $ram->[$a]{'used-capacity'} = 0;
+ $ram->[$a]{'eec'} ||= 'None';
+ $ram->[$a]{'use'} ||= 'System Memory';
+ for (my $i=0; $i < scalar @{$ram->[$a]{'modules'}}; $i++){
+ if ($ram->[$a]{'modules'}[$i]{'size'}){
+ $derived_module_size = calculate_size($ram->[$a]{'modules'}[$i]{'size'}.'KiB',$derived_module_size);
+ $ram->[$a]{'device-count-found'}++;
+ $ram->[$a]{'slots-active'}++;
+ $ram->[$a]{'used-capacity'} += $ram->[$a]{'modules'}[$i]{'size'};
+ }
+ elsif (!$ram->[$a]{'modules'}[$i]{'size'}){
+ $ram->[$a]{'modules'}[$i]{'size'} = main::message('ram-no-module');
+ }
+ # sometimes all upper case, no idea why
+ if ($ram->[$a]{'modules'}[$i]{'manufacturer'} ||
+ $ram->[$a]{'modules'}[$i]{'part-number'}){
+ ($ram->[$a]{'modules'}[$i]{'manufacturer'},
+ $ram->[$a]{'modules'}[$i]{'vendor-id'},
+ $ram->[$a]{'modules'}[$i]{'part-number'}) = process_manufacturer(
+ $ram->[$a]{'modules'}[$i]{'manufacturer'},
+ $ram->[$a]{'modules'}[$i]{'part-number'});
+ }
+ # these are sometimes reversed
+ if ($ram->[$a]{'modules'}[$i]{'data-width'} &&
+ $ram->[$a]{'modules'}[$i]{'total-width'} &&
+ $ram->[$a]{'modules'}[$i]{'data-width'} > $ram->[$a]{'modules'}[$i]{'total-width'}){
+ my $temp = $ram->[$a]{'modules'}[$i]{'data-width'};
+ $ram->[$a]{'modules'}[$i]{'data-width'} = $ram->[$a]{'modules'}[$i]{'total-width'};
+ $ram->[$a]{'modules'}[$i]{'total-width'} = $temp;
+ }
+ if ($ram->[$a]{'modules'}[$i]{'speed'}){
+ my $result = process_speed($ram->[$a]{'modules'}[$i]{'speed-unit'},
+ $ram->[$a]{'modules'}[$i]{'speed'},
+ $ram->[$a]{'modules'}[$i]{'device-type'},$check);
+ $ram->[$a]{'modules'}[$i]{'speed'} = $result->[0];
+ $ram->[$a]{'modules'}[$i]{'speed-note'} = $result->[1];
+ }
+ if ($ram->[$a]{'modules'}[$i]{'configured-clock-speed'}){
+ my $result = process_speed($ram->[$a]{'modules'}[$i]{'speed-unit'},
+ $ram->[$a]{'modules'}[$i]{'configured-clock-speed'},
+ $ram->[$a]{'modules'}[$i]{'device-type'},$check);
+ $ram->[$a]{'modules'}[$i]{'configured-clock-speed'} = $result->[0];
+ $ram->[$a]{'modules'}[$i]{'configured-note'} = $result->[1];
+ }
+ # odd case were all value 1, which is almost certainly wrong
+ if ($ram->[$a]{'modules'}[$i]{'voltage-min'} &&
+ $ram->[$a]{'modules'}[$i]{'voltage-max'} &&
+ $ram->[$a]{'modules'}[$i]{'voltage-config'} &&
+ $ram->[$a]{'modules'}[$i]{'voltage-min'} eq '1' &&
+ $ram->[$a]{'modules'}[$i]{'voltage-max'} eq '1' &&
+ $ram->[$a]{'modules'}[$i]{'voltage-config'} eq '1'){
+ $ram->[$a]{'modules'}[$i]{'voltage-note'} = $check;
+ }
+ if ($ram->[$a]{'modules'}[$i]{'locator'} &&
+ $ram->[$a]{'modules'}[$i]{'bank-locator'}){
+ $ram->[$a]{'modules'}[$i]{'locator'} = process_locator(
+ $ram->[$a]{'modules'}[$i]{'locator'},$ram->[$a]{'modules'}[$i]{'bank-locator'});
+ }
+ }
+ $ram->[$a]{'derived-module-size'} = $derived_module_size if $derived_module_size;
+ }
+ eval $end if $b_log;
+}
+
+sub process_data {
+ eval $start if $b_log;
+ my $ram = $_[0];
+ my @result;
my $b_debug = 0;
- my (@return,@temp);
- my $est = 'est.';
- foreach (@ram){
- # because we use the actual array handle as the index,
- # there will be many undefined keys
- next if ! defined $_;
- my %ref = %$_;
+ my $check = main::message('note-check');
+ my $est = main::message('note-est');
+ foreach my $item (@$ram){
+ # Because we use the actual array handle as the index, there will be many
+ # undefined keys.
+ next if ! defined $item;
my ($max_cap,$max_mod_size) = (0,0);
- my ($alt_cap,$est_cap,$est_mod,$unit) = (0,'','','');
- $max_cap = $ref{'max-capacity-16'};
+ my ($alt_cap,$est_cap,$est_mod,$est_slots,$unit) = (0,'','','','');
+ $max_cap = $item->{'max-capacity-16'};
$max_cap ||= 0;
- # make sure they are integers not string if empty
- $ref{'slots-5'} ||= 0;
- $ref{'slots-16'} ||= 0;
- $ref{'max-capacity-5'} ||= 0;
- $ref{'max-module-size'} ||= 0;
- $ref{'used-capacity'} ||= 0;
- #$ref{'max-module-size'} = 0;# debugger
- # 1: if max cap 1 is null, and max cap 2 not null, use 2
+ # Make sure they are integers not string if empty.
+ $item->{'slots-5'} ||= 0;
+ $item->{'slots-16'} ||= 0;
+ $item->{'slots-active'} ||= 0;
+ $item->{'device-count-found'} ||= 0;
+ $item->{'max-capacity-5'} ||= 0;
+ $item->{'max-module-size'} ||= 0;
+ $item->{'used-capacity'} ||= 0;
+ # $item->{'max-module-size'} = 0;# debugger
+ # 1: If max cap 1 is null, and max cap 2 not null, use 2
if ($b_debug){
- print "1: mms: $ref{'max-module-size'} :dms: $ref{'derived-module-size'} :mc: $max_cap :uc: $ref{'used-capacity'}\n";
- print "1a: s5: $ref{'slots-5'} s16: $ref{'slots-16'}\n";
+ print "1: mms: $item->{'max-module-size'} :dms: $item->{'derived-module-size'} ";
+ print ":mc: $max_cap :uc: $item->{'used-capacity'}\n";
+ print "1a: s5: $item->{'slots-5'} s16: $item->{'slots-16'}\n";
}
- if (!$max_cap && $ref{'max-capacity-5'}) {
- $max_cap = $ref{'max-capacity-5'};
+ if (!$max_cap && $item->{'max-capacity-5'}){
+ $max_cap = $item->{'max-capacity-5'};
}
if ($b_debug){
- print "2: mms: $ref{'max-module-size'} :dms: $ref{'derived-module-size'} :mc: $max_cap :uc: $ref{'used-capacity'}\n";
- }
- # 2: now check to see if actually found module sizes are > than listed max module, replace if >
- if ( $ref{'max-module-size'} && $ref{'derived-module-size'} &&
- $ref{'derived-module-size'} > $ref{'max-module-size'} ){
- $ref{'max-module-size'} = $ref{'derived-module-size'};
+ print "2: mms: $item->{'max-module-size'} :dms: $item->{'derived-module-size'} ";
+ print ":mc: $max_cap :uc: $item->{'used-capacity'}\n";
+ }
+ # 2: Now check to see if actually found module sizes are > than listed
+ # max module, replace if >
+ if ($item->{'max-module-size'} && $item->{'derived-module-size'} &&
+ $item->{'derived-module-size'} > $item->{'max-module-size'}){
+ $item->{'max-module-size'} = $item->{'derived-module-size'};
$est_mod = $est;
}
if ($b_debug){
- print "3: dcf: $ref{'device-count-found'} :dms: $ref{'derived-module-size'} :mc: $max_cap :uc: $ref{'used-capacity'}\n";
- }
- # note: some cases memory capacity == max module size, so one stick will fill it
- # but I think only with cases of 2 slots does this happen, so if > 2, use the count of slots.
- if ($max_cap && ($ref{'device-count-found'} || $ref{'slots-16'}) ){
- # first check that actual memory found is not greater than listed max cap, or
- # checking to see module count * max mod size is not > used capacity
- if ($ref{'used-capacity'} && $ref{'max-capacity-16'}){
- if ($ref{'used-capacity'} > $max_cap){
- if ($ref{'max-module-size'} &&
- $ref{'used-capacity'} < ($ref{'slots-16'} * $ref{'max-module-size'} )){
- $max_cap = $ref{'slots-16'} * $ref{'max-module-size'};
+ print "3: dcf: $item->{'device-count-found'} :dms: $item->{'derived-module-size'} ";
+ print ":mc: $max_cap :uc: $item->{'used-capacity'}\n";
+ }
+ # Note: some cases memory capacity == max module size, so one stick will
+ # fill it but I think only with cases of 2 slots does this happen, so
+ # if > 2, use the count of slots.
+ if ($max_cap && ($item->{'device-count-found'} || $item->{'slots-16'})){
+ # First check that actual memory found is not greater than listed max cap,
+ # or checking to see module count * max mod size is not > used capacity
+ if ($item->{'used-capacity'} && $item->{'max-capacity-16'}){
+ if ($item->{'used-capacity'} > $max_cap){
+ if ($item->{'max-module-size'} &&
+ $item->{'used-capacity'} < ($item->{'slots-16'} * $item->{'max-module-size'})){
+ $max_cap = $item->{'slots-16'} * $item->{'max-module-size'};
$est_cap = $est;
print "A\n" if $b_debug;
}
- elsif ($ref{'derived-module-size'} &&
- $ref{'used-capacity'} < ($ref{'slots-16'} * $ref{'derived-module-size'}) ){
- $max_cap = $ref{'slots-16'} * $ref{'derived-module-size'};
+ elsif ($item->{'derived-module-size'} &&
+ $item->{'used-capacity'} < ($item->{'slots-16'} * $item->{'derived-module-size'})){
+ $max_cap = $item->{'slots-16'} * $item->{'derived-module-size'};
$est_cap = $est;
print "B\n" if $b_debug;
}
else {
- $max_cap = $ref{'used-capacity'};
+ $max_cap = $item->{'used-capacity'};
$est_cap = $est;
print "C\n" if $b_debug;
}
}
}
- # note that second case will never really activate except on virtual machines and maybe
- # mobile devices
+ # Note that second case will never really activate except on virtual
+ # machines and maybe mobile devices.
if (!$est_cap){
- # do not do this for only single modules found, max mod size can be equal to the array size
- if ($ref{'slots-16'} > 1 && $ref{'device-count-found'} > 1 &&
- $max_cap < ($ref{'derived-module-size'} * $ref{'slots-16'} ) ){
- $max_cap = $ref{'derived-module-size'} * $ref{'slots-16'};
+ # Do not do this for only single modules found, max mod size can be
+ # equal to the array size.
+ if ($item->{'slots-16'} > 1 && $item->{'device-count-found'} > 1 &&
+ $max_cap < ($item->{'derived-module-size'} * $item->{'slots-16'})){
+ $max_cap = $item->{'derived-module-size'} * $item->{'slots-16'};
$est_cap = $est;
print "D\n" if $b_debug;
}
- elsif ($ref{'device-count-found'} > 0 && $max_cap < ( $ref{'derived-module-size'} * $ref{'device-count-found'} )){
- $max_cap = $ref{'derived-module-size'} * $ref{'device-count-found'};
+ elsif ($item->{'device-count-found'} > 0 &&
+ $max_cap < ($item->{'derived-module-size'} * $item->{'device-count-found'})){
+ $max_cap = $item->{'derived-module-size'} * $item->{'device-count-found'};
$est_cap = $est;
print "E\n" if $b_debug;
}
- ## handle cases where we have type 5 data: mms x device count equals type 5 max cap
- # however do not use it if cap / devices equals the derived module size
- elsif ($ref{'max-module-size'} > 0 &&
- ($ref{'max-module-size'} * $ref{'slots-16'}) == $ref{'max-capacity-5'} &&
- $ref{'max-capacity-5'} != $ref{'max-capacity-16'} &&
- $ref{'derived-module-size'} != ($ref{'max-capacity-16'}/$ref{'slots-16'}) ){
- $max_cap = $ref{'max-capacity-5'};
+ # Handle cases where we have type 5 data: mms x device count equals
+ # type 5 max caphowever do not use it if cap / devices equals the
+ # derived module size.
+ elsif ($item->{'max-module-size'} > 0 &&
+ ($item->{'max-module-size'} * $item->{'slots-16'}) == $item->{'max-capacity-5'} &&
+ $item->{'max-capacity-5'} != $item->{'max-capacity-16'} &&
+ $item->{'derived-module-size'} != ($item->{'max-capacity-16'}/$item->{'slots-16'})){
+ $max_cap = $item->{'max-capacity-5'};
$est_cap = $est;
print "F\n" if $b_debug;
}
}
if ($b_debug){
- print "4: mms: $ref{'max-module-size'} :dms: $ref{'derived-module-size'} :mc: $max_cap :uc: $ref{'used-capacity'}\n";
+ print "4: mms: $item->{'max-module-size'} :dms: $item->{'derived-module-size'} ";
+ print ":mc: $max_cap :uc: $item->{'used-capacity'}\n";
}
- # some cases of type 5 have too big module max size, just dump the data then since
- # we cannot know if it is valid or not, and a guess can be wrong easily
- if ($ref{'max-module-size'} && $max_cap && $ref{'max-module-size'} > $max_cap){
- $ref{'max-module-size'} = 0;
+ # Some cases of type 5 have too big module max size, just dump the data
+ # then since we cannot know if it is valid or not, and a guess can be
+ # wrong easily.
+ if ($item->{'max-module-size'} && $max_cap && $item->{'max-module-size'} > $max_cap){
+ $item->{'max-module-size'} = 0;
}
if ($b_debug){
- print "5: dms: $ref{'derived-module-size'} :s16: $ref{'slots-16'} :mc: $max_cap\n";
+ print "5: dms: $item->{'derived-module-size'} :s16: $item->{'slots-16'} :mc: $max_cap\n";
}
-
- # now prep for rebuilding the ram array data
- if (!$ref{'max-module-size'}){
+ # Now prep for rebuilding the ram array data.
+ if (!$item->{'max-module-size'}){
# ie: 2x4gB
- if (!$est_cap && $ref{'derived-module-size'} > 0 && $max_cap > ($ref{'derived-module-size'} * $ref{'slots-16'} * 4) ){
- $est_cap = 'check';
+ if (!$est_cap && $item->{'derived-module-size'} > 0 &&
+ $max_cap > ($item->{'derived-module-size'} * $item->{'slots-16'} * 4)){
+ $est_cap = $check;
print "G\n" if $b_debug;
}
- if ($max_cap && ($ref{'slots-16'} || $ref{'slots-5'})){
+ if ($max_cap && ($item->{'slots-16'} || $item->{'slots-5'})){
my $slots = 0;
- if ($ref{'slots-16'} && $ref{'slots-16'} >= $ref{'slots-5'}){
- $slots = $ref{'slots-16'};
+ if ($item->{'slots-16'} && $item->{'slots-16'} >= $item->{'slots-5'}){
+ $slots = $item->{'slots-16'};
}
- elsif ($ref{'slots-5'} && $ref{'slots-5'} > $ref{'slots-16'}){
- $slots = $ref{'slots-5'};
+ elsif ($item->{'slots-5'} && $item->{'slots-5'} > $item->{'slots-16'}){
+ $slots = $item->{'slots-5'};
}
# print "slots: $slots\n" if $b_debug;
- if ($ref{'derived-module-size'} * $slots > $max_cap){
- $ref{'max-module-size'} = $ref{'derived-module-size'};
+ if ($item->{'derived-module-size'} * $slots > $max_cap){
+ $item->{'max-module-size'} = $item->{'derived-module-size'};
print "H\n" if $b_debug;
}
else {
- $ref{'max-module-size'} = sprintf("%.f",$max_cap/$slots);
+ $item->{'max-module-size'} = sprintf("%.f",$max_cap/$slots);
print "J\n" if $b_debug;
}
$est_mod = $est;
}
}
- # case where listed max cap is too big for actual slots x max cap, eg:
+ # Case where listed max cap is too big for actual slots x max cap, eg:
# listed max cap, 8gb, max mod 2gb, slots 2
else {
- if (!$est_cap && $ref{'max-module-size'} > 0){
- if ($max_cap > ( $ref{'max-module-size'} * $ref{'slots-16'})){
- $est_cap = 'check';
+ if (!$est_cap && $item->{'max-module-size'} > 0){
+ if ($max_cap > ($item->{'max-module-size'} * $item->{'slots-16'})){
+ $est_cap = $check;
print "K\n" if $b_debug;
}
}
}
}
- @temp = ({
+ # No slots found due to legacy dmi probably. Note, too many logic errors
+ # happen if we just set a general slots above, so safest to do it here
+ $item->{'slots-16'} = $item->{'slots-5'} if $item->{'slots-5'} && !$item->{'slots-16'};
+ if (!$item->{'slots-16'} && $item->{'modules'} && ref $item->{'modules'} eq 'ARRAY'){
+ $est_slots = $check;
+ $item->{'slots-16'} = scalar @{$item->{'modules'}};
+ print "L\n" if $b_debug;
+ }
+ # Only bsds using dmesg data
+ elsif ($item->{'slots-qualifier'}){
+ $est_slots = $item->{'slots-qualifier'};
+ $est_cap = $est;
+ }
+ $ram_total += $item->{'used-capacity'};
+ push(@result, {
'capacity' => $max_cap,
'cap-qualifier' => $est_cap,
- 'eec' => $ref{'eec'},
- 'location' => $ref{'location'},
- 'max-module-size' => $ref{'max-module-size'},
+ 'device-type' => $item->{'device-type'},
+ 'eec' => $item->{'eec'},
+ 'location' => $item->{'location'},
+ 'max-module-size' => $item->{'max-module-size'},
'mod-qualifier' => $est_mod,
- 'modules' => $ref{'modules'},
- 'slots' => $ref{'slots-16'},
- 'use' => $ref{'use'},
- 'voltage' => $ref{'voltage'},
+ 'modules' => $item->{'modules'},
+ 'slots' => $item->{'slots-16'},
+ 'slots-active' => $item->{'slots-active'},
+ 'slots-qualifier' => $est_slots,
+ 'use' => $item->{'use'},
+ 'used-capacity' => $item->{'used-capacity'},
+ 'voltage-config' => $item->{'voltage-config'},
+ 'voltage-max' => $item->{'voltage-max'},
+ 'voltage-min' => $item->{'voltage-min'},
});
- @return = (@return,@temp);
}
+ @$ram = @result;
eval $end if $b_log;
- return @return;
}
+
+## RAM UTILITIES ##
+
+# arg: 0: size string; 1: working size. If calculated result > $size, uses new
+# value. If $data not valid, returns 0.
+sub calculate_size {
+ eval $start if $b_log;
+ my ($data, $size) = @_;
+ # Technically k is KiB, K is KB but can't trust that.
+ if ($data =~ /^([0-9]+\s*[kKGMTP])i?B/){
+ my $working = $1;
+ # This converts it to KiB
+ my $working_size = main::translate_size($working);
+ # print "ws-a: $working_size s-1: $size\n";
+ if (main::is_numeric($working_size) && $working_size > $size){
+ $size = $working_size;
+ }
+ # print "ws-b: $working_size s-2: $size\n";
+ }
+ else {
+ $size = 0;
+ }
+ # print "d-2: $data s-3: $size\n";
+ eval $end if $b_log;
+ return $size;
+}
+
+# Because of the wide range of bank/slot type data, we will just use the
+# one that seems most likely to be right. Some have:
+# 'Bank: SO DIMM 0 slot: J6A' so we dump the useless data and use the one
+# most likely to be visibly correct.
+# Some systems show only DIMM 1 etc for locator with > 1 channels.
+# args: 0: locator; 1: bank-locator
+sub process_locator {
+ eval $start if $b_log;
+ my ($locator,$bank_locator) = @_;
+ my $main_locator;
+ if ($bank_locator && $bank_locator =~ /DIMM/){
+ $main_locator = $bank_locator;
+ }
+ else {
+ # some systems show only DIMM 1 etc for locator with > 1 channels.
+ if ($locator && $locator =~ /^DIMM[\s_-]?\d+$/ &&
+ $bank_locator && $bank_locator =~ /Channel[\s_-]?([A-Z]+)/i){
+ $main_locator = "Channel-$1 $locator";
+ }
+ else {
+ $main_locator = $locator;
+ }
+ }
+ eval $end if $b_log;
+ return $main_locator;
+}
+
+# args: 0: manufacturer; 1: part number
+sub process_manufacturer {
+ eval $start if $b_log;
+ my ($manufacturer,$part_number) = @_;
+ my $vendor_id;
+ if ($manufacturer){
+ if ($manufacturer =~ /^([a-f0-9]{4})$/i){
+ $vendor_id = lc($1);
+ $manufacturer = '';
+ }
+ elsif ($manufacturer =~ /^[A-Z]+$/){
+ $manufacturer = ucfirst(lc($manufacturer));
+ }
+ }
+ if (!$manufacturer){
+ if ($part_number){
+ my $result = ram_vendor($part_number);
+ $manufacturer = $result->[0] if $result->[0];
+ $part_number = $result->[1] if $result->[1];
+ }
+ if (!$manufacturer && $vendor_id){
+ set_ram_vendor_ids() if !$vendor_ids;
+ if ($vendor_ids->{$vendor_id}){
+ $manufacturer = $vendor_ids->{$vendor_id};
+ }
+ else {
+ $manufacturer = $vendor_id;
+ }
+ }
+ }
+ eval $end if $b_log;
+ return ($manufacturer,$vendor_id,$part_number);
+}
+
+# args: 0: size in KiB
sub process_size {
+ eval $start if $b_log;
my ($size) = @_;
my ($b_trim,$unit) = (0,'');
- #print "size0: $size\n";
- return 'N/A' if ( ! $size );
- #return $size if $size =~ /\D/;
+ # print "size0: $size\n";
+ return 'N/A' if !$size;
+ # we're going to preserve the bad data for output
return $size if !main::is_numeric($size);
- #print "size: $size\n";
- if ( $size < 1024 ){
- $unit='MiB';
- }
- elsif ( $size < 1024000 ){
- $size = $size / 1024;
- $unit='GiB';
- $b_trim = 1;
- }
- elsif ( $size < 1024000000 ){
- $size = $size / 1024000;
- $unit='TiB';
- $b_trim = 1;
- }
- # we only want a max 2 decimal places, and only when it's
- # a unit > MB
+ # print "size: $size\n";
+ # We only want max 2 decimal places, and only when it's a unit > 1 GiB.
+ $b_trim = 1 if $size > 1024**2;
+ ($size,$unit) = main::get_size($size);
$size = sprintf("%.2f",$size) if $b_trim;
$size =~ s/\.[0]+$//;
$size = "$size $unit";
+ eval $end if $b_log;
return $size;
}
-sub calculate_size {
- my ($data, $size) = @_;
- # technically k is KiB, K is KB but can't trust that
- if ( $data =~ /^[0-9]+\s*[kKGMTP]B/) {
- if ( $data =~ /([0-9]+)\s*GB/ ) {
- $data = $1 * 1024;
- }
- elsif ( $data =~ /([0-9]+)\s*MB/ ) {
- $data = $1;
- }
- elsif ( $data =~ /([0-9]+)\s*TB/ ) {
- $data = $1 * 1024 * 1000;
- }
- elsif ( $data =~ /([0-9]+)\s*PB/ ) {
- $data = $1 * 1024 * 1000 * 1000;
- }
- elsif ( $data =~ /([0-9]+)\s*[kK]B/ ) {
- $data = $1/1024;
- #print "d3:$data\n";
- }
- #print "d1a: $data s1: $size\n";
- if (main::is_numeric($data) && $data > $size ) {
- #if ($data =~ /^[0-9][0-9]+$/ && $data > $size ) {
- $size = $data;
+
+# args: 0: speed unit; 1: speed (numeric); 2: device tyep; 3: check string
+sub process_speed {
+ eval $start if $b_log;
+ my ($unit,$speed,$device_type,$check) = @_;
+ my ($speed_note,$speed_orig);
+ if ($unit eq 'MHz' && $device_type && $device_type =~ /ddr/i && $speed){
+ $speed_orig = " ($speed $unit)";
+ $speed = ($speed * 2);
+ $unit = 'MT/s';
+ }
+ # Seen cases of 1 MT/s, 61690 MT/s, not sure why, bug. Crucial is shipping
+ # 5100 MT/s now, and 6666 has been hit, so speeds can hit 10k. DDR6 hits
+ # 12.8k-17k, DDR7?. If GT/s assume valid and working
+ if ($speed && $unit && $unit eq 'MT/s'){
+ if ($speed < 50 || $speed > 30000){
+ $speed_note = $check;
+ }
+ }
+ $speed .= " $unit";
+ $speed .= $speed_orig if $speed_orig;
+ eval $end if $b_log;
+ return [$speed,$speed_note];
+}
+
+# BSD: Map string to speed, in MT/s
+sub set_speed_maps {
+ $speed_maps = {
+ # DDR1
+ 'PC-1600' => 200,
+ 'PC-2100' => 266,
+ 'PC-2400' => 300,
+ 'PC-2700' => 333,
+ 'PC-3200' => 400,
+ # DDR2
+ 'PC2-3200' => 400,
+ 'PC2-4200' => 533,
+ 'PC2-5300' => 667,
+ 'PC2-6400' => 800,
+ 'PC2-8000' => 1000,
+ 'PC2-8500' => 1066,
+ # DDR3
+ 'PC3-6400' => 800,
+ 'PC3-8500' => 1066,
+ 'PC3-10600' => 1333,
+ 'PC3-12800' => 1600,
+ 'PC3-14900 ' => 1866,
+ 'PC3-17000' => 2133,
+ # DDR4
+ 'PC4-12800' => 1600,
+ 'PC4-14900' => 1866,
+ 'PC4-17000' => 2133,
+ 'PC4-19200' => 2400,
+ 'PC4-21300' => 2666,
+ 'PC4-21333' => 2666,
+ 'PC4-23400' => 2933,
+ 'PC4-23466' => 2933,
+ 'PC4-24000' => 3000,
+ 'PC4-25600' => 3200,
+ 'PC4-28800' => 3600,
+ 'PC4-32000' => 4000,
+ 'PC4-35200' => 4400,
+ # DDR5
+ 'PC5-32000' => 4000,
+ 'PC5-35200' => 4400,
+ 'PC5-38400' => 4800,
+ 'PC5-41600' => 5200,
+ 'PC5-44800' => 5600,
+ 'PC5-48000' => 6000,
+ 'PC5-49600' => 6200,
+ 'PC5-51200' => 6400,
+ 'PC5-54400' => 6800,
+ 'PC5-57600' => 7200,
+ 'PC5-60800' => 7600,
+ 'PC5-64000' => 8000,
+ # DDR6, coming...
+ # 'PC6-xxxxx' => 12800,
+ # 'PC6-xxxxx' => 17000, # overclocked
+ };
+}
+
+# args: 0: pc type string;
+sub speed_mapper {
+ eval $start if $b_log;
+ set_speed_maps if !$speed_maps;
+ eval $end if $b_log;
+ return ($speed_maps->{$_[0]}) ? $speed_maps->{$_[0]} . ' MT/s' : $_[0];
+}
+
+## START RAM VENDOR ##
+sub set_ram_vendors {
+ $vendors = [
+ # A-Data xpg: AX4U; AX\d{4} for axiom
+ ['^(A[DX]\dU|AVD|A[\s-]?Data)','A[\s-]?Data','A-Data',''],
+ ['^(A[\s-]?Tech)','A[\s-]?Tech','A-Tech',''], # Don't know part nu
+ ['^(AX[\d]{4}|Axiom)','Axiom','Axiom',''],
+ ['^(BD\d|Black[s-]?Diamond)','Black[s-]?Diamond','Black Diamond',''],
+ ['^(-BN$|Brute[s-]?Networks)','Brute[s-]?Networks','Brute Networks',''],
+ ['^(CM|Corsair)','Corsair','Corsair',''],
+ ['^(CT\d|BL|Crucial)','Crucial','Crucial',''],
+ ['^(CY|Cypress)','Cypress','Cypress',''],
+ ['^(SNP|Dell)','Dell','Dell',''],
+ ['^(PE[\d]{4}|Edge)','Edge','Edge',''],
+ ['^(Elpida|EB)','^Elpida','Elpida',''],
+ ['^(GVT|Galvantech)','Galvantech','Galvantech',''],
+ # If we get more G starters, make rules tighter
+ ['^(G[A-Z]|Geil)','Geil','Geil',''],
+ # Note: FA- but make loose FA
+ ['^(F4|G[\s\.-]?Skill)','G[\s\.-]?Skill','G.Skill',''],
+ ['^(GJN)','GJN','GJN',''],
+ ['^(HP)','','HP',''], # no IDs found
+ ['^(HX|HyperX)','HyperX','HyperX',''],
+ # Qimonda spun out of Infineon, same ids
+ # ['^(HYS]|Qimonda)','Qimonda','Qimonda',''],
+ ['^(HY|Infineon)','Infineon','Infineon',''],#HY[A-Z]\d
+ ['^(KSM|KVR|Kingston)','Kingston','Kingston',''],
+ ['^(LuminouTek)','LuminouTek','LuminouTek',''],
+ ['^(MT|Micron)','Micron','Micron',''],
+ # Seen: 992069 991434 997110S
+ ['^(M[BLERS][A-Z][1-7]|99[0-9]{3}|Mushkin)','Mushkin','Mushkin',''],
+ ['^(OCZ)','^OCZ\b','OCZ',''],
+ ['^([MN]D\d|OLOy)','OLOy','OLOy',''],
+ ['^(M[ERS]\d|Nemix)','Nemix','Nemix',''],
+ # Before patriot just in case
+ ['^(MN\d|PNY)','PNY\s','PNY',''],
+ ['^(P[A-Z]|Patriot)','Patriot','Patriot',''],
+ ['^RAMOS','^RAMOS','RAmos',''],
+ ['^(K[1-6][ABLT]|K\d|M[\d]{3}[A-Z]|Samsung)','Samsung','Samsung',''],
+ ['^(SP|Silicon[\s-]?Power)','Silicon[\s-]?Power','Silicon Power',''],
+ ['^(STK|Simtek)','Simtek','Simtek',''],
+ ['^(Simmtronics|Gamex)','^Simmtronics','Simmtronics',''],
+ ['^(HM[ACT]|SK[\s-]?Hynix)','SK[\s-]?Hynix','SK-Hynix',''],
+ # TED TTZD TLRD TDZAD TF4D4 TPD4 TXKD4 seen: HMT but could by skh
+ #['^(T(ED|D[PZ]|F\d|LZ|P[DR]T[CZ]|XK)|Team[\s-]?Group)','Team[\s-]?Group','TeamGroup',''],
+ ['^(T[^\dR]|Team[\s-]?Group)','Team[\s-]?Group','TeamGroup',''],
+ ['^(TR\d|JM\d|Transcend)','Transcend','Transcend',''],
+ ['^(VK\d|Vaseky)','Vaseky','Vaseky',''],
+ ['^(Yangtze|Zhitai|YMTC)','(Yangtze(\s*Memory)?|YMTC)','YMTC',''],
+ ];
+}
+
+# Note: many of these are pci ids, not confirmed valid for ram
+sub set_ram_vendor_ids {
+ $vendor_ids = {
+ '01f4' => 'Transcend',# confirmed
+ '02fe' => 'Elpida',# confirmed
+ '0314' => 'Mushkin',# confirmed
+ '0420' => 'Chips and Technologies',
+ '1014' => 'IBM',
+ '1099' => 'Samsung',
+ '10c3' => 'Samsung',
+ '11e2' => 'Samsung',
+ '1249' => 'Samsung',
+ '144d' => 'Samsung',
+ '15d1' => 'Infineon',
+ '167d' => 'Samsung',
+ '196e' => 'PNY',
+ '1b1c' => 'Corsair',
+ '1b85' => 'OCZ',
+ '1c5c' => 'SK-Hynix',
+ '1cc1' => 'A-Data',
+ '1e49' => 'YMTC',# Yangtze Memory confirmed
+ '0215' => 'Corsair',# confirmed
+ '2646' => 'Kingston',
+ '2c00' => 'Micron',# confirmed
+ '5105' => 'Qimonda',# confirmed
+ '802c' => 'Micron',# confirmed
+ '80ad' => 'SK-Hynix',# confirmed
+ '80ce' => 'Samsung',# confirmed
+ '8551' => 'Qimonda',# confirmed
+ '8564' => 'Transcend',
+ '859b' => 'Crucial', # confirmed
+ 'ad00' => 'SK-Hynix',# confirmed
+ 'c0a9' => 'Crucial',
+ 'ce00' => 'Samsung',# confirmed
+ # '' => '',
+ }
+}
+## END RAM VENDOR ##
+
+sub ram_vendor {
+ eval $start if $b_log;
+ my ($id) = $_[0];
+ set_ram_vendors() if !$vendors;
+ my ($vendor);
+ foreach my $row (@$vendors){
+ if ($id =~ /$row->[0]/i){
+ $vendor = $row->[2];
+ # Usually we want to assign N/A at output phase, maybe do this logic there?
+ if ($row->[1]){
+ if ($id !~ m/$row->[1]$/i){
+ $id =~ s/$row->[1]//i;
+ }
+ else {
+ $id = 'N/A';
+ }
+ }
+ $id =~ s/^[\/\[\s_-]+|[\/\s_-]+$//g;
+ $id =~ s/\s\s/ /g;
+ last;
}
- #print "d1b: $data s1: $size\n";
- }
- else {
- $size = 0;
}
- #print "d2: $data s2: $size\n";
- return $size;
+ eval $end if $b_log;
+ return [$vendor,$id];
}
}
-## RepoData
+## RepoItem
{
-package RepoData;
-
+package RepoItem;
# easier to keep these package global, but undef after done
-my (@dbg_files,$debugger_dir);
+my (@dbg_files,$debugger_dir,%repo_keys);
my $num = 0;
+
sub get {
eval $start if $b_log;
($debugger_dir) = @_;
- my (@data,@rows,@rows_p,@rows_r);
- if ($extra > 0 && !$b_pkg){
- my %packages = PackageData::get('main',\$num);
- my @data;
- for (keys %packages){
- $rows_p[0]{$_} = $packages{$_};
+ my $rows = [];
+ if ($extra > 0 && !$loaded{'package-data'}){
+ my $packages = PackageData::get('main',\$num);
+ for (keys %$packages){
+ $rows->[0]{$_} = $packages->{$_};
}
- $b_pkg = 1;
}
+ my $rows_start = scalar @$rows; # to test if we found more rows after
$num = 0;
if ($bsd_type){
- @rows_r = get_repos_bsd();
+ get_repos_bsd($rows);
}
else {
- @rows_r = get_repos_linux();
+ get_repos_linux($rows);
}
if ($debugger_dir){
- @rows = @dbg_files;
+ @$rows = @dbg_files;
undef @dbg_files;
undef $debugger_dir;
+ undef %repo_keys;
}
else {
- if (!@rows_r){
- my $pm = (!$bsd_type) ? 'package manager': 'OS type';
- @data = (
- {main::key($num++,0,1,'Alert') => "No repo data detected. Does $self_name support your $pm?"},
- );
+ if ($rows_start == scalar @$rows){
+ my $pm_missing;
+ if ($bsd_type){
+ $pm_missing = main::message('repo-data-bsd',$uname[0]);
+ }
+ else {
+ $pm_missing = main::message('repo-data');
+ }
+ push(@$rows,{main::key($num++,0,1,'Alert') => $pm_missing});
}
- @rows = (@rows_p,@rows_r,@data);
}
eval $end if $b_log;
- return @rows;
+ return $rows;
}
+
sub get_repos_linux {
eval $start if $b_log;
- my (@content,@data,@data2,@data3,@files,$repo,@repos,@rows);
+ my $rows = $_[0];
+ my (@content,$data,@data2,@data3,@files,$repo,@repos);
my ($key,$path);
my $apk = '/etc/apk/repositories';
my $apt = '/etc/apt/sources.list';
+ my $apt_termux = '/data/data/com.termux/files/usr' . $apt;
+ $apt = $apt_termux if -e $apt_termux; # for android termux
my $cards = '/etc/cards.conf';
+ my $dnf_conf = '/etc/dnf/dnf.conf';
+ my $dnf_repo_dir = '/etc/dnf.repos.d/';
my $eopkg_dir = '/var/lib/eopkg/';
+ my $netpkg = '/etc/netpkg.conf';
+ my $netpkg_dir = '/etc/netpkg.d';
+ my $nix = '/etc/nix/nix.conf';
my $pacman = '/etc/pacman.conf';
my $pacman_g2 = '/etc/pacman-g2.conf';
my $pisi_dir = '/etc/pisi/';
my $portage_dir = '/etc/portage/repos.conf/';
my $portage_gentoo_dir = '/etc/portage-gentoo/repos.conf/';
+ my $sbopkg = '/etc/sbopkg/sbopkg.conf';
+ my $sboui_backend = '/etc/sboui/sboui-backend.conf';
+ my $scratchpkg = '/etc/scratchpkg.repo';
my $slackpkg = '/etc/slackpkg/mirrors';
my $slackpkg_plus = '/etc/slackpkg/slackpkgplus.conf';
my $slapt_get = '/etc/slapt-get/';
+ my $slpkg = '/etc/slpkg/repositories.toml';
+ my $tazpkg = '/etc/slitaz/tazpkg.conf';
+ my $tazpkg_mirror = '/var/lib/tazpkg/mirror';
my $tce_app = '/usr/bin/tce';
my $tce_file = '/opt/tcemirror';
my $tce_file2 = '/opt/localmirrors';
@@ -14882,34 +25145,42 @@ sub get_repos_linux {
my $xbps_dir_2 = '/usr/share/xbps.d/';
my $zypp_repo_dir = '/etc/zypp/repos.d/';
my $b_test = 0;
- # apt - debian, buntus, also sometimes some yum/rpm repos may create
- # apt repos here as well
+ ## apt: Debian, *buntus + derived (deb files);AltLinux, PCLinuxOS (rpm files)
+ # Sometimes some yum/rpm repos may create apt repos here as well
if (-f $apt || -d "$apt.d"){
my ($apt_arch,$apt_comp,$apt_suites,$apt_types,@apt_urls,@apt_working,
$b_apt_enabled,$file,$string);
my $counter = 0;
- @files = main::globber('/etc/apt/sources.list.d/*.list');
- push @files, $apt;
- main::log_data('data',"apt repo files:\n" . main::joiner(\@files, "\n", 'unset') ) if $b_log;
- foreach ( sort @files){
- # altlinux/pclinuxos use rpms in apt files
- @data = repo_builder($_,'apt','^\s*(deb|rpm)') if -r $_;
- @rows = (@rows,@data);
- }
- #@files = main::globber("$ENV{'HOME'}/bin/scripts/inxi/data/repo/apt/*.sources");
- @files = main::globber('/etc/apt/sources.list.d/*.sources');
- main::log_data('data',"apt deb822 repo files:\n" . main::joiner(\@files, "\n", 'unset') ) if $b_log;
+ @files = main::globber("$apt.d/*.list");
+ push(@files, $apt);
+ # prefilter list for logging
+ @files = grep {-f $_} @files; # may not have $apt file.
+ main::log_data('data',"apt repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
+ foreach (sort @files){
+ # altlinux/pclinuxos use rpms in apt files, -r to be on safe side
+ if (-r $_){
+ $data = repo_builder($_,'apt','^\s*(deb|rpm)');
+ push(@$rows,@$data);
+ }
+ }
+ # @files = main::globber("$fake_data_dir/repo/apt/*.sources");
+ @files = main::globber("$apt.d/*.sources");
+ # prefilter list for logging, sometimes globber returns non-prsent files.
+ @files = grep {-f $_} @files;
+ # @files = ("$fake_data_dir/repo/apt/deb822-u193-3.sources",
+ # "$fake_data_dir/repo/apt/deb822-u193-3.sourcesdeb822-u193-4-signed-by.sources");
+ main::log_data('data',"apt deb822 repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
foreach $file (@files){
# critical: whitespace is the separator, no logical ordering of
# field names exists within each entry.
@data2 = main::reader($file);
- #print Data::Dumper::Dumper \@data2;
+ # print Data::Dumper::Dumper \@data2;
if (@data2){
@data2 = map {s/^\s*$/~/;$_} @data2;
- push @data2, '~';
+ push(@data2, '~');
}
- push @dbg_files, $file if $debugger_dir;
- #print "$file\n";
+ push(@dbg_files, $file) if $debugger_dir;
+ # print "$file\n";
@apt_urls = ();
@apt_working = ();
$b_apt_enabled = 1;
@@ -14920,21 +25191,21 @@ sub get_repos_linux {
next if $row =~ /^\s+/ && $row !~ /^\s+[^#]+:\//;
# strip out line space starters now that it's safe
$row =~ s/^\s+//;
- #print "$row\n";
+ # print "$row\n";
if ($row eq '~'){
if (@apt_working && $b_apt_enabled){
- #print "1: url builder\n";
+ # print "1: url builder\n";
foreach $repo (@apt_working){
$string = $apt_types;
$string .= ' [arch=' . $apt_arch . ']' if $apt_arch;
$string .= ' ' . $repo;
$string .= ' ' . $apt_suites if $apt_suites ;
$string .= ' ' . $apt_comp if $apt_comp;
- #print "s1:$string\n";
- push @data3, $string;
+ # print "s1:$string\n";
+ push(@data3, $string);
}
- #print join "\n",@data3,"\n";
- @apt_urls = (@apt_urls,@data3);
+ # print join("\n",@data3),"\n";
+ push(@apt_urls,@data3);
}
@data3 = ();
@apt_working = ();
@@ -14944,19 +25215,17 @@ sub get_repos_linux {
$apt_types = '';
$b_apt_enabled = 1;
}
- #print "row:$row\n";
elsif ($row =~ /^Types:\s*(.*)/i){
- #print "ath:$type_holder\n";
+ # print "1:$1\n";
$apt_types = $1;
}
elsif ($row =~ /^Enabled:\s*(.*)/i){
- my $status = $1;
- $b_apt_enabled = ($status =~ /\b(disable|false|off|no|without)\b/i) ? 0: 1;
+ $b_apt_enabled = ($1 =~ /\b(disable|false|off|no|without)\b/i) ? 0: 1;
}
elsif ($row =~ /^[^#]+:\//){
my $url = $row;
$url =~ s/^URIs:\s*//i;
- push @apt_working, $url if $url;
+ push(@apt_working, $url) if $url;
}
elsif ($row =~ /^Suites:\s*(.*)/i){
$apt_suites = $1;
@@ -14970,23 +25239,22 @@ sub get_repos_linux {
}
if (@apt_urls){
$key = repo_data('active','apt');
- @apt_urls = url_cleaner(@apt_urls);
+ clean_url(\@apt_urls);
}
else {
$key = repo_data('missing','apt');
}
- @data = (
+ push(@$rows,
{main::key($num++,1,1,$key) => $file},
[@apt_urls],
);
- @rows = (@rows,@data);
}
@files = ();
}
- # pacman: Arch and derived
+ ## pacman, pacman-g2: Arch + derived, Frugalware
if (-f $pacman || -f $pacman_g2){
$repo = 'pacman';
- if (-f $pacman_g2 ){
+ if (-f $pacman_g2){
$pacman = $pacman_g2;
$repo = 'pacman-g2';
}
@@ -14997,106 +25265,247 @@ sub get_repos_linux {
}
if (@files){
@files = map {
- my @working = split( /\s+=\s+/, $_);
+ my @working = split(/\s+=\s+/, $_);
$working[1];
} @files;
}
- @files = sort(@files);
- @files = main::uniq(@files);
- unshift @files, $pacman if @repos;
+ @files = sort @files;
+ main::uniq(\@files);
+ unshift(@files, $pacman) if @repos;
foreach (@files){
if (-f $_){
- @data = repo_builder($_,$repo,'^\s*Server','\s*=\s*',1);
- @rows = (@rows,@data);
+ $data = repo_builder($_,$repo,'^\s*Server','\s*=\s*',1);
+ push(@$rows,@$data);
}
else {
# set it so the debugger knows the file wasn't there
- push @dbg_files, $_ if $debugger_dir;
- @data = (
+ push(@dbg_files, $_) if $debugger_dir;
+ push(@$rows,
{main::key($num++,1,1,'File listed in') => $pacman},
[("$_ does not seem to exist.")],
);
- @rows = (@rows,@data);
}
}
- if (!@rows){
- @data = (
+ if (!@$rows){
+ push(@$rows,
{main::key($num++,0,1,repo_data('missing','files')) => $pacman },
);
- @rows = (@rows,@data);
}
}
- # slackware
- if (-f $slackpkg || -f $slackpkg_plus || -d $slapt_get){
- #$slackpkg = "$ENV{HOME}/bin/scripts/inxi/data/repo/slackware/slackpkg-2.conf";
+ ## netpkg: Zenwalk, Slackware
+ if (-f $netpkg){
+ my @data2 = ($netpkg);
+ if (-d $netpkg_dir){
+ @data3 = main::globber("$netpkg_dir/*");
+ @data3 = grep {!/\/local$/} @data3 if @data3; # package directory
+ push(@data2,@data3) if @data3;
+ }
+ foreach my $file (@data2){
+ $data = repo_builder($file,'netpkg','^URL\s*=','\s*=\s*',1);
+ push(@$rows,@$data);
+ }
+ }
+ ## sbopkg, sboui, slackpkg, slackpkg+, slapt_get, slpkg: Slackware + derived
+ # $slpkg = "$fake_data_dir/repo/slackware/slpkg-2.toml";
+ # $sbopkg = "$fake_data_dir/repo/slackware/sbopkg-2.conf";
+ # $sboui_backend = "$fake_data_dir/repo/slackware/sboui-backend-1.conf";
+ if (-f $slackpkg || -f $slackpkg_plus || -d $slapt_get || -f $slpkg ||
+ -f $sbopkg || -f $sboui_backend){
+ if (-f $sbopkg){
+ my $sbo_root = '/root/.sbopkg.conf';
+ # $sbo_root = "$fake_data_dir/repo/slackware/sbopkg-root-1.conf";
+ @files = ($sbopkg);
+ # /root not readable as user, unless it is, so just check if readable
+ push(@files,$sbo_root) if -r $sbo_root;
+ my ($branch,$name);
+ # SRC_REPO repo URL not used, not what we think
+ foreach my $file (@files){
+ foreach my $row (main::reader($file,'strip')){
+ if ($row =~ /^REPO_NAME=(\S\{REPO_NAME:-)?(.*?)\}?$/){
+ $name = $2;
+ }
+ elsif ($row =~ /^REPO_BRANCH=(\S\{REPO_BRANCH:-)?(.*?)\}?$/){
+ $branch = $2;
+ }
+ }
+ }
+ # First found overridden by next, so we don't care where the value came
+ # from. We do care if 1 file and not root however, since might be wrong.
+ if ($branch && $name){
+ if ($b_root || scalar @files == 2){
+ $key = repo_data('active','sbopkg');
+ }
+ else {
+ $key = repo_data('active-permissions','sbopkg');
+ }
+ @content = ("$name ~ $branch");
+ }
+ else {
+ $key = repo_data('missing','sbopkg');
+ }
+ my @data = (
+ {main::key($num++,1,1,$key) => join(', ',@files)},
+ [@content],
+ );
+ push(@$rows,@data);
+ (@content,@files) = ();
+ }
+ if (-f $sboui_backend){
+ my ($branch,$repo);
+ # Note: sboui also has a sboui.conf file, with the package_manager string
+ # but that is too hard to handle clearly in output so leaving aside.
+ foreach my $row (main::reader($sboui_backend,'strip')){
+ if ($row =~ /^REPO\s*=\s*["']?(\S+?)["']?\s*$/){
+ $repo = $1;
+ }
+ elsif ($row =~ /^BRANCH\s*=\s*["']?(\S+?)["']?\s*$/){
+ $branch = $1;
+ }
+ }
+ if ($repo){
+ $key = repo_data('active','sboui');
+ $branch = 'current' if !$branch || $repo =~ /ponce/i;
+ @content = ("SBo $branch ~ $repo"); # we want SBo name to show
+ }
+ else {
+ $key = repo_data('missing','sboui');
+ }
+ my @data = (
+ {main::key($num++,1,1,$key) => $sboui_backend},
+ [@content],
+ );
+ push(@$rows,@data);
+ @content = ();
+ }
if (-f $slackpkg){
- @data = repo_builder($slackpkg,'slackpkg','^[[:space:]]*[^#]+');
- @rows = (@rows,@data);
+ $data = repo_builder($slackpkg,'slackpkg','^[[:space:]]*[^#]+');
+ push(@$rows,@$data);
}
if (-d $slapt_get){
@data2 = main::globber("${slapt_get}*");
+ @data2 = grep {!/pubring/} @data2 if @data2;
foreach my $file (@data2){
- @data = repo_builder($file,'slaptget','^\s*SOURCE','\s*=\s*',1);
- @rows = (@rows,@data);
+ $data = repo_builder($file,'slaptget','^\s*SOURCE','\s*=\s*',1);
+ push(@$rows,@$data);
}
}
if (-f $slackpkg_plus){
- push @dbg_files, $slackpkg_plus if $debugger_dir;
- @data = main::reader($slackpkg_plus,'strip');
+ push(@dbg_files, $slackpkg_plus) if $debugger_dir;
my (@repoplus_list,$active_repos);
- foreach my $row (@data){
- @data2 = split /\s*=\s*/, $row;
+ foreach my $row (main::reader($slackpkg_plus,'strip')){
+ @data2 = split(/\s*=\s*/, $row);
@data2 = map { $_ =~ s/^\s+|\s+$//g ; $_ } @data2;
last if $data2[0] =~ /^SLACKPKGPLUS/i && $data2[1] eq 'off';
- # REPOPLUS=( slackpkgplus restricted alienbob ktown multilib slacky)
+ # REPOPLUS=(slackpkgplus restricted alienbob ktown multilib slacky)
if ($data2[0] =~ /^REPOPLUS/i){
- @repoplus_list = split /\s+/, $data2[1];
+ @repoplus_list = split(/\s+/, $data2[1]);
@repoplus_list = map {s/\(|\)//g; $_} @repoplus_list;
- $active_repos = join ('|',@repoplus_list);
+ $active_repos = join('|',@repoplus_list);
}
# MIRRORPLUS['multilib']=http://taper.alienbase.nl/mirrors/people/alien/multilib/14.1/
if ($active_repos && $data2[0] =~ /^MIRRORPLUS/i){
$data2[0] =~ s/MIRRORPLUS\[\'|\'\]//ig;
if ($data2[0] =~ /$active_repos/){
- push @content,"$data2[0] ~ $data2[1]";
+ push(@content,"$data2[0] ~ $data2[1]");
}
}
}
- if (! @content){
+ if (!@content){
$key = repo_data('missing','slackpkg+');
}
else {
- @content = url_cleaner(@content);
+ clean_url(\@content);
$key = repo_data('active','slackpkg+');
}
- @data = (
+ my @data = (
{main::key($num++,1,1,$key) => $slackpkg_plus},
[@content],
);
- @data = url_cleaner(@data);
- @rows = (@rows,@data);
+ push(@$rows,@data);
@content = ();
}
- }
- # redhat/suse
- if (-d $yum_repo_dir || -f $yum_conf || -d $zypp_repo_dir){
- if (-d $yum_repo_dir || -f $yum_conf){
- @files = main::globber("$yum_repo_dir*.repo");
- push @files, $yum_conf if -f $yum_conf;
- $repo = 'yum';
+ if (-f $slpkg){
+ my ($active,$name,$repo);
+ my $holder = '';
+ @data2 = main::reader($slpkg);
+ # We can't rely on the presence of empty lines as block separator.
+ push(@data2,'-eof-') if @data2;
+ # print Data::Dumper::Dumper \@data2;
+ # old: "https://download.salixos.org/x86_64/slackware-15.0/"
+ # new: ["https://slac...nl/people/alien/sbrepos/", "15.0/", "x86_64/"]
+ foreach (@data2){
+ next if /^\s*([#\[]|$)/;
+ $_ = lc($_);
+ if (/^\s*(\S+?)_(repo(|_name|_mirror))\s*=\s*[\['"]{0,2}(.*?)[\]'"]{0,2}\s*$/ ||
+ $_ eq '-eof-'){
+ my ($key,$value) = ($2,$4);
+ if (($1 && $holder ne $1) || $_ eq '-eof-'){
+ $holder = $1;
+ if ($name && $repo){
+ if (!$active || $active =~ /^(true|1|yes)$/i){
+ push(@content,"$name ~ $repo");
+ }
+ ($active,$name,$repo) = ();
+ }
+ }
+ if ($key){
+ if ($key eq 'repo'){
+ $active = $value;}
+ elsif ($key eq 'repo_name'){
+ $name = $value;}
+ elsif ($key eq 'repo_mirror'){
+ # map new form to a real url
+ $value =~ s/['"],\s*['"]//g;
+ $repo = $value;}
+ }
+ }
+ }
+ if (!@content){
+ $key = repo_data('missing','slpkg');
+ }
+ else {
+ # Special case, sbo and ponce true, dump sbo, they conflict.
+ # slpkg does this internally so no other way to handle.
+ if (grep {/^ponce ~/} @content){
+ @content = grep {!/sbo ~/} @content;
+ }
+ clean_url(\@content);
+ $key = repo_data('active','slpkg');
+ }
+ push(@$rows,
+ {main::key($num++,1,1,$key) => $slpkg},
+ [@content],
+ );
+ (@content,@data2,@data3) = ();
}
- elsif (-d $zypp_repo_dir){
- @files = main::globber("$zypp_repo_dir*.repo");
+ }
+ ## dnf, yum, zypp: Redhat, Suse + derived (rpm based)
+ if (-f $dnf_conf ||-d $dnf_repo_dir|| -d $yum_repo_dir || -f $yum_conf ||
+ -d $zypp_repo_dir){
+ @files = ();
+ push(@files, $dnf_conf) if -f $dnf_conf;
+ push(@files, main::globber("$dnf_repo_dir*.repo")) if -d $dnf_repo_dir;
+ push(@files, $yum_conf) if -f $yum_conf;
+ push(@files, main::globber("$yum_repo_dir*.repo")) if -d $yum_repo_dir;
+ if (-d $zypp_repo_dir){
+ push(@files, main::globber("$zypp_repo_dir*.repo"));
main::log_data('data',"zypp repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
- $repo = 'zypp';
}
- #$repo = 'yum';
- #push @files, "$ENV{'HOME'}/bin/scripts/inxi/data/repo/yum/rpmfusion-nonfree-1.repo";
+ # push(@files, "$fake_data_dir/repo/yum/rpmfusion-nonfree-1.repo");
if (@files){
foreach (sort @files){
@data2 = main::reader($_);
- push @dbg_files, $_ if $debugger_dir;
+ push(@dbg_files, $_) if $debugger_dir;
+ if (/yum/){
+ $repo = 'yum';
+ }
+ elsif (/dnf/){
+ $repo = 'dnf';
+ }
+ elsif(/zypp/){
+ $repo = 'zypp';
+ }
my ($enabled,$url,$title) = (undef,'','');
foreach my $line (@data2){
# this is a hack, assuming that each item has these fields listed, we collect the 3
@@ -15108,7 +25517,7 @@ sub get_repos_linux {
my $temp = $1;
if ($url && $title && defined $enabled){
if ($enabled > 0){
- push @content, "$title ~ $url";
+ push(@content, "$title ~ $url");
}
($enabled,$url,$title) = (undef,'','');
}
@@ -15128,40 +25537,39 @@ sub get_repos_linux {
# repoTitle is hit above, it will print out the line there instead
if ($url && $title && defined $enabled){
if ($enabled > 0){
- push @content, "$title ~ $url";
+ push(@content, "$title ~ $url");
}
($enabled,$url,$title) = (0,'','');
}
}
# print the last one if there is data for it
if ($url && $title && $enabled){
- push @content, "$title ~ $url";
+ push(@content, "$title ~ $url");
}
- if (! @content){
+ if (!@content){
$key = repo_data('missing',$repo);
}
else {
- @content = url_cleaner(@content);
+ clean_url(\@content);
$key = repo_data('active',$repo);
}
- @data = (
+ push(@$rows,
{main::key($num++,1,1,$key) => $_},
[@content],
);
- @rows = (@rows,@data);
@content = ();
}
}
- # print Data::Dumper::Dumper \@rows;
+ # print Data::Dumper::Dumper \@$rows;
}
- # gentoo
- if ( (-d $portage_dir || -d $portage_gentoo_dir ) && main::check_program('emerge')){
+ # emerge, portage: Gentoo + derived
+ if ((-d $portage_dir || -d $portage_gentoo_dir) && main::check_program('emerge')){
@files = (main::globber("$portage_dir*.conf"),main::globber("$portage_gentoo_dir*.conf"));
$repo = 'portage';
if (@files){
foreach (sort @files){
@data2 = main::reader($_);
- push @dbg_files, $_ if $debugger_dir;
+ push(@dbg_files, $_) if $debugger_dir;
my ($enabled,$url,$title) = (undef,'','');
foreach my $line (@data2){
# this is a hack, assuming that each item has these fields listed, we collect the 3
@@ -15173,7 +25581,7 @@ sub get_repos_linux {
my $temp = $1;
if ($url && $title && defined $enabled){
if ($enabled > 0){
- push @content, "$title ~ $url";
+ push(@content, "$title ~ $url");
}
($enabled,$url,$title) = (undef,'','');
}
@@ -15192,129 +25600,150 @@ sub get_repos_linux {
# repoTitle is hit above, it will print out the line there instead
if ($url && $title && defined $enabled){
if ($enabled > 0){
- push @content, "$title ~ $url";
+ push(@content, "$title ~ $url");
}
($enabled,$url,$title) = (undef,'','');
}
}
# print the last one if there is data for it
if ($url && $title && $enabled){
- push @content, "$title ~ $url";
+ push(@content, "$title ~ $url");
}
if (! @content){
$key = repo_data('missing','portage');
}
else {
- @content = url_cleaner(@content);
+ clean_url(\@content);
$key = repo_data('active','portage');
}
- @data = (
+ push(@$rows,
{main::key($num++,1,1,$key) => $_},
[@content],
);
- @rows = (@rows,@data);
@content = ();
}
}
}
- # Alpine linux
- if (-f $apk){
- @data = repo_builder($apk,'apk','^\s*[^#]+');
- @rows = (@rows,@data);
+ ## apk: Alpine, Chimera
+ if (-f $apk || -d "$apk.d"){
+ @files = main::globber("$apk.d/*.list");
+ push(@files, $apk);
+ # prefilter list for logging
+ @files = grep {-f $_} @files; # may not have $apk file.
+ main::log_data('data',"apk repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
+ foreach (sort @files){
+ # -r to be on safe side
+ if (-r $_){
+ $data = repo_builder($_,'apk','^\s*[^#]+');
+ push(@$rows,@$data);
+ }
+ }
}
- # cards/nutyx
+ ## scratchpkg: Venom
+ if (-f $scratchpkg){
+ $data = repo_builder($scratchpkg,'scratchpkg','^[[:space:]]*[^#]+');
+ push(@$rows,@$data);
+ }
+ # cards: Nutyx
if (-f $cards){
@data3 = main::reader($cards,'clean');
- push @dbg_files, $cards if $debugger_dir;
+ push(@dbg_files, $cards) if $debugger_dir;
foreach (@data3){
if ($_ =~ /^dir\s+\/[^\|]+\/([^\/\|]+)\s*(\|\s*((http|ftp).*))?/){
my $type = ($3) ? $3: 'local';
- push @content, "$1 ~ $type";
+ push(@content, "$1 ~ $type");
}
}
- if (! @content){
+ if (!@content){
$key = repo_data('missing','cards');
}
else {
- @content = url_cleaner(@content);
+ clean_url(\@content);
$key = repo_data('active','cards');
}
- @data = (
+ push(@$rows,
{main::key($num++,1,1,$key) => $cards},
[@content],
);
- @rows = (@rows,@data);
@content = ();
}
- # TinyCore
+ ## tazpkg: Slitaz
+ if (-e $tazpkg || -e $tazpkg_mirror){
+ $data = repo_builder($tazpkg_mirror,'tazpkg','^\s*[^#]+');
+ push(@$rows,@$data);
+ }
+ ## tce: TinyCore
if (-e $tce_app || -f $tce_file || -f $tce_file2){
- @data = repo_builder($tce_file,'tce','^\s*[^#]+');
- @rows = (@rows,@data);
+ if (-f $tce_file){
+ $data = repo_builder($tce_file,'tce','^\s*[^#]+');
+ push(@$rows,@$data);
+ }
if (-f $tce_file2){
- @data = repo_builder($tce_file2,'tce','^\s*[^#]+');
- @rows = (@rows,@data);
+ $data = repo_builder($tce_file2,'tce','^\s*[^#]+');
+ push(@$rows,@$data);
}
}
- # Void
+ ## xbps: Void
if (-d $xbps_dir_1 || -d $xbps_dir_2){
@files = main::globber("$xbps_dir_1*.conf");
- @files = (@files,main::globber("$xbps_dir_2*.conf")) if -d $xbps_dir_2;
- main::log_data('data',"xbps repo files:\n" . main::joiner(\@files, "\n", 'unset') ) if $b_log;
- foreach ( sort @files){
- @data = repo_builder($_,'xbps','^\s*repository\s*=','\s*=\s*',1) if -r $_;
- @rows = (@rows,@data);
- }
- }
- # Mandriva/Mageia using: urpmq
- if ( $path = main::check_program('urpmq') ){
- @data2 = main::grabber("$path --list-media active --list-url","\n",'strip');
- main::writer("$debugger_dir/system-repo-data-urpmq.txt",@data2) if $debugger_dir;
- # now we need to create the structure: repo info: repo path
- # we do that by looping through the lines of the output and then
- # putting it back into the <data>:<url> format print repos expects to see
- # note this structure in the data, so store first line and make start of line
- # then when it's an http line, add it, and create the full line collection.
+ push(@files,main::globber("$xbps_dir_2*.conf")) if -d $xbps_dir_2;
+ main::log_data('data',"xbps repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
+ foreach (sort @files){
+ if (-r $_){
+ $data = repo_builder($_,'xbps','^\s*repository\s*=','\s*=\s*',1);
+ push(@$rows,@$data);
+ }
+ }
+ }
+ ## urpmq: Mandriva, Mageia
+ if ($path = main::check_program('urpmq')){
+ @data2 = main::grabber("$path --list-media active --list-url 2>/dev/null","\n",'strip');
+ main::writer("$debugger_dir/system-repo-data-urpmq.txt",\@data2) if $debugger_dir;
+ # Now we need to create the structure: repo info: repo path. We do that by
+ # looping through the lines of the output and then putting it back into the
+ # <data>:<url> format print repos expects to see. Note this structure in the
+ # data, so store first line and make start of line then when it's an http
+ # line, add it, and create the full line collection.
# Contrib ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/contrib/release
# Contrib Updates ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/contrib/updates
# Non-free ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/non-free/release
# Non-free Updates ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/non-free/updates
# Nonfree Updates (Local19) /mnt/data/mirrors/mageia/distrib/cauldron/x86_64/media/nonfree/updates
foreach (@data2){
- # need to dump leading/trailing spaces and clear out color codes for irc output
+ # Need to dump leading/trailing spaces and clear out color codes for irc output
$_ =~ s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g;
$_ =~ s/\e\[([0-9];)?[0-9]+m//g;
# urpmq output is the same each line, repo name space repo url, can be:
# rsync://, ftp://, file://, http:// OR repo is locally mounted on FS in some cases
if (/(.+)\s([\S]+:\/\/.+)/){
# pack the repo url
- push @content, $1;
- @content = url_cleaner(@content);
+ push(@content, $1);
+ clean_url(\@content);
# get the repo
$repo = $2;
- @data = (
- {main::key($num++,1,1,'urpmq repo') => $repo},
+ push(@$rows,
+ {main::key($num++,1,1,'urpm repo') => $repo},
[@content],
);
- @rows = (@rows,@data);
@content = ();
}
}
}
- # Pardus/Solus
- if ( (-d $pisi_dir && ( $path = main::check_program('pisi') ) ) ||
- (-d $eopkg_dir && ( $path = main::check_program('eopkg') ) ) ){
+ # pisi: Pardus, Solus
+ if ((-d $pisi_dir && ($path = main::check_program('pisi'))) ||
+ (-d $eopkg_dir && ($path = main::check_program('eopkg')))){
#$path = 'eopkg';
my $which = ($path =~ /pisi$/) ? 'pisi': 'eopkg';
my $cmd = ($which eq 'pisi') ? "$path list-repo": "$path lr";
- #my $file = "$ENV{HOME}/bin/scripts/inxi/data/repo/solus/eopkg-2.txt";
- #@data2 = main::reader($file,'strip');
+ # my $file = "$ENV{HOME}/bin/scripts/inxi/data/repo/solus/eopkg-2.txt";
+ # @data2 = main::reader($file,'strip');
@data2 = main::grabber("$cmd 2>/dev/null","\n",'strip');
- main::writer("$debugger_dir/system-repo-data-$which.txt",@data2) if $debugger_dir;
- # now we need to create the structure: repo info: repo path
- # we do that by looping through the lines of the output and then
- # putting it back into the <data>:<url> format print repos expects to see
- # note this structure in the data, so store first line and make start of line
- # then when it's an http line, add it, and create the full line collection.
+ main::writer("$debugger_dir/system-repo-data-$which.txt",\@data2) if $debugger_dir;
+ # Now we need to create the structure: repo info: repo path
+ # We do that by looping through the lines of the output and then putting it
+ # back into the <data>:<url> format print repos expects to see. Note this
+ # structure in the data, so store first line and make start of line then
+ # when it's an http line, add it, and create the full line collection.
# Pardus-2009.1 [Aktiv]
# http://packages.pardus.org.tr/pardus-2009.1/pisi-index.xml.bz2
# Contrib [Aktiv]
@@ -15327,130 +25756,175 @@ sub get_repos_linux {
$_ =~ s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g;
$_ =~ s/\e\[([0-9];)?[0-9]+m//g;
if (/^\/|:\/\//){
- push @content, $_ if $repo;
+ push(@content, $_) if $repo;
}
# Local [inactive] Unstable [active]
- elsif ( /^(.*)\s\[([\S]+)\]/){
+ elsif (/^(.*)\s\[([\S]+)\]/){
$repo = $1;
$repo = ($2 =~ /^activ/i) ? $repo : '';
}
if ($repo && @content){
- @content = url_cleaner(@content);
+ clean_url(\@content);
$key = repo_data('active',$which);
- @data = (
+ push(@$rows,
{main::key($num++,1,1,$key) => $repo},
[@content],
);
- @rows = (@rows,@data);
$repo = '';
@content = ();
}
}
# last one if present
if ($repo && @content){
- @content = url_cleaner(@content);
+ clean_url(\@content);
$key = repo_data('active',$which);
- @data = (
+ push(@$rows,
{main::key($num++,1,1,$key) => $repo},
[@content],
);
- @rows = (@rows,@data);
}
}
- # print Dumper \@rows;
+ ## nix: General pm for Linux/Unix
+ if (-f $nix && ($path = main::check_program('nix-channel'))){
+ @content = main::grabber("$path --list 2>/dev/null","\n",'strip');
+ main::writer("$debugger_dir/system-repo-data-nix.txt",\@content) if $debugger_dir;
+ if (!@content){
+ $key = repo_data('missing','nix');
+ }
+ else {
+ clean_url(\@content);
+ $key = repo_data('active','nix');
+ }
+ my $user = ($ENV{'USER'}) ? $ENV{'USER'}: 'N/A';
+ push(@$rows,
+ {main::key($num++,1,1,$key) => $user},
+ [@content],
+ );
+ @content = ();
+
+ }
+ # print Dumper $rows;
eval $end if $b_log;
- return @rows;
}
+
sub get_repos_bsd {
eval $start if $b_log;
- my (@content,@data,@data2,@data3,@files,@rows);
+ my $rows = $_[0];
+ my (@content,$data,@data2,@data3,@files);
my ($key);
my $bsd_pkg = '/usr/local/etc/pkg/repos/';
my $freebsd = '/etc/freebsd-update.conf';
my $freebsd_pkg = '/etc/pkg/FreeBSD.conf';
+ my $ghostbsd_pkg = '/etc/pkg/GhostBSD.conf';
+ my $hardenedbsd_pkg = '/etc/pkg/HardenedBSD.conf';
+ my $mports = '/usr/mports/Makefile';
my $netbsd = '/usr/pkg/etc/pkgin/repositories.conf';
my $openbsd = '/etc/pkg.conf';
my $openbsd2 = '/etc/installurl';
my $portsnap = '/etc/portsnap.conf';
- if ( -f $portsnap || -f $freebsd || -d $bsd_pkg){
- if ( -f $portsnap ) {
- @data = repo_builder($portsnap,'portsnap','^\s*SERVERNAME','\s*=\s*',1);
- @rows = (@rows,@data);
- }
- if ( -f $freebsd ){
- @data = repo_builder($freebsd,'freebsd','^\s*ServerName','\s+',1);
- @rows = (@rows,@data);
- }
-# if ( -f $freebsd_pkg ){
-# @data = repo_builder($freebsd_pkg,'freebsd-pkg','^\s*url',':\s+',1);
-# @rows = (@rows,@data);
-# }
- if ( -d $bsd_pkg || -f $freebsd_pkg){
+ if (-f $portsnap || -f $freebsd || -d $bsd_pkg ||
+ -f $ghostbsd_pkg || -f $hardenedbsd_pkg){
+ if (-f $portsnap){
+ $data = repo_builder($portsnap,'portsnap','^\s*SERVERNAME','\s*=\s*',1);
+ push(@$rows,@$data);
+ }
+ if (-f $freebsd){
+ $data = repo_builder($freebsd,'freebsd','^\s*ServerName','\s+',1);
+ push(@$rows,@$data);
+ }
+ if (-d $bsd_pkg || -f $freebsd_pkg || -f $ghostbsd_pkg || -f $hardenedbsd_pkg){
@files = main::globber('/usr/local/etc/pkg/repos/*.conf');
- push @files, $freebsd_pkg if -f $freebsd_pkg;
+ push(@files, $freebsd_pkg) if -f $freebsd_pkg;
+ push(@files, $ghostbsd_pkg) if -f $ghostbsd_pkg;
+ push(@files, $hardenedbsd_pkg) if -f $hardenedbsd_pkg;
if (@files){
my ($url);
foreach (@files){
- push @dbg_files, $_ if $debugger_dir;
+ push(@dbg_files, $_) if $debugger_dir;
# these will be result sets separated by an empty line
# first dump all lines that start with #
@content = main::reader($_,'strip');
# then do some clean up on the lines
- @content = map { $_ =~ s/{|}|,|\*//g; $_; } @content if @content;
+ @content = map { $_ =~ s/{|}|,|\*//g; $_;} @content if @content;
# get all rows not starting with a # and starting with a non space character
my $url = '';
foreach my $line (@content){
if ($line !~ /^\s*$/){
- my @data2 = split /\s*:\s*/, $line;
- @data2 = map { $_ =~ s/^\s+|\s+$//g; $_; } @data2;
+ my @data2 = split(/\s*:\s*/, $line);
+ @data2 = map { $_ =~ s/^\s+|\s+$//g; $_;} @data2;
if ($data2[0] eq 'url'){
$url = "$data2[1]:$data2[2]";
$url =~ s/"|,//g;
}
- #print "url:$url\n" if $url;
+ # print "url:$url\n" if $url;
if ($data2[0] eq 'enabled'){
- if ($url && $data2[1] eq 'yes'){
- push @data3, "$url"
+ if ($url && $data2[1] =~ /^(1|true|yes)$/i){
+ push(@data3, "$url");
}
$url = '';
}
}
}
- if (! @data3){
+ if (!@data3){
$key = repo_data('missing','bsd-package');
}
else {
- @data3 = url_cleaner(@data3);
+ clean_url(\@data3);
$key = repo_data('active','bsd-package');
}
- @data = (
+ push(@$rows,
{main::key($num++,1,1,$key) => $_},
[@data3],
);
- @rows = (@rows,@data);
@data3 = ();
}
}
}
}
- elsif (-f $openbsd || -f $openbsd2) {
+ if (-f $openbsd || -f $openbsd2){
if (-f $openbsd){
- @data = repo_builder($openbsd,'openbsd','^installpath','\s*=\s*',1);
- @rows = (@rows,@data);
+ $data = repo_builder($openbsd,'openbsd','^installpath','\s*=\s*',1);
+ push(@$rows,@$data);
}
if (-f $openbsd2){
- @data = repo_builder($openbsd2,'openbsd','^(http|ftp)','',1);
- @rows = (@rows,@data);
+ $data = repo_builder($openbsd2,'openbsd','^(http|ftp)','',1);
+ push(@$rows,@$data);
}
}
- elsif (-f $netbsd){
+ if (-f $netbsd){
# not an empty row, and not a row starting with #
- @data = repo_builder($netbsd,'netbsd','^\s*[^#]+$');
- @rows = (@rows,@data);
- }
+ $data = repo_builder($netbsd,'netbsd','^\s*[^#]+$');
+ push(@$rows,@$data);
+ }
+ # I don't think this is right, have to find out, for midnightbsd
+ # if (-f $mports){
+ # @data = main::reader($mports,'strip');
+ # main::writer("$debugger_dir/system-repo-data-mports.txt",\@data) if $debugger_dir;
+ # for (@data){
+ # if (!/^MASTER_SITE_INDEX/){
+ # next;
+ # }
+ # else {
+ # push(@data3,(split(/=\s*/,$_))[1]);
+ # }
+ # last if /^INDEX/;
+ # }
+ # if (!@data3){
+ # $key = repo_data('missing','mports');
+ # }
+ # else {
+ # clean_url(\@data3);
+ # $key = repo_data('active','mports');
+ # }
+ # push(@$rows,
+ # {main::key($num++,1,1,$key) => $mports},
+ # [@data3],
+ # );
+ # @data3 = ();
+ # }
# BSDs do not default always to having repo files, so show correct error
# mesage in that case
- if (!@rows){
+ if (!@$rows){
if ($bsd_type eq 'freebsd'){
$key = repo_data('missing','freebsd-files');
}
@@ -15463,28 +25937,28 @@ sub get_repos_bsd {
else {
$key = repo_data('missing','bsd-files');
}
- @data = (
+ push(@$rows,
{main::key($num++,0,1,'Message') => $key},
[()],
);
- @rows = (@rows,@data);
}
eval $start if $b_log;
- return @rows;
}
-sub repo_data {
+
+sub set_repo_keys {
eval $start if $b_log;
- my ($status,$type) = @_;
- my %keys = (
+ %repo_keys = (
'apk-active' => 'APK repo',
'apk-missing' => 'No active APK repos in',
'apt-active' => 'Active apt repos in',
'apt-missing' => 'No active apt repos in',
- 'bsd-files-missing' => 'No BSD pkg server files found',
- 'bsd-package-active' => 'BSD enabled pkg servers in',
+ 'bsd-files-missing' => 'No pkg server files found',
+ 'bsd-package-active' => 'Enabled pkg servers in',
'bsd-package-missing' => 'No enabled BSD pkg servers in',
'cards-active' => 'Active CARDS collections in',
'cards-missing' => 'No active CARDS collections in',
+ 'dnf-active' => 'Active dnf repos in',
+ 'dnf-missing' => 'No active dnf repos in',
'eopkg-active' => 'Active eopkg repo',
'eopkg-missing' => 'No active eopkg repos found',
'files-missing' => 'No repo files found in',
@@ -15493,9 +25967,15 @@ sub repo_data {
'freebsd-missing' => 'No FreeBSD update servers in',
'freebsd-pkg-active' => 'FreeBSD default pkg server',
'freebsd-pkg-missing' => 'No FreeBSD default pkg server in',
+ 'mports-active' => 'mports servers',
+ 'mports-missing' => 'No mports servers found',
'netbsd-active' => 'NetBSD pkg servers',
'netbsd-files-missing' => 'No NetBSD pkg server files found',
'netbsd-missing' => 'No NetBSD pkg servers in',
+ 'netpkg-active' => 'Active netpkg repos in',
+ 'netpkg-missing' => 'No active netpkg repos in',
+ 'nix-active' => 'Active nix channels for user',
+ 'nix-missing' => 'No nix channels found for user',
'openbsd-active' => 'OpenBSD pkg mirror',
'openbsd-files-missing' => 'No OpenBSD pkg mirror files found',
'openbsd-missing' => 'No OpenBSD pkg mirrors in',
@@ -15507,14 +25987,25 @@ sub repo_data {
'pisi-missing' => 'No active pisi repos found',
'portage-active' => 'Enabled portage sources in',
'portage-missing' => 'No enabled portage sources in',
- 'portsnap-active' => 'BSD ports server',
+ 'portsnap-active' => 'Ports server',
'portsnap-missing' => 'No ports servers in',
- 'slackpkg-active' => 'slackpkg repos in',
- 'slackpkg-missing' => 'No active slackpkg repos in',
+ 'sbopkg-active' => 'Active sbopkg repo',
+ 'sbopkg-active-permissions' => 'Active sbopkg repo (confirm with root)',
+ 'sbopkg-missing' => 'No sbopkg repo',
+ 'sboui-active' => 'Active sboui repo',
+ 'sboui-missing' => 'No sboui repo',
+ 'scratchpkg-active' => 'scratchpkg repos in',
+ 'scratchpkg-missing' => 'No active scratchpkg repos in',
+ 'slackpkg-active' => 'slackpkg mirror in',
+ 'slackpkg-missing' => 'No slackpkg mirror set in',
'slackpkg+-active' => 'slackpkg+ repos in',
'slackpkg+-missing' => 'No active slackpkg+ repos in',
'slaptget-active' => 'slapt-get repos in',
'slaptget-missing' => 'No active slapt-get repos in',
+ 'slpkg-active' => 'Active slpkg repos in',
+ 'slpkg-missing' => 'No active slpkg repos in',
+ 'tazpkg-active' => 'tazpkg mirrors in',
+ 'tazpkg-missing' => 'No tazpkg mirrors in',
'tce-active' => 'tce mirrors in',
'tce-missing' => 'No tce mirrors in',
'xbps-active' => 'Active xbps repos in',
@@ -15525,21 +26016,29 @@ sub repo_data {
'zypp-missing' => 'No active zypp repos in',
);
eval $end if $b_log;
- return $keys{$type . '-' . $status};
}
+
+sub repo_data {
+ eval $start if $b_log;
+ my ($status,$type) = @_;
+ set_repo_keys() if !%repo_keys;
+ eval $end if $b_log;
+ return $repo_keys{$type . '-' . $status};
+}
+
sub repo_builder {
eval $start if $b_log;
my ($file,$type,$search,$split,$count) = @_;
- my (@content,@data,$key);
- push @dbg_files, $file if $debugger_dir;
+ my (@content,$key);
+ push(@dbg_files, $file) if $debugger_dir;
if (-r $file){
@content = main::reader($file);
@content = grep {/$search/i && !/^\s*$/} @content if @content;
- @content = data_cleaner(@content) if @content;
+ clean_data(\@content) if @content;
}
if ($split && @content){
@content = map {
- my @inner = split (/$split/, $_);
+ my @inner = split(/$split/, $_);
$inner[$count];
} @content;
}
@@ -15548,27 +26047,34 @@ sub repo_builder {
}
else {
$key = repo_data('active',$type);
- @content = url_cleaner(@content);
+ clean_url(\@content);
}
- @data = (
+ eval $end if $b_log;
+ return [
{main::key($num++,1,1,$key) => $file},
[@content],
- );
- eval $end if $b_log;
- return @data;
+ ];
}
-sub data_cleaner {
- my (@content) = @_;
- # basics: trim white space, get rid of double spaces
- @content = map { $_ =~ s/^\s+|\s+$//g; $_ =~ s/\s\s+/ /g; $_} @content;
- return @content;
+
+sub clean_data {
+ # basics: trim white space, get rid of double spaces; trim comments at
+ # ends of repo values
+ @{$_[0]} = map {
+ $_ =~ s/\s\s+/ /g;
+ $_ =~ s/^\s+|\s+$//g;
+ $_ =~ s/\[\s+/[/g; # [ signed-by
+ $_ =~ s/\s+\]/]/g;
+ $_ =~ s/^(.*\/.*) #.*/$1/;
+ $_;} @{$_[0]};
}
-# clean if irc
-sub url_cleaner {
- my (@content) = @_;
- @content = map { $_ =~ s/:\//: \//; $_} @content if $b_irc;
- return @content;
+
+# Clean if irc
+sub clean_url {
+ @{$_[0]} = map {$_ =~ s/:\//: \//; $_} @{$_[0]} if $b_irc;
+ # trim comments at ends of repo values
+ @{$_[0]} = map {$_ =~ s/^(.*\/.*) #.*/$1/; $_} @{$_[0]};
}
+
sub file_path {
my ($filename,$dir) = @_;
my ($working);
@@ -15580,594 +26086,1021 @@ sub file_path {
}
}
-## SensorData
+## SensorItem
{
-package SensorData;
-my (@sensors_data);
-my ($b_ipmi) = (0);
+package SensorItem;
+my $gpu_data = [];
+my $sensors_raw = {};
+my $max_fan = 15000;
+
sub get {
eval $start if $b_log;
- my ($key1,$program,$val1,@data,@rows,%sensors);
- my $num = 0;
- my $source = 'sensors';
+ my ($b_data,$b_ipmi,$b_no_lm,$b_no_sys);
+ my ($message_type,$program,$val1,$sensors);
+ my ($key1,$num,$rows) = ('Message',0,[]);
+ my $source = 'sensors'; # will trip some type output if ipmi + another type
# we're allowing 1 or 2 ipmi tools, first the gnu one, then the
# almost certain to be present in BSDs
- if ( $b_ipmi ||
- ( main::globber('/dev/ipmi**') &&
- ( ( $program = main::check_program('ipmi-sensors') ) ||
- ( $program = main::check_program('ipmitool') ) ) ) ){
- if ($b_ipmi || $b_root){
- %sensors = ipmi_data($program);
- @data = create_output('ipmi',%sensors);
- if (!@data) {
- $key1 = 'Message';
- $val1 = main::row_defaults('sensors-data-ipmi');
- #$val1 = main::row_defaults('dev');
- @data = ({main::key($num++,0,1,$key1) => $val1,});
+ if ($fake{'ipmi'} || (main::globber('/dev/ipmi**') &&
+ (($program = main::check_program('ipmi-sensors')) ||
+ ($program = main::check_program('ipmitool'))))){
+ if ($fake{'ipmi'} || $b_root){
+ $sensors = ipmi_data($program);
+ $b_data = sensors_output($rows,'ipmi',$sensors);
+ if (!$b_data){
+ $val1 = main::message('sensor-data-ipmi');
+ push(@$rows,{
+ main::key($num++,1,1,'Src') => 'ipmi',
+ main::key($num++,0,1,$key1) => $val1,
+ });
}
- @rows = (@rows,@data);
- $source = 'lm-sensors'; # trips per sensor type output
}
else {
$key1 = 'Permissions';
- $val1 = main::row_defaults('sensors-ipmi-root');
- @data = ({main::key($num++,0,1,$key1) => $val1,});
- @rows = (@rows,@data);
+ $val1 = main::message('sensor-data-ipmi-root');
+ push(@$rows,{
+ main::key($num++,1,1,'Src') => 'ipmi',
+ main::key($num++,0,2,$key1) => $val1,
+ });
}
+ $b_ipmi = 1;
}
- my $ref = $alerts{'sensors'};
- if ( $$ref{'action'} ne 'use'){
- #print "here 1\n";
- $key1 = $$ref{'action'};
- $val1 = $$ref{$key1};
- $key1 = ucfirst($key1);
- @data = ({main::key($num++,0,1,$key1) => $val1,});
- @rows = (@rows,@data);
+ $b_data = 0;
+ if ($bsd_type){
+ if ($sysctl{'sensor'}){
+ $sensors = sysctl_data();
+ $source = 'sysctl' if $b_ipmi;
+ $b_data = sensors_output($rows,$source,$sensors);
+ if (!$b_data){
+ $source = 'sysctl';
+ $val1 = main::message('sensor-data-bsd',$uname[0]);
+ }
+ }
+ else {
+ if ($bsd_type =~ /^(free|open)bsd/){
+ $source = 'sysctl';
+ $val1 = main::message('sensor-data-bsd-ok');
+ }
+ else {
+ $source = 'N/A';
+ $val1 = main::message('sensor-data-bsd-unsupported');
+ }
+ }
}
else {
- %sensors = lm_sensors_data();
- @data = create_output($source,%sensors);
- #print "here 2\n";
- if (!@data) {
- $key1 = 'Message';
- $val1 = main::row_defaults('sensors-data-linux');
- @data = ({main::key($num++,0,1,$key1) => $val1,});
+ if (!$force{'sensors-sys'} &&
+ ($fake{'sensors'} || $alerts{'sensors'}->{'action'} eq 'use')){
+ load_lm_sensors();
+ $sensors = linux_sensors_data();
+ $source = 'lm-sensors' if $b_ipmi; # trips per sensor type output
+ $b_data = sensors_output($rows,$source,$sensors);
+ # print "here 1\n";
+ $b_no_lm = 1 if !$b_data;
+ }
+ # given recency of full /sys data, we want to prefer lm-sensors for a long time
+ # and use /sys as a fallback. This will handle servers, which often do not
+ # have lm-sensors installed, but do have /sys hwmon data.
+ if (!$b_data && -d '/sys/class/hwmon'){
+ load_sys_data();
+ $sensors = linux_sensors_data();
+ $source = '/sys'; # trips per sensor type output
+ $b_data = sensors_output($rows,$source,$sensors);
+ # print "here 2\n";
+ $b_no_sys = 1 if !$b_data;
+ }
+ if (!$b_data){
+ if ($b_no_lm || $b_no_sys){
+ if ($b_no_lm && $b_no_sys){
+ $source = 'lm-sensors+/sys';
+ $val1 = main::message('sensor-data-sys-lm');
+ }
+ elsif ($b_no_lm){
+ $source = 'lm-sensors';
+ $val1 = main::message('sensor-data-lm-sensors');
+ }
+ else {
+ $val1 = main::message('sensor-data-sys');
+ }
+ }
+ elsif (!$fake{'sensors'} && $alerts{'sensors'}->{'action'} ne 'use'){
+ # print "here 3\n";
+ $source = 'lm-sensors';
+ $key1 = $alerts{'sensors'}->{'action'};
+ $key1 = ucfirst($key1);
+ $val1 = $alerts{'sensors'}->{'message'};
+ }
+ else {
+ $source = 'N/A';
+ $val1 = main::message('sensors-data-linux');
+ }
}
- @rows = (@rows,@data);
}
- undef @sensors_data;
+ if (!$b_data){
+ push(@$rows,{
+ main::key($num++,1,1,'Src') => $source,
+ main::key($num++,0,2,$key1) => $val1,
+ });
+ }
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub create_output {
+
+sub sensors_output {
eval $start if $b_log;
- my ($source,%sensors) = @_;
- # note: might revisit this, since gpu sensors data might be present
- return if ! %sensors;
- my (@gpu,@data,@rows,@fan_default,@fan_main);
- my ($data_source) = ('');
+ my ($rows,$source,$sensors) = @_;
+ my ($b_result,@fan_default,@fan_main);
my $fan_number = 0;
my $num = 0;
- my $j = 0;
- @gpu = gpu_data() if ( $source eq 'sensors' || $source eq 'lm-sensors' );
- my $temp_unit = (defined $sensors{'temp-unit'}) ? " $sensors{'temp-unit'}": '';
- my $cpu_temp = (defined $sensors{'cpu-temp'}) ? $sensors{'cpu-temp'} . $temp_unit: 'N/A';
- my $mobo_temp = (defined $sensors{'mobo-temp'}) ? $sensors{'mobo-temp'} . $temp_unit: 'N/A';
- my $cpu1_key = ($sensors{'cpu2-temp'}) ? 'cpu-1': 'cpu' ;
- $data_source = $source if ($source eq 'ipmi' || $source eq 'lm-sensors');
- @data = ({
- main::key($num++,1,1,'System Temperatures') => $data_source,
- main::key($num++,0,2,$cpu1_key) => $cpu_temp,
- });
- @rows = (@rows,@data);
- if ($sensors{'cpu2-temp'}){
- $rows[$j]{main::key($num++,0,2,'cpu-2')} = $sensors{'cpu2-temp'} . $temp_unit;
- }
- if ($sensors{'cpu3-temp'}){
- $rows[$j]{main::key($num++,0,2,'cpu-3')} = $sensors{'cpu3-temp'} . $temp_unit;
- }
- if ($sensors{'cpu4-temp'}){
- $rows[$j]{main::key($num++,0,2,'cpu-4')} = $sensors{'cpu4-temp'} . $temp_unit;
- }
- $rows[$j]{main::key($num++,0,2,'mobo')} = $mobo_temp;
- if (defined $sensors{'sodimm-temp'}){
- my $sodimm_temp = $sensors{'sodimm-temp'} . $temp_unit;
- $rows[$j]{main::key($num++,0,2,'sodimm')} = $sodimm_temp;
- }
- if (defined $sensors{'psu-temp'}){
- my $psu_temp = $sensors{'psu-temp'} . $temp_unit;
- $rows[$j]{main::key($num++,0,2,'psu')} = $psu_temp;
- }
- if (defined $sensors{'ambient-temp'}){
- my $ambient_temp = $sensors{'ambient-temp'} . $temp_unit;
- $rows[$j]{main::key($num++,0,2,'ambient')} = $ambient_temp;
- }
- if (scalar @gpu == 1 && defined $gpu[0]{'temp'}){
- my $gpu_temp = $gpu[0]{'temp'};
- my $gpu_type = $gpu[0]{'type'};
- my $gpu_unit = (defined $gpu[0]{'temp-unit'} && $gpu_temp ) ? " $gpu[0]{'temp-unit'}" : ' C';
- $rows[$j]{main::key($num++,1,2,'gpu')} = $gpu_type;
- $rows[$j]{main::key($num++,0,3,'temp')} = $gpu_temp . $gpu_unit;
- }
- $j = scalar @rows;
- my $ref_main = $sensors{'fan-main'};
- my $ref_default = $sensors{'fan-default'};
- @fan_main = @$ref_main if @$ref_main;
- @fan_default = @$ref_default if @$ref_default;
- my $fan_def = ($data_source) ? $data_source : '';
- if (!@fan_main && !@fan_default){
- $fan_def = ($fan_def) ? "$data_source N/A" : 'N/A';
- }
- $rows[$j]{main::key($num++,1,1,'Fan Speeds (RPM)')} = $fan_def;
+ my $j = scalar @$rows;
+ if (!$loaded{'gpu-data'} &&
+ ($source eq 'sensors' || $source eq 'lm-sensors' || $source eq '/sys')){
+ gpu_sensor_data();
+ }
+ # gpu sensors data might be present even if standard sensors data wasn't
+ return if !%$sensors && !@$gpu_data;
+ $b_result = 1; ## need to trip data found conditions
+ my $temp_unit = (defined $sensors->{'temp-unit'}) ? " $sensors->{'temp-unit'}": '';
+ my $cpu_temp = (defined $sensors->{'cpu-temp'}) ? $sensors->{'cpu-temp'} . $temp_unit: 'N/A';
+ my $mobo_temp = (defined $sensors->{'mobo-temp'}) ? $sensors->{'mobo-temp'} . $temp_unit: 'N/A';
+ my $cpu1_key = ($sensors->{'cpu2-temp'}) ? 'cpu-1': 'cpu';
+ my ($l1,$l2,$l3) = (1,2,3);
+ if ($source ne 'sensors'){
+ $rows->[$j]{main::key($num++,1,1,'Src')} = $source;
+ ($l1,$l2,$l3) = (2,3,4);
+ }
+ $rows->[$j]{main::key($num++,1,$l1,'System Temperatures')} = '';
+ $rows->[$j]{main::key($num++,0,$l2,$cpu1_key)} = $cpu_temp;
+ if ($sensors->{'cpu2-temp'}){
+ $rows->[$j]{main::key($num++,0,$l2,'cpu-2')} = $sensors->{'cpu2-temp'} . $temp_unit;
+ }
+ if ($sensors->{'cpu3-temp'}){
+ $rows->[$j]{main::key($num++,0,$l2,'cpu-3')} = $sensors->{'cpu3-temp'} . $temp_unit;
+ }
+ if ($sensors->{'cpu4-temp'}){
+ $rows->[$j]{main::key($num++,0,$l2,'cpu-4')} = $sensors->{'cpu4-temp'} . $temp_unit;
+ }
+ if (defined $sensors->{'pch-temp'}){
+ my $pch_temp = $sensors->{'pch-temp'} . $temp_unit;
+ $rows->[$j]{main::key($num++,0,$l2,'pch')} = $pch_temp;
+ }
+ $rows->[$j]{main::key($num++,0,$l2,'mobo')} = $mobo_temp;
+ if (defined $sensors->{'sodimm-temp'}){
+ my $sodimm_temp = $sensors->{'sodimm-temp'} . $temp_unit;
+ $rows->[$j]{main::key($num++,0,$l2,'sodimm')} = $sodimm_temp;
+ }
+ if (defined $sensors->{'psu-temp'}){
+ my $psu_temp = $sensors->{'psu-temp'} . $temp_unit;
+ $rows->[$j]{main::key($num++,0,$l2,'psu')} = $psu_temp;
+ }
+ if (defined $sensors->{'ambient-temp'}){
+ my $ambient_temp = $sensors->{'ambient-temp'} . $temp_unit;
+ $rows->[$j]{main::key($num++,0,$l2,'ambient')} = $ambient_temp;
+ }
+ if (scalar @$gpu_data == 1 && defined $gpu_data->[0]{'temp'}){
+ my $gpu_temp = $gpu_data->[0]{'temp'};
+ my $gpu_type = $gpu_data->[0]{'type'};
+ my $gpu_unit = (defined $gpu_data->[0]{'temp-unit'} && $gpu_temp) ? " $gpu_data->[0]{'temp-unit'}" : ' C';
+ $rows->[$j]{main::key($num++,1,$l2,'gpu')} = $gpu_type;
+ $rows->[$j]{main::key($num++,0,$l3,'temp')} = $gpu_temp . $gpu_unit;
+ if ($extra > 1 && $gpu_data->[0]{'temp-mem'}){
+ $rows->[$j]{main::key($num++,0,$l3,'mem')} = $gpu_data->[0]{'temp-mem'} . $gpu_unit;
+ }
+ }
+ $j = scalar @$rows;
+ @fan_main = @{$sensors->{'fan-main'}} if $sensors->{'fan-main'};
+ @fan_default = @{$sensors->{'fan-default'}} if $sensors->{'fan-default'};
+ my $fan_def = (!@fan_main && !@fan_default) ? 'N/A' : '';
+ $rows->[$j]{main::key($num++,1,$l1,'Fan Speeds (rpm)')} = $fan_def;
my $b_cpu = 0;
for (my $i = 0; $i < scalar @fan_main; $i++){
next if $i == 0;# starts at 1, not 0
if (defined $fan_main[$i]){
- if ($i == 1 || ($i == 2 && !$b_cpu )){
- $rows[$j]{main::key($num++,0,2,'cpu')} = $fan_main[$i];
+ if ($i == 1 || ($i == 2 && !$b_cpu)){
+ $rows->[$j]{main::key($num++,0,$l2,'cpu')} = $fan_main[$i];
$b_cpu = 1;
}
elsif ($i == 2 && $b_cpu){
- $rows[$j]{main::key($num++,0,2,'mobo')} = $fan_main[$i];
+ $rows->[$j]{main::key($num++,0,$l2,'mobo')} = $fan_main[$i];
}
elsif ($i == 3){
- $rows[$j]{main::key($num++,0,2,'psu')} = $fan_main[$i];
+ $rows->[$j]{main::key($num++,0,$l2,'psu')} = $fan_main[$i];
}
elsif ($i == 4){
- $rows[$j]{main::key($num++,0,2,'sodimm')} = $fan_main[$i];
+ $rows->[$j]{main::key($num++,0,$l2,'sodimm')} = $fan_main[$i];
}
elsif ($i > 4){
$fan_number = $i - 4;
- $rows[$j]{main::key($num++,0,2,"case-$fan_number")} = $fan_main[$i];
+ $rows->[$j]{main::key($num++,0,$l2,"case-$fan_number")} = $fan_main[$i];
}
}
}
for (my $i = 0; $i < scalar @fan_default; $i++){
next if $i == 0;# starts at 1, not 0
if (defined $fan_default[$i]){
- $rows[$j]{main::key($num++,0,2,"fan-$i")} = $fan_default[$i];
+ $rows->[$j]{main::key($num++,0,$l2,"fan-$i")} = $fan_default[$i];
}
}
- $rows[$j]{main::key($num++,0,2,'psu')} = $sensors{'fan-psu'} if defined $sensors{'fan-psu'};
- $rows[$j]{main::key($num++,0,2,'psu-1')} = $sensors{'fan-psu1'} if defined $sensors{'fan-psu1'};
- $rows[$j]{main::key($num++,0,2,'psu-2')} = $sensors{'fan-psu2'} if defined $sensors{'fan-psu2'};
+ $rows->[$j]{main::key($num++,0,$l2,'psu')} = $sensors->{'fan-psu'} if defined $sensors->{'fan-psu'};
+ $rows->[$j]{main::key($num++,0,$l2,'psu-1')} = $sensors->{'fan-psu1'} if defined $sensors->{'fan-psu1'};
+ $rows->[$j]{main::key($num++,0,$l2,'psu-2')} = $sensors->{'fan-psu2'} if defined $sensors->{'fan-psu2'};
# note: so far, only nvidia-settings returns speed, and that's in percent
- if (scalar @gpu == 1 && defined $gpu[0]{'fan-speed'}){
- my $gpu_fan = $gpu[0]{'fan-speed'} . $gpu[0]{'speed-unit'};
- my $gpu_type = $gpu[0]{'type'};
- $rows[$j]{main::key($num++,1,2,'gpu')} = $gpu_type;
- $rows[$j]{main::key($num++,0,3,'fan')} = $gpu_fan;
- }
- if (scalar @gpu > 1){
- $j = scalar @rows;
- $rows[$j]{main::key($num++,1,1,'GPU')} = '';
- my $gpu_unit = (defined $gpu[0]{'temp-unit'} ) ? " $gpu[0]{'temp-unit'}" : ' C';
- foreach my $ref (@gpu){
- my %info = %$ref;
+ if (scalar @$gpu_data == 1 && defined $gpu_data->[0]{'fan-speed'}){
+ my $gpu_fan = $gpu_data->[0]{'fan-speed'} . $gpu_data->[0]{'speed-unit'};
+ my $gpu_type = $gpu_data->[0]{'type'};
+ $rows->[$j]{main::key($num++,1,$l2,'gpu')} = $gpu_type;
+ $rows->[$j]{main::key($num++,0,$l3,'fan')} = $gpu_fan;
+ }
+ if (scalar @$gpu_data > 1){
+ $j = scalar @$rows;
+ $rows->[$j]{main::key($num++,1,$l1,'GPU')} = '';
+ my $gpu_unit = (defined $gpu_data->[0]{'temp-unit'}) ? " $gpu_data->[0]{'temp-unit'}" : ' C';
+ foreach my $info (@$gpu_data){
# speed unit is either '' or %
- my $gpu_fan = (defined $info{'fan-speed'}) ? $info{'fan-speed'} . $info{'speed-unit'}: undef ;
- my $gpu_type = $info{'type'};
- my $gpu_temp = (defined $info{'temp'} ) ? $info{'temp'} . $gpu_unit: 'N/A';
- $rows[$j]{main::key($num++,1,2,'device')} = $gpu_type;
- if (defined $info{'screen'} ){
- $rows[$j]{main::key($num++,0,3,'screen')} = $info{'screen'};
- }
- $rows[$j]{main::key($num++,0,3,'temp')} = $gpu_temp;
+ my $gpu_fan = (defined $info->{'fan-speed'}) ? $info->{'fan-speed'} . $info->{'speed-unit'}: undef;
+ my $gpu_type = $info->{'type'};
+ my $gpu_temp = (defined $info->{'temp'}) ? $info->{'temp'} . $gpu_unit: 'N/A';
+ $rows->[$j]{main::key($num++,1,$l2,'device')} = $gpu_type;
+ if (defined $info->{'screen'}){
+ $rows->[$j]{main::key($num++,0,$l3,'screen')} = $info->{'screen'};
+ }
+ $rows->[$j]{main::key($num++,0,$l3,'temp')} = $gpu_temp;
+ if ($extra > 1 && $info->{'temp-mem'}){
+ $rows->[$j]{main::key($num++,0,$l3,'mem')} = $info->{'temp-mem'} . $gpu_unit;
+ }
if (defined $gpu_fan){
- $rows[$j]{main::key($num++,0,3,'fan')} = $gpu_fan;
+ $rows->[$j]{main::key($num++,0,$l3,'fan')} = $gpu_fan;
+ }
+ if ($extra > 2 && $info->{'watts'}){
+ $rows->[$j]{main::key($num++,0,$l3,'watts')} = $info->{'watts'};
+ }
+ if ($extra > 2 && $info->{'volts-gpu'}){
+ $rows->[$j]{main::key($num++,0,$l3,$info->{'volts-gpu'}[1])} = $info->{'volts-gpu'}[0];
}
}
}
if ($extra > 0 && ($source eq 'ipmi' ||
- ($sensors{'volts-12'} || $sensors{'volts-5'} || $sensors{'volts-3.3'} || $sensors{'volts-vbat'}))){
- $j = scalar @rows;
- $sensors{'volts-12'} ||= 'N/A';
- $sensors{'volts-5'} ||= 'N/A';
- $sensors{'volts-3.3'} ||= 'N/A';
- $sensors{'volts-vbat'} ||= 'N/A';
- $rows[$j]{main::key($num++,1,1,'Voltages')} = $data_source;
- $rows[$j]{main::key($num++,0,2,'12v')} = $sensors{'volts-12'};
- $rows[$j]{main::key($num++,0,2,'5v')} = $sensors{'volts-5'};
- $rows[$j]{main::key($num++,0,2,'3.3v')} = $sensors{'volts-3.3'};
- $rows[$j]{main::key($num++,0,2,'vbat')} = $sensors{'volts-vbat'};
- if ($extra > 1 && $source eq 'ipmi' ){
- $sensors{'volts-dimm-p1'} ||= 'N/A';
- $sensors{'volts-dimm-p2'} ||= 'N/A';
- $rows[$j]{main::key($num++,0,2,'dimm-p1')} = $sensors{'volts-dimm-p1'} if $sensors{'volts-dimm-p1'};
- $rows[$j]{main::key($num++,0,2,'dimm-p2')} = $sensors{'volts-dimm-p2'} if $sensors{'volts-dimm-p2'};
- $rows[$j]{main::key($num++,0,2,'soc-p1')} = $sensors{'volts-soc-p1'} if $sensors{'volts-soc-p1'};
- $rows[$j]{main::key($num++,0,2,'soc-p2')} = $sensors{'volts-soc-p2'} if $sensors{'volts-soc-p2'};
- }
- }
- eval $end if $b_log;
- return @rows;
+ ($sensors->{'volts-12'} || $sensors->{'volts-5'} || $sensors->{'volts-3.3'} ||
+ $sensors->{'volts-vbat'}))){
+ $j = scalar @$rows;
+ $sensors->{'volts-12'} ||= 'N/A';
+ $sensors->{'volts-5'} ||= 'N/A';
+ $sensors->{'volts-3.3'} ||= 'N/A';
+ $sensors->{'volts-vbat'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,$l1,'Power')} = '';
+ $rows->[$j]{main::key($num++,0,$l2,'12v')} = $sensors->{'volts-12'};
+ $rows->[$j]{main::key($num++,0,$l2,'5v')} = $sensors->{'volts-5'};
+ $rows->[$j]{main::key($num++,0,$l2,'3.3v')} = $sensors->{'volts-3.3'};
+ $rows->[$j]{main::key($num++,0,$l2,'vbat')} = $sensors->{'volts-vbat'};
+ if ($extra > 1 && $source eq 'ipmi'){
+ $sensors->{'volts-dimm-p1'} ||= 'N/A';
+ $sensors->{'volts-dimm-p2'} ||= 'N/A';
+ if ($sensors->{'volts-dimm-p1'}){
+ $rows->[$j]{main::key($num++,0,$l2,'dimm-p1')} = $sensors->{'volts-dimm-p1'};
+ }
+ if ($sensors->{'volts-dimm-p2'}){
+ $rows->[$j]{main::key($num++,0,$l2,'dimm-p2')} = $sensors->{'volts-dimm-p2'};
+ }
+ if ($sensors->{'volts-soc-p1'}){
+ $rows->[$j]{main::key($num++,0,$l2,'soc-p1')} = $sensors->{'volts-soc-p1'};
+ }
+ if ($sensors->{'volts-soc-p2'}){
+ $rows->[$j]{main::key($num++,0,$l2,'soc-p2')} = $sensors->{'volts-soc-p2'};
+ }
+ }
+ if (scalar @$gpu_data == 1 && $extra > 2 &&
+ ($gpu_data->[0]{'watts'} || $gpu_data->[0]{'volts-gpu'})){
+ $rows->[$j]{main::key($num++,1,$l2,'gpu')} = $gpu_data->[0]{'type'};
+ if ($gpu_data->[0]{'watts'}){
+ $rows->[$j]{main::key($num++,0,$l3,'watts')} = $gpu_data->[0]{'watts'};
+ }
+ if ($gpu_data->[0]{'volts-gpu'}){
+ $rows->[$j]{main::key($num++,0,$l3,$gpu_data->[0]{'volts-gpu'}[1])} = $gpu_data->[0]{'volts-gpu'}[0];
+ }
+ }
+ }
+ eval $end if $b_log;
+ return $b_result;
}
+
sub ipmi_data {
eval $start if $b_log;
my ($program) = @_;
- my ($b_cpu_0,$cmd,$file,@data,$fan_working,%sensors,@row,$sys_fan_nu,
- $temp_working,$working_unit);
- $program ||= 'ipmi-sensors'; # only for debugging, will always exist if reaches here
+ my ($b_cpu_0,$cmd,$file,@data,$fan_working,@row,$speed,$sys_fan_nu,$temp_working,
+ $working_unit);
my ($b_ipmitool,$i_key,$i_value,$i_unit);
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-archerseven-1.txt";$program='ipmitool';
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-crazy-epyc-1.txt";$program='ipmitool';
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-RK016013.txt";$program='ipmitool';
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-crazy-epyc-1.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-lathander.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-zwerg.txt";
- #@data = main::reader($file);
- if ($program =~ /ipmi-sensors$/){
- $cmd = $program;
- ($b_ipmitool,$i_key,$i_value,$i_unit) = (0,1,3,4);
+ my $sensors = {};
+ if ($fake{'ipmi'}){
+ ## ipmitool ##
+ # $file = "$fake_data_dir/sensors/ipmitool/ipmitool-sensors-archerseven-1.txt";$program='ipmitool';
+ # $file = "$fake_data_dir/sensorsipmitool/ipmitool-sensors-epyc-1.txt";$program='ipmitool';
+ # $file = "$fake_data_dir/sensorsipmitool/ipmitool-sensors-RK016013.txt";$program='ipmitool';
+ # $file = "$fake_data_dir/sensorsipmitool/ipmitool-sensors-freebsd-offsite-backup.txt";
+ # $file = "$fake_data_dir/sensorsipmitool/ipmitool-sensor-shom-1.txt";$program='ipmitool';
+ # $file = "$fake_data_dir/sensorsipmitool/ipmitool-sensor-shom-2.txt";$program='ipmitool';
+ # $file = "$fake_data_dir/sensorsipmitool/ipmitool-sensor-tyan-1.txt";$program='ipmitool';
+ # ($b_ipmitool,$i_key,$i_value,$i_unit) = (1,0,1,2); # ipmitool sensors
+ ## ipmi-sensors ##
+ # $file = "$fake_data_dir/sensorsipmitool/ipmi-sensors-epyc-1.txt";$program='ipmi-sensors';
+ # $file = "$fake_data_dir/sensorsipmitool/ipmi-sensors-lathander.txt";$program='ipmi-sensors';
+ # $file = "$fake_data_dir/sensorsipmitool/ipmi-sensors-zwerg.txt";$program='ipmi-sensors';
+ # $file = "$fake_data_dir/sensorsipmitool/ipmi-sensors-arm-server-1.txt";$program='ipmi-sensors';
+ # ($b_ipmitool,$i_key,$i_value,$i_unit) = (0,1,3,4); # ipmi-sensors
+ # @data = main::reader($file);
}
else {
- $cmd = "$program sensors";
- ($b_ipmitool,$i_key,$i_value,$i_unit) = (1,0,1,2);
+ if ($program =~ /ipmi-sensors$/){
+ $cmd = $program;
+ ($b_ipmitool,$i_key,$i_value,$i_unit) = (0,1,3,4);
+ }
+ else { # ipmitool
+ $cmd = "$program sensor"; # note: 'sensor' NOT 'sensors' !!
+ ($b_ipmitool,$i_key,$i_value,$i_unit) = (1,0,1,2);
+ }
+ @data = main::grabber("$cmd 2>/dev/null");
}
- @data = main::grabber("$cmd 2>/dev/null");
- # print join ("\n", @data), "\n";
- return if ! @data;
+ # print join("\n", @data), "\n";
+ # shouldn't need to log, but saw a case with debugger ipmi data, but none here apparently
+ main::log_data('dump','ipmi @data',\@data) if $b_log;
+ return $sensors if !@data;
foreach (@data){
next if /^\s*$/;
# print "$_\n";
- @row = split /\s*\|\s*/, $_;
- #print "$row[$i_value]\n";
+ @row = split(/\s*\|\s*/, $_);
+ # print "$row[$i_value]\n";
next if !main::is_numeric($row[$i_value]);
# print "$row[$i_key] - $row[$i_value]\n";
- if (!$sensors{'mobo-temp'} && $row[$i_key] =~ /^(MB_TEMP[0-9]|System[\s_]Temp|System[\s_]?Board)$/i){
- $sensors{'mobo-temp'} = int($row[$i_value]);
+ if (!$sensors->{'mobo-temp'} && $row[$i_key] =~ /^(MB[\s_-]?TEMP[0-9]|System[\s_-]?Temp|System[\s_-]?Board([\s_-]?Temp)?)$/i){
+ $sensors->{'mobo-temp'} = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
- elsif ($row[$i_key] =~ /^(Ambient)$/i){
- $sensors{'ambient-temp'} = int($row[$i_value]);
+ elsif ($row[$i_key] =~ /^(System[\s_-]?)?(Ambient)([\s_-]?Temp)?$/i){
+ $sensors->{'ambient-temp'} = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
# Platform Control Hub (PCH), it is the X370 chip on the Crosshair VI Hero.
# VRM: voltage regulator module
# NOTE: CPU0_TEMP CPU1_TEMP is possible, unfortunately; CPU Temp Interf
- elsif ( !$sensors{'cpu-temp'} && $row[$i_key] =~ /^CPU([01])?([\s_]Temp)?$/i) {
+ elsif (!$sensors->{'cpu-temp'} && $row[$i_key] =~ /^CPU[\s_-]?([01])?([\s_](below[\s_]Tmax|Temp))?$/i){
$b_cpu_0 = 1 if defined $1 && $1 == 0;
- $sensors{'cpu-temp'} = int($row[$i_value]);
+ $sensors->{'cpu-temp'} = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
- elsif ($row[$i_key] =~ /^CPU([1-4])([\s_]Temp)?$/i) {
+ elsif ($row[$i_key] =~ /^CPU[\s_-]?([1-4])([\s_](below[\s_]Tmax|Temp))?$/i){
$temp_working = $1;
$temp_working++ if $b_cpu_0;
- $sensors{"cpu${temp_working}-temp"} = int($row[$i_value]);
+ $sensors->{"cpu${temp_working}-temp"} = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
# for temp1/2 only use temp1/2 if they are null or greater than the last ones
- elsif ($row[$i_key] =~ /^(MB[_]?TEMP1|Temp[\s_]1)$/i) {
+ elsif ($row[$i_key] =~ /^(MB[\s_-]?TEMP1|Temp[\s_]1)$/i){
$temp_working = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
- if ( !$sensors{'temp1'} || ( defined $temp_working && $temp_working > 0 ) ) {
- $sensors{'temp1'} = $temp_working;
+ if (!$sensors->{'temp1'} || (defined $temp_working && $temp_working > 0)){
+ $sensors->{'temp1'} = $temp_working;
}
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
- elsif ($row[$i_key] =~ /^(MB[_]?TEMP2|Temp[\s_]2)$/i) {
+ elsif ($row[$i_key] =~ /^(MB[_]?TEMP2|Temp[\s_]2)$/i){
$temp_working = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
- if ( !$sensors{'temp2'} || ( defined $temp_working && $temp_working > 0 ) ) {
- $sensors{'temp2'} = $temp_working;
+ if (!$sensors->{'temp2'} || (defined $temp_working && $temp_working > 0)){
+ $sensors->{'temp2'} = $temp_working;
}
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
# temp3 is only used as an absolute override for systems with all 3 present
- elsif ($row[$i_key] =~ /^(MB[_]?TEMP3|Temp[\s_]3)$/i) {
+ elsif ($row[$i_key] =~ /^(MB[_]?TEMP3|Temp[\s_]3)$/i){
$temp_working = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
- if ( !$sensors{'temp3'} || ( defined $temp_working && $temp_working > 0 ) ) {
- $sensors{'temp3'} = $temp_working;
+ if (!$sensors->{'temp3'} || (defined $temp_working && $temp_working > 0)){
+ $sensors->{'temp3'} = $temp_working;
}
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
- elsif (!$sensors{'sodimm-temp'} && $row[$i_key] =~ /^(DIMM[-_]([A-Z][0-9][-_])?[A-Z]?[0-9][A-Z]?)$/i){
- $sensors{'sodimm-temp'} = int($row[$i_value]);
+ elsif (!$sensors->{'sodimm-temp'} && ($row[$i_key] =~ /^(DIMM[-_]([A-Z][0-9]+[-_])?[A-Z]?[0-9]+[A-Z]?)$/i ||
+ $row[$i_key] =~ /^DIMM\s?[0-9]+ (Area|Temp).*/)){
+ $sensors->{'sodimm-temp'} = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
# note: can be cpu fan:, cpu fan speed:, etc.
- elsif ($row[$i_key] =~ /^(CPU|Processor)[\s_]Fan/i) {
- $sensors{'fan-main'} = () if !$sensors{'fan-main'};
- $sensors{'fan-main'}[1] = int($row[$i_value]);
+ elsif ($row[$i_key] =~ /^(CPU|Processor)[\s_]Fan/i ||
+ $row[$i_key] =~ /^SYS\.[0-9][\s_]?\(CPU\s?0\)$/i){
+ $speed = int($row[$i_value]);
+ $sensors->{'fan-main'}->[1] = $speed if $speed < $max_fan;
}
# note that the counters are dynamically set for fan numbers here
# otherwise you could overwrite eg aux fan2 with case fan2 in theory
# note: cpu/mobo/ps are 1/2/3
- elsif ($row[$i_key] =~ /^(SYS[\s_])?FAN[\s_]?([0-9A-F]+)/i) {
+ # SYS.3(Front 2)
+ # $row[$i_key] =~ /^(SYS[\.])([0-9])\s?\((Front|Rear).+\)$/i
+ elsif ($row[$i_key] =~ /^(SYS[\s_])?FAN[\s_]?([0-9A-F]+)/i){
$sys_fan_nu = hex($2);
$fan_working = int($row[$i_value]);
- $sensors{'fan-default'} = () if !$sensors{'fan-default'};
- if ( $sys_fan_nu =~ /^([0-9]+)$/ ) {
+ next if $fan_working > $max_fan;
+ $sensors->{'fan-default'} = () if !$sensors->{'fan-default'};
+ if ($sys_fan_nu =~ /^([0-9]+)$/){
# add to array if array index does not exist OR if number is > existing number
- if ( defined $sensors{'fan-default'}[$sys_fan_nu] ) {
- if ( $fan_working >= $sensors{'fan-default'}[$sys_fan_nu] ) {
- $sensors{'fan-default'}[$sys_fan_nu] = $fan_working;
+ if (defined $sensors->{'fan-default'}->[$sys_fan_nu]){
+ if ($fan_working >= $sensors->{'fan-default'}->[$sys_fan_nu]){
+ $sensors->{'fan-default'}->[$sys_fan_nu] = $fan_working;
}
}
else {
- $sensors{'fan-default'}[$sys_fan_nu] = $fan_working;
+ $sensors->{'fan-default'}->[$sys_fan_nu] = $fan_working;
}
}
}
- elsif ($row[$i_key] =~ /^(FAN PSU|PSU FAN)$/i) {
- $sensors{'fan-psu'} = int($row[$i_value]);
+ elsif ($row[$i_key] =~ /^(FAN PSU|PSU FAN)$/i){
+ $speed = int($row[$i_value]);
+ $sensors->{'fan-psu'} = $speed if $speed < $max_fan;
}
- elsif ($row[$i_key] =~ /^(FAN PSU1|PSU1 FAN)$/i) {
- $sensors{'fan-psu-1'} = int($row[$i_value]);
+ elsif ($row[$i_key] =~ /^(FAN PSU1|PSU1 FAN)$/i){
+ $speed = int($row[$i_value]);
+ $sensors->{'fan-psu-1'} = $speed if $speed < $max_fan;
}
- elsif ($row[$i_key] =~ /^(FAN PSU2|PSU2 FAN)$/i) {
- $sensors{'fan-psu-2'} = int($row[$i_value]);
+ elsif ($row[$i_key] =~ /^(FAN PSU2|PSU2 FAN)$/i){
+ $speed = int($row[$i_value]);
+ $sensors->{'fan-psu-2'} = $speed if $speed < $max_fan;
}
if ($extra > 0){
- if ($row[$i_key] =~ /^(MAIN\s|P[_]?)?12V$/i) {
- $sensors{'volts-12'} = $row[$i_value];
+ if ($row[$i_key] =~ /^((.+\s|P[_]?)?\+?12V|PSU[12]_VOUT)$/i){
+ $sensors->{'volts-12'} = $row[$i_value];
}
- elsif ($row[$i_key] =~ /^(MAIN\s5V|P5V|5VCC|5V PG)$/i) {
- $sensors{'volts-5'} = $row[$i_value];
+ elsif ($row[$i_key] =~ /^(.+\s5V|P5V|5VCC|5V( PG)?|5V_SB)$/i){
+ $sensors->{'volts-5'} = $row[$i_value];
}
- elsif ($row[$i_key] =~ /^(MAIN\s3.3V|P3V3|3.3VCC|3.3V PG)$/i) {
- $sensors{'volts-3.3'} = $row[$i_value];
+ elsif ($row[$i_key] =~ /^(.+\s3\.3V|P3V3|3\.3VCC|3\.3V( PG)?|3V3_SB)$/i){
+ $sensors->{'volts-3.3'} = $row[$i_value];
}
- elsif ($row[$i_key] =~ /^((P_)?VBAT|CMOS Battery|BATT 3.0V)$/i) {
- $sensors{'volts-vbat'} = $row[$i_value];
+ elsif ($row[$i_key] =~ /^((P_)?VBAT|CMOS Battery|BATT 3.0V)$/i){
+ $sensors->{'volts-vbat'} = $row[$i_value];
}
# NOTE: VDimmP1ABC VDimmP1DEF
- elsif (!$sensors{'volts-dimm-p1'} && $row[$i_key] =~ /^(P1_VMEM|VDimmP1|MEM RSR A PG)/i) {
- $sensors{'volts-dimm-p1'} = $row[$i_value];
+ elsif (!$sensors->{'volts-dimm-p1'} && $row[$i_key] =~ /^(P1_VMEM|VDimmP1|MEM RSR A PG|DIMM_VR1_VOLT)/i){
+ $sensors->{'volts-dimm-p1'} = $row[$i_value];
}
- elsif (! $sensors{'volts-dimm-p2'} && $row[$i_key] =~ /^(P2_VMEM|VDimmP2|MEM RSR B PG)/i) {
- $sensors{'volts-dimm-p2'} = $row[$i_value];
+ elsif (!$sensors->{'volts-dimm-p2'} && $row[$i_key] =~ /^(P2_VMEM|VDimmP2|MEM RSR B PG|DIMM_VR2_VOLT)/i){
+ $sensors->{'volts-dimm-p2'} = $row[$i_value];
}
- elsif (!$sensors{'volts-soc-p1'} && $row[$i_key] =~ /^(P1_SOC_RUN$)/i) {
- $sensors{'volts-soc-p1'} = $row[$i_value];
+ elsif (!$sensors->{'volts-soc-p1'} && $row[$i_key] =~ /^(P1_SOC_RUN$)/i){
+ $sensors->{'volts-soc-p1'} = $row[$i_value];
}
- elsif (! $sensors{'volts-soc-p2'} && $row[$i_key] =~ /^(P2_SOC_RUN$)/i) {
- $sensors{'volts-soc-p2'} = $row[$i_value];
+ elsif (!$sensors->{'volts-soc-p2'} && $row[$i_key] =~ /^(P2_SOC_RUN$)/i){
+ $sensors->{'volts-soc-p2'} = $row[$i_value];
}
}
}
- # print Data::Dumper::Dumper \%sensors;
- %sensors = data_processor(%sensors) if %sensors;
- main::log_data('dump','ipmi: %sensors',\%sensors) if $b_log;
+ print Data::Dumper::Dumper $sensors if $dbg[31];
+ process_data($sensors) if %$sensors;
+ main::log_data('dump','ipmi: %$sensors',$sensors) if $b_log;
eval $end if $b_log;
- # print Data::Dumper::Dumper \%sensors;
- return %sensors;
+ print Data::Dumper::Dumper $sensors if $dbg[31];
+ return $sensors;
}
-sub lm_sensors_data {
+
+sub linux_sensors_data {
eval $start if $b_log;
- my (%sensors);
- my ($b_valid,$sys_fan_nu) = (0,0);
- my ($adapter,$fan_working,$temp_working,$working_unit) = ('','','','');
- @sensors_data = main::grabber(main::check_program('sensors') . " 2>/dev/null");
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/amdgpu-w-fan-speed-stretch-k10.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/peci-tin-geggo.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-w-other-biker.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-asus-chassis-1.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-devnull-1.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-jammin1.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-mx-incorrect-1.txt";
- # my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-maximus-arch-1.txt";
- # @sensors_data = main::reader($file);
- # print join ("\n", @sensors_data), "\n";
- @sensors_data = map {$_ =~ s/\s*:\s*\+?/:/;$_} @sensors_data;
- foreach (@sensors_data){
- # we get this from gpu_data()
- if (/^(amdgpu|intel|nouveau|radeon|.*hwmon)-pci/){
- $b_valid = 0;
- $adapter = '';
+ my $sensors = {};
+ my ($sys_fan_nu) = (0);
+ my ($adapter,$fan_working,$temp_working,$working_unit) = ('','','','','');
+ foreach $adapter (keys %{$sensors_raw->{'main'}}){
+ next if !$adapter || ref $sensors_raw->{'main'}{$adapter} ne 'ARRAY';
+ # not sure why hwmon is excluded, forgot to add info in comments
+ if ((@sensors_use && !(grep {/$adapter/} @sensors_use)) ||
+ (@sensors_exclude && (grep {/$adapter/} @sensors_exclude))){
next;
}
- if (/^(?:(?!amdgpu|intel|nouveau|radeon|.*hwmon).)*-(isa|pci|virtual)-/){
- $b_valid = 1;
- $adapter = $1;
- next;
- }
- next if !$b_valid;
- my @working = split /:/, $_;
- next if !$working[0] || /^Adapter/;
- #print "$working[0]:$working[1]\n";
- # There are some guesses here, but with more sensors samples it will get closer.
- # note: using arrays starting at 1 for all fan arrays to make it easier overall
- # we have to be sure we are working with the actual real string before assigning
- # data to real variables and arrays. Extracting C/F degree unit as well to use
- # when constructing temp items for array.
- # note that because of charset issues, no "°" degree sign used, but it is required
- # in testing regex to avoid error. It might be because I got that data from a forum post,
- # note directly via debugger.
- if ($_ =~ /^(AMBIENT|M\/B|MB|Motherboard|SIO|SYS).*:([0-9\.]+)[\s°]*(C|F)/i) {
- # avoid SYSTIN: 118 C
- if (main::is_numeric($2) && $2 < 90 ){
- $sensors{'mobo-temp'} = $2;
+ foreach (@{$sensors_raw->{'main'}{$adapter}}){
+ my @working = split(':', $_);
+ next if !$working[0];
+ # print "$working[0]:$working[1]\n";
+ # There are some guesses here, but with more sensors samples it will get closer.
+ # note: using arrays starting at 1 for all fan arrays to make it easier overall
+ # we have to be sure we are working with the actual real string before assigning
+ # data to real variables and arrays. Extracting C/F degree unit as well to use
+ # when constructing temp items for array.
+ # note that because of charset issues, no "°" degree sign used, but it is required
+ # in testing regex to avoid error. It might be because I got that data from a forum post,
+ # note directly via debugger.
+ if ($_ =~ /^T?(AMBIENT|M\/B|MB|Motherboard|SIO|SYS).*:([0-9\.]+)[\s°]*(C|F)/i){
+ # avoid SYSTIN: 118 C
+ if (main::is_numeric($2) && $2 < 90){
+ $sensors->{'mobo-temp'} = $2;
+ $working_unit = $3;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
+ }
+ }
+ # issue 58 msi/asus show wrong for CPUTIN so overwrite it if PECI 0 is present
+ # http://www.spinics.net/lists/lm-sensors/msg37308.html
+ # NOTE: had: ^CPU.*\+([0-9]+): but that misses: CPUTIN and anything not with + in starter
+ # However, "CPUTIN is not a reliable measurement because it measures difference to Tjmax,
+ # which is the maximum CPU temperature reported as critical temperature by coretemp"
+ # NOTE: I've seen an inexplicable case where: CPU:52.0°C fails to match with [\s°] but
+ # does match with: [\s°]*. I can't account for this, but that's why the * is there
+ # Tdie is a new k10temp-pci syntax for real cpu die temp. Tctl is cpu control value,
+ # NOT the real cpu die temp: UNLESS tctl and tdie are equal, sigh..
+ elsif ($_ =~ /^(Chip 0.*?|T?CPU.*|Tdie.*):([0-9\.]+)[\s°]*(C|F)/i){
+ $temp_working = $2;
$working_unit = $3;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
- }
- }
- # issue 58 msi/asus show wrong for CPUTIN so overwrite it if PECI 0 is present
- # http://www.spinics.net/lists/lm-sensors/msg37308.html
- # NOTE: had: ^CPU.*\+([0-9]+): but that misses: CPUTIN and anything not with + in starter
- # However, "CPUTIN is not a reliable measurement because it measures difference to Tjmax,
- # which is the maximum CPU temperature reported as critical temperature by coretemp"
- # NOTE: I've seen an inexplicable case where: CPU:52.0°C fails to match with [\s°] but
- # does match with: [\s°]*. I can't account for this, but that's why the * is there
- # Tdie is a new k10temp-pci syntax for cpu die temp
- elsif ($_ =~ /^(CPU.*|Tdie.*):([0-9\.]+)[\s°]*(C|F)/i) {
- $temp_working = $2;
- $working_unit = $3;
- if ( !$sensors{'cpu-temp'} ||
- ( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'cpu-temp'} ) ) {
- $sensors{'cpu-temp'} = $temp_working;
- }
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
- }
- elsif ($_ =~ /^PECI\sAgent\s0.*:([0-9\.]+)[\s°]*(C|F)/i) {
- $sensors{'cpu-peci-temp'} = $1;
- $working_unit = $2;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
- }
- elsif ($_ =~ /^(P\/S|Power).*:([0-9\.]+)[\s°]*(C|F)/i) {
- $sensors{'psu-temp'} = $2;
- $working_unit = $3;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
- }
- elsif ($_ =~ /^SODIMM.*:([0-9\.]+)[\s°]*(C|F)/i) {
- $sensors{'sodimm-temp'} = $1;
- $working_unit = $2;
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
- }
- # for temp1/2 only use temp1/2 if they are null or greater than the last ones
- elsif ($_ =~ /^temp1:([0-9\.]+)[\s°]*(C|F)/i) {
- $temp_working = $1;
- $working_unit = $2;
- if ( !$sensors{'temp1'} ||
- ( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp1'} ) ) {
- $sensors{'temp1'} = $temp_working;
+ if (!$sensors->{'cpu-temp'} ||
+ (defined $temp_working && $temp_working > 0 && $temp_working > $sensors->{'cpu-temp'})){
+ $sensors->{'cpu-temp'} = $temp_working;
+ }
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
- }
- elsif ($_ =~ /^temp2:([0-9\.]+)[\s°]*(C|F)/i) {
- $temp_working = $1;
- $working_unit = $2;
- if ( !$sensors{'temp2'} ||
- ( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp2'} ) ) {
- $sensors{'temp2'} = $temp_working;
+ elsif ($_ =~ /^(Tctl.*):([0-9\.]+)[\s°]*(C|F)/i){
+ $temp_working = $2;
+ $working_unit = $3;
+ if (!$sensors->{'tctl-temp'} ||
+ (defined $temp_working && $temp_working > 0 && $temp_working > $sensors->{'tctl-temp'})){
+ $sensors->{'tctl-temp'} = $temp_working;
+ }
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
- }
- # temp3 is only used as an absolute override for systems with all 3 present
- elsif ($_ =~ /^temp3:([0-9\.]+)[\s°]*(C|F)/i) {
- $temp_working = $1;
- $working_unit = $2;
- if ( !$sensors{'temp3'} ||
- ( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp3'} ) ) {
- $sensors{'temp3'} = $temp_working;
+ elsif ($_ =~ /^PECI\sAgent\s0.*:([0-9\.]+)[\s°]*(C|F)/i){
+ $sensors->{'cpu-peci-temp'} = $1;
+ $working_unit = $2;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
}
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
- }
- # final fallback if all else fails, funtoo user showed sensors putting
- # temp on wrapped second line, not handled
- elsif ($_ =~ /^(core0|core 0|Physical id 0)(.*):([0-9\.]+)[\s°]*(C|F)/i) {
- $temp_working = $3;
- $working_unit = $4;
- if ( !$sensors{'core-0-temp'} ||
- ( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'core-0-temp'} ) ) {
- $sensors{'core-0-temp'} = $temp_working;
+ elsif ($_ =~ /^T?(P\/S|Power).*:([0-9\.]+)[\s°]*(C|F)/i){
+ $sensors->{'psu-temp'} = $2;
+ $working_unit = $3;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
+ }
+ elsif ($_ =~ /^T?(dimm|mem|sodimm).*?:([0-9\.]+)[\s°]*(C|F)/i){
+ $sensors->{'sodimm-temp'} = $1;
+ $working_unit = $2;
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
+ }
+ # for temp1/2 only use temp1/2 if they are null or greater than the last ones
+ elsif ($_ =~ /^temp1:([0-9\.]+)[\s°]*(C|F)/i){
+ $temp_working = $1;
+ $working_unit = $2;
+ if (!$sensors->{'temp1'} ||
+ (defined $temp_working && $temp_working > 0 && $temp_working > $sensors->{'temp1'})){
+ $sensors->{'temp1'} = $temp_working;
+ }
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
+ }
+ elsif ($_ =~ /^temp2:([0-9\.]+)[\s°]*(C|F)/i){
+ $temp_working = $1;
+ $working_unit = $2;
+ if (!$sensors->{'temp2'} ||
+ (defined $temp_working && $temp_working > 0 && $temp_working > $sensors->{'temp2'})){
+ $sensors->{'temp2'} = $temp_working;
+ }
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
+ }
+ # temp3 is only used as an absolute override for systems with all 3 present
+ elsif ($_ =~ /^temp3:([0-9\.]+)[\s°]*(C|F)/i){
+ $temp_working = $1;
+ $working_unit = $2;
+ if (!$sensors->{'temp3'} ||
+ (defined $temp_working && $temp_working > 0 && $temp_working > $sensors->{'temp3'})){
+ $sensors->{'temp3'} = $temp_working;
+ }
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
+ }
+ # final fallback if all else fails, funtoo user showed sensors putting
+ # temp on wrapped second line, not handled
+ elsif ($_ =~ /^T?(core0|core 0|Physical id 0)(.*):([0-9\.]+)[\s°]*(C|F)/i){
+ $temp_working = $3;
+ $working_unit = $4;
+ if (!$sensors->{'core-0-temp'} ||
+ (defined $temp_working && $temp_working > 0 && $temp_working > $sensors->{'core-0-temp'})){
+ $sensors->{'core-0-temp'} = $temp_working;
+ }
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit) if $working_unit;
+ }
+ # note: can be cpu fan:, cpu fan speed:, etc.
+ elsif (!defined $sensors->{'fan-main'}->[1] && $_ =~ /^F?(CPU|Processor).*:([0-9]+)[\s]RPM/i){
+ $sensors->{'fan-main'}->[1] = $2 if $2 < $max_fan;
+ }
+ elsif (!defined $sensors->{'fan-main'}->[2] && $_ =~ /^F?(M\/B|MB|SYS|Motherboard).*:([0-9]+)[\s]RPM/i){
+ $sensors->{'fan-main'}->[2] = $2 if $2 < $max_fan;
+ }
+ elsif (!defined $sensors->{'fan-main'}->[3] && $_ =~ /F?(Power|P\/S|POWER).*:([0-9]+)[\s]RPM/i){
+ $sensors->{'fan-main'}->[3] = $2 if $2 < $max_fan;
+ }
+ elsif (!defined $sensors->{'fan-main'}->[4] && $_ =~ /F?(dimm|mem|sodimm).*:([0-9]+)[\s]RPM/i){
+ $sensors->{'fan-main'}->[4] = $2 if $2 < $max_fan;
+ }
+ # note that the counters are dynamically set for fan numbers here
+ # otherwise you could overwrite eg aux fan2 with case fan2 in theory
+ # note: cpu/mobo/ps/sodimm are 1/2/3/4
+ elsif ($_ =~ /^F?(AUX|CASE|CHASSIS|FRONT|REAR).*:([0-9]+)[\s]RPM/i){
+ next if $2 > $max_fan;
+ $temp_working = $2;
+ for (my $i = 5; $i < 30; $i++){
+ next if defined $sensors->{'fan-main'}->[$i];
+ if (!defined $sensors->{'fan-main'}->[$i]){
+ $sensors->{'fan-main'}->[$i] = $temp_working;
+ last;
+ }
+ }
+ }
+ # in rare cases syntax is like: fan1: xxx RPM
+ elsif ($_ =~ /^FAN(1)?:([0-9]+)[\s]RPM/i){
+ $sensors->{'fan-default'}->[1] = $2 if $2 < $max_fan;
+ }
+ elsif ($_ =~ /^FAN([2-9]|1[0-9]).*:([0-9]+)[\s]RPM/i){
+ next if $2 > $max_fan;
+ $fan_working = $2;
+ $sys_fan_nu = $1;
+ if ($sys_fan_nu =~ /^([0-9]+)$/){
+ # add to array if array index does not exist OR if number is > existing number
+ if (defined $sensors->{'fan-default'}->[$sys_fan_nu]){
+ if ($fan_working >= $sensors->{'fan-default'}->[$sys_fan_nu]){
+ $sensors->{'fan-default'}->[$sys_fan_nu] = $fan_working;
+ }
+ }
+ else {
+ $sensors->{'fan-default'}->[$sys_fan_nu] = $fan_working;
+ }
+ }
+ }
+ if ($extra > 0){
+ if ($_ =~ /^[+]?(12 Volt|12V|V\+?12).*:([0-9\.]+)\sV/i){
+ $sensors->{'volts-12'} = $2;
+ }
+ # note: 5VSB is a field name
+ elsif ($_ =~ /^[+]?(5 Volt|5V|V\+?5):([0-9\.]+)\sV/i){
+ $sensors->{'volts-5'} = $2;
+ }
+ elsif ($_ =~ /^[+]?(3\.3 Volt|3\.3V|V\+?3\.3).*:([0-9\.]+)\sV/i){
+ $sensors->{'volts-3.3'} = $2;
+ }
+ elsif ($_ =~ /^(Vbat).*:([0-9\.]+)\sV/i){
+ $sensors->{'volts-vbat'} = $2;
+ }
+ elsif ($_ =~ /^v(dimm|mem|sodimm).*:([0-9\.]+)\sV/i){
+ $sensors->{'volts-mem'} = $2;
+ }
}
- $sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
}
- # note: can be cpu fan:, cpu fan speed:, etc.
- elsif (!$sensors{'fan-main'}[1] && $_ =~ /^(CPU|Processor).*:([0-9]+)[\s]RPM/i) {
- $sensors{'fan-main'} = () if !$sensors{'fan-main'};
- $sensors{'fan-main'}[1] = $2;
+ }
+ foreach $adapter (keys %{$sensors_raw->{'pch'}}){
+ next if !$adapter || ref $sensors_raw->{'pch'}{$adapter} ne 'ARRAY';
+ if ((@sensors_use && !(grep {/$adapter/} @sensors_use)) ||
+ (@sensors_exclude && (grep {/$adapter/} @sensors_exclude))){
+ next;
}
- elsif (!$sensors{'fan-main'}[2] && $_ =~ /^(M\/B|MB|SYS|Motherboard).*:([0-9]+)[\s]RPM/i) {
- $sensors{'fan-main'} = () if !$sensors{'fan-main'};
- $sensors{'fan-main'}[2] = $2;
+ $temp_working = '';
+ foreach (@{$sensors_raw->{'pch'}{$adapter}}){
+ if ($_ =~ /^[^:]+:([0-9\.]+)[\s°]*(C|F)/i){
+ $temp_working = $1;
+ $working_unit = $2;
+ if (!$sensors->{'pch-temp'} ||
+ (defined $temp_working && $temp_working > 0 && $temp_working > $sensors->{'pch-temp'})){
+ $sensors->{'pch-temp'} = $temp_working;
+ }
+ if (!$sensors->{'temp-unit'} && $working_unit){
+ $sensors->{'temp-unit'} = set_temp_unit($sensors->{'temp-unit'},$working_unit);
+ }
+ }
}
- elsif (!$sensors{'fan-main'}[3] && $_ =~ /(Power|P\/S|POWER).*:([0-9]+)[\s]RPM/i) {
- $sensors{'fan-main'} = () if !$sensors{'fan-main'};
- $sensors{'fan-main'}[3] = $2;
+ }
+ print Data::Dumper::Dumper $sensors if $dbg[31];
+ process_data($sensors) if %$sensors;
+ main::log_data('dump','lm-sensors: %sensors',$sensors) if $b_log;
+ print Data::Dumper::Dumper $sensors if $dbg[31];
+ eval $end if $b_log;
+ return $sensors;
+}
+
+sub load_lm_sensors {
+ eval $start if $b_log;
+ my (@sensors_data,@values);
+ my ($adapter,$holder,$type) = ('','','');
+ if ($fake{'sensors'}){
+ # my $file;
+ # $file = "$fake_data_dir/sensors/lm-sensors/amdgpu-w-fan-speed-stretch-k10.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/peci-tin-geggo.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-w-other-biker.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-asus-chassis-1.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-devnull-1.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-jammin1.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-mx-incorrect-1.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-maximus-arch-1.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/kernel-58-sensors-ant-1.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-zenpower-nvme-2.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-pch-intel-1.txt";
+ # $file = "$fake_data_dir/sensors/slm-sensors/ensors-ppc-sr71.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-coretemp-acpitz-1.txt";
+ # $file = "$fake_data_dir/sensors/lm-sensors/sensors-applesmc-1.txt";
+ # @sensors_data = main::reader($file);
+ }
+ else {
+ # only way to get sensor array data? Unless using sensors -j, but can't assume json
+ @sensors_data = main::grabber($alerts{'sensors'}->{'path'} . ' 2>/dev/null');
+ }
+ # print join("\n", @sensors_data), "\n";
+ if (@sensors_data){
+ @sensors_data = map {$_ =~ s/\s*:\s*\+?/:/;$_} @sensors_data;
+ push(@sensors_data, 'END');
+ }
+ # print Data::Dumper::Dumper \@sensors_data;
+ foreach (@sensors_data){
+ # print 'st:', $_, "\n";
+ next if /^\s*$/;
+ $_ = main::trimmer($_);
+ if (@values && $adapter && (/^Adapter/ || $_ eq 'END')){
+ # note: drivetemp: known, but many others could exist
+ if ($adapter =~ /^(drive|nvme)/){
+ $type = 'disk';
+ }
+ elsif ($adapter =~ /^(BAT)/){
+ $type = 'bat';
+ }
+ # intel on die io controller, like southbridge/northbridge used to be
+ elsif ($adapter =~ /^(pch[_-])/){
+ $type = 'pch';
+ }
+ elsif ($adapter =~ /^(.*hwmon)-/){
+ $type = 'hwmon';
+ }
+ # ath/iwl: wifi; enp/eno/eth/i350bb: lan nic
+ elsif ($adapter =~ /^(ath|i350bb|iwl|en[op][0-9]|eth)[\S]+-/){
+ $type = 'network';
+ }
+ # put last just in case some other sensor type above had intel in name
+ elsif ($adapter =~ /^(amdgpu|intel|nouveau|radeon)-/){
+ $type = 'gpu';
+ }
+ elsif ($adapter =~ /^(acpitz)-/ && $adapter !~ /^(acpitz-virtual)-/ ){
+ $type = 'acpitz';
+ }
+ else {
+ $type = 'main';
+ }
+ $sensors_raw->{$type}{$adapter} = [@values];
+ @values = ();
+ $adapter = '';
}
- elsif (!$sensors{'fan-main'}[4] && $_ =~ /(SODIMM).*:([0-9]+)[\s]RPM/i) {
- $sensors{'fan-main'} = () if !$sensors{'fan-main'};
- $sensors{'fan-main'}[4] = $2;
+ if (/^Adapter/){
+ $adapter = $holder;
}
- # note that the counters are dynamically set for fan numbers here
- # otherwise you could overwrite eg aux fan2 with case fan2 in theory
- # note: cpu/mobo/ps/sodimm are 1/2/3/4
- elsif ($_ =~ /^(AUX|CASE|CHASSIS).*:([0-9]+)[\s]RPM/i) {
- $temp_working = $2;
- $sensors{'fan-main'} = () if !$sensors{'fan-main'};
- for ( my $i = 5; $i < 30; $i++ ){
- next if defined $sensors{'fan-main'}[$i];
- if ( !defined $sensors{'fan-main'}[$i] ){
- $sensors{'fan-main'}[$i] = $temp_working;
- last;
- }
- }
+ elsif (/\S:\S/){
+ push(@values, $_);
}
- # in rare cases syntax is like: fan1: xxx RPM
- elsif ($_ =~ /^FAN(1)?:([0-9]+)[\s]RPM/i) {
- $sensors{'fan-default'} = () if !$sensors{'fan-default'};
- $sensors{'fan-default'}[1] = $2;
+ else {
+ $holder = $_;
+ }
+ }
+ print 'lm sensors: ' , Data::Dumper::Dumper $sensors_raw if $dbg[18];
+ main::log_data('dump','lm-sensors data: %$sensors_raw',$sensors_raw) if $b_log;
+ eval $end if $b_log;
+}
+
+sub load_sys_data {
+ eval $start if $b_log;
+ my ($device,$mon,$name,$label,$unit,$value,@values,%hwmons);
+ my ($j,$holder,$sensor,$type) = (0,'','','');
+ my $glob = '/sys/class/hwmon/hwmon*/';
+ $glob .= '{name,device,{curr,fan,in,power,temp}*_{input,label}}';
+ my @hwmon = main::globber($glob);
+ # print Data::Dumper::Dumper \@sensors_data;
+ @hwmon = sort @hwmon;
+ push(@hwmon,'END');
+ foreach my $item (@hwmon){
+ next if ! -e $item;
+ $item =~ m|/sys/class/hwmon/(hwmon\d+)/|;
+ $mon = $1;
+ $mon =~ s/hwmon(\d)$/hwmon0$1/ if $mon =~ /hwmon\d$/;
+ # if it's a new hwmon, dump all previous data to avoid carry-over
+ if (!defined $hwmons{$mon}){
+ $sensor = '';
+ $holder = '';
+ $j = 0;
+ }
+ if ($item =~ m/([^\/]+)_input$/){
+ $sensor = $1;
+ $value = main::reader($item,'strip',0);;
+ }
+ # add the label to the just created _input item, if valid
+ elsif ($item =~ m/([^\/]+)_label$/){
+ print "3: mon: $mon id: $sensor holder: $holder file: $item\n" if $dbg[51];
+ # if this doesn't match, something unexpected happened, like no _input for
+ # _label item. Seen that, real.
+ next if !$holder || $1 ne $holder;
+ if (defined $hwmons{$mon}->{'sensors'}[$j]{'id'}){
+ $sensor = $1;
+ $hwmons{$mon}->{'sensors'}[$j]{'label'} = main::reader($item,'strip',0);
+ }
+ }
+ if ($sensor && ($sensor ne $holder || $item eq 'END')){
+ print "2: mon: $mon id: $sensor holder: $holder file: $item\n" if $dbg[51];
+ # add the item, we'll add label after if it's located since it will be next
+ # in loop due to sort order.
+ if ($value){
+ push(@{$hwmons{$mon}->{'sensors'}},{
+ 'id' => $sensor,
+ 'value' => $value,
+ });
+ $j = $#{$hwmons{$mon}->{'sensors'}};
+ }
+ $holder = $sensor;
+ ($sensor,$value) = ('',undef,undef);
}
- elsif ($_ =~ /^FAN([2-9]|1[0-9]).*:([0-9]+)[\s]RPM/i) {
- $fan_working = $2;
- $sys_fan_nu = $1;
- $sensors{'fan-default'} = () if !$sensors{'fan-default'};
- if ( $sys_fan_nu =~ /^([0-9]+)$/ ) {
- # add to array if array index does not exist OR if number is > existing number
- if ( defined $sensors{'fan-default'}[$sys_fan_nu] ) {
- if ( $fan_working >= $sensors{'fan-default'}[$sys_fan_nu] ) {
- $sensors{'fan-default'}[$sys_fan_nu] = $fan_working;
+ print "1: mon: $mon id: $sensor holder: $holder file: $item\n" if $dbg[51];
+ # print "$item\n";
+ if ($item =~ /name$/){
+ $name = main::reader($item,'strip',0);
+ if ($name =~ /^(drive|nvme)/){
+ $type = 'disk';
+ }
+ elsif ($name =~ /^(BAT)/i){
+ $type = 'bat';
+ }
+ # intel on die io controller, like southbridge/northbridge used to be
+ elsif ($name =~ /^(pch)/){
+ $type = 'pch';
+ }
+ elsif ($name =~ /^(.*hwmon)/){
+ $type = 'hwmon';
+ }
+ # ath/iwl: wifi; enp/eno/eth/i350bb: lan nic
+ elsif ($name =~ /^(ath|i350|iwl|en[op][0-9]|eth)[\S]/){
+ $type = 'network';
+ }
+ # put last just in case some other sensor type above had intel in name
+ elsif ($name =~ /^(amdgpu|intel|nouveau|radeon)/){
+ $type = 'gpu';
+ }
+ # not confirmed in /sys that name will be acpitz-virtual, verify
+ elsif ($name =~ /^(acpitz)/ && $name !~ /^(acpitz-virtual)/ ){
+ $type = 'acpitz';
+ }
+ else {
+ $type = 'main';
+ }
+ $hwmons{$mon}->{'name'} = $name;
+ $hwmons{$mon}->{'type'} = $type;
+ }
+ elsif ($item =~ /device$/){
+ $device = readlink($item);
+ print "device: $device\n" if $dbg[51];
+ $device =~ s|^.*/||;
+ $hwmons{$mon}->{'device'} = $device;
+ }
+ }
+ print '/sys/class/hwmon raw: ', Data::Dumper::Dumper \%hwmons if $dbg[18];
+ main::log_data('dump','/sys data raw: %hwmons',\%hwmons) if $b_log;
+ # $sensors_raw->{$type}{$adapter} = [@values];
+ foreach my $hwmon (sort keys %hwmons){
+ my $adapter = $hwmons{$hwmon}->{'name'};
+ $hwmons{$hwmon}->{'device'} =~ s/^0000://;
+ $adapter .= '-' . $hwmons{$hwmon}->{'device'};
+ ($unit,$value,@values) = ();
+ foreach my $item (@{$hwmons{$hwmon}->{'sensors'}}){
+ next if !defined $item->{'id'};
+ my $name = ($item->{'label'}) ? $item->{'label'}: $item->{'id'};
+ if ($item->{'id'} =~ /^temp/){
+ $unit = 'C';
+ $value = sprintf('%0.1f',$item->{'value'}/1000);
+ }
+ elsif ($item->{'id'} =~ /^fan/){
+ $unit = 'rpm';
+ $value = $item->{'value'};
+ }
+ # note: many sensors require further math on value, so these will be wrong
+ # in many cases since this is not running the math on the results like
+ # lm-sensors will do if sensors are detected and loaded and configured.
+ elsif ($item->{'id'} =~ /^in\d/){
+ if ($item->{'value'} >= 1000){
+ $unit = 'V';
+ $value = sprintf('%0.2f',$item->{'value'}/1000) + 0;
+ if ($hwmons{$hwmon}->{'type'} eq 'main' && $name =~ /^in\d/){
+ if ($value >= 10 && $value <= 14){
+ $name = '12V';
+ }
+ elsif ($value >= 4 && $value <= 6){
+ $name = '5V';
+ }
+ # vbat can be 3, 3.3, but so can 3.3V board
}
}
else {
- $sensors{'fan-default'}[$sys_fan_nu] = $fan_working;
+ $unit = 'mV';
+ $value = $item->{'value'};
}
}
- }
- if ($extra > 0){
- if ($_ =~ /^[+]?(12 Volt|12V).*:([0-9\.]+)\sV/i) {
- $sensors{'volts-12'} = $2;
- }
- # note: 5VSB is a field name
- elsif ($_ =~ /^[+]?(5 Volt|5V):([0-9\.]+)\sV/i) {
- $sensors{'volts-5'} = $2;
- }
- elsif ($_ =~ /^[+]?(3\.3 Volt|3\.3V).*:([0-9\.]+)\sV/i) {
- $sensors{'volts-3.3'} = $2;
+ elsif ($item->{'id'} =~ /^power/){
+ $unit = 'W';
+ $value = sprintf('%0.1f',$item->{'value'}/1000);
}
- elsif ($_ =~ /^(Vbat).*:([0-9\.]+)\sV/i) {
- $sensors{'volts-vbat'} = $2;
+ if (defined $value && defined $unit){
+ my $string = $name . ':' . $value . " $unit";
+ push(@values,$string);
}
}
+ # if ($hwmons{$hwmon}->{'type'} eq 'acpitz' && $hwmons{$hwmon}->{'device'}){
+ # my $tz ='/sys/class/thermal/' . $hwmons{$hwmon}->{'device'} . '/type';
+ # if (-e $tz){
+ # my $tz_type = main::reader($tz,'strip',0),"\n";
+ # }
+ # }
+ if (@values){
+ $sensors_raw->{$hwmons{$hwmon}->{'type'}}{$adapter} = [@values];
+ }
}
- # print Data::Dumper::Dumper \%sensors;
- %sensors = data_processor(%sensors) if %sensors;
- main::log_data('dump','lm-sensors: %sensors',\%sensors) if $b_log;
- # print Data::Dumper::Dumper \%sensors;
+ print '/sys/class/hwmon processed: ' , Data::Dumper::Dumper $sensors_raw if $dbg[18];
+ main::log_data('dump','/sys data: %$sensors_raw',$sensors_raw) if $b_log;
eval $end if $b_log;
- return %sensors;
}
-# oddly, openbsd sysctl actually has hw.sensors data!
+# bsds sysctl may have hw.sensors data
sub sysctl_data {
eval $start if $b_log;
- my (@data,%sensors);
- foreach (@sysctl_sensors){
- if (/^hw.sensors\.([0-9a-z]+)\.(temp|fan|volt)([0-9])/){
- my $sensor = $1;
- my $type = $2;
- my $number = $3;
- my @working = split /:/, $_;
+ my (@data);
+ my $sensors = {};
+ # assume always starts at 0, can't do dynamic because freebsd shows tz1 first
+ my $add = 1;
+ print Data::Dumper::Dumper $sysctl{'sensor'} if $dbg[18];;
+ foreach (@{$sysctl{'sensor'}}){
+ my ($sensor,$type,$number,$value);
+ if (/^hw\.sensors\.([a-z]+)([0-9]+)\.(cpu|temp|fan|volt)([0-9])/){
+ $sensor = $1;
+ $type = $3;
+ $number = $4;
+ # hw.sensors.cpu0.temp0:47.00 degC
+ # hw.sensors.acpitz0.temp0:43.00 degC
+ $type = 'cpu' if $sensor eq 'cpu';
+ }
+ elsif (/^hw\.sensors\.(acpi)\.(thermal)\.(tz)([0-9]+)\.(temperature)/){
+ $sensor = $1 . $3; # eg acpitz
+ $type = ($5 eq 'temperature') ? 'temp': $5;
+ $number = $4;
+ }
+ elsif (/^dev\.(cpu)\.([0-9]+)\.(temperature)/){
+ $sensor = $1;
+ $type = $3;
+ $number = $2;
+ $type = 'cpu' if $sensor eq 'cpu';
+ }
+ if ($sensor && $type){
+ if ($sensor && ((@sensors_use && !(grep {/$sensor/} @sensors_use)) ||
+ (@sensors_exclude && (grep {/$sensor/} @sensors_exclude)))){
+ next;
+ }
+ my $working = (split(':\s*', $_))[1];
+ if (defined $working && $working =~ /^([0-9\.]+)\s?((deg)?([CF]))?\b/){
+ $value = $1 ;
+ $sensors->{'temp-unit'} = $4 if $4 && !$sensors->{'temp-unit'};
+ }
+ else {
+ next;
+ }
+ $number += $add;
+ if ($type eq 'cpu' && !defined $sensors->{'cpu-temp'}){
+ $sensors->{'cpu-temp'} = $value;
+ }
+ elsif ($type eq 'temp' && !defined $sensors->{'temp' . $number}){
+ $sensors->{'temp' . $number} = $value;
+ }
+ elsif ($type eq 'fan' && !defined $sensors->{'fan-main'}->[$number]){
+ $sensors->{'fan-main'}->[$number] = $value if $value < $max_fan;
+ }
+ elsif ($type eq 'volt'){
+ if ($working =~ /\+3\.3V/i){
+ $sensors->{'volts-3.3'} = $value;
+ }
+ elsif ($working =~ /\+5V/i){
+ $sensors->{'volts-5'} = $value;
+ }
+ elsif ($working =~ /\+12V/i){
+ $sensors->{'volts-12'} = $value;
+ }
+ elsif ($working =~ /VBAT/i){
+ $sensors->{'volts-vbat'} = $value;
+ }
+ }
}
- last if /^(hw.cpuspeed|hw.vendor|hw.physmem)/;
}
- %sensors = data_processor(%sensors) if %sensors;
- main::log_data('dump','%sensors',\%sensors) if $b_log;
- # print Data::Dumper::Dumper \%sensors;
+ process_data($sensors) if %$sensors;
+ main::log_data('dump','%$sensors',$sensors) if $b_log;
+ print Data::Dumper::Dumper $sensors if $dbg[31];;
eval $end if $b_log;
- return %sensors;
+ return $sensors;
}
+
sub set_temp_unit {
my ($sensors,$working) = @_;
my $return_unit = '';
-
- if ( !$sensors && $working ){
+ if (!$sensors && $working){
$return_unit = $working;
}
elsif ($sensors){
@@ -16176,35 +27109,39 @@ sub set_temp_unit {
return $return_unit;
}
-sub data_processor {
+sub process_data {
eval $start if $b_log;
- my (%sensors) = @_;
- my ($cpu_temp,$cpu2_temp,$cpu3_temp,$cpu4_temp,$index_count_fan_default,
- $index_count_fan_main,$mobo_temp,$psu_temp) = (0,0,0,0,0,0,0,0);
- my ($fan_type,$i,$j) = (0,0,0);
+ my ($sensors) = @_;
+ my ($cpu_temp,$cpu2_temp,$cpu3_temp,$cpu4_temp,$mobo_temp,$pch_temp,$psu_temp);
+ my ($fan_type,$i,$j,$index_count_fan_default,$index_count_fan_main) = (0,0,0,0,0);
my $temp_diff = 20; # for C, handled for F after that is determined
my (@fan_main,@fan_default);
+ # kernel/sensors only show Tctl if Tctl == Tdie temp, sigh...
+ if (!$sensors->{'cpu-temp'} && $sensors->{'tctl-temp'}){
+ $sensors->{'cpu-temp'} = $sensors->{'tctl-temp'};
+ undef $sensors->{'tctl-temp'};
+ }
# first we need to handle the case where we have to determine which temp/fan to use for cpu and mobo:
# note, for rare cases of weird cool cpus, user can override in their prefs and force the assignment
# this is wrong for systems with > 2 tempX readings, but the logic is too complex with 3 variables
# so have to accept that it will be wrong in some cases, particularly for motherboard temp readings.
- if ( $sensors{'temp1'} && $sensors{'temp2'} ){
- if ( $sensors_cpu_nu ) {
+ if ($sensors->{'temp1'} && $sensors->{'temp2'}){
+ if ($sensors_cpu_nu){
$fan_type = $sensors_cpu_nu;
}
else {
# first some fringe cases with cooler cpu than mobo: assume which is cpu temp based on fan speed
# but only if other fan speed is 0.
- if ( $sensors{'temp1'} >= $sensors{'temp2'} &&
- defined $fan_default[1] && defined $fan_default[2] && $fan_default[1] == 0 && $fan_default[2] > 0 ) {
+ if ($sensors->{'temp1'} >= $sensors->{'temp2'} &&
+ defined $fan_default[1] && defined $fan_default[2] && $fan_default[1] == 0 && $fan_default[2] > 0){
$fan_type = 2;
}
- elsif ( $sensors{'temp2'} >= $sensors{'temp1'} &&
- defined $fan_default[1] && defined $fan_default[2] && $fan_default[2] == 0 && $fan_default[1] > 0 ) {
+ elsif ($sensors->{'temp2'} >= $sensors->{'temp1'} &&
+ defined $fan_default[1] && defined $fan_default[2] && $fan_default[2] == 0 && $fan_default[1] > 0){
$fan_type = 1;
}
# then handle the standard case if these fringe cases are false
- elsif ( $sensors{'temp1'} >= $sensors{'temp2'} ) {
+ elsif ($sensors->{'temp1'} >= $sensors->{'temp2'}){
$fan_type = 1;
}
else {
@@ -16213,128 +27150,135 @@ sub data_processor {
}
}
# need a case for no temps at all reported, like with old intels
- elsif ( !$sensors{'temp2'} && !$sensors{'cpu-temp'} ){
- if ( !$sensors{'temp1'} && !$sensors{'mobo-temp'} ){
+ elsif (!$sensors->{'temp2'} && !$sensors->{'cpu-temp'}){
+ if (!$sensors->{'temp1'} && !$sensors->{'mobo-temp'}){
$fan_type = 1;
}
- elsif ( $sensors{'temp1'} && !$sensors{'mobo-temp'} ){
+ elsif ($sensors->{'temp1'} && !$sensors->{'mobo-temp'}){
$fan_type = 1;
}
- elsif ( $sensors{'temp1'} && $sensors{'mobo-temp'} ){
+ elsif ($sensors->{'temp1'} && $sensors->{'mobo-temp'}){
$fan_type = 1;
}
}
# convert the diff number for F, it needs to be bigger that is
- if ( $sensors{'temp-unit'} && $sensors{'temp-unit'} eq "F" ) {
+ if ($sensors->{'temp-unit'} && $sensors->{'temp-unit'} eq "F"){
$temp_diff = $temp_diff * 1.8
}
- if ( $sensors{'cpu-temp'} ) {
+ if ($sensors->{'cpu-temp'}){
# specific hack to handle broken CPUTIN temps with PECI
- if ( $sensors{'cpu-peci-temp'} && ( $sensors{'cpu-temp'} - $sensors{'cpu-peci-temp'} ) > $temp_diff ){
- $cpu_temp = $sensors{'cpu-peci-temp'};
+ if ($sensors->{'cpu-peci-temp'} && ($sensors->{'cpu-temp'} - $sensors->{'cpu-peci-temp'}) > $temp_diff){
+ $cpu_temp = $sensors->{'cpu-peci-temp'};
}
# then get the real cpu temp, best guess is hottest is real, though only within narrowed diff range
else {
- $cpu_temp = $sensors{'cpu-temp'};
+ $cpu_temp = $sensors->{'cpu-temp'};
}
}
else {
- if ($fan_type ){
+ if ($fan_type){
# there are some weird scenarios
- if ( $fan_type == 1 ){
- if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp2'} > $sensors{'temp1'} ) {
- $cpu_temp = $sensors{'temp2'};
+ if ($fan_type == 1){
+ if ($sensors->{'temp1'} && $sensors->{'temp2'} && $sensors->{'temp2'} > $sensors->{'temp1'}){
+ $cpu_temp = $sensors->{'temp2'};
}
else {
- $cpu_temp = $sensors{'temp1'};
+ $cpu_temp = $sensors->{'temp1'};
}
}
else {
- if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp1'} > $sensors{'temp2'} ) {
- $cpu_temp = $sensors{'temp1'};
+ if ($sensors->{'temp1'} && $sensors->{'temp2'} && $sensors->{'temp1'} > $sensors->{'temp2'}){
+ $cpu_temp = $sensors->{'temp1'};
}
else {
- $cpu_temp = $sensors{'temp2'};
+ $cpu_temp = $sensors->{'temp2'};
}
}
}
else {
- $cpu_temp = $sensors{'temp1'}; # can be null, that is ok
+ $cpu_temp = $sensors->{'temp1'}; # can be null, that is ok
}
- if ( $cpu_temp ) {
- # using $sensors{'temp3'} is just not reliable enough, more errors caused than fixed imo
- #if ( $sensors{'temp3'} && $sensors{'temp3'} > $cpu_temp ) {
- # $cpu_temp = $sensors{'temp3'};
- #}
- # there are some absurdly wrong $sensors{'temp1'}: acpitz-virtual-0 $sensors{'temp1'}: +13.8°C
- if ( $sensors{'core-0-temp'} && ($sensors{'core-0-temp'} - $cpu_temp) > $temp_diff ) {
- $cpu_temp = $sensors{'core-0-temp'};
+ if ($cpu_temp){
+ # using $sensors->{'temp3'} is just not reliable enough, more errors caused than fixed imo
+ # if ($sensors->{'temp3'} && $sensors->{'temp3'} > $cpu_temp){
+ # $cpu_temp = $sensors->{'temp3'};
+ # }
+ # there are some absurdly wrong $sensors->{'temp1'}: acpitz-virtual-0 $sensors->{'temp1'}: +13.8°C
+ if ($sensors->{'core-0-temp'} && ($sensors->{'core-0-temp'} - $cpu_temp) > $temp_diff){
+ $cpu_temp = $sensors->{'core-0-temp'};
}
}
}
# if all else fails, use core0/peci temp if present and cpu is null
- if ( !$cpu_temp ) {
- if ( $sensors{'core-0-temp'} ) {
- $cpu_temp = $sensors{'core-0-temp'};
+ if (!$cpu_temp){
+ if ($sensors->{'core-0-temp'}){
+ $cpu_temp = $sensors->{'core-0-temp'};
}
# note that peci temp is known to be colder than the actual system
# sometimes so it is the last fallback we want to use even though in theory
# it is more accurate, but fact suggests theory wrong.
- elsif ( $sensors{'cpu-peci-temp'} ) {
- $cpu_temp = $sensors{'cpu-peci-temp'};
+ elsif ($sensors->{'cpu-peci-temp'}){
+ $cpu_temp = $sensors->{'cpu-peci-temp'};
}
}
# then the real mobo temp
- if ( $sensors{'mobo-temp'} ){
- $mobo_temp = $sensors{'mobo-temp'};
+ if ($sensors->{'mobo-temp'}){
+ $mobo_temp = $sensors->{'mobo-temp'};
}
- elsif ( $fan_type ){
- if ( $fan_type == 1 ) {
- if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp2'} > $sensors{'temp1'} ) {
- $mobo_temp = $sensors{'temp1'};
+ elsif ($fan_type){
+ if ($fan_type == 1){
+ if ($sensors->{'temp1'} && $sensors->{'temp2'} && $sensors->{'temp2'} > $sensors->{'temp1'}){
+ $mobo_temp = $sensors->{'temp1'};
}
else {
- $mobo_temp = $sensors{'temp2'};
+ $mobo_temp = $sensors->{'temp2'};
}
}
else {
- if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp1'} > $sensors{'temp2'} ) {
- $mobo_temp = $sensors{'temp2'};
+ if ($sensors->{'temp1'} && $sensors->{'temp2'} && $sensors->{'temp1'} > $sensors->{'temp2'}){
+ $mobo_temp = $sensors->{'temp2'};
}
else {
- $mobo_temp = $sensors{'temp1'};
+ $mobo_temp = $sensors->{'temp1'};
}
}
- ## NOTE: not safe to assume $sensors{'temp3'} is the mobo temp, sad to say
- #if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp3'} && $sensors{'temp3'} < $mobo_temp ) {
- # $mobo_temp = $sensors{'temp3'};
- #}
+ ## NOTE: not safe to assume $sensors->{'temp3'} is the mobo temp, sad to say
+ # if ($sensors->{'temp1'} && $sensors->{'temp2'} && $sensors->{'temp3'} && $sensors->{'temp3'} < $mobo_temp){
+ # $mobo_temp = $sensors->{'temp3'};
+ # }
}
+ # in case with cpu-temp AND temp1 and not temp 2, or temp 2 only, fan type: 0
else {
- $mobo_temp = $sensors{'temp2'};
+ if ($sensors->{'cpu-temp'} && $sensors->{'temp1'} &&
+ $sensors->{'cpu-temp'} > $sensors->{'temp1'}){
+ $mobo_temp = $sensors->{'temp1'};
+ }
+ elsif ($sensors->{'temp2'}){
+ $mobo_temp = $sensors->{'temp2'};
+ }
}
- @fan_main = @{$sensors{'fan-main'}} if $sensors{'fan-main'};
+ @fan_main = @{$sensors->{'fan-main'}} if $sensors->{'fan-main'};
$index_count_fan_main = (@fan_main) ? scalar @fan_main : 0;
- @fan_default = @{$sensors{'fan-default'}} if $sensors{'fan-default'};
+ @fan_default = @{$sensors->{'fan-default'}} if $sensors->{'fan-default'};
$index_count_fan_default = (@fan_default) ? scalar @fan_default : 0;
# then set the cpu fan speed
- if ( ! $fan_main[1] ) {
+ if (!$fan_main[1]){
# note, you cannot test for $fan_default[1] or [2] != ""
# because that creates an array item in gawk just by the test itself
- if ( $fan_type == 1 && defined $fan_default[1] ) {
+ if ($fan_type == 1 && defined $fan_default[1]){
$fan_main[1] = $fan_default[1];
$fan_default[1] = undef;
}
- elsif ( $fan_type == 2 && defined $fan_default[2] ) {
+ elsif ($fan_type == 2 && defined $fan_default[2]){
$fan_main[1] = $fan_default[2];
$fan_default[2] = undef;
}
}
# clear out any duplicates. Primary fan real trumps fan working always if same speed
- for ($i = 1; $i <= $index_count_fan_main; $i++) {
- if ( defined $fan_main[$i] && $fan_main[$i] ) {
- for ($j = 1; $j <= $index_count_fan_default; $j++) {
- if ( defined $fan_default[$j] && $fan_main[$i] == $fan_default[$j] ) {
+ for ($i = 1; $i <= $index_count_fan_main; $i++){
+ if (defined $fan_main[$i] && $fan_main[$i]){
+ for ($j = 1; $j <= $index_count_fan_default; $j++){
+ if (defined $fan_default[$j] && $fan_main[$i] == $fan_default[$j]){
$fan_default[$j] = undef;
}
}
@@ -16348,54 +27292,56 @@ sub data_processor {
# shows the proper value, so the corruption might be internal in awk.
# Note: gensub is the culprit I think, assigning type string for range 501-1000 but
# type integer for all others, this triggers true for >
- for ($j = 1; $j <= $index_count_fan_default; $j++) {
- if ( defined $fan_default[$j] && $fan_default[$j] > 5000 && !$fan_main[2] ) {
+ for ($j = 1; $j <= $index_count_fan_default; $j++){
+ if (defined $fan_default[$j] && $fan_default[$j] > 5000 && !$fan_main[2]){
$fan_main[2] = $fan_default[$j];
- $fan_default[$j] = '';
+ $fan_default[$j] = undef;
# then add one if required for output
- if ( $index_count_fan_main < 2 ) {
+ if ($index_count_fan_main < 2){
$index_count_fan_main = 2;
}
}
}
# if they are ALL null, print error message. psFan is not used in output currently
- if ( !$cpu_temp && !$mobo_temp && !$fan_main[1] && !$fan_main[2] && !$fan_main[1] && !@fan_default ) {
- %sensors = ();
+ if (!$cpu_temp && !$mobo_temp && !$fan_main[1] && !$fan_main[2] && !$fan_main[1] && !@fan_default){
+ %$sensors = ();
}
else {
my ($ambient_temp,$psu_fan,$psu1_fan,$psu2_fan,$psu_temp,$sodimm_temp,
$v_12,$v_5,$v_3_3,$v_dimm_p1,$v_dimm_p2,$v_soc_p1,$v_soc_p2,$v_vbat);
- $psu_temp = $sensors{'psu-temp'} if $sensors{'psu-temp'};
+ $psu_temp = $sensors->{'psu-temp'} if $sensors->{'psu-temp'};
# sodimm fan is fan_main[4]
- $sodimm_temp = $sensors{'sodimm-temp'} if $sensors{'sodimm-temp'};
- $cpu2_temp = $sensors{'cpu2-temp'} if $sensors{'cpu2-temp'};
- $cpu3_temp = $sensors{'cpu3-temp'} if $sensors{'cpu3-temp'};
- $cpu4_temp = $sensors{'cpu4-temp'} if $sensors{'cpu4-temp'};
- $ambient_temp = $sensors{'ambient-temp'} if $sensors{'ambient-temp'};
- $psu_fan = $sensors{'fan-psu'} if $sensors{'fan-psu'};
- $psu1_fan = $sensors{'fan-psu-1'} if $sensors{'fan-psu-1'};
- $psu2_fan = $sensors{'fan-psu-2'} if $sensors{'fan-psu-2'};
+ $sodimm_temp = $sensors->{'sodimm-temp'} if $sensors->{'sodimm-temp'};
+ $cpu2_temp = $sensors->{'cpu2-temp'} if $sensors->{'cpu2-temp'};
+ $cpu3_temp = $sensors->{'cpu3-temp'} if $sensors->{'cpu3-temp'};
+ $cpu4_temp = $sensors->{'cpu4-temp'} if $sensors->{'cpu4-temp'};
+ $ambient_temp = $sensors->{'ambient-temp'} if $sensors->{'ambient-temp'};
+ $pch_temp = $sensors->{'pch-temp'} if $sensors->{'pch-temp'};
+ $psu_fan = $sensors->{'fan-psu'} if $sensors->{'fan-psu'};
+ $psu1_fan = $sensors->{'fan-psu-1'} if $sensors->{'fan-psu-1'};
+ $psu2_fan = $sensors->{'fan-psu-2'} if $sensors->{'fan-psu-2'};
# so far only for ipmi, sensors data is junk for volts
- if ($extra > 0 &&
- ($sensors{'volts-12'} || $sensors{'volts-5'} || $sensors{'volts-3.3'} || $sensors{'volts-vbat'}) ){
- $v_12 = $sensors{'volts-12'} if $sensors{'volts-12'};
- $v_5 = $sensors{'volts-5'} if $sensors{'volts-5'};
- $v_3_3 = $sensors{'volts-3.3'} if $sensors{'volts-3.3'};
- $v_vbat = $sensors{'volts-vbat'} if $sensors{'volts-vbat'};
- $v_dimm_p1 = $sensors{'volts-dimm-p1'} if $sensors{'volts-dimm-p1'};
- $v_dimm_p2 = $sensors{'volts-dimm-p2'} if $sensors{'volts-dimm-p2'};
- $v_soc_p1 = $sensors{'volts-soc-p1'} if $sensors{'volts-soc-p1'};
- $v_soc_p2 = $sensors{'volts-soc-p2'} if $sensors{'volts-soc-p2'};
- }
- %sensors = (
+ if ($extra > 0 && ($sensors->{'volts-12'} || $sensors->{'volts-5'} ||
+ $sensors->{'volts-3.3'} || $sensors->{'volts-vbat'})){
+ $v_12 = $sensors->{'volts-12'} if $sensors->{'volts-12'};
+ $v_5 = $sensors->{'volts-5'} if $sensors->{'volts-5'};
+ $v_3_3 = $sensors->{'volts-3.3'} if $sensors->{'volts-3.3'};
+ $v_vbat = $sensors->{'volts-vbat'} if $sensors->{'volts-vbat'};
+ $v_dimm_p1 = $sensors->{'volts-dimm-p1'} if $sensors->{'volts-dimm-p1'};
+ $v_dimm_p2 = $sensors->{'volts-dimm-p2'} if $sensors->{'volts-dimm-p2'};
+ $v_soc_p1 = $sensors->{'volts-soc-p1'} if $sensors->{'volts-soc-p1'};
+ $v_soc_p2 = $sensors->{'volts-soc-p2'} if $sensors->{'volts-soc-p2'};
+ }
+ %$sensors = (
'ambient-temp' => $ambient_temp,
'cpu-temp' => $cpu_temp,
'cpu2-temp' => $cpu2_temp,
'cpu3-temp' => $cpu3_temp,
'cpu4-temp' => $cpu4_temp,
'mobo-temp' => $mobo_temp,
+ 'pch-temp' => $pch_temp,
'psu-temp' => $psu_temp,
- 'temp-unit' => $sensors{'temp-unit'},
+ 'temp-unit' => $sensors->{'temp-unit'},
'fan-main' => \@fan_main,
'fan-default' => \@fan_default,
'fan-psu' => $psu_fan,
@@ -16403,37 +27349,37 @@ sub data_processor {
'fan-psu2' => $psu2_fan,
);
if ($psu_temp){
- $sensors{'psu-temp'} = $psu_temp;
+ $sensors->{'psu-temp'} = $psu_temp;
}
if ($sodimm_temp){
- $sensors{'sodimm-temp'} = $sodimm_temp;
+ $sensors->{'sodimm-temp'} = $sodimm_temp;
}
- if ($extra > 0 && ($v_12 || $v_5 || $v_3_3 || $v_vbat) ){
- $sensors{'volts-12'} = $v_12;
- $sensors{'volts-5'} = $v_5;
- $sensors{'volts-3.3'} = $v_3_3;
- $sensors{'volts-vbat'} = $v_vbat;
- $sensors{'volts-dimm-p1'} = $v_dimm_p1;
- $sensors{'volts-dimm-p2'} = $v_dimm_p2;
- $sensors{'volts-soc-p1'} = $v_soc_p1;
- $sensors{'volts-soc-p2'} = $v_soc_p2;
+ if ($extra > 0 && ($v_12 || $v_5 || $v_3_3 || $v_vbat)){
+ $sensors->{'volts-12'} = $v_12;
+ $sensors->{'volts-5'} = $v_5;
+ $sensors->{'volts-3.3'} = $v_3_3;
+ $sensors->{'volts-vbat'} = $v_vbat;
+ $sensors->{'volts-dimm-p1'} = $v_dimm_p1;
+ $sensors->{'volts-dimm-p2'} = $v_dimm_p2;
+ $sensors->{'volts-soc-p1'} = $v_soc_p1;
+ $sensors->{'volts-soc-p2'} = $v_soc_p2;
}
}
eval $end if $b_log;
- return %sensors;
}
-sub gpu_data {
+
+sub gpu_sensor_data {
eval $start if $b_log;
- return @gpudata if $b_gpudata;
my ($cmd,@data,@data2,$path,@screens,$temp);
- my ($j) = (0);
+ my $j = 0;
+ $loaded{'gpu-data'} = 1;
if ($path = main::check_program('nvidia-settings')){
# first get the number of screens. This only work if you are in X
- if ($b_display) {
+ if ($b_display){
@data = main::grabber("$path -q screens 2>/dev/null");
foreach (@data){
- if ( /(:[0-9]\.[0-9])/ ) {
- push @screens, $1;
+ if (/(:[0-9]\.[0-9])/){
+ push(@screens, $1);
}
}
}
@@ -16465,33 +27411,32 @@ sub gpu_data {
$cmd = "$path -c $screen2 $cmd 2>/dev/null";
@data = main::grabber($cmd);
main::log_data('cmd',$cmd) if $b_log;
- @data = (@data,@data2);
- $j = scalar @gpudata;
- $gpudata[$j] = ({});
+ push(@data,@data2);
+ $j = scalar @$gpu_data;
foreach my $item (@data){
if ($item =~ /^\s*Attribute\s\'([^']+)\'\s.*:\s*([\S]+)\.$/){
my $attribute = $1;
my $value = $2;
- $gpudata[$j]{'type'} = 'nvidia';
- $gpudata[$j]{'speed-unit'} = '%';
- $gpudata[$j]{'screen'} = $screen;
- if (!$gpudata[$j]{'temp'} && $attribute eq 'GPUCoreTemp'){
- $gpudata[$j]{'temp'} = $value;
+ $gpu_data->[$j]{'type'} = 'nvidia';
+ $gpu_data->[$j]{'speed-unit'} = '%';
+ $gpu_data->[$j]{'screen'} = $screen;
+ if (!$gpu_data->[$j]{'temp'} && $attribute eq 'GPUCoreTemp'){
+ $gpu_data->[$j]{'temp'} = $value;
}
- elsif (!$gpudata[$j]{'ram'} && $attribute eq 'VideoRam'){
- $gpudata[$j]{'ram'} = $value;
+ elsif (!$gpu_data->[$j]{'ram'} && $attribute eq 'VideoRam'){
+ $gpu_data->[$j]{'ram'} = $value;
}
- elsif (!$gpudata[$j]{'clock'} && $attribute eq 'GPUCurrentClockFreqs'){
- $gpudata[$j]{'clock'} = $value;
+ elsif (!$gpu_data->[$j]{'clock'} && $attribute eq 'GPUCurrentClockFreqs'){
+ $gpu_data->[$j]{'clock'} = $value;
}
- elsif (!$gpudata[$j]{'bus'} && $attribute eq 'PCIBus'){
- $gpudata[$j]{'bus'} = $value;
+ elsif (!$gpu_data->[$j]{'bus'} && $attribute eq 'PCIBus'){
+ $gpu_data->[$j]{'bus'} = $value;
}
- elsif (!$gpudata[$j]{'bus-id'} && $attribute eq 'PCIDevice'){
- $gpudata[$j]{'bus-id'} = $value;
+ elsif (!$gpu_data->[$j]{'bus-id'} && $attribute eq 'PCIDevice'){
+ $gpu_data->[$j]{'bus-id'} = $value;
}
- elsif (!$gpudata[$j]{'fan-speed'} && $attribute eq 'GPUCurrentFanSpeed'){
- $gpudata[$j]{'fan-speed'} = $value;
+ elsif (!$gpu_data->[$j]{'fan-speed'} && $attribute eq 'GPUCurrentFanSpeed'){
+ $gpu_data->[$j]{'fan-speed'} = $value;
}
}
}
@@ -16502,413 +27447,771 @@ sub gpu_data {
@data = main::grabber("$path --adapter=all --od-gettemperature 2>/dev/null");
foreach (@data){
if (/Sensor [^0-9]*([0-9\.]+) /){
- $j = scalar @gpudata;
- $gpudata[$j] = ({});
+ $j = scalar @$gpu_data;
my $value = $1;
- $gpudata[$j]{'type'} = 'amd';
- $gpudata[$j]{'temp'} = $value;
- }
- }
- }
- if (@sensors_data){
- my ($b_found,$holder) = (0,'');
- foreach (@sensors_data){
- next if (/^Adapter:/ || /^\s*$/);
- if (/^(amdgpu|intel|nouveau|radeon)-pci-(.*)/){
- $b_found = 1;
- $holder = $1;
- $j = scalar @gpudata;
- }
- if (/^(?:(?!amdgpu|.*hwmon|intel|nouveau|radeon).)*-(pci|virtual|isa)-(.*)/){
- $b_found = 0;
- $holder = '';
- }
- if ($b_found){
- $gpudata[$j]{'type'} = $holder;
- if (/^[^:]*:([0-9]+).*\b(C|F)\s/i){
- $gpudata[$j]{'temp'} = $1;
- $gpudata[$j]{'unit'} = $2;
- # print "$_\n";
+ $gpu_data->[$j]{'type'} = 'amd';
+ $gpu_data->[$j]{'temp'} = $value;
+ }
+ }
+ }
+ if ($sensors_raw->{'gpu'}){
+ # my ($b_found,$holder) = (0,'');
+ foreach my $adapter (keys %{$sensors_raw->{'gpu'}}){
+ $j = scalar @$gpu_data;
+ $gpu_data->[$j]{'type'} = $adapter;
+ $gpu_data->[$j]{'type'} =~ s/^(amdgpu|intel|nouveau|radeon)-.*/$1/;
+ # print "ad: $adapter\n";
+ foreach (@{$sensors_raw->{'gpu'}{$adapter}}){
+ # print "val: $_\n";
+ if (/^[^:]*mem[^:]*:([0-9\.]+).*\b(C|F)\b/i){
+ $gpu_data->[$j]{'temp-mem'} = $1;
+ $gpu_data->[$j]{'unit'} = $2;
+ # print "temp: $_\n";
+ }
+ elsif (/^[^:]+:([0-9\.]+).*\b(C|F)\b/i){
+ $gpu_data->[$j]{'temp'} = $1;
+ $gpu_data->[$j]{'unit'} = $2;
+ # print "temp: $_\n";
}
# speeds can be in percents or rpms, so need the 'fan' in regex
- if (/^.*fan.*:([0-9]+).*(RPM)?/i){
- $gpudata[$j]{'fan-speed'} = $1;
+ elsif (/^.*?fan.*?:([0-9\.]+).*(RPM)?/i){
+ $gpu_data->[$j]{'fan-speed'} = $1;
# NOTE: we test for nvidia %, everything else stays with nothing
- $gpudata[$j]{'speed-unit'} = '';
+ $gpu_data->[$j]{'speed-unit'} = '';
+ }
+ elsif (/^[^:]+:([0-9\.]+)\s+W\s/i){
+ $gpu_data->[$j]{'watts'} = $1;
+ }
+ elsif (/^[^:]+:([0-9\.]+)\s+(m?V)\s/i){
+ $gpu_data->[$j]{'volts-gpu'} = [$1,$2];
}
- main::log_data('dump','sensors output: video: @gpudata',\@gpudata);
}
}
}
- # we'll probably use this data elsewhere so make it a one time call
- $b_gpudata = 1;
- # print Data::Dumper::Dumper \@gpudata;
+ main::log_data('dump','sensors output: video: @$gpu_data',$gpu_data) if $b_log;
+ print 'gpu_data: ', Data::Dumper::Dumper $gpu_data if $dbg[18];
eval $end if $b_log;
- return @gpudata;
}
}
-## SlotData
+## SlotItem
{
-package SlotData;
+package SlotItem;
+my ($sys_slots);
sub get {
eval $start if $b_log;
- my (@data,@rows,$key1,$val1);
+ my ($data,$key1,$val1);
+ my $rows = [];
my $num = 0;
- my $ref = $alerts{'dmidecode'};
- if ($b_fake_dmidecode || ( $$ref{'action'} eq 'use' && (!$b_arm || $b_slot_tool ) )){
- @rows = slot_data();
- }
- elsif ($b_arm && !$b_slot_tool){
- $key1 = 'ARM';
- $val1 = main::row_defaults('arm-pci','');
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
- }
- elsif ( $$ref{'action'} ne 'use'){
- $key1 = $$ref{'action'};
- $val1 = $$ref{$key1};
+ if ($fake{'dmidecode'} || ($alerts{'dmidecode'}->{'action'} eq 'use' &&
+ (!%risc || $use{'slot-tool'}))){
+ if ($b_admin && -e '/sys/devices/pci0000:00'){
+ slot_data_sys();
+ }
+ $data = slot_data_dmi();
+ slot_output($rows,$data) if @$data;
+ if (!@$rows){
+ my $key = 'Message';
+ push(@$rows, {
+ main::key($num++,0,1,$key) => main::message('pci-slot-data','')
+ });
+ }
+ }
+ elsif (%risc && !$use{'slot-tool'}){
+ $key1 = 'Message';
+ $val1 = main::message('risc-pci',$risc{'id'});
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
+ }
+ elsif ($alerts{'dmidecode'}->{'action'} ne 'use'){
+ $key1 = $alerts{'dmidecode'}->{'action'};
+ $val1 = $alerts{'dmidecode'}->{'message'};
$key1 = ucfirst($key1);
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub slot_data {
+
+sub slot_output {
eval $start if $b_log;
- my (@data,@rows);
- my $num = 0;
- foreach (@dmi){
+ my ($rows,$data) = @_;
+ my $num = 1;
+ foreach my $slot_data (@$data){
+ next if !$slot_data || ref $slot_data ne 'HASH';
$num = 1;
- my @ref = @$_;
- if ($ref[0] == 9){
- my ($designation,$id,$length,$type,$usage) = ('','','','','');
- # skip first two row, we don't need that data
- splice @ref, 0, 2 if @ref;
- my $j = scalar @rows;
- foreach my $item (@ref){
- if ($item !~ /^~/){ # skip the indented rows
- my @value = split /:\s+/, $item;
- if ($value[0] eq 'Type'){
- $type = $value[1];
- }
- if ($value[0] eq 'Designation'){
- $designation = $value[1];
- }
- if ($value[0] eq 'Current Usage'){
- $usage = $value[1];
-
- }
- if ($value[0] eq 'ID'){
- $id = $value[1];
- }
- if ($extra > 1 && $value[0] eq 'Length'){
- $length = $value[1];
+ my $j = scalar @$rows;
+ $slot_data->{'id'} = 'N/A' if !defined $slot_data->{'id'}; # can be 0
+ $slot_data->{'pci'} ||= 'N/A';
+ push(@$rows, {
+ main::key($num++,1,1,'Slot') => $slot_data->{'id'},
+ main::key($num++,0,2,'type') => $slot_data->{'pci'},
+ },);
+ # PCIe only
+ if ($extra > 1 && $slot_data->{'gen'}){
+ $rows->[$j]{main::key($num++,0,2,'gen')} = $slot_data->{'gen'};
+ }
+ if ($slot_data->{'lanes-phys'} && $slot_data->{'lanes-active'} &&
+ $slot_data->{'lanes-phys'} ne $slot_data->{'lanes-active'}){
+ $rows->[$j]{main::key($num++,1,2,'lanes')} = '';
+ $rows->[$j]{main::key($num++,0,3,'phys')} = $slot_data->{'lanes-phys'};
+ $rows->[$j]{main::key($num++,0,3,'active')} = $slot_data->{'lanes-active'};
+ }
+ elsif ($slot_data->{'lanes-phys'}){
+ $rows->[$j]{main::key($num++,0,2,'lanes')} = $slot_data->{'lanes-phys'};
+ }
+ # Non PCIe only
+ if ($extra > 1 && $slot_data->{'bits'}){
+ $rows->[$j]{main::key($num++,0,2,'bits')} = $slot_data->{'bits'};
+ }
+ # PCI-X and PCI only
+ if ($extra > 1 && $slot_data->{'mhz'}){
+ $rows->[$j]{main::key($num++,0,2,'MHz')} = $slot_data->{'mhz'};
+ }
+ $rows->[$j]{main::key($num++,0,2,'status')} = $slot_data->{'usage'};
+ if ($slot_data->{'extra'}){
+ $rows->[$j]{main::key($num++,0,2,'info')} = join(', ', @{$slot_data->{'extra'}});
+ }
+ if ($extra > 1){
+ $slot_data->{'length'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'length')} = $slot_data->{'length'};
+ if ($slot_data->{'cpu'}){
+ $rows->[$j]{main::key($num++,0,2,'cpu')} = $slot_data->{'cpu'};
+ }
+ if ($slot_data->{'volts'}){
+ $rows->[$j]{main::key($num++,0,2,'volts')} = $slot_data->{'volts'};
+ }
+ }
+ if ($extra > 0){
+ $slot_data->{'bus_address'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,2,'bus-ID')} = $slot_data->{'bus_address'};
+ if ($b_admin && $slot_data->{'children'}){
+ children_output($rows,$j,\$num,$slot_data->{'children'},3);
+ }
+ }
+ }
+ eval $end if $b_log;
+}
+sub children_output {
+ my ($rows,$j,$num,$children,$ind) = @_;
+ my $cnt = 0;
+ $rows->[$j]{main::key($$num++,1,$ind,'children')} = '';
+ $ind++;
+ foreach my $id (sort keys %{$children}){
+ $cnt++;
+ $rows->[$j]{main::key($$num++,1,$ind,$cnt)} = $id;
+ if ($children->{$id}{'class-id'} && $children->{$id}{'class-id-sub'}){
+ my $class = $children->{$id}{'class-id'} . $children->{$id}{'class-id-sub'};
+ $rows->[$j]{main::key($$num++,0,($ind + 1),'class-ID')} = $class;
+ if ($children->{$id}{'class'}){
+ $rows->[$j]{main::key($$num++,0,($ind + 1),'type')} = $children->{$id}{'class'};
+ }
+ }
+ if ($children->{$id}{'children'}){
+ children_output($rows,$j,$num,$children->{$id}{'children'},$ind + 1);
+ }
+ }
+}
+
+sub slot_data_dmi {
+ eval $start if $b_log;
+ my $i = 0;
+ my $slots = [];
+ foreach my $slot_data (@dmi){
+ next if $slot_data->[0] != 9;
+ my (%data,@extra);
+ # skip first two row, we don't need that data
+ foreach my $item (@$slot_data[2 .. $#$slot_data]){
+ if ($item !~ /^~/){ # skip the indented rows
+ my @value = split(/:\s+/, $item, 2);
+ if ($value[0] eq 'Type'){
+ $data{'type'} = $value[1];
+ }
+ if ($value[0] eq 'Designation'){
+ $data{'designation'} = $value[1];
+ }
+ if ($value[0] eq 'Current Usage'){
+ $data{'usage'} = lc($value[1]);
+ }
+ if ($value[0] eq 'ID'){
+ $data{'id'} = $value[1];
+ }
+ if ($value[0] eq 'Length'){
+ $data{'length'} = lc($value[1]);
+ }
+ if ($value[0] eq 'Bus Address'){
+ $value[1] =~ s/^0000://;
+ $data{'bus_address'} = $value[1];
+ if ($b_admin && $sys_slots){
+ $data{'children'} = slot_children($data{'bus_address'},$sys_slots);
}
}
}
- if ($type){
- $id = 'N/A' if ($id eq '' );
- if ($type eq 'Other' && $designation){
- $type = $designation;
- }
- elsif ($type && $designation) {
- $type = "$type $designation";
- }
- @data = (
- {
- main::key($num++,1,1,'Slot') => $id,
- main::key($num++,0,2,'type') => $type,
- main::key($num++,0,2,'status') => $usage,
- },
- );
- @rows = (@rows,@data);
- if ($extra > 1 ){
- $rows[$j]{main::key($num++,0,2,'length')} = $length;
+ elsif ($item =~ /^~([\d.]+)[\s-]?V is provided/){
+ $data{'volts'} = $1;
+ }
+ }
+ if ($data{'type'} eq 'Other' && $data{'designation'}){
+ $data{'type'} = $data{'designation'};
+ undef $data{'designation'};
+ }
+ foreach my $string (($data{'type'},$data{'designation'})){
+ next if !$string;
+ print "st: $string\n" if $dbg[48];
+ $string =~ s/(PCI[\s_-]?Express|Pci[_-]?e)/PCIe /ig;
+ $string =~ s/PCI[\s_-]?X/PCIX /ig;
+ $string =~ s/Mini[\s_-]?PCI/MiniPCI /ig;
+ $string =~ s/Media[\s_-]?Card/MediaCard/ig;
+ $string =~ s/Express[\s_-]?Card/ExpressCard/ig;
+ $string =~ s/Card[\s_-]?Bus/CardBus/ig;
+ $string =~ s/PCMCIA/PCMCIA /ig;
+ if (!$data{'pci'} && $string =~ /(AGP|ISA|MiniPCI|PCIe|PCIX|PCMCIA|PCI)/){
+ $data{'pci'} = $1;
+ # print "pci: $data{'pci'}\n";
+ }
+ if ($string =~ /(MiniPCI|PCMCIA)/){
+ $data{'pci'} = $1;
+ # print "pci: $data{'pci'}\n";
+ }
+ # legacy format: PCIE#3-x8
+ if (!$data{'lanes-phys'} && $string =~ /(^x|#\d+-x)(\d+)/){
+ $data{'lanes-phys'} = $2;
+ }
+ if (!$data{'lanes-active'} && $string =~ /^x\d+ .*? x(\d+)/){
+ $data{'lanes-active'} = $1;
+ }
+ # legacy format, seens with PCI-X/PCIe mobos: PCIX#2-100MHz, PCIE#3-x8
+ if (!defined $data{'id'} && $string =~ /(#|PCI)(\d+)\b/){
+ $data{'id'} = $2;
+ }
+ if (!defined $data{'id'} && $string =~ /SLOT[\s-]?(\d+)\b/i){
+ $data{'id'} = $1;
+ }
+ if ($string =~ s/\bJ-?(\S+)\b//){
+ push(@extra,'J' . $1) if ! grep {$_ eq 'J' . $1} @extra;
+ }
+ if ($string =~ s/\bM\.?2\b//){
+ push(@extra,'M.2') if ! grep {$_ eq 'M.2'} @extra;
+ }
+ if ($string =~ /(ExpressCard|MediaCard|CardBus)/){
+ push(@extra,$1) if ! grep {$_ eq $1} @extra;
+ }
+ if (!$data{'cpu'} && $string =~ s/CPU-?(\d+)\b//){
+ $data{'cpu'} = $1;
+ }
+ if (!$data{'gen'} && $data{'pci'} && $data{'pci'} eq 'PCIe' &&
+ $string =~ /PCIe[\s_-]*([\d.]+)/){
+ $data{'gen'} = $1 + 0;
+ }
+ if (!$data{'mhz'} && $data{'pci'} && $string =~ /(\d+)[\s_-]?MHz/){
+ $data{'mhz'} = $1;
+ }
+ if (!$data{'bits'} && $data{'pci'} && $string =~ /\b(\d+)[\s_-]?bit/){
+ $data{'bits'} = $1;
+ }
+ $i++;
+ }
+ if (!$data{'pci'} && $data{'type'} &&
+ $data{'type'} =~ /(ExpressCard|MediaCard|CardBus)/){
+ $data{'pci'} = $1;
+ @extra = grep {$_ ne $data{'pci'}} @extra;
+ }
+ $data{'extra'} = [@extra] if @extra;
+ push(@$slots,{%data}) if %data;
+ }
+ print '@$slots: ', Data::Dumper::Dumper $slots if $dbg[48];
+ main::log_data('dump','@$slots final',$slots) if $b_log;
+ eval $end if $b_log;
+ return $slots;
+}
+
+sub slot_data_sys {
+ eval $start if $b_log;
+ my $path = '/sys/devices/pci0000:*/00*';
+ my @data = main::globber($path);
+ my ($full,$id);
+ foreach $full (@data){
+ $id = $full;
+ $id =~ s/^.*\/\S+:([0-9a-f]{2}:[0-9a-f]{2}\.[0-9a-f]+)$/$1/;
+ $sys_slots->{$id} = slot_data_recursive($full);
+ }
+ print 'sys_slots: ', Data::Dumper::Dumper $sys_slots if $dbg[49];
+ main::log_data('dump','$sys_slots',$sys_slots) if $b_log;
+ eval $end if $b_log;
+}
+
+sub slot_data_recursive {
+ eval $start if $b_log;
+ my $path = shift @_;
+ my $info = {};
+ my $id = $path;
+ $id =~ s/^.*\/\S+:(\S{2}:\S{2}\.\S+)$/$1/;
+ my ($content,$id2,@files);
+ # @files = main::globber("$full/{class,current_link_speed,current_link_width,max_link_speed,max_link_width,00*}");
+ if (-e "$path/class" && ($content = main::reader("$path/class",'strip',0))){
+ if ($content =~ /^0x(\S{2})(\S{2})/){
+ $info->{'class-id'} = $1;
+ $info->{'class-id-sub'} = $2;
+ $info->{'class'} = DeviceData::pci_class($1);
+ if ($info->{'class-id'} eq '06'){
+ my @files = main::globber("$path/00*:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f].[0-9a-f]");
+ foreach my $item (@files){
+ $id = $item;
+ $id =~ s/^.*\/[0-9a-f]+:([0-9a-f]{2}:[0-9a-f]{2}\.[0-9a-f]+)$/$1/;
+ $info->{'children'}{$id} = slot_data_recursive($item);
}
}
}
}
- if (!@rows){
- my $key = 'Message';
- @data = ({
- main::key($num++,0,1,$key) => main::row_defaults('pci-slot-data',''),
- },);
- @rows = (@rows,@data);
+ if (-e "$path/current_link_speed" &&
+ ($content = main::reader("$path/current_link_speed",'strip',0))){
+ $content =~ s/\sPCIe//i;
+ $info->{'current-link-speed'} = main::clean_dmi($content);
+ }
+ if (-e "$path/current_link_width" &&
+ ($content = main::reader("$path/current_link_width",'strip',0))){
+ $info->{'current-link-width'} = $content;
}
eval $end if $b_log;
- return @rows;
+ return $info;
}
+
+sub slot_children {
+ eval $start if $b_log;
+ my ($bus_id,$slots) = @_;
+ my $children = slot_children_recursive($bus_id,$slots);
+ # $children->{'0a:00.0'}{'children'} = {'3423' => {
+ # 'class' => 'test','class-id' => '05','class-id-sub' => '10'}};
+ print $bus_id, ' children: ', Data::Dumper::Dumper $children if $dbg[49];
+ main::log_data('dump','$children',$children) if $b_log;
+ eval $end if $b_log;
+ return $children;
}
-## SwapData
+sub slot_children_recursive {
+ my ($bus_id,$slots) = @_;
+ my $children;
+ foreach my $key (keys %{$slots}){
+ if ($slots->{$bus_id}){
+ $children = $slots->{$bus_id}{'children'} if $slots->{$bus_id}{'children'};
+ last;
+ }
+ elsif ($slots->{$key}{'children'}){
+ slot_children_recursive($bus_id,$slots->{$key}{'children'});
+ }
+ }
+ return $children;
+}
+}
+
+## SwapItem
{
-package SwapData;
+package SwapItem;
sub get {
eval $start if $b_log;
- my (@data,@rows,$key1,$val1);
+ my $rows = [];
my $num = 0;
- @rows =create_output();
- if (!@rows){
- @data = (
- {main::key($num++,0,1,'Alert') => main::row_defaults('swap-data')},
- );
- @rows = (@data);
+ create_output($rows);
+ if (!@$rows){
+ @$rows = ({main::key($num++,0,1,'Alert') => main::message('swap-data')});
}
eval $end if $b_log;
- return @rows;
+ return $rows;
}
+
sub create_output {
eval $start if $b_log;
+ my $rows = $_[0];
my $num = 0;
my $j = 0;
- my (@data,@data2,%part,@rows,$dev,$percent,$raw_size,$size,$used);
- my @swap_data = PartitionData::swap_data();
- foreach my $ref (@swap_data){
- my %row = %$ref;
+ my (@rows,$dev,$percent,$raw_size,$size,$used);
+ PartitionData::set() if !$bsd_type && !$loaded{'partition-data'};
+ DiskDataBSD::set() if $bsd_type && !$loaded{'disk-data-bsd'};
+ main::set_mapper() if !$loaded{'mapper'};
+ PartitionItem::swap_data() if !$loaded{'set-swap'};
+ foreach my $row (@swaps){
$num = 1;
- @data2 = main::get_size($row{'size'}) if (defined $row{'size'});
- $size = (@data2) ? $data2[0] . ' ' . $data2[1]: 'N/A';
- @data2 = main::get_size($row{'used'}) if (defined $row{'used'});
- $used = (@data2) ? $data2[0] . ' ' . $data2[1]: 'N/A';
- $percent = (defined $row{'percent-used'}) ? ' (' . $row{'percent-used'} . '%)' : '';
- %part = ();
- $dev = ($row{'swap-type'} eq 'file') ? 'file' : 'dev';
- $row{'swap-type'} = ($row{'swap-type'}) ? $row{'swap-type'} : 'N/A';
+ $size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : 'N/A';
+ $used = main::get_size($row->{'used'},'string','N/A'); # used can be 0
+ $percent = (defined $row->{'percent-used'}) ? ' (' . $row->{'percent-used'} . '%)' : '';
+ $dev = ($row->{'swap-type'} eq 'file') ? 'file' : 'dev';
+ $row->{'swap-type'} = ($row->{'swap-type'}) ? $row->{'swap-type'} : 'N/A';
if ($b_admin && !$bsd_type && $j == 0){
$j = scalar @rows;
- if (defined $row{'swappiness'} || defined $row{'cache-pressure'}){
- $rows[$j]{main::key($num++,1,1,'Kernel')} = '';
- if (defined $row{'swappiness'}){
- $rows[$j]{main::key($num++,0,2,'swappiness')} = $row{'swappiness'};
- }
- if (defined $row{'cache-pressure'}){
- $rows[$j]{main::key($num++,0,2,'cache pressure')} = $row{'cache-pressure'};
+ if (defined $row->{'swappiness'} || defined $row->{'cache-pressure'}){
+ $rows->[$j]{main::key($num++,1,1,'Kernel')} = '';
+ if (defined $row->{'swappiness'}){
+ $rows->[$j]{main::key($num++,0,2,'swappiness')} = $row->{'swappiness'};
+ }
+ if (defined $row->{'cache-pressure'}){
+ $rows->[$j]{main::key($num++,0,2,'cache-pressure')} = $row->{'cache-pressure'};
+ }
+ $row->{'zswap-enabled'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,1,2,'zswap')} = $row->{'zswap-enabled'};
+ if ($row->{'zswap-enabled'} eq 'yes'){
+ if (defined $row->{'zswap-compressor'}){
+ $rows->[$j]{main::key($num++,0,1,'compressor')} = $row->{'zswap-compressor'};
+ }
+ if (defined $row->{'zswap-max-pool-percent'}){
+ $rows->[$j]{main::key($num++,0,1,'max-pool')} = $row->{'zswap-max-pool-percent'} . '%';
+ }
}
}
else {
- $rows[$j]{main::key($num++,0,1,'Message')} = main::row_defaults('swap-admin');
+ $rows->[$j]{main::key($num++,0,1,'Message')} = main::message('swap-admin');
}
}
- $j = scalar @rows;
- @data = ({
- main::key($num++,1,1,'ID') => $row{'id'},
- main::key($num++,0,2,'type') => $row{'swap-type'},
+ $j = scalar @$rows;
+ push(@$rows, {
+ main::key($num++,1,1,'ID') => $row->{'id'},
+ main::key($num++,0,2,'type') => $row->{'swap-type'},
});
- @rows = (@rows,@data);
# not used for swap as far as I know
- if ($b_admin && $row{'raw-size'} ){
+ if ($b_admin && $row->{'raw-size'}){
# It's an error! permissions or missing tool
- if (!main::is_numeric($row{'raw-size'})){
- $raw_size = $row{'raw-size'};
- }
- else {
- @data2 = main::get_size($row{'raw-size'});
- $raw_size = (@data2) ? $data2[0] . ' ' . $data2[1]: 'N/A';
- }
- $rows[$j]{main::key($num++,0,2,'raw size')} = $raw_size;
+ $raw_size = main::get_size($row->{'raw-size'},'string');
+ $rows->[$j]{main::key($num++,0,2,'raw-size')} = $raw_size;
}
# not used for swap as far as I know
- if ($b_admin && $row{'raw-available'} && $size ne 'N/A'){
- $size .= ' (' . $row{'raw-available'} . '%)';
+ if ($b_admin && $row->{'raw-available'} && $size ne 'N/A'){
+ $size .= ' (' . $row->{'raw-available'} . '%)';
}
- $rows[$j]{main::key($num++,0,2,'size')} = $size;
- $rows[$j]{main::key($num++,0,2,'used')} = $used . $percent;
+ $rows->[$j]{main::key($num++,0,2,'size')} = $size;
+ $rows->[$j]{main::key($num++,0,2,'used')} = $used . $percent;
# not used for swap as far as I know
- if ($b_admin && $row{'block-size'}){
- $rows[$j]{main::key($num++,0,2,'block size')} = $row{'block-size'} . ' B';;
- #$rows[$j]{main::key($num++,0,2,'physical')} = $row{'block-size'} . ' B';
- #$rows[$j]{main::key($num++,0,2,'logical')} = $row{'block-logical'} . ' B';
+ if ($b_admin && $row->{'block-size'}){
+ $rows->[$j]{main::key($num++,0,2,'block-size')} = $row->{'block-size'} . ' B';;
+ #$rows->[$j]{main::key($num++,0,2,'physical')} = $row->{'block-size'} . ' B';
+ #$rows->[$j]{main::key($num++,0,2,'logical')} = $row->{'block-logical'} . ' B';
}
- if ($extra > 1 && defined $row{'priority'}){
- $rows[$j]{main::key($num++,0,2,'priority')} = $row{'priority'};
+ if ($extra > 1 && defined $row->{'priority'}){
+ $rows->[$j]{main::key($num++,0,2,'priority')} = $row->{'priority'};
+ }
+ if ($b_admin && $row->{'swap-type'} eq 'zram'){
+ if ($row->{'zram-comp'}){
+ $rows->[$j]{main::key($num++,1,2,'comp')} = $row->{'zram-comp'};
+ if ($row->{'zram-comp-avail'}){
+ $rows->[$j]{main::key($num++,0,3,'avail')} = $row->{'zram-comp-avail'};
+ }
+ }
+ if ($row->{'zram-max-comp-streams'}){
+ $rows->[$j]{main::key($num++,0,3,'max-streams')} = $row->{'zram-max-comp-streams'};
+ }
}
- $row{'mount'} =~ s|/home/[^/]+/(.*)|/home/$filter_string/$1| if $row{'mount'} && $use{'filter'};
- $rows[$j]{main::key($num++,0,2,$dev)} = ($row{'mount'}) ? $row{'mount'} : 'N/A';
- if ($show{'label'} && ($row{'label'} || $row{'swap-type'} eq 'partition') ){
- $row{'label'} = main::apply_partition_filter('part', $row{'label'}, '') if $use{'filter-label'};
- $rows[$j]{main::key($num++,0,2,'label')} = ($row{'label'}) ? $row{'label'}: 'N/A';
+ $row->{'mount'} =~ s|/home/[^/]+/(.*)|/home/$filter_string/$1| if $row->{'mount'} && $use{'filter'};
+ $rows->[$j]{main::key($num++,1,2,$dev)} = ($row->{'mount'}) ? $row->{'mount'} : 'N/A';
+ if ($b_admin && $row->{'maj-min'}){
+ $rows->[$j]{main::key($num++,0,3,'maj-min')} = $row->{'maj-min'};
}
- if ($show{'uuid'} && ($row{'uuid'} || $row{'swap-type'} eq 'partition' )){
- $row{'uuid'} = main::apply_partition_filter('part', $row{'uuid'}, '') if $use{'filter-uuid'};
- $rows[$j]{main::key($num++,0,2,'uuid')} = ($row{'uuid'}) ? $row{'uuid'}: 'N/A';
+ if ($extra > 0 && $row->{'dev-mapped'}){
+ $rows->[$j]{main::key($num++,0,3,'mapped')} = $row->{'dev-mapped'};
+ }
+ if ($show{'label'} && ($row->{'label'} || $row->{'swap-type'} eq 'partition')){
+ if ($use{'filter-label'}){
+ $row->{'label'} = main::filter_partition('part', $row->{'label'}, '');
+ }
+ $row->{'label'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'label')} = $row->{'label'};
+ }
+ if ($show{'uuid'} && ($row->{'uuid'} || $row->{'swap-type'} eq 'partition')){
+ if ($use{'filter-uuid'}){
+ $row->{'uuid'} = main::filter_partition('part', $row->{'uuid'}, '');
+ }
+ $row->{'uuid'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'uuid')} = $row->{'uuid'};
}
}
eval $end if $b_log;
- return @rows;
}
-
}
-## UnmountedData
+## UnmountedItem
{
-package UnmountedData;
+package UnmountedItem;
sub get {
eval $start if $b_log;
- my (@data,@rows,$key1,$val1);
+ my ($data,$key1,$val1);
+ my $rows = [];
my $num = 0;
if ($bsd_type){
- $key1 = 'Message';
- $val1 = main::row_defaults('unmounted-data-bsd');
+ DiskDataBSD::set() if !$loaded{'disk-data-bsd'};
+ if (%disks_bsd && ($alerts{'disklabel'}->{'action'} eq 'use' ||
+ $alerts{'gpart'}->{'action'} eq 'use')){
+ $data = bsd_data();
+ if (!@$data){
+ $key1 = 'Message';
+ $val1 = main::message('unmounted-data');
+ }
+ else {
+ create_output($rows,$data);
+ }
+ }
+ else {
+ if ($alerts{'disklabel'}->{'action'} eq 'permissions'){
+ $key1 = 'Message';
+ $val1 = $alerts{'disklabel'}->{'message'};
+ }
+ else {
+ $key1 = 'Message';
+ $val1 = main::message('unmounted-data-bsd',$uname[0]);
+ }
+ }
}
else {
- if (my $file = main::system_files('partitions')){
- @data = unmounted_data($file);
- if (!@data){
+ if ($system_files{'proc-partitions'}){
+ $data = proc_data();
+ if (!@$data){
$key1 = 'Message';
- $val1 = main::row_defaults('unmounted-data');
+ $val1 = main::message('unmounted-data');
}
else {
- @rows = create_output(@data);
+ create_output($rows,$data);
}
}
else {
$key1 = 'Message';
- $val1 = main::row_defaults('unmounted-file');
+ $val1 = main::message('unmounted-file');
}
}
- if (!@rows && $key1){
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ if (!@$rows && $key1){
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
eval $end if $b_log;
- return @rows;
+ return $rows;
}
+
sub create_output {
eval $start if $b_log;
- my (@unmounted) = @_;
- my (@data,@rows,$fs);
- my $num = 0;
- @unmounted = sort { $a->{'dev-base'} cmp $b->{'dev-base'} } @unmounted;
- foreach my $ref (@unmounted){
- my %row = %$ref;
+ my ($rows,$unmounted) = @_;
+ my ($fs);
+ my ($j,$num) = (0,0);
+ @$unmounted = sort { $a->{'dev-base'} cmp $b->{'dev-base'} } @$unmounted;
+ my $fs_skip = PartitionItem::get_filters('fs-skip');
+ foreach my $row (@$unmounted){
$num = 1;
- my @data2 = main::get_size($row{'size'}) if (defined $row{'size'});
- my $size = (@data2) ? $data2[0] . ' ' . $data2[1]: 'N/A';
- if ($row{'fs'}){
- $fs = lc($row{'fs'});
+ my $size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : 'N/A';
+ if ($row->{'fs'}){
+ $fs = lc($row->{'fs'});
}
else {
- if (main::check_program('file')){
- $fs = ($b_root) ? 'N/A' : main::row_defaults('root-required');
+ if ($bsd_type){
+ $fs = 'N/A';
+ }
+ elsif (main::check_program('file')){
+ $fs = ($b_root) ? 'N/A' : main::message('root-required');
}
else {
- $fs = 'requires file';
+ $fs = main::message('tool-missing-basic','file');
}
}
- $row{'label'} = main::apply_partition_filter('part', $row{'label'}, '') if $use{'filter-label'};
- $row{'uuid'} = main::apply_partition_filter('part', $row{'uuid'}, '') if $use{'filter-uuid'};
- @data = ({
- main::key($num++,1,1,'ID') => "/dev/$row{'dev-base'}",
- main::key($num++,0,2,'size') => $size,
- main::key($num++,0,2,'fs') => $fs,
- main::key($num++,0,2,'label') => $row{'label'},
- main::key($num++,0,2,'uuid') => $row{'uuid'},
+ $j = scalar @$rows;
+ push(@$rows, {
+ main::key($num++,1,1,'ID') => "/dev/$row->{'dev-base'}",
});
- @rows = (@rows,@data);
+ if ($b_admin && $row->{'maj-min'}){
+ $rows->[$j]{main::key($num++,0,2,'maj-min')} = $row->{'maj-min'};
+ }
+ if ($extra > 0 && $row->{'dev-mapped'}){
+ $rows->[$j]{main::key($num++,0,2,'mapped')} = $row->{'dev-mapped'};
+ }
+ $row->{'label'} ||= 'N/A';
+ $row->{'uuid'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'size')} = $size;
+ $rows->[$j]{main::key($num++,0,2,'fs')} = $fs;
+ # don't show for fs known to not have label/uuid
+ if (($show{'label'} || $show{'uuid'}) && $fs !~ /^$fs_skip$/){
+ if ($show{'label'}){
+ if ($use{'filter-label'}){
+ $row->{'label'} = main::filter_partition('part', $row->{'label'}, '');
+ }
+ $row->{'label'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'label')} = $row->{'label'};
+ }
+ if ($show{'uuid'}){
+ if ($use{'filter-uuid'}){
+ $row->{'uuid'} = main::filter_partition('part', $row->{'uuid'}, '');
+ }
+ $row->{'uuid'} ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,2,'uuid')} = $row->{'uuid'};
+ }
+ }
}
eval $end if $b_log;
- return @rows;
}
-sub unmounted_data {
+
+sub proc_data {
eval $start if $b_log;
- my ($file) = @_;
- my ($fs,$label,$size,$uuid,@data,%part,@unmounted);
- my @mounted = ('scd[0-9]+','sr[0-9]+','cdrom[0-9]*','cdrw[0-9]*',
+ my ($dev_mapped,$fs,$label,$maj_min,$size,$uuid,$part);
+ my $unmounted = [];
+ # last filters to make sure these are dumped
+ my @filters = ('scd[0-9]+','sr[0-9]+','cdrom[0-9]*','cdrw[0-9]*',
'dvd[0-9]*','dvdrw[0-9]*','fd[0-9]','ram[0-9]*');
- my @mounts = main::reader($file,'strip');
my $num = 0;
- PartitionData::set_lsblk() if !$bsd_type && !$b_lsblk;
# set labels, uuid, gpart
- PartitionData::partition_data() if !$b_partitions;
- PartitionData::set_label_uuid() if !$b_label_uuid;
- RaidData::raid_data() if !$b_raid;
- @mounted = get_mounted(@mounted);
- foreach (@mounts){
- my @working = split /\s+/, $_;
- ($fs,$label,$uuid,$size) = ('','','','');
+ PartitionItem::set_partitions() if !$loaded{'set-partitions'};
+ RaidItem::raid_data() if !$loaded{'raid'};
+ my $mounted = get_mounted();
+ # print join("\n",(@filters,@$mounted)),"\n";
+ foreach my $row (@proc_partitions){
+ ($dev_mapped,$fs,$label,$maj_min,$uuid,$size) = ('','','','','','');
# note that size 1 means it is a logical extended partition container
# lvm might have dm-1 type syntax
# need to exclude loop type file systems, squashfs for example
# NOTE: nvme needs special treatment because the main device is: nvme0n1
# note: $working[2] != 1 is wrong, it's not related
- # note: for zfs using /dev/sda no partitions, this will also remove those from
- # the unmounted report because sdb is found in sdb1, this is acceptable
- if ( $working[-1] !~ /^(nvme[0-9]+n|mmcblk|mtdblk|mtdblock)[0-9]+$/ &&
- $working[-1] =~ /[a-z][0-9]+$|dm-[0-9]+$/ && $working[-1] !~ /loop/ &&
- !(grep {$working[-1] =~ /$_/} @mounted)){
- %part = PartitionData::check_lsblk($working[-1],0) if (@lsblk && $working[-1]);
- if (%part){
- $fs = $part{'fs'};
- $label = $part{'label'};
- $uuid = $part{'uuid'};
- $size = $part{'size'} if $part{'size'} && !$working[2];
- }
- $size ||= $working[2];
- $fs = unmounted_filesystem($working[-1]) if !$fs;
- $label = PartitionData::get_label("/dev/$working[-1]") if !$label;
- $uuid = PartitionData::get_uuid("/dev/$working[-1]") if !$uuid;
- @data = ({
- 'dev-base' => $working[-1],
+ # note: for zfs using /dev/sda no partitions, previous rule would have removed
+ # the unmounted report because sdb was found in sdb1, but match of eg sdb1 and sdb12
+ # makes this a problem, so using zfs_member test instead to filter out zfs members.
+ # For zfs using entire disk, ie, sda, in that case, all partitions sda1 sda9 (8BiB)
+ # belong to zfs, and aren't unmmounted, so if sda and partition sda9,
+ # remove from list. this only works for sdxx drives, but is better than no fix
+ # This logic may also end up working for btrfs partitions, and maybe hammer?
+ # In arm/android seen /dev/block/mmcblk0p12
+ # print "mount: $row->[-1]\n";
+ if ($row->[-1] !~ /^(nvme[0-9]+n|mmcblk|mtdblk|mtdblock)[0-9]+$/ &&
+ $row->[-1] =~ /[a-z][0-9]+$|dm-[0-9]+$/ &&
+ $row->[-1] !~ /\bloop/ &&
+ !(grep {$row->[-1] =~ /$_$/} (@filters,@$mounted)) &&
+ !(grep {$_ =~ /(block\/)?$row->[-1]$/} @$mounted) &&
+ !(grep {$_ =~ /^sd[a-z]+$/ && $row->[-1] =~ /^$_[0-9]+/} @$mounted)){
+ $dev_mapped = $dmmapper{$row->[-1]} if $dmmapper{$row->[-1]};
+ if (@lsblk){
+ my $id = ($dev_mapped) ? $dev_mapped: $row->[-1];
+ $part = LsblkData::get($id);
+ if (%$part){
+ $fs = $part->{'fs'};
+ $label = $part->{'label'};
+ $maj_min = $part->{'maj-min'};
+ $uuid = $part->{'uuid'};
+ $size = $part->{'size'} if $part->{'size'} && !$row->[2];
+ }
+ }
+ $size ||= $row->[2];
+ $fs = unmounted_filesystem($row->[-1]) if !$fs;
+ # seen: (zfs|lvm2|linux_raid)_member; crypto_luks
+ # note: lvm, raid members are never mounted. luks member is never mounted.
+ next if $fs && $fs =~ /(bcache|crypto|luks|_member)$/i;
+ # these components of lvm raid will show as partitions byt are reserved private lvm member
+ # See man lvm for all current reserved private volume names
+ next if $dev_mapped && $dev_mapped =~ /_([ctv]data|corig|[mr]image|mlog|[crt]meta|pmspare|pvmove|vorigin)(_[0-9]+)?$/;
+ if (!$bsd_type){
+ $label = PartitionItem::get_label("/dev/$row->[-1]") if !$label;
+ $uuid = PartitionItem::get_uuid("/dev/$row->[-1]") if !$uuid;
+ }
+ else {
+ my @temp = GpartData::get($row->[-1]);
+ $label = $temp[1] if $temp[1];
+ $uuid = $temp[2] if $temp[2];
+ }
+ $maj_min = "$row->[0]:$row->[1]" if !$maj_min;
+ push(@$unmounted, {
+ 'dev-base' => $row->[-1],
+ 'dev-mapped' => $dev_mapped,
'fs' => $fs,
'label' => $label,
+ 'maj-min' => $maj_min,
'size' => $size,
'uuid' => $uuid,
});
- @unmounted = (@unmounted,@data);
}
}
- # print Data::Dumper::Dumper @unmounted;
- main::log_data('dump','@unmounted',\@unmounted) if $b_log;
+ print Data::Dumper::Dumper $unmounted if $dbg[35];
+ main::log_data('dump','@$unmounted',$unmounted) if $b_log;
+ eval $end if $b_log;
+ return $unmounted;
+}
+
+sub bsd_data {
+ eval $start if $b_log;
+ my ($fs,$label,$size,$uuid,%part);
+ my $unmounted = [];
+ PartitionItem::set_partitions() if !$loaded{'set-partitions'};
+ RaidItem::raid_data() if !$loaded{'raid'};
+ my $mounted = get_mounted();
+ foreach my $id (sort keys %disks_bsd){
+ next if !$disks_bsd{$id}->{'partitions'};
+ foreach my $part (sort keys %{$disks_bsd{$id}->{'partitions'}}){
+ if (!(grep {$_ =~ /$part$/} @$mounted)){
+ $fs = $disks_bsd{$id}->{'partitions'}{$part}{'fs'};
+ next if $fs && $fs =~ /(raid|_member)$/i;
+ $label = $disks_bsd{$id}->{'partitions'}{$part}{'label'};
+ $size = $disks_bsd{$id}->{'partitions'}{$part}{'size'};
+ $uuid = $disks_bsd{$id}->{'partitions'}{$part}{'uuid'};
+ # $fs = unmounted_filesystem($part) if !$fs;
+ push(@$unmounted, {
+ 'dev-base' => $part,
+ 'dev-mapped' => '',
+ 'fs' => $fs,
+ 'label' => $label,
+ 'maj-min' => '',
+ 'size' => $size,
+ 'uuid' => $uuid,
+ });
+ }
+ }
+ }
+ print Data::Dumper::Dumper $unmounted if $dbg[35];
+ main::log_data('dump','@$unmounted',$unmounted) if $b_log;
eval $end if $b_log;
- return @unmounted;
+ return $unmounted;
}
+
sub get_mounted {
eval $start if $b_log;
- my (@mounted) = @_;
- foreach my $ref (@partitions){
- my %row = %$ref;
- push @mounted, $row{'dev-base'} if $row{'dev-base'};
+ my (@arrays);
+ my $mounted = [];
+ foreach my $row (@partitions){
+ push(@$mounted, $row->{'dev-base'}) if $row->{'dev-base'};
}
- foreach my $ref (@raid){
- my %row = %$ref;
- my $ref2 = $row{'arrays'};
+ # print Data::Dumper::Dumper \@zfs_raid;
+ foreach my $row ((@btrfs_raid,@lvm_raid,@md_raid,@soft_raid,@zfs_raid)){
# we want to not show md0 etc in unmounted report
- push @mounted, $row{'id'} if $row{'id'};
- my @arrays = (ref $ref2 eq 'ARRAY' ) ? @$ref2 : ();
+ push(@$mounted, $row->{'id'}) if $row->{'id'};
+ # print Data::Dumper::Dumper $row;
+ # row->arrays->components: zfs; row->components: lvm,mdraid,softraid
+ if ($row->{'arrays'} && ref $row->{'arrays'} eq 'ARRAY'){
+ push(@arrays,@{$row->{'arrays'}});
+ }
+ elsif ($row->{'components'} && ref $row->{'components'} eq 'ARRAY'){
+ push(@arrays,$row);
+ }
@arrays = grep {defined $_} @arrays;
- foreach my $array (@arrays){
- my %row2 = %$array;
- my $ref3 = $row2{'components'};
- my @components = (ref $ref3 eq 'ARRAY') ? @$ref3 : ();
+ # print Data::Dumper::Dumper \@arrays;
+ foreach my $item (@arrays){
+ # print Data::Dumper::Dumper $item;
+ my @components = (ref $item->{'components'} eq 'ARRAY') ? @{$item->{'components'}} : ();
foreach my $component (@components){
- my @temp = split /~/, $component;
- push @mounted, $temp[0];
+ # md has ~, not zfs,lvm,softraid
+ my $temp = (split('~', $component->[0]))[0];
+ push(@$mounted, $temp);
}
}
}
eval $end if $b_log;
- return @mounted;
+ return $mounted;
}
+
+# bsds do not seem to return any useful data so only for linux
sub unmounted_filesystem {
eval $start if $b_log;
my ($item) = @_;
my ($data,%part);
my ($file,$fs,$path) = ('','','');
- if ($path = main::check_program('file')) {
+ if ($path = main::check_program('file')){
$file = $path;
}
# order matters in this test!
my @filesystems = ('ext2','ext3','ext4','ext5','ext','ntfs',
- 'fat32','fat16','FAT\s\(.*\)','vfat','fatx','tfat','swap','btrfs',
+ 'fat32','fat16','FAT\s\(.*\)','vfat','fatx','tfat','exfat','swap','btrfs',
'ffs','hammer','hfs\+','hfs\splus','hfs\sextended\sversion\s[1-9]','hfsj',
- 'hfs','jfs','nss','reiserfs','reiser4','ufs2','ufs','xfs','zfs');
+ 'hfs','apfs','jfs','nss','reiserfs','reiser4','ufs2','ufs','xfs','zfs');
if ($file){
# this will fail if regular user and no sudo present, but that's fine, it will just return null
# note the hack that simply slices out the first line if > 1 items found in string
# also, if grub/lilo is on partition boot sector, no file system data is available
- $data = (main::grabber("$sudo$file -s /dev/$item 2>/dev/null"))[0];
+ $data = (main::grabber("$sudoas$file -s /dev/$item 2>/dev/null"))[0];
if ($data){
foreach (@filesystems){
if ($data =~ /($_)[\s,]/i){
@@ -16925,284 +28228,341 @@ sub unmounted_filesystem {
}
}
-## UsbData
+## UsbItem
{
-package UsbData;
+package UsbItem;
sub get {
eval $start if $b_log;
- my (@data,@rows,$key1,$val1);
+ my ($key1,$val1);
+ my $rows = [];
my $num = 0;
- my $ref = $alerts{'lsusb'};
- my $ref2 = $alerts{'usbdevs'};
- if ( !@usb && $$ref{'action'} ne 'use' && $$ref2{'action'} ne 'use'){
- if ($os eq 'linux' ){
- $key1 = $$ref{'action'};
- $val1 = $$ref{$key1};
+ if (!$usb{'main'} && $alerts{'lsusb'}->{'action'} ne 'use' &&
+ $alerts{'usbdevs'}->{'action'} ne 'use' &&
+ $alerts{'usbconfig'}->{'action'} ne 'use'){
+ if ($os eq 'linux'){
+ $key1 = $alerts{'lsusb'}->{'action'};
+ $val1 = $alerts{'lsusb'}->{'message'};
}
else {
- $key1 = $$ref2{'action'};
- $val1 = $$ref2{$key1};
+ # note: usbdevs only has 'missing', usbconfig has missing/permissions
+ # both have platform, but irrelevant since testing for linux here
+ if ($alerts{'usbdevs'}->{'action'} eq 'missing' &&
+ $alerts{'usbconfig'}->{'action'} eq 'missing'){
+ $key1 = $alerts{'usbdevs'}->{'action'};
+ $val1 = main::message('tools-missing-bsd','usbdevs/usbconfig');
+ }
+ elsif ($alerts{'usbconfig'}->{'action'} eq 'permissions'){
+ $key1 = $alerts{'usbconfig'}->{'action'};
+ $val1 = $alerts{'usbconfig'}->{'message'};
+ }
+ # elsif ($alerts{'lsusb'}->{'action'} eq 'missing'){
+ # $key1 = $alerts{'lsusb'}->{'action'};
+ # $val1 = $alerts{'lsusb'}->{'message'};
+ # }
}
$key1 = ucfirst($key1);
- @rows = ({main::key($num++,0,1,$key1) => $val1,});
+ @$rows = ({main::key($num++,0,1,$key1) => $val1});
}
else {
- @rows = usb_data();
- if (!@rows){
+ usb_output($rows);
+ if (!@$rows){
my $key = 'Message';
- @data = ({
- main::key($num++,0,1,$key) => main::row_defaults('usb-data',''),
- },);
- @rows = (@rows,@data);
+ @$rows = ({
+ main::key($num++,0,1,$key) => main::message('usb-data','')
+ });
}
}
eval $end if $b_log;
- return @rows;
+ return $rows;
}
-sub usb_data {
+
+sub usb_output {
eval $start if $b_log;
- return if ! @usb;
- my (@data,@rows);
- my ($b_hub,$bus_id,$chip_id,$driver,$ind_sc,$path_id,$ports,$product,$serial,$speed,$type);
+ return if !$usb{'main'};
+ my $rows = $_[0];
+ my ($b_hub,$bus_id,$chip_id,$driver,$ind_rc,$ind_sc,$path_id,$ports,$product,
+ $rev,$serial,$speed_si,$type);
my $num = 0;
my $j = 0;
- # note: the data has been presorted in set_lsusb_data by:
- # bus id then device id, so we don't need to worry about the order
- foreach my $ref (@usb){
- my @id = @$ref;
- $j = scalar @rows;
- ($b_hub,$ind_sc,$num) = (0,3,1);
- $chip_id = $id[7];
- ($driver,$path_id,$ports,$product,
- $serial,$speed,$type) = ('','','','','','','');
- $speed = ( main::is_numeric($id[8]) ) ? sprintf("%1.1f",$id[8]) : $id[8] if $id[8];
- $product = main::cleaner($id[13]) if $id[13];
- $serial = main::apply_filter($id[16]) if $id[16];
+ # note: the data has been presorted in UsbData:
+ # bus alpah id, so we don't need to worry about the order
+ foreach my $id (@{$usb{'main'}}){
+ $j = scalar @$rows;
+ ($b_hub,$ind_rc,$ind_sc,$num) = (0,4,3,1);
+ ($driver,$path_id,$ports,$product,$rev,$serial,$speed_si,
+ $type) = ('','','','','','','','','');
+ $rev = $id->[8] if $id->[8];
+ $product = main::clean($id->[13]) if $id->[13];
+ $serial = main::filter($id->[16]) if $id->[16];
$product ||= 'N/A';
- $speed ||= 'N/A';
- $path_id = $id[2] if $id[2];
- $bus_id = "$path_id:$id[1]";
+ $rev ||= 'N/A';
+ $path_id = $id->[2] if $id->[2];
+ $bus_id = "$path_id:$id->[1]";
# it's a hub
- if ($id[4] eq '9'){
- $ports = $id[10] if $id[10];
+ if ($id->[4] eq '09'){
+ $ports = $id->[10] if $id->[10];
$ports ||= 'N/A';
- #print "pt0:$protocol\n";
- @data = ({
+ # print "pt0:$protocol\n";
+ push(@$rows, {
main::key($num++,1,1,'Hub') => $bus_id,
main::key($num++,0,2,'info') => $product,
main::key($num++,0,2,'ports') => $ports,
- main::key($num++,0,2,'rev') => $speed,
},);
- @rows = (@rows,@data);
$b_hub = 1;
+ $ind_rc =3;
$ind_sc =2;
}
# it's a device
else {
- $type = $id[14] if $id[14];
- $driver = $id[15] if $id[15];
+ $type = $id->[14] if $id->[14];
+ $driver = $id->[15] if $id->[15];
$type ||= 'N/A';
$driver ||= 'N/A';
- #print "pt3:$class:$product\n";
- $rows[$j]{main::key($num++,1,2,'Device')} = $bus_id;
- $rows[$j]{main::key($num++,0,3,'info')} = $product;
- $rows[$j]{main::key($num++,0,3,'type')} = $type;
+ # print "pt3:$class:$product\n";
+ $rows->[$j]{main::key($num++,1,2,'Device')} = $bus_id;
+ $rows->[$j]{main::key($num++,0,3,'info')} = $product;
+ $rows->[$j]{main::key($num++,0,3,'type')} = $type;
if ($extra > 0){
- $rows[$j]{main::key($num++,0,3,'driver')} = $driver;
+ $rows->[$j]{main::key($num++,0,3,'driver')} = $driver;
}
- if ($extra > 2 && $id[9]){
- $rows[$j]{main::key($num++,0,3,'interfaces')} = $id[9];
+ if ($extra > 2 && $id->[9]){
+ $rows->[$j]{main::key($num++,0,3,'interfaces')} = $id->[9];
}
- $rows[$j]{main::key($num++,0,3,'rev')} = $speed;
}
# for either hub or device
- if ($extra > 2 && main::is_numeric($id[17])){
- my $speed = $id[17];
- if ($speed >= 1000) {$speed = ($id[17] / 1000 ) . " Gb/s"}
- else {$speed = $id[17] . " Mb/s"}
- $rows[$j]{main::key($num++,0,$ind_sc,'speed')} = $speed;
- }
- if ($extra > 1){
- $rows[$j]{main::key($num++,0,$ind_sc,'chip ID')} = $chip_id;
- }
- if (!$b_hub && $extra > 2){
- if ($serial){
- $rows[$j]{main::key($num++,0,$ind_sc,'serial')} = main::apply_filter($serial);
+ $rows->[$j]{main::key($num++,1,$ind_sc,'rev')} = $rev;
+ if ($extra > 0){
+ $speed_si = ($id->[17]) ? $id->[17] : 'N/A';
+ $speed_si .= " ($id->[25])" if ($b_admin && $id->[25]);
+ $rows->[$j]{main::key($num++,0,$ind_rc,'speed')} = $speed_si;
+ if ($extra > 1){
+ if ($id->[24]){
+ if ($id->[23] == $id->[24]){
+ $rows->[$j]{main::key($num++,0,$ind_rc,'lanes')} = $id->[24];
+ }
+ else {
+ $rows->[$j]{main::key($num++,1,$ind_rc,'lanes')} = '';
+ $rows->[$j]{main::key($num++,0,($ind_rc+1),'rx')} = $id->[23];
+ $rows->[$j]{main::key($num++,0,($ind_rc+1),'tx')} = $id->[24];
+ }
+ }
+ }
+ # 22 is only available if 23 and 24 are present as well
+ if ($b_admin && $id->[22]){
+ $rows->[$j]{main::key($num++,0,$ind_rc,'mode')} = $id->[22];
+ }
+ if ($extra > 2 && $id->[19] && $id->[19] ne '0mA'){
+ $rows->[$j]{main::key($num++,0,$ind_sc,'power')} = $id->[19];
+ }
+ $chip_id = $id->[7];
+ $chip_id ||= 'N/A';
+ $rows->[$j]{main::key($num++,0,$ind_sc,'chip-ID')} = $chip_id;
+ if ($extra > 2 && defined $id->[5] && $id->[5] ne ''){
+ my $id = sprintf("%02s",$id->[4]) . sprintf("%02s", $id->[5]);
+ $rows->[$j]{main::key($num++,0,$ind_sc,'class-ID')} = $id;
+ }
+ if (!$b_hub && $extra > 2){
+ if ($serial){
+ $rows->[$j]{main::key($num++,0,$ind_sc,'serial')} = main::filter($serial);
+ }
}
}
}
- #print Data::Dumper::Dumper \@rows;
+ # print Data::Dumper::Dumper \@rows;
eval $end if $b_log;
- return @rows;
}
}
-## add metric / imperial (us) switch
-## WeatherData
+## WeatherItem
+# add metric / imperial (us) switch
{
-package WeatherData;
+package WeatherItem;
sub get {
eval $start if $b_log;
- my (@rows,$key1,$val1);
+ my $rows = [];
my $num = 0;
- @rows = create_output();
- eval $end if $b_log;
- return @rows;
-}
-sub create_output {
- eval $start if $b_log;
- my ($j,$num) = (0,0);
- my (@data,@location,@rows,$value,%weather,);
- my ($conditions) = ('NA');
- if ($show{'weather-location'}){
- my $location_string;
- $location_string = $show{'weather-location'};
- $location_string =~ s/\+/ /g;
- if ( $location_string =~ /,/){
- my @temp = split /,/, $location_string;
- my $sep = '';
- my $string = '';
- foreach (@temp){
- $_ = ucfirst($_);
- $string .= $sep . $_;
- $sep = ', ';
- }
- $location_string = $string;
- }
- $location_string = main::apply_filter($location_string);
- @location = ($show{'weather-location'},$location_string,'');
+ my $location = [];
+ location_data($location);
+ # print Data::Dumper::Dumper $location;exit;
+ if (!$location->[0]){
+ @$rows = ({
+ main::key($num++,0,1,'Message') => main::message('weather-null','current location')
+ });
}
else {
- @location = get_location();
- if (!$location[0]) {
- return @rows = ({
- main::key($num++,0,1,'Message') => main::row_defaults('weather-null','current location'),
+ my $weather = get_weather($location);
+ if ($weather->{'error'}){
+ @$rows = ({
+ main::key($num++,0,1,'Message') => main::message('weather-error',$weather->{'error'})
});
}
+ elsif (!$weather->{'weather'}){
+ @$rows = ({
+ main::key($num++,0,1,'Message') => main::message('weather-null','weather data')
+ });
+ }
+ else {
+ weather_output($rows,$location,$weather);
+ }
}
- %weather = get_weather(@location);
- if ($weather{'error'}) {
- return @rows = ({
- main::key($num++,0,1,'Message') => main::row_defaults('weather-error',$weather{'error'}),
- });
- }
- if (!$weather{'weather'}) {
- return @rows = ({
- main::key($num++,0,1,'Message') => main::row_defaults('weather-null','weather data'),
+ if (!@$rows){
+ @$rows = ({
+ main::key($num++,0,1,'Message') => main::message('weather-null','weather data')
});
}
- $conditions = "$weather{'weather'}";
- my $temp = unit_output($weather{'temp'},$weather{'temp-c'},'C',$weather{'temp-f'},'F');
- $j = scalar @rows;
- @data = ({
+ eval $end if $b_log;
+ return $rows;
+}
+
+sub weather_output {
+ eval $start if $b_log;
+ my ($rows,$location,$weather) = @_;
+ my ($j,$num) = (0,0);
+ my ($value);
+ my ($conditions) = ('NA');
+ $conditions = "$weather->{'weather'}";
+ my $temp = process_unit(
+ $weather->{'temp'},
+ $weather->{'temp-c'},'C',
+ $weather->{'temp-f'},'F');
+ $j = scalar @$rows;
+ push(@$rows, {
main::key($num++,1,1,'Report') => '',
main::key($num++,0,2,'temperature') => $temp,
main::key($num++,0,2,'conditions') => $conditions,
},);
- @rows = (@rows,@data);
if ($extra > 0){
- my $pressure = unit_output($weather{'pressure'},$weather{'pressure-mb'},'mb',$weather{'pressure-in'},'in');
- my $wind = wind_output($weather{'wind'},$weather{'wind-direction'},$weather{'wind-mph'},$weather{'wind-ms'},
- $weather{'wind-gust-mph'},$weather{'wind-gust-ms'});
- $rows[$j]{main::key($num++,0,2,'wind')} = $wind;
+ my $pressure = process_unit(
+ $weather->{'pressure'},
+ $weather->{'pressure-mb'},'mb',
+ $weather->{'pressure-in'},'in');
+ my $wind = process_wind(
+ $weather->{'wind'},
+ $weather->{'wind-direction'},
+ $weather->{'wind-mph'},
+ $weather->{'wind-ms'},
+ $weather->{'wind-gust-mph'},
+ $weather->{'wind-gust-ms'});
+ $rows->[$j]{main::key($num++,0,2,'wind')} = $wind;
if ($extra > 1){
- if (defined $weather{'cloud-cover'}){
- $rows[$j]{main::key($num++,0,2,'cloud cover')} = $weather{'cloud-cover'} . '%';
+ if (defined $weather->{'cloud-cover'}){
+ $rows->[$j]{main::key($num++,0,2,'cloud cover')} = $weather->{'cloud-cover'} . '%';
}
- if ($weather{'precip-1h-mm'} && defined $weather{'precip-1h-in'} ){
- $value = unit_output('',$weather{'precip-1h-mm'},'mm',$weather{'precip-1h-in'},'in');
- $rows[$j]{main::key($num++,0,2,'precipitation')} = $value;
+ if ($weather->{'precip-1h-mm'} && defined $weather->{'precip-1h-in'}){
+ $value = process_unit('',$weather->{'precip-1h-mm'},'mm',
+ $weather->{'precip-1h-in'},'in');
+ $rows->[$j]{main::key($num++,0,2,'precipitation')} = $value;
}
- if ($weather{'rain-1h-mm'} && defined $weather{'rain-1h-in'} ){
- $value = unit_output('',$weather{'rain-1h-mm'},'mm',$weather{'rain-1h-in'},'in');
- $rows[$j]{main::key($num++,0,2,'rain')} = $value;
+ if ($weather->{'rain-1h-mm'} && defined $weather->{'rain-1h-in'}){
+ $value = process_unit('',$weather->{'rain-1h-mm'},'mm',
+ $weather->{'rain-1h-in'},'in');
+ $rows->[$j]{main::key($num++,0,2,'rain')} = $value;
}
- if ($weather{'snow-1h-mm'} && defined $weather{'snow-1h-in'} ){
- $value = unit_output('',$weather{'snow-1h-mm'},'mm',$weather{'snow-1h-in'},'in');
- $rows[$j]{main::key($num++,0,2,'snow')} = $value;
+ if ($weather->{'snow-1h-mm'} && defined $weather->{'snow-1h-in'}){
+ $value = process_unit('',$weather->{'snow-1h-mm'},'mm',
+ $weather->{'snow-1h-in'},'in');
+ $rows->[$j]{main::key($num++,0,2,'snow')} = $value;
}
}
- $rows[$j]{main::key($num++,0,2,'humidity')} = $weather{'humidity'} . '%';
+ $rows->[$j]{main::key($num++,0,2,'humidity')} = $weather->{'humidity'} . '%';
if ($extra > 1){
- if ($weather{'dewpoint'} || (defined $weather{'dewpoint-c'} && defined $weather{'dewpoint-f'})){
- $value = unit_output($weather{'dewpoint'},$weather{'dewpoint-c'},'C',$weather{'dewpoint-f'},'F');
- $rows[$j]{main::key($num++,0,2,'dew point')} = $value;
+ if ($weather->{'dewpoint'} || (defined $weather->{'dewpoint-c'} &&
+ defined $weather->{'dewpoint-f'})){
+ $value = process_unit(
+ $weather->{'dewpoint'},
+ $weather->{'dewpoint-c'},
+ 'C',
+ $weather->{'dewpoint-f'},
+ 'F');
+ $rows->[$j]{main::key($num++,0,2,'dew point')} = $value;
}
}
- $rows[$j]{main::key($num++,0,2,'pressure')} = $pressure;
+ $rows->[$j]{main::key($num++,0,2,'pressure')} = $pressure;
}
if ($extra > 1){
- if ($weather{'heat-index'} || (defined $weather{'heat-index-c'} && defined $weather{'heat-index-f'})){
- $value = unit_output($weather{'heat-index'},$weather{'heat-index-c'},'C',$weather{'heat-index-f'},'F');
- $rows[$j]{main::key($num++,0,2,'heat index')} = $value;
- }
- if ($weather{'windchill'} || (defined $weather{'windchill-c'} && defined $weather{'windchill-f'})){
- $value = unit_output($weather{'windchill'},$weather{'windchill-c'},'C',$weather{'windchill-f'},'F');
- $rows[$j]{main::key($num++,0,2,'wind chill')} = $value;
+ if ($weather->{'heat-index'} || (defined $weather->{'heat-index-c'} &&
+ defined $weather->{'heat-index-f'})){
+ $value = process_unit(
+ $weather->{'heat-index'},
+ $weather->{'heat-index-c'},'C',
+ $weather->{'heat-index-f'},'F');
+ $rows->[$j]{main::key($num++,0,2,'heat index')} = $value;
+ }
+ if ($weather->{'windchill'} || (defined $weather->{'windchill-c'} &&
+ defined $weather->{'windchill-f'})){
+ $value = process_unit(
+ $weather->{'windchill'},
+ $weather->{'windchill-c'},'C',
+ $weather->{'windchill-f'},'F');
+ $rows->[$j]{main::key($num++,0,2,'wind chill')} = $value;
}
if ($extra > 2){
- if ($weather{'forecast'}){
- $j = scalar @rows;
- @data = ({
- main::key($num++,1,1,'Forecast') => $weather{'forecast'},
+ if ($weather->{'forecast'}){
+ $j = scalar @$rows;
+ push(@$rows, {
+ main::key($num++,1,1,'Forecast') => $weather->{'forecast'},
},);
- @rows = (@rows,@data);
}
}
}
- $j = scalar @rows;
- my $location = '';
+ $j = scalar @$rows;
if ($extra > 2 && !$use{'filter'}){
- $location = complete_location($location[1],$weather{'city'},$weather{'state'},$weather{'country'});
- }
- @data = ({
- main::key($num++,1,1,'Locale') => $location,
+ complete_location(
+ $location,
+ $weather->{'city'},
+ $weather->{'state'},
+ $weather->{'country'});
+ }
+ push(@$rows, {
+ main::key($num++,1,1,'Locale') => $location->[1],
},);
- @rows = (@rows,@data);
- if ($extra > 2 && !$use{'filter'} && ($weather{'elevation-m'} || $weather{'elevation-ft'} )){
- $rows[$j]{main::key($num++,0,2,'altitude')} = elevation_output($weather{'elevation-m'},$weather{'elevation-ft'});
+ if ($extra > 2 && !$use{'filter'} && ($weather->{'elevation-m'} ||
+ $weather->{'elevation-ft'})){
+ $rows->[$j]{main::key($num++,0,2,'altitude')} = process_elevation(
+ $weather->{'elevation-m'},
+ $weather->{'elevation-ft'});
}
- $rows[$j]{main::key($num++,0,2,'current time')} = $weather{'date-time'},;
+ $rows->[$j]{main::key($num++,0,2,'current time')} = $weather->{'date-time'},;
if ($extra > 2){
- $weather{'observation-time-local'} = 'N/A' if !$weather{'observation-time-local'};
- $rows[$j]{main::key($num++,0,2,'observation time')} = $weather{'observation-time-local'};
- if ($weather{'sunrise'}){
- $rows[$j]{main::key($num++,0,2,'sunrise')} = $weather{'sunrise'};
+ $weather->{'observation-time-local'} = 'N/A' if !$weather->{'observation-time-local'};
+ $rows->[$j]{main::key($num++,0,2,'observation time')} = $weather->{'observation-time-local'};
+ if ($weather->{'sunrise'}){
+ $rows->[$j]{main::key($num++,0,2,'sunrise')} = $weather->{'sunrise'};
}
- if ($weather{'sunset'}){
- $rows[$j]{main::key($num++,0,2,'sunset')} = $weather{'sunset'};
+ if ($weather->{'sunset'}){
+ $rows->[$j]{main::key($num++,0,2,'sunset')} = $weather->{'sunset'};
}
- if ($weather{'moonphase'}){
- $value = $weather{'moonphase'} . '%';
- $value .= ($weather{'moonphase-graphic'}) ? ' ' . $weather{'moonphase-graphic'} :'';
- $rows[$j]{main::key($num++,0,2,'moonphase')} = $value;
+ if ($weather->{'moonphase'}){
+ $value = $weather->{'moonphase'} . '%';
+ $value .= ($weather->{'moonphase-graphic'}) ? ' ' . $weather->{'moonphase-graphic'} :'';
+ $rows->[$j]{main::key($num++,0,2,'moonphase')} = $value;
}
}
- if ($weather{'api-source'}){
- $rows[$j]{main::key($num++,0,1,'Source')} = $weather{'api-source'};
+ if ($weather->{'api-source'}){
+ $rows->[$j]{main::key($num++,0,1,'Source')} = $weather->{'api-source'};
}
eval $end if $b_log;
- return @rows;
}
-sub elevation_output {
+
+sub process_elevation {
eval $start if $b_log;
my ($meters,$feet) = @_;
my ($result,$i_unit,$m_unit) = ('','ft','m');
$feet = sprintf("%.0f", 3.28 * $meters) if defined $meters && !$feet;
- $meters = sprintf("%.1f", $feet / 3.28 ) if defined $feet && !$meters;
+ $meters = sprintf("%.1f", $feet/3.28) if defined $feet && !$meters;
$meters = sprintf("%.0f", $meters) if $meters;
- if ( defined $meters && $weather_unit eq 'mi' ){
+ if (defined $meters && $weather_unit eq 'mi'){
$result = "$meters $m_unit ($feet $i_unit)";
}
- elsif (defined $meters && $weather_unit eq 'im' ){
+ elsif (defined $meters && $weather_unit eq 'im'){
$result = "$feet $i_unit ($meters $m_unit)";
}
- elsif (defined $meters && $weather_unit eq 'm' ){
+ elsif (defined $meters && $weather_unit eq 'm'){
$result = "$meters $m_unit";
}
- elsif (defined $feet && $weather_unit eq 'i' ){
+ elsif (defined $feet && $weather_unit eq 'i'){
$result = "$feet $i_unit";
}
else {
@@ -17211,20 +28571,21 @@ sub elevation_output {
eval $end if $b_log;
return $result;
}
-sub unit_output {
+
+sub process_unit {
eval $start if $b_log;
my ($primary,$metric,$m_unit,$imperial,$i_unit) = @_;
my $result = '';
- if (defined $metric && defined $imperial && $weather_unit eq 'mi' ){
+ if (defined $metric && defined $imperial && $weather_unit eq 'mi'){
$result = "$metric $m_unit ($imperial $i_unit)";
}
- elsif (defined $metric && defined $imperial && $weather_unit eq 'im' ){
+ elsif (defined $metric && defined $imperial && $weather_unit eq 'im'){
$result = "$imperial $i_unit ($metric $m_unit)";
}
- elsif (defined $metric && $weather_unit eq 'm' ){
+ elsif (defined $metric && $weather_unit eq 'm'){
$result = "$metric $m_unit";
}
- elsif (defined $imperial && $weather_unit eq 'i' ){
+ elsif (defined $imperial && $weather_unit eq 'i'){
$result = "$imperial $i_unit";
}
elsif ($primary){
@@ -17236,7 +28597,8 @@ sub unit_output {
eval $end if $b_log;
return $result;
}
-sub wind_output {
+
+sub process_wind {
eval $start if $b_log;
my ($primary,$direction,$mph,$ms,$gust_mph,$gust_ms) = @_;
my ($result,$gust_kmh,$kmh,$i_unit,$m_unit,$km_unit) = ('','','','mph','m/s','km/h');
@@ -17246,42 +28608,42 @@ sub wind_output {
# calculate and round, order matters so that rounding only happens after math done
$ms = 0.44704 * $mph if defined $mph && !defined $ms;
$mph = $ms * 2.23694 if defined $ms && !defined $mph;
- $kmh = sprintf("%.0f", 18 * $ms / 5) if defined $ms;
- $ms = sprintf("%.1f", $ms ) if defined $ms; # very low mph speeds yield 0, which is wrong
+ $kmh = sprintf("%.0f", 18*$ms/5) if defined $ms;
+ $ms = sprintf("%.1f", $ms) if defined $ms; # very low mph speeds yield 0, which is wrong
$mph = sprintf("%.0f", $mph) if defined $mph;
$gust_ms = 0.44704 * $gust_mph if $gust_mph && !$gust_ms;
$gust_kmh = 18 * $gust_ms / 5 if $gust_ms;
$gust_mph = $gust_ms * 2.23694 if $gust_ms && !$gust_mph;
$gust_mph = sprintf("%.0f", $gust_mph) if $gust_mph;
$gust_kmh = sprintf("%.0f", $gust_kmh) if $gust_kmh;
- $gust_ms = sprintf("%.0f", $gust_ms ) if $gust_ms;
+ $gust_ms = sprintf("%.0f", $gust_ms) if $gust_ms;
if (!defined $mph && $primary){
$result = $primary;
}
- elsif (defined $mph && defined $direction ){
- if ( $weather_unit eq 'mi' ){
+ elsif (defined $mph && defined $direction){
+ if ($weather_unit eq 'mi'){
$result = "from $direction at $ms $m_unit ($kmh $km_unit, $mph $i_unit)";
}
- elsif ( $weather_unit eq 'im' ){
+ elsif ($weather_unit eq 'im'){
$result = "from $direction at $mph $i_unit ($ms $m_unit, $kmh $km_unit)";
}
- elsif ( $weather_unit eq 'm' ){
+ elsif ($weather_unit eq 'm'){
$result = "from $direction at $ms $m_unit ($kmh $km_unit)";
}
- elsif ( $weather_unit eq 'i' ){
+ elsif ($weather_unit eq 'i'){
$result = "from $direction at $mph $i_unit";
}
if ($gust_mph){
- if ( $weather_unit eq 'mi' ){
+ if ($weather_unit eq 'mi'){
$result .= ". Gusting to $ms $m_unit ($kmh $km_unit, $mph $i_unit)";
}
- elsif ( $weather_unit eq 'im' ){
+ elsif ($weather_unit eq 'im'){
$result .= ". Gusting to $mph $i_unit ($ms $m_unit, $kmh $km_unit)";
}
- elsif ( $weather_unit eq 'm' ){
+ elsif ($weather_unit eq 'm'){
$result .= ". Gusting to $ms $m_unit ($kmh $km_unit)";
}
- elsif ( $weather_unit eq 'i' ){
+ elsif ($weather_unit eq 'i'){
$result .= ". Gusting to $mph $i_unit";
}
}
@@ -17295,283 +28657,290 @@ sub wind_output {
eval $end if $b_log;
return $result;
}
+
sub get_weather {
eval $start if $b_log;
- my (@location) = @_;
+ my ($location) = @_;
my $now = POSIX::strftime "%Y%m%d%H%M", localtime;
- my ($date_time,$freshness,$tz,@weather_data,%weather);
- my $loc_name = lc($location[0]);
+ my ($date_time,$freshness,$tz,$weather_data);
+ my $weather = {};
+ my $loc_name = lc($location->[0]);
$loc_name =~ s/-\/|\s|,/-/g;
$loc_name =~ s/--/-/g;
my $file_cached = "$user_data_dir/weather-$loc_name-$weather_source.txt";
- if (-f $file_cached){
- @weather_data = main::reader($file_cached);
- $freshness = (split /\^\^/, $weather_data[0])[1];
- #print "$now:$freshness\n";
+ if (-r $file_cached){
+ @$weather_data = main::reader($file_cached);
+ $freshness = (split(/\^\^/, $weather_data->[0]))[1];
+ # print "$now:$freshness\n";
}
- if (!$freshness || $freshness < ($now - 60) ) {
- @weather_data = download_weather($now,$file_cached,@location);
+ if (!$freshness || $freshness < ($now - 60)){
+ $weather_data = download_weather($now,$file_cached,$location);
}
- #print join "\n", @weather_data, "\n";
+ # print join("\n", @weather_data), "\n";
# NOTE: because temps can be 0, we can't do if value tests
- foreach (@weather_data){
- my @working = split /\s*\^\^\s*/,$_;
+ foreach (@$weather_data){
+ my @working = split(/\s*\^\^\s*/, $_);
next if ! defined $working[1] || $working[1] eq '';
- if ( $working[0] eq 'api_source' ){
- $weather{'api-source'} = $working[1];
+ if ($working[0] eq 'api_source'){
+ $weather->{'api-source'} = $working[1];
}
- elsif ( $working[0] eq 'city' ){
- $weather{'city'} = $working[1];
+ elsif ($working[0] eq 'city'){
+ $weather->{'city'} = $working[1];
}
- elsif ( $working[0] eq 'cloud_cover' ){
- $weather{'cloud-cover'} = $working[1];
+ elsif ($working[0] eq 'cloud_cover'){
+ $weather->{'cloud-cover'} = $working[1];
}
- elsif ( $working[0] eq 'country' ){
- $weather{'country'} = $working[1];
+ elsif ($working[0] eq 'country'){
+ $weather->{'country'} = $working[1];
}
- elsif ( $working[0] eq 'dewpoint_string' ){
- $weather{'dewpoint'} = $working[1];
+ elsif ($working[0] eq 'dewpoint_string'){
+ $weather->{'dewpoint'} = $working[1];
$working[1] =~ /^([0-9\.]+)\sF\s\(([0-9\.]+)\sC\)/;
- $weather{'dewpoint-c'} = $2;;
- $weather{'dewpoint-f'} = $1;;
+ $weather->{'dewpoint-c'} = $2;;
+ $weather->{'dewpoint-f'} = $1;;
}
- elsif ( $working[0] eq 'dewpoint_c' ){
- $weather{'dewpoint-c'} = $working[1];
+ elsif ($working[0] eq 'dewpoint_c'){
+ $weather->{'dewpoint-c'} = $working[1];
}
- elsif ( $working[0] eq 'dewpoint_f' ){
- $weather{'dewpoint-f'} = $working[1];
+ elsif ($working[0] eq 'dewpoint_f'){
+ $weather->{'dewpoint-f'} = $working[1];
}
# WU: there are two elevations, we want the first one
- elsif (!$weather{'elevation-m'} && $working[0] eq 'elevation'){
+ elsif (!$weather->{'elevation-m'} && $working[0] eq 'elevation'){
# note: bug in source data uses ft for meters, not 100% of time, but usually
- $weather{'elevation-m'} = $working[1];
- $weather{'elevation-m'} =~ s/\s*(ft|m).*$//;
+ $weather->{'elevation-m'} = $working[1];
+ $weather->{'elevation-m'} =~ s/\s*(ft|m).*$//;
}
- elsif ( $working[0] eq 'error' ){
- $weather{'error'} = $working[1];
+ elsif ($working[0] eq 'error'){
+ $weather->{'error'} = $working[1];
}
- elsif ( $working[0] eq 'forecast' ){
- $weather{'forecast'} = $working[1];
+ elsif ($working[0] eq 'forecast'){
+ $weather->{'forecast'} = $working[1];
}
- elsif ( $working[0] eq 'heat_index_string' ){
- $weather{'heat-index'} = $working[1];
+ elsif ($working[0] eq 'heat_index_string'){
+ $weather->{'heat-index'} = $working[1];
$working[1] =~ /^([0-9\.]+)\sF\s\(([0-9\.]+)\sC\)/;
- $weather{'heat-index-c'} = $2;;
- $weather{'heat-index-f'} = $1;
+ $weather->{'heat-index-c'} = $2;;
+ $weather->{'heat-index-f'} = $1;
}
- elsif ( $working[0] eq 'heat_index_c' ){
- $weather{'heat-index-c'} = $working[1];
+ elsif ($working[0] eq 'heat_index_c'){
+ $weather->{'heat-index-c'} = $working[1];
}
- elsif ( $working[0] eq 'heat_index_f' ){
- $weather{'heat-index-f'} = $working[1];
+ elsif ($working[0] eq 'heat_index_f'){
+ $weather->{'heat-index-f'} = $working[1];
}
- elsif ( $working[0] eq 'relative_humidity' ){
+ elsif ($working[0] eq 'relative_humidity'){
$working[1] =~ s/%$//;
- $weather{'humidity'} = $working[1];
+ $weather->{'humidity'} = $working[1];
}
- elsif ( $working[0] eq 'local_time' ){
- $weather{'local-time'} = $working[1];
+ elsif ($working[0] eq 'local_time'){
+ $weather->{'local-time'} = $working[1];
}
- elsif ( $working[0] eq 'local_epoch' ){
- $weather{'local-epoch'} = $working[1];
+ elsif ($working[0] eq 'local_epoch'){
+ $weather->{'local-epoch'} = $working[1];
}
- elsif ( $working[0] eq 'moonphase' ){
- $weather{'moonphase'} = $working[1];
+ elsif ($working[0] eq 'moonphase'){
+ $weather->{'moonphase'} = $working[1];
}
- elsif ( $working[0] eq 'moonphase_graphic' ){
- $weather{'moonphase-graphic'} = $working[1];
+ elsif ($working[0] eq 'moonphase_graphic'){
+ $weather->{'moonphase-graphic'} = $working[1];
}
- elsif ( $working[0] eq 'observation_time_rfc822' ){
- $weather{'observation-time-rfc822'} = $working[1];
+ elsif ($working[0] eq 'observation_time_rfc822'){
+ $weather->{'observation-time-rfc822'} = $working[1];
}
- elsif ( $working[0] eq 'observation_epoch' ){
- $weather{'observation-epoch'} = $working[1];
+ elsif ($working[0] eq 'observation_epoch'){
+ $weather->{'observation-epoch'} = $working[1];
}
- elsif ( $working[0] eq 'observation_time' ){
- $weather{'observation-time-local'} = $working[1];
- $weather{'observation-time-local'} =~ s/Last Updated on //;
+ elsif ($working[0] eq 'observation_time'){
+ $weather->{'observation-time-local'} = $working[1];
+ $weather->{'observation-time-local'} =~ s/Last Updated on //;
}
- elsif ( $working[0] eq 'precip_mm' ){
- $weather{'precip-1h-mm'} = $working[1];
+ elsif ($working[0] eq 'precip_mm'){
+ $weather->{'precip-1h-mm'} = $working[1];
}
- elsif ( $working[0] eq 'precip_in' ){
- $weather{'precip-1h-in'} = $working[1];
+ elsif ($working[0] eq 'precip_in'){
+ $weather->{'precip-1h-in'} = $working[1];
}
- elsif ( $working[0] eq 'pressure_string' ){
- $weather{'pressure'} = $working[1];
+ elsif ($working[0] eq 'pressure_string'){
+ $weather->{'pressure'} = $working[1];
}
- elsif ( $working[0] eq 'pressure_mb' ){
- $weather{'pressure-mb'} = $working[1];
+ elsif ($working[0] eq 'pressure_mb'){
+ $weather->{'pressure-mb'} = $working[1];
}
- elsif ( $working[0] eq 'pressure_in' ){
- $weather{'pressure-in'} = $working[1];
+ elsif ($working[0] eq 'pressure_in'){
+ $weather->{'pressure-in'} = $working[1];
}
- elsif ( $working[0] eq 'rain_1h_mm' ){
- $weather{'rain-1h-mm'} = $working[1];
+ elsif ($working[0] eq 'rain_1h_mm'){
+ $weather->{'rain-1h-mm'} = $working[1];
}
- elsif ( $working[0] eq 'rain_1h_in' ){
- $weather{'rain-1h-in'} = $working[1];
+ elsif ($working[0] eq 'rain_1h_in'){
+ $weather->{'rain-1h-in'} = $working[1];
}
- elsif ( $working[0] eq 'snow_1h_mm' ){
- $weather{'snow-1h-mm'} = $working[1];
+ elsif ($working[0] eq 'snow_1h_mm'){
+ $weather->{'snow-1h-mm'} = $working[1];
}
- elsif ( $working[0] eq 'snow_1h_in' ){
- $weather{'snow-1h-in'} = $working[1];
+ elsif ($working[0] eq 'snow_1h_in'){
+ $weather->{'snow-1h-in'} = $working[1];
}
- elsif ( $working[0] eq 'state_name' ){
- $weather{'state'} = $working[1];
+ elsif ($working[0] eq 'state_name'){
+ $weather->{'state'} = $working[1];
}
- elsif ( $working[0] eq 'sunrise' ){
+ elsif ($working[0] eq 'sunrise'){
if ($working[1]){
if ($working[1] !~ /^[0-9]+$/){
- $weather{'sunrise'} = $working[1];
+ $weather->{'sunrise'} = $working[1];
}
# trying to figure out remote time from UTC is too hard
elsif (!$show{'weather-location'}){
- $weather{'sunrise'} = POSIX::strftime "%T", localtime($working[1]);
+ $weather->{'sunrise'} = POSIX::strftime "%T", localtime($working[1]);
}
}
}
- elsif ( $working[0] eq 'sunset' ){
+ elsif ($working[0] eq 'sunset'){
if ($working[1]){
if ($working[1] !~ /^[0-9]+$/){
- $weather{'sunset'} = $working[1];
+ $weather->{'sunset'} = $working[1];
}
# trying to figure out remote time from UTC is too hard
elsif (!$show{'weather-location'}){
- $weather{'sunset'} = POSIX::strftime "%T", localtime($working[1]);
+ $weather->{'sunset'} = POSIX::strftime "%T", localtime($working[1]);
}
}
}
- elsif ( $working[0] eq 'temperature_string' ){
- $weather{'temp'} = $working[1];
+ elsif ($working[0] eq 'temperature_string'){
+ $weather->{'temp'} = $working[1];
$working[1] =~ /^([0-9\.]+)\sF\s\(([0-9\.]+)\sC\)/;
- $weather{'temp-c'} = $2;;
- $weather{'temp-f'} = $1;
-# $weather{'temp'} =~ s/\sF/\xB0 F/; # B0
-# $weather{'temp'} =~ s/\sF/\x{2109}/;
-# $weather{'temp'} =~ s/\sC/\x{2103}/;
+ $weather->{'temp-c'} = $2;;
+ $weather->{'temp-f'} = $1;
+ # $weather->{'temp'} =~ s/\sF/\xB0 F/; # B0
+ # $weather->{'temp'} =~ s/\sF/\x{2109}/;
+ # $weather->{'temp'} =~ s/\sC/\x{2103}/;
}
- elsif ( $working[0] eq 'temp_f' ){
- $weather{'temp-f'} = $working[1];
+ elsif ($working[0] eq 'temp_f'){
+ $weather->{'temp-f'} = $working[1];
}
- elsif ( $working[0] eq 'temp_c' ){
- $weather{'temp-c'} = $working[1];
+ elsif ($working[0] eq 'temp_c'){
+ $weather->{'temp-c'} = $working[1];
}
- elsif ( $working[0] eq 'timezone' ){
- $weather{'timezone'} = $working[1];
+ elsif ($working[0] eq 'timezone'){
+ $weather->{'timezone'} = $working[1];
}
- elsif ( $working[0] eq 'visibility' ){
- $weather{'visibility'} = $working[1];
+ elsif ($working[0] eq 'visibility'){
+ $weather->{'visibility'} = $working[1];
}
- elsif ( $working[0] eq 'visibility_km' ){
- $weather{'visibility-km'} = $working[1];
+ elsif ($working[0] eq 'visibility_km'){
+ $weather->{'visibility-km'} = $working[1];
}
- elsif ( $working[0] eq 'visibility_mi' ){
- $weather{'visibility-mi'} = $working[1];
+ elsif ($working[0] eq 'visibility_mi'){
+ $weather->{'visibility-mi'} = $working[1];
}
- elsif ( $working[0] eq 'weather' ){
- $weather{'weather'} = $working[1];
+ elsif ($working[0] eq 'weather'){
+ $weather->{'weather'} = $working[1];
}
- elsif ( $working[0] eq 'wind_degrees' ){
- $weather{'wind-degrees'} = $working[1];
+ elsif ($working[0] eq 'wind_degrees'){
+ $weather->{'wind-degrees'} = $working[1];
}
- elsif ( $working[0] eq 'wind_dir' ){
- $weather{'wind-direction'} = $working[1];
+ elsif ($working[0] eq 'wind_dir'){
+ $weather->{'wind-direction'} = $working[1];
}
- elsif ( $working[0] eq 'wind_mph' ){
- $weather{'wind-mph'} = $working[1];
+ elsif ($working[0] eq 'wind_mph'){
+ $weather->{'wind-mph'} = $working[1];
}
- elsif ( $working[0] eq 'wind_gust_mph' ){
- $weather{'wind-gust-mph'} = $working[1];
+ elsif ($working[0] eq 'wind_gust_mph'){
+ $weather->{'wind-gust-mph'} = $working[1];
}
- elsif ( $working[0] eq 'wind_gust_ms' ){
- $weather{'wind-gust-ms'} = $working[1];
+ elsif ($working[0] eq 'wind_gust_ms'){
+ $weather->{'wind-gust-ms'} = $working[1];
}
- elsif ( $working[0] eq 'wind_ms' ){
- $weather{'wind-ms'} = $working[1];
+ elsif ($working[0] eq 'wind_ms'){
+ $weather->{'wind-ms'} = $working[1];
}
- elsif ( $working[0] eq 'wind_string' ){
- $weather{'wind'} = $working[1];
+ elsif ($working[0] eq 'wind_string'){
+ $weather->{'wind'} = $working[1];
}
- elsif ( $working[0] eq 'windchill_string' ){
- $weather{'windchill'} = $working[1];
+ elsif ($working[0] eq 'windchill_string'){
+ $weather->{'windchill'} = $working[1];
$working[1] =~ /^([0-9\.]+)\sF\s\(([0-9\.]+)\sC\)/;
- $weather{'windchill-c'} = $2;
- $weather{'windchill-f'} = $1;
+ $weather->{'windchill-c'} = $2;
+ $weather->{'windchill-f'} = $1;
}
- elsif ( $working[0] eq 'windchill_c' ){
- $weather{'windchill-c'} = $working[1];
+ elsif ($working[0] eq 'windchill_c'){
+ $weather->{'windchill-c'} = $working[1];
}
- elsif ( $working[0] eq 'windchill_f' ){
- $weather{'windchill_f'} = $working[1];
+ elsif ($working[0] eq 'windchill_f'){
+ $weather->{'windchill_f'} = $working[1];
}
}
if ($show{'weather-location'}){
- if ($weather{'observation-time-local'} &&
- $weather{'observation-time-local'} =~ /^(.*)\s([a-z_]+\/[a-z_]+)$/i){
+ if ($weather->{'observation-time-local'} &&
+ $weather->{'observation-time-local'} =~ /^(.*)\s([a-z_]+\/[a-z_]+)$/i){
$tz = $2;
}
- if (!$tz && $weather{'timezone'}){
- $tz = $weather{'timezone'};
- $weather{'observation-time-local'} .= ' (' . $weather{'timezone'} . ')' if $weather{'observation-time-local'};
+ if (!$tz && $weather->{'timezone'}){
+ $tz = $weather->{'timezone'};
+ $weather->{'observation-time-local'} .= ' (' . $weather->{'timezone'} . ')' if $weather->{'observation-time-local'};
}
# very clever trick, just make the system think it's in the
# remote timezone for this local block only
local $ENV{'TZ'} = $tz if $tz;
$date_time = POSIX::strftime "%c", localtime();
$date_time = test_locale_date($date_time,'','');
- $weather{'date-time'} = $date_time;
+ $weather->{'date-time'} = $date_time;
# only wu has rfc822 value, and we want the original observation time then
- if ($weather{'observation-epoch'} && $tz){
- $date_time = POSIX::strftime "%Y-%m-%d %T ($tz %z)", localtime($weather{'observation-epoch'});
- $date_time = test_locale_date($date_time,$show{'weather-location'},$weather{'observation-epoch'});
- $weather{'observation-time-local'} = $date_time;
+ if ($weather->{'observation-epoch'} && $tz){
+ $date_time = POSIX::strftime "%Y-%m-%d %T ($tz %z)", localtime($weather->{'observation-epoch'});
+ $date_time = test_locale_date($date_time,$show{'weather-location'},$weather->{'observation-epoch'});
+ $weather->{'observation-time-local'} = $date_time;
}
}
else {
$date_time = POSIX::strftime "%c", localtime();
$date_time = test_locale_date($date_time,'','');
- $tz = ( $location[2] ) ? " ($location[2])" : '';
- $weather{'date-time'} = $date_time . $tz;
+ $tz = ($location->[2]) ? " ($location->[2])" : '';
+ $weather->{'date-time'} = $date_time . $tz;
}
# we get the wrong time using epoch for remote -W location
- if ( !$show{'weather-location'} && $weather{'observation-epoch'}){
- $date_time = POSIX::strftime "%c", localtime($weather{'observation-epoch'});
- $date_time = test_locale_date($date_time,$show{'weather-location'},$weather{'observation-epoch'});
- $weather{'observation-time-local'} = $date_time;
+ if (!$show{'weather-location'} && $weather->{'observation-epoch'}){
+ $date_time = POSIX::strftime "%c", localtime($weather->{'observation-epoch'});
+ $date_time = test_locale_date($date_time,$show{'weather-location'},$weather->{'observation-epoch'});
+ $weather->{'observation-time-local'} = $date_time;
}
- return %weather;
eval $end if $b_log;
+ return $weather;
}
+
sub download_weather {
eval $start if $b_log;
- my ($now,$file_cached,@location) = @_;
- my (@weather,$temp,$ua,$url);
- $url = "https://smxi.org/opt/xr2.php?loc=$location[0]&src=$weather_source";
+ my ($now,$file_cached,$location) = @_;
+ my ($temp,$ua,$url);
+ my $weather = [];
+ $url = "https://smxi.org/opt/xr2.php?loc=$location->[0]&src=$weather_source";
$ua = 'weather';
-# {
-# #my $file2 = "$ENV{'HOME'}/bin/scripts/inxi/data/weather/weather-1.xml";
-# # my $file2 = "$ENV{'HOME'}/bin/scripts/inxi/data/weather/feed-oslo-1.xml";
-# local $/;
-# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/weather/weather-1.xml";
-# open my $fh, '<', $file or die "can't open $file: $!";
-# $temp = <$fh>;
-# }
- $temp = main::download_file('stdout',$url,'',$ua);
- @weather = split(/\n/, $temp) if $temp;
- unshift (@weather,("timestamp^^$now"));
- main::writer($file_cached,\@weather);
- #print "$file_cached: download/cleaned\n";
- eval $end if $b_log;
- return @weather;
-}
-# resolve wide character issue, if detected, switch to iso
+ if ($fake{'weather'}){
+ # my $file2 = "$fake_data_dir/weather/weather-1.xml";
+ # my $file2 = "$fake_data_dir/weather/feed-oslo-1.xml";
+ # local $/;
+ # my $file = "$fake_data_dir/weather/weather-1.xml";
+ # open(my $fh, '<', $file) or die "can't open $file: $!";
+ # $temp = <$fh>;
+ }
+ else {
+ $temp = main::download_file('stdout',$url,'',$ua);
+ }
+ @$weather = split('\n', $temp) if $temp;
+ unshift(@$weather, "timestamp^^$now");
+ main::writer($file_cached,$weather);
+ # print "$file_cached: download/cleaned\n";
+ eval $end if $b_log;
+ return $weather;
+}
+
+# Rsolve wide character issue, if detected, switch to iso
# date format, we won't try to be too clever here.
sub test_locale_date {
my ($date_time,$location,$epoch) = @_;
# $date_time .= 'дек';
- #print "1: $date_time\n";
+ # print "1: $date_time\n";
if ($date_time =~ m/[^\x00-\x7f]/){
if (!$location && $epoch){
$date_time = POSIX::strftime "%Y-%m-%d %H:%M:%S", localtime($epoch);
@@ -17581,29 +28950,59 @@ sub test_locale_date {
}
}
$date_time =~ s/\s+$//;
- #print "2: $date_time\n";
+ # print "2: $date_time\n";
return $date_time;
}
+
+## Location Data ##
+sub location_data {
+ eval $start if $b_log;
+ my $location = $_[0];
+ if ($show{'weather-location'}){
+ my $location_string;
+ $location_string = $show{'weather-location'};
+ $location_string =~ s/\+/ /g;
+ if ($location_string =~ /,/){
+ my @temp = split(',', $location_string);
+ my $sep = '';
+ my $string = '';
+ foreach (@temp){
+ $_ = ucfirst($_);
+ $string .= $sep . $_;
+ $sep = ', ';
+ }
+ $location_string = $string;
+ }
+ $location_string = main::filter($location_string);
+ @$location = ($show{'weather-location'},$location_string,'');
+ }
+ else {
+ get_location($location);
+ }
+ eval $end if $b_log;
+}
+
sub get_location {
eval $start if $b_log;
+ my $location = $_[0];
my ($city,$country,$freshness,%loc,$loc_arg,$loc_string,@loc_data,$state);
my $now = POSIX::strftime "%Y%m%d%H%M", localtime;
my $file_cached = "$user_data_dir/location-main.txt";
- if (-f $file_cached){
+ if (-r $file_cached){
@loc_data = main::reader($file_cached);
- $freshness = (split /\^\^/, $loc_data[0])[1];
+ $freshness = (split(/\^\^/, $loc_data[0]))[1];
}
- if (!$freshness || $freshness < $now - 90) {
+ if (!$freshness || $freshness < $now - 90){
my $temp;
my $url = "http://geoip.ubuntu.com/lookup";
-# {
-# local $/;
-# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/weather/location-1.xml";
-# open my $fh, '<', $file or die "can't open $file: $!";
-# $temp = <$fh>;
-# }
+ # {
+ # local $/;
+ # my $file = "$fake_data_dir/weather/location-1.xml";
+ # open(my $fh, '<', $file) or die "can't open $file: $!";
+ # $temp = <$fh>;
+ # }
$temp = main::download_file('stdout',$url);
- @loc_data = split /\n/, $temp;
+ @loc_data = split('\n', $temp);
@loc_data = map {
s/<\?.*<Response>//;
s/<\/[^>]+>/\n/g;
@@ -17611,46 +29010,46 @@ sub get_location {
s/<//g;
$_;
} @loc_data;
- @loc_data = split /\n/, $loc_data[0];
- unshift (@loc_data,("timestamp^^$now"));
+ @loc_data = split('\n', $loc_data[0]);
+ unshift(@loc_data, "timestamp^^$now");
main::writer($file_cached,\@loc_data);
- #print "$file_cached: download/cleaned\n";
+ # print "$file_cached: download/cleaned\n";
}
foreach (@loc_data){
- my @working = split /\s*\^\^\s*/,$_;
- #print "$working[0]:$working[1]\n";
- if ($working[0] eq 'CountryCode3' ) {
+ my @working = split(/\s*\^\^\s*/, $_);
+ # print "$working[0]:$working[1]\n";
+ if ($working[0] eq 'CountryCode3'){
$loc{'country3'} = $working[1];
}
- elsif ($working[0] eq 'CountryCode' ) {
+ elsif ($working[0] eq 'CountryCode'){
$loc{'country'} = $working[1];
}
- elsif ($working[0] eq 'CountryName' ) {
+ elsif ($working[0] eq 'CountryName'){
$loc{'country2'} = $working[1];
}
- elsif ($working[0] eq 'RegionCode' ) {
+ elsif ($working[0] eq 'RegionCode'){
$loc{'region-id'} = $working[1];
}
- elsif ($working[0] eq 'RegionName' ) {
+ elsif ($working[0] eq 'RegionName'){
$loc{'region'} = $working[1];
}
- elsif ($working[0] eq 'City' ) {
+ elsif ($working[0] eq 'City'){
$loc{'city'} = $working[1];
}
- elsif ($working[0] eq 'ZipPostalCode' ) {
+ elsif ($working[0] eq 'ZipPostalCode'){
$loc{'zip'} = $working[1];
}
- elsif ($working[0] eq 'Latitude' ) {
+ elsif ($working[0] eq 'Latitude'){
$loc{'lat'} = $working[1];
}
- elsif ($working[0] eq 'Longitude' ) {
+ elsif ($working[0] eq 'Longitude'){
$loc{'long'} = $working[1];
}
- elsif ($working[0] eq 'TimeZone' ) {
+ elsif ($working[0] eq 'TimeZone'){
$loc{'tz'} = $working[1];
}
}
- #print Data::Dumper::Dumper \%loc;
+ # print Data::Dumper::Dumper \%loc;
# assign location, cascade from most accurate
# latitude,longitude first
if ($loc{'lat'} && $loc{'long'}){
@@ -17667,308 +29066,462 @@ sub get_location {
$country = ($loc{'country3'}) ? $loc{'country3'} : $loc{'country'};
$city = ($loc{'city'}) ? $loc{'city'} : 'City N/A';
$state = ($loc{'region-id'}) ? $loc{'region-id'} : 'Region N/A';
- $loc_string = main::apply_filter("$city, $state, $country");
- my @location = ($loc_arg,$loc_string,$loc{'tz'});
- #print ($loc_arg,"\n", join "\n", @loc_data, "\n",scalar @loc_data, "\n");
+ $loc_string = main::filter("$city, $state, $country");
+ @$location = ($loc_arg,$loc_string,$loc{'tz'});
+ # print ($loc_arg,"\n", join("\n", @loc_data), "\n",scalar @loc_data, "\n");
eval $end if $b_log;
- return @location;
}
+
sub complete_location {
eval $start if $b_log;
my ($location,$city,$state,$country) = @_;
- if ($location && $location =~ /[0-9+-]/ && $city){
- $location = $country . ', ' . $location if $country && $location !~ m|$country|i;
- $location = $state . ', ' . $location if $state && $location !~ m|$state|i;
- $location = $city . ', ' . $location if $city && $location !~ m|$city|i;
+ if ($location->[1] && $location->[1] =~ /[0-9+-]/ && $city){
+ $location->[1] = $country . ', ' . $location->[1] if $country && $location->[1] !~ m|$country|i;
+ $location->[1] = $state . ', ' . $location->[1] if $state && $location->[1] !~ m|$state|i;
+ $location->[1] = $city . ', ' . $location->[1] if $city && $location->[1] !~ m|$city|i;
}
eval $end if $b_log;
- return $location;
}
}
#### -------------------------------------------------------------------
-#### UTILITIES FOR DATA LINES
+#### ITEM UTILITIES
#### -------------------------------------------------------------------
-sub get_compiler_version {
+# android only, for distro / OS id and machine data
+sub set_build_prop {
eval $start if $b_log;
- my (@compiler);
- if (my $file = system_files('version') ) {
- @compiler = get_compiler_version_linux($file);
- }
- elsif ($bsd_type) {
- @compiler = get_compiler_version_bsd();
+ my $path = '/system/build.prop';
+ $loaded{'build-prop'} = 1;
+ return if ! -r $path;
+ my @data = reader($path,'strip');
+ foreach (@data){
+ my @working = split('=', $_);
+ next if $working[0] !~ /^ro\.(build|product)/;
+ if ($working[0] eq 'ro.build.date.utc'){
+ $build_prop{'build-date'} = strftime "%F", gmtime($working[1]);
+ }
+ # ldgacy, replaced by ro.product.device
+ elsif ($working[0] eq 'ro.build.product'){
+ $build_prop{'build-product'} = $working[1];
+ }
+ # this can be brand, company, android, it varies, but we don't want android value
+ elsif ($working[0] eq 'ro.build.user'){
+ $build_prop{'build-user'} = $working[1] if $working[1] !~ /android/i;
+ }
+ elsif ($working[0] eq 'ro.build.version.release'){
+ $build_prop{'build-version'} = $working[1];
+ }
+ elsif ($working[0] eq 'ro.product.board'){
+ $build_prop{'product-board'} = $working[1];
+ }
+ elsif ($working[0] eq 'ro.product.brand'){
+ $build_prop{'product-brand'} = $working[1];
+ }
+ elsif ($working[0] eq 'ro.product.device'){
+ $build_prop{'product-device'} = $working[1];
+ }
+ elsif ($working[0] eq 'ro.product.manufacturer'){
+ $build_prop{'product-manufacturer'} = $working[1];
+ }
+ elsif ($working[0] eq 'ro.product.model'){
+ $build_prop{'product-model'} = $working[1];
+ }
+ elsif ($working[0] eq 'ro.product.name'){
+ $build_prop{'product-name'} = $working[1];
+ }
+ elsif ($working[0] eq 'ro.product.screensize'){
+ $build_prop{'product-screensize'} = $working[1];
+ }
}
+ log_data('dump','%build_prop',\%build_prop) if $b_log;
+ print Dumper \%build_prop if $dbg[20];
eval $end if $b_log;
- return @compiler;
}
-sub get_compiler_version_bsd {
+# Return all detected compiler versions
+# args: 0: compiler
+sub get_compiler_data {
eval $start if $b_log;
- my (@compiler,@working);
- if ($alerts{'sysctl'}{'action'} && $alerts{'sysctl'}{'action'} eq 'use'){
- # for dragonfly, we will use free mem, not used because free is 0
- my @working;
- foreach (@sysctl){
- # freebsd seems to use bytes here
- # Not every line will have a : separator though the processor should make
- # most have it. This appears to be 10.x late feature add, I don't see it
- # on earlier BSDs
- if (/^kern.compiler_version/){
- @working = split /:\s*/, $_;
- $working[1] =~ /.*(gcc|clang)\sversion\s([\S]+)\s.*/;
- @compiler = ($1,$2);
- last;
+ my $compiler = $_[0];
+ my $compiler_version;
+ my $compilers = [];
+ # NOTE: see %program_values for regex used for different gcc syntax
+ if (my $program = check_program($compiler)){
+ (my $name,$compiler_version) = ProgramData::full($compiler,$program);
+ }
+ if ($extra > 1){
+ # glob /usr/bin,/usr/local/bin for ccs, strip out all non numeric values
+ if (my @temp = globber("/usr/{local/,}bin/${compiler}{-,}[0-9]*")){
+ # usually: gcc-11, sometimes: gcc-11.2.0, gcc-2.8, gcc48 [FreeBSD]
+ foreach (@temp){
+ if (/\/${compiler}-?(\d+\.\d+|\d+)(\.\d+)?/){
+ # freebsd uses /usr/local/bin/gcc48, gcc34 for old gccs. Why?
+ my $working = ($bsd_type && $1 >= 30) ? $1/10 : $1;
+ if (!$compiler_version || $compiler_version !~ /^$working\b/){
+ push(@$compilers, $working);
+ }
+ }
}
+ @$compilers = sort {$a <=> $b} @$compilers if @$compilers;
}
}
- log_data('dump','@compiler',\@compiler) if $b_log;
+ unshift(@$compilers, $compiler_version) if $compiler_version;
+ log_data('dump','@$compilers',$compilers) if $b_log;
+ print "$compiler\n", Data::Dumper::Dumper $compilers if $dbg[62];
eval $end if $b_log;
- return @compiler;
+ return $compilers;
}
-sub get_compiler_version_linux {
+sub set_dboot_data {
eval $start if $b_log;
- my ($file) = @_;
- my (@compiler,$type);
- my @data = reader($file);
- my $result = $data[0] if @data;
- if ($result){
- $result =~ /(gcc|clang).*version\s([\S]+)/;
- # $result = $result =~ /\*(gcc|clang)\*eval\*/;
- if ($1){
- $type = $2;
- $type ||= 'N/A'; # we don't really know what linux clang looks like!
- @compiler = ($1,$type);
+ $loaded{'dboot'} = 1;
+ my ($file,@db_data,@dm_data,@temp);
+ my ($counter) = (0);
+ if (!$fake{'dboot'}){
+ $file = $system_files{'dmesg-boot'};
+ }
+ else {
+ # $file = "$fake_data_dir/bsd/dmesg-boot/bsd-disks-diabolus.txt";
+ # $file = "$fake_data_dir/bsd/dmesg-boot/freebsd-disks-solestar.txt";
+ # $file = "$fake_data_dir/bsd/dmesg-boot/freebsd-enceladus-1.txt";
+ ## matches: toshiba: openbsd-5.6-sysctl-2.txt
+ # $file = "$fake_data_dir/bsd/dmesg-boot/openbsd-5.6-dmesg.boot-1.txt";
+ ## matches: compaq: openbsd-5.6-sysctl-1.txt"
+ # $file = "$fake_data_dir/bsd/dmesg-boot/openbsd-dmesg.boot-1.txt";
+ # $file = "$fake_data_dir/bsd/dmesg-boot/openbsd-6.8-battery-sensors-1.txt";
+ }
+ if ($file){
+ return if ! -r $file;
+ @db_data = reader($file);
+ # sometimes > 1 sessions stored, dump old ones
+ for (@db_data){
+ if (/^(Dragonfly|OpenBSD|NetBSD|FreeBSD is a registered trademark|Copyright.*Midnight)/){
+ $counter++;
+ undef @temp if $counter > 1;
+ }
+ push(@temp,$_);
+ }
+ @db_data = @temp;
+ undef @temp;
+ my @dm_data = grabber('dmesg 2>/dev/null');
+ # clear out for netbsd, only 1 space following or lines won't match
+ @dm_data = map {$_ =~ s/^\[[^\]]+\]\s//;$_} @dm_data;
+ $counter = 0;
+ # dump previous sessions, and also everything roughly before dmesg.boot
+ # ends, it does't need to be perfect, we just only want the actual post
+ # boot data
+ for (@dm_data){
+ if (/^(Dragonfly|OpenBSD|NetBSD|FreeBSD is a registered trademark|Copyright.*Midnight)/ ||
+ /^(smbus[0-9]:|Security policy loaded|root on)/){
+ $counter++;
+ undef @temp if $counter > 1;
+ }
+ push(@temp,$_);
+ }
+ @dm_data = @temp;
+ undef @temp;
+ push(@db_data,'~~~~~',@dm_data);
+ # uniq(\@db_data); # get rid of duplicate lines
+ # some dmesg repeats, so we need to dump the second and > iterations
+ # replace all indented items with ~ so we can id them easily while
+ # processing note that if user, may get error of read permissions
+ # for some weird reason, real mem and avail mem are use a '=' separator,
+ # who knows why, the others are ':'
+ foreach (@db_data){
+ $_ =~ s/\s*=\s*|:\s*/:/;
+ $_ =~ s/\"//g;
+ $_ =~ s/^\s+/~/;
+ $_ =~ s/\s\s/ /g;
+ $_ =~ s/^(\S+)\sat\s/$1:at /; # ada0 at ahcich0
+ push(@{$dboot{'main'}}, $_);
+ if ($use{'bsd-battery'} && /^acpi(bat|cmb)/){
+ push(@{$sysctl{'battery'}}, $_);
+ }
+ # ~Debug Features 0:<2 CTX BKPTs,4 Watchpoints,6 Breakpoints,PMUv3,Debugv8>
+ elsif ($use{'bsd-cpu'} &&
+ (!/^~(Debug|Memory)/ && /(^cpu[0-9]+:|Features|^~*Origin:\s*)/)){
+ push(@{$dboot{'cpu'}}, $_);
+ }
+ # FreeBSD: 'da*' is a USB device 'ada*' is a SATA device 'mmcsd*' is an SD card
+ # OpenBSD: 'sd' is usb device, 'wd' normal drive. OpenBSD uses sd for nvme drives
+ # but also has the nvme data:
+ # nvme1 at pci6 dev 0 function 0 vendor "Phison", unknown product 0x5012 rev 0x01: msix, NVMe 1.3
+ # nvme1: OWC Aura P12 1.0TB, firmware ECFM22.6, serial 2003100010208
+ # scsibus2 at nvme1: 2 targets, initiator 0
+ # sd1 at scsibus2 targ 1 lun 0: <NVMe, OWC Aura P12 1.0, ECFM>
+ # sd1: 915715MB, 4096 bytes/sector, 234423126 sectors
+ elsif ($use{'bsd-disk'} &&
+ /^(ad|ada|da|mmcblk|mmcsd|nvme([0-9]+n)?|sd|wd)[0-9]+(:|\sat\s|.*?\sdetached$)/){
+ $_ =~ s/^\(//;
+ push (@{$dboot{'disk'}},$_);
+ }
+ if ($use{'bsd-machine'} && /^bios[0-9]:(at|vendor)/){
+ push(@{$sysctl{'machine'}}, $_);
+ }
+ elsif ($use{'bsd-machine'} && !$dboot{'machine-vm'} &&
+ /(\bhvm\b|innotek|\bkvm\b|microsoft.*virtual machine|openbsd[\s-]vmm|qemu|qumranet|vbox|virtio|virtualbox|vmware)/i){
+ push(@{$dboot{'machine-vm'}}, $_);
+ }
+ elsif ($use{'bsd-optical'} && /^(cd)[0-9]+(\([^)]+\))?(:|\sat\s)/){
+ push(@{$dboot{'optical'}},$_);
+ }
+ elsif ($use{'bsd-pci'} && /^(pci[0-9]+:at|\S+:at pci)/){
+ push(@{$dboot{'pci'}},$_);
+ }
+ elsif ($use{'bsd-ram'} && /(^spdmem)/){
+ push(@{$dboot{'ram'}}, $_);
+ }
+ }
+ log_data('dump','$dboot{main}',$dboot{'main'}) if $b_log;
+ print Dumper $dboot{'main'} if $dbg[11];
+
+ if ($dboot{'main'} && $b_log){
+ log_data('dump','$dboot{cpu}',$dboot{'cpu'});
+ log_data('dump','$dboot{disk}',$dboot{'disk'});
+ log_data('dump','$dboot{machine-vm}',$dboot{'machine-vm'});
+ log_data('dump','$dboot{optical}',$dboot{'optical'});
+ log_data('dump','$dboot{ram}',$dboot{'ram'});
+ log_data('dump','$dboot{usb}',$dboot{'usb'});
+ log_data('dump','$sysctl{battery}',$sysctl{'battery'});
+ log_data('dump','$sysctl{machine}',$sysctl{'machine'});
+ }
+ if ($dboot{'main'} && $dbg[11]){
+ print("cpu:\n", Dumper $dboot{'cpu'});
+ print("disk:\n", Dumper $dboot{'disk'});
+ print("machine vm:\n", Dumper $dboot{'machine-vm'});
+ print("optical:\n", Dumper $dboot{'optical'});
+ print("ram:\n", Dumper $dboot{'ram'});
+ print("usb:\n", Dumper $dboot{'usb'});
+ print("sys battery:\n", Dumper $sysctl{'battery'});
+ print("sys machine:\n", Dumper $sysctl{'machine'});
+ }
+ # this should help get rid of dmesg usb mounts not present
+ # note if you take out one, put in another, it will always show the first
+ # one, I think. Not great. Not using this means all drives attached
+ # current session are shown, using it, possibly wrong drive shown, which is bad
+ # not using this for now: && (my @disks = grep {/^hw\.disknames/} @{$dboot{'disk'}}
+ if ($dboot{'disk'}){
+ # hw.disknames:sd0:,sd1:3242432,sd2:
+ #$disks[0] =~ s/(^hw\.disknames:|:[^,]*)//g;
+ #@disks = split(',',$disks[0]) if $disks[0];
+ my ($id,$value,%dboot_disks,@disks_live,@temp);
+ # first, since openbsd has this, let's use it
+ foreach (@{$dboot{'disk'}}){
+ if (!@disks_live && /^hw\.disknames/){
+ $_ =~ s/(^hw\.disknames:|:[^,]*)//g;
+ @disks_live = split(/[,\s]/,$_) if $_;
+ }
+ else {
+ push(@temp,$_);
+ }
+ }
+ @{$dboot{'disk'}} = @temp if @temp;
+ foreach my $row (@temp){
+ $row =~ /^([^:\s]+)[:\s]+(.+)/;
+ $id = $1;
+ $value = $2;
+ push(@{$dboot_disks{$id}},$value);
+ # get rid of detached or non present drives
+ if ((@disks_live && !(grep {$id =~ /^$_/} @disks_live)) ||
+ $value =~ /\b(destroyed|detached)$/){
+ delete $dboot_disks{$id};
+ }
+ }
+ $dboot{'disk'} = \%dboot_disks;
+ log_data('dump','post: $dboot{disk}',$dboot{'disk'}) if $b_log;
+ print("post: disk:\n",Dumper $dboot{'disk'}) if $dbg[11];
+ }
+ if ($use{'bsd-pci'} && $dboot{'pci'}){
+ my $bus_id = 0;
+ foreach (@{$dboot{'pci'}}){
+ if (/^pci[0-9]+:at.*?bus\s([0-9]+)/){
+ $bus_id = $1;
+ next;
+ }
+ elsif (/:at pci[0-9]+\sdev/){
+ $_ =~ s/^(\S+):at.*?dev\s([0-9]+)\sfunction\s([0-9]+)\s/$bus_id:$2:$3:$1:/;
+ push(@temp,$_);
+ }
+ }
+ $dboot{'pci'} = [@temp];
+ log_data('dump','$dboot{pci}',$dboot{'pci'}) if $b_log;
+ print("pci:\n",Dumper $dboot{'pci'}) if $dbg[11];
}
}
- log_data('dump','@compiler',\@compiler) if $b_log;
eval $end if $b_log;
- return @compiler;
}
-## Get DesktopEnvironment
-## returns array:
-# 0 - desktop name
-# 1 - version
-# 2 - toolkit
-# 3 - toolkit version
-# 4 - info extra desktop data
-# 5 - wm
-# 6 - wm version
+## DesktopData
+# returns array:
+# 0: desktop name
+# 1: version
+# 2: toolkit
+# 3: toolkit version
+# 4: de/wm components: panels, docks, menus, etc
+# 5: wm
+# 6: wm version
+# 7: tools: screensavers/lockers: running
+# 8: tools: screensavers/lockers: all not running, installed
+# 9: de advanced data type [eg. kde frameworks]
+# 10: de advanced data version
{
-package DesktopEnvironment;
-my ($b_gtk,$b_qt,$b_xprop,$desktop_session,$gdmsession,$kde_session_version,
-$xdg_desktop,@desktop,@data,@xprop);
+package DesktopData;
+my ($b_dbg_de,$desktop_session,$gdmsession,$kde_full_session,
+$kde_session_version,$tk_test,$xdg_desktop,@data,%xprop);
+my $desktop = [];
+
sub get {
- # NOTE $XDG_CURRENT_DESKTOP envvar is not reliable, but it shows certain desktops better.
- # most desktops are not using it as of 2014-01-13 (KDE, UNITY, LXDE. Not Gnome)
- $desktop_session = ( $ENV{'DESKTOP_SESSION'} ) ? lc($ENV{'DESKTOP_SESSION'}) : '';
- $xdg_desktop = ( $ENV{'XDG_CURRENT_DESKTOP'} ) ? lc($ENV{'XDG_CURRENT_DESKTOP'}) : '';
- $kde_session_version = ($ENV{'KDE_SESSION_VERSION'}) ? $ENV{'KDE_SESSION_VERSION'} : '';
- # for fallback to fallback protections re false gnome id
- $gdmsession = ( $ENV{'GDMSESSION'} ) ? lc($ENV{'GDMSESSION'}) : '';
- main::set_ps_gui() if ! $b_ps_gui;
- get_kde_trinity_data();
- if (!@desktop){
- get_env_de_data();
- }
- if (!@desktop){
- get_env_xprop_gnome_based_data();
- }
- if (!@desktop && $b_xprop ){
- get_env_xprop_non_gnome_based_data();
+ eval $start if $b_log;
+ $b_dbg_de = 1 if $dbg[63] || $b_log;
+ PsData::set_de_wm() if !$loaded{'ps-gui'};
+ set_env_data();
+ # the order of these tests matters, go from most to least common
+ de_kde_tde_data();
+ de_env_data() if !@$desktop;
+ if (!@$desktop){
+ # NOTE: Always add to set_prop the search term if you add an item!!
+ set_xprop() if !$loaded{'xprop'};
+ de_gnome_based_data();
+ }
+ de_xfce_data() if !@$desktop;
+ de_enlightenment_based_data() if !@$desktop;
+ de_misc_data() if !@$desktop;
+ # last try, get it from ps data
+ de_ps_data() if !@$desktop;
+ if ($extra > 2 && @$desktop){
+ components_data(); # bars, docks, menu, panels, trays etc
+ tools_data(); # screensavers, lockers
+ }
+ if ($b_display && !$force{'display'} && $extra > 1){
+ wm_data();
+ }
+ # we want tk, but no previous methods got it
+ if ($extra > 1 && !$desktop->[3] && $tk_test){
+ if ($tk_test eq 'gtk'){
+ tk_gtk_data();}
+ elsif ($tk_test eq 'qt'){
+ tk_qt_data();}
+ else {
+ tk_misc_data();}
}
- if (!@desktop){
- get_ps_de_data();
+ # try to avoid repeat version calls for wm/compostors
+ if ($show{'graphic'} && @$desktop){
+ $comps{lc($desktop->[0])} = [$desktop->[0],$desktop->[1]] if $desktop->[0];
+ $comps{lc($desktop->[5])} = [$desktop->[5],$desktop->[6]] if $desktop->[5];
}
- if ($extra > 2 && @desktop){
- set_info_data();
+ if ($b_log){
+ main::log_data('dump','@$desktop', $desktop);
+ main::log_data('dump','%comps', \%comps);
}
- if ($b_display && !$b_force_display && $extra > 1){
- get_wm();
+ if ($dbg[59]){
+ print '$desktop: ', Data::Dumper::Dumper $desktop;
+ print '%comps: ', Data::Dumper::Dumper \%comps;
}
- set_gtk_data() if $b_gtk && $extra > 1;
- set_qt_data() if $b_qt && $extra > 1;
- main::log_data('dump','@desktop', \@desktop) if $b_log;
- # ($b_xprop,$kde_session_version,$xdg_desktop,@data,@xprop) = undef;
- return @desktop;
+ eval $end if $b_log;
+ return $desktop;
}
-sub get_kde_trinity_data {
+
+## DE SPECIFIC IDS ##
+
+# ENLIGHTENMENT/MOKSHA #
+sub de_enlightenment_based_data {
eval $start if $b_log;
- my ($program,@version_data,@version_data2);
- my $kde_full_session = ($ENV{'KDE_FULL_SESSION'}) ? $ENV{'KDE_FULL_SESSION'} : '';
- if ($desktop_session eq 'trinity' || $xdg_desktop eq 'trinity' || (grep {/^tde/} @ps_gui) ){
- $desktop[0] = 'Trinity';
- if ($program = main::check_program('kdesktop')){
- @version_data = main::grabber("$program --version 2>/dev/null");
- $desktop[1] = main::awk(\@version_data,'^TDE:',2,'\s+') if @version_data;
- }
- if ($extra > 1 && @version_data){
- $desktop[2] = 'Qt';
- $desktop[3] = main::awk(\@version_data,'^Qt:',2,'\s+') if @version_data;
- }
- }
- # works on 4, assume 5 will id the same, why not, no need to update in future
- # KDE_SESSION_VERSION is the integer version of the desktop
- # NOTE: as of plasma 5, the tool: about-distro MAY be available, that will show
- # actual desktop data, so once that's in debian/ubuntu, if it gets in, add that test
- elsif ( $xdg_desktop eq 'kde' || $kde_session_version ){
- if ($kde_session_version && $kde_session_version <= 4){
- @data = main::program_values("kded$kde_session_version");
- if (@data){
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version("kded$kde_session_version",$data[0],$data[1],$data[2],$data[5],$data[6]);
- # kded exists, so we can now get the qt data string as well
- if ($desktop[1] && ($program = main::check_program("kded$kde_session_version")) ){
- @version_data = main::grabber("$program --version 2>/dev/null");
- }
- }
- $desktop[0] = 'KDE' if !$desktop[0];
- }
- else {
- # NOTE: this command string is almost certain to change, and break, with next
- # major plasma desktop, ie, 6.
- # qdbus org.kde.plasmashell /MainApplication org.qtproject.Qt.QCoreApplication.applicationVersion
- # Qt: 5.4.2
- # KDE Frameworks: 5.11.0
- # kf5-config: 1.0
- # for QT, and Frameworks if we use it
- if (!@version_data && ($program = main::check_program("kf$kde_session_version-config") )){
- @version_data = main::grabber("$program --version 2>/dev/null");
- }
- if (!@version_data && ($program = main::check_program("kded$kde_session_version"))){
- @version_data = main::grabber("$program --version 2>/dev/null");
- }
- if ($program = main::check_program("plasmashell")){
- @version_data2 = main::grabber("$program --version 2>/dev/null");
- $desktop[1] = main::awk(\@version_data2,'^plasmashell',-1,'\s+');
- }
- $desktop[0] = 'KDE Plasma';
- }
- if (!$desktop[1]){
- $desktop[1] = ($kde_session_version) ? $kde_session_version: main::row_defaults('unknown-desktop-version');
- }
- # print Data::Dumper::Dumper \@version_data;
- if ($extra > 1){
- if (@version_data){
- $desktop[3] = main::awk(\@version_data,'^Qt:', 2,'\s+');
- }
- # qmake can have variants, qt4-qmake, qt5-qmake, also qt5-default but not tested
- if (!$desktop[3] && main::check_program("qmake")){
- # note: this program has issues, it may appear to be in /usr/bin, but it
- # often fails to execute, so the below will have null output, but use as a
- # fall back test anyway.
- ($desktop[2],$desktop[3]) = main::program_data('qmake');
- }
- $desktop[2] ||= 'Qt';
- }
- }
- # KDE_FULL_SESSION property is only available since KDE 3.5.5.
- elsif ($kde_full_session eq 'true'){
- @version_data = main::grabber("kded --version 2>/dev/null");
- $desktop[0] = 'KDE';
- $desktop[1] = main::awk(\@version_data,'^KDE:',2,'\s+') if @version_data;
- if (!$desktop[1]){
- $desktop[1] = '3.5';
- }
- if ($extra > 1 && @version_data){
- $desktop[2] = 'Qt';
- $desktop[3] = main::awk(\@version_data,'^Qt:',2,'\s+') if @version_data;
+ # print 'de evn xprop: ', Data::Dumper::Dumper \%xprop;
+ my ($v_src,$program);
+ # earlier moksha fully ID as enlightenment
+ if ($xdg_desktop eq 'moksha' || $gdmsession eq 'moksha' ||
+ ($xprop{'moksha'} &&
+ (main::check_program('enlightenment') || main::check_program('moksha')))){
+ # ENLIGHTENMENT_VERSION(STRING) = "Moksha 0.2.0.15989"
+ # note: toolkit: EFL
+ # later releases have -version
+ if ($v_src = main::check_program('moksha')){
+ ($desktop->[0],$desktop->[1]) = ProgramData::full('moksha',$v_src);
+ }
+ # Earlier: no -v or --version but version is in xprop -root
+ if (!$desktop->[1] && $xprop{'moksha'}){
+ $v_src = 'xprop';
+ $desktop->[1] = main::awk($xprop{'moksha'}->{'lines'},
+ '(enlightenment|moksha)_version',2,'\s+=\s+');
+ $desktop->[1] =~ s/"?(moksha|enlightenment)\s([^"]+)"?/$2/ if $desktop->[1];
+ }
+ $desktop->[0] ||= 'Moksha';
+ }
+ elsif ($xdg_desktop eq 'enlightenment' || $gdmsession eq 'enlightenment' ||
+ ($xprop{'enlightenment'} && main::check_program('enlightenment'))){
+ # no -v or --version but version is in xprop -root
+ # ENLIGHTENMENT_VERSION(STRING) = "Enlightenment 0.16.999.49898"
+ $desktop->[0] = 'Enlightenment';
+ if ($xprop{'enlightenment'}){
+ $v_src = 'xprop';
+ $desktop->[1] = main::awk($xprop{'enlightenment'}->{'lines'},
+ '(enlightenment|moksha)_version',2,'\s+=\s+');
+ $desktop->[1] =~ s/"?(moksha|enlightenment)\s([^"]+)"?/$2/ if $desktop->[1];
}
}
- eval $end if $b_log;
-}
-sub get_env_de_data {
- eval $start if $b_log;
- my ($program,@version_data);
- if (!$desktop[0]){
- # 0: 1/0; 1: env var search; 2: data; 3: gtk tk; 4: qt tk; 5: ps_gui search
- my @desktops =(
- [1,'unity','unity',0,0],
- [0,'budgie','budgie-desktop',0,0],
- # debian package: lxde-core.
- # NOTE: some distros fail to set XDG data for root
- [1,'lxde','lxpanel',0,0,',^lxsession$'],
- [1,'razor','razor-session',0,1,'^razor-session$'],
- # BAD: lxqt-about opens dialogue, sigh.
- # Checked, lxqt-panel does show same version as lxqt-about
- [1,'lxqt','lxqt-panel',0,1,'^lxqt-session$'],
- [0,'^(razor|lxqt)$','lxqt-variant',0,1,'^(razor-session|lxqt-session)$'],
- # note, X-Cinnamon value strikes me as highly likely to change, so just
- # search for the last part
- [0,'cinnamon','cinnamon',1,0],
- # these so far have no cli version data
- [1,'deepin','deepin',0,1], # version comes from file read
- [1,'pantheon','pantheon',0,0],
- [1,'lumina','lumina-desktop',0,1],
- [0,'manokwari','manokwari',1,0],
- [1,'ukui','ukui-session',0,1],
- );
- foreach my $item (@desktops){
- # Check if in xdg_desktop OR desktop_session OR if in $item->[6] and in ps_gui
- if ( (($item->[0] && ($xdg_desktop eq $item->[1] || $desktop_session eq $item->[1] )) ||
- (!$item->[0] && ($xdg_desktop =~ /$item->[1]/ || $desktop_session =~ /$item->[1]/ )) ) ||
- ($item->[5] && @ps_gui && (grep {/$item->[5]/} @ps_gui) ) ){
- ($desktop[0],$desktop[1]) = main::program_data($item->[2]);
- $b_gtk = $item->[3];
- $b_qt = $item->[4];
- last;
- }
+ if ($desktop->[0]){
+ if ($extra > 1 && ($program = main::check_program('efl-version'))){
+ ($desktop->[2],$desktop->[3]) = ProgramData::full('efl-version',$program);
}
+ $desktop->[2] ||= 'EFL' if $extra > 1;
+ main::feature_debugger('de ' . $desktop->[0] . ' v_src,program,desktop',
+ [$v_src,$program,$desktop],$dbg[63]) if $b_dbg_de;
}
eval $end if $b_log;
}
-sub get_env_xprop_gnome_based_data {
+
+# GNOME/CINNAMON/MATE #
+sub de_gnome_based_data {
eval $start if $b_log;
- my ($program,$value,@version_data);
- # NOTE: Always add to set_prop the search term if you add an item!!
- set_xprop();
# add more as discovered
return if $xdg_desktop eq 'xfce' || $gdmsession eq 'xfce';
+ my ($program,$value,@version_data);
# note that cinnamon split from gnome, and and can now be id'ed via xprop,
# but it will still trigger the next gnome true case, so this needs to go
# before gnome test eventually this needs to be better organized so all the
# xprop tests are in the same section, but this is good enough for now.
# NOTE: was checking for 'muffin' but that's not part of cinnamon
- if ( $xdg_desktop eq 'cinnamon' || $gdmsession eq 'cinnamon' ||
- (main::check_program('muffin') || main::check_program('cinnamon-session') ) &&
- ($b_xprop && main::awk(\@xprop,'_muffin') )){
- ($desktop[0],$desktop[1]) = main::program_data('cinnamon','cinnamon',0);
- $b_gtk = 1;
- $desktop[0] ||= 'Cinnamon';
- }
- elsif ($xdg_desktop eq 'mate' || $gdmsession eq 'mate' ||
- ( $b_xprop && main::awk(\@xprop,'_marco') )){
+ if ($xdg_desktop eq 'cinnamon' || $gdmsession eq 'cinnamon' ||
+ (($xprop{'muffin'} || $xprop{'mutter'}) &&
+ (main::check_program('muffin') || main::check_program('cinnamon-session')))){
+ ($desktop->[0],$desktop->[1]) = ProgramData::full('cinnamon','cinnamon',0);
+ $tk_test = 'gtk';
+ $desktop->[0] ||= 'Cinnamon';
+ main::feature_debugger('gnome test 1 $desktop',$desktop,$dbg[63]) if $b_dbg_de;
+ }
+ elsif ($xdg_desktop eq 'mate' || $gdmsession eq 'mate' || $xprop{'marco'}){
# NOTE: mate-about and mate-sesssion vary which has the higher number, neither
# consistently corresponds to the actual MATE version, so check both.
my %versions = ('mate-about' => '','mate-session' => '');
foreach my $key (keys %versions){
- if ($program = main::check_program($key) ) {
- @data = main::program_data($key,$program,0);
- $desktop[0] = $data[0];
- $versions{$key} = $data[1];
+ if ($program = main::check_program($key)){
+ ($desktop->[0],$versions{$key}) = ProgramData::full($key,$program,0);
}
}
# no consistent rule about which version is higher, so just compare them and take highest
- $desktop[1] = main::compare_versions($versions{'mate-about'},$versions{'mate-session'});
- # $b_gtk = 1;
- $desktop[0] ||= 'MATE';
+ $desktop->[1] = main::compare_versions($versions{'mate-about'},$versions{'mate-session'});
+ # $tk_test = 'gtk';
+ $desktop->[0] ||= 'MATE';
+ main::feature_debugger('gnome test 2 $desktop',$desktop,$dbg[63]) if $b_dbg_de;
}
# See sub for logic and comments
- elsif (check_gnome() ){
- if (main::check_program('gnome-about') ) {
- ($desktop[0],$desktop[1]) = main::program_data('gnome-about');
+ elsif (check_gnome()){
+ if (main::check_program('gnome-about')){
+ ($desktop->[0],$desktop->[1]) = ProgramData::full('gnome-about');
}
- elsif (main::check_program('gnome-shell') ) {
- ($desktop[0],$desktop[1]) = main::program_data('gnome','gnome-shell');
+ elsif (main::check_program('gnome-shell')){
+ ($desktop->[0],$desktop->[1]) = ProgramData::full('gnome','gnome-shell');
}
- $b_gtk = 1;
- $desktop[0] ||= 'GNOME';
+ $tk_test = 'gtk';
+ $desktop->[0] ||= 'GNOME';
+ main::feature_debugger('gnome test 3 $desktop $desktop',$desktop,
+ $dbg[63]) if $b_dbg_de;
}
eval $end if $b_log;
}
-# note, GNOME_DESKTOP_SESSION_ID is deprecated so we'll see how that works out
+
+# Note, GNOME_DESKTOP_SESSION_ID is deprecated so we'll see how that works out
# https://bugzilla.gnome.org/show_bug.cgi?id=542880.
# NOTE: manjaro is leaving XDG data null, which forces the manual check for gnome, sigh...
# some gnome programs can trigger a false xprop gnome ID
@@ -17976,11 +29529,13 @@ sub get_env_xprop_gnome_based_data {
sub check_gnome {
eval $start if $b_log;
my ($b_gnome,$detection) = (0,'');
- if ($xdg_desktop && $xdg_desktop eq 'gnome'){
+ if ($xdg_desktop && $xdg_desktop =~ /gnome/){
$detection = 'xdg_current_desktop';
$b_gnome = 1;
}
- elsif ($xdg_desktop && $xdg_desktop ne 'gnome'){
+ # should work as long as string contains gnome, eg: peppermint:gnome
+ # filtered explicitly in set_env_data
+ elsif ($xdg_desktop && $xdg_desktop !~ /gnome/){
$detection = 'xdg_current_desktop';
}
# possible values: lightdm-xsession, only positive match tests will work
@@ -18002,99 +29557,262 @@ sub check_gnome {
$b_gnome = 1;
}
# maybe use ^_gnome_session instead? try it for a while
- elsif ($b_xprop && main::check_program('gnome-shell') && main::awk(\@xprop,'^_gnome_session')){
+ elsif ($xprop{'gnome_session'} && main::check_program('gnome-shell')){
$detection = 'xprop-root';
$b_gnome = 1;
}
- main::log_data('data','$detection:$b_gnome',$detection . ":$b_gnome") if $b_log;
+ if ($b_dbg_de && $b_gnome){
+ main::feature_debugger('gnome $detection','detect-type: ' . $detection,$dbg[63]);
+ }
+ main::log_data('data','$detection:$b_gnome>>' . $detection . ":$b_gnome") if $b_log;
+ eval $end if $b_log;
return $b_gnome;
+}
+
+# KDE/TRINITY #
+sub de_kde_tde_data {
+ eval $start if $b_log;
+ my ($kded,$kded_name,$program,$tk_src,$v_data,$v_src);
+ # we can't rely on 3 using kded3, it could be kded
+ if ($kde_session_version && ($program = main::check_program('kded' . $kde_session_version))){
+ $kded = $program;
+ $kded_name = 'kded' . $kde_session_version;
+ }
+ elsif ($program = main::check_program('kded')){
+ $kded = $program;
+ $kded_name = 'kded';
+ }
+ # note: if TDM is used to start kde, can pass ps tde test
+ if ($desktop_session eq 'trinity' || $xdg_desktop eq 'trinity' ||
+ (!$desktop_session && !$xdg_desktop && @{$ps_data{'de-ps-detect'}} &&
+ (grep {/^tde/} @{$ps_data{'de-ps-detect'}}))){
+ if ($program = main::check_program('kdesktop')){
+ ($desktop->[0],$desktop->[1],$v_data) = ProgramData::full('kdesktop-trinity',$program,0,'raw');
+ }
+ if ($extra > 1 && $v_data && @$v_data){
+ ($desktop->[2],$desktop->[3]) = item_from_version($v_data,['^Qt:',2,'Qt']);
+ }
+ $desktop->[0] ||= 'Trinity';
+ $desktop->[2] ||= 'Qt' if $extra > 1;
+ main::feature_debugger('kde trinity $program,$v_data,$desktop',
+ [$program,$v_data,$desktop],$dbg[63]) if $b_dbg_de;
+ }
+ # works on 4, assume 5 will id the same, why not, no need to update in future
+ # KDE_SESSION_VERSION is the integer version of the desktop
+ # NOTE: as of plasma 5, the tool: about-distro MAY be available, that will show
+ # actual desktop data, so once that's in debian/ubuntu, if it gets in, add that test
+ elsif ($desktop_session eq 'kde-plasma' || $desktop_session eq 'plasma' ||
+ $xdg_desktop eq 'kde' || $kde_session_version){
+ # KDE <= 4
+ if ($kde_session_version && $kde_session_version <= 4){
+ if ($program = main::check_program($kded_name)){
+ ($desktop->[0],$desktop->[1],$v_data) = ProgramData::full($kded_name,$program,0,'raw');
+ if ($extra > 1 && $v_data && @$v_data){
+ ($desktop->[2],$desktop->[3]) = item_from_version($v_data,['^Qt:',2,'Qt']);
+ }
+ }
+ $desktop->[0] ||= 'KDE';
+ $desktop->[2] ||= 'Qt' if $extra > 1;
+ main::feature_debugger('kde 4 program,v_data,$desktop',
+ [$program,$v_data,$desktop],$dbg[63]) if $b_dbg_de;
+ }
+ # KDE >= 5
+ else {
+ # no qt data, just the kde version as of 5, not in kde4
+ my $fw_src;
+ if (!$desktop->[0] &&
+ ($v_src = $program = main::check_program("plasmashell"))){
+ ($desktop->[0],$desktop->[1]) = ProgramData::full('plasmashell',$program);
+ }
+ # kwin through version 4 showed full kde/qt data, 5 only shows plasma version
+ if (!$desktop->[0] &&
+ ($v_src = $program = main::check_program("kwin"))){
+ ($desktop->[0],$desktop->[1]) = ProgramData::full('kwin-kde',$program);
+ }
+ $desktop->[0] = 'KDE Plasma';
+ if (!$desktop->[1]){
+ $desktop->[1] = ($kde_session_version) ?
+ $kde_session_version : main::message('unknown-desktop-version');
+ }
+ # NOTE: this command string is almost certain to change, and break, with next
+ # major plasma desktop, ie, 6.
+ # qdbus org.kde.plasmashell /MainApplication org.qtproject.Qt.QCoreApplication.applicationVersion
+ # kde 4: kwin,kded4 (KDE:); kde5: kf5-config (KDE Frameworks:)
+ # Qt: 5.4.2
+ # KDE Frameworks: 5.11.0
+ # kf5-config: 1.0
+ # for QT, and Frameworks if we use it. Frameworks v is NOT same as KDE v.
+ if ($extra > 1){
+ if ($tk_src = $program = main::check_program("kf$kde_session_version-config")){
+ ($desktop->[2],$desktop->[3],$v_data) = ProgramData::full(
+ "kf-config-qt",$program,0,'raw');
+ }
+ if (!$desktop->[3] && (!$v_data || !@$v_data) &&
+ ($tk_src = $program = main::check_program("kf-config"))){
+ ($desktop->[2],$desktop->[3],$v_data) = ProgramData::full(
+ "kf-config-qt",$program,0,'raw');
+ }
+ $desktop->[2] ||= 'Qt';
+ if ($b_admin){
+ if ($v_data && @$v_data){
+ $fw_src = $tk_src;
+ ($desktop->[9],$desktop->[10]) = item_from_version($v_data,
+ ['^KDE Frameworks:',3,'frameworks']);
+ }
+ # This has Frameworks version as of kde 5
+ if ($kded && !$desktop->[10]){
+ $fw_src = $kded;
+ ($desktop->[9],$desktop->[10]) = ProgramData::full($kded_name . '-frameworks',$kded);
+ }
+ }
+ }
+ main::feature_debugger('kde >= 5 v_src,tk_src,fw_src,v_data,$desktop',
+ [$v_src,$tk_src,$fw_src,$v_data,$desktop],$dbg[63]) if $b_dbg_de;
+ }
+ }
+ # KDE_FULL_SESSION property is only available since KDE 3.5.5. This will only
+ # trigger for KDE 3.5, since above conditions catch >= 4
+ elsif ($kde_full_session eq 'true'){
+ # this is going to be bad data since new kdedX is different version from kde
+ ($desktop->[0],$desktop->[1],$v_data) = ProgramData::full($kded_name,$kded,0,'raw');
+ $desktop->[1] ||= '3.5';
+ if ($extra > 1 && $v_data && @$v_data){
+ ($desktop->[2],$desktop->[3]) = item_from_version($v_data,['^Qt:',2,'Qt']);
+
+ }
+ $desktop->[2] ||= 'Qt' if $extra > 1;
+ main::feature_debugger('kde 3.5 de+qt $desktop',$desktop,$dbg[63]) if $b_dbg_de;
+ }
eval $end if $b_log;
}
-sub get_env_xprop_non_gnome_based_data {
+
+# XFCE #
+# Not strictly dependent on xprop data, which is not necessarily always present
+sub de_xfce_data {
eval $start if $b_log;
- my ($program,@version_data,$version);
- #print join "\n", @xprop, "\n";
+ my ($program,$v_data);
+ # print 'de-xfce-env: ', Data::Dumper::Dumper \%xprop;
# String: "This is xfdesktop version 4.2.12"
# alternate: xfce4-about --version > xfce4-about 4.10.0 (Xfce 4.10)
- # note: some distros/wm (e.g. bunsen) set xdg to xfce to solve some other
- # issues so don't test for that. $xdg_desktop eq 'xfce'
+ # note: some distros/wm (e.g. bunsen) set $xdg_desktop to xfce to solve some
+ # other issues so but are OpenBox. Not inxi issue.
+ # $xdg_desktop can be /usr/bin/startxfce4
+ # print "xdg_d: $xdg_desktop gdms: $gdmsession\n";
if ($xdg_desktop eq 'xfce' || $gdmsession eq 'xfce' ||
- (main::check_program('xfdesktop')) && main::awk(\@xprop,'^(xfdesktop|xfce)' )){
- # this is a very expensive test that doesn't usually result in a find
- # talk to xfce to see what id they will be using for xfce 5
-# if (main::awk(\@xprop, 'xfce4')){
-# $version = '4';
-# }
- if (main::awk(\@xprop, 'xfce5')){
- $version = '5';
- }
- else {
- $version = '4';
- }
- @data = main::program_values('xfdesktop');
- $desktop[0] = $data[3];
- # xfdesktop --version out of x fails to get display, so no data
- @version_data = main::grabber('xfdesktop --version 2>/dev/null');
- # out of x, this error goes to stderr, so it's an empty result
- $desktop[1] = main::awk(\@version_data,$data[0],$data[1],'\s+');
- #$desktop[1] = main::program_version('xfdesktop',$data[0],$data[1],$data[2],$data[5],$data[6]);
- if ( !$desktop[1] ){
- @data = main::program_values("xfce${version}-panel");
- # print Data::Dumper::Dumper \@data;
+ (($xprop{'xfdesktop'} || $xprop{'xfce'}) && main::check_program('xfdesktop'))){
+ ($desktop->[0],$desktop->[1],$v_data) = ProgramData::full('xfdesktop','',0,'raw');
+ if (!$desktop->[1]){
+ my $version = '4'; # just assume it's 4, we tried
+ if ($program = main::check_program('xfce4-panel')){
+ $version = '4';
+ }
+ # talk to xfce to see what id they will be using for xfce 5
+ elsif ($program = main::check_program('xfce5-panel')){
+ $version = '5';
+ }
+ # they might get rid of number, we'll see
+ elsif ($program = main::check_program('xfce-panel')){
+ $version = '';
+ }
+ # xfce4-panel does not show built with gtk [version]
# this returns an error message to stdout in x, which breaks the version
# xfce4-panel --version out of x fails to get display, so no data
- $desktop[1] = main::program_version("xfce${version}-panel",$data[0],$data[1],$data[2],$data[5],$data[6]);
# out of x this kicks out an error: xfce4-panel: Cannot open display
- $desktop[1] = '' if $desktop[1] !~ /[0-9]\./;
+ ($desktop->[0],$desktop->[1]) = ProgramData::full("xfce${version}-panel",$program);
}
- $desktop[0] ||= 'Xfce';
- $desktop[1] ||= ''; # xfce isn't going to be 4 forever
- if ($extra > 1){
- @data = main::program_values('xfdesktop-toolkit');
- #$desktop[3] = main::program_version('xfdesktop',$data[0],$data[1],$data[2],$data[5],$data[6]);
- $desktop[3] = main::awk(\@version_data,$data[0],$data[1],'\s+');
- $desktop[2] = $data[3];
+ $desktop->[0] ||= 'Xfce';
+ $desktop->[1] ||= ''; # xfce isn't going to be 4 forever
+ if ($extra > 1 && $v_data && @$v_data){
+ ($desktop->[2],$desktop->[3]) = item_from_version($v_data,['^Built with GTK',4,'Gtk']);
}
+ main::feature_debugger('xfce $program,$desktop',[$program,$desktop],
+ $dbg[63]) if $b_dbg_de;
}
- elsif ( $xdg_desktop eq 'moksha' || $gdmsession eq 'moksha' ||
- (main::check_program('enlightenment') || main::check_program('moksha') ) && main::awk(\@xprop,'moksha') ){
- # no -v or --version but version is in xprop -root
- # ENLIGHTENMENT_VERSION(STRING) = "Moksha 0.2.0.15989"
- $desktop[0] = 'Moksha';
- $desktop[1] = main::awk(\@xprop,'(enlightenment|moksha)_version',2,'\s+=\s+' );
- $desktop[1] =~ s/"?(Moksha|Enlightenment)\s([^"]+)"?/$2/i if $desktop[1];
- }
- elsif ( $xdg_desktop eq 'enlightenment' || $gdmsession eq 'enlightenment' ||
- (main::check_program('enlightenment') && main::awk(\@xprop,'enlightenment' ) ) ){
- # no -v or --version but version is in xprop -root
- # ENLIGHTENMENT_VERSION(STRING) = "Enlightenment 0.16.999.49898"
- $desktop[0] = 'Enlightenment';
- $desktop[1] = main::awk(\@xprop,'(enlightenment|moksha)_version',2,'\s+=\s+' );
- $desktop[1] =~ s/"?(Moksha|Enlightenment)\s([^"]+)"?/$2/i if $desktop[1];
- }
- # the sequence here matters, some desktops like icewm, razor, let you set different
- # wm, so we want to get the main controlling desktop first, then fall back to the wm
- # detections. get_ps_de_data() and get_wm() will handle alternate wm detections.
- if (!$desktop[0]){
- # 0 check program; 1 xprop search; 2: data; 3 - optional: ps_gui search
+ eval $end if $b_log;
+}
+
+## GENERAL DE TESTS ##
+sub de_env_data {
+ eval $start if $b_log;
+ if (!$desktop->[0]){
+ my $v_data;
+ # 0: 0/1 regex/eq; 1: env var search; 2: PD full; 3: [PD version cmd];
+ # 4: tk; 5: ps search;
+ # 6: [toolkits data sourced from full version [search,position,print]]
my @desktops =(
- ['icewm','icewm','icewm'],
- # debian package: i3-wm
- ['i3','i3','i3'],
- ['mwm','^_motif','mwm'],
- # debian package name: wmaker
- ['WindowMaker','^_?windowmaker','wmaker'],
- ['wm2','^_wm2','wm2'],
- ['herbstluftwm','herbstluftwm','herbstluftwm'],
- ['fluxbox','blackbox_pid','fluxbox','^fluxbox$'],
- ['blackbox','blackbox_pid','blackbox'],
- ['openbox','openbox_pid','openbox'],
- ['amiwm','amiwm','amiwm'],
+ [1,'unity','unity','',''],
+ [0,'budgie','budgie-desktop','','gtk'],
+ # debian package: lxde-core.
+ # NOTE: some distros fail to set XDG data for root, ps may get it
+ [1,'lxde','lxpanel','','gtk-na',',^lxsession$'], # no gtk v data, not same as system
+ [1,'razor','razor-session','','qt','^razor-session$'],
+ # BAD: lxqt-about opens dialogue, sigh.
+ # Checked, lxqt-panel does show same version as lxqt-about/session
+ [1,'lxqt','lxqt-panel','','qt','^lxqt-session$',['Qt',2,'Qt']],
+ [0,'^(razor|lxqt)$','lxqt-variant','','qt','^(razor-session|lxqt-session)$'],
+ [1,'fvwm-crystal','fvwm-crystal','fvwm',''],
+ [1,'hyprland','hyprctl','',''],
+ [1,'blackbox','blackbox','',''],
+ # note, X-Cinnamon value strikes me as highly likely to change, so just
+ # search for the last part
+ [1,'nscde','nscde','',''],# has to go before cde
+ [0,'cde','cde','','motif'],
+ [0,'cinnamon','cinnamon','','gtk'],
+ # these so far have no cli version data
+ [1,'deepin','deepin','','qt'], # version comes from file read
+ [1,'draco','draco','','qt'],
+ [1,'leftwm','leftwm','',''],
+ [1,'mlvwm','mlvwm','',''],
+ [0,'^(motif\s?window|mwm)','mwm','','motif'],
+ [1,'pantheon','pantheon','','gtk'],
+ [1,'penrose','penrose','',''],# unknown, just guessing
+ [1,'lumina','lumina-desktop','','qt'],
+ [0,'manokwari','manokwari','','gtk'],
+ [1,'ukui','ukui-session','','qt'],
+ [0,'wmaker|windowmaker','windowmaker','wmaker',''],
);
foreach my $item (@desktops){
- if (main::check_program($item->[0]) && main::awk(\@xprop,$item->[1]) &&
- (!$item->[4] || (@ps_gui && (grep {/$item->[4]/} @ps_gui ))) ){
- ($desktop[0],$desktop[1]) = main::program_data($item->[2]);
+ # Check if in xdg_desktop OR desktop_session OR if in $item->[5] and in ps_gui
+ if ((($item->[0] &&
+ ($xdg_desktop eq $item->[1] || $desktop_session eq $item->[1])) ||
+ (!$item->[0] &&
+ ($xdg_desktop =~ /$item->[1]/ || $desktop_session =~ /$item->[1]/))) ||
+ ($item->[5] &&
+ @{$ps_data{'de-ps-detect'}} && (grep {/$item->[5]/} @{$ps_data{'de-ps-detect'}}))){
+ ($desktop->[0],$desktop->[1],$v_data) = ProgramData::full($item->[2],$item->[3],0,$item->[6]);
+ if ($extra > 1){
+ if ($item->[6] && $v_data && @$v_data){
+ ($desktop->[2],$desktop->[3]) = item_from_version($v_data,$item->[6]);
+ }
+ $tk_test = $item->[4] if !$desktop->[3];
+ }
+ main::feature_debugger('env de-wm',$desktop,$dbg[63]) if $b_dbg_de;
+ last;
+ }
+ }
+ }
+ eval $end if $b_log;
+}
+
+# These require data from xprop.
+sub de_misc_data {
+ eval $start if $b_log;
+ # print 'de evn xprop: ', Data::Dumper::Dumper \%xprop;
+ # the sequence here matters, some desktops like icewm, razor, let you set different
+ # wm, so we want to get the main controlling desktop first, then fall back to the wm
+ # detections. de_ps_data() and wm_data() will handle alternate wm detections.
+ if (%xprop){
+ # order matters! These are the primary xprop detected de/wm
+ my $program;
+ my @desktops = qw(icewm i3 mwm windowmaker wm2 herbstluftwm fluxbox blackbox
+ openbox amiwm);
+ foreach my $de (@desktops){
+ if ($xprop{$de} &&
+ (($program = main::check_program($xprop{$de}->{'name'})) ||
+ ($xprop{$de}->{'vname'} && ($program = main::check_program($xprop{$de}->{'vname'}))))){
+ ($desktop->[0],$desktop->[1]) = ProgramData::full($xprop{$de}->{'name'},$program);
+ main::feature_debugger('de misc $program,$desktop',
+ [$program,$desktop],$dbg[63]) if $b_dbg_de;
last;
}
}
@@ -18102,721 +29820,2293 @@ sub get_env_xprop_non_gnome_based_data {
# need to check starts line because it's so short
eval $end if $b_log;
}
-sub get_ps_de_data {
+
+sub de_ps_data {
eval $start if $b_log;
- my ($program,@version_data);
- main::set_ps_gui() if !$b_ps_gui;
- if (@ps_gui){
- # 1 check program; 2 ps_gui search; 3 data; 4: trigger alternate values/version
- my @desktops =(
- ['9wm','9wm','9wm',''],
- ['afterstep','afterstep','afterstep',''],
- ['aewm++','aewm\+\+','aewm++',''],
- ['aewm','aewm','aewm',''],
- ['amiwm','amiwm','amiwm',''],
- ['antiwm','antiwm','antiwm',''],
- ['awesome','awesome','awesome',''],
- ['blackbox','blackbox','blackbox',''],
- ['bspwm','bspwm','bspwm',''],
- ['cagebreak','cagebreak','cagebreak',''],
- ['calmwm','calmwm','calmwm',''],
- ['clfswm','.*(sh|c?lisp)?.*clfswm','clfswm',''],
+ my ($v_data,@working);
+ # The sequence here matters, some desktops like icewm, razor, let you set different
+ # wm, so we want to get the main controlling desktop first
+ # icewm and any other that permits alternate wm to be used need to go first
+ push(@working,@{$ps_data{'wm-parent'}}) if @{$ps_data{'wm-parent'}};
+ push(@working,@{$ps_data{'wm-compositors'}}) if @{$ps_data{'wm-compositors'}};
+ push(@working,@{$ps_data{'wm-main'}}) if @{$ps_data{'wm-main'}};
+ if (@working){
+ # order matters, these have alternate search patterns from default name
+ # 0: check program; 1: ps_gui search; 2: PD full; 3: [PD version cmd]
+ my @wms =(
+ ['WindowMaker','(WindowMaker|wmaker)','wmaker',''],
['cwm','(openbsd-)?cwm','cwm',''],
- ['dwm','dwm','dwm',''],
- ['echinus','echinus','echinus',''],
- ['evilwm','evilwm','evilwm',''],
- ['fireplace','fireplace','fireplace',''],
- ['fluxbox','fluxbox','fluxbox',''],
- ['flwm','flwm','flwm',''],
- ['flwm','flwm_topside','flwm',''],
- ['fvwm-crystal','fvwm.*-crystal','fvwm-crystal','fvwm'],
- ['fvwm1','fvwm1','fvwm1',''],
- ['fvwm2','fvwm2','fvwm2',''],
- ['fvwm3','fvwm3','fvwm3',''],
- ['fvwm95','fvwm95','fvwm95',''],
- ['fvwm','fvwm','fvwm',''],
- ['glass','glass','glass',''],
- ['hackedbox','hackedbox','hackedbox',''],
- ['instantwm','instantwm','instantwm',''],
- ['ion3','ion3','ion3',''],
- ['jbwm','jbwm','jbwm',''],
- ['jwm','jwm','jwm',''],
- ['larswm','larswm','larswm',''],
- ['lwm','lwm','lwm',''],
- ['mini','mini','mini',''],
- ['musca','musca','musca',''],
- ['mvwm','mvwm','mvwm',''],
- ['mwm','mwm','mwm',''],
- ['nawm','nawm','nawm',''],
- ['notion','notion','notion',''],
- ['openbox','openbox','openbox',''],
- ['orbital','orbital','orbital',''],
- ['pekwm','pekwm','pekwm',''],
- ['perceptia','perceptia','perceptia',''],
- ['qtile','.*(python.*)?qtile','qtile',''],
- ['qvwm','qvwm','qvwm',''],
- ['ratpoison','ratpoison','ratpoison',''],
- ['sawfish','sawfish','sawfish',''],
- ['scrotwm','scrotwm','scrotwm',''],
- ['spectrwm','spectrwm','spectrwm',''],
- ['stumpwm','(sh|c?lisp)?.*stumpwm','stumpwm',''],
- ['sway','sway','sway',''],
- ['matchbox-window-manager','matchbox-window-manager','matchbox-window-manager',''],
- ['tinywm','tinywm','tinywm',''],
- ['tvtwm','tvtwm','tvtwm',''],
- ['twm','twm','twm',''],
- ['waycooler','waycooler','way-cooler',''],
- ['way-cooler','way-cooler','way-cooler',''],
- ['WindowMaker','WindowMaker','wmaker',''],
- ['windowlab','windowlab','windowlab',''],
- # not in debian apt, current is wmii, version 3
- ['wmii2','wmii2','wmii2',''],
- ['wmii','wmii','wmii',''],
- ['wmx','wmx','wmx',''],
- ['xmonad','xmonad','xmonad',''],
- ## fallback for xfce in case no xprop
- ['xfdesktop','xfdesktop','xfdesktop',''],
- ['yeahwm','yeahwm','yeahwm',''],
+ ['flwm','flwm(_topside)?','flwm',''],
+ ['fvwm-crystal','fvwm.*-crystal\S*','fvwm-crystal','fvwm'],
+ ['hyprland','[Hh]yprland','hyprctl',''],
+ ['xfdesktop','xfdesktop','xfdesktop','',['^Built with GTK',4,'Gtk']],
);
- foreach my $item (@desktops){
+ # note: use my $item to avoid bizarre return from program_data to ps_gui write
+ foreach my $item (@wms){
# no need to use check program with short list of ps_gui
- if (grep {/^$item->[1]$/} @ps_gui){
- ($desktop[0],$desktop[1]) = main::program_data($item->[2],$item->[3]);
- if ($extra > 1 && $item->[0] eq 'xfdesktop'){
- ($desktop[2],$desktop[3]) = main::program_data('xfdesktop-toolkit',$item->[0],1);
- }
+ # print "1: $item->[1]\n";
+ if (grep {/^$item->[1]$/i} @working){
+ # print "2: $item->[1]\n";
+ ($desktop->[0],$desktop->[1],$v_data) = ProgramData::full($item->[2],$item->[3],0,$item->[4]);
+ if ($extra > 1 && $item->[4] && $v_data && @$v_data){
+ ($desktop->[2],$desktop->[3]) = item_from_version($v_data,$item->[4]);
+ }
+ main::feature_debugger('ps de test 1 $desktop',
+ $desktop,$dbg[63]) if $b_dbg_de;
last;
}
}
+ if (!$desktop->[0]){
+ # we're relying on the stack order to get primary before secondary wm
+ my $de = shift(@working);
+ ($desktop->[0],$desktop->[1]) = ProgramData::full($de);
+ main::feature_debugger('ps de test 2 $desktop',
+ $desktop,$dbg[63]) if $b_dbg_de;
+ }
}
eval $end if $b_log;
}
+
+## TOOLKIT DATA ##
# NOTE: used to use a super slow method here, but gtk-launch returns
# the gtk version I believe
-sub set_gtk_data {
+sub tk_gtk_data {
eval $start if $b_log;
if (main::check_program('gtk-launch')){
- ($desktop[2],$desktop[3]) = main::program_data('gtk-launch');
+ ($desktop->[2],$desktop->[3]) = ProgramData::full('gtk-launch');
+ main::feature_debugger('gtk $desktop 2,3',
+ [$desktop->[2],$desktop->[3]],$dbg[63]) if $b_dbg_de;
}
eval $end if $b_log;
}
-sub set_qt_data {
+
+# This handles stray tooltips that won't get versions, yet anyway.
+sub tk_misc_data {
eval $start if $b_log;
- my ($program,@data,@version_data);
+ if ($tk_test eq 'gtk-na'){
+ $desktop->[2] = 'Gtk';
+ }
+ else {
+ $desktop->[2] = ucfirst($tk_test);
+ }
+ eval $end if $b_log;
+}
+
+# Note ideally most of these are handled by item_from_version, but these will
+# handle as fallback detections as those are updated, if possible.
+sub tk_qt_data {
+ eval $start if $b_log;
+ my $program;
my $kde_version = $kde_session_version;
- $program = '';
if (!$kde_version){
- if ($program = main::check_program("kded6") ){$kde_version = 6;}
- elsif ($program = main::check_program("kded5") ){$kde_version = 5;}
- elsif ($program = main::check_program("kded4") ){$kde_version = 4;}
- elsif ($program = main::check_program("kded") ){$kde_version = '';}
+ if ($program = main::check_program("kded6")){
+ $kde_version = 6;}
+ elsif ($program = main::check_program("kded5")){
+ $kde_version = 5;}
+ elsif ($program = main::check_program("kded4")){
+ $kde_version = 4;}
+ elsif ($program = main::check_program("kded")){
+ $kde_version = '';}
}
# alternate: qt4-default, qt4-qmake or qt5-default, qt5-qmake
# often this exists, is executable, but actually is nothing, shows error
- if (!$desktop[3] && main::check_program('qmake')){
- ($desktop[2],$desktop[3]) = main::program_data('qmake');
+ if (!$desktop->[3] && ($program = main::check_program('qmake'))){
+ ($desktop->[2],$desktop->[3]) = ProgramData::full('qmake-qt',$program);
}
- if (!$desktop[3] && main::check_program('qtdiag')){
- ($desktop[2],$desktop[3]) = main::program_data('qtdiag');
+ if (!$desktop->[3] && ($program = main::check_program('qtdiag'))){
+ ($desktop->[2],$desktop->[3]) = ProgramData::full('qtdiag-qt',$program);
}
- if (!$desktop[3] && ($program = main::check_program("kf$kde_version-config") )){
- @version_data = main::grabber("$program --version 2>/dev/null");
- $desktop[2] = 'Qt';
- $desktop[3] = main::awk(\@version_data,'^Qt:',2) if @version_data;
+ if (!$desktop->[3] && ($program = main::check_program("kf$kde_version-config"))){
+ ($desktop->[2],$desktop->[3]) = ProgramData::full('kf-config-qt',$program);
}
# note: qt 5 does not show qt version in kded5, sigh
- if (!$desktop[3] && ($program = main::check_program("kded$kde_version"))){
- @version_data = main::grabber("$program --version 2>/dev/null");
- $desktop[2] = 'Qt';
- $desktop[3] = main::awk(\@version_data,'^Qt:',2) if @version_data;
+ if (!$desktop->[3] && ($program = main::check_program("kded$kde_version"))){
+ ($desktop->[2],$desktop->[3]) = ProgramData::full('kded-qt',$program);
+ }
+ if ($b_dbg_de && ($desktop->[2] || $desktop->[3])){
+ main::feature_debugger('qt $program,qt,v $desktop 2,3',
+ [$program,$desktop->[2],$desktop->[3]],$dbg[63]);
}
eval $end if $b_log;
}
-sub get_wm {
+## WM DATA ##
+sub wm_data {
eval $start if $b_log;
- if (!$b_wmctrl) {
- get_wm_main();
+ my $b_wm;
+ if (!$force{'wmctrl'}){
+ set_xprop() if !$loaded{'xprop'};
+ wm_ps_xprop_data(\$b_wm);
}
# note, some wm, like cinnamon muffin, do not appear in ps aux, but do in wmctrl
- if ( (!$desktop[5] || $b_wmctrl) && (my $program = main::check_program('wmctrl'))){
- get_wm_wmctrl($program);
- }
- eval $end if $b_log;
-}
-sub get_wm_main {
- eval $start if $b_log;
- my ($wms,$working);
- # xprop is set only if not kde/gnome/cinnamon/mate/budgie/lx..
- if ($b_xprop){
- #KWIN_RUNNING
- $wms = 'amiwm|blackbox|bspwm|compiz|kwin_wayland|kwin_x11|kwin|marco|';
- $wms .= 'motif|muffin|openbox|herbstluftwm|twin|ukwm|wm2|windowmaker|i3';
- foreach (@xprop){
- if (/($wms)/){
- $working = $1;
- $working = 'wmaker' if $working eq 'windowmaker';
- last;
- }
+ if (((!$b_wm && !$desktop->[5]) || $force{'wmctrl'}) &&
+ (my $program = main::check_program('wmctrl'))){
+ wm_wmctrl_data($program);
+ }
+ eval $end if $b_log;
+}
+
+# args: 0: $b_wm ref
+sub wm_ps_xprop_data {
+ eval $start if $b_log;
+ my $b_wm = $_[0];
+ my @wms;
+ # order matters, see above logic
+ push(@wms,@{$ps_data{'de-wm-compositors'}}) if @{$ps_data{'de-wm-compositors'}};
+ push(@wms,@{$ps_data{'wm-compositors'}}) if @{$ps_data{'wm-compositors'}};
+ push(@wms,@{$ps_data{'wm-main'}}) if @{$ps_data{'wm-main'}};
+ # eg: blackbox parent of icewm, icewm parent of blackbox
+ push(@wms,@{$ps_data{'wm-parent'}}) if @{$ps_data{'wm-parent'}};
+ # leave off parent since that would always be primary
+ foreach my $wm (@wms){
+ if ($wm eq 'windowmaker'){
+ $wm = 'wmaker';}
+ wm_version('manual',$wm,$b_wm);
+ if ($desktop->[5]){
+ main::feature_debugger('ps wm,v $desktop 5,6',
+ [$desktop->[5],$desktop->[6]],$dbg[63]) if $b_dbg_de;
+ last;
}
}
- if (!$desktop[5]){
- main::set_ps_gui() if ! $b_ps_gui;
- # order matters, see above logic
- # due to lisp/python starters, clfswm/stumpwm/qtile will not detect here
- $wms = '9wm|aewm\+\+|aewm|afterstep|amiwm|antiwm|awesome|blackbox|bspwm|budgie-wm|';
- $wms .= 'cagebreak|calmwm|clfswm|compiz|(openbsd-)?cwm|fluxbox|';
- $wms .= 'deepin-wm|dwm|echinus|evilwm|';
- $wms .= 'fireplace|flwm|fvwm-crystal|fvwm1|fvwm2|fvwm3|fvwm95|fvwm|';
- $wms .= 'gala|glass|gnome-shell|hackedbox|i3|instantwm|ion3|jbwm|jwm|';
- $wms .= 'twin|kwin_wayland|kwin_x11|kwin|larswm|lwm|';
- $wms .= 'matchbox-window-manager|marco|mini|muffin|';
- $wms .= 'musca|deepin-mutter|mutter|deepin-metacity|metacity|mvwm|mwm|';
- $wms .= 'nawm|notion|openbox|orbital|perceptia|qtile|qvwm|';
- $wms .= 'ratpoison|sawfish|scrotwm|spectrwm|';
- $wms .= 'stumpwm|sway|tinywm|tvtwm|twm|ukwm|';
- $wms .= 'way-?cooler|windowlab|WindowMaker|wm2|wmii2|wmii|wmx|';
- $wms .= 'xfwm4|xfwm5|xmonad|yeahwm';
- foreach (@ps_gui){
- if (/^($wms)$/){
- $working = $1;
+ # xprop is set only if not kde/gnome/cinnamon/mate/budgie/lx. Issues with
+ # fluxbox blackbox_pid false detection, so run this as fallback.
+ if (!$desktop->[5] && %xprop){
+ # print "wm ps xprop: ", Data::Dumper::Dumper \%xprop;
+ # KWIN_RUNNING, note: the actual xprop filters handle position and _ type syntax
+ # don't use i3, it's not unique enough in this test, can trigger false positive
+ @wms = qw(amiwm blackbox bspwm compiz kwin_x11 kwinft kwin
+ marco motif muffin mutter openbox herbstluftwm twin ukwm wm2 windowmaker);
+ my $working;
+ foreach my $wm (@wms){
+ last if $desktop->[0] && $wm eq lc($desktop->[0]); # catch odd stuff like wmaker
+ if ($xprop{$wm}){
+ $working = $wm;
+ if ($working eq 'mutter' && $desktop->[0] && lc($desktop->[0]) eq 'cinnamon'){
+ $working = 'muffin';
+ }
+ $working = $xprop{$wm}->{'vname'} if $xprop{$wm}->{'vname'};
+ wm_version('manual',$working,$b_wm);
+ main::feature_debugger('xprop wm,v $desktop 5,6',
+ [$desktop->[5],$desktop->[6]],$dbg[63]) if $b_dbg_de;
last;
}
}
}
- get_wm_version('manual',$working) if $working;
- $desktop[5] = $working if !$desktop[5] && $working;
eval $end if $b_log;
}
-sub get_wm_wmctrl {
+
+sub wm_wmctrl_data {
eval $start if $b_log;
my ($program) = @_;
my $cmd = "$program -m 2>/dev/null";
my @data = main::grabber($cmd,'','strip');
main::log_data('dump','@data',\@data) if $b_log;
- $desktop[5] = main::awk(\@data,'^Name',2,'\s*:\s*');
- $desktop[5] = '' if $desktop[5] && $desktop[5] eq 'N/A';
- if ($desktop[5]){
+ $desktop->[5] = main::awk(\@data,'^Name',2,'\s*:\s*');
+ # qtile,scrotwm,spectrwm have an odd fake wmctrl wm for irrelevant reasons
+ # inxi doesn't support lg3d, if support added update this, but assume bad
+ if ($desktop->[5] && ($desktop->[5] eq 'N/A' ||
+ ($desktop->[0] && $desktop->[5] eq 'LG3D'))){
+ $desktop->[5] = '';
+ }
+ if ($desktop->[5]){
# variants: gnome shell;
# IceWM 1.3.8 (Linux 3.2.0-4-amd64/i686) ; Metacity (Marco) ; Xfwm4
- $desktop[5] =~ s/\d+\.\d\S+|[\[\(].*\d+\.\d.*[\)\]]//g;
- $desktop[5] = main::trimmer($desktop[5]);
+ $desktop->[5] =~ s/\d+\.\d\S+|[\[\(].*\d+\.\d.*[\)\]]//g;
+ $desktop->[5] = main::trimmer($desktop->[5]);
# change Metacity (Marco) to marco
- if ($desktop[5] =~ /marco/i) {$desktop[5] = 'marco'}
- elsif ($desktop[5] =~ /muffin/i) {$desktop[5] = 'muffin'}
- elsif (lc($desktop[5]) eq 'gnome shell') {$desktop[5] = 'gnome-shell'}
- elsif ($desktop_session eq 'trinity' && lc($desktop[5]) eq 'kwin') {$desktop[5] = 'Twin'}
- get_wm_version('wmctrl',$desktop[5]);
+ if ($desktop->[5] =~ /marco/i){
+ $desktop->[5] = 'marco';}
+ elsif ($desktop->[5] =~ /muffin/i){
+ $desktop->[5] = 'muffin';}
+ elsif (lc($desktop->[5]) eq 'gnome shell'){
+ $desktop->[5] = 'gnome-shell';}
+ elsif ($desktop_session eq 'trinity' && lc($desktop->[5]) eq 'kwin'){
+ $desktop->[5] = 'Twin';}
+ wm_version('wmctrl',$desktop->[5]);
+ main::feature_debugger('wmctrl wm,v $desktop 5,6',
+ [$desktop->[5],$desktop->[6]],$dbg[63]) if $b_dbg_de;
}
eval $end if $b_log;
}
-sub get_wm_version {
+
+# args: 0: manual/wmctrl; 1: wm; 2: $b_wm ref
+sub wm_version {
eval $start if $b_log;
- my ($type,$wm) = @_;
+ my ($type,$wm,$b_wm) = @_;
# we don't want the gnome-shell version, and the others have no --version
# we also don't want to run --version again on stuff we already have tested
- return if ! $wm || $wm =~ /^(budgie-wm|gnome-shell)$/ || ($desktop[0] && lc($desktop[0]) eq lc($wm) );
- my $temp = (split /\s+/, $wm)[0];
+ if (!$wm || ($desktop->[0] && lc($desktop->[0]) eq lc($wm))){
+ # we don't want to run wmctrl if we got a matching de/wm set
+ $$b_wm = 1 if $wm;
+ return;
+ }
+ elsif ($wm && $wm =~ /^(budgie-wm|gnome-shell)$/){
+ $desktop->[5] = $wm;
+ return;
+ }
+ my $temp = (split(/\s+/, $wm))[0];
if ($temp){
- $temp = (split /\s+/, $temp)[0];
+ $temp = (split(/\s+/, $temp))[0];
$temp = lc($temp);
$temp = 'wmaker' if $temp eq 'windowmaker';
- my @data = main::program_data($temp,$temp,3);
+ my @data = ProgramData::full($temp,$temp,3);
return if !$data[0];
# print Data::Dumper::Dumper \@data;
- $desktop[5] = $data[0] if $type eq 'manual';
- $desktop[6] = $data[1] if $data[1];
+ $desktop->[5] = $data[0] if $type eq 'manual';
+ $desktop->[6] = $data[1] if $data[1];
}
eval $end if $b_log;
}
-sub set_info_data {
+## PARTS/TOOLS DATA ##
+sub components_data {
eval $start if $b_log;
- main::set_ps_gui() if ! $b_ps_gui;
- my (@data,@info,$item);
- my $pattern = 'alltray|awn|bar|bmpanel|bmpanel2|budgie-panel|cairo-dock|';
- $pattern .= 'dde-dock|dmenu|dockbarx|docker|docky|dzen|dzen2|';
- $pattern .= 'fancybar|fbpanel|fspanel|glx-dock|gnome-panel|hpanel|i3bar|i3status|icewmtray|';
- $pattern .= 'kdocker|kicker|';
- $pattern .= 'latte|latte-dock|lemonbar|ltpanel|lxpanel|lxqt-panel|';
- $pattern .= 'matchbox-panel|mate-panel|ourico|';
- $pattern .= 'perlpanel|plank|plasma-desktop|plasma-netbook|polybar|pypanel|';
- $pattern .= 'razor-panel|razorqt-panel|stalonetray|swaybar|taskbar|tint2|trayer|';
- $pattern .= 'ukui-panel|vala-panel|wbar|wharf|wingpanel|witray|';
- $pattern .= 'xfce4-panel|xfce5-panel|xmobar|yabar';
- if (@data = grep {/^($pattern)$/} @ps_gui ) {
- # only one entry per type, can be multiple
- foreach $item (@data){
- if (! grep {$item =~ /$_/} @info){
- $item = main::trimmer($item);
- $item =~ s/.*\///;
- push @info, (split /\s+/, $item)[0];
+ if (@{$ps_data{'components-active'}}){
+ main::make_list_value($ps_data{'components-active'},\$desktop->[4],',','sort');
+ }
+ eval $end if $b_log;
+}
+
+sub tools_data {
+ eval $start if $b_log;
+ # these are running/active
+ if (@{$ps_data{'tools-active'}}){
+ main::make_list_value($ps_data{'tools-active'},\$desktop->[7],',','sort');
+ }
+ # now check if any are available but not running/services
+ if ($b_admin){
+ my %test;
+ my $installed = [];
+ if ($desktop->[7]){
+ foreach my $tool (@{$ps_data{'tools-active'}}){
+ $test{$tool} = 1;
+ }
+ }
+ foreach my $item (@{$ps_data{'tools-test'}}){
+ next if $test{$item};
+ if (main::check_program($item)){
+ push(@$installed,$item);
}
}
+ if (@$installed){
+ main::make_list_value($installed,\$desktop->[8],',','sort');
+ }
}
- if (@info){
- @info = main::uniq(@info);
- $desktop[4] = join (', ', @info);
+ eval $end if $b_log;
+}
+
+## UTILITIES ##
+
+# args: 0: raw $version data ref; 1: [search regex, split pos, print name]
+# returns item print name, version
+sub item_from_version {
+ eval $start if $b_log;
+ my ($item,$version);
+ if (!$_[0] || !$_[1] || ref $_[0] ne 'ARRAY'){
+ eval $end if $b_log;
+ return;
+ }
+ foreach my $line (@{$_[0]}){
+ # print "line: $line\n";
+ if ($line =~ /${$_[1]}[0]/){
+ my @data = split(/\s+/,$line);
+ # print 'ifv main: ', Data::Dumper::Dumper \@data;
+ ($item,$version) = (${$_[1]}[2],$data[${$_[1]}[1] - 1]);
+ last;
+ }
}
+ $version =~ s/[,_\.-]$//g if $version; # trim off gunk
eval $end if $b_log;
+ return ($item,$version);
+}
+
+# note: for tests, all values are lowercased.
+sub set_env_data {
+ # NOTE $XDG_CURRENT_DESKTOP envvar is not reliable, but it shows certain desktops better.
+ # most desktops are not using it as of 2014-01-13 (KDE, UNITY, LXDE. Not Gnome)
+ $desktop_session = ($ENV{'DESKTOP_SESSION'}) ? clean_env($ENV{'DESKTOP_SESSION'}) : '';
+ $xdg_desktop = ($ENV{'XDG_CURRENT_DESKTOP'}) ? clean_env($ENV{'XDG_CURRENT_DESKTOP'}) : '';
+ $kde_full_session = ($ENV{'KDE_FULL_SESSION'}) ? clean_env($ENV{'KDE_FULL_SESSION'}) : '';
+ $kde_session_version = ($ENV{'KDE_SESSION_VERSION'}) ? $ENV{'KDE_SESSION_VERSION'} : '';
+ # for fallback to fallback protections re false gnome id
+ $gdmsession = ($ENV{'GDMSESSION'}) ? clean_env($ENV{'GDMSESSION'}) : '';
+ main::feature_debugger('desktop-scalars',
+ ['$desktop_session: ' . $desktop_session,
+ '$xdg_desktop: ' . $xdg_desktop,
+ '$kde_full_session: ' . $kde_full_session,
+ '$kde_session_version: ' . $kde_session_version,
+ '$gdmsession: ' . $gdmsession],$dbg[63]) if $b_dbg_de;
+}
+
+# Note: an ubuntu regresssion replaces or adds 'ubuntu' string to
+# real value. Since ubuntu is the only distro I know that does this,
+# will add more distro type filters as/if we come across them
+# args: 0:
+sub clean_env {
+ $_[0] = lc(main::trimmer($_[0]));
+ $_[0] =~ s/\b(arch|debian|fedora|manjaro|mint|opensuse|ubuntu):?\s*//i;
+ return $_[0];
}
sub set_xprop {
eval $start if $b_log;
+ $loaded{'xprop'} = 1;
+ my $data;
if (my $program = main::check_program('xprop')){
- @xprop = main::grabber("xprop -root $display_opt 2>/dev/null");
- if (@xprop){
- # add wm / de as required, but only add what is really tested for above
+ $data = main::grabber("xprop -root $display_opt 2>/dev/null",'','strip','ref');
+ if ( @$data){
+ my $pattern = '_(MIT|QT_DESKTOP|WIN|XROOTPMAP)_|_NET_(CLIENT|SUPPORTED)|';
+ $pattern .= '(AT_SPI|ESETROOT|GDK_VISUALS|GNOME_SM|PULSE|RESOURCE_|XKLAVIER';
+ @$data = grep {!/^($pattern))/} @$data;
+ }
+ if ($data && @$data){
+ $_ = lc for @$data;
+ # Add wm / de as required, but only add what is really tested for above
+ # index: 0: PD full name; 1: xprop search; 2: PD version name
+ my @info = (
+ ['amiwm','^amiwm',''],
+ # leads to false IDs since other wm have this too
+ # ['blackbox','blackbox_pid',''], # fluxbox, forked from blackbox, has this
+ ['bspwm','bspwm',''],
+ ['compiz','compiz',''],
+ ['enlightenment','enlightenment',''], # gets version from line
+ ['gnome-session','^_gnome_session',''],
+ ['herbstluftwm','herbstluftwm',''],
+ ['i3','^i3_',''],
+ ['icewm','icewm',''],
+ ['kde','^kde_','kwin'],
+ ['kwin','^kwin_',''],
+ ['marco','_marco',''],
+ ['moksha','moksha',''], # gets version from line
+ # cde's dtwm is based on mwm, leads to bad ID, look for them with env/ps
+ # ['motif','^_motif_wm','mwm'],
+ ['muffin','_muffin',''],
+ ['mutter','_mutter',''],
+ ['openbox','openbox_pid',''], # lxde, lxqt, razor _may_ have this
+ ['ukwm','^_ukwm',''],
+ ['windowmaker','^_?windowmaker','wmaker'],
+ ['wm2','^_wm2',''],
# XFDESKTOP_IMAGE_FILE; XFCE_DESKTOP
- my $pattern = '^amiwm|blackbox_pid|bspwm|compiz|enlightenment|^_gnome|';
- $pattern .= 'herbstluftwm|^kwin_|^i3_|icewm|_marco|moksha|^_motif|_muffin|';
- $pattern .= 'openbox_pid|^_ukwm|^_?windowmaker|^_wm2|^(xfdesktop|xfce)';
- # let's only do these searches once
- @xprop = grep {/^\S/ && /($pattern)/i} @xprop;
- $_ = lc for @xprop;
- $b_xprop = 1 if scalar @xprop > 0;
+ ['xfce','^xfce','xfdesktop'],
+ ['xfdesktop','^xfdesktop',''],
+ );
+ foreach my $item (@info){
+ foreach my $line (@$data){
+ if ($line =~ /$item->[1]/){
+ $xprop{$item->[0]} = {
+ 'name' => $item->[0],
+ 'vname' => $item->[2],
+ } if !$xprop{$item->[0]};
+ # we can have > 1 results for each search, and we want those lines
+ push(@{$xprop{$item->[0]}->{'lines'}},$line);
+ }
+ }
+ }
}
}
- # print "@xprop\n";
+ main::feature_debugger('xprop data: working, results',
+ [$data,\%xprop],$dbg[63]) if $b_dbg_de;
+ eval $end if $b_log;
+}
+}
+
+## DeviceData
+# creates arrays: $devices{'audio'}; $devices{'graphics'}; $devices{'hwraid'};
+# $devices{'network'}; $devices{'timer'} and local @devices for logging/debugging
+# 0: type
+# 1: type_id
+# 2: bus_id
+# 3: sub_id
+# 4: device
+# 5: vendor_id
+# 6: chip_id
+# 7: rev
+# 8: port
+# 9: driver
+# 10: modules
+# 11: driver_nu [bsd, like: em0 - driver em; nu 0. Used to match IF in -n
+# 12: subsystem/vendor
+# 13: subsystem vendor_id:chip id
+# 14: soc handle
+# 15: serial number
+{
+package DeviceData;
+my (@bluetooth,@devices,@files,@full_names,@pcis,@temp,@temp2,@temp3,%lspci_n);
+my ($b_bt_check,$b_lspci_n);
+my ($busid,$busid_nu,$chip_id,$content,$device,$driver,$driver_nu,$file,
+$handle,$modules,$port,$rev,$serial,$temp,$type,$type_id,$vendor,$vendor_id);
+
+sub set {
+ eval $start if $b_log;
+ ${$_[0]} = 1; # set check by reference
+ if ($use{'pci'}){
+ if (!$bsd_type){
+ if ($alerts{'lspci'}->{'action'} eq 'use'){
+ lspci_data();
+ }
+ # ! -d '/proc/bus/pci'
+ # this is sketchy, a sbc won't have pci, but a non sbc arm may have it, so
+ # build up both and see what happens
+ if (%risc){
+ soc_data();
+ }
+ }
+ else {
+ # if (1 == 1){
+ if ($alerts{'pciconf'}->{'action'} eq 'use'){
+ pciconf_data();
+ }
+ elsif ($alerts{'pcidump'}->{'action'} eq 'use'){
+ pcidump_data();
+ }
+ elsif ($alerts{'pcictl'}->{'action'} eq 'use'){
+ pcictl_data();
+ }
+ }
+ if ($dbg[9]){
+ print Data::Dumper::Dumper $devices{'audio'};
+ print Data::Dumper::Dumper $devices{'bluetooth'};
+ print Data::Dumper::Dumper $devices{'graphics'};
+ print Data::Dumper::Dumper $devices{'network'};
+ print Data::Dumper::Dumper $devices{'hwraid'};
+ print Data::Dumper::Dumper $devices{'timer'};
+ print "vm: $device_vm\n";
+ }
+ if ($b_log){
+ main::log_data('dump','$devices{audio}',$devices{'audio'});
+ main::log_data('dump','$devices{bluetooth}',$devices{'bluetooth'});
+ main::log_data('dump','$devices{graphics}',$devices{'graphics'});
+ main::log_data('dump','$devices{hwraid}',$devices{'hwraid'});
+ main::log_data('dump','$devices{network}',$devices{'network'});
+ main::log_data('dump','$devices{timer}',$devices{'timer'});
+ }
+ }
+ undef @devices;
eval $end if $b_log;
}
+sub lspci_data {
+ eval $start if $b_log;
+ my ($busid_full,$subsystem,$subsystem_id);
+ my $data = pci_grabber('lspci');
+ # print Data::Dumper::Dumper $data;
+ foreach (@$data){
+ # print "$_\n";
+ if ($device){
+ if ($_ eq '~'){
+ @temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+ $rev,$port,$driver,$modules,$driver_nu,$subsystem,$subsystem_id);
+ assign_data('pci',\@temp);
+ $device = '';
+ # print "$busid $device_id r:$rev p: $port\n$type\n$device\n";
+ }
+ elsif ($_ =~ /^Subsystem.*\[([a-f0-9]{4}:[a-f0-9]{4})\]/){
+ $subsystem_id = $1;
+ $subsystem = (split(/^Subsystem:\s*/, $_))[1];
+ $subsystem =~ s/(\s?\[[^\]]+\])+$//g;
+ $subsystem = main::clean($subsystem);
+ $subsystem = main::clean_pci($subsystem,'pci');
+ $subsystem = main::clean_pci_subsystem($subsystem);
+ # print "ss:$subsystem\n";
+ }
+ elsif ($_ =~ /^I\/O\sports/){
+ $port = (split(/\s+/, $_))[3];
+ # print "p:$port\n";
+ }
+ elsif ($_ =~ /^Kernel\sdriver\sin\suse/){
+ $driver = (split(/:\s*/, $_))[1];
+ }
+ elsif ($_ =~ /^Kernel\smodules/i){
+ $modules = (split(/:\s*/, $_))[1];
+ }
+ }
+ # note: arm servers can have more complicated patterns
+ # 0002:01:02.0 Ethernet controller [0200]: Cavium, Inc. THUNDERX Network Interface Controller virtual function [177d:a034] (rev 08)
+ # seen cases of lspci trimming too long lines like this:
+ # 01:00.0 Display controller [0380]: Advanced Micro Devices, Inc. [AMD/ATI] Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] [10... (rev c3) (prog-if 00 [Normal decode])
+ # \s(.*)\s\[([0-9a-f]{4}):([0-9a-f]{4})\](\s\(rev\s([^\)]+)\))?
+ elsif ($_ =~ /^((([0-9a-f]{2,4}:)?[0-9a-f]{2}:[0-9a-f]{2})[.:]([0-9a-f]+))\s+/){
+ $busid_full = $1;
+ $busid = $2;
+ $busid_nu = hex($4);
+ ($chip_id,$rev,$type,$type_id,$vendor_id) = ('','','','','');
+ $_ =~ s/^\Q$busid_full\E\s+//;
+ # old systems didn't use [...] but type will get caught in lspci_n check
+ if ($_ =~ /^(([^\[]+?)\s+\[([a-f0-9]{4})\]:\s+)/){
+ $type = $2;
+ $type_id = $3;
+ $_ =~ s/^\Q$1\E//;
+ $type = lc($type);
+ $type = main::clean_pci($type,'pci');
+ $type =~ s/\s+$//;
+ }
+ # trim off end prog-if and rev items
+ if ($_ =~ /(\s+\(prog[^\)]+\))/){
+ $_ =~ s/\Q$1\E//;
+ }
+ if ($_ =~ /(\s+\(rev\s+[^\)]+\))/){
+ $rev = $2;
+ $_ =~ s/\Q$1\E//;
+ }
+ # get rid of anything in parentheses at end in case other variants show
+ # up, which they probably will.
+ if ($_ =~ /((\s+\([^\)]+\))+)$/){
+ $_ =~ s/\Q$1\E//;
+ }
+ if ($_ =~ /(\s+\[([0-9a-f]{4}):([0-9a-f]{4})\])$/){
+ $vendor_id = $2;
+ $chip_id = $3;
+ $_ =~ s/\Q$1\E//;
+ }
+ # lspci -nnv string trunctation bug
+ elsif ($_ =~ /(\s+\[[^\]]*\.\.\.)$/){
+ $_ =~ s/\Q$1\E//;
+ }
+ $device = $_;
+ # cases of corrupted string set to ''
+ $device = main::clean($device);
+ # corrupted lspci truncation bug; and ancient lspci, 2.4 kernels
+ if (!$vendor_id){
+ my $temp = lspci_n_data($busid_full);
+ if (@$temp){
+ $type_id = $temp->[0] if !$type_id;
+ $vendor_id = $temp->[1];
+ $chip_id = $temp->[2];
+ $rev = $temp->[3] if !$rev && $temp->[3];
+ }
+ }
+ $use{'hardware-raid'} = 1 if $type_id eq '0104';
+ ($driver,$driver_nu,$modules,$port,$subsystem,$subsystem_id) = ('','','','','','');
+ }
+ }
+ print Data::Dumper::Dumper \@devices if $dbg[4];
+ main::log_data('dump','lspci @devices',\@devices) if $b_log;
+ eval $end if $b_log;
}
-sub get_display_manager {
+# args: 0: busID
+# returns if valid busID: (classID,vendorID,productID,revNu)
+# almost never used, only in case of lspci -nnv line truncation bug
+sub lspci_n_data {
eval $start if $b_log;
- my (@data,@found,$path,$working,$b_run,$b_vrun,$b_vrunrc);
- # ldm - LTSP display manager. Note that sddm does not appear to have a .pid
- # extension in Arch note: to avoid positives with directories, test for -f
- # explicitly, not -e. Guessing on cdm.pid
- my @dms = qw(cdm.pid entranced.pid gdm.pid gdm3.pid kdm.pid ldm.pid
- lightdm.pid lxdm.pid mdm.pid nodm.pid pcdm.pid sddm.pid slim.lock
- tdm.pid udm.pid wdm.pid xdm.pid xenodm.pid);
- # these are the only one I know of so far that have version info
- my @dms_version = qw(gdm gdm3 lightdm slim);
- $b_run = 1 if -d "/run";
+ my ($bus_id) = @_;
+ if (!$b_lspci_n){
+ $b_lspci_n = 1;
+ my (@data);
+ if ($fake{'lspci'}){
+ # my $file = "$fake_data_dir/pci/lspci/steve-mint-topaz-lspci-n.txt";
+ # my $file = "$fake_data_dir/pci/lspci/ben81-hwraid-lspci-n.txt";
+ # @data = main::reader($file,'strip');
+ }
+ else {
+ @data = main::grabber($alerts{'lspci'}->{'path'} . ' -n 2>/dev/null','','strip');
+ }
+ foreach (@data){
+ if (/^([a-f0-9:\.]+)\s+([a-f0-9]{4}):\s+([a-f0-9]{4}):([a-f0-9]{4})(\s+\(rev\s+([0-9a-z\.]+)\))?/){
+ my $rev = (defined $6) ? $6 : '';
+ $lspci_n{$1} = [$2,$3,$4,$rev];
+ }
+ }
+ print Data::Dumper::Dumper \%lspci_n if $dbg[4];
+ main::log_data('dump','%lspci_n',\%lspci_n) if $b_log;
+ }
+ my $return = ($lspci_n{$bus_id}) ? $lspci_n{$bus_id}: [];
+ print Data::Dumper::Dumper $return if $dbg[50];
+ main::log_data('dump','@$return') if $b_log;
+ eval $end if $b_log;
+ return $return;
+}
+
+# em0@pci0:6:0:0: class=0x020000 card=0x10d315d9 chip=0x10d38086 rev=0x00 hdr=0x00
+# vendor = 'Intel Corporation'
+# device = 'Intel 82574L Gigabit Ethernet Controller (82574L)'
+# class = network
+# subclass = ethernet
+sub pciconf_data {
+ eval $start if $b_log;
+ my $data = pci_grabber('pciconf');
+ foreach (@$data){
+ if ($driver){
+ if ($_ eq '~'){
+ $vendor = main::clean($vendor);
+ $device = main::clean($device);
+ # handle possible regex in device name, like [ConnectX-3]
+ # and which could make matches fail
+ my $device_temp = main::clean_regex($device);
+ if ($vendor && $device){
+ if (main::clean_regex($vendor) !~ /\Q$device_temp\E/i){
+ $device = "$vendor $device";
+ }
+ }
+ elsif (!$device){
+ $device = $vendor;
+ }
+ @temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+ $rev,$port,$driver,$modules,$driver_nu);
+ assign_data('pci',\@temp);
+ $driver = '';
+ # print "$busid $device_id r:$rev p: $port\n$type\n$device\n";
+ }
+ elsif ($_ =~ /^vendor/){
+ $vendor = (split(/\s+=\s+/, $_))[1];
+ # print "p:$port\n";
+ }
+ elsif ($_ =~ /^device/){
+ $device = (split(/\s+=\s+/, $_))[1];
+ }
+ elsif ($_ =~ /^class/i){
+ $type = (split(/\s+=\s+/, $_))[1];
+ }
+ }
+ # pre freebsd 13, note chip is product+vendor
+ # atapci0@pci0:0:1:1: class=0x01018a card=0x00000000 chip=0x71118086 rev=0x01 hdr=0x00
+ # freebsd 13
+ # isab0@pci0:0:1:0: class=0x060100 rev=0x00 hdr=0x00 vendor=0x8086 device=0x7000 subvendor=0x0000 subdevice=0x0000
+ if (/^([^@]+)\@pci([0-9]{1,3}:[0-9]{1,3}:[0-9]{1,3}):([0-9]{1,3}):/){
+ $driver = $1;
+ $busid = $2;
+ $busid_nu = $3;
+ $driver = $1;
+ $driver =~ s/([0-9]+)$//;
+ $driver_nu = $1;
+ # we don't use the sub sub class part of the class id, just first 4
+ if (/\bclass=0x([\S]{4})\S*\b/){
+ $type_id = $1;
+ }
+ if (/\brev=0x([\S]+)\b/){
+ $rev = $1;
+ }
+ if (/\bvendor=0x([\S]+)\b/){
+ $vendor_id = $1;
+ }
+ if (/\bdevice=0x([\S]+)\b/){
+ $chip_id = $1;
+ }
+ # yes, they did it backwards, product+vendor id
+ if (/\bchip=0x([a-f0-9]{4})([a-f0-9]{4})\b/){
+ $chip_id = $1;
+ $vendor_id = $2;
+ }
+ ($device,$type,$vendor) = ('','','');
+ }
+ }
+ print Data::Dumper::Dumper \@devices if $dbg[4];
+ main::log_data('dump','pciconf @devices',\@devices) if $b_log;
+ eval $end if $b_log;
+}
+
+sub pcidump_data {
+ eval $start if $b_log;
+ my $data = pci_grabber('pcidump');
+ main::set_dboot_data() if !$loaded{'dboot'};
+ foreach (@$data){
+ if ($_ eq '~' && $busid && $device){
+ @temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+ $rev,$port,$driver,$modules,$driver_nu,'','','',$serial);
+ assign_data('pci',\@temp);
+ ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+ $rev,$port,$driver,$modules,$driver_nu,$serial) = ();
+ next;
+ }
+ if ($_ =~ /^([0-9a-f:]+):([0-9]+):\s([^:]+)$/i){
+ $busid = $1;
+ $busid_nu = $2;
+ ($driver,$driver_nu) = pcidump_driver("$busid:$busid_nu") if $dboot{'pci'};
+ $device = main::clean($3);
+ }
+ elsif ($_ =~ /^0x[\S]{4}:\s+Vendor ID:\s+([0-9a-f]{4}),?\s+Product ID:\s+([0-9a-f]{4})/){
+ $vendor_id = $1;
+ $chip_id = $2;
+ }
+ elsif ($_ =~ /^0x[\S]{4}:\s+Class:\s+([0-9a-f]{2})(\s[^,]+)?,?\s+Subclass:\s+([0-9a-f]{2})(\s+[^,]+)?,?(\s+Interface: ([0-9a-f]+),?\s+Revision: ([0-9a-f]+))?/){
+ $type = pci_class($1);
+ $type_id = "$1$3";
+ }
+ elsif (/^Serial Number:\s*(\S+)/){
+ $serial = $1;
+ }
+ }
+ print Data::Dumper::Dumper \@devices if $dbg[4];
+ main::log_data('dump','pcidump @devices',\@devices) if $b_log;
+ eval $end if $b_log;
+}
+
+sub pcidump_driver {
+ eval $start if $b_log;
+ my $bus_id = $_[0];
+ my ($driver,$nu);
+ for (@{$dboot{'pci'}}){
+ if (/^$bus_id:([^0-9]+)([0-9]+):/){
+ $driver = $1;
+ $nu = $2;
+ last;
+ }
+ }
+ eval $end if $b_log;
+ return ($driver,$nu);
+}
+
+sub pcictl_data {
+ eval $start if $b_log;
+ my $data = pci_grabber('pcictl');
+ my $data2 = pci_grabber('pcictl-n');
+ foreach (@$data){
+ if ($_ eq '~' && $busid && $device){
+ @temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+ $rev,$port,$driver,$modules,$driver_nu);
+ assign_data('pci',\@temp);
+ ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+ $rev,$port,$driver,$modules,$driver_nu) = ();
+ next;
+ }
+ # it's too fragile to get these in one matching so match, trim, next match
+ if (/\s+\[([^\]0-9]+)([0-9]+)\]$/){
+ $driver = $1;
+ $driver_nu = $2;
+ $_ =~ s/\s+\[[^\]]+\]$//;
+ }
+ if (/\s+\(.*?(revision 0x([^\)]+))?\)/){
+ $rev = $2 if $2;
+ $_ =~ s/\s+\([^\)]+?\)$//;
+ }
+ if ($_ =~ /^([0-9a-f:]+):([0-9]+):\s+([^.]+?)$/i){
+ $busid = $1;
+ $busid_nu = $2;
+ $device = main::clean($3);
+ my $working = (grep {/^${busid}:${busid_nu}:\s/} @$data2)[0];
+ if ($working &&
+ $working =~ /^${busid}:${busid_nu}:\s+0x([0-9a-f]{4})([0-9a-f]{4})\s+\(0x([0-9a-f]{2})([0-9a-f]{2})[0-9a-f]+\)/){
+ $vendor_id = $1;
+ $chip_id = $2;
+ $type = pci_class($3);
+ $type_id = "$3$4";
+ }
+ }
+ }
+ print Data::Dumper::Dumper \@devices if $dbg[4];
+ main::log_data('dump','pcidump @devices',\@devices) if $b_log;
+ eval $end if $b_log;
+}
+
+sub pci_grabber {
+ eval $start if $b_log;
+ my ($program) = @_;
+ my ($args,$path,$pattern,$data);
+ my $working = [];
+ if ($program eq 'lspci'){
+ # 2.2.8 lspci did not support -k, added in 2.2.9, but -v turned on -k
+ $args = ' -nnv';
+ $path = $alerts{'lspci'}->{'path'};
+ $pattern = q/^[0-9a-f]+:/; # i only added perl 5.14, don't use qr/
+ }
+ elsif ($program eq 'pciconf'){
+ $args = ' -lv';
+ $path = $alerts{'pciconf'}->{'path'};
+ $pattern = q/^([^@]+)\@pci/; # i only added perl 5.14, don't use qr/
+ }
+ elsif ($program eq 'pcidump'){
+ $args = ' -v';
+ $path = $alerts{'pcidump'}->{'path'};
+ $pattern = q/^[0-9a-f]+:/; # i only added perl 5.14, don't use qr/
+ }
+ elsif ($program eq 'pcictl'){
+ $args = ' pci0 list -N';
+ $path = $alerts{'pcictl'}->{'path'};
+ $pattern = q/^[0-9a-f:]+:/; # i only added perl 5.14, don't use qr/
+ }
+ elsif ($program eq 'pcictl-n'){
+ $args = ' pci0 list -n';
+ $path = $alerts{'pcictl'}->{'path'};
+ $pattern = q/^[0-9a-f:]+:/; # i only added perl 5.14, don't use
+ }
+ if ($fake{'lspci'} || $fake{'pciconf'} || $fake{'pcictl'} || $fake{'pcidump'}){
+ # my $file = "$fake_data_dir/pci/pciconf/pci-freebsd-8.2-2";
+ # my $file = "$fake_data_dir/pci/pcidump/pci-openbsd-6.1-vm.txt";
+ # my $file = "$fake_data_dir/pci/pcictl/pci-netbsd-9.1-vm.txt";
+ # my $file = "$fake_data_dir/pci/lspci/racermach-1-knnv.txt";
+ # my $file = "$fake_data_dir/pci/lspci/rk016013-knnv.txt";
+ # my $file = "$fake_data_dir/pci/lspci/kot--book-lspci-nnv.txt";
+ # my $file = "$fake_data_dir/pci/lspci/steve-mint-topaz-lspci-nnkv.txt";
+ # my $file = "$fake_data_dir/pci/lspci/ben81-hwraid-lspci-nnv.txt";
+ # my $file = "$fake_data_dir/pci/lspci/gx78b-lspci-nnv.txt";
+ # $data = main::reader($file,'strip','ref');
+ }
+ else {
+ $data = main::grabber("$path $args 2>/dev/null",'','strip','ref');
+ }
+ if (@$data){
+ $use{'pci-tool'} = 1 if scalar @$data > 10;
+ foreach (@$data){
+ # this is the group separator and assign trigger
+ if ($_ =~ /$pattern/i){
+ push(@$working, '~');
+ }
+ push(@$working, $_);
+ }
+ push(@$working, '~');
+ }
+ print Data::Dumper::Dumper $working if $dbg[30];
+ eval $end if $b_log;
+ return $working;
+}
+
+sub soc_data {
+ eval $start if $b_log;
+ soc_devices_files();
+ soc_devices();
+ soc_devicetree();
+ print Data::Dumper::Dumper \@devices if $dbg[4];
+ main::log_data('dump','soc @devices',\@devices) if $b_log;
+ eval $end if $b_log;
+}
+
+# 1: /sys/devices/platform/soc/1c30000.ethernet/uevent:["DRIVER=dwmac-sun8i", "OF_NAME=ethernet",
+# "OF_FULLNAME=/soc/ethernet@1c30000", "OF_COMPATIBLE_0=allwinner,sun8i-h3-emac",
+# "OF_COMPATIBLE_N=1", "OF_ALIAS_0=ethernet0", # "MODALIAS=of:NethernetT<NULL>Callwinner,sun8i-h3-emac"]
+# 2: /sys/devices/platform/soc:audio/uevent:["DRIVER=bcm2835_audio", "OF_NAME=audio", "OF_FULLNAME=/soc/audio",
+# "OF_COMPATIBLE_0=brcm,bcm2835-audio", "OF_COMPATIBLE_N=1", "MODALIAS=of:NaudioT<NULL>Cbrcm,bcm2835-audio"]
+# 3: /sys/devices/platform/soc:fb/uevent:["DRIVER=bcm2708_fb", "OF_NAME=fb", "OF_FULLNAME=/soc/fb",
+# "OF_COMPATIBLE_0=brcm,bcm2708-fb", "OF_COMPATIBLE_N=1", "MODALIAS=of:NfbT<NULL>Cbrcm,bcm2708-fb"]
+# 4: /sys/devices/platform/soc/1c40000.gpu/uevent:["OF_NAME=gpu", "OF_FULLNAME=/soc/gpu@1c40000",
+# "OF_COMPATIBLE_0=allwinner,sun8i-h3-mali", "OF_COMPATIBLE_1=allwinner,sun7i-a20-mali",
+# "OF_COMPATIBLE_2=arm,mali-400", "OF_COMPATIBLE_N=3",
+# "MODALIAS=of:NgpuT<NULL>Callwinner,sun8i-h3-maliCallwinner,sun7i-a20-maliCarm,mali-400"]
+# 5: /sys/devices/platform/soc/soc:internal-regs/d0018180.gpio/uevent
+# 6: /sys/devices/soc.0/1180000001800.mdio/8001180000001800:05/uevent
+# ["DRIVER=AR8035", "OF_NAME=ethernet-phy"
+# 7: /sys/devices/soc.0/1c30000.eth/uevent
+# 8: /sys/devices/wlan.26/uevent [from pine64]
+# 9: /sys/devices/platform/audio/uevent:["DRIVER=bcm2835_AUD0", "OF_NAME=audio"
+# 10: /sys/devices/vio/71000002/uevent:["DRIVER=ibmveth", "OF_NAME=l-lan"
+# 11: /sys/devices/platform/soc:/soc:i2c-hdmi:/i2c-2/2-0050/uevent:['OF_NAME=hdmiddc'
+# 12: /sys/devices/platform/soc:/soc:i2c-hdmi:/uevent:['DRIVER=i2c-gpio', 'OF_NAME=i2c-hdmi'
+# 13: /sys/devices/platform/scb/fd580000.ethernet/uevent
+# 14: /sys/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1/uevent (wifi, pi 3,4)
+# 15: Pi BT: /sys/devices/platform/soc/fe201000.serial/uevent
+# 16: Pi BT: /sys/devices/platform/soc/fe201000.serial/tty/ttyAMA0/hci0
+sub soc_devices_files {
+ eval $start if $b_log;
+ if (-d '/sys/devices/platform/'){
+ @files = main::globber('/sys/devices/platform/soc*/*/uevent');
+ @temp2 = main::globber('/sys/devices/platform/soc*/*/*/uevent');
+ push(@files,@temp2) if @temp2;
+ if (-e '/sys/devices/platform/scb'){
+ @temp2 = main::globber('/sys/devices/platform/scb/*/uevent');
+ push(@files,@temp2) if @temp2;
+ @temp2 = main::globber('/sys/devices/platform/scb/*/*/uevent');
+ push(@files,@temp2) if @temp2;
+ }
+ @temp2 = main::globber('/sys/devices/platform/*/uevent');
+ push(@files,@temp2) if @temp2;
+ }
+ if (main::globber('/sys/devices/soc*')){
+ @temp2 = main::globber('/sys/devices/soc*/*/uevent');
+ push(@files,@temp2) if @temp2;
+ @temp2 = main::globber('/sys/devices/soc*/*/*/uevent');
+ push(@files,@temp2) if @temp2;
+ }
+ @temp2 = main::globber('/sys/devices/*/uevent'); # see case 8
+ push(@files,@temp2) if @temp2;
+ @temp2 = main::globber('/sys/devices/*/*/uevent'); # see case 10
+ push(@files,@temp2) if @temp2;
+ undef @temp2;
+ # not sure why, but even as root/sudo, /subsystem|driver/uevent are unreadable with -r test true
+ @files = grep {!/\/(subsystem|driver)\//} @files if @files;
+ main::uniq(\@files);
+ eval $end if $b_log;
+}
+
+sub soc_devices {
+ eval $start if $b_log;
+ my (@working);
+ set_bluetooth() if !$b_bt_check;
+ foreach $file (@files){
+ next if -z $file;
+ $chip_id = $file;
+ # variants: /soc/20100000.ethernet/ /soc/soc:audio/ /soc:/ /soc@0/ /soc:/12cb0000.i2c:/
+ # mips: /sys/devices/soc.0/1180000001800.mdio/8001180000001800:07/
+ # ppc: /sys/devices/vio/71000002/
+ $chip_id =~ /\/sys\/devices\/(platform\/)?(soc[^\/]*\/)?([^\/]+\/)?([^\/]+\/)?([^\/\.:]+)([\.:])?([^\/:]+)?:?\/uevent$/;
+ $chip_id = $5;
+ $temp = $7;
+ @working = main::reader($file, 'strip') if -r $file;
+ ($device,$driver,$handle,$type,$vendor_id) = ();
+ foreach my $data (@working){
+ @temp2 = split('=', $data);
+ if ($temp2[0] eq 'DRIVER'){
+ $driver = $temp2[1];
+ $driver =~ s/-/_/g if $driver; # kernel uses _, not - in module names
+ }
+ elsif ($temp2[0] eq 'OF_NAME'){
+ $type = $temp2[1];
+ }
+ # we'll use these paths to test in device tree pci completer
+ elsif ($temp2[0] eq 'OF_FULLNAME' && $temp2[1]){
+ # we don't want the short names like /soc, /led and so on
+ push(@full_names, $temp2[1]) if (() = $temp2[1] =~ /\//g) > 1;
+ $handle = (split('@', $temp2[1]))[-1] if $temp2[1] =~ /@/;
+ }
+ elsif ($temp2[0] eq 'OF_COMPATIBLE_0'){
+ @temp3 = split(',', $temp2[1]);
+ $device = $temp3[-1];
+ $vendor_id = $temp3[0];
+ }
+ }
+ # it's worthless, we can't use it
+ next if ! defined $type;
+ $type_id = $type;
+ if (@bluetooth && $type eq 'serial'){
+ my $file_temp = $file;
+ $file_temp =~ s/uevent$//;
+ $type = 'bluetooth' if grep {/$file_temp/} @bluetooth;
+ }
+ $chip_id = '' if ! defined $chip_id;
+ $vendor_id = '' if ! defined $vendor_id;
+ $driver = '' if ! defined $driver;
+ $handle = '' if ! defined $handle;
+ $busid = (defined $temp && main::is_int($temp)) ? $temp: 0;
+ $type = soc_type($type,$vendor_id,$driver);
+ ($busid_nu,$modules,$port,$rev) = (0,'','','');
+ @temp3 = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,$rev,
+ $port,$driver,$modules,'','','',$handle);
+ assign_data('soc',\@temp3);
+ main::log_data('dump','soc devices: @devices @temp3',\@temp3) if $b_log;
+ }
+ eval $end if $b_log;
+}
+
+sub soc_devicetree {
+ eval $start if $b_log;
+ # now we want to fill in stuff that was not in /sys/devices/
+ if (-d '/sys/firmware/devicetree/base/soc'){
+ @files = main::globber('/sys/firmware/devicetree/base/soc/*/compatible');
+ my $test = (@full_names) ? join('|', sort @full_names) : 'xxxxxx';
+ set_bluetooth() if !$b_bt_check;
+ foreach $file (@files){
+ if ($file !~ m%$test%){
+ ($handle,$content,$device,$type,$type_id,$vendor_id) = ('','','','','','');
+ $content = main::reader($file, 'strip',0) if -r $file;
+ $file =~ m%soc/([^@]+)@([^/]+)/compatible$%;
+ $type = $1;
+ next if !$type || !$content;
+ $handle = $2 if $2;
+ $type_id = $type;
+ if (@bluetooth && $type eq 'serial'){
+ my $file_temp = $file;
+ $file_temp =~ s/uevent$//;
+ $type = 'bluetooth' if grep {/$file_temp/} @bluetooth;
+ }
+ if ($content){
+ @temp3 = split(',', $content);
+ $vendor_id = $temp3[0];
+ $device = $temp3[-1];
+ # strip off those weird device tree special characters
+ $device =~ s/\x01|\x02|\x03|\x00//g;
+ }
+ $type = soc_type($type,$vendor_id,'');
+ @temp3 = ($type,$type_id,0,0,$device,$vendor_id,'soc','','','','','','','',$handle);
+ assign_data('soc',\@temp3);
+ main::log_data('dump','devicetree: @devices @temp3',\@temp3) if $b_log;
+ }
+ }
+ }
+ eval $end if $b_log;
+}
+
+sub set_bluetooth {
+ # special case of pi bt on ttyAMA0
+ $b_bt_check = 1;
+ @bluetooth = main::globber('/sys/class/bluetooth/*') if -e '/sys/class/bluetooth';
+ @bluetooth = map {$_ = Cwd::abs_path($_);$_} @bluetooth if @bluetooth;
+ @bluetooth = grep {!/usb/} @bluetooth if @bluetooth; # we only want non usb bt
+ main::log_data('dump','soc bt: @bluetooth', \@bluetooth) if $b_log;
+}
+
+sub assign_data {
+ my ($tool,$data) = @_;
+ if (check_graphics($data->[0],$data->[1])){
+ push(@{$devices{'graphics'}},[@$data]);
+ $use{'soc-gfx'} = 1 if $tool eq 'soc';
+ }
+ # for hdmi, we need gfx/audio both
+ if (check_audio($data->[0],$data->[1])){
+ push(@{$devices{'audio'}},[@$data]);
+ $use{'soc-audio'} = 1 if $tool eq 'soc';
+ }
+ if (check_bluetooth($data->[0],$data->[1])){
+ push(@{$devices{'bluetooth'}},[@$data]);
+ $use{'soc-bluetooth'} = 1 if $tool eq 'soc';
+ }
+ elsif (check_hwraid($data->[0],$data->[1])){
+ push(@{$devices{'hwraid'}},[@$data]);
+ $use{'soc-hwraid'} = 1 if $tool eq 'soc';
+ }
+ elsif (check_network($data->[0],$data->[1])){
+ push(@{$devices{'network'}},[@$data]);
+ $use{'soc-network'} = 1 if $tool eq 'soc';
+ }
+ elsif (check_timer($data->[0],$data->[1])){
+ push(@{$devices{'timer'}},[@$data]);
+ $use{'soc-timer'} = 1 if $tool eq 'soc';
+ }
+ # not used at this point, -M comes before ANG
+ # $device_vm = check_vm($data[4]) if ((!$risc{'ppc'} && !$risc{'mips'}) && !$device_vm);
+ push(@devices,[@$data]);
+}
+
+# Note: for SOC these have been converted in soc_type()
+sub check_audio {
+ if (($_[1] && length($_[1]) == 4 && $_[1] =~ /^04/) ||
+ ($_[0] && $_[0] =~ /^(audio|hdmi|multimedia|sound)$/i)){
+ return 1;
+ }
+ else {return 0}
+}
+
+sub check_bluetooth {
+ if (($_[1] && length($_[1]) == 4 && $_[1] eq '0d11') ||
+ ($_[0] && $_[0] =~ /^(bluetooth)$/i)){
+ return 1;
+ }
+ else {return 0}
+}
+
+sub check_graphics {
+ # note: multimedia class 04 is video if 0400. 'tv' is risky I think
+ if (($_[1] && length($_[1]) == 4 && ($_[1] =~ /^03/ || $_[1] eq '0400' ||
+ $_[1] eq '0d80')) ||
+ ($_[0] && $_[0] =~ /^(vga|display|hdmi|3d|video|tv|television)$/i)){
+ return 1;
+ }
+ else {return 0}
+}
+
+sub check_hwraid {
+ return 1 if ($_[1] && $_[1] eq '0104');
+}
+
+# NOTE: class 06 subclass 80
+# https://www-s.acm.illinois.edu/sigops/2007/roll_your_own/7.c.1.html
+# 0d20: 802.11a 0d21: 802.11b 0d80: other wireless
+sub check_network {
+ if (($_[1] && length($_[1]) == 4 && ($_[1] =~/^02/ || $_[1] =~ /^0d2/ || $_[1] eq '0680')) ||
+ ($_[0] && $_[0] =~ /^(ethernet|network|wifi|wlan)$/i)){
+ return 1;
+ }
+ else {return 0}
+}
+
+sub check_timer {
+ return 1 if ($_[0] && $_[0] eq 'timer');
+}
+
+sub check_vm {
+ if ($_[0] && $_[0] =~ /(innotek|vbox|virtualbox|vmware|qemu)/i){
+ return $1
+ }
+ else {return ''}
+}
+
+sub soc_type {
+ my ($type,$info,$driver) = @_;
+ # I2S or i2s. I2C is i2 controller |[iI]2[Ss]. note: odroid hdmi item is sound only
+ # snd_soc_dummy. simple-audio-amplifier driver: speaker_amp
+ if (($driver && $driver =~ /codec/) || ($info && $info =~ /codec/) ||
+ ($type && $type =~ /codec/)){
+ $type = 'codec';
+ }
+ elsif (($driver && $driver =~ /dummy/i) || ($info && $info =~ /dummy/i)){
+ $type = 'dummy';
+ }
+ # rome_vreg reg_fixed_voltage regulator-fixed wlan_en_vreg
+ elsif (($driver && $driver =~ /\bv?reg(ulat|_)|voltage/i) ||
+ ($info && $info =~ /_v?reg|\bv?reg(ulat|_)|voltage/i)){
+ $type = 'regulator';
+ }
+ elsif ($type =~ /^(daudio|.*hifi.*|.*sound[_-]card|.*dac[0-9]?)$/i ||
+ ($info && $info !~ /amp/i && $info =~ /(sound|audio)/i) ||
+ ($driver && $driver =~ /(audio|snd|sound)/i)){
+ $type = 'audio';
+ }
+ # no need for bluetooth since that's only found in pi, handled above
+ elsif ($type =~ /^((meson-?)?fb|disp|display(-[^\s]+)?|gpu|.*mali|vpu)$/i){
+ $type = 'display';
+ }
+ # includes ethernet-phy, meson-eth
+ elsif ($type =~ /^(([^\s]+-)?eth|ethernet(-[^\s]+)?|lan|l-lan)$/i){
+ $type = 'ethernet';
+ }
+ elsif ($type =~ /^(.*wlan.*|.*wifi.*|.*mmcnr.*)$/i){
+ $type = 'wifi';
+ }
+ # needs to catch variants like hdmi-tx but not hdmi-connector
+ elsif ($type =~ /^(.*hdmi(-?tx)?)$/i){
+ $type = 'hdmi';
+ }
+ elsif ($type =~ /^timer$/i){
+ $type = 'timer';
+ }
+ return $type;
+}
+
+sub pci_class {
+ eval $start if $b_log;
+ my ($id) = @_;
+ $id = lc($id);
+ my %classes = (
+ '00' => 'unclassified',
+ '01' => 'mass-storage',
+ '02' => 'network',
+ '03' => 'display',
+ '04' => 'audio',
+ '05' => 'memory',
+ '06' => 'bridge',
+ '07' => 'communication',
+ '08' => 'peripheral',
+ '09' => 'input',
+ '0a' => 'docking',
+ '0b' => 'processor',
+ '0c' => 'serialbus',
+ '0d' => 'wireless',
+ '0e' => 'intelligent',
+ '0f' => 'satellite',
+ '10' => 'encryption',
+ '11' => 'signal-processing',
+ '12' => 'processing-accelerators',
+ '13' => 'non-essential-instrumentation',
+ # 14 - fe reserved
+ '40' => 'coprocessor',
+ 'ff' => 'unassigned',
+ );
+ my $type = (defined $classes{$id}) ? $classes{$id}: 'unhandled';
+ eval $end if $b_log;
+ return $type;
+}
+}
+
+# if > 1, returns first found, not going to be too granular with this yet.
+sub get_device_temp {
+ eval $start if $b_log;
+ my $bus_id = $_[0];
+ my $glob = "/sys/devices/pci*/*/*:$bus_id/hwmon/hwmon*/temp*_input";
+ my @files = main::globber($glob);
+ my $temp;
+ foreach my $file (@files){
+ $temp = main::reader($file,'strip',0);
+ if ($temp){
+ $temp = sprintf('%0.1f',$temp/1000);
+ last;
+ }
+ }
+ eval $end if $b_log;
+ return $temp;
+}
+
+## DiskDataBSD
+# handles disks and partition extra data for disks bsd, raid-zfs,
+# partitions, swap, unmounted
+# glabel: partID, logical/physical-block-size, uuid, label, size
+# disklabel: partID, block-size, fs, size
+{
+package DiskDataBSD;
+
+# Sets initial pure dboot data, and fills it in with
+# disklabel/gpart partition and advanced data
+sub set {
+ eval $start if $b_log;
+ $loaded{'disk-data-bsd'} = 1;
+ set_dboot_disks();
+ if ($use{'bsd-partition'}){
+ if ($alerts{'gpart'}->{'action'} eq 'use'){
+ set_gpart_data();
+ }
+ elsif ($alerts{'disklabel'}->{'action'} eq 'use'){
+ set_disklabel_data();
+ }
+ }
+ eval $end if $b_log;
+}
+
+sub get {
+ eval $start if $b_log;
+ my $id = $_[0];
+ return if !$id || !%disks_bsd;
+ $id =~ s|^/dev/||;
+ my $data = {};
+ # this handles mainly zfs, which can be either disk or part
+ if ($disks_bsd{$id}){
+ $data = $disks_bsd{$id};
+ delete $data->{'partitions'} if $data->{'partitions'};
+ }
+ else {
+ OUTER: foreach my $key (keys %disks_bsd){
+ if ($disks_bsd{$key}->{'partitions'}){
+ foreach my $part (keys %{$disks_bsd{$key}->{'partitions'}}){
+ if ($part eq $id){
+ $data = $disks_bsd{$key}->{'partitions'}{$part};
+ last OUTER;
+ }
+ }
+ }
+ }
+ }
+ eval $end if $b_log;
+ return $data;
+}
+
+sub set_dboot_disks {
+ eval $start if $b_log;
+ my ($working,@temp);
+ foreach my $id (sort keys %{$dboot{'disk'}}){
+ next if !@{$dboot{'disk'}->{$id}};
+ foreach (@{$dboot{'disk'}->{$id}}){
+ my @row = split(/:\s*/, $_);
+ next if !$row[0];
+ # no dots, note: ada2: 2861588MB BUT: ada2: 600.000MB/s
+ # print "$_ i: $i\n";
+ # openbsd/netbsd matches will often work
+ if ($row[0] =~ /(^|,\s*)([0-9\.]+\s*[MGTPE])i?B?[,.\s]+([0-9]+)\ssectors$|^</){
+ $working = main::translate_size($2);
+ # seen: for some reason, size/sectors did not result in clean integer value
+ $disks_bsd{$id}->{'block-physical'} = POSIX::ceil(($working/$3)*1024) if $3;
+ $disks_bsd{$id}->{'size'} = $working;
+ }
+ # don't set both, if smartctl installed, we want to use its data so having
+ # only one of logical/physical will trip use of smartctl values
+ if ($row[0] =~ /[\s,]+([0-9]+)\sbytes?[\s\/]sect/){
+ #$disks_bsd{$id}->{'block-logical'} = $1;
+ $disks_bsd{$id}->{'block-physical'} = $1;
+ }
+ if ($row[1]){
+ if ($row[1] =~ /<([^>]+)>/){
+ $disks_bsd{$id}->{'model'} = $1 if $1;
+ $disks_bsd{$id}->{'type'} = 'removable' if $_ =~ /removable/;
+ # <Generic-, Compact Flash, 1.00>
+ my $count = ($disks_bsd{$id}->{'model'} =~ tr/,//);
+ if ($count && $count > 1){
+ @temp = split(/,\s*/, $disks_bsd{$id}->{'model'});
+ $disks_bsd{$id}->{'model'} = $temp[1];
+ }
+ }
+ if ($row[1] =~ /\bserial\.(\S*)/){
+ $disks_bsd{$id}->{'serial'} = $1;
+ }
+ }
+ if (!$disks_bsd{$id}->{'serial'} && $row[0] =~ /^Serial\sNumber\s(.*)/){
+ $disks_bsd{$id}->{'serial'} = $1;
+ }
+ # mmcsd0:32GB <SDHC SL32G 8.0 SN 27414E9E MFG 07/2014 by 3 SD> at mmc0 50.0MHz/4bit/65535-block
+ if (!$disks_bsd{$id}->{'serial'} && $row[0] =~ /(\s(SN|s\/n)\s(\S+))[>\s]/){
+ $disks_bsd{$id}->{'serial'} = $3;
+ # strip out the SN/MFG so it won't show in model
+ $row[0] =~ s/$1//;
+ $row[0] =~ s/\sMFG\s[^>]+//;
+ }
+ # these were mainly FreeBSD/Dragonfly matches
+ if (!$disks_bsd{$id}->{'size'} && $row[0] =~ /^([0-9]+\s*[KMGTPE])i?B?[\s,]/){
+ $working = main::translate_size($1);
+ $disks_bsd{$id}->{'size'} = $working;
+ }
+ if ($row[0] =~ /(device$|^([0-9\.]+\s*[KMGT]B\s+)?<)/){
+ $row[0] =~ s/\bdevice$//g;
+ $row[0] =~ /<([^>]*)>(\s(.*))?/;
+ $disks_bsd{$id}->{'model'} = $1 if $1;
+ $disks_bsd{$id}->{'spec'} = $3 if $3;
+ }
+ if ($row[0] =~ /^([0-9\.]+[MG][B]?\/s)/){
+ $disks_bsd{$id}->{'speed'} = $1;
+ $disks_bsd{$id}->{'speed'} =~ s/\.[0-9]+// if $disks_bsd{$id}->{'speed'};
+ }
+ $disks_bsd{$id}->{'model'} = main::clean_disk($disks_bsd{$id}->{'model'});
+ if (!$disks_bsd{$id}->{'serial'} && $show{'disk'} && $extra > 1 &&
+ $alerts{'bioctl'}->{'action'} eq 'use'){
+ $disks_bsd{$id}->{'serial'} = bioctl_data($id);
+ }
+ }
+ }
+ print Data::Dumper::Dumper \%disks_bsd if $dbg[34];
+ main::log_data('dump','%disks_bsd',\%disks_bsd) if $b_log;
+ eval $end if $b_log;
+}
+
+sub bioctl_data {
+ eval $start if $b_log;
+ my $id = $_[0];
+ my $serial;
+ my $working = (main::grabber($alerts{'bioctl'}->{'path'} . " $id 2>&1",'','strip'))[0];
+ if ($working){
+ if ($working =~ /permission/i){
+ $alerts{'bioctl'}->{'action'} = 'permissions';
+ }
+ elsif ($working =~ /serial[\s-]?(number|n[ou]\.?)?\s+(\S+)$/i){
+ $serial = $2;
+ }
+ }
+ eval $end if $b_log;
+ return $serial;
+}
+
+sub set_disklabel_data {
+ eval $start if $b_log;
+ my ($cmd,@data,@working);
+ # see docs/inxi-data.txt for fs info
+ my %fs = (
+ '4.2bsd' => 'ffs',
+ '4.4lfs' => 'lfs',
+ );
+ foreach my $id (keys %disks_bsd){
+ $cmd = "$alerts{'disklabel'}->{'path'} $id 2>&1";
+ @data = main::grabber($cmd,'','strip');
+ main::log_data('dump','disklabel @data', \@data) if $b_log;
+ if (scalar @data < 4 && (grep {/permission/i} @data)){
+ $alerts{'disklabel'}->{'action'} = 'permissions';
+ $alerts{'disklabel'}->{'message'} = main::message('root-feature');
+ last;
+ }
+ else {
+ my ($b_part,$duid,$part_id,$bytes_sector) = ();
+ if ($extra > 2 && $show{'disk'} && $alerts{'fdisk'}->{'action'} eq 'use'){
+ $disks_bsd{$id}->{'partition-table'} = fdisk_data($id);
+ }
+ foreach my $row (@data){
+ if ($row =~ /^\d+\spartitions:/){
+ $b_part = 1;
+ next;
+ }
+ if (!$b_part){
+ @working = split(/:\s*/, $row);
+ if ($working[0] eq 'bytes/sector'){
+ $disks_bsd{$id}->{'block-physical'} = $working[1];
+ $bytes_sector = $working[1];
+ }
+ elsif ($working[0] eq 'duid'){
+ $working[1] =~ s/^0+$//; # dump duid if all 0s
+ $disks_bsd{$id}->{'duid'} = $working[1];
+ }
+ elsif ($working[0] eq 'label'){
+ $disks_bsd{$id}->{'dlabel'} = $working[1];
+ }
+ }
+ # part: size [bytes*sector] offset fstype [fsize bsize cpg]# mount
+ # d: 8388608 18838976 4.2BSD 2048 16384 12960 # /tmp
+ else {
+ @working = split(/:?\s+#?\s*/, $row);
+ # netbsd: disklabel: super block size 0 AFTER partitions started!
+ # note: 'unused' fs type is NOT unused space, it's often the entire disk!!
+ if (($working[0] && $working[0] eq 'disklabel') ||
+ ($working[3] && $working[3] =~ /ISO9660|unused/i) ||
+ (!$working[1] || !main::is_numeric($working[1]))){
+ next;
+ }
+ $part_id = $id . $working[0];
+ $working[1] = $working[1]*$bytes_sector/1024 if $working[1];
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'size'} = $working[1];
+ if ($working[3]){ # fs
+ $working[3] = lc($working[3]);
+ $working[3] = $fs{$working[3]} if $fs{$working[3]}; #translate
+ }
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'fs'} = $working[3];
+ # OpenBSD: mount point; NetBSD: (Cyl. 0 - 45852*)
+ if ($working[7] && $working[7] =~ m|^/|){
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'mount'} = $working[7];
+ }
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'uuid'} = '';
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'label'} = '';
+ }
+ }
+ }
+ }
+ print Data::Dumper::Dumper \%disks_bsd if $dbg[34];
+ main::log_data('dump', '%disks_bsd', \%disks_bsd) if $b_log;
+ eval $end if $b_log;
+}
+
+sub fdisk_data {
+ eval $start if $b_log;
+ my $id = $_[0];
+ my ($scheme);
+ my @data = main::grabber($alerts{'fdisk'}->{'path'} . " -v $id 2>&1",'','strip');
+ foreach (@data){
+ if (/permission/i){
+ $alerts{'fdisk'}->{'action'} = 'permissions';
+ last;
+ }
+ elsif (/^(GUID|MBR):/){
+ $scheme = ($1 eq 'GUID') ? 'GPT' : $1;
+ last;
+ }
+ }
+ eval $start if $b_log;
+ return $scheme;
+}
+
+# 2021-03: openbsd: n/a; dragonfly: no 'list'; freebsd: yes
+sub set_gpart_data {
+ eval $start if $b_log;
+ my @data = main::grabber($alerts{'gpart'}->{'path'} . " list 2>/dev/null",'','strip');
+ main::log_data('dump', 'gpart: @data', \@data) if $b_log;
+ my ($b_cd,$id,$part_id,$type);
+ for (@data){
+ my @working = split(/\s*:\s*/, $_);
+ if ($working[0] eq 'Geom name'){
+ $id = $working[1];
+ # [1. Name|Geom name]: iso9660/FVBE
+ $b_cd = ($id =~ /iso9660/i) ? 1: 0;
+ next;
+ }
+ elsif ($working[0] eq 'scheme'){
+ $disks_bsd{$id}->{'scheme'} = $working[1];
+ next;
+ }
+ elsif ($working[0] eq 'Consumers'){
+ $type = 'disk';
+ next;
+ }
+ elsif ($working[0] eq 'Providers'){
+ $type = 'part';
+ next;
+ }
+ if (!$b_cd && $type && $type eq 'part'){
+ if ($working[0] =~ /^[0-9]+\.\s*Name/){
+ $part_id = $working[1];
+ }
+ # eg: label:(null) - we want to show null
+ elsif ($working[0] eq 'label'){
+ $working[1] =~ s/\(|\)//g;
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'label'} = $working[1];
+ }
+ elsif ($working[0] eq 'Mediasize'){
+ $working[1] =~ s/\s+\(.*$//; # trim off the (2.4G)
+ # gpart shows in bytes, not KiB. For the time being...
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'size'} = $working[1]/1024 if $working[1];
+ }
+ elsif ($working[0] eq 'rawuuid'){
+ $working[1] =~ s/\(|\)//g;
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'uuid'} = $working[1];
+ }
+ elsif ($working[0] eq 'Sectorsize'){
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'physical-block-size'} = $working[1];
+ }
+ elsif ($working[0] eq 'Stripesize'){
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'logical-block-size'} = $working[1];
+ }
+ elsif ($working[0] eq 'type'){
+ $working[1] =~ s/\(|\)//g;
+ $disks_bsd{$id}->{'partitions'}{$part_id}{'fs'} = $working[1];
+ }
+ }
+ # really strange results happen if no dboot disks were found and it's zfs!
+ elsif (!$b_cd && $type && $type eq 'disk' && $disks_bsd{$id}->{'size'}){
+ # need to see raid, may be > 1 Consumers
+ if ($working[0] =~ /^[0-9]+\.\s*Name/){
+ $id = $working[1];
+ }
+ elsif ($working[0] eq 'Mediasize'){
+ $working[1] =~ s/\s+\(.*$//; # trim off the (2.4G)
+ # gpart shows in bytes, not KiB. For the time being...
+ $disks_bsd{$id}->{'size'} = $working[1]/1024 if $working[1];
+ }
+ elsif ($working[0] eq 'Sectorsize'){
+ $disks_bsd{$id}->{'block-physical'} = $working[1];
+ }
+ }
+ }
+ print Data::Dumper::Dumper \%disks_bsd if $dbg[34];
+ main::log_data('dump', '%disks_bsd', \%disks_bsd) if $b_log;
+ eval $end if $b_log;
+}
+}
+
+## DmData
+# Public method: get()
+# returns hash ref of array of arrays for dm/lm
+# hash: dm, lm
+# 0: dm/lm print name
+# 1: dm/lm version
+# 2: dm/lm status
+{
+package DmData;
+my ($found,@glob);
+
+sub get {
+ eval $start if $b_log;
+ set_glob();
+ $found = {};
+ get_dm_lm('dm');
+ if (!$found->{'dm'}){
+ test_ps_dm()
+ }
+ get_dm_lm('lm') if !$found->{'dm'};
+ print 'dm data: ', Data::Dumper::Dumper $found if $dbg[60];
+ main::log_data('dump','display manager: %$found',$found) if $b_log;
+ eval $end if $b_log;
+ return $found;
+}
+
+sub set_glob {
+ eval $start if $b_log;
+ my $pattern = '';
+ if (-d '/run'){
+ $pattern .= '/run';
+ }
# in most linux, /var/run is a sym link to /run, so no need to check it twice
- if ( -d "/var/run" ){
- my $rdlink = readlink('/var/run');
- $b_vrun = 1 if !$rdlink || ($rdlink && $rdlink ne '/run');
- $b_vrunrc = 1 if -d "/var/run/rc.d";
- }
- foreach my $id (@dms){
- # note: $working will create a dir name out of the dm $id, then
- # test if pid is in that note: sddm, in an effort to be unique and special,
- # do not use a pid/lock file, but rather a random string inside a directory
- # called /run/sddm/ so assuming the existence of the pid inside a directory named
- # from the dm. Hopefully this change will not have negative results.
- $working = $id;
- $working =~ s/\.\S+$//;
- # note: there were issues with duplicated dm's in inxi, checking @found corrects it
- if ( ( ( $b_run && ( -f "/run/$id" || -d "/run/$working" ) ) ||
- ( $b_vrun && ( -f "/var/run/$id" || -d "/var/run/$working" ) ) ||
- ( $b_vrunrc && ( -f "/var/run/rc.d/$working" || -d "/var/run/rc.d/$id" ) ) ) &&
- ! grep {/$working/} @found ){
- if ($extra > 2 && awk( \@dms_version, $working) && ($path = main::check_program($working)) ){}
- else {$path = $working;}
- # print "$path $extra\n";
- @data = main::program_data($working,$path,3);
- $working = $data[0];
- $working .= ' ' . $data[1] if $data[1];
- push @found, $working;
- }
- }
- if (!@found){
+ if (-d '/var/run' && ! -l '/var/run'){
+ $pattern .= ',' if $pattern;
+ $pattern .= '/var/run';
+ }
+ if (-d '/var/run/rc.d'){
+ $pattern .= ',' if $pattern;
+ $pattern .= '/var/run/rc.d';
+ }
+ if ($pattern){
+ $pattern = '{' . $pattern . '}/*';
+ # for dm.pid type file or dm directory names, like greetd-684.sock
+ @glob = main::globber($pattern);
+ main::uniq(\@glob) if @glob;
+ }
+ print '@glob: ', Data::Dumper::Dumper \@glob if $dbg[60];
+ main::log_data('dump','dm @glob:',\@glob) if $b_log;
+ eval $end if $b_log;
+}
+
+# args: 0: dm/lm, first test for dms, then if no dms, test for lms
+sub get_dm_lm {
+ eval $start if $b_log;
+ my $type = $_[0];
+ my (@dms,@glob_working,@temp);
+ # See: docs/inxi-desktops-wm.txt for Display/login manager info.
+ # Guessing on cdm, qingy. pcdm uses vt, PCDM-vt9.pid
+ # Add Ly in case they add run file/directory.
+ if ($type eq 'dm'){
+ @dms = qw(brzdm cdm emptty entranced gdm gdm3 kdm kdm3 kdmctl ldm lemurs
+ lightdm loginx lxdm ly mdm mlogind nodm pcdm qingy sddm slim slimski tdm
+ udm wdm x3dm xdm xdmctl xenodm);
+ }
+ # greetd frontends: agreety dlm gtkgreet qtgreet tuigreet wlgreet
+ else {
+ @dms = qw(elogind greetd seatd tbsm);
+ }
+ # print Data::Dumper::Dumper \@glob;
+ # used to test for .pid/lock type file or directory, now just see if the
+ # search name exists in run and call it good since test would always be true
+ # if directory existed previously anyway.
+ if (@glob){
+ my $search = join('|',@dms);
+ @glob_working = grep {/\/($search)\b/} @glob;
+ if (@glob_working){
+ foreach my $item (@glob_working){
+ my @id = grep {$item =~ /\/$_\b/} @dms;
+ push(@temp,@id) if @id;
+ }
+ # note: there were issues with duplicated dm's, using uniq will handle those
+ main::uniq(\@temp) if @temp;
+ }
+ }
+ @dms = @temp;
+ my @dm_info;
+ # print Data::Dumper::Dumper \@dms;
+ # we know the files or directories exist so no need for further checks here
+ foreach my $dm (@dms){
+ @dm_info = ();
+ ($dm_info[0],$dm_info[1]) = ProgramData::full($dm,'',3);
+ if (scalar @dms > 1 && (my $temp = ServiceData::get('status',$dm))){
+ $dm_info[2] = main::message('stopped') if $temp && $temp =~ /stopped|disabled/;
+ }
+ push(@{$found->{$type}},[@dm_info]);
+ }
+ eval $end if $b_log;
+}
+
+sub test_ps_dm {
+ eval $start if $b_log;
+ PsData::set_dm();
+ if (@{$ps_data{'dm-active'}}){
+ my @dm_info;
# ly does not have a run/pid file
- if (grep {$_ eq 'ly'} @ps_gui) {
- @data = main::program_data('ly','ly',3);
- $found[0] = $data[0];
- $found[0] .= ' ' . $data[1] if $data[1];
+ if (grep {$_ eq 'ly'} @{$ps_data{'dm-active'}}){
+ ($dm_info[0],$dm_info[1]) = ProgramData::full('ly','ly',3);
+ $found->{'dm'}[0] = [@dm_info];
}
- elsif (grep {/startx$/} @ps_gui) {
- $found[0] = 'startx';
+ elsif (grep {/startx$/} @{$ps_data{'dm-active'}}){
+ $found->{'dm'}[0] = ['startx'];
}
- elsif (grep {$_ eq 'xinit'} @ps_gui) {
- $found[0] = 'xinit';
+ elsif (grep {$_ eq 'xinit'} @{$ps_data{'dm-active'}}){
+ $found->{'dm'}[0] = ['xinit'];
}
}
- # might add this in, but the rate of new dm's makes it more likely it's an
- # unknown dm, so we'll keep output to N/A
- log_data('dump','display manager: @found',\@found) if $b_log;
eval $end if $b_log;
- return join ', ', @found if @found;
+}
}
-## Get DistroData
+## DistroData
{
package DistroData;
-my (@distro_data,@osr);
+my ($id_src,@osr,@working);
+my ($etc_issue,$lc_issue,$os_release) = ('','','/etc/os-release');
+my $distro = {
+'base' => '',
+'base-files' => [],
+'base-method' => [],
+'file' => '',
+'files' => [],
+'id' => '',
+'method' => [],
+'name' => '',
+};
+
sub get {
eval $start if $b_log;
+ if ($dbg[66] || $b_log){
+ $distro->{'dbg'} = 1;
+ }
if ($bsd_type){
- get_bsd_os();
+ get_distro_bsd();
}
else {
- get_linux_distro();
+ get_distro_linux();
}
eval $end if $b_log;
- return @distro_data;
+ return $distro;
}
-sub get_bsd_os {
+## BSD ##
+sub get_distro_bsd {
eval $start if $b_log;
- my ($distro) = ('');
- if ($bsd_type eq 'darwin'){
- my $file = '/System/Library/CoreServices/SystemVersion.plist';
- if (-f $file){
- my @data = main::reader($file);
- @data = grep {/(ProductName|ProductVersion)/} @data if @data;
- @data = grep {/<string>/} @data if @data;
- @data = map {s/<[\/]?string>//g; } @data if @data;
- $distro = join (' ', @data);
+ # used to parse /System/Library/CoreServices/SystemVersion.plist for Darwin
+ # but dumping that since it broke, just using standard BSD uname 0 2 name.
+ if (!$distro->{'name'}){
+ my $bsd_type_osr = 'dragonfly';
+ if (-r $os_release){
+ @osr = main::reader($os_release);
+ push(@{$distro->{'files'}},$os_release) if $distro->{'dbg'};
+ if (@osr && $bsd_type =~ /($bsd_type_osr)/ && (grep {/($bsd_type_osr)/i} @osr)){
+ $distro->{'name'} = get_osr();
+ $distro->{'id'} = lc($1);
+ push(@{$distro->{'method'}},$os_release);
+ }
+ }
+ }
+ if (!$distro->{'name'}){
+ my $bsd_type_version = 'truenas';
+ my ($version_file,$version_info) = ('/etc/version','');
+ if (-r $version_file){
+ $version_info = main::reader($version_file,'strip');
+ push(@{$distro->{'files'}},$version_file) if $distro->{'dbg'};
+ if ($version_info && $version_info =~ /($bsd_type_version)/i){
+ $distro->{'name'} = $version_info;
+ $distro->{'id'} = lc($1);
+ push(@{$distro->{'method'}},$version_file);
+ }
}
+ }
+ if (!$distro->{'name'}){
+ # seen a case without osx file, or was it permissions?
+ # this covers all the other bsds anyway, no problem.
+ $distro->{'name'} = "$uname[0] $uname[2]";
+ $distro->{'id'} = lc($uname[0]);
+ push(@{$distro->{'method'}},'uname 0, 2');
}
- # seen a case without osx file, or was it permissions?
- # this covers all the other bsds anyway, no problem.
- $distro = "$uname[0] $uname[2]" if !$distro;
- @distro_data = ($distro,'');
+ if ($distro->{'name'} &&
+ (-e '/etc/pkg/GhostBSD.conf' || -e '/usr/local/etc/pkg/repos/GhostBSD.conf') &&
+ $distro->{'name'} =~ /freebsd/i){
+ my $version = (main::grabber("pkg query '%v' os-generic-userland-base 2>/dev/null"))[0];
+ # only swap if we get result from the query
+ if ($version){
+ $distro->{'base'} = $distro->{'name'};
+ $distro->{'name'} = "GhostBSD $version";
+ push(@{$distro->{'method'}},'pkg query');
+ }
+ }
+ if ($distro->{'dbg'}){
+ dbg_distro_files('BSD',$distro->{'files'});
+ main::feature_debugger('name: $distro: pre-base [bsd]',$distro);
+ }
+ system_base_bsd() if $extra > 0;
eval $end if $b_log;
}
-sub get_linux_distro {
+sub system_base_bsd {
eval $start if $b_log;
- my ($distro,$distro_id,$distro_file,$system_base) = ('','','','');
- my ($b_issue,$b_osr,$b_use_issue,@working);
+ # ghostbsd is handled in main bsd section
+ if (lc($uname[1]) eq 'nomadbsd' && $distro->{'id'} eq 'freebsd'){
+ $distro->{'base'} = $distro->{'name'};
+ $distro->{'name'} = $uname[1];
+ push(@{$distro->{'method-base'}},'uname 1');
+ }
+ elsif (-f '/etc/pkg/HardenedBSD.conf' && $distro->{'id'} eq 'freebsd'){
+ $distro->{'base'} = $distro->{'name'};
+ $distro->{'name'} = 'HardenedBSD';
+ push(@{$distro->{'method-base'}},'/etc/pkg/HardenedBSD.conf');
+ }
+ elsif ($distro->{'id'} =~ /^(truenas)$/){
+ $distro->{'base'} = "$uname[0] $uname[2]";
+ push(@{$distro->{'method-base'}},'uname 0 + 2');
+ }
+ main::feature_debugger('system-base: $distro [bsd]',$distro) if $distro->{'dbg'};
+ eval $end if $b_log;
+}
+
+# GNU/LINUX ##
+sub get_distro_linux {
+ # NOTE: increasingly no distro release files are present, so this logic is
+ # deprecated, but still works often.
# order matters!
my @derived = qw(antix-version aptosid-version bodhibuilder.conf kanotix-version
knoppix-version pclinuxos-release mandrake-release manjaro-release mx-version
- pardus-release porteus-version q4os_version sabayon-release siduction-version sidux-version
- slitaz-release solusos-release turbolinux-release zenwalk-version);
- my $derived_s = join "|", @derived;
- my @primary = qw(altlinux-release arch-release gentoo-release redhat-release slackware-version
- SuSE-release);
- my $primary_s = join "|", @primary;
- my $exclude_s = 'debian_version|devuan_version|ubuntu_version';
+ pardus-release porteus-version q4os_version sabayon-release
+ siduction-version sidux-version slax-version slint-version slitaz-release
+ solusos-release turbolinux-release zenwalk-version);
+ my $derived_str = join('|', @derived);
+ my @primary = qw(altlinux-release arch-release gentoo-release redhat-release
+ slackware-version SuSE-release);
+ my $primary_str = join('|', @primary);
+ my $exclude_str = 'debian_version|devuan_version|ubuntu_version';
# note, pclinuxos has all these mandrake/mandriva files, careful!
- my $lsb_good_s = 'mandrake-release|mandriva-release|mandrakelinux-release|manjaro-release';
- my $os_release_good_s = 'altlinux-release|arch-release|pclinuxos-release|rpi-issue|SuSE-release';
- # note: always exceptions, so wild card after release/version:
- # /etc/lsb-release-crunchbang
- # wait to handle since crunchbang file is one of the few in the world that
- # uses this method
- my @distro_files = main::globber('/etc/*[-_]{[rR]elease,[vV]ersion,issue}*');
- push @distro_files, '/etc/bodhibuilder.conf' if -r '/etc/bodhibuilder.conf';
- my $lsb_release = '/etc/lsb-release';
- my $b_lsb = 1 if -f $lsb_release;
- my ($etc_issue,$issue,$lc_issue) = ('','/etc/issue','');
- $b_issue = 1 if -f $issue;
- # note: OpenSuse Tumbleweed 2018-05 has made /etc/issue created by sym link to /run/issue
+ my $lsb_good_str = 'mandrake-release|mandriva-release|mandrakelinux-release|';
+ $lsb_good_str .= 'manjaro-release';
+ my $osr_good_str = 'altlinux-release|arch-release|mageia-release|';
+ $osr_good_str .= 'pclinuxos-release|rpi-issue|SuSE-release';
+ # We need these empirically verified one by one as they appear, but always remember
+ # that stuff changes, legacy, deprecated, but these ideally are going to be right
+ my $osr_good = 'antergos|chakra|fedora|guix|mageia|manjaro|oracle|pclinuxos|';
+ $osr_good .= 'porteux|raspberry pi os|slint|zorin';
+ # Force use of pretty name because that's only location of derived distro name
+ # devuan should catch many devuans spins, which often put their names in pretty
+ my $osr_pretty = 'devuan|slackel|zinc';
+ my $dist_file_no_name = 'slitaz'; # these may not have the distro name in the file
+ my ($issue,$lsb_release) = ('/etc/issue','/etc/lsb-release');
+ # Note: OpenSuse Tumbleweed 2018-05 has made /etc/issue created by sym link to /run/issue
# and then made that resulting file 700 permissions, which is obviously a mistake
- $etc_issue = (main::reader($issue))[0] if -r $issue;
- $etc_issue = main::clean_characters($etc_issue);
- my $os_release = '/etc/os-release';
- @osr = main::reader($os_release) if -r $os_release;
+ $etc_issue = main::reader($issue,'strip',0) if -r $issue;
# debian issue can end with weird escapes like \n \l
# antergos: Antergos Linux \r (\l)
- if ($etc_issue){
- $lc_issue = lc($etc_issue) if $etc_issue;
- if ($lc_issue =~ /(antergos|grml|linux lite)/){
- $distro_id = $1;
- $b_use_issue = 1;
- }
+ $etc_issue = main::clean_characters($etc_issue) if $etc_issue;
+ # Note: always exceptions, so wild card after release/version:
+ # /etc/lsb-release-crunchbang
+ # Wait to handle since crunchbang file is one of the few in the world that
+ # uses this method
+ @{$distro->{'files'}} = main::globber('/etc/{*[-_]{[rR]elease,[vV]ersion}*,issue}');
+ push(@{$distro->{'files'}}, '/etc/bodhibuilder.conf') if -r '/etc/bodhibuilder.conf'; # legacy
+ @osr = main::reader($os_release) if -r $os_release;
+ if (-f '/etc/bodhi/info'){
+ $lsb_release = '/etc/bodhi/info';
+ $distro->{'file'} = $lsb_release;
+ $distro->{'issue-skip'} = 1;
+ push(@{$distro->{'files'}}, $lsb_release);
+ }
+ $distro->{'issue'} = $issue if -f $issue;
+ $distro->{'lsb'} = $lsb_release if -f $lsb_release;
+ if (!$distro->{'issue-skip'} && $etc_issue){
+ $lc_issue = lc($etc_issue);
+ if ($lc_issue =~ /(antergos|grml|linux lite|openmediavault)/){
+ $distro->{'id'} = $1;
+ $distro->{'issue-skip'} = 1;
+ }
+ # This raspbian detection fails for raspberry pi os
elsif ($lc_issue =~ /(raspbian|peppermint)/){
- $distro_id = $1;
- $distro_file = $os_release if @osr;
+ $distro->{'id'} = $1;
+ $distro->{'file'} = $os_release if @osr;
+ }
+ # Note: wrong fix, applies to both raspbian and raspberry pi os
+ # assumption here is that r pi os fixes this before stable release
+ elsif ($lc_issue =~ /^debian/ && -e '/etc/apt/sources.list.d/raspi.list' &&
+ (grep {/[^#]+raspberrypi\.org/} main::reader('/etc/apt/sources.list.d/raspi.list'))){
+ $distro->{'id'} = 'raspios' ;
}
}
# Note that antergos changed this around # 2018-05, and now lists
# antergos in os-release, sigh... We want these distros to use os-release
# if it contains their names. Last check below
- if ( @osr && ( grep {/(manjaro|antergos|chakra|pclinuxos|zorin)/i} @osr ) ){
- $distro_file = $os_release;
- }
- $distro_id = 'armbian' if grep {/armbian/} @distro_files;
- main::log_data('dump','@distro_files',\@distro_files) if $b_log;
- main::log_data('data',"distro_file-1: $distro_file") if $b_log;
- if (!$distro_file){
- if (scalar @distro_files == 1){
- $distro_file = $distro_files[0];
- }
- elsif (scalar @distro_files > 1) {
- # special case, to force manjaro/antergos which also have arch-release
+ if (@osr){
+ if (grep {/($osr_good)/i} @osr){
+ $distro->{'file'} = $os_release;
+ }
+ elsif (grep {/($osr_pretty)/i} @osr){
+ $distro->{'osr-pretty'} = 1;
+ $distro->{'file'} = $os_release;
+ }
+ }
+ if (grep {/armbian/} @{$distro->{'files'}}){
+ $distro->{'id'} = 'armbian' ;
+ }
+ $distro->{'file-for-0'} = $distro->{'file'};
+ dbg_distro_files('Linux',$distro->{'files'}) if $distro->{'dbg'};
+ if (!$distro->{'file'}){
+ if (scalar @{$distro->{'files'}} == 1){
+ $distro->{'file'} = $distro->{'files'}[0];
+ }
+ elsif (scalar @{$distro->{'files'}} > 1){
+ # Special case, to force manjaro/antergos which also have arch-release
# manjaro should use lsb, which has the full info, arch uses os release
# antergos should use /etc/issue. We've already checked os-release above
- if ($distro_id eq 'antergos' || (grep {/antergos|chakra|manjaro/} @distro_files )){
- @distro_files = grep {!/arch-release/} @distro_files;
- #$system_base = 'Arch Linux';
- }
- my $distro_files_s = join "|", @distro_files;
- @working = (@derived,@primary);
- foreach my $file (@working){
- if ( "/etc/$file" =~ /($distro_files_s)$/){
- # Now lets see if the distro file is in the known-good working-lsb-list
- # if so, use lsb-release, if not, then just use the found file
- # this is for only those distro's with self named release/version files
+ if ($distro->{'id'} eq 'antergos' || (grep {/antergos|chakra|manjaro/} @{$distro->{'files'}})){
+ @{$distro->{'files'}} = grep {!/arch-release/} @{$distro->{'files'}};
+ }
+ my $dist_files_str = join('|', @{$distro->{'files'}});
+ foreach my $file ((@derived,@primary)){
+ if ("/etc/$file" =~ /($dist_files_str)$/){
+ # These is for only those distro's with self named release/version files
# because Mint does not use such, it must be done as below
- if (@osr && $file =~ /($os_release_good_s)$/){
- $distro_file = $os_release;
+ # Force use of os-release file in cases where there might be conflict
+ # between lsb-release rules and os-release priorities.
+ if (@osr && $file =~ /($osr_good_str)$/){
+ $distro->{'file'} = $os_release;
}
- elsif ($b_lsb && $file =~ /$lsb_good_s/){
- $distro_file = $lsb_release;
+ # Now lets see if the distro file is in the known-good working-lsb-list
+ # if so, use lsb-release, if not, then just use the found file
+ elsif ($distro->{'lsb'} && $file =~ /$lsb_good_str/){
+ $distro->{'file'} = $lsb_release;
}
else {
- $distro_file = "/etc/$file";
+ $distro->{'file'} = "/etc/$file";
}
last;
}
}
}
}
- main::log_data('data',"distro_file-2: $distro_file") if $b_log;
+ $distro->{'file-for-1'} = $distro->{'file'};
# first test for the legacy antiX distro id file
- if ( -f '/etc/antiX'){
+ if (-r '/etc/antiX'){
@working = main::reader('/etc/antiX');
- $distro = main::awk(\@working,'antix.*\.iso') if @working;
- $distro = main::clean_characters($distro) if $distro;
+ $distro->{'name'} = main::awk(\@working,'antix.*\.iso') if @working;
+ $distro->{'name'} = main::clean_characters($distro->{'name'}) if $distro->{'name'};
+ push(@{$distro->{'method'}},'file: /etc/antiX');
}
- # this handles case where only one release/version file was found, and it's lsb-release.
+ # This handles case where only one release/version file was found, and it's lsb-release.
# This would never apply for ubuntu or debian, which will filter down to the following
# conditions. In general if there's a specific distro release file available, that's to
# be preferred, but this is a good backup.
- elsif ($distro_file && $b_lsb && ($distro_file =~ /\/etc\/($lsb_good_s)$/ || $distro_file eq $lsb_release) ){
- $distro = get_lsb_release();
- }
- elsif ($distro_file && $distro_file eq $os_release){
- $distro = get_os_release();
- $b_osr = 1;
- }
- # if distro id file was found and it's not in the exluded primary distro file list, read it
- elsif ( $distro_file && -s $distro_file && $distro_file !~ /\/etc\/($exclude_s)$/){
- # new opensuse uses os-release, but older ones may have a similar syntax, so just use
+ elsif ($distro->{'file'} && $distro->{'lsb'} &&
+ ($distro->{'file'} =~ /\/etc\/($lsb_good_str)$/ || $distro->{'file'} eq $lsb_release)){
+ # print "df: $distro->{'file'} lf: $lsb_release\n";
+ $distro->{'name'} = get_lsb($lsb_release);
+ push(@{$distro->{'method'}},'get_lsb(): primary');
+ }
+ elsif ($distro->{'file'} && $distro->{'file'} eq $os_release){
+ $distro->{'name'} = get_osr();
+ $distro->{'osr-skip'} = 1;
+ push(@{$distro->{'method'}},'get_osr(): primary');
+ }
+ # If distro id file was found and it's not in the exluded primary distro file list, read it
+ elsif ($distro->{'file'} && -s $distro->{'file'} && $distro->{'file'} !~ /\/etc\/($exclude_str)$/){
+ # New opensuse uses os-release, but older ones may have a similar syntax, so just use
# the first line
- if ($distro_file eq '/etc/SuSE-release'){
- # leaving off extra data since all new suse have it, in os-release, this file has
+ if ($distro->{'file'} eq '/etc/SuSE-release'){
+ # Leaving off extra data since all new suse have it, in os-release, this file has
# line breaks, like os-release but in case we want it, it's:
# CODENAME = Mantis | VERSION = 12.2
- # for now, just take first occurrence, which should be the first line, which does
+ # For now, just take first occurrence, which should be the first line, which does
# not use a variable type format
- @working = main::reader($distro_file);
- $distro = main::awk(\@working,'suse');
+ @working = main::reader($distro->{'file'});
+ $distro->{'name'} = main::awk(\@working,'suse');
+ push(@{$distro->{'method'}}, 'custom: suse-release');
}
- elsif ($distro_file eq '/etc/bodhibuilder.conf'){
- @working = main::reader($distro_file);
- $distro = main::awk(\@working,'^LIVECDLABEL',2,'\s*=\s*');
- $distro =~ s/"//g if $distro;
+ elsif ($distro->{'file'} eq '/etc/bodhibuilder.conf'){
+ @working = main::reader($distro->{'file'});
+ $distro->{'name'} = main::awk(\@working,'^LIVECDLABEL',2,'\s*=\s*');
+ $distro->{'name'} =~ s/"//g if $distro->{'name'};
+ push(@{$distro->{'method'}},'custom: /etc/bodhibuilder');
}
else {
- $distro = (main::reader($distro_file))[0];
+ $distro->{'name'} = main::reader($distro->{'file'},'',0);
# only contains version number. Why? who knows.
- if ($distro_file eq '/etc/q4os_version' && $distro !~ /q4os/i){
- $distro = "Q4OS $distro" ;
+ if ($distro->{'file'} eq '/etc/q4os_version' && $distro->{'name'} !~ /q4os/i){
+ $distro->{'name'} = "Q4OS $distro->{'name'}" ;
}
+ push(@{$distro->{'method'}},'default: distro file');
+ }
+ if ($distro->{'name'}){
+ $distro->{'name'} = main::clean_characters($distro->{'name'});
}
- $distro = main::clean_characters($distro) if $distro;
}
- # otherwise try the default debian/ubuntu /etc/issue file
- elsif ($b_issue){
- if ( !$distro_id && $etc_issue && $lc_issue =~ /(mint|lmde)/ ){
- $distro_id = $1;
- $b_use_issue = 1;
+ # Otherwise try the default debian/ubuntu/distro /etc/issue file
+ elsif ($distro->{'issue'}){
+ if (!$distro->{'id'} && $lc_issue && $lc_issue =~ /(mint|lmde)/){
+ $distro->{'id'} = $1;
+ $distro->{'issue-skip'} = 1;
}
# os-release/lsb gives more manageable and accurate output than issue,
# but mint should use issue for now. Antergos uses arch os-release, but issue shows them
- if (!$b_use_issue && @osr){
- $distro = get_os_release();
- $b_osr = 1;
- }
- elsif (!$b_use_issue && $b_lsb){
- $distro = get_lsb_release();
- }
- elsif ($etc_issue) {
- $distro = $etc_issue;
- # this handles an arch bug where /etc/arch-release is empty and /etc/issue
- # is corrupted only older arch installs that have not been updated should
- # have this fallback required, new ones use os-release
- if ( $distro =~ /arch linux/i){
- $distro = 'Arch Linux';
+ if (!$distro->{'issue-skip'} && @osr){
+ $distro->{'name'} = get_osr();
+ $distro->{'osr-skip'} = 1;
+ push(@{$distro->{'method'}},'get_osr(): w/issue');
+ }
+ elsif (!$distro->{'issue-skip'} && $distro->{'lsb'}){
+ $distro->{'name'} = get_lsb();
+ push(@{$distro->{'method'}},'get_lsb(): w/issue');
+ }
+ elsif ($etc_issue){
+ if (-d '/etc/guix' && $lc_issue =~ /^this is the gnu system\./){
+ # No standard paths or files for os data, use pm version
+ ($distro->{'name'},my $version) = ProgramData::full('guix');
+ $distro->{'name'} .= " $version" if $version;
+ $distro->{'issue-skip'} = 1;
+ push(@{$distro->{'method'}},'issue-id; from program version');
+ }
+ else {
+ $distro->{'name'} = $etc_issue;
+ push(@{$distro->{'method'}},'issue: source');
+ # This handles an arch bug where /etc/arch-release is empty and /etc/issue
+ # is corrupted only older arch installs that have not been updated should
+ # have this fallback required, new ones use os-release
+ if ($distro->{'name'} =~ /arch linux/i){
+ $distro->{'name'} = 'Arch Linux';
+ }
}
}
}
- # a final check. If a long value, before assigning the debugger output, if os-release
+ # A final check. If a long value, before assigning the debugger output, if os-release
# exists then let's use that if it wasn't tried already. Maybe that will be better.
# not handling the corrupt data, maybe later if needed. 10 + distro: (8) + string
- if ($distro && length($distro) > 60 ){
- if (!$b_osr && @osr){
- $distro = get_os_release();
- $b_osr = 1;
+ if ($distro->{'name'} && length($distro->{'name'}) > 60){
+ if (!$distro->{'osr-skip'} && @osr){
+ $distro->{'name'} = get_osr();
+ $distro->{'osr-skip'} = 1;
+ push(@{$distro->{'method'}},'get_osr(): bad name');
}
}
- # test for /etc/lsb-release as a backup in case of failure, in cases
+ # Test for /etc/lsb-release as a backup in case of failure, in cases
# where > one version/release file were found but the above resulted
# in null distro value.
- if (!$distro){
- if (!$b_osr && @osr){
- $distro = get_os_release();
- $b_osr = 1;
+ if (!$distro->{'name'} && $windows{'cygwin'}){
+ $distro->{'name'} = $uname[0]; # like so: CYGWIN_NT-10.0-19043
+ $distro->{'osr-skip'} = 1;
+ push(@{$distro->{'method'}},'uname 0: cygwin');
+ }
+ if (!$distro->{'name'}){
+ if (!$distro->{'osr-skip'} && @osr){
+ $distro->{'name'} = get_osr();
+ $distro->{'osr-skip'} = 1;
+ push(@{$distro->{'method'}},'get_osr(): final');
}
- elsif ($b_lsb){
- $distro = get_lsb_release();
+ elsif ($distro->{'lsb'}){
+ $distro->{'name'} = get_lsb();
+ push(@{$distro->{'method'}},'get_lsb(): final');
}
}
- # now some final null tries
- if (!$distro ){
- # if the file was null but present, which can happen in some cases, then use
+ # Now some final null tries
+ if (!$distro->{'name'}){
+ # If the file was null but present, which can happen in some cases, then use
# the file name itself to set the distro value. Why say unknown if we have
# a pretty good idea, after all?
- if ($distro_file){
- $distro_file =~ s/\/etc\/|[-_]|release|version//g;
- $distro = $distro_file;
+ if ($distro->{'file'}){
+ $distro->{'file'} =~ s/\/etc\/|[-_]|release|version//g;
+ $distro->{'name'} = $distro->{'file'};
+ push(@{$distro->{'method'}},'use: distro file name');
+ }
+ }
+ main::feature_debugger('name: $distro: pre-base [linux]',$distro) if $distro->{'dbg'};
+ system_base_linux() if $extra > 0;
+ # Some last customized changes, double check if possible to verify still valid
+ if ($distro->{'name'}){
+ if ($distro->{'id'} eq 'armbian'){
+ $distro->{'name'} =~ s/Debian/Armbian/;
+ push(@{$distro->{'method'}},'custom: armbian name adjust');
+ }
+ elsif ($distro->{'id'} eq 'raspios'){
+ $distro->{'base'} = $distro->{'name'};
+ push(@{$distro->{'base-method'}},'custom: pi base from name');
+ # No need to repeat the debian version info if base:
+ if ($extra == 0){
+ $distro->{'name'} =~ s/Debian\s*GNU\/Linux/Raspberry Pi OS/;
+ }
+ else {
+ $distro->{'name'} = 'Raspberry Pi OS';
+ }
+ push(@{$distro->{'method'}},'custom: pi name adjust');
}
- }
- if ($extra > 0){
- my $base_debian_version_distro = 'sidux';
- my $base_debian_version_osr = '\belive|lmde|neptune|parrot|pureos|rescatux|septor|sparky|tails';
- my $base_default = 'antix-version|mx-version'; # osr has base ids
- my $base_issue = 'bunsen'; # base only found in issue
- my $base_manual = 'blankon|deepin|kali'; # synthesize, no direct data available
- my $base_osr = 'aptosid|grml|q4os|siduction|bodhi'; # osr base, distro id in list of distro files
- my $base_osr_issue = 'grml|linux lite'; # osr base, distro id in issue
- # osr has distro name but has ubuntu ID_LIKE/UBUNTU_CODENAME
- my $base_osr_ubuntu = 'mint|neon|nitrux|pop!_os|zorin';
- my $base_upstream_lsb = '/etc/upstream-release/lsb-release';
- my $base_upstream_osr = '/etc/upstream-release/os-release';
- # first: try, some distros have upstream-release, elementary, new mint
- # and anyone else who uses this method for fallback ID
- if ( -r $base_upstream_osr){
- my @osr_working = main::reader($base_upstream_osr);
- if ( @osr_working){
- my (@osr_temp);
- @osr_temp = @osr;
- @osr = @osr_working;
- $system_base = get_os_release();
- @osr = @osr_temp if !$system_base;
- (@osr_temp,@osr_working) = (undef,undef);
- }
- }
- elsif ( -r $base_upstream_lsb){
- $system_base = get_lsb_release($base_upstream_lsb);
- }
- if (!$system_base && @osr){
- my ($base_type) = ('');
- if ($etc_issue && (grep {/($base_issue)/i} @osr)){
- $system_base = $etc_issue;
- }
- # more tests added here for other ubuntu derived distros
- elsif ( @distro_files && (grep {/($base_default)/} @distro_files) ){
- $base_type = 'default';
- }
- # must go before base_osr_ubuntu test
- elsif ( grep {/($base_debian_version_osr)/i} @osr ){
- $system_base = debian_id();
- }
- elsif ( grep {/($base_osr_ubuntu)/i} @osr ){
- $base_type = 'ubuntu';
- }
- elsif ( ( ($distro_id && $distro_id =~ /($base_osr_issue)/ ) ||
- (@distro_files && (grep {/($base_osr)/} @distro_files) ) ) &&
- !(grep {/($base_osr)/i} @osr)){
- $system_base = get_os_release();
- }
- if (!$system_base && $base_type){
- $system_base = get_os_release($base_type);
- }
- }
- if (!$system_base && @distro_files && ( grep {/($base_debian_version_distro)/i} @distro_files ) ){
- $system_base = debian_id();
- }
- if (!$system_base && $lc_issue && $lc_issue =~ /($base_manual)/){
- my $id = $1;
- my %manual = (
- 'blankon' => 'Debian unstable',
- 'deepin' => 'Debian unstable',
- 'kali' => 'Debian testing',
- );
- $system_base = $manual{$id};
+ # check for spins, relies on xdg directory name
+ elsif ($distro->{'name'} =~ /^(Ubuntu)/i){
+ my $base = $1;
+ my $temp = distro_spin($distro->{'name'});
+ if ($temp ne $distro->{'name'}){
+ if (!$distro->{'base'} && $extra > 0){
+ $distro->{'base'} = $base;
+ push(@{$distro->{'base-method'}},'use: name');
+ }
+ $distro->{'name'} = $temp;
+ push(@{$distro->{'method'}},'use: distro_spin()');
+ }
}
- if ($distro && -d '/etc/salixtools/' && $distro =~ /Slackware/i){
- $system_base = $distro;
+ elsif (-d '/etc/salixtools/' && $distro->{'name'} =~ /Slackware/i){
+ $distro->{'name'} =~ s/Slackware/Salix/;
+ push(@{$distro->{'method'}},'manual: name swap');
}
- }
- if ($distro){
- if ($distro_id eq 'armbian'){
- $distro =~ s/Debian/Armbian/;
+ elsif ($distro->{'file'} =~ /($dist_file_no_name)/ && $distro->{'name'} =~ /^[\d\.]+$/){
+ $distro->{'file'} =~ s/\/etc\/|[-_]|release|version//g;
+ $distro->{'name'} = ucfirst($distro->{'file'}) . ' ' . $distro->{'name'};
+ push(@{$distro->{'method'}},'use: file name');
}
- elsif (-d '/etc/salixtools/' && $distro =~ /Slackware/i){
- $distro =~ s/Slackware/Salix/;
+ }
+ else {
+ # android fallback, sometimes requires root, sometimes doesn't
+ android_info() if $b_android;
+ }
+ ## Finally, if all else has failed, give up
+ $distro->{'name'} ||= 'unknown';
+ if ($extra > 0 && $distro->{'name'} && $distro->{'base'}){
+ check_base();
+ }
+ main::feature_debugger('name: $distro: final [linux]',$distro) if $distro->{'dbg'};
+ eval $end if $b_log;
+}
+
+sub android_info {
+ eval $start if $b_log;
+ main::set_build_prop() if !$loaded{'build-prop'};;
+ $distro->{'name'} = 'Android';
+ $distro->{'name'} .= ' ' . $build_prop{'build-version'} if $build_prop{'build-version'};
+ $distro->{'name'} .= ' ' . $build_prop{'build-date'} if $build_prop{'build-date'};
+ if (!$show{'machine'}){
+ if ($build_prop{'product-manufacturer'} && $build_prop{'product-model'}){
+ $distro->{'name'} .= ' (' . $build_prop{'product-manufacturer'} . ' ' . $build_prop{'product-model'} . ')';
+ }
+ elsif ($build_prop{'product-device'}){
+ $distro->{'name'} .= ' (' . $build_prop{'product-device'} . ')';
+ }
+ elsif ($build_prop{'product-name'}){
+ $distro->{'name'} .= ' (' . $build_prop{'product-name'} . ')';
+ }
+ }
+ eval $end if $b_log;
+}
+
+sub system_base_linux {
+ eval $start if $b_log;
+ $distro->{'osr-pretty'} = 0; # reset: if we want to use osr pretty, detect here.
+ # Need data on these Arch derived: CachyOS; can be ArchLab/Labs
+ my $base_distro_arch = 'anarchy|antergos|apricity';
+ $base_distro_arch .= '|arch(bang|craft|ex|lab|man|strike)|arco|artix';
+ $base_distro_arch .= '|blackarch|bluestar|bridge|cachyos|chakra|condres|ctlos';
+ # note: arch linux derived distro page claims kaos as arch derived but it is NOT
+ $base_distro_arch .= '|endeavour|feliz|garuda|hyperbola|linhes|liri';
+ $base_distro_arch .= '|mabox|magpie|manjaro|mysys2|namib|netrunner\s?rolling|ninja';
+ $base_distro_arch .= '|obarun|parabola|porteus|puppyrus-?a';
+ $base_distro_arch .= '|reborn|revenge|salient|snal|steamos';
+ $base_distro_arch .= '|talkingarch|theshell|ubos|velt|xero';
+ my $base_file_debian_version = 'sidux';
+ # detect debian steamos before arch steamos
+ my $base_osr_debian_version = '\belive|lmde|neptune|nitrux|parrot|pureos|';
+ $base_osr_debian_version .= 'rescatux|septor|sparky|steamos|tails';
+ my $base_osr_devuan_version = 'crowz|dowse|etertics|\bexe\b|fluxuan|gnuinos|';
+ $base_osr_devuan_version .= 'gobmis|heads|miyo|refracta|\bstar\b|virage';
+ # osr has base ids
+ my $base_default = 'antix-version|bodhi|mx-version';
+ # base only found in issue
+ my $base_issue = 'bunsen';
+ # synthesize, no direct data available
+ my $base_manual = 'blankon|deepin|kali';
+ # osr base, distro id in list of distro files
+ my $base_osr = 'aptosid|bodhi|grml|q4os|siduction|slax|zenwalk';
+ # osr base, distro id in issue
+ my $base_osr_issue = 'grml|linux lite|openmediavault';
+ # same as rhel re VERSION_ID but likely only ID_LIKE=fedora
+ my $base_osr_fedora = 'amahi|asahi|audinux|clearos|fx64|montana|nobara|qubes|';
+ $base_osr_fedora .= 'risios|ultramarine|vortexbox';
+ # osr has distro name but has fedora centos redhat ID_LIKE and VERSION_ID same
+ # fedora not handled will fall to RHEL if contains centos string
+ my $base_osr_redhat = 'almalinux|centos|eurolinux|oracle|puias|rocky|';
+ $base_osr_redhat .= 'scientific|springdale';
+ # osr has distro name but has ubuntu (or debian) ID_LIKE/UBUNTU_CODENAME
+ my $base_osr_ubuntu = 'feren|mint|neon|nitrux|pop!?_os|tuxedo|zinc|zorin';
+ my $base_upstream_lsb = '/etc/upstream-release/lsb-release';
+ my $base_upstream_osr = '/etc/upstream-release/os-release';
+ # These id as themselves, but system base is version file. Slackware mostly.
+ my %base_version = (
+ 'porteux|salix|slackel|slint' => '/etc/slackware-version',
+ );
+ # First: try, some distros have upstream-release, elementary, new mint
+ # and anyone else who uses this method for fallback ID
+ if (-r $base_upstream_osr){
+ my @osr_working = main::reader($base_upstream_osr);
+ push(@{$distro->{'base-files'}},$base_upstream_osr) if $distro->{'dbg'};
+ if (@osr_working){
+ my @osr_temp = @osr;
+ @osr = @osr_working;
+ $distro->{'base'} = get_osr();
+ @osr = @osr_temp if !$distro->{'base'};
+ push(@{$distro->{'base-method'}},'get_osr(): upstream osr');
+ }
+ }
+ # note: ultramarine trips this one but uses os-release field names, sigh, ignore
+ elsif (-r $base_upstream_lsb){
+ $distro->{'base'} = get_lsb($base_upstream_lsb);
+ push(@{$distro->{'base-files'}},$base_upstream_lsb) if $distro->{'dbg'};
+ push(@{$distro->{'base-method'}},'get_lsb(): upstream lsb');
+ }
+ dbg_distro_files('Linux base',$distro->{'base-files'}) if $distro->{'dbg'};
+ # probably no need for these @osr greps, just grep $distro->{'name'} instead?
+ if (!$distro->{'base'} && @osr){
+ if ($etc_issue && (grep {/($base_issue)/i} @osr)){
+ $distro->{'base'} = $etc_issue;
+ push(@{$distro->{'base-method'}},'file: /etc/issue');
+ }
+ # more tests added here for other ubuntu derived distros
+ elsif (@{$distro->{'files'}} && (grep {/($base_default)/} @{$distro->{'files'}})){
+ $distro->{'base-type'} = 'default';
+ }
+ # must go before base_osr_arch,ubuntu tests. For steamos, use fallback arch
+ elsif (grep {/($base_osr_debian_version)/i} @osr){
+ $distro->{'base'} = debian_id('debian');
+ push(@{$distro->{'base-method'}},'use: debian_id(debian)');
+ }
+ elsif (grep {/($base_osr_devuan_version)/i} @osr){
+ $distro->{'base'} = debian_id('devuan');
+ push(@{$distro->{'base-method'}},'use: debian_id(devuan)');
+ }
+ elsif (grep {/($base_osr_fedora)/i} @osr){
+ $distro->{'base-type'} = 'fedora';
+ }
+ elsif (grep {/($base_osr_redhat)/i} @osr){
+ $distro->{'base-type'} = 'rhel';
+ }
+ elsif (grep {/($base_osr_ubuntu)/i} @osr){
+ $distro->{'base-type'} = 'ubuntu';
+ }
+ elsif ((($distro->{'id'} && $distro->{'id'} =~ /($base_osr_issue)/) ||
+ (@{$distro->{'files'}} && (grep {/($base_osr)/} @{$distro->{'files'}}))) &&
+ !(grep {/($base_osr)/i} @osr)){
+ $distro->{'base'} = get_osr();
+ push(@{$distro->{'base-method'}},'get_osr(): issue match');
+ }
+ if (!$distro->{'base'} && $distro->{'base-type'}){
+ $distro->{'base'} = get_osr($distro->{'base-type'});
+ push(@{$distro->{'base-method'}},'get_osr(): base-type');
+ }
+ }
+ if (!$distro->{'base'} && @{$distro->{'files'}} &&
+ (grep {/($base_file_debian_version)/i} @{$distro->{'files'}})){
+ $distro->{'base'} = debian_id('debian');
+ push(@{$distro->{'base-method'}},'debian_id(debian): base_file_debian_version');
+ }
+ if (!$distro->{'base'} && $lc_issue && $lc_issue =~ /($base_manual)/){
+ my $id = $1;
+ my %manual = (
+ 'blankon' => 'Debian unstable',
+ 'deepin' => 'Debian unstable',
+ 'kali' => 'Debian testing',
+ );
+ $distro->{'base'} = $manual{$id};
+ push(@{$distro->{'base-method'}},'manual: /etc/issue match');
+ }
+ if (!$distro->{'base'} && $distro->{'name'}){
+ if ($distro->{'name'} =~ /^($base_distro_arch)/i){
+ $distro->{'base'} = 'Arch Linux';
+ push(@{$distro->{'base-method'}},'name-match: assign arch');
+ }
+ elsif ($distro->{'name'} =~ /^peppermint/i){
+ my $type = (-f '/etc/devuan_version') ? 'devuan': 'debian';
+ $distro->{'base'} = debian_id($type);
+ push(@{$distro->{'base-method'}},'debian_id(): type');
+ }
+ }
+ if (!$distro->{'base'} && $distro->{'name'}){
+ foreach my $key (keys %base_version){
+ if (-r $base_version{$key} && $distro->{'name'} =~ /($key)/i){
+ $distro->{'base'} = main::reader($base_version{$key},'strip',0);
+ $distro->{'base'} = main::clean_characters($distro->{'base'}) if $distro->{'base'};
+ push(@{$distro->{'base-method'}},"base_version: file: $key");
+ last;
+ }
}
}
- ## finally, if all else has failed, give up
- $distro ||= 'unknown';
- @distro_data = ($distro,$system_base);
+ if (!$distro->{'base'} && $distro->{'name'} && -d '/etc/salixtools/' &&
+ $distro->{'name'} =~ /Slackware/i){
+ $distro->{'base'} = $distro->{'name'};
+ push(@{$distro->{'base-method'}},'custom: salix');
+ }
+ main::feature_debugger('$distro: base [linux]',$distro) if $distro->{'dbg'};
eval $end if $b_log;
}
-sub get_lsb_release {
+## PROCESS OS/LSB RELEASE ##
+# Note: corner case when parsing the bodhi distro file
+# args: 0: file name
+sub get_lsb {
eval $start if $b_log;
my ($lsb_file) = @_;
$lsb_file ||= '/etc/lsb-release';
- my ($distro,$id,$release,$codename,$description) = ('','','','','');
+ my ($dist_lsb,$id,$release,$codename,$description) = ('','','','','');
+ my ($dist_id,$dist_release,$dist_code,$dist_desc) = ('DISTRIB_ID',
+ 'DISTRIB_RELEASE','DISTRIB_CODENAME','DISTRIB_DESCRIPTION');
+ if ($lsb_file eq '/etc/bodhi/info'){
+ $id = 'Bodhi Linux';
+ # note: No ID field, hard code
+ ($dist_id,$dist_release,$dist_code,$dist_desc) = ('ID','RELEASE',
+ 'CODENAME','DESCRIPTION');
+ }
my @content = main::reader($lsb_file);
main::log_data('dump','@content',\@content) if $b_log;
@content = map {s/,|\*|\\||\"|[:\47]|^\s+|\s+$|n\/a//ig; $_} @content if @content;
foreach (@content){
next if /^\s*$/;
- my @working = split /\s*=\s*/, $_;
+ my @working = split(/\s*=\s*/, $_);
next if !$working[0];
- if ($working[0] eq 'DISTRIB_ID' && $working[1]){
+ if ($working[0] eq $dist_id && $working[1]){
if ($working[1] =~ /^Manjaro/i){
$id = 'Manjaro Linux';
}
# in the old days, arch used lsb_release
-# elsif ($working[1] =~ /^Arch$/i){
-# $id = 'Arch Linux';
-# }
+ # elsif ($working[1] =~ /^Arch$/i){
+ # $id = 'Arch Linux';
+ # }
else {
$id = $working[1];
}
}
- elsif ($working[0] eq 'DISTRIB_RELEASE' && $working[1]){
+ elsif ($working[0] eq $dist_release && $working[1]){
$release = $working[1];
}
- elsif ($working[0] eq 'DISTRIB_CODENAME' && $working[1]){
+ elsif ($working[0] eq $dist_code && $working[1]){
$codename = $working[1];
}
# sometimes some distros cannot do their lsb-release files correctly,
# so here is one last chance to get it right.
- elsif ($working[0] eq 'DISTRIB_DESCRIPTION' && $working[1]){
+ elsif ($working[0] eq $dist_desc && $working[1]){
$description = $working[1];
}
}
if (!$id && !$release && !$codename && $description){
- $distro = $description;
+ $dist_lsb = $description;
}
else {
- $distro = "$id $release $codename";
- $distro =~ s/^\s+|\s\s+|\s+$//g; # get rid of double and trailing spaces
+ # avoid duplicates
+ $dist_lsb = $id;
+ $dist_lsb .= " $release" if $release && $dist_lsb !~ /$release/;
+ # eg: release: 9 codename: mga9
+ if ($codename && $dist_lsb !~ /$codename/i &&
+ (!$release || $codename !~ /$release/)){
+ $dist_lsb .= " $codename";
+ }
+ $dist_lsb =~ s/^\s+|\s\s+|\s+$//g; # get rid of double and trailing spaces
}
eval $end if $b_log;
- return $distro;
+ return $dist_lsb;
}
-sub get_os_release {
+
+sub get_osr {
eval $start if $b_log;
my ($base_type) = @_;
- my ($base_id,$base_name,$base_version,$distro,$distro_name,$pretty_name,
- $lc_name,$name,$version_name,$version_id) = ('','','','','','','','','','');
+ my ($base_id,$base_name,$base_version,$dist_osr,$name,$name_lc,$name_pretty,
+ $version_codename,$version_name,$version_id) = ('','','','','','','','','','');
my @content = @osr;
main::log_data('dump','@content',\@content) if $b_log;
@content = map {s/\\||\"|[:\47]|^\s+|\s+$|n\/a//ig; $_} @content if @content;
foreach (@content){
next if /^\s*$/;
- my @working = split /\s*=\s*/, $_;
+ my @working = split(/\s*=\s*/, $_);
next if !$working[0];
if ($working[0] eq 'PRETTY_NAME' && $working[1]){
- $pretty_name = $working[1];
+ $name_pretty = $working[1];
}
elsif ($working[0] eq 'NAME' && $working[1]){
$name = $working[1];
- $lc_name = lc($name);
+ $name_lc = lc($name);
+ }
+ elsif ($working[0] eq 'VERSION_CODENAME' && $working[1]){
+ $version_codename = $working[1];
}
elsif ($working[0] eq 'VERSION' && $working[1]){
$version_name = $working[1];
@@ -18826,14 +32116,28 @@ sub get_os_release {
$version_id = $working[1];
}
# for mint/zorin, other ubuntu base system base
- if ($base_type ){
+ if ($base_type){
if ($working[0] eq 'ID_LIKE' && $working[1]){
if ($base_type eq 'ubuntu'){
- # popos shows debian
+ # feren,popos shows debian, feren ID ubuntu
$working[1] =~ s/^(debian|ubuntu\sdebian|debian\subuntu)/ubuntu/;
- $working[1] = 'ubuntu' if $working[1] eq 'debian';
+ $base_name = ucfirst($working[1]);
+ }
+ elsif ($base_type eq 'fedora' && $working[1] =~ /fedora/i){
+ $base_name = 'Fedora';
+ $base_version = $version_id if $version_id;
+ }
+ # oracle ID_LIKE="fedora". Why? who knows.
+ elsif ($base_type eq 'rhel' && $working[1] =~ /rhel|fedora/i){
+ $base_name = 'RHEL';
+ $base_version = $version_id if $version_id;
+ }
+ elsif ($base_type eq 'arch' && $working[1] =~ /$base_type/i){
+ $base_name = 'Arch Linux';
+ }
+ else {
+ $base_name = ucfirst($working[1]);
}
- $base_name = ucfirst($working[1]);
}
elsif ($base_type eq 'ubuntu' && $working[0] eq 'UBUNTU_CODENAME' && $working[1]){
$base_version = ucfirst($working[1]);
@@ -18847,92 +32151,203 @@ sub get_os_release {
# arco shows only the release name, like kirk, in pretty name. Too many distros
# are doing pretty name wrong, and just putting in the NAME value there
if (!$base_type){
- if ($name && $version_name){
- $distro = $name;
- $distro = 'Arco Linux' if $lc_name =~ /^arco/;
+ if ((!$distro->{'osr-pretty'} || !$name_pretty) && $name && $version_name){
+ $dist_osr = $name;
+ $dist_osr = 'Arco Linux' if $name_lc =~ /^arco/;
if ($version_id && $version_name !~ /$version_id/){
- $distro .= ' ' . $version_id;
+ $dist_osr .= ' ' . $version_id;
}
- $distro .= " $version_name";
+ $dist_osr .= " $version_name";
}
- elsif ($pretty_name && ($pretty_name !~ /tumbleweed/i && $lc_name ne 'arcolinux') ){
- $distro = $pretty_name;
+ elsif ($name_pretty && ($name_pretty !~ /tumbleweed/i && $name_lc ne 'arcolinux')){
+ $dist_osr = $name_pretty;
}
elsif ($name){
- $distro = $name;
+ $dist_osr = $name;
if ($version_id){
- $distro .= ' ' . $version_id;
+ $dist_osr .= ' ' . $version_id;
+ }
+ }
+ if ($version_codename && $dist_osr !~ /$version_codename/i){
+ my @temp = split(/\s*[\/\s]\s*/, $version_codename);
+ foreach (@temp){
+ if ($dist_osr !~ /\b$_\b/i){
+ $dist_osr .= " $_";
+ }
}
}
}
# note: mint has varying formats here, some have ubuntu as name, 17 and earlier
else {
- # mint 17 used ubuntu os-release, so won't have $base_version
- if ($base_name && $base_version){
+ # incoherent feren use of version, id, etc
+ if ($base_type eq 'ubuntu' && !$base_version && $version_codename &&
+ $name =~ /feren/i){
+ $base_version = ucfirst($version_codename);
+ $distro->{'name'} =~ s/ $version_codename//;
+ }
+ # mint 17 used ubuntu os-release, so won't have $base_version, steamos holo
+ if ($base_name && ($base_type eq 'fedora' || $base_type eq 'rhel')){
+ $dist_osr = $base_name;
+ $dist_osr .= ' ' . $version_id if $version_id;
+ }
+ elsif ($base_name && $base_type eq 'arch'){
+ $dist_osr = $base_name;
+ }
+ elsif ($base_name && $base_version){
$base_id = ubuntu_id($base_version) if $base_type eq 'ubuntu' && $base_version;
$base_id = '' if $base_id && "$base_name$base_version" =~ /$base_id/;
$base_id .= ' ' if $base_id;
- $distro = "$base_name $base_id$base_version";
+ $dist_osr = "$base_name $base_id$base_version";
}
- elsif ($base_type eq 'default' && ($pretty_name || ($name && $version_name) ) ){
- $distro = ($name && $version_name) ? "$name $version_name" : $pretty_name;
+ elsif ($base_type eq 'default' && ($name_pretty || ($name && $version_name))){
+ $dist_osr = ($name && $version_name) ? "$name $version_name" : $name_pretty;
}
# LMDE 2 has only limited data in os-release, no _LIKE values. 3 has like and debian_codename
- elsif ( $base_type eq 'ubuntu' && $lc_name =~ /^(debian|ubuntu)/ && ($pretty_name || ($name && $version_name))){
- $distro = ($name && $version_name) ? "$name $version_name": $pretty_name;
- }
- elsif ( $base_type eq 'debian' && $base_version ){
- $distro = debian_id($base_version);
+ elsif ($base_type eq 'ubuntu' && $name_lc =~ /^(debian|ubuntu)/ &&
+ ($name_pretty || ($name && $version_name))){
+ $dist_osr = ($name && $version_name) ? "$name $version_name": $name_pretty;
+ }
+ elsif ($base_type eq 'debian' && $base_version){
+ $dist_osr = debian_id('debian',$base_version);
+ }
+ # not used yet
+ elsif ($base_type eq 'devuan' && $base_version){
+ $dist_osr = debian_id('devuan',$base_version);
+ }
+ }
+ eval $end if $b_log;
+ return $dist_osr;
+}
+
+## ID MATCHING TABLES ##
+# args: 0: distro string
+# note: relies on /etc/xdg/xdg-[distro-id] which is an ubuntu thing but could
+# work if other distros use that for spins. Xebian does but not official spin.
+sub distro_spin {
+ my $name = $_[0];
+ eval $start if $b_log;
+ my @spins = (
+ # 0: distro name; 1: xdg search; 2: env search; 3: print name; 4: System Base
+ ['budgie','budgie','','Ubuntu Budgie','Ubuntu'],
+ ['cinnamon','cinnamon','','Ubuntu Cinnamon','Ubuntu'],
+ ['edubuntu','edubuntu','edubuntu','Edubuntu','Ubuntu'],
+ # ['icebox','icebox','icebox','Debian Icebox','Debian'],
+ ['kubuntu','kubuntu|plasma','kubuntu','Kubuntu','Ubuntu'],
+ ['kylin','kylin','kylin','Ubuntu Kylin','Ubuntu'],
+ ['lubuntu','lubuntu','lubuntu','Lubuntu','Ubuntu'],
+ ['mate','mate','','Ubuntu MATE','Ubuntu'],
+ ['studio','studio','studio','Ubuntu Studio','Ubuntu'],
+ ['unity','unity','','Ubuntu Unity','Ubuntu'],
+ # ['xebian','xebian','','Xebian','Debian'],
+ ['xubuntu','xubuntu','xubuntu','Xubuntu','Ubuntu'],
+ );
+ my $tests = 'budgie,cinna,edub,plasma,kubu,kylin,lubu,mate,studio,unity,xebi,xubu';
+ $tests = join(':',main::globber("/etc/xdg/xdg-*{$tests}*"));
+ # xdg is poor since only works in gui. Some of these also in DESKTOP_SESSION
+ foreach my $spin (@spins){
+ if ($name !~ /$spin->[0]/i && (
+ ($spin->[2] && $ENV{'DESKTOP_SESSION'} &&
+ $ENV{'DESKTOP_SESSION'} =~ /$spin->[2]/i) ||
+ ($ENV{'XDG_CONFIG_DIRS'} && $ENV{'XDG_CONFIG_DIRS'} =~ /$spin->[1]/i) ||
+ ($tests && $tests =~ /$spin->[1]/i))){
+ $name =~ s/\b$spin->[4]/$spin->[3]/i;
+ last;
}
}
eval $end if $b_log;
- return $distro;
+ return $name;
}
-# arg: 1 - optional: debian codename
+
+# args: 0: $type [debian|devuan]; 1: optional: debian codename
sub debian_id {
eval $start if $b_log;
- my ($codename) = @_;
- my ($debian_version,$id);
- $debian_version = (main::reader('/etc/debian_version','strip'))[0] if -r '/etc/debian_version';
- $id = 'Debian';
- return if !$debian_version && !$codename;
- # note, 3.0, woody, 3.1, sarge, but after it's integer per version
- my %debians = (
- '4' => 'etch',
- '5' => 'lenny',
- '6' => 'squeeze',
- '7' => 'wheezy',
- '8' => 'jessie',
- '9' => 'stretch',
- '10' => 'buster',
- '11' => 'bullseye',
- '12' => 'bookworm', # ?
- );
- if (main::is_numeric($debian_version)){
- $id .= " $debian_version $debians{int($debian_version)}";
+ my ($type,$codename) = @_;
+ my ($id,$file_value,%releases,$version);
+ if (-r "/etc/${type}_version"){
+ $file_value = main::reader("/etc/${type}_version",'strip',0);
+ }
+ return if !$file_value && !$codename;
+ if ($type eq 'debian'){
+ $id = 'Debian';
+ # note, 3.0, woody, 3.1, sarge, but after it's integer per version
+ %releases = (
+ '4' => 'etch',
+ '5' => 'lenny',
+ '6' => 'squeeze',
+ '7' => 'wheezy',
+ '8' => 'jessie',
+ '9' => 'stretch',
+ '10' => 'buster',
+ '11' => 'bullseye',
+ '12' => 'bookworm',
+ '13' => 'trixie',
+ '14' => 'forky',
+ );
+ }
+ else {
+ $id = 'Devuan';
+ %releases = (
+ '1' => 'jesse', # jesse
+ '2' => 'ascii', # stretch
+ '3' => 'beowolf', # buster
+ '4' => 'chimaera', # bullseye
+ '5' => 'daedalus', # bookworm
+ '6' => 'excalibur',# trixie
+ '7' => 'freia', # forky
+ # '' => 'ceres/daedalus', # sid/unstable
+ );
}
- elsif ($codename) {
- my %by_value = reverse %debians;
- my $version = (main::is_numeric($debian_version)) ? "$debian_version $codename": $debian_version;
- $id .= " $version";
+ # debian often numeric, devuan usually not
+ # like trixie/sid; daedalus; ceres/daedalus; 12.0
+ if (main::is_numeric($file_value)){
+ $version = $file_value . ' ' . $releases{int($file_value)};
}
- # like buster/sid
- elsif ($debian_version) {
- $id .= " $debian_version";
+ else {
+ my %releases_r = reverse %releases;
+ if ($codename){
+ $version = ($releases_r{$codename}) ? "$releases_r{$codename} $codename": $codename;
+ }
+ elsif ($releases_r{$file_value}) {
+ $version = "$releases_r{$file_value} $file_value";
+ }
+ else {
+ $version = $file_value;
+ }
+ }
+ if ($version){
+ my @temp = split(/\s*[\/\s]\s*/, $version);
+ foreach (@temp){
+ if ($distro->{'name'} !~ /\b$_\b/i){
+ $id .= " $_";
+ }
+ }
}
eval $end if $b_log;
return $id;
}
-# note, these are only for matching derived names, no need to go
-# all the way back here, update as new names are known. This is because
+# Note, these are only for matching distro/mint derived names.
+# Update list as new names become available. While first Mint was 2006-08,
+# this method depends on /etc/os-release which was introduced 2012-02.
# Mint is using UBUNTU_CODENAME without ID data.
sub ubuntu_id {
eval $start if $b_log;
my ($codename) = @_;
$codename = lc($codename);
my ($id) = ('');
+ # xx.04, xx.10
my %codenames = (
+ # '??' => '26.04',
+ # '??' => '25.10',
+ # '??' => '25.04',
+ # '??' => '24.10',
+ 'noble' => '24.04 LTS',
+ 'mantic' => '23.10',
+ 'lunar' => '23.04',
+ 'kinetic' => '22.10',
+ 'jammy' => '22.04 LTS',
+ 'impish' => '21.10',
+ 'hirsute' => '21.04',
'groovy' => '20.10',
'focal' => '20.04 LTS',
'eoan' => '19.10',
@@ -18951,99 +32366,213 @@ sub ubuntu_id {
'raring' => '13.04',
'quantal' => '12.10',
'precise' => '12.04 LTS ',
+ # 'natty' => '11.04','oneiric' => '11.10',
+ # 'lucid' => '10.04','maverick' => '10.10',
+ # 'jaunty' => '9.04','karmic' => '9.10',
+ # 'hardy' => '8.04','intrepid' => '8.10',
+ # 'feisty' => '7.04','gutsy' => '7.10',
+ # 'dapper' => '6.06','edgy' => '6.10',
+ # 'hoary' => '5.04','breezy' => '5.10',
+ # 'warty' => '4.10', # warty was the first ubuntu release
);
$id = $codenames{$codename} if defined $codenames{$codename};
eval $end if $b_log;
return $id;
}
+
+## UTILITIES ##
+sub check_base {
+ if (lc($distro->{'name'}) eq lc($distro->{'base'})){
+ $distro->{'base'} = '';
+ }
+ else {
+ my @name = split(/\s+/,$distro->{'name'});
+ my @working;
+ foreach my $word (@name){
+ if ($distro->{'base'} !~ /\b\Q$word\E\b/i || $word =~ /^[\d\.]+$/){
+ push(@working,$word);
+ }
+ }
+ $distro->{'name'} = join(' ',@working) if @working;
+ }
}
-# return all device modules not including driver
-sub get_driver_modules {
+
+# args: 0: info; 1: list of globbed distro files
+sub dbg_distro_files {
+ my ($info,$files) = @_;
+ my $contents = {};
+ foreach my $file (@$files){
+ $contents->{$file} = (-r $file ) ? main::reader($file,'','ref') : main::message('file-unreadable');
+ }
+ main::feature_debugger($info . ' raw distro files:',$contents);
+}
+}
+
+## DmidecodeData
+{
+package DmidecodeData;
+
+# Note, all actual tests have already been run in check_tools so if we
+# got here, we're good.
+sub set {
eval $start if $b_log;
- my ($driver,$modules) = @_;
- return if ! $modules;
- my @mods = split /,\s+/, $modules;
- if ($driver){
- @mods = grep {!/^$driver$/} @mods;
- $modules = join ',', @mods;
+ ${$_[0]} = 1; # set check boolean by reference
+ if ($fake{'dmidecode'} || $alerts{'dmidecode'}->{'action'} eq 'use'){
+ generate_data();
}
- log_data('data','$modules',$modules) if $b_log;
eval $end if $b_log;
- return $modules;
}
-# 1: driver; 2: modules, comma separated, return only modules
-# which do not equal the driver string itself. Sometimes the module
-# name is different from the driver name, even though it's the same thing.
-sub get_gcc_data {
+
+sub generate_data {
eval $start if $b_log;
- my ($gcc,@data,@gccs,@temp);
- # NOTE: We can't use program_version because we don't yet know where
- # the version number is
- if (my $program = check_program('gcc') ){
- @data = grabber("$program --version 2>/dev/null");
- $gcc = awk(\@data,'^gcc');
+ my ($content,@data,@working,$type,$handle);
+ if ($fake{'dmidecode'}){
+ my $file;
+ # $file = "$fake_data_dir/dmidecode/pci-freebsd-8.2-2";
+ # $file = "$fake_data_dir/dmidecode/dmidecode-loki-1.txt";
+ # $file = "$fake_data_dir/dmidecode/dmidecode-t41-1.txt";
+ # $file = "$fake_data_dir/dmidecode/dmidecode-mint-20180106.txt";
+ # $file = "$fake_data_dir/dmidecode/dmidecode-vmware-ram-1.txt";
+ # $file = "$fake_data_dir/dmidecode/dmidecode-tyan-4408.txt";
+ # $file = "$fake_data_dir/ram/dmidecode-speed-configured-1.txt";
+ # $file = "$fake_data_dir/ram/dmidecode-speed-configured-2.txt";
+ # $file = "$fake_data_dir/ram/00srv-dmidecode-mushkin-1.txt";
+ # $file = "$fake_data_dir/dmidecode/dmidecode-slots-pcix-pcie-1.txt";
+ # $file = "$fake_data_dir/dmidecode/dmidecode-Microknopix-pci-vga-types-5-6-16-17.txt";
+ # open(my $fh, '<', $file) or die "can't open $file: $!";
+ # chomp(@data = <$fh>);
}
- if ($gcc){
- # strip out: gcc (Debian 6.3.0-18) 6.3.0 20170516
- # gcc (GCC) 4.2.2 20070831 prerelease [FreeBSD]
- $gcc =~ s/\([^\)]*\)//g;
- $gcc = get_piece($gcc,2);
+ else {
+ $content = qx($alerts{'dmidecode'}->{'path'} 2>/dev/null);
+ @data = split('\n', $content);
}
- if ($extra > 1){
- # glob /usr/bin for gccs, strip out all non numeric values
- @temp = globber('/usr/bin/gcc-*');
- foreach (@temp){
- if (/\/gcc-([0-9.]+)$/){
- push @gccs, $1;
+ # we don't need the opener lines of dmidecode output
+ # but we do want to preserve the indentation. Empty lines
+ # won't matter, they will be skipped, so no need to handle them.
+ # some dmidecodes do not use empty line separators
+ splice(@data, 0, 5) if @data;
+ my $j = 0;
+ my $b_skip = 1;
+ foreach (@data){
+ if (!/^Hand/){
+ next if $b_skip;
+ if (/^[^\s]/){
+ $_ = lc($_);
+ $_ =~ s/\s(information)//;
+ push(@working, $_);
+ }
+ elsif (/^\t/){
+ $_ =~ s/^\t\t/~/;
+ $_ =~ s/^\t|\s+$//g;
+ push(@working, $_);
}
}
+ elsif (/^Handle\s(0x[0-9A-Fa-f]+).*DMI\stype\s([0-9]+),.*/){
+ $j = scalar @dmi;
+ $handle = hex($1);
+ $type = $2;
+ $use{'slot-tool'} = 1 if $type && $type == 9;
+ $b_skip = ($type > 126) ? 1 : 0;
+ next if $b_skip;
+ # we don't need 32, system boot, or 127, end of table
+ if (@working){
+ if ($working[0] != 32 && $working[0] < 127){
+ $dmi[$j] = (
+ [@working],
+ );
+ }
+ }
+ @working = ($type,$handle);
+ }
}
- unshift @gccs, $gcc;
- log_data('dump','@gccs',\@gccs) if $b_log;
+ if (@working && $working[0] != 32 && $working[0] != 127){
+ $j = scalar @dmi;
+ $dmi[$j] = \@working;
+ }
+ # last by not least, sort it by dmi type, now we don't have to worry
+ # about random dmi type ordering in the data, which happens. Also sort
+ # by handle, as secondary sort.
+ @dmi = sort { $a->[0] <=> $b->[0] || $a->[1] <=> $b->[1] } @dmi;
+ main::log_data('dump','@dmi',\@dmi) if $b_log;
+ print Data::Dumper::Dumper \@dmi if $dbg[2];
eval $end if $b_log;
- return @gccs;
+}
}
-# rasberry pi only
-sub get_gpu_ram_arm {
+# args: 0: driver; 1: modules, comma separated, return only modules
+# which do not equal the driver string itself. Sometimes the module
+# name is different from the driver name, even though it's the same thing.
+sub get_driver_modules {
eval $start if $b_log;
- my ($gpu_ram) = (0);
- if (my $program = check_program('vcgencmd')){
- # gpu=128M
- # "VCHI initialization failed" - you need to add video group to your user
- my $working = (grabber("$program get_mem gpu 2>/dev/null"))[0];
- $working = (split /\s*=\s*/, $working)[1] if $working;
- $gpu_ram = translate_size($working) if $working;
+ my ($driver,$modules) = @_;
+ return if !$modules;
+ my @mods = split(/,\s+/, $modules);
+ if ($driver){
+ @mods = grep {!/^$driver$/} @mods;
+ my $join = (length(join(',', @mods)) > 40) ? ', ' : ',';
+ $modules = join($join, @mods);
}
- log_data('data',"gpu ram: $gpu_ram") if $b_log;
+ log_data('data','$modules',$modules) if $b_log;
eval $end if $b_log;
- return $gpu_ram;
+ return $modules;
+}
+
+## GlabelData: public methods: set(), get()
+# Used only to get RAID ZFS gptid path standard name, like ada0p1
+{
+package GlabelData;
+
+# gptid/c5e940f1-5ce2-11e6-9eeb-d05099ac4dc2 N/A ada0p1
+sub get {
+ eval $start if $b_log;
+ my ($gptid) = @_;
+ set() if !$loaded{'glabel'};
+ return if !@glabel || !$gptid;
+ my ($dev_id) = ('');
+ foreach (@glabel){
+ my @temp = split(/\s+/, $_);
+ my $gptid_trimmed = $gptid;
+ # slice off s[0-9] from end in case they use slice syntax
+ $gptid_trimmed =~ s/s[0-9]+$//;
+ if (defined $temp[0] && ($temp[0] eq $gptid || $temp[0] eq $gptid_trimmed)){
+ $dev_id = $temp[2];
+ last;
+ }
+ }
+ $dev_id ||= $gptid; # no match? return full string
+ eval $end if $b_log;
+ return $dev_id;
}
-# standard systems
-sub get_gpu_ram {
+sub set {
eval $start if $b_log;
- my ($gpu_ram) = (0);
+ $loaded{'glabel'} = 1;
+ if (my $path = main::check_program('glabel')){
+ @glabel = main::grabber("$path status 2>/dev/null");
+ }
+ main::log_data('dump','@glabel:with Headers',\@glabel) if $b_log;
+ # get rid of first header line
+ shift @glabel;
eval $end if $b_log;
- return $gpu_ram;
+}
}
sub get_hostname {
eval $start if $b_log;
my $hostname = '';
- if ( $ENV{'HOSTNAME'} ){
+ if ($ENV{'HOSTNAME'}){
$hostname = $ENV{'HOSTNAME'};
}
- elsif ( !$bsd_type && -f "/proc/sys/kernel/hostname" ){
- $hostname = (reader('/proc/sys/kernel/hostname'))[0];
+ elsif (!$bsd_type && -r "/proc/sys/kernel/hostname"){
+ $hostname = reader('/proc/sys/kernel/hostname','',0);
}
# puppy removed this from core modules, sigh
# this is faster than subshell of hostname
- elsif (check_module('Sys::Hostname')){
- import Sys::Hostname;
+ elsif (check_perl_module('Sys::Hostname')){
+ Sys::Hostname->import;
$hostname = Sys::Hostname::hostname();
}
- elsif (my $program = check_program('hostname')) {
+ elsif (my $program = check_program('hostname')){
$hostname = (grabber("$program 2>/dev/null"))[0];
}
$hostname ||= 'N/A';
@@ -19051,239 +32580,1150 @@ sub get_hostname {
return $hostname;
}
-sub get_init_data {
+## InitData
+{
+package InitData;
+my ($init,$init_version,$program) = ('','','');
+
+sub get {
eval $start if $b_log;
- my $runlevel = get_runlevel_data();
+ my $runlevel = get_runlevel();
my $default = ($extra > 1) ? get_runlevel_default() : '';
- my ($init,$init_version,$rc,$rc_version,$program) = ('','','','','');
- my $comm = ( -e '/proc/1/comm' ) ? (reader('/proc/1/comm'))[0] : '';
- my (@data);
+ my ($rc,$rc_version) = ('','');
+ my $comm = (-r '/proc/1/comm') ? main::reader('/proc/1/comm','',0) : '';
+ my $link = readlink('/sbin/init');
# this test is pretty solid, if pid 1 is owned by systemd, it is systemd
# otherwise that is 'init', which covers the rest of the init systems.
- # more data may be needed for other init systems.
- if ( $comm ){
- if ( $comm =~ /systemd/ ){
- $init = 'systemd';
- if ( $program = check_program('systemd')){
- $init_version = program_version($program,'^systemd','2','--version');
- }
- if (!$init_version && ($program = check_program('systemctl') ) ){
- $init_version = program_version($program,'^systemd','2','--version');
- }
+ # more data may be needed for other init systems.
+ # Some systemd cases no /proc/1/comm exists however :(
+ if (($comm && $comm =~ /systemd/) || -e '/run/systemd/units'){
+ $init = 'systemd';
+ if ($program = main::check_program('systemd')){
+ ($init,$init_version) = ProgramData::full('systemd',$program);
+ }
+ if (!$init_version && ($program = main::check_program('systemctl'))){
+ ($init,$init_version) = ProgramData::full('systemd',$program);
+ }
+ if ($runlevel && $runlevel =~ /^\d$/){
+ my $target = '';
+ if ($runlevel == 1){
+ $target = 'rescue';}
+ elsif ($runlevel > 1 && $runlevel < 5){
+ $target = 'multi-user';}
+ elsif ($runlevel == 5){
+ $target = 'graphical';}
+ $runlevel = "$target ($runlevel)" if $target;
+ }
+ }
+ if (!$init && $comm){
+ # not verified
+ if ($comm =~ /^31init/){
+ $init = '31init';
+ # no version, this is a 31 line C program
}
- # epoch version == Epoch Init System 1.0.1 "Sage"
elsif ($comm =~ /epoch/){
- $init = 'Epoch';
- $init_version = program_version('epoch', '^Epoch', '4','version');
+ ($init,$init_version) = ProgramData::full('epoch');
+ }
+ # if they fix dinit to show /proc/1/comm == dinit
+ elsif ($comm =~ /^dinit/){
+ ($init,$init_version) = ProgramData::full('dinit');
+ }
+ elsif ($comm =~ /finit/){
+ ($init,$init_version) = ProgramData::full('finit');
+ }
+ # not verified
+ elsif ($comm =~ /^hummingbird/){
+ $init = 'Hummingbird';
+ # no version data known. Complete if more info found.
+ }
+ # nosh can map service manager to systemctl, service, rcctl, at least.
+ elsif ($comm =~ /^nosh/){
+ $init = 'nosh';
}
# missing data: note, runit can install as a dependency without being the
# init system: http://smarden.org/runit/sv.8.html
# NOTE: the proc test won't work on bsds, so if runit is used on bsds we
- # will need more datas
+ # will need more data
elsif ($comm =~ /runit/){
$init = 'runit';
+ # no version data as of 2022-10-26
}
elsif ($comm =~ /^s6/){
$init = 's6';
+ # no version data as of 2022-10-26
+ }
+ elsif ($comm =~ /shepherd/){
+ ($init,$init_version) = ProgramData::full('shepherd');
+ }
+ # fallback for some inits that link to /sbin/init
+ elsif ($comm eq 'init'){
+ # shows /sbin/dinit-init but may change
+ if (-e '/sbin/dinit' && $link && $link =~ /dinit/){
+ ($init,$init_version) = ProgramData::full('dinit');
+ }
+ elsif (-e '/sbin/openrc-init' && $link && $link =~ /openrc/){
+ ($init,$init_version) = openrc_data();
+ }
}
}
if (!$init){
- # output: /sbin/init --version: init (upstart 1.1)
- # init (upstart 0.6.3)
- # openwrt /sbin/init hangs on --version command, I think
- if ((!$b_mips && !$b_sparc && !$b_arm) && ($init_version = program_version('init', 'upstart', '3','--version') )){
+ # openwrt/busybox /sbin/init hangs on --version command
+ if (-e '/sbin/init' && $link && $link =~ /busybox/){
+ ($init,$init_version) = ProgramData::full('busybox','/sbin/init');
+ }
+ # risky since we don't know which init it is. $comm == 'init'
+ # output: /sbin/init --version: init (upstart 1.1); init (upstart 0.6.3)
+ elsif (!%risc && !$link && main::globber('/{usr/lib,sbin,var/log}/upstart*') &&
+ ($init_version = ProgramData::version('init', 'upstart', '3','--version'))){
$init = 'Upstart';
}
- elsif (check_program('launchctl')){
+ # surely more positive way to detect active
+ elsif (main::check_program('launchctl')){
$init = 'launchd';
}
- elsif ( -f '/etc/inittab' ){
+ # could be nosh or runit as well for BSDs, not handled yet
+ elsif (-f '/etc/inittab'){
$init = 'SysVinit';
- if (check_program('strings')){
- @data = grabber('strings /sbin/init');
- $init_version = awk(\@data,'^version\s+[0-9]',2);
+ if (main::check_program('strings')){
+ my @data = main::grabber('strings /sbin/init 2>/dev/null');
+ $init_version = main::awk(\@data,'^version\s+[0-9]',2);
}
}
- elsif ( -f '/etc/ttys' ){
+ elsif (-f '/etc/ttys'){
$init = 'init (BSD)';
}
}
- if ( grep { /openrc/ } globber('/run/*openrc*') ){
- $rc = 'OpenRC';
- # /sbin/openrc --version == openrc (OpenRC) 0.13
- if ($program = check_program('openrc')){
- $rc_version = program_version($program, '^openrc', '3','--version');
+ if ((grep { /openrc/ } main::globber('/run/*openrc*')) || (grep {/openrc/} @ps_cmd)){
+ if (!$init || $init ne 'OpenRC'){
+ ($rc,$rc_version) = openrc_data();
}
- # /sbin/rc --version == rc (OpenRC) 0.11.8 (Gentoo Linux)
- elsif ($program = check_program('rc')){
- $rc_version = program_version($program, '^rc', '3','--version');
+ if (-r '/run/openrc/softlevel'){
+ $runlevel = main::reader('/run/openrc/softlevel','',0);
}
- if ( -e '/run/openrc/softlevel' ){
- $runlevel = (reader('/run/openrc/softlevel'))[0];
+ elsif (-r '/var/run/openrc/softlevel'){
+ $runlevel = main::reader('/var/run/openrc/softlevel','',0);
}
- elsif ( -e '/var/run/openrc/softlevel'){
- $runlevel = (reader('/var/run/openrc/softlevel'))[0];
- }
- elsif ( $program = check_program('rc-status')){
- $runlevel = (grabber("$program -r 2>/dev/null"))[0];
+ elsif ($program = main::check_program('rc-status')){
+ $runlevel = (main::grabber("$program -r 2>/dev/null"))[0];
}
}
- my %init = (
+ eval $end if $b_log;
+ return {
'init-type' => $init,
'init-version' => $init_version,
'rc-type' => $rc,
'rc-version' => $rc_version,
'runlevel' => $runlevel,
'default' => $default,
- );
+ };
+}
+
+sub openrc_data {
+ eval $start if $b_log;
+ my @result;
+ # /sbin/openrc --version: openrc (OpenRC) 0.13
+ if ($program = main::check_program('openrc')){
+ @result = ProgramData::full('openrc',$program);
+ }
+ # /sbin/rc --version: rc (OpenRC) 0.11.8 (Gentoo Linux)
+ elsif ($program = main::check_program('rc')){
+ @result = ProgramData::full('rc',$program);
+ }
+ $result[0] ||= 'OpenRC';
eval $end if $b_log;
- return %init;
+ return @result;
}
-sub get_kernel_data {
+# Check? /var/run/nologin for bsds?
+sub get_runlevel {
eval $start if $b_log;
- my ($kernel,$ksplice) = ('','');
- # Linux; yawn; 4.9.0-3.1-liquorix-686-pae; #1 ZEN SMP PREEMPT liquorix 4.9-4 (2017-01-14); i686
- # FreeBSD; siwi.pair.com; 8.2-STABLE; FreeBSD 8.2-STABLE #0: Tue May 31 14:36:14 EDT 2016 erik5@iddhi.pair.com:/usr/obj/usr/src/sys/82PAIRx-AMD64; amd64
- if (@uname){
- $kernel = $uname[2];
- if ( (my $program = check_program('uptrack-uname')) && $kernel){
- $ksplice = qx($program -rm);
- $ksplice = trimmer($ksplice);
- $kernel = ($ksplice) ? $ksplice . ' (ksplice)' : $kernel;
+ my $runlevel = '';
+ if ($program = main::check_program('runlevel')){
+ # variants: N 5; 3 5; unknown
+ $runlevel = (main::grabber("$program 2>/dev/null"))[0];
+ $runlevel = undef if $runlevel && lc($runlevel) eq 'unknown';
+ $runlevel =~ s/^(\S\s)?(\d)$/$2/ if $runlevel;
+ # print_line($runlevel . ";;");
+ }
+ eval $end if $b_log;
+ return $runlevel;
+}
+
+# Note: it appears that at least as of 2014-01-13, /etc/inittab is going
+# to be used for default runlevel in upstart/sysvinit. systemd default is
+# not always set so check to see if it's linked.
+sub get_runlevel_default {
+ eval $start if $b_log;
+ my @data;
+ my $default = '';
+ if ($program = main::check_program('systemctl')){
+ # note: systemd systems do not necessarily have this link created
+ my $systemd = '/etc/systemd/system/default.target';
+ # faster to read than run
+ if (-e $systemd){
+ $default = readlink($systemd);
+ $default =~ s/(.*\/|\.target$)//g if $default;
+ }
+ if (!$default){
+ $default = (main::grabber("$program get-default 2>/dev/null"))[0];
+ $default =~ s/\.target$// if $default;
+ }
+ }
+ if (!$default){
+ # http://askubuntu.com/questions/86483/how-can-i-see-or-change-default-run-level
+ # note that technically default can be changed at boot but for inxi purposes
+ # that does not matter, we just want to know the system default
+ my $upstart = '/etc/init/rc-sysinit.conf';
+ my $inittab = '/etc/inittab';
+ if (-r $upstart){
+ # env DEFAULT_RUNLEVEL=2
+ @data = main::reader($upstart);
+ $default = main::awk(\@data,'^env\s+DEFAULT_RUNLEVEL',2,'=');
+ }
+ # handle weird cases where null but inittab exists
+ if (!$default && -r $inittab){
+ @data = main::reader($inittab);
+ $default = main::awk(\@data,'^id.*initdefault',2,':');
}
- $kernel .= ' ' . $uname[-1];
- $kernel = ($bsd_type) ? $uname[0] . ' ' . $kernel : $kernel;
}
- $kernel ||= 'N/A';
- log_data('data',"kernel: $kernel ksplice: $ksplice") if $b_log;
eval $end if $b_log;
- return $kernel;
+ return $default;
+}
+}
+
+## IpData
+{
+package IpData;
+
+sub set {
+ eval $start if $b_log;
+ if ($force{'ip'} ||
+ (!$force{'ifconfig'} && $alerts{'ip'}->{'action'} eq 'use')){
+ set_ip_addr();
+ }
+ elsif ($force{'ifconfig'} || $alerts{'ifconfig'}->{'action'} eq 'use'){
+ set_ifconfig();
+ }
+ eval $end if $b_log;
+}
+
+sub set_ip_addr {
+ eval $start if $b_log;
+ my @data = main::grabber($alerts{'ip'}->{'path'} . " addr 2>/dev/null",'\n','strip');
+ if ($fake{'ip-if'}){
+ # my $file = "$fake_data_dir/if/scope-ipaddr-1.txt";
+ # my $file = "$fake_data_dir/network/ip-addr-blue-advance.txt";
+ # my $file = "$fake_data_dir/network/ppoe/ppoe-ip-address-1.txt";
+ # my $file = "$fake_data_dir/network/ppoe/ppoe-ip-addr-2.txt";
+ # my $file = "$fake_data_dir/network/ppoe/ppoe-ip-addr-3.txt";
+ # @data = main::reader($file,'strip') or die $!;
+ }
+ my ($b_skip,$broadcast,$if,$if_id,$ip,@ips,$scope,$type,@temp,@temp2);
+ foreach (@data){
+ if (/^[0-9]/){
+ # print "$_\n";
+ if (@ips){
+ # print "$if\n";
+ push(@ifs,($if,[@ips]));
+ @ips = ();
+ }
+ @temp = split(/:\s+/, $_);
+ $if = $temp[1];
+ if ($if eq 'lo'){
+ $b_skip = 1;
+ $if = '';
+ next;
+ }
+ ($b_skip,@temp) = ();
+ }
+ elsif (!$b_skip && /^inet/){
+ # print "$_\n";
+ ($broadcast,$ip,$scope,$if_id,$type) = ();
+ @temp = split(/\s+/, $_);
+ $ip = $temp[1];
+ $type = ($temp[0] eq 'inet') ? 4 : 6 ;
+ if ($temp[2] eq 'brd'){
+ $broadcast = $temp[3];
+ }
+ if (/scope\s([^\s]+)(\s(.+))?/){
+ $scope = $1;
+ $if_id = $3;
+ }
+ push(@ips,[$type,$ip,$broadcast,$scope,$if_id]);
+ # print Data::Dumper::Dumper \@ips;
+ }
+ }
+ if (@ips){
+ push(@ifs,($if,[@ips]));
+ }
+ main::log_data('dump','@ifs',\@ifs) if $b_log;
+ print 'ip addr: ', Data::Dumper::Dumper \@ifs if $dbg[3];
+ eval $end if $b_log;
+}
+
+sub set_ifconfig {
+ eval $start if $b_log;
+ # whitespace matters!! Don't use strip
+ my @data = main::grabber($alerts{'ifconfig'}->{'path'} . " 2>/dev/null",'\n','');
+ if ($fake{'ip-if'}){
+ # my $file = "$fake_data_dir/network/ppoe/ppoe-ifconfig-all-1.txt";
+ # my $file = "$fake_data_dir/network/vps-ifconfig-1.txt";
+ # @data = main::reader($file) or die $!;
+ }
+ my ($b_skip,$broadcast,$if,@ips_bsd,$ip,@ips,$scope,$if_id,$type,@temp,@temp2);
+ my ($state,$speed,$duplex,$mac);
+ foreach (@data){
+ if (/^[\S]/i){
+ # print "$_\n";
+ if (@ips){
+ # print "here\n";
+ push(@ifs,($if,[@ips]));
+ @ips = ();
+ }
+ if ($mac){
+ push(@ifs_bsd,($if,[$state,$speed,$duplex,$mac]));
+ ($state,$speed,$duplex,$mac,$if_id) = ('','','','','');
+ }
+ $if = (split(/\s+/, $_))[0];
+ $if =~ s/:$//; # em0: flags=8843
+ $if_id = $if;
+ $if = (split(':', $if))[0] if $if;
+ if ($if =~ /^lo/){
+ $b_skip = 1;
+ $if = '';
+ $if_id = '';
+ next;
+ }
+ $b_skip = 0;
+ }
+ elsif (!$b_skip && $bsd_type && /^\s+(address|ether|media|status|lladdr)/){
+ $_ =~ s/^\s+//;
+ # freebsd 7.3: media: Ethernet 100baseTX <full-duplex>
+ # Freebsd 8.2/12.2: media: Ethernet autoselect (1000baseT <full-duplex>)
+ # Netbsd 9.1: media: Ethernet autoselect (1000baseT full-duplex)
+ # openbsd: media: Ethernet autoselect (1000baseT full-duplex)
+ if (/^media/){
+ if ($_ =~ /[\s\(]([1-9][^\(\s]+)?\s<([^>]+)>/){
+ $speed = $1 if $1;
+ $duplex = $2;
+ }
+ if (!$duplex && $_ =~ /\s\(([\S]+)\s([^\s<]+)\)/){
+ $speed = $1;
+ $duplex = $2;
+ }
+ if (!$speed && $_ =~ /\s\(([1-9][\S]+)\s/){
+ $speed = $1;
+ }
+ }
+ # lladdr openbsd/address netbsd/ether freebsd
+ elsif (!$mac && /^(address|ether|lladdr)/){
+ $mac = (split(/\s+/, $_))[1];
+ }
+ elsif (/^status:\s*(.*)/){
+ $state = $1;
+ }
+ }
+ elsif (!$b_skip && /^\s+inet/){
+ # print "$_\n";
+ $_ =~ s/^\s+//;
+ $_ =~ s/addr:\s/addr:/;
+ @temp = split(/\s+/, $_);
+ ($broadcast,$ip,$scope,$type) = ('','','','');
+ $ip = $temp[1];
+ # fe80::225:90ff:fe13:77ce%em0
+# $ip =~ s/^addr:|%([\S]+)//;
+ if ($1 && $1 ne $if_id){
+ $if_id = $1;
+ }
+ $type = ($temp[0] eq 'inet') ? 4 : 6 ;
+ if (/(Bcast:|broadcast\s)([\S]+)/){
+ $broadcast = $2;
+ }
+ if (/(scopeid\s[^<]+<|Scope:|scopeid\s)([^>]+)[>]?/){
+ $scope = $2;
+ }
+ $scope = 'link' if $ip =~ /^fe80/;
+ push(@ips,[$type,$ip,$broadcast,$scope,$if_id]);
+ # print Data::Dumper::Dumper \@ips;
+ }
+ }
+ if (@ips){
+ push(@ifs,($if,[@ips]));
+ }
+ if ($mac){
+ push(@ifs_bsd,($if,[$state,$speed,$duplex,$mac]));
+ ($state,$speed,$duplex,$mac) = ('','','','');
+ }
+ print 'ifconfig: ', Data::Dumper::Dumper \@ifs if $dbg[3];
+ print 'ifconfig bsd: ', Data::Dumper::Dumper \@ifs_bsd if $dbg[3];
+ main::log_data('dump','@ifs',\@ifs) if $b_log;
+ main::log_data('dump','@ifs_bsd',\@ifs_bsd) if $b_log;
+ eval $end if $b_log;
+}
}
sub get_kernel_bits {
eval $start if $b_log;
my $bits = '';
if (my $program = check_program('getconf')){
- $bits = (grabber("$program LONG_BIT 2>/dev/null"))[0];
+ # what happens with future > 64 bit kernels? we'll see in the future!
+ if ($bits = (grabber("$program _POSIX_V6_LP64_OFF64 2>/dev/null"))[0]){
+ if ($bits =~ /^(-1|undefined)$/i){
+ $bits = 32;
+ }
+ # no docs for true state, 1 is usually true, but probably can be others
+ else {
+ $bits = 64;
+ }
+ }
+ # returns long bits if we got nothing on first test
+ $bits = (grabber("$program LONG_BIT 2>/dev/null"))[0] if !$bits;
}
# fallback test
- if (!$bits && @uname){
- $bits = $uname[-1];
- $bits = ($bits =~ /64/ ) ? 64 : 32;
+ if (!$bits && $bits_sys){
+ $bits = $bits_sys;
}
$bits ||= 'N/A';
eval $end if $b_log;
return $bits;
}
-sub get_kernel_parameters {
+# arg: 0: $cs_curr, by ref; 1: $cs_avail, by ref.
+sub get_kernel_clocksource {
+ eval $start if $b_log;
+ if (-r '/sys/devices/system/clocksource/clocksource0/current_clocksource'){
+ ${$_[0]} = reader('/sys/devices/system/clocksource/clocksource0/current_clocksource','',0);
+ if ($b_admin &&
+ -r '/sys/devices/system/clocksource/clocksource0/available_clocksource'){
+ ${$_[1]} = reader('/sys/devices/system/clocksource/clocksource0/available_clocksource','',0);
+ if (${$_[0]} && ${$_[1]}){
+ my @temp = split(/\s+/,${$_[1]});
+ @temp = grep {$_ ne ${$_[0]}} @temp;
+ ${$_[1]} = join(',', @temp);
+ }
+ }
+ }
+ eval $end if $b_log;
+}
+
+## KernelCompiler
+{
+package KernelCompiler;
+
+sub get {
+ eval $start if $b_log;
+ my $compiler = []; # we want an array ref to return if not set
+ if (my $file = $system_files{'proc-version'}){
+ version_proc($compiler,$file);
+ }
+ elsif ($bsd_type){
+ version_bsd($compiler);
+ }
+ eval $end if $b_log;
+ return $compiler;
+}
+
+# args: 0: compiler by ref
+sub version_bsd {
+ eval $start if $b_log;
+ my $compiler = $_[0];
+ if ($alerts{'sysctl'}->{'action'} && $alerts{'sysctl'}->{'action'} eq 'use'){
+ if ($sysctl{'kernel'}){
+ my @working;
+ foreach (@{$sysctl{'kernel'}}){
+ # Not every line will have a : separator though the processor should make
+ # most have it. This appears to be 10.x late feature add, I don't see it
+ # on earlier BSDs
+ if (/^kern.compiler_version/){
+ @working = split(/:\s*/, $_);
+ $working[1] =~ /.*(clang|gcc|zigcc)\sversion\s([\S]+)\s.*/;
+ @$compiler = ($1,$2);
+ last;
+ }
+ }
+ }
+ # OpenBSD doesn't show compiler data in sysctl or dboot but it's going to
+ # be Clang until way into the future, and it will be the installed version.
+ if (ref $compiler ne 'ARRAY' || !@$compiler){
+ if (my $path = main::check_program('clang')){
+ ($compiler->[0],$compiler->[1]) = ProgramData::full('clang',$path);
+ }
+ }
+ }
+ main::log_data('dump','@$compiler',$compiler) if $b_log;
+ eval $end if $b_log;
+}
+
+# args: 0: compiler by ref; 1: proc file name
+sub version_proc {
+ eval $start if $b_log;
+ my ($compiler,$file) = @_;
+ if (my $result = main::reader($file,'',0)){
+ my $version;
+ if ($fake{'compiler'}){
+ # $result = $result =~ /\*(gcc|clang)\*eval\*/;
+ # $result='Linux version 5.4.0-rc1 (sourav@archlinux-pc) (clang version 9.0.0 (tags/RELEASE_900/final)) #1 SMP PREEMPT Sun Oct 6 18:02:41 IST 2019';
+ # $result='Linux version 5.8.3-fw1 (fst@x86_64.frugalware.org) ( OpenMandriva 11.0.0-0.20200819.1 clang version 11.0.0 (/builddir/build/BUILD/llvm-project-release-11.x/clang 2a0076812cf106fcc34376d9d967dc5f2847693a), LLD 11.0.0)';
+ # $result='Linux version 5.8.0-18-generic (buildd@lgw01-amd64-057) (gcc (Ubuntu 10.2.0-5ubuntu2) 10.2.0, GNU ld (GNU Binutils for Ubuntu) 2.35) #19-Ubuntu SMP Wed Aug 26 15:26:32 UTC 2020';
+ # $result='Linux version 5.8.9-fw1 (fst@x86_64.frugalware.org) (gcc (Frugalware Linux) 9.2.1 20200215, GNU ld (GNU Binutils) 2.35) #1 SMP PREEMPT Tue Sep 15 16:38:57 CEST 2020';
+ # $result='Linux version 5.8.0-2-amd64 (debian-kernel@lists.debian.org) (gcc-10 (Debian 10.2.0-9) 10.2.0, GNU ld (GNU Binutils for Debian) 2.35) #1 SMP Debian 5.8.10-1 (2020-09-19)';
+ # $result='Linux version 5.9.0-5-amd64 (debian-kernel@lists.debian.org) (gcc-10 (Debian 10.2.1-1) 10.2.1 20201207, GNU ld (GNU Binutils for Debian) 2.35.1) #1 SMP Debian 5.9.15-1 (2020-12-17)';
+ # $result='Linux version 2.6.1 (GNU 0.9 GNU-Mach 1.8+git20201007-486/Hurd-0.9 i686-AT386)';
+ # $result='NetBSD version 9.1 (netbsd@localhost) (gcc version 7.5.0) NetBSD 9.1 (GENERIC) #0: Sun Oct 18 19:24:30 UTC 2020';
+ #$result='Linux version 6.0.8-0-generic (chimera@chimera) (clang version 15.0.4, LLD 15.0.4) #1 SMP PREEMPT_DYNAMIC Fri Nov 11 13:45:29 UTC 2022';
+ # 2023 ubuntu, sigh..
+ # $result='Linux version 6.5.8-1-liquorix-amd64 (steven@liquorix.net) (gcc (Debian 13.2.0-4) 13.2.0, GNU ld (GNU Binutils for Debian) 2.41) #1 ZEN SMP PREEMPT liquorix 6.5-9.1~trixie (2023-10-19)';
+ # $result='Linux version 6.5.0-9-generic (buildd@bos03-amd64-043) (x86_64-linux-gnu-gcc-13 (Ubuntu 13.2.0-4ubuntu3) 13.2.0, GNU ld (GNU Binutils for Ubuntu) 2.41) #9-Ubuntu SMP PREEMPT_DYNAMIC Sat Oct 7 01:35:40 UTC 2023';
+ # $result='Linux version 6.5.13-un-def-alt1 (builder@localhost.localdomain) (gcc-13 (GCC) 13.2.1 20230817 (ALT Sisyphus 13.2.1-alt2), GNU ld (GNU Binutils) 2.41.0.20230826) #1 SMP PREEMPT_DYNAMIC Wed Nov 29 15:54:38 UTC 2023';
+ }
+ # Note: zigcc is only theoretical, but someone is going to try it!
+ # cleanest, old style: 'clang version 9.0.0 (' | 'gcc version 7.5.0'
+ if ($result =~ /(gcc|clang|zigcc).*?version\s([^,\s\)]+)/){
+ @$compiler = ($1,$2);
+ }
+ # new styles: compiler + stuff + x.y.z. Ignores modifiers to number: -4, -ubuntu
+ elsif ($result =~ /(gcc|clang|zigcc).*?\s(\d+(\.\d+){2,4})[)\s,_-]/){
+ @$compiler = ($1,$2);
+ }
+ # failed, let's at least try for compiler type
+ elsif ($result =~ /(gcc|clang|zigcc)/){
+ @$compiler = ($1,'N/A');
+ }
+ }
+ main::log_data('dump','@$compiler',$compiler) if $b_log;
+ eval $end if $b_log;
+}
+}
+
+sub get_kernel_data {
+ eval $start if $b_log;
+ my ($ksplice) = ('');
+ my $kernel = [];
+ # Linux; yawn; 4.9.0-3.1-liquorix-686-pae; #1 ZEN SMP PREEMPT liquorix 4.9-4 (2017-01-14); i686
+ # FreeBSD; siwi.pair.com; 8.2-STABLE; FreeBSD 8.2-STABLE #0: Tue May 31 14:36:14 EDT 2016 erik5@iddhi.pair.com:/usr/obj/usr/src/sys/82PAIRx-AMD64; amd64
+ if (@uname){
+ $kernel->[0] = $uname[2];
+ if ((my $program = check_program('uptrack-uname')) && $kernel->[0]){
+ $ksplice = qx($program -rm);
+ $ksplice = trimmer($ksplice);
+ $kernel->[0] = $ksplice . ' (ksplice)' if $ksplice;
+ }
+ $kernel->[1] = $uname[-1];
+ }
+ # we want these to have values to save validation checks for output
+ $kernel->[0] ||= 'N/A';
+ $kernel->[1] ||= 'N/A';
+ log_data('data',"kernel: " . join('; ', $kernel) . " ksplice: $ksplice") if $b_log;
+ log_data('dump','perl @uname', \@uname) if $b_log;
+ eval $end if $b_log;
+ return $kernel;
+}
+
+## KernelParameters
+{
+package KernelParameters;
+
+sub get {
eval $start if $b_log;
my ($parameters);
- if (my $file = system_files('cmdline') ) {
- $parameters = get_kernel_parameters_linux($file);
+ if (my $file = $system_files{'proc-cmdline'}){
+ $parameters = parameters_linux($file);
}
- elsif ($bsd_type) {
- $parameters = get_kernel_parameters_bsd();
+ elsif ($bsd_type){
+ $parameters = parameters_bsd();
}
eval $end if $b_log;
return $parameters;
}
-sub get_kernel_parameters_linux {
+
+sub parameters_linux {
eval $start if $b_log;
my ($file) = @_;
- my $line = (reader($file))[0];
+ # unrooted android may have file only root readable
+ my $line = main::reader($file,'',0) if -r $file;
+ $line =~ s/\s\s+/ /g;
eval $end if $b_log;
return $line;
}
-sub get_kernel_parameters_bsd {
+
+sub parameters_bsd {
eval $start if $b_log;
my ($parameters);
eval $end if $b_log;
return $parameters;
}
+}
+
+## LsblkData: public methods: set(), get()
+{
+package LsblkData;
-sub get_memory_data_full {
+# args: 0: partition name
+sub get {
eval $start if $b_log;
- my ($source) = @_;
- my $num = 0;
- my ($memory,@rows);
- my ($gpu_ram,$percent,$total,$used) = (0,'','','');
- if ($show{'ram'} || (!$show{'info'} && $show{'process'} )){
- $memory = get_memory_data('splits');
- if ($memory){
- my @temp = split /:/, $memory;
- my @temp2 = get_size($temp[0]);
- $gpu_ram = $temp[3] if $temp[3];
- $total = ($temp2[1]) ? $temp2[0] . ' ' . $temp2[1] : $temp2[0];
- @temp2 = get_size($temp[1]);
- $used = ($temp2[1]) ? $temp2[0] . ' ' . $temp2[1] : $temp2[0];
- $used .= " ($temp[2]%)" if $temp[2];
- if ($gpu_ram){
- @temp2 = get_size($gpu_ram);
- $gpu_ram = $temp2[0] . ' ' . $temp2[1] if $temp2[1];
+ my $item = $_[0];
+ return if !@lsblk;
+ my $result;
+ foreach my $device (@lsblk){
+ if ($device->{'name'} eq $item){
+ $result = $device;
+ last;
+ }
+ }
+ eval $start if $b_log;
+ return ($result) ? $result : {};
+}
+
+sub set {
+ eval $start if $b_log;
+ $loaded{'lsblk'} = 1;
+ if ($alerts{'lsblk'} && $alerts{'lsblk'}->{'path'}){
+ # check to see if lsblk removes : - separators from accepted input syntax
+ my $cmd = $alerts{'lsblk'}->{'path'} . ' -bP --output NAME,TYPE,RM,FSTYPE,';
+ $cmd .= 'SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,';
+ $cmd .= 'MAJ:MIN,PKNAME 2>/dev/null';
+ print "cmd: $cmd\n" if $dbg[32];
+ my @working = main::grabber($cmd);
+ print Data::Dumper::Dumper \@working if $dbg[32];
+ # note: lsblk 2.37 changeed - and : to _ in the output.
+ my $pattern = 'NAME="([^"]*)"\s+TYPE="([^"]*)"\s+RM="([^"]*)"\s+';
+ $pattern .= 'FSTYPE="([^"]*)"\s+SIZE="([^"]*)"\s+LABEL="([^"]*)"\s+';
+ $pattern .= 'UUID="([^"]*)"\s+SERIAL="([^"]*)"\s+MOUNTPOINT="([^"]*)"\s+';
+ $pattern .= 'PHY[_-]SEC="([^"]*)"\s+LOG[_-]SEC="([^"]*)"\s+';
+ $pattern .= 'PARTFLAGS="([^"]*)"\s+MAJ[:_-]MIN="([^"]*)"\s+PKNAME="([^"]*)"';
+ foreach (@working){
+ if (/$pattern/){
+ my $size = ($5) ? $5/1024: 0;
+ # some versions of lsblk do not return serial, fs, uuid, or label
+ push(@lsblk, {
+ 'name' => $1,
+ 'type' => $2,
+ 'rm' => $3,
+ 'fs' => $4,
+ 'size' => $size,
+ 'label' => $6,
+ 'uuid' => $7,
+ 'serial' => $8,
+ 'mount' => $9,
+ 'block-physical' => $10,
+ 'block-logical' => $11,
+ 'partition-flags' => $12,
+ 'maj-min' => $13,
+ 'parent' => $14,
+ });
+ # must be below assignments!! otherwise the result of the match replaces values
+ # note: for bcache and luks, the device that has that fs is the parent!!
+ if ($show{'logical'}){
+ $use{'logical-lvm'} = 1 if !$use{'logical-lvm'} && $2 && $2 eq 'lvm';
+ if (!$use{'logical-general'} && (($4 &&
+ ($4 eq 'crypto_LUKS' || $4 eq 'bcache')) ||
+ ($2 && ($2 eq 'dm' && $1 =~ /veracrypt/i) || $2 eq 'crypto' ||
+ $2 eq 'mpath' || $2 eq 'multipath'))){
+ $use{'logical-general'} = 1;
+ }
+ }
}
}
- my $key = ($source eq 'process') ? 'System RAM': 'RAM';
- $rows[0]{main::key($num++,1,1,$key)} = '';
- $rows[0]{main::key($num++,0,2,'total')} = $total;
- $rows[0]{main::key($num++,0,2,'used')} = $used;
- $rows[0]{main::key($num++,0,2,'gpu')} = $gpu_ram if $gpu_ram;
- $b_mem = 1;
}
+ print Data::Dumper::Dumper \@lsblk if $dbg[32];
+ main::log_data('dump','@lsblk',\@lsblk) if $b_log;
+ eval $end if $b_log;
+}
+}
+
+sub set_mapper {
+ eval $start if $b_log;
+ $loaded{'mapper'} = 1;
+ return if ! -d '/dev/mapper';
+ foreach ((globber('/dev/mapper/*'))){
+ my ($key,$value) = ($_,Cwd::abs_path("$_"));
+ next if !$value;
+ $key =~ s|^/.*/||;
+ $value =~ s|^/.*/||;
+ $mapper{$key} = $value;
+ }
+ %dmmapper = reverse %mapper if %mapper;
eval $end if $b_log;
- return @rows;
}
-sub get_memory_data {
+## MemoryData
+{
+package MemoryData;
+
+sub get {
eval $start if $b_log;
my ($type) = @_;
+ $loaded{'memory'} = 1;
my ($memory);
- if (my $file = system_files('meminfo') ) {
- $memory = get_memory_data_linux($type,$file);
+ # netbsd 8.0 uses meminfo, but it uses it in a weird way
+ if (!$force{'vmstat'} && (!$bsd_type || ($force{'meminfo'} && $bsd_type)) &&
+ (my $file = $system_files{'proc-meminfo'})){
+ $memory = linux_data($type,$file);
}
else {
- $memory = get_memory_data_bsd($type);
+ $memory = bsd_data($type);
}
eval $end if $b_log;
return $memory;
}
-sub get_memory_data_linux {
+# $memory:
+# 0: available (not reserved or iGPU)
+# 1: used (of available)
+# 2: used %
+# 3: gpu (raspberry pi only)
+# Linux only, but could be extended if anyone wants to do the work for BSDs
+# 4: array ref: sys_memory [total, blocks, block-size, count factor]
+# 5: array ref: proc/iomem [total, reserved, gpu]
+#
+# args: 0: source, the caller; 1: $row hash ref; 2: $num ref; 3: indent
+sub row {
+ eval $start if $b_log;
+ my ($source,$row,$num,$indent) = @_;
+ $loaded{'memory'} = 1;
+ my ($available,$gpu_ram,$note,$total,$used);
+ my $memory = get('full');
+ if ($memory){
+ # print Data::Dumper::Dumper $memory;
+ if ($memory->[3]){
+ $gpu_ram = $memory->[3];
+ }
+ elsif ($memory->[5] && $memory->[5][2]){
+ $gpu_ram = $memory->[5][2];
+ }
+ # Great, we have the real RAM data.
+ if ($show{'ram'} && ($total = RamItem::ram_total())){
+ $total = main::get_size($total,'string');
+ }
+ elsif ($memory->[4] || $memory->[5]){
+ process_total($memory,\$total,\$note);
+ }
+ if ($gpu_ram){
+ $gpu_ram = main::get_size($gpu_ram,'string');
+ }
+ $available = main::get_size($memory->[0],'string') if $memory->[0];
+ $used = main::get_size($memory->[1],'string') if $memory->[1];
+ $used .= " ($memory->[2]%)" if $memory->[2];
+ }
+ my $field = ($source eq 'info') ? 'Memory' : 'System RAM';
+ $available ||= 'N/A';
+ $total ||= 'N/A';
+ $used ||= 'N/A';
+ $row->{main::key($$num++,1,$indent,$field)} = '';
+ $row->{main::key($$num++,1,$indent+1,'total')} = $total;
+ $row->{main::key($$num++,0,$indent+2,'note')} = $note if $note;
+ $row->{main::key($$num++,0,$indent+1,'available')} = $available;
+ $row->{main::key($$num++,0,$indent+1,'used')} = $used;
+ $row->{main::key($$num++,0,$indent+1,'igpu')} = $gpu_ram if $gpu_ram;
+ eval $end if $b_log;
+}
+
+## LINUX DATA ##
+sub linux_data {
eval $start if $b_log;
my ($type,$file) = @_;
- my ($gpu,$memory,$not_used,$total) = (0,'',0,0);
- my @data = reader($file);
+ my ($available,$buffers,$cached,$free,$gpu,$not_used,$total_avail) = (0,0,0,0,0,0,0);
+ my ($iomem,$memory,$sys_memory,$total);
+ my @data = main::reader($file);
+ # Note: units kB should mean 1000x8 bits, but actually means KiB! Confusing
foreach (@data){
+ # Not actual total, it's total physical minus reserved/kernel/system.
if ($_ =~ /^MemTotal:/){
- $total = get_piece($_,2);
+ $total_avail = main::get_piece($_,2);
+ }
+ elsif ($_ =~ /^MemFree:/){
+ $free = main::get_piece($_,2);
+ }
+ elsif ($_ =~ /^Buffers:/){
+ $buffers = main::get_piece($_,2);
}
- elsif ($_ =~ /^(MemFree|Buffers|Cached):/){
- $not_used += get_piece($_,2);
+ elsif ($_ =~ /^Cached:/){
+ $cached = main::get_piece($_,2);
+ }
+ elsif ($_ =~ /^MemAvailable:/){
+ $available = main::get_piece($_,2);
}
}
- $gpu = get_gpu_ram_arm() if $b_arm;
- #$gpu = translate_size('128M');
- $total += $gpu;
- my $used = $total - ($not_used);
- my $percent = ($used && $total) ? sprintf("%.1f", ($used/$total)*100) : '';
- if ($type eq 'string'){
- $percent = " ($percent%)" if $percent;
- $memory = sprintf("%.1f/%.1f MiB", $used/1024, $total/1024) . $percent;
+ $gpu = gpu_ram_arm() if $risc{'arm'};
+ if ($type ne 'short' && ($fake{'sys-mem'} || -d '/sys/devices/system/memory')){
+ sys_memory(\$sys_memory);
+ }
+ if ($type ne 'short' && ($fake{'iomem'} || ($b_root && -r '/proc/iomem'))){
+ proc_iomem(\$iomem);
+ }
+ # $gpu = main::translate_size('128M');
+ # $total_avail += $gpu; # not using because this ram is not available to system
+ if ($available){
+ $not_used = $available;
+ }
+ # Seen fringe cases, where total - free+buff+cach < 0
+ # The idea is that the OS must be using 10MiB of ram or more
+ elsif (($total_avail - ($free + $buffers + $cached)) > 10000){
+ $not_used = ($free + $buffers + $cached);
+ }
+ # Netbsd goes < 0, but it's wrong, so dump the cache
+ elsif (($total_avail - ($free + $buffers)) > 10000){
+ $not_used = ($free + $buffers);
}
else {
- $memory = "$total:$used:$percent:$gpu";
+ $not_used = $free;
}
- log_data('data',"memory: $memory") if $b_log;
+ my $used = ($total_avail - $not_used);
+ my $percent = ($used && $total_avail) ? sprintf("%.1f", ($used/$total_avail)*100) : '';
+ if ($type eq 'short'){
+ $memory = short_data($total_avail,$used,$percent);
+ }
+ else {
+ # raw return in KiB
+ $memory = [$total_avail,$used,$percent,$gpu,$sys_memory,$iomem];
+ }
+ # print "$total_avail, $used, $percent, $gpu\n";
+ # print Data::Dumper::Dumper $memory;
+ main::log_data('data',"memory ref: $memory") if $b_log;
eval $end if $b_log;
return $memory;
}
+# All values 0 if not root, but it is readable.
+# See inxi-perl/dev/code-snippets.pl for original attempt, with pci/reserved
+# args: 0: $iomem by ref
+sub proc_iomem {
+ eval $start if $b_log;
+ my $file = '/proc/iomem';
+ my ($buffer,$gpu,$pci,$reserved,$rom,$system) = (0,0,0,0,0,0);
+ my $b_reserved;
+ no warnings 'portable';
+ if ($fake{'iomem'}){
+ # $file = "$fake_data_dir/memory/proc-iomem-128gb-1.txt";
+ # $file = "$fake_data_dira/memory/proc-iomem-544mb-igpu.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-64mb-vram-stolen.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-rh-1-matrox.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-2-vram.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-512mb-1.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-518mb-reserved-1.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-512mb-2-onboardgpu-active.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-512mb-system-1.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-257.18gb-system-1.txt";
+ # $file = "$fake_data_dir/memory/proc-iomem-192gb-system-1.txt";
+ $file = "$fake_data_dir/memory/proc-iomem-1012mb-igpu.txt";
+ }
+ foreach ((main::reader($file),'EOF')){
+ if ($dbg[54]){
+ if (/^\s*([0-9a-f]+)-([^\s]+) : /){
+ print $_,"\n",' size: ';
+ print main::get_size(((hex($2) - hex($1) + 1)/1024),'string'), "\n";
+ }
+ }
+ # Get everythign solidly System RAM
+ if (/^([0-9a-f]+)-([^\s]+) : (System RAM)$/i){
+ $system += hex($2) - hex($1) + 1;
+ }
+ elsif (/^([0-9a-f]+)-([^\s]+) : (Ram buffer)$/i){
+ $buffer += hex($2) - hex($1) + 1;
+ }
+ # Sometimes primary Reserved block contains PCI and other non RAM devices,
+ # but also can contain non RAM addresses, maybe NVMe?
+ elsif (/^([0-9a-f]+)-([^\s]+) : (Reserved)$/i){
+ $reserved += hex($2) - hex($1) + 1;
+ }
+ # Legacy System ROM not in a Reserved block, primary item.
+ elsif (/^\s*([0-9a-f]+)-([^\s]+) : (System ROM)$/i){
+ $rom += hex($2) - hex($1) + 1;
+ }
+ elsif (/^([0-9a-f]+)-([^\s]+) : (ACPI Tables)$/i){
+ $rom += hex($2) - hex($1) + 1;
+ }
+ # Incomplete because sometimes Reserved blocks contain PCI etc devices
+ elsif (/^([0-9a-f]+)-([^\s]+) : (PCI .*)$/){
+ $pci += hex($2) - hex($1) + 1;
+ }
+ # Graphics stolen memory/Video RAM area, but legacy had inside PCI blocks,
+ # not reserved, or as primary. That behavior seems to have changed.
+ if (/^\s*([0-9a-f]+)-([^\s]+) : (?:(Video RAM|Graphics).*)$/i){
+ $gpu += hex($2) - hex($1) + 1;
+ }
+ }
+ if ($dbg[54] || $b_log){
+ my $d = ['iomem:','System: ' . main::get_size(($system/1024),'string'),
+ 'Reserved: ' . main::get_size(($reserved/1024),'string'),
+ 'Buffer: ' . main::get_size(($buffer/1024),'string'),
+ 'iGPU: ' . main::get_size(($gpu/1024),'string'),
+ 'ROM: ' . main::get_size(($rom/1024),'string'),
+ 'System+iGPU+buffer+rom: ' . main::get_size((($system+$gpu+$buffer+$rom)/1024),'string'),
+ ' Raw GiB: ' . ($system+$gpu+$buffer+$rom)/1024**3,
+ 'System+reserved: ' . main::get_size((($system+$reserved)/1024),'string'),
+ ' Raw GiB: ' . ($system+$reserved)/1024**3,
+ 'System+reserved+buffer: ' . main::get_size((($system+$reserved+$buffer)/1024),'string'),
+ ' Raw GiB: ' . ($system+$reserved+$buffer)/1024**3,
+ 'Reserved-iGPU: ' . main::get_size((($reserved-$gpu)/1024),'string'),
+ 'PCI Bus: ' . main::get_size(($pci/1024),'string')];
+ main::log_data('dump','$d iomem',$d) if $b_log;
+ print "\n",join("\n",@$d),"\n\n" if $dbg[54];
+ }
+ if ($gpu || $system || $reserved){
+ # This combination seems to provide the bwest overall result
+ $system += $gpu + $rom + $buffer;
+ ${$_[0]} = [$system/1024,$reserved/1024,$gpu/1024];
+ }
+ main::log_data('dump','$iomem',$_[0]) if $b_log;
+ print 'proc/iomem: ', Data::Dumper::Dumper $_[0] if $dbg[53];
+ eval $end if $b_log;
+}
+
+# Note: seen case where actual 128 GiB, result here 130, 65x2GiB. Also cases
+# where blocks under expected total, this may be related to active onboard gpu.
+sub sys_memory {
+ eval $start if $b_log;
+ return if !$fake{'sys-mem'} && ! -r '/sys/devices/system/memory/block_size_bytes';
+ my ($count,$factor,$size,$total) = (0,1,0,0);
+ # state = off,online; online = 1/0
+ foreach my $online (main::globber('/sys/devices/system/memory/memory*/online')){
+ $count++ if main::reader($online,'',0); # content 1/0, so will read as t/f
+ }
+ if ($count){
+ $size = main::reader('/sys/devices/system/memory/block_size_bytes','',0);
+ if ($size){
+ $size = hex($size)/1024; # back to integer KiB
+ $total = $count * $size;
+ }
+ }
+ if ($fake{'sys-mem'}){
+ # ($total,$count,$size) = (,,); #
+ # ($total,$count,$size) = (4194304,32,131072); # 4gb
+ # ($total,$count,$size) = (7864320,60,131072); # 7.5 gb, -4 blocks
+ # ($total,$count,$size) = (136314880,65,2097152); # 130 gb, +1 block
+ # ($total,$count,$size) = (8126464,62,131072); # 7.75 gb, -2 blocks, vram?
+ # ($total,$count,$size) = (33554432,256,131072); # 32 gb
+ # ($total,$count,$size) = (8388608,64,131072); # 8gb
+ # ($total,$count,$size) = (270532608,129,2097152); # 258 gb, +1 block
+ # ($total,$count,$size) = (17563648,134,131072); # 16.75 gb, +6 block
+ # ($total,$count,$size) = (3801088,29,131072); # 3.62 gb, -3 blocks
+ # ($total,$count,$size) = (67108864,32,2097152); # 64 gb
+ # ($total,$count,$size) = (524288,4,131072); # 512 mb, maybe -4 blocks, vm
+ }
+ # Max stick size assumed: 64 blocks: 8 GiB/128 GiB min module: 2 GiB/32 GiB
+ # 128 blocks: 16 GiB/256 GiB min module: 4 GiB/64 GiB but no way to know
+ # Note: 128 MiB blocks; > 32 GiB, 2 GiB blocks, I think.
+ # 64: 8 GiB/256 GiB, min module: 2 GiB/32 GiB
+ if ($count > 32){
+ $factor = 16;}
+ # 32: 4 GiB/64 GiB, min module: 1 GiB/16 GiB
+ elsif ($count > 16){
+ $factor = 8;}
+ # 16: 2 GiB, min module: 512 MiB
+ elsif ($count > 8){
+ $factor = 4;}
+ # 8: 1 GiB, min module: 256 MiB
+ elsif ($count > 4){
+ $factor = 2;}
+ # 4: 512 MiB, min module: 128 MiB
+ else {
+ $factor = 1;}
+ if ($total || $count || $size){
+ ${$_[0]} = [$total,$count,$size,$factor];
+ }
+ if ($dbg[54] || $b_log){
+ my $d = ['/sys:','Total: ' . main::get_size($total,'string'),
+ 'Blocks: ' . $count,
+ 'Block-size: ' . main::get_size($size,'string'),
+ "Count-factor: $count % $factor: " . $count % $factor];
+ main::log_data('dump','$d sys-mem',$d) if $b_log;
+ print "\n",join("\n",@$d),"\n\n" if $dbg[54];
+ }
+ main::log_data('dump','$sys_memory',$_[0]) if $b_log;
+ print 'sys memory: ', Data::Dumper::Dumper $_[0] if $dbg[53];
+ eval $end if $b_log;
+}
+
+# These are hacks since the phy ram real data is not available in clear form
+# args: 0: memory array ref; 1: $total ref; 2: $note ref.
+sub process_total {
+ eval $start if $b_log;
+ my ($memory,$total,$note) = @_;
+ my ($d,$b_vm,@info);
+ my $src = '';
+ $b_vm = MachineItem::is_vm() if $show{'machine'};
+ # Seen case where actual 128 GiB, result here 130, 65x2GiB. Maybe nvme?
+ # This can be over or under phys ram
+ if ($memory->[4] && $memory->[4][0]){
+ @info = main::get_size($memory->[4][0]);
+ # We want to show note for probably wrong results
+ if ((!$fake{'sys-mem'} && $memory->[0] && $memory->[4][0] < $memory->[0]) ||
+ (!$b_vm && $memory->[4][1] % $memory->[4][3] != 0)){
+ $$note = main::message('note-check');
+ }
+ $src = 'sys';
+ }
+ # Note: this is a touch under the real ram amount, varies, igpu/vram can eat it.
+ # This working total will only be under phys ram.
+ if ($memory->[5] && $memory->[5][0] &&
+ (!$memory->[4] || !$memory->[4][0] || ($memory->[4][0] != $memory->[5][0]))){
+ @info = main::get_size($memory->[5][0]);
+ $src = 'iomem';
+ }
+ if (@info){
+ $$note = '';
+ if (!$b_vm){
+ # $info[0] = 384;
+ # $info[1] = 'MiB';
+ my ($factor,$factor2) = (1,0.5);
+ # For M, assume smallest is 128, anything older won't even work probably.
+ # For T RAM, the system ram is going to be 99.9% of physical because the
+ # reserved stuff is going to be tiny, I believe. We will see.
+ # T array stick sizes: 128/256/512/1024 G
+ # Note: samsung ships 1T modules (2024?), 512G (2023).
+ if ($info[0] > 512){
+ $factor = ($info[1] eq 'MiB') ? 256 : 64;
+ }
+ elsif ($info[0] > 256){
+ $factor = ($info[1] eq 'MiB') ? 128 : 32;
+ }
+ elsif ($info[0] > 128){
+ $factor = ($info[1] eq 'MiB') ? 64 : 16;
+ }
+ elsif ($info[0] > 64){
+ $factor = 8;
+ }
+ elsif ($info[0] > 16){
+ $factor = 4;
+ }
+ elsif ($info[0] > 8){
+ $factor = 4;
+ }
+ elsif ($info[0] > 4){
+ $factor = 2;
+ }
+ elsif ($info[0] > 3){
+ $factor = 1;
+ }
+ elsif ($info[0] > 2){
+ $factor = ($info[1] eq 'TiB') ? 0.25 : 0.5;
+ }
+ # Note: get_size returns 1 as 1024, so we never actually see 1
+ elsif ($info[0] > 1){
+ $factor = ($info[1] eq 'TiB') ? 0.125 : 0.25;
+ }
+ my $result = $info[0] / $factor;
+ my $mod = ((100 * $result) % 100);
+ if ($b_log || $dbg[54]){
+ push(@$d,"src: $src result: $info[0] / $factor: $result math-modulus: $mod");
+ }
+ if ($mod > 0){
+ my ($check,$working) = (0,0);
+ # Sometimes Perl generates a tiny value over 0.1: 0.100000000000023
+ # but also we want to be a little loose here. Note that when high
+ # numbers, like 1012 M, we want the math much looser.
+ # Within ~ 5%
+ if ($info[1] eq 'MiB'){
+ if ($info[0] > 768){
+ $check = 64;
+ }
+ elsif ($info[0] > 512){
+ $check = 32;
+ }
+ elsif ($info[0] > 256){
+ $check = 16;
+ }
+ else {
+ $check = 4;
+ }
+ }
+ # Within ~ 1%
+ elsif ($info[1] eq 'GiB'){
+ if ($info[0] > 512){
+ $check = 4;
+ }
+ elsif ($info[0] > 256){
+ $check = 2;
+ }
+ elsif ($info[0] > 3){
+ $check = 0.25;
+ }
+ else {
+ $check = 0.1;
+ }
+ }
+ # Will need to verify this T assumption on real data one day, but keep
+ # in mind how much reserved ram this would be!
+ elsif ($info[1] eq 'TiB'){
+ if ($info[0] > 16){
+ $check = 0.25;
+ }
+ elsif ($info[0] > 8){
+ $check = 0.15;
+ }
+ elsif ($info[0] > 2){
+ $check = 0.1;
+ }
+ else {
+ $check = 0.05;
+ }
+ }
+ # iomem is always under, sys can be over or under. we want fractional
+ # corresponding value over or under result.
+ # sys has block sizes: 128M, 2G, 32G, so sizes will always be divisible
+ if ($src eq 'sys'){
+ if ($info[0] > 64){
+ $factor2 = 0.25;
+ }
+ }
+ if ($src eq 'sys' && int($result + $factor2) == int($result)){
+ $working = int($result) * $factor;
+ }
+ else {
+ $working = POSIX::ceil($result) * $factor;
+ }
+ if ($b_log || $dbg[54]){
+ push(@$d, "factor2: $factor2 floor_res+fact2: " . int($result + $factor2),
+ "ceil_result * factor: " . (POSIX::ceil($result) * $factor),
+ "floor_result * factor: " . (int($result) * $factor));
+ }
+ if (abs(($working - $info[0])) < $check){
+ if ($src eq 'sys' && $info[0] != $working){
+ $$note = main::message('note-est');
+ }
+ if ($b_log || $dbg[54]){
+ push(@$d,"check less: ($working - $info[0]) < $check: ",
+ "result: inside ceil < $check, clean");
+ }
+ }
+ else {
+ if ($b_log || $dbg[54]){
+ push(@$d,"check not less: ($working - $info[0]) < $check: ",
+ "set: $info[0] = $working");
+ }
+ $$note = main::message('note-est');
+ }
+ $info[0] = $working;
+ }
+ else {
+ if ($b_log || $dbg[54]){
+ push(@$d,"result: clean match, no change: $info[0] $info[1]");
+ }
+ }
+ }
+ else {
+ my $dec = ($info[1] eq 'MiB') ? 1: 2;
+ $info[0] = sprintf("%0.${dec}f",$info[0]) + 0;
+ if ($b_log || $dbg[54]){
+ push(@$d,"result: vm, using size: $info[0] $info[1]");
+ }
+ }
+ $$total = $info[0] . ' ' . $info[1];
+ }
+ if ($b_log || $dbg[54]){
+ main::log_data('dump','debugger',$d) if $b_log;
+ print Data::Dumper::Dumper $d if $dbg[54];
+ }
+ eval $end if $b_log;
+}
+
+## BSD DATA ##
## openbsd/linux
# procs memory page disks traps cpu
# r b w avm fre flt re pi po fr sr wd0 wd1 int sys cs us sy id
# 0 0 0 55256 1484092 171 0 0 0 0 0 2 0 12 460 39 3 1 96
-## openbsd 6.3? added in M, sigh...
+## openbsd 6.3? added in M/G/T etc, sigh...
# 2 57 55M 590M 789 0 0 0...
## freebsd:
# procs memory page disks faults cpu
@@ -19291,121 +33731,159 @@ sub get_memory_data_linux {
# 0 0 0 21880M 6444M 924 32 11 0 822 827 0 0 853 832 463 8 3 88
# with -H
# 2 0 0 14925812 936448 36 13 10 0 84 35 0 0 84 30 42 11 3 86
-## dragonfly
+## dragonfly: V1, supported -H
# procs memory page disks faults cpu
# r b w avm fre flt re pi po fr sr ad0 ad1 in sy cs us sy id
# 0 0 0 0 84060 30273993 2845 12742 1164 407498171 320960902 0 0 ....
-sub get_memory_data_bsd {
+## dragonfly: V2, no avm, no -H support
+sub bsd_data {
eval $start if $b_log;
my ($type) = @_;
- my $memory = '';
- my ($avm,$av_pages,$cnt,$fre,$free_mem,$real_mem,$total) = (3,0,0,4,0,0,0);
- my (@data,$message);
- my $arg = ($bsd_type ne 'openbsd') ? '-H' : '';
- if (my $program = check_program('vmstat')){
- # see above, it's the last line. -H makes it hopefully all in kB so no need
- # for K/M/G tests
- my @vmstat = grabber("vmstat $arg 2>/dev/null",'\n','strip');
- my @header = split /\s+/, $vmstat[1];
- foreach ( @header){
+ my ($avm,$av_pages,$cnt,$fre,$free_mem,$mult,$real_mem,$total) = (0,0,0,0,0,0,0,0);
+ my (@data,$memory,$message);
+ # my $arg = ($bsd_type ne 'openbsd' && $bsd_type ne 'dragonfly') ? '-H' : '';
+ if (my $program = main::check_program('vmstat')){
+ # See above, it's the last line. -H makes it hopefully all in kB so no need
+ # for K/M/G tests, note that -H not consistently supported, so don't use.
+ my @vmstat = main::grabber("vmstat 2>/dev/null",'\n','strip');
+ main::log_data('dump','@vmstat',\@vmstat) if $b_log;
+ my @header = split(/\s+/, $vmstat[1]);
+ foreach (@header){
if ($_ eq 'avm'){$avm = $cnt}
elsif ($_ eq 'fre'){$fre = $cnt}
elsif ($_ eq 'flt'){last;}
$cnt++;
}
my $row = $vmstat[-1];
- if ( $row ){
- @data = split /\s+/, $row;
- # 6.3 introduced an M character, sigh.
- if ($data[$avm] && $data[$avm] =~ /^([0-9]+)M$/){
- $data[$avm] = $1 * 1024;
+ if ($row){
+ @data = split(/\s+/, $row);
+ # Openbsd 6.3, dragonfly 5.x introduced an M / G character, sigh.
+ if ($avm > 0 && $data[$avm] && $data[$avm] =~ /^([0-9\.]+[KGMT])(iB|B)?$/){
+ $data[$avm] = main::translate_size($1);
}
- if ($data[$fre] && $data[$fre] =~ /^([0-9]+)M$/){
- $data[$fre] = $1 * 1024;
+ if ($fre > 0 && $data[$fre] && $data[$fre] =~ /^([0-9\.]+[KGMT])(iB|B)?$/){
+ $data[$fre] = main::translate_size($1);
}
- # dragonfly can have 0 avg, but they may fix that so make test dynamic
- if ($data[$avm] != 0){
- $av_pages = ($bsd_type ne 'openbsd') ? sprintf ('%.1f',$data[$avm]/1024) : $data[$avm];
+ # Dragonfly can have 0 avg, or no avm, sigh, but they may fix that so make test dynamic
+ if ($avm > 0 && $data[$avm] != 0){
+ $av_pages = ($bsd_type !~ /^(net|open)bsd$/) ? sprintf('%.1f',$data[$avm]/1024) : $data[$avm];
}
- elsif ($data[$fre] != 0){
- $free_mem = sprintf ('%.1f',$data[$fre]);
+ if ($fre > 0 && $data[$fre] != 0){
+ $free_mem = sprintf('%.1f',$data[$fre]);
}
}
}
- ## code to get total goes here:
- my $ref = $alerts{'sysctl'};
- if ($$ref{'action'} eq 'use'){
- # for dragonfly, we will use free mem, not used because free is 0
+ # Code to get total goes here:
+ if ($alerts{'sysctl'}->{'action'} eq 'use'){
+ # For dragonfly, we will use free mem, not used because free is 0
my @working;
- foreach (@sysctl){
- # freebsd seems to use bytes here
- if (!$real_mem && /^hw.physmem:/){
- @working = split /:\s*/,$_;
- #if ($working[1]){
- $working[1] =~ s/^[^0-9]+|[^0-9]+$//g;
- $real_mem = sprintf("%.1f", $working[1]/1024);
- #}
- last if $free_mem;
- }
- # But, it uses K here. Openbsd/Dragonfly do not seem to have this item
- # this can be either: Free Memory OR Free Memory Pages
- elsif (/^Free Memory:/){
- @working = split /:\s*/,$_;
- $working[1] =~ s/[^0-9]+//g;
- $free_mem = sprintf("%.1f", $working[1]);
- last if $real_mem;
+ if ($sysctl{'memory'}){
+ foreach (@{$sysctl{'memory'}}){
+ # Freebsd seems to use bytes here
+ if (!$real_mem && /^hw.physmem:/){
+ @working = split(/:\s*/, $_);
+ # if ($working[1]){
+ $working[1] =~ s/^[^0-9]+|[^0-9]+$//g;
+ $real_mem = sprintf("%.1f", $working[1]/1024);
+ # }
+ last if $free_mem;
+ }
+ # But, it uses K here. Openbsd/Dragonfly do not seem to have this item
+ # This can be either: Free Memory OR Free Memory Pages
+ elsif (/^Free Memory:/){
+ @working = split(/:\s*/, $_);
+ $working[1] =~ s/[^0-9]+//g;
+ $free_mem = sprintf("%.1f", $working[1]);
+ last if $real_mem;
+ }
}
}
}
else {
- $message = "sysctl $$ref{'action'}"
+ $message = "sysctl $alerts{'sysctl'}->{'action'}"
}
- # not using, but leave in place for a bit in case we want it
+ # Not using, but leave in place for a bit in case we want it
# my $type = ($free_mem) ? ' free':'' ;
- # hack: temp fix for openbsd/darwin: in case no free mem was detected but we have physmem
+ # Hack: temp fix for openbsd/darwin: in case no free mem was detected but we have physmem
if (($av_pages || $free_mem) && !$real_mem){
my $error = ($message) ? $message: 'total N/A';
my $used = (!$free_mem) ? $av_pages : $real_mem - $free_mem;
- if ($type eq 'string'){
- $used = sprintf("%.1f",$used/1024);
- $memory = "$used/($error) MB";
+ if ($type eq 'short'){
+ $memory = short_data($error,$used);
}
else {
- $memory = "$error:$used:";
+ $memory = [$error,$used,undef];
}
}
- # use openbsd/dragonfly avail mem data if available
- elsif (($av_pages || $free_mem) && $real_mem) {
+ # Use openbsd/dragonfly avail mem data if available
+ elsif (($av_pages || $free_mem) && $real_mem){
my $used = (!$free_mem) ? $av_pages : $real_mem - $free_mem;
my $percent = ($used && $real_mem) ? sprintf("%.1f", ($used/$real_mem)*100) : '';
- if ($type eq 'string'){
- $used = sprintf("%.1f",$used/1024);
- $real_mem = sprintf("%.1f",$real_mem/1024);
- $percent = " ($percent)" if $percent;
- $memory = "$used/$real_mem MB" . $percent;
+ if ($type eq 'short'){
+ $memory = short_data($real_mem,$used,$percent);
}
else {
- $memory = "$real_mem:$used:$percent:0";
+ $memory = [$real_mem,$used,$percent,0];
}
}
eval $end if $b_log;
return $memory;
}
+## TOOLS ##
+# args: 0: avail memory; 1: used memory; 2: percent used
+sub short_data {
+ # some BSDs, no available
+ my @avail = (main::is_numeric($_[0])) ? main::get_size($_[0]) : ($_[0]);
+ my @used = main::get_size($_[1]);
+ my $string = '';
+ if ($avail[1] && $used[1]){
+ if ( $avail[1] eq $used[1]){
+ $string = "$used[0]/$avail[0] $used[1]";
+ }
+ else {
+ $string = "$used[0] $used[1]/$avail[0] $avail[1]";
+ }
+ }
+ elsif ($used[1]){
+ $string = "$used[0]/[$avail[0]] $used[1]";
+ }
+ $string .= " ($_[2]%)" if $_[2];
+ return $string;
+}
+
+# Raspberry pi only
+sub gpu_ram_arm {
+ eval $start if $b_log;
+ my ($gpu_ram) = (0);
+ if (my $program = main::check_program('vcgencmd')){
+ # gpu=128M
+ # "VCHI initialization failed" - you need to add video group to your user
+ my $working = (main::grabber("$program get_mem gpu 2>/dev/null"))[0];
+ $working = (split(/\s*=\s*/, $working))[1] if $working;
+ $gpu_ram = main::translate_size($working) if $working;
+ }
+ main::log_data('data',"gpu ram: $gpu_ram") if $b_log;
+ eval $end if $b_log;
+ return $gpu_ram;
+}
+}
+
+# args: 0: module to get version of
sub get_module_version {
eval $start if $b_log;
my ($module) = @_;
- return if ! $module;
+ return if !$module;
my ($version);
my $path = "/sys/module/$module/version";
- if (-f $path){
- $version = (reader($path))[0];
+ if (-r $path){
+ $version = reader($path,'',0);
}
elsif (-f "/sys/module/$module/uevent"){
$version = 'kernel';
}
- #print "version:$version\n";
- if (!$version) {
+ # print "version:$version\n";
+ if (!$version){
if (my $path = check_program('modinfo')){
my @data = grabber("$path $module 2>/dev/null");
$version = awk(\@data,'^version',2,':\s+') if @data;
@@ -19415,55 +33893,82 @@ sub get_module_version {
eval $end if $b_log;
return $version;
}
+
+## PackageData
# Note: this outputs the key/value pairs ready to go and is
# called from either -r or -Ix, -r precedes.
-## Get PackageData
{
package PackageData;
-my ($count,%counts,@list,$num,%output,$program,$type);
-$counts{'total'} = 0;
+my ($count,$num,%pms,$type);
+$pms{'total'} = 0;
+
sub get {
eval $start if $b_log;
# $num passed by reference to maintain incrementing where requested
- ($type,$num) = @_;
+ ($type,$num) = @_;
+ $loaded{'package-data'} = 1;
+ my $output = {};
package_counts();
appimage_counts();
- create_output();
+ create_output($output);
eval $end if $b_log;
- return %output;
+ return $output;
}
+
sub create_output {
eval $start if $b_log;
- my $total;
- if ($counts{'total'}){
- $total = $counts{'total'};
+ my $output = $_[0];
+ my $total = '';
+ if ($pms{'total'}){
+ $total = $pms{'total'};
}
else {
- if ($type eq 'inner'){$total = 'N/A';}
- else {$total = main::row_defaults('packages','');}
+ if ($type eq 'inner' || $pms{'disabled'}){
+ $total = 'N/A' if $extra < 2;
+ }
+ else {
+ $total = main::message('package-data');
+ }
}
- if ($counts{'total'} && $extra > 1){
- delete $counts{'total'};
+ if ($pms{'total'} && $extra > 1){
+ delete $pms{'total'};
my $b_mismatch;
- foreach (keys %counts){
- if ($counts{$_}->[0] && $counts{$_}->[0] != $total){
+ foreach (keys %pms){
+ next if $_ eq 'disabled';
+ if ($pms{$_}->{'pkgs'} && $pms{$_}->{'pkgs'} != $total){
$b_mismatch = 1;
last;
}
}
$total = '' if !$b_mismatch;
}
- $output{main::key($$num++,1,1,'Packages')} = $total;
- if ($extra > 1 && %counts){
- foreach (sort keys %counts){
+ $output->{main::key($$num++,1,1,'Packages')} = $total;
+ # if blocked pm secondary, only show if no total or improbable total
+ if ($pms{'disabled'} && $extra < 2 && (!$pms{'total'} || $total < 100)){
+ $output->{main::key($$num++,0,2,'note')} = $pms{'disabled'};
+ }
+ if ($extra > 1 && %pms){
+ foreach my $pm (sort keys %pms){
my ($cont,$ind) = (1,2);
- if ($counts{$_}->[0] || $b_admin){
- my $key = $_;
- $key =~ s/^zzz-//; # get rid of the special sorters for items to show last
- $output{main::key($$num++,$cont,$ind,$key)} = $counts{$_}->[0];
- if ($b_admin && $counts{$_}->[1]){
- ($cont,$ind) = (0,3);
- $output{main::key($$num++,$cont,$ind,'lib')} = $counts{$_}->[1];
+ # if package mgr command returns error, this will not be a hash
+ next if ref $pms{$pm} ne 'HASH';
+ if ($pms{$pm}->{'pkgs'} || $b_admin || ($extra > 1 && $pms{$pm}->{'disabled'})){
+ my $type = $pm;
+ $type =~ s/^zzz-//; # get rid of the special sorters for items to show last
+ $output->{main::key($$num++,$cont,$ind,'pm')} = $type;
+ ($cont,$ind) = (0,3);
+ $pms{$pm}->{'pkgs'} = 'N/A' if $pms{$pm}->{'disabled'};
+ $output->{main::key($$num++,($cont+1),$ind,'pkgs')} = $pms{$pm}->{'pkgs'};
+ if ($pms{$pm}->{'disabled'}){
+ $output->{main::key($$num++,$cont,$ind,'note')} = $pms{$pm}->{'disabled'};
+ }
+ if ($b_admin ){
+ if ($pms{$pm}->{'libs'}){
+ $output->{main::key($$num++,$cont,($ind+1),'libs')} = $pms{$pm}->{'libs'};
+ }
+ if ($pms{$pm}->{'tools'}){
+ $output->{main::key($$num++,$cont,$ind,'tools')} = $pms{$pm}->{'tools'};
+ }
}
}
}
@@ -19471,1474 +33976,2677 @@ sub create_output {
# print Data::Dumper::Dumper \%output;
eval $end if $b_log;
}
+
sub package_counts {
eval $start if $b_log;
my ($type) = @_;
- # 0: key; 1: program; 2: p/d; 3: arg/path; 4: 0/1 use lib;
- # 5: lib slice; 6: lib splitter; 7 - optional eval test
+ # note: there is a program called discover which has nothing to do with kde
+ # apt systems: plasma-discover, non apt, discover, but can't use due to conflict
+ # my $disc = 'plasma-discover';
+ my $gs = 'gnome-software';
+ # 0: key; 1: program; 2: p/d [no-list]; 3: arg/path/no-list; 4: 0/1 use lib;
+ # 5: lib slice; 6: lib splitter; 7: optional eval test;
+ # 8: optional installed tool tests for -ra
# needed: cards [nutyx], urpmq [mageia]
my @pkg_managers = (
['alps','alps','p','showinstalled',1,0,''],
['apk','apk','p','info',1,0,''],
- # older dpkg-query do not support -f values consistently: eg ${binary:Package}
- ['apt','dpkg-query','p','-W -f=\'${Package}\n\'',1,0,''],
# ['aptd','dpkg-query','d','/usr/lib/*',1,3,'\\/'],
# mutyx. do cards test because there is a very slow pkginfo python pkg mgr
['cards','pkginfo','p','-i',1,1,'','main::check_program(\'cards\')'],
+ # older dpkg-query do not support -f values consistently: eg ${binary:Package}
+ ['dpkg','dpkg-query','p','-W --showformat=\'${Package}\n\'',1,0,'','',
+ ['apt','apt-get','aptitude','deb-get','muon','nala','synaptic']],
['emerge','emerge','d','/var/db/pkg/*/*/',1,5,'\\/'],
['eopkg','eopkg','d','/var/lib/eopkg/package/*',1,5,'\\/'],
['guix-sys','guix','p','package -p "/run/current-system/profile" -I',1,0,''],
- ['guix-usr','guix','p','package package -I',1,0,''],
- ['pacman','pacman','p','-Qq --color never',1,0,''],
- ['pacman-g2','pacman-g2','p','-i',1,0,''],
+ ['guix-usr','guix','p','package -I',1,0,''],
+ ['kiss','kiss','p','list',1,0,''],
+ ['mport','mport','p','list',1,0,''],
+ # netpkg puts packages in same place as slackpkg, only way to tell apart
+ ['netpkg','netpkg','d','/var/lib/pkgtools/packages/*',1,5,'\\/',
+ '-d \'/var/netpkg\' && -d \'/var/lib/pkgtools/packages\'',
+ ['netpkg','sbopkg','sboui','slackpkg','slapt-get','slpkg','swaret']],
+ ['nix-sys','nix-store','p','-qR /run/current-system/sw',1,1,'-'],
+ ['nix-usr','nix-store','p','-qR ~/.nix-profile',1,1,'-'],
+ ['nix-default','nix-store','p','-qR /nix/var/nix/profiles/default',1,2,'-'],
+ ['opkg','opkg','p','list',1,0,''], # ubuntu based Security Onion
+ ['pacman','pacman','p','-Qq --color never',1,0,'',
+ '!main::check_program(\'pacman-g2\')', # pacman-g2 has sym link to pacman
+ # these may need to be trimmed down depending on how useful/less some are
+ ['argon','aura','aurutils','baph','cylon','octopi','pacaur','pacseek',
+ 'pakku','pamac','paru','pikaur','trizen','yaourt','yay','yup']],
+ ['pacman-g2','pacman-g2','p','-Q',1,0,'','',],
['pkg','pkg','d','/var/db/pkg/*',1,0,''], # 'pkg list' returns non programs
- ['pkg_info','pkg_info','p','',1,0,''],
- ['pkgtool','pkgtool','d','/var/log/packages/*',1,4,'\\/'],
- # way too slow without nodigest/sig!! confirms packages exist
- ['rpm','rpm','p','-qa --nodigest --nosignature',1,0,''],
- # note',' slapt-get, spkg, and pkgtool all return the same count
- #['slapt-get','slapt-get','p','--installed',1,0,''],
- #['spkg','spkg','p','--installed',1,0,''],
- ['tce','tce-status','p','-i',1,0,''],
+ ['pkg_add','pkg_info','p','',1,0,''], # OpenBSD has set of tools, not 1 pm
+ # like cards, avoid pkginfo directly due to python pm being so slow
+ # but pkgadd is also found in scratch
+ ['pkgutils','pkginfo','p','-i',1,0,'','main::check_program(\'pkgadd\')'],
+ # slack 15 moves packages to /var/lib/pkgtools/packages but links to /var/log/packages
+ ['pkgtool','installpkg','d','/var/lib/pkgtools/packages/*',1,5,'\\/',
+ '!-d \'/var/netpkg\' && -d \'/var/lib/pkgtools/packages\'',
+ ['sbopkg','sboui','slackpkg','slapt-get','slpkg','swaret']],
+ ['pkgtool','installpkg','d','/var/log/packages/*',1,4,'\\/',
+ '! -d \'/var/lib/pkgtools/packages\' && -d \'/var/log/packages/\'',
+ ['sbopkg','sboui','slackpkg','slapt-get','slpkg','swaret']],
+ # rpm way too slow without nodigest/sig!! confirms packages exist
+ # but even with, MASSIVELY slow in some cases, > 20, 30 seconds!!!!
+ # find another way to get rpm package counts or don't show this feature for rpm!!
+ ['rpm','rpm','force','-qa --nodigest --nosignature',1,0,'',
+ 'main::check_program(\'apt-get\') && main::check_program(\'dpkg\')',
+ ['dnf','packagekit','up2date','urpmi','yast','yum','zypper']],
+ # uncommon case where apt-get frontend for rpm, w/o dpkg, like AltLinux did
+ ['rpm-apt','rpm','p','-qa',1,0,'',
+ 'main::check_program(\'apt-get\') && !main::check_program(\'dpkg\')',
+ ['apt-get','rpm']],
+ # scratch is a programming language too, with software called scratch
+ ['scratch','pkgbuild','d','/var/lib/scratchpkg/index/*/.pkginfo',1,5,'\\/',
+ '-d \'/var/lib/scratchpkg\''],
+ # note: slackpkg, slapt-get, spkg, and pkgtool all return the same count
+ # ['slackpkg','pkgtool','slapt-get','slpkg','swaret']],
+ # ['slapt-get','slapt-get','p','--installed',1,0,''],
+ # ['spkg','spkg','p','--installed',1,0,''],
+ ['tazpkg','tazpkg','p','list',1,0,'','',['tazpkgbox','tazpanel']],
+ ['tce','tce-status','p','-i',1,0,'','',['apps','tce-load']],
# note: I believe mageia uses rpm internally but confirm
# ['urpmi','urpmq','p','??',1,0,''],
['xbps','xbps-query','p','-l',1,1,''],
+ # ['xxx-brew','brew','p','--cellar',0,0,''], # verify how this works
['zzz-flatpak','flatpak','p','list',0,0,''],
['zzz-snap','snap','p','list',0,0,'','@ps_cmd && (grep {/\bsnapd\b/} @ps_cmd)'],
);
- my $libs;
- foreach (@pkg_managers){
- if ($program = main::check_program($_->[1])){
- next if $_->[7] && !eval $_->[7];
- if ($_->[2] eq 'p'){
- chomp(@list = qx($program $_->[3] 2>/dev/null));
+ my ($program);
+ foreach my $pm (@pkg_managers){
+ if ($program = main::check_program($pm->[1])){
+ next if $pm->[7] && !eval $pm->[7];
+ my ($disabled,$libs,@list,$pmts);
+ if ($pm->[2] eq 'p' || ($pm->[2] eq 'force' && check_run($pm))){
+ chomp(@list = qx($program $pm->[3] 2>/dev/null)) if $pm->[3];
+ }
+ elsif ($pm->[2] eq 'd'){
+ @list = main::globber($pm->[3]);
}
else {
- @list = main::globber($_->[3]);
+ # update message() if pm other than rpm disabled by default
+ $disabled = main::message('pm-disabled',$pm->[1]);
}
- $libs = undef;
- $count = scalar @list;
- #print Data::Dumper::Dumper \@list;
- if ($b_admin && $count && $_->[4]){
- $libs = count_libs(\@list,$_->[5],$_->[6]);
+ $count = scalar @list if !$disabled;
+ # print Data::Dumper::Dumper \@list;
+ if (!$disabled){
+ if ($b_admin && $count && $pm->[4]){
+ $libs = count_libs(\@list,$pm->[5],$pm->[6]);
+ }
}
- $counts{$_->[0]} = ([$count,$libs]);
- $counts{'total'} += $count;
- #print Data::Dumper::Dumper \%counts;
+ else {
+ $pms{'disabled'} = $disabled;
+ }
+ # if there is ambiguity about actual program installed, use this loop
+ if ($b_admin && $pm->[8]){
+ my @tools;
+ foreach my $tool (@{$pm->[8]}){
+ if (main::check_program($tool)){
+ push(@tools,$tool);
+ }
+ }
+ # only show gs if tools found, and if not added before
+ if (@tools){
+ if ($gs && main::check_program($gs)){
+ push(@tools,$gs);
+ $gs = '';
+ }
+ }
+ if (@tools){
+ main::make_list_value(\@tools,\$pmts,',','sort');
+ }
+ }
+ $pms{$pm->[0]} = {
+ 'disabled' => $disabled,
+ 'pkgs' => $count,
+ 'libs' => $libs,
+ 'tools' => $pmts,
+ };
+ $pms{'total'} += $count if defined $count;
+ # print Data::Dumper::Dumper \%pms;
}
}
- # print Data::Dumper::Dumper \%counts;
- main::log_data('dump','Packaage managers: %counts',\%counts) if $b_log;
+ print 'package_counts %pms: ', Data::Dumper::Dumper \%pms if $dbg[65];
+ main::log_data('dump','Package managers: %pms',\%pms) if $b_log;
eval $end if $b_log;
}
+
sub appimage_counts {
- if (@ps_cmd && (grep {/\bappimaged\b/} @ps_cmd)){
- @list = main::globber($ENV{'HOME'} . '/.local/bin/*.appimage');
+ if (@ps_cmd && (grep {/\bappimage(d|launcher)\b/} @ps_cmd)){
+ my @list = main::globber($ENV{'HOME'} . '/.{appimage/,local/bin/}*.[aA]pp[iI]mage');
$count = scalar @list;
- $counts{'zzz-appimage'} = ([$$count,undef]) if $count;
- $counts{'total'} += $count;
+ $pms{'zzz-appimage'} = {
+ 'pkgs' => $count,
+ 'libs' => undef,
+ };
+ $pms{'total'} += $count;
+ }
+}
+
+sub check_run {
+ if ($force{'pkg'}){
+ return 1;
+ }
+ elsif (${_[0]}->[1] eq 'rpm'){
+ # testing for core wrappers for rpm, these should not be present in non
+ # redhat/suse based systems. mageia has urpmi, dnf, yum
+ foreach my $tool (('dnf','up2date','urpmi','yum','zypper')){
+ return 0 if main::check_program($tool);
+ }
+ # Note: test fails: apt-rpm (pclinuxos,alt linux), unknown how to detect
+ # Add pm test if known to have rpm available.
+ foreach my $tool (('dpkg','pacman','pkgtool','tce-load')){
+ return 1 if main::check_program($tool);
+ }
}
}
+
sub count_libs {
- my ($ref,$pos,$split) = @_;
+ my ($items,$pos,$split) = @_;
my (@data);
my $i = 0;
$split ||= '\\s+';
- #print scalar @$ref, '::', $split, '::', $pos, "\n";
- foreach (@$ref){
- @data = split /$split/, $_;
- #print scalar @data, '::', $data[$pos], "\n";
+ # print scalar @$items, '::', $split, '::', $pos, "\n";
+ foreach (@$items){
+ @data = split(/$split/, $_);
+ # print scalar @data, '::', $data[$pos], "\n";
$i++ if $data[$pos] && $data[$pos] =~ m%^lib%;
}
return $i;
}
}
-# args: 1 - pci device string; 2 - pci cleaned subsystem string
-sub get_pci_vendor {
- eval $start if $b_log;
- my ($device, $subsystem) = @_;
- return if !$subsystem;
- my ($vendor,$sep,$temp) = ('','','');
- # get rid of any [({ type characters that will make regex fail
- # and similar matches show as non-match
- $subsystem = regex_cleaner($subsystem);
- my @data = split /\s+/, $subsystem;
- # when using strings in patterns for regex have to escape them
- foreach (@data){
- $temp = $_;
- $temp =~ s/(\+|\$|\?|\^|\*)/\\$1/g;
- if ($device !~ m|\b$temp\b|){
- $vendor .= $sep . $_;
- $sep = ' ';
- }
- else {
- last;
- }
- }
- eval $end if $b_log;
- return $vendor;
+## ParseEDID
+{
+package ParseEDID;
+# CVT_ratios:
+my @known_ratios = qw(5/4 4/3 3/2 16/10 15/9 16/9);
+
+# Set values
+my @edid_info = (
+ ['a8', '_header'],
+ ['a2', 'manufacturer_name'],
+ ['v', 'product_code'],
+ ['V', 'serial_number'],
+ ['C', 'week'],
+ ['C', 'year'],
+ ['C', 'edid_version'],
+ ['C', 'edid_revision'],
+ ['a', 'video_input_definition'],
+ ['C', 'max_size_horizontal'], # in cm, 0 on projectors
+ ['C', 'max_size_vertical'], # in cm, 0 on projectors
+ ['C', 'gamma'],
+ ['a', 'feature_support'],
+ ['a10', 'color_characteristics'],
+ ['a3' , 'established_timings'],
+ ['a16', 'standard_timings'],
+ ['a72', 'monitor_details'],
+ ['C', 'extension_flag'],
+ ['C', 'checksum'],
+);
+my %subfields = (
+ manufacturer_name => [
+ [1, ''],
+ [5, '1'],
+ [5, '2'],
+ [5, '3'],
+ ],
+ video_input_definition => [
+ [1, 'digital'],
+ [1, 'separate_sync'],
+ [1, 'composite_sync'],
+ [1, 'sync_on_green'],
+ [2, ''],
+ [2, 'voltage_level'],
+ ],
+ feature_support => [
+ [1, 'DPMS_standby'],
+ [1, 'DPMS_suspend'],
+ [1, 'DPMS_active_off'],
+ [1, 'rgb'],
+ [1, ''],
+ [1, 'sRGB_compliance'],
+ [1, 'has_preferred_timing'],
+ [1, 'GTF_compliance'],
+ ],
+ # these are VESA timings, basically: VESA-EEDID-A2.pdf
+ established_timings => [
+ # byte 1, 23h
+ [1, '720x400_70'],
+ [1, '720x400_88'],
+ [1, '640x480_60'],
+ [1, '640x480_67'],
+ [1, '640x480_72'],
+ [1, '640x480_75'],
+ [1, '800x600_56'],
+ [1, '800x600_60'],
+ # byte 2, 24h
+ [1, '800x600_72'],
+ [1, '800x600_75'],
+ [1, '832x624_75'],
+ [1, '1024x768_87i'],
+ [1, '1024x768_60'],
+ [1, '1024x768_70'],
+ [1, '1024x768_75'],
+ [1, '1280x1024_75'],
+ # byte 3, 25h
+ # 7: [1, '1152x870_75'], # apple macII
+ # 6-0: manufacturer's timings
+ ],
+ detailed_timing => [
+ [8, 'horizontal_active'],
+ [8, 'horizontal_blanking'],
+ [4, 'horizontal_active_hi'],
+ [4, 'horizontal_blanking_hi'],
+ [8, 'vertical_active'],
+ [8, 'vertical_blanking'],
+ [4, 'vertical_active_hi'],
+ [4, 'vertical_blanking_hi'],
+ [8, 'horizontal_sync_offset'],
+ [8, 'horizontal_sync_pulse_width'],
+ [4, 'vertical_sync_offset'],
+ [4, 'vertical_sync_pulse_width'],
+ [2, 'horizontal_sync_offset_hi'],
+ [2, 'horizontal_sync_pulse_width_hi'],
+ [2, 'vertical_sync_offset_hi'],
+ [2, 'vertical_sync_pulse_width_hi'],
+ [8, 'horizontal_image_size'], # in mm
+ [8, 'vertical_image_size'], # in mm
+ [4, 'horizontal_image_size_hi'],
+ [4, 'vertical_image_size_hi'],
+ [8, 'horizontal_border'],
+ [8, 'vertical_border'],
+ [1, 'interlaced'],
+ [2, 'stereo'],
+ [2, 'digital_composite'],
+ [1, 'horizontal_sync_positive'],
+ [1, 'vertical_sync_positive'],
+ [1, ''],
+ ],
+ # 16 bytes, up to 8 additional timings, each identified by a unique 2 byte
+ # code derived from the horizontal active pixel count, the image aspect ratio
+ # and field refresh rate as described in Table 3.19
+ standard_timing => [
+ [8, 'X'],
+ [2, 'aspect'],
+ [6, 'vfreq'],
+ ],
+ monitor_range => [
+ [8, 'vertical_min'],
+ [8, 'vertical_max'],
+ [8, 'horizontal_min'],
+ [8, 'horizontal_max'],
+ [8, 'pixel_clock_max'],
+ ],
+ manufacturer_specified_range_timing => [
+ # http://www.spwg.org/salisbury_march_19_2002.pdf
+ # for the glossary: http://www.vesa.org/Public/PSWG/PSWG15v1.pdf
+ [8, 'horizontal_sync_pulse_width_min'], # HSPW (Horizontal Sync Pulse Width)
+ [8, 'horizontal_sync_pulse_width_max'],
+ [8, 'horizontal_back_porch_min'], # t_hbp
+ [8, 'horizontal_back_porch_max'],
+ [8, 'vertical_sync_pulse_width_min'], # VSPW (Vertical Sync Pulse Width)
+ [8, 'vertical_sync_pulse_width_max'],
+ [8, 'vertical_back_porch_min'], # t_vbp (Vertical Back Porch)
+ [8, 'vertical_back_porch_max'],
+ [8, 'horizontal_blanking_min'], # t_hp (Horizontal Period)
+ [8, 'horizontal_blanking_max'],
+ [8, 'vertical_blanking_min'], # t_vp
+ [8, 'vertical_blanking_max'],
+ [8, 'module_revision'],
+ ],
+ cea_data_block_collection => [
+ [3, 'type'],
+ [5, 'size'],
+ ],
+ cea_video_data_block => [
+ [1, 'native'],
+ [7, 'mode'],
+ ],
+ # Section 3.7 in VESA-EEDID-A2.pdf specs
+ color_characteristics => [
+ # Rx1 Rx0 Ry1 Ry0 Gx1 Gx0 Gy1 Gy0
+ [8, 'white_point_red_green'],
+ # Bx1 Bx0 By1 By0 Wx1 Wx0 Wy1 Wy0
+ [8, 'white_point_blue_white'],
+ [8, 'red_x'],
+ [8, 'red_y'],
+ [8, 'green_x'],
+ [8, 'green_y'],
+ [8, 'blue_x'],
+ [8, 'blue_y'],
+ [8, 'white_x'],
+ [8, 'white_y'],
+ ],
+);
+my @cea_video_mode_to_detailed_timing = (
+ 'pixel_clock',
+ 'horizontal_active',
+ 'vertical_active',
+ 'aspect',
+ 'horizontal_blanking',
+ 'horizontal_sync_offset',
+ 'horizontal_sync_pulse_width',
+ 'vertical_blanking',
+ 'vertical_sync_offset',
+ 'vertical_sync_pulse_width',
+ 'horizontal_sync_positive',
+ 'vertical_sync_positive',
+ 'interlaced'
+);
+my @cea_video_modes = (
+# [0] pixel clock, [1] X, [2] Y, [3] aspect, [4] Hblank, [5] Hsync_offset, [6] Hsync_pulse_width,
+# [7] Vblank, [8] Vsync_offset, [9] Vsync_pulse_width, [10] Hsync+, [11] Vsync+, [12] interlaced
+# 59.94/29.97 and similar modes also have a 60.00/30.00 counterpart by raising the pixel clock
+ [ 25.175, 640, 480, "4/3", 160, 16, 96, 45, 10, 2, 0, 0, 0 ], # 1: 640x 480@59.94
+ [ 27.000, 720, 480, "4/3", 138, 16, 62, 45, 9, 6, 0, 0, 0 ], # 2: 720x 480@59.94
+ [ 27.000, 720, 480, "16/9", 138, 16, 62, 45, 9, 6, 0, 0, 0 ], # 3: 720x 480@59.94
+ [ 74.250, 1280, 720, "16/9", 370, 110, 40, 30, 5, 5, 1, 1, 0 ], # 4: 1280x 720@60.00
+ [ 74.250, 1920, 1080, "16/9", 280, 88, 44, 45, 4, 10, 1, 1, 1 ], # 5: 1920x1080@30.00
+ [ 27.000, 1440, 480, "4/3", 276, 38, 124, 45, 8, 6, 0, 0, 1 ], # 6: 1440x 480@29.97
+ [ 27.000, 1440, 480, "16/9", 276, 38, 124, 45, 8, 6, 0, 0, 1 ], # 7: 1440x 480@29.97
+ [ 27.000, 1440, 240, "4/3", 276, 38, 124, 22, 4, 3, 0, 0, 0 ], # 8: 1440x 240@60.05
+ [ 27.000, 1440, 240, "16/9", 276, 38, 124, 22, 4, 3, 0, 0, 0 ], # 9: 1440x 240@60.05
+ [ 54.000, 2880, 480, "4/3", 552, 76, 248, 45, 8, 6, 0, 0, 1 ], # 10: 2880x 480@29.97
+ [ 54.000, 2880, 480, "16/9", 552, 76, 248, 45, 8, 6, 0, 0, 1 ], # 11: 2880x 480@29.97
+ [ 54.000, 2880, 240, "4/3", 552, 76, 248, 22, 4, 3, 0, 0, 0 ], # 12: 2880x 240@60.05
+ [ 54.000, 2880, 240, "16/9", 552, 76, 248, 22, 4, 3, 0, 0, 0 ], # 13: 2880x 240@60.05
+ [ 54.000, 1440, 480, "4/3", 276, 32, 124, 45, 9, 6, 0, 0, 0 ], # 14: 1440x 480@59.94
+ [ 54.000, 1440, 480, "16/9", 276, 32, 124, 45, 9, 6, 0, 0, 0 ], # 15: 1440x 480@59.94
+ [ 148.500, 1920, 1080, "16/9", 280, 88, 44, 45, 4, 5, 1, 1, 0 ], # 16: 1920x1080@60.00
+ [ 27.000, 720, 576, "4/3", 144, 12, 64, 49, 5, 5, 0, 0, 0 ], # 17: 720x 576@50.00
+ [ 27.000, 720, 576, "16/9", 144, 12, 64, 49, 5, 5, 0, 0, 0 ], # 18: 720x 576@50.00
+ [ 74.250, 1280, 720, "16/9", 700, 440, 40, 30, 5, 5, 1, 1, 0 ], # 19: 1280x 720@50.00
+ [ 74.250, 1920, 1080, "16/9", 720, 528, 44, 45, 4, 10, 1, 1, 1 ], # 20: 1920x1080@25.00
+ [ 27.000, 1440, 576, "4/3", 288, 24, 126, 49, 4, 6, 0, 0, 1 ], # 21: 1440x 576@25.00
+ [ 27.000, 1440, 576, "16/9", 288, 24, 126, 49, 4, 6, 0, 0, 1 ], # 22: 1440x 576@25.00
+ [ 27.000, 1440, 288, "4/3", 288, 24, 126, 24, 2, 3, 0, 0, 0 ], # 23: 1440x 288@50.08
+ [ 27.000, 1440, 288, "16/9", 288, 24, 126, 24, 2, 3, 0, 0, 0 ], # 24: 1440x 288@50.08
+ [ 54.000, 2880, 576, "4/3", 576, 48, 252, 49, 4, 6, 0, 0, 1 ], # 25: 2880x 576@25.00
+ [ 54.000, 2880, 576, "16/9", 576, 48, 252, 49, 4, 6, 0, 0, 1 ], # 26: 2880x 576@25.00
+ [ 54.000, 2880, 288, "4/3", 576, 48, 252, 24, 2, 3, 0, 0, 0 ], # 27: 2880x 288@50.08
+ [ 54.000, 2880, 288, "16/9", 576, 48, 252, 24, 2, 3, 0, 0, 0 ], # 28: 2880x 288@50.08
+ [ 54.000, 1440, 576, "4/3", 288, 24, 128, 49, 5, 5, 0, 0, 0 ], # 29: 1440x 576@50.00
+ [ 54.000, 1440, 576, "16/9", 288, 24, 128, 49, 5, 5, 0, 0, 0 ], # 30: 1440x 576@50.00
+ [ 148.500, 1920, 1080, "16/9", 720, 528, 44, 45, 4, 5, 1, 1, 0 ], # 31: 1920x1080@50.00
+ [ 74.250, 1920, 1080, "16/9", 830, 638, 44, 45, 4, 5, 1, 1, 0 ], # 32: 1920x1080@24.00
+ [ 74.250, 1920, 1080, "16/9", 720, 528, 44, 45, 4, 5, 1, 1, 0 ], # 33: 1920x1080@25.00
+ [ 74.250, 1920, 1080, "16/9", 280, 88, 44, 45, 4, 5, 1, 1, 0 ], # 34: 1920x1080@30.00
+ [ 108.000, 2880, 480, "4/3", 552, 64, 248, 45, 9, 6, 0, 0, 0 ], # 35: 2880x 480@59.94
+ [ 108.000, 2880, 480, "16/9", 552, 64, 248, 45, 9, 6, 0, 0, 0 ], # 36: 2880x 480@59.94
+ [ 108.000, 2880, 576, "4/3", 576, 48, 256, 49, 5, 5, 0, 0, 0 ], # 37: 2880x 576@50.00
+ [ 108.000, 2880, 576, "16/9", 576, 48, 256, 49, 5, 5, 0, 0, 0 ], # 38: 2880x 576@50.00
+ [ 72.000, 1920, 1080, "16/9", 384, 32, 168, 170, 46, 10, 1, 0, 1 ], # 39: 1920x1080@25.00
+ [ 148.500, 1920, 1080, "16/9", 720, 528, 44, 45, 4, 10, 1, 1, 1 ], # 40: 1920x1080@50.00
+ [ 148.500, 1280, 720, "16/9", 700, 440, 40, 30, 5, 5, 1, 1, 0 ], # 41: 1280x 720@100.00
+ [ 54.000, 720, 576, "4/3", 144, 12, 64, 49, 5, 5, 0, 0, 0 ], # 42: 720x 576@100.00
+ [ 54.000, 720, 576, "16/9", 144, 12, 64, 49, 5, 5, 0, 0, 0 ], # 43: 720x 576@100.00
+ [ 54.000, 1440, 576, "4/3", 288, 24, 126, 49, 4, 6, 0, 0, 0 ], # 44: 1440x 576@50.00
+ [ 54.000, 1440, 576, "16/9", 288, 24, 126, 49, 4, 6, 0, 0, 0 ], # 45: 1440x 576@50.00
+ [ 148.500, 1920, 1080, "16/9", 280, 88, 44, 45, 4, 10, 1, 1, 1 ], # 46: 1920x1080@60.00
+ [ 148.500, 1280, 720, "16/9", 370, 110, 40, 30, 5, 5, 1, 1, 0 ], # 47: 1280x 720@120.00
+ [ 54.000, 720, 480, "4/3", 138, 16, 62, 45, 9, 6, 0, 0, 0 ], # 48: 720x 480@119.88
+ [ 54.000, 720, 480, "16/9", 138, 16, 62, 45, 9, 6, 0, 0, 0 ], # 49: 720x 480@119.88
+ [ 54.000, 1440, 480, "4/3", 276, 38, 124, 45, 8, 6, 0, 0, 1 ], # 50: 1440x 480@59.94
+ [ 54.000, 1440, 480, "16/9", 276, 38, 124, 45, 8, 6, 0, 0, 1 ], # 51: 1440x 480@59.94
+ [ 108.000, 720, 576, "4/3", 144, 12, 64, 49, 5, 5, 0, 0, 0 ], # 52: 720x 576@200.00
+ [ 108.000, 720, 576, "16/9", 144, 12, 64, 49, 5, 5, 0, 0, 0 ], # 53: 720x 576@200.00
+ [ 108.000, 1440, 576, "4/3", 288, 24, 126, 49, 4, 6, 0, 0, 1 ], # 54: 1440x 576@100.00
+ [ 108.000, 1440, 576, "16/9", 288, 24, 126, 49, 4, 6, 0, 0, 1 ], # 55: 1440x 576@100.00
+ [ 108.000, 720, 480, "4/3", 138, 16, 62, 45, 9, 6, 0, 0, 0 ], # 56: 720x 480@239.76
+ [ 108.000, 720, 480, "16/9", 138, 16, 62, 45, 9, 6, 0, 0, 0 ], # 57: 720x 480@239.76
+ [ 108.000, 1440, 480, "4/3", 276, 38, 124, 45, 8, 6, 0, 0, 1 ], # 58: 1440x 480@119.88
+ [ 108.000, 1440, 480, "16/9", 276, 38, 124, 45, 8, 6, 0, 0, 1 ], # 59: 1440x 480@119.88
+ [ 59.400, 1280, 720, "16/9", 2020, 1760, 40, 30, 5, 5, 1, 1, 0 ], # 60: 1280x 720@24.00
+ [ 74.250, 1280, 720, "16/9", 2680, 2420, 40, 30, 5, 5, 1, 1, 0 ], # 61: 1280x 720@25.00
+ [ 74.250, 1280, 720, "16/9", 2020, 1760, 40, 30, 5, 5, 1, 1, 0 ], # 62: 1280x 720@30.00
+ [ 297.000, 1920, 1080, "16/9", 280, 88, 44, 45, 4, 5, 1, 1, 0 ], # 63: 1920x1080@120.00
+ [ 297.000, 1920, 1080, "16/9", 720, 528, 44, 45, 4, 10, 1, 1, 0 ], # 64: 1920x1080@100.00
+);
+# Exist but IDs Unknown: Pixio, AOpen (AON?), AORUS [probably GBT], Deco Gear,
+# Eyoyo, GAEMS, GeChic, KOORUI, Lilliput, Mobile Pixels, Nexanic, SunFounder,
+# TECNII, TPEKKA, V7/VSEVEN,
+# Guesses: KYY=KYY, MSI=MSI, KOE=Kaohsiung Opto Electronics
+# PGS: Princeton Graphic Systems; SDC: Samsung Display Co;
+# SIS: Silicon Integrated Systems; STN: Samsung Electronics America;
+# BDS: Barco Display Systems
+# TAI: Toshiba America
+# HIQ: Hitachi ImageQuest or Kaohsiung Opto Electronics? or does Imagequest make hitachi:
+# NVD: Nvidia or NewVisionDisplay?
+my %vendors = (
+'AAC' => 'AcerView', 'ACI' => 'Asus', 'ACR' => 'Acer', 'ACT' => 'Targa', 'ADI' => 'ADI',
+'AIC' => 'AG Neovo', 'AMW' => 'AMW', 'ANX' => 'Acer Netxix', 'AOC' => 'AOC', 'API' => 'A Plus Info',
+'APP' => 'Apple', 'ART' => 'ArtMedia', 'AST' => 'AST Research', 'AUO' => 'AU Optronics',
+'BEL' => 'Beltronic', 'BMM' => 'BMM', 'BNQ' => 'BenQ', 'BOE' => 'BOE Display', 'BDS' => 'Barco',
+'CHO' => 'Sichuang Changhong', 'CMN' => 'ChiMei InnoLux', 'CMO' => 'Chi Mei Optoelectronics',
+'CPL' => 'Compal/ALFA', 'CPQ' => 'Compaq', 'CPT' => 'Chungwa Picture Tubes', 'CTX' => 'CTX (Chuntex)', 'CVT' => 'DGM',
+'DEC' => 'DEC', 'DEL' => 'Dell', 'DON' => 'Denon', 'DPC' => 'Delta', 'DPL' => 'Digital Projection', 'DWE' => 'Daewoo',
+'ECS' => 'Elitegroup', 'EIZ' => 'EIZO', 'ELS' => 'ELSA', 'ENC' => 'EIZO NANAO', 'EPI' => 'Envision', 'ETR' => 'Rotel',
+'FCM' => 'Funai', 'FUJ' => 'Fujitsu', 'FUS' => 'Fujitsu Siemens',
+'GBT' => 'Gigabyte', 'GFN' => 'Gefen', 'GSM' => 'LG (GoldStar)', 'GWY' => 'Gateway 2000',
+'HEI' => 'Hyundai.', 'HIQ' => 'Hyundai ImageQuest', 'HIT' => 'Hitachi', 'HPN' => 'HP',
+'HSD' => 'HannSpree/HannStar', 'HSL' => 'Hansol', 'HTC' => 'Hitachi/Nissei', 'HVR' => 'Hitachi',
+'HWP' => 'HP', 'HWV' => 'Huawei',
+'IBM' => 'IBM', 'ICL' => 'Fujitsu ICL', 'IFS' => 'InFocus', 'INO' => 'Innolab Pte', 'IQT' => 'Hyundai',
+'IVM' => 'Idek Iiyama', 'IVO' => 'InfoVision Optronics/Kunshan',
+'KDS' => 'Korea Data Systems (KDS)', 'KFC' => 'KFC Computek', 'KOE' => 'Kaohsiung OptoElectronics',
+'KTC' => 'Kingston', 'KYY' => 'KYY',
+'LCD' => 'Toshiba Matsushita', 'LEN' => 'Lenovo', 'LGD' => 'LG Display', 'LKM' => 'Adlas/Azalea',
+'LNK' => 'LINK', 'LPL' => 'LG Philips', 'LTN' => 'Lite-On',
+'MAG' => 'MAG InnoVision', 'MAX' => 'Belinea/Maxdata', 'MED' => 'Medion',
+'MEI' => 'Panasonic', 'MEL' => 'Mitsubishi', 'MIR' => 'Miro', 'MSI' => 'MSI', 'MTC' => 'MITAC',
+'NAN' => 'NANAO/EIZO', 'NEX' => 'Nexgen Mediatech', 'NCP' => 'Najing CEC Panda', 'NEC' => 'NEC',
+'NOK' => 'Nokia', 'NVD' => 'Nvidia',
+'ONK' => 'Onkyo', 'OPT' => 'Optoma','OQI' => 'ViewSonic Optiquest', 'ORN' => 'Orion',
+'PBN' => 'Packard Bell', 'PCK' => 'Daewoo', 'PDC' => 'Polaroid', 'PGS' => 'Princeton',
+'PHL' => 'Philips', 'PIO' => 'Pioneer', 'PNR' => 'Planar', 'PRT' => 'Princeton',
+'QDI' => 'Quantum Data', 'QDS' => 'Quanta Display', 'REL' => 'Relisys', 'REN' => 'Renesas',
+'SAM' => 'Samsung', 'SAN' => 'Sanyo', 'SBI' => 'Smarttech', 'SDC' => 'Samsung', 'SEC' => 'Seiko Epson',
+'SEN' => 'Sensics', 'SHP' => 'Sharp', 'SGD' => 'Sigma Designs', 'SGI' => 'SGI', 'SHI' => 'Jiangsu Shinco',
+'SII' => 'Silicon Image', 'SIS' => 'SIS', 'SKM' => 'Guangzhou Teclast', 'SMC' => 'Samtron',
+'SMI' => 'Smile', 'SNI' => 'Siemens Nixdorf', 'SNY' => 'Sony', 'SPT' => 'Sceptre',
+'SRC' => 'Shamrock', 'STN' => 'Samsung', 'STP' => 'Sceptre', 'SUN' => 'Sun Microsystems', 'SYN' => 'Synaptics',
+'TAI' => 'Toshiba', 'TAT' => 'Tatung', 'TOS' => 'Toshiba', 'TRL' => 'Royal Information',
+'TSB' => 'Toshiba', 'UEG' => 'EliteGroup', 'UNM' => 'Unisys',
+'VIT' => 'Visitech', 'VLV' => 'Valve', 'VSC' => 'ViewSonic', 'VTK' => 'Viewteck', 'VTS' => 'VTech',
+'WTC' => 'Wen Technology', 'XLX' => 'Xilinx', 'YMH' => 'Yamaha', 'ZCM' => 'Zenith',
+);
+
+sub _within_limit {
+ my ($value, $type, $limit) = @_;
+ $type eq 'min' ? $value >= $limit : $value <= $limit;
}
-# # check? /var/run/nologin for bsds?
-sub get_runlevel_data {
- eval $start if $b_log;
- my $runlevel = '';
- if ( my $program = check_program('runlevel')){
- $runlevel = (grabber("$program 2>/dev/null"))[0];
- $runlevel =~ s/[^\d]//g if $runlevel;
- #print_line($runlevel . ";;");
+sub _get_many_bits {
+ my ($s, $field_name) = @_;
+ my @bits = split('', unpack('B*', $s));
+ my %h;
+ foreach (@{$subfields{$field_name}}) {
+ my ($size, $field) = @$_;
+ my @l = ('0' x (8 - $size), splice(@bits, 0, $size));
+ if ($field && $field !~ /^_/){
+ $h{$field} = unpack("C", pack('B*', join('', @l)));
+ # spec: chromacity: 0.xyz: white_point see color_characteristics
+ if ($h{$field} && $field_name eq 'color_characteristics'){
+ $h{$field} = ($field =~ /_[xy]$/) ? sprintf('%0.3f',$h{$field}/255) : [@l[1..8]];
+ }
+ }
}
- eval $end if $b_log;
- return $runlevel;
+ \%h;
}
-# note: it appears that at least as of 2014-01-13, /etc/inittab is going
-# to be used for default runlevel in upstart/sysvinit. systemd default is
-# not always set so check to see if it's linked.
-sub get_runlevel_default {
- eval $start if $b_log;
- my @data;
- my $default = '';
- my $b_systemd = 0;
- my $inittab = '/etc/inittab';
- my $systemd = '/etc/systemd/system/default.target';
- my $upstart = '/etc/init/rc-sysinit.conf';
- # note: systemd systems do not necessarily have this link created
- if ( -e $systemd){
- $default = readlink($systemd);
- $default =~ s/.*\/// if $default;
- $b_systemd = 1;
- }
- # http://askubuntu.com/questions/86483/how-can-i-see-or-change-default-run-level
- # note that technically default can be changed at boot but for inxi purposes
- # that does not matter, we just want to know the system default
- elsif ( -e $upstart){
- # env DEFAULT_RUNLEVEL=2
- @data = reader($upstart);
- $default = awk(\@data,'^env\s+DEFAULT_RUNLEVEL',2,'=');
- }
- # handle weird cases where null but inittab exists
- if (!$default && -e $inittab ){
- @data = reader($inittab);
- $default = awk(\@data,'^id.*initdefault',2,':');
+sub _build_detailed_timing {
+ my ($pixel_clock, $vv) = @_;
+ my $h = _get_many_bits($vv, 'detailed_timing');
+ $h->{pixel_clock} = $pixel_clock / 100; # to have it in MHz
+ my %detailed_timing_field_size = map { $_->[1], $_->[0] } @{$subfields{detailed_timing}};
+ foreach my $field (keys %detailed_timing_field_size) {
+ $field =~ s/_hi$// or next;
+ my $hi = delete($h->{$field . '_hi'});
+ $h->{$field} += $hi << $detailed_timing_field_size{$field};
}
- eval $end if $b_log;
- return $default;
+ $h;
}
-sub get_self_version {
- eval $start if $b_log;
- my $patch = $self_patch;
- if ( $patch ne '' ){
- # for cases where it was for example: 00-b1 clean to -b1
- $patch =~ s/^[0]+-?//;
- $patch = "-$patch" if $patch;
- }
- eval $end if $b_log;
- return $self_version . $patch;
+sub _add_standard_timing_modes {
+ my ($edid, $v) = @_;
+ my @aspect2ratio = (
+ $edid->{edid_version} > 1 || $edid->{edid_revision} > 2 ? '16/10' : '1/1',
+ '4/3', '5/4', '16/9',
+ );
+ $v = [ map {
+ my $h = _get_many_bits($_, 'standard_timing');
+ $h->{X} = ($h->{X} + 31) * 8;
+ if ($_ ne "\x20\x20" && $h->{X} > 256){ # cf VALID_TIMING in Xorg edid.h
+ $h->{vfreq} += 60;
+ if ($h->{ratio} = $aspect2ratio[$h->{aspect}]){
+ delete $h->{aspect};
+ $h->{Y} = $h->{X} / eval($h->{ratio});
+ }
+ $h;
+ }
+ else { () }
+ } unpack('a2' x (length($v) / 2), $v) ];
+ $v;
}
-sub get_shell_data {
+sub parse_edid {
eval $start if $b_log;
- my ($ppid) = @_;
- my $cmd = "ps -p $ppid -o comm= 2>/dev/null";
- my $shell = qx($cmd);
- log_data('cmd',$cmd) if $b_log;
- chomp($shell);
- if ($shell){
- #print "shell pre: $shell\n";
- # when run in debugger subshell, would return sh as shell,
- # and parent as perl, that is, pinxi itself, which is actually right.
- # trim leading /.../ off just in case. ps -p should return the name, not path
- # but at least one user dataset suggests otherwise so just do it for all.
- $shell =~ s/^.*\///;
- my $working = $ENV{'SHELL'};
- # NOTE: su -c "inxi -F" results in shell being su
- if ($shell eq 'sudo' || $shell eq 'su' ){
- $client{'su-start'} = $shell;
- $shell = get_shell_parent(get_start_parent($ppid));
+ my ($raw_edid, $verbose) = @_;
+ my (%edid, @warnings);
+ my ($main_edid, @eedid_blocks) = unpack("a128" x (length($raw_edid) / 128), $raw_edid);
+ my @vals = unpack(join('', map { $_->[0] } @edid_info), $main_edid);
+ my $i = 0;
+ foreach (@edid_info) {
+ my ($field, $v) = ($_->[1], $vals[$i++]);
+ if ($field eq 'year'){
+ $v += 1990;
+ }
+ elsif ($field eq 'manufacturer_name'){
+ my $h = _get_many_bits($v, 'manufacturer_name');
+ $v = join('', map { chr(ord('A') + $h->{$_} - 1) } 1 .. 3);
+ $v = "" if $v eq "@@@";
+ $edid{'manufacturer_name_nice'} = ($v && $vendors{$v}) ? $vendors{$v} : '';
+ }
+ elsif ($field eq 'video_input_definition'){
+ $v = _get_many_bits($v, 'video_input_definition');
}
- if ($working){
- $working =~ s/^.*\///;
-# if (($shell eq 'sh' || $shell eq 'sudo' || $shell eq 'su' ) && $shell ne $working){
-# $client{'su-start'} = $shell if ($shell eq 'sudo' || $shell eq 'su');
-# $shell = $working;
-# }
- # a few manual changes for known
- # Note: parent when fizsh shows as zsh but SHELL is fizsh, but other times
- # SHELL is default shell, but in zsh, SHELL is default shell, not zfs
- if ($shell eq 'zsh' && $working eq 'fizsh' ){
- $shell = $working;
+ elsif ($field eq 'feature_support'){
+ $v = _get_many_bits($v, 'feature_support');
+ }
+ elsif ($field eq 'color_characteristics'){
+ $v = _get_many_bits($v, 'color_characteristics');
+ }
+ elsif ($field eq 'established_timings'){
+ my $h = _get_many_bits($v, 'established_timings');
+ $v = [
+ sort { $a->{X} <=> $b->{X} || $a->{vfreq} <=> $b->{vfreq} }
+ map { /(\d+)x(\d+)_(\d+)(i?)/ ? { X => $1, Y => $2, vfreq => $3, $4 ? (interlace => 1) : () } : () }
+ grep { $h->{$_} } keys %$h ];
+ }
+ elsif ($field eq 'standard_timings'){
+ $v = _add_standard_timing_modes(\%edid, $v);
+ }
+ elsif ($field eq 'monitor_details'){
+ while ($v){
+ (my $pixel_clock, my $vv, $v) = unpack("v a16 a*", $v);
+ if ($pixel_clock){
+ # detailed timing
+ my $h = _build_detailed_timing($pixel_clock, $vv);
+ push @{$edid{detailed_timings}}, $h
+ if $h->{horizontal_active} > 1 && $h->{vertical_active} > 1;
+ }
+ else {
+ (my $flag, $vv) = unpack("n x a*", $vv);
+ if ($flag == 0xfd){
+ # range
+ $edid{monitor_range} = _get_many_bits($vv, 'monitor_range');
+ if ($edid{monitor_range}{pixel_clock_max} == 0xff){
+ delete $edid{monitor_range}{pixel_clock_max};
+ }
+ else {
+ $edid{monitor_range}{pixel_clock_max} *= 10; #- to have it in MHz
+ }
+ }
+ elsif ($flag == 0xf){
+ my $range = _get_many_bits($vv, 'manufacturer_specified_range_timing');
+ my $e = $edid{detailed_timings}[0];
+ my $valid = 1;
+ foreach my $m ('min', 'max') {
+ my %total;
+ foreach my $dir ('horizontal', 'vertical'){
+ $range->{$dir . '_sync_pulse_width_' . $m} *= 2;
+ $range->{$dir . '_back_porch_' . $m} *= 2;
+ $range->{$dir . '_blanking_' . $m} *= 2;
+ if ($e && $e->{$dir . '_active'}
+ && _within_limit($e->{$dir . '_blanking'}, $m, $range->{$dir . '_blanking_' . $m})
+ && _within_limit($e->{$dir . '_sync_pulse_width'}, $m, $range->{$dir . '_sync_pulse_width_' . $m})
+ && _within_limit($e->{$dir . '_blanking'} - $e->{$dir . '_sync_offset'} - $e->{$dir . '_sync_pulse_width'},
+ $m, $range->{$dir . '_back_porch_' . $m})){
+ $total{$dir} = $e->{$dir . '_active'} + $range->{$dir . '_blanking_' . $m};
+ }
+ }
+ if ($total{horizontal} && $total{vertical}){
+ my $hfreq = $e->{pixel_clock} * 1000 / $total{horizontal};
+ my $vfreq = $hfreq * 1000 / $total{vertical};
+ $range->{'horizontal_' . ($m eq 'min' ? 'max' : 'min')} = _round($hfreq);
+ $range->{'vertical_' . ($m eq 'min' ? 'max' : 'min')} = _round($vfreq);
+ }
+ else {
+ $valid = 0;
+ }
+ }
+ $edid{$valid ? 'monitor_range' : 'manufacturer_specified_range_timing'} = $range;
+ }
+ elsif ($flag == 0xfa){
+ push @{$edid{standard_timings}}, _add_standard_timing_modes(\%edid, unpack('a12', $vv));
+ }
+ elsif ($flag == 0xfc){
+ my $prev = $edid{monitor_name};
+ $edid{monitor_name} = ($prev ? "$prev " : '') . unpack('A13', $vv);
+ }
+ elsif ($flag == 0xfe){
+ push @{$edid{monitor_text}}, unpack('A13', $vv);
+ }
+ elsif ($flag == 0xff){
+ push @{$edid{serial_number2}}, unpack('A13', $vv);
+ }
+ elsif ($vv ne "\0" x 13 && $vv ne " " x 13){
+ push(@warnings, "parse_edid: unknown flag $flag");
+ warn "$warnings[-1]\n" if $verbose;
+ }
+ }
}
}
- # print "shell post: $shell working: $working\n";
- # since there are endless shells, we'll keep a list of non program value
- # set shells since there is little point in adding those to program values
- if (test_shell($shell)){
- # do nothing, just leave $shell as is
- }
- # note: not all programs return version data. This may miss unhandled shells!
- elsif ((@app = main::program_data(lc($shell),lc($shell),1)) && $app[0]){
- $shell = $app[0];
- $client{'version'} = $app[1] if $app[1];
- #print "app test $shell v: $client{'version'}\n";
- }
- else {
- # NOTE: we used to guess here with position 2 --version but this cuold lead
- # to infinite loops when inxi called from a script 'infos' that is in PATH and
- # script does not have any start arg handlers or bad arg handlers:
- # eg: shell -> infos -> inxi -> sh -> infos --version -> infos -> inxi...
- # Basically here we are hoping that the grandparent is a shell, or at least
- # recognized as a known possible program
- #print "app not shell?: $shell\n";
- if ($shell){
- # print 'shell: ' . $shell .' Start client version type: ', get_shell_parent(get_start_parent(getppid())), "\n";
- my $parent = get_shell_parent(get_start_parent($ppid));
- if ($parent){
- if (test_shell($parent)){
- $shell = $parent;
- }
- elsif ((@app = main::program_data(lc($parent),lc($parent),0)) && $app[0]){
- $shell = $app[0];
- $client{'version'} = $app[1] if $app[1];
+ $edid{$field} = $v if $field && $field !~ /^_/;
+ }
+ foreach (@eedid_blocks){
+ my ($tag, $v) = unpack("C a*", $_);
+ if ($tag == 0x02){ # CEA EDID
+ my $dtd_offset;
+ ($dtd_offset, $v) = unpack("x C x a*", $v);
+ next if $dtd_offset < 4;
+ $dtd_offset -= 4;
+ while ($dtd_offset > 0){
+ if (!$v){
+ push(@warnings, "parse_edid: DTD offset outside of available data");
+ warn "$warnings[-1]\n" if $verbose;
+ last;
+ }
+ my $h = _get_many_bits($v, 'cea_data_block_collection');
+ $dtd_offset -= $h->{size} + 1;
+ my $vv;
+ ($vv, $v) = unpack("x a$h->{size} a*", $v);
+ if ($h->{type} == 0x02){ # Video Data Block
+ my @vmodes = unpack("a" x $h->{size}, $vv);
+ foreach my $vmode (@vmodes){
+ $h = _get_many_bits($vmode, 'cea_video_data_block');
+ my $cea_mode = $cea_video_modes[$h->{mode} - 1];
+ if (!$cea_mode){
+ push(@warnings, "parse_edid: unhandled CEA mode $h->{mode}");
+ warn "$warnings[-1]\n" if $verbose;
+ next;
+ }
+ my %det_mode = (source => 'cea_vdb');
+ @det_mode{@cea_video_mode_to_detailed_timing} = @$cea_mode;
+ push @{$edid{detailed_timings}}, \%det_mode;
}
- #print "shell3: $shell version: $client{'version'}\n";
}
}
- else {
- $client{'version'} = row_defaults('unknown-shell');
+ while (length($v) >= 18){
+ (my $pixel_clock, my $vv, $v) = unpack("v a16 a*", $v);
+ last if !$pixel_clock;
+ my $h = _build_detailed_timing($pixel_clock, $vv);
+ push @{$edid{detailed_timings}}, $h
+ if $h->{horizontal_active} > 1 && $h->{vertical_active} > 1;
}
- #print "shell not app version: $client{'version'}\n";
+ }
+ else {
+ push(@warnings, "parse_edid: unknown tag $tag");
+ warn "$warnings[-1]\n" if $verbose;
}
- $client{'version'} ||= '';
- $client{'version'} =~ s/(\(.*|-release|-version)// if $client{'version'};
- $client{'name'} = lc($shell);
- $client{'name-print'} = $shell;
- #print "shell4: $client{'name-print'} version: $client{'version'}\n";
- if ($extra > 2 && $working && lc($shell) ne lc($working)){
- if (@app = main::program_data(lc($working))){
- $client{'default-shell'} = $app[0];
- $client{'default-shell-v'} = $app[1];
- $client{'default-shell-v'} =~ s/(\(.*|-release|-version)// if $client{'default-shell-v'};
- }
- else {
- $client{'default-shell'} = $working;
+ }
+ $edid{max_size_precision} = 'cm';
+ if ($edid{product_code}){
+ $edid{product_code_h} = sprintf('%04x', $edid{product_code});
+ if ($edid{manufacturer_name}){
+ $edid{EISA_ID} = $edid{manufacturer_name} . $edid{product_code_h};
+ }
+ $edid{product_code_h} = '0x'. $edid{product_code_h};
+ }
+ if ($edid{monitor_range}){
+ $edid{HorizSync} = $edid{monitor_range}{horizontal_min} . '-' . $edid{monitor_range}{horizontal_max};
+ $edid{VertRefresh} = $edid{monitor_range}{vertical_min} . '-' . $edid{monitor_range}{vertical_max};
+ }
+ if ($edid{max_size_vertical}){
+ $edid{ratio} = $edid{max_size_horizontal} / $edid{max_size_vertical};
+ $edid{ratio_name} = _ratio_name($edid{max_size_horizontal}, $edid{max_size_vertical}, 'cm');
+ $edid{ratio_precision} = 'cm';
+ }
+ if ($edid{feature_support}{has_preferred_timing} && $edid{detailed_timings}[0]){
+ $edid{detailed_timings}[0]{preferred} = 1;
+ }
+ foreach my $h (@{$edid{detailed_timings}}){
+ # EDID standard is ambiguous on how interlaced modes should be
+ # specified; workaround clearly broken modes:
+ if ($h->{interlaced}){
+ foreach ("720x480", "1440x480", "2880x480", "720x576", "1440x576", "2880x576", "1920x1080"){
+ if ($_ eq $h->{horizontal_active} . 'x' . $h->{vertical_active} * 2){
+ $h->{vertical_active} *= 2;
+ $h->{vertical_blanking} *= 2;
+ $h->{vertical_sync_offset} *= 2;
+ $h->{vertical_sync_pulse_width} *= 2;
+ $h->{vertical_blanking} |= 1;
+ }
}
}
+ # if the mm size given in the detailed_timing is not far from the cm size
+ # put it as a more precise cm size
+ my %in_cm = (
+ horizontal => _define($h->{horizontal_image_size}) / 10,
+ vertical => _define($h->{vertical_image_size}) / 10,
+ );
+ my ($error) = sort { $b <=> $a } map { abs($edid{'max_size_' . $_} - $in_cm{$_}) } keys %in_cm;
+ if ($error <= 0.5){
+ $edid{'max_size_' . $_} = $in_cm{$_} foreach keys %in_cm;
+ $edid{max_size_precision} = 'mm';
+ }
+ if ($error < 1 && $in_cm{vertical}){
+ # using it for the ratio
+ $edid{ratio} = $in_cm{horizontal} / $in_cm{vertical};
+ $edid{ratio_name} = _ratio_name($in_cm{horizontal}, $in_cm{vertical}, 'mm');
+ $edid{ratio_precision} = 'mm';
+ }
+ if ($edid{ratio_precision} &&
+ abs($edid{ratio} - $h->{horizontal_active} / $h->{vertical_active}) > ($edid{ratio_precision} eq 'mm' ? 0.02 : 0.2)){
+ $h->{bad_ratio} = 1;
+ }
+ if ($edid{ratio_name}){
+ $edid{ratios} = $edid{ratio_name};
+ $edid{ratios} =~ s|/|:|g;
+ $edid{ratios} = [split(/ or /, $edid{ratios})]; # "3/2 or 16/10"
+ }
+ if ($edid{max_size_vertical}){
+ $h->{vertical_dpi} = $h->{vertical_active} / $edid{max_size_vertical} * 2.54;
+ }
+ if ($edid{max_size_horizontal}){
+ $h->{horizontal_dpi} = $h->{horizontal_active} / $edid{max_size_horizontal} * 2.54;
+ }
+ if ($h->{horizontal_image_size}){
+ $h->{horizontal_image_size_i} = sprintf('%.2f',($h->{horizontal_image_size}/25.4)) + 0;
+ }
+ if ($h->{vertical_image_size}){
+ $h->{vertical_image_size_i} = sprintf('%.2f',($h->{vertical_image_size}/25.4)) + 0;
+ }
+ my $dpi_string = '';
+ if ($h->{vertical_dpi} && $h->{horizontal_dpi}){
+ $dpi_string =
+ abs($h->{vertical_dpi} / $h->{horizontal_dpi} - 1) < 0.05 ?
+ sprintf("%d dpi", $h->{horizontal_dpi}) :
+ sprintf("%dx%d dpi", $h->{horizontal_dpi}, $h->{vertical_dpi});
+ }
+ my $horizontal_total = $h->{horizontal_active} + $h->{horizontal_blanking};
+ my $vertical_total = $h->{vertical_active} + $h->{vertical_blanking};
+ no warnings 'uninitialized';
+ $h->{ModeLine_comment} = sprintf(qq(# Monitor %s%s modeline (%.1f Hz vsync, %.1f kHz hsync, %sratio %s%s)),
+ $h->{preferred} ? "preferred" : "supported",
+ $h->{source} eq 'cea_vdb' ? " CEA" : '',
+ $h->{pixel_clock} / $horizontal_total / $vertical_total * 1000 * 1000 * ($h->{interlaced} ? 2 : 1),
+ $h->{pixel_clock} / $horizontal_total * 1000,
+ $h->{interlaced} ? "interlaced, " : '',
+ _nearest_ratio($h->{horizontal_active} / $h->{vertical_active}, 0.01) || sprintf("%.2f", $h->{horizontal_active} / $h->{vertical_active}),
+ $dpi_string ? ", $dpi_string" : '');
+
+ $h->{ModeLine} = sprintf(qq("%dx%d" $h->{pixel_clock} %d %d %d %d %d %d %d %d %shsync %svsync%s),
+ $h->{horizontal_active}, $h->{vertical_active},
+ $h->{horizontal_active},
+ $h->{horizontal_active} + $h->{horizontal_sync_offset},
+ $h->{horizontal_active} + $h->{horizontal_sync_offset} + $h->{horizontal_sync_pulse_width},
+ $horizontal_total,
+ $h->{vertical_active},
+ $h->{vertical_active} + $h->{vertical_sync_offset},
+ $h->{vertical_active} + $h->{vertical_sync_offset} + $h->{vertical_sync_pulse_width},
+ $vertical_total,
+ $h->{horizontal_sync_positive} ? '+' : '-',
+ $h->{vertical_sync_positive} ? '+' : '-',
+ $h->{interlaced} ? ' Interlace' : '');
}
- else {
- $client{'name'} = 'shell';
- $client{'name-print'} = 'Unknown Shell';
+ $edid{diagonal_size} = sqrt(_sqr($edid{max_size_horizontal}) + _sqr($edid{max_size_vertical})) / 2.54;
+ # we want to use null data found tests so only return errors/warnings if
+ # %edid or if verbose, since then we want to know no matter what.
+ if (%edid || $verbose){
+ _edid_errors(\%edid);
+ $edid{edid_warnings} = \@warnings if @warnings;
}
- $client{'su-start'} = 'sudo' if (!$client{'su-start'} && $ENV{'SUDO_USER'});
eval $end if $b_log;
-}
-# list of program_values non-handled shells, or known to have no version
-# Move shell to set_program_values for print name, or version if available
-sub test_shell {
- my ($test) = @_;
- # not verified or tested
- my $shells = 'apush|ccsh|ch|esh|eshell|heirloom|hush|';
- $shells .= 'ion|imrsh|larryshell|mrsh|msh(ell)?|murex|nsh|nu(shell)?|';
- $shells .= 'psh|pwsh|pysh(ell)?|rush|sash|';
- # tested shells with no version info discovered
- $shells .= 'es|rc|scsh|sh';
- return '|' . $shells if $test eq 'return';
- return ($test =~ /^($shells)$/) ? $test : '';
+ \%edid;
}
-sub get_shell_source {
- eval $start if $b_log;
- my (@data);
- my ($msg,$self_parent,$shell_parent) = ('','','');
- my $ppid = getppid();
- $self_parent = get_start_parent($ppid);
- if ($b_log){
- $msg = ($ppid) ? "self parent: $self_parent ppid: $ppid": "self parent: undefined";
- log_data('data',$msg);
- }
- #print "self parent: $self_parent ppid: $ppid\n";
- if ($self_parent){
- $shell_parent = get_shell_parent($self_parent);
- $client{'su-start'} = $shell_parent if ($shell_parent eq 'su' && !$client{'su-start'});
- #print "shell parent 1: $shell_parent\n";
- if ($b_log){
- $msg = ($shell_parent) ? "shell parent 1: $shell_parent": "shell parent 1: undefined";
- log_data('data',$msg);
+sub _edid_errors {
+ my $edid = shift @_;
+ if (!defined $edid->{edid_version}){
+ _edid_error($edid,'edid-version','undefined');
+ }
+ elsif ($edid->{edid_version} < 1 || $edid->{edid_version} > 2){
+ _edid_error($edid,'edid-version',$edid->{edid_version});
+ }
+ if (!defined $edid->{edid_revision}){
+ _edid_error($edid,'edid-revision','undefined');
+ }
+ elsif ($edid->{edid_revision} == 0xff){
+ _edid_error($edid,'edid-revision',$edid->{edid_revision});
+ }
+ if ($edid->{monitor_range}){
+ if (!$edid->{monitor_range}{horizontal_min}){
+ _edid_error($edid,'edid-sync','no horizontal');
}
- # in case sudo starts inxi, parent is shell (or perl inxi if run by debugger)
- # so: perl (2) started pinxi with sudo (3) in sh (4) in terminal
- my $shells = 'ash|bash|busybox|cicada|csh|dash|elvish|fish|fizsh|ksh|ksh93|';
- $shells .= 'lksh|loksh|mksh|nash|oh|oil|osh|pdksh|perl|posh|';
- $shells .= 'su|sudo|tcsh|xonsh|yash|zsh';
- $shells .= test_shell('return');
- for my $i (2..4){
- if ( $shell_parent && $shell_parent =~ /^($shells)$/ ){
- # no idea why have to do script_parent action twice in su case, but you do.
- $self_parent = get_start_parent($self_parent);
- $shell_parent = get_shell_parent($self_parent);
- #print "self::shell parent 2-${i}: $self_parent :: $shell_parent\n";
- if ($b_log){
- $msg = ($shell_parent) ? "shell parent $i: $shell_parent": "shell parent $i: undefined";
- log_data('data',$msg);
- }
- }
- else {
- last;
- }
+ elsif ($edid->{monitor_range}{horizontal_min} > $edid->{monitor_range}{horizontal_max}){
+ _edid_error($edid,'edid-sync',
+ "bad horizontal values: min: $edid->{monitor_range}{horizontal_min} max: $edid->{monitor_range}{horizontal_max}");
+ }
+ if (!$edid->{monitor_range}{vertical_min}){
+ _edid_error($edid,'edid-sync','no vertical');
+ }
+ elsif ($edid->{monitor_range}{vertical_min} > $edid->{monitor_range}{vertical_max}){
+ _edid_error($edid,'edid-sync',
+ "bad vertical values: min: $edid->{monitor_range}{vertical_min} max: $edid->{monitor_range}{vertical_max}");
}
- # to work around a ps -p or gnome-terminal bug, which returns
- # gnome-terminal- trim - off end
- $shell_parent =~ s/-$// if $shell_parent;
- }
- if ($b_log){
- $self_parent ||= '';
- $shell_parent ||= '';
- log_data('data',"parents: self: $self_parent shell: $shell_parent");
}
- eval $end if $b_log;
- return $shell_parent;
}
-# utilities for get_shell_source
-# arg: 1 - parent id
-sub get_start_parent {
- eval $start if $b_log;
- my ($parent) = @_;
- return 0 if !$parent;
- # ps -j -fp : bsds ps do not have -f for PPID, so we can't get the ppid
- my $cmd = "ps -j -fp $parent 2>/dev/null";
- log_data('cmd',$cmd) if $b_log;
- my @data = grabber($cmd);
- #shift @data if @data;
- my $self_parent = awk(\@data,"$parent",3,'\s+');
- eval $end if $b_log;
- return $self_parent;
+sub _edid_error {
+ my ($edid,$error,$data) = @_;
+ $edid->{edid_errors} = [] if !$edid->{edid_errors};
+ push(@{$edid->{edid_errors}},main::message($error,$data));
}
-# arg: 1 - parent id
-sub get_shell_parent {
- eval $start if $b_log;
- my ($parent) = @_;
- return '' if !$parent;
- my $cmd = "ps -j -p $parent 2>/dev/null";
- log_data('cmd',$cmd) if $b_log;
- my @data = grabber($cmd,'','strip');
- #shift @data if @data;
- my $shell_parent = awk(\@data, "$parent",-1,'\s+');
- eval $end if $b_log;
- return $shell_parent;
+sub _nearest_ratio {
+ my ($ratio, $max_error) = @_;
+ my @sorted =
+ sort { $a->[1] <=> $b->[1] }
+ map {
+ my $error = abs($ratio - eval($_));
+ $error > $max_error ? () : [ $_, $error ];
+ } @known_ratios;
+ $sorted[0][0];
}
-# this will test against default IP like: (:0) vs full IP to determine
-# ssh status. Surprisingly easy test? Cross platform
-sub get_ssh_status {
- eval $start if $b_log;
- my ($b_ssh,$ssh);
- # fred pts/10 2018-03-24 16:20 (:0.0)
- # fred-remote pts/1 2018-03-27 17:13 (43.43.43.43)
- if (my $program = check_program('who')){
- $ssh = (grabber("$program am i 2>/dev/null"))[0];
- # crude IP validation
- if ($ssh && $ssh =~ /\(([:0-9a-f]{8,}|[1-9][\.0-9]{6,})\)$/){
- $b_ssh = 1;
+sub _ratio_name {
+ my ($horizontal, $vertical, $precision) = @_;
+ if ($precision eq 'mm'){
+ _nearest_ratio($horizontal / $vertical, 0.1);
+ }
+ else {
+ my $error = 0.5;
+ my $ratio1 = _nearest_ratio(($horizontal + $error) / ($vertical - $error), 0.2);
+ my $ratio2 = _nearest_ratio(($horizontal - $error) / ($vertical + $error), 0.2);
+ $ratio1 && $ratio2 or return;
+ if ($ratio1 eq $ratio2){
+ $ratio1;
+ }
+ else {
+ my $ratio = _nearest_ratio($horizontal / $vertical, 0.2);
+ join(' or ', $ratio, $ratio eq $ratio1 ? $ratio2 : $ratio1);
}
}
- eval $end if $b_log;
- return $b_ssh;
}
-sub get_tty_console_irc {
- eval $start if $b_log;
+sub _define {
+ defined $_[0] ? $_[0] : 0;
+}
+
+sub _sqr {
+ $_[0] * $_[0];
+}
+
+sub _round {
+ int($_[0] + 0.5);
+}
+}
+
+## PartitionData: public methods: set(), get()
+# for /proc/partitions only, see DiskDataBSD for BSD partition data.
+{
+package PartitionData;
+
+sub set {
my ($type) = @_;
- return $tty_session if defined $tty_session;
- if ( $type eq 'vtrn' && defined $ENV{'XDG_VTNR'} ){
- $tty_session = $ENV{'XDG_VTNR'};
- }
- else {
- my $ppid = getppid();
- $tty_session = awk(\@ps_aux,".*$ppid.*$client{'name'}",7,'\s+');
- $tty_session =~ s/^[^[0-9]+// if $tty_session;
+ $loaded{'partition-data'} = 1;
+ if (my $file = $system_files{'proc-partitions'}){
+ proc_data($file);
}
- $tty_session = '' if ! defined $tty_session;
- log_data('data',"conole-irc-tty:$tty_session") if $b_log;
- eval $end if $b_log;
- return $tty_session;
}
-sub get_tty_number {
+# args: 0: partition name, without /dev, like sda1, sde
+sub get {
eval $start if $b_log;
- my ($tty);
- if ( defined $ENV{'XDG_VTNR'} ){
- $tty = $ENV{'XDG_VTNR'};
- }
- else {
- $tty = POSIX::ttyname(1);
- #variants: /dev/pts/1 /dev/tty1 /dev/ttyp2 /dev/ttyra [hex number a]
- $tty =~ s/.*\/[^0-9]*//g if defined $tty;
+ my $item = $_[0];
+ return if !@proc_partitions;
+ my $result;
+ foreach my $device (@proc_partitions){
+ if ($device->[3] eq $item){
+ $result = $device;
+ last;
+ }
}
- $tty = '' if ! defined $tty;
- log_data('data',"tty:$tty") if $b_log;
- eval $end if $b_log;
- return $tty;
+ eval $start if $b_log;
+ return ($result) ? $result : [];
}
-# 2:58PM up 437 days, 8:18, 3 users, load averages: 2.03, 1.72, 1.77
-# 04:29:08 up 3:18, 3 users, load average: 0,00, 0,00, 0,00
-# 10:23PM up 5 days, 16:17, 1 user, load averages: 0.85, 0.90, 1.00
-# 05:36:47 up 1 day, 3:28, 4 users, load average: 1,88, 0,98, 0,62
-# 05:36:47 up 1 day, 3 min, 4 users, load average: 1,88, 0,98, 0,62
-# 04:41:23 up 2:16, load average: 7.13, 6.06, 3.41 # root openwrt
-sub get_uptime {
+sub proc_data {
eval $start if $b_log;
- my ($days,$hours,$minutes,$uptime) = ('','','','');
- if (check_program('uptime')){
- $uptime = qx(uptime);
- $uptime = trimmer($uptime);
- #$uptime = '05:36:47 up 3 min, 4 users, load average: 1,88, 0,98, 0,62';
- if ($uptime &&
- $uptime =~ /[\S]+\s+up\s+(([0-9]+)\s+day[s]?,\s+)?(([0-9]{1,2}):([0-9]{1,2})|([0-9]+)\smin[s]?),\s+([0-9]+\s+user|load average)/){
- $days = $2 . 'd' if $2;
- $days .= ' ' if ($days && ($4 || $6));
- if ($4 && $5){
- $hours = $4 . 'h ';
- $minutes = $5 . 'm';
- }
- elsif ($6){
- $minutes = $6 . 'm';
-
- }
- $uptime = $days . $hours . $minutes;
- }
+ my $file = $_[0];
+ if ($fake{'partitions'}){
+ # $file = "$fake_data_dir/block-devices/proc-partitions/proc-partitions-1.txt";
+ }
+ my @parts = main::reader($file,'strip');
+ # print Data::Dumper::Dumper \@parts;
+ shift @parts if @parts; # get rid of headers
+ for (@parts){
+ my @temp = split(/\s+/, $_);
+ next if !defined $temp[2];
+ push (@proc_partitions,[$temp[0],$temp[1],$temp[2],$temp[3]]);
}
- $uptime ||= 'N/A';
eval $end if $b_log;
- return $uptime;
+}
}
-#### -------------------------------------------------------------------
-#### SET DATA VALUES
-#### -------------------------------------------------------------------
-
-## creates arrays: @devices_audio; @devices_graphics; @devices_hwraid;
-## @devices_network; @devices_timer plus @devices for logging/debugging
-# 0 type
-# 1 type_id
-# 2 bus_id
-# 3 sub_id
-# 4 device
-# 5 vendor_id
-# 6 chip_id
-# 7 rev
-# 8 port
-# 9 driver
-# 10 modules
-# 11 driver_nu [bsd, like: em0 - driver em; nu 0. Used to match IF in -n
-# 12 subsystem/vendor
-# 13 subsystem vendor_id:chip id
-# 14 soc handle
-## DeviceData / PCI / SOC
-{
-package DeviceData;
-my (@data,@devices,@files,@full_names,@pcis,@temp,@temp2,@temp3);
-
-my ($busid,$busid_nu,$chip_id,$content,$device,$driver,$driver_nu,$file,
-$handle,$modules,$port,$rev,$temp,$type,$type_id,$vendor,$vendor_id);
-
-sub set {
+# args: 0: pci device string; 1: pci cleaned subsystem string
+sub get_pci_vendor {
eval $start if $b_log;
- $_[0] = 1; # check boolean passed by reference
- if ( $b_pci ){
- if (!$bsd_type){
- if ($alerts{'lspci'}{'action'} eq 'use' ){
- lspci_data();
- }
- # ! -d '/proc/bus/pci'
- # this is sketchy, a sbc won't have pci, but a non sbc arm may have it, so
- # build up both and see what happens
- if ($b_arm || $b_mips || $b_ppc || $b_sparc){
- soc_data();
- }
+ my ($device, $subsystem) = @_;
+ return if !$subsystem;
+ my ($vendor,$sep) = ('','');
+ # get rid of any [({ type characters that will make regex fail
+ # and similar matches show as non-match
+ my @data = split(/\s+/, clean_regex($subsystem));
+ foreach my $word (@data){
+ # AMD Tahiti PRO [Radeon HD 7950/8950 OEM / R9 280]
+ # PC Partner Limited / Sapphire Technology Tahiti PRO [Radeon HD 7950/8950 OEM / R9 280]
+ # $word =~ s/(\+|\$|\?|\^|\*)/\\$1/g;
+ if (length($word) == 1 || $device !~ m|\b\Q$word\E\b|i){
+ $vendor .= $sep . $word;
+ $sep = ' ';
}
else {
- #if (1 == 1){
- if ($alerts{'pciconf'}{'action'} eq 'use'){
- pciconf_data();
- }
- elsif ($alerts{'pcidump'}{'action'} eq 'use'){
- pcidump_data();
- }
- }
- if ($test[9]){
- print Data::Dumper::Dumper \@devices_audio;
- print Data::Dumper::Dumper \@devices_graphics;
- print Data::Dumper::Dumper \@devices_network;
- print Data::Dumper::Dumper \@devices_hwraid;
- print Data::Dumper::Dumper \@devices_timer;
- print "vm: $device_vm\n";
- }
- if ( $b_log){
- main::log_data('dump','@devices_audio',\@devices_audio);
- main::log_data('dump','@devices_graphics',\@devices_graphics);
- main::log_data('dump','@devices_hwraid',\@devices_hwraid);
- main::log_data('dump','@devices_network',\@devices_network);
- main::log_data('dump','@devices_timer',\@devices_timer);
+ last;
}
}
- @devices = undef;
+ # just in case we had a standalone last character after done
+ $vendor =~ s| [/\(\[\{a\.,-]$|| if $vendor;
eval $end if $b_log;
+ return $vendor;
}
-sub lspci_data {
+# $rows, $num by ref.
+sub get_pcie_data {
+ eval $start if $b_log;
+ my ($bus_id,$j,$rows,$num,$type) = @_;
+ $type ||= '';
+ # see also /sys/class/drm/
+ my $path_start = '/sys/bus/pci/devices/0000:';
+ return if !$bus_id || ! -d $path_start . $bus_id;
+ $path_start .= $bus_id;
+ my $path = $path_start . '/{max_link_width,current_link_width,max_link_speed';
+ $path .= ',current_link_speed}';
+ my @files = globber($path);
+ if ($type eq 'gpu'){
+ $path = $path_start . '/0000*/0000*/{mem_info_vram_used,mem_info_vram_total}';
+ push(@files,globber($path));
+ }
+ # print @files,"\n";
+ return if !@files;
+ my (%data,$name);
+ my %gen = (
+ '2.5 GT/s' => 1,
+ '5 GT/s' => 2,
+ '8 GT/s' => 3,
+ '16 GT/s' => 4,
+ '32 GT/s' => 5,
+ '64 GT/s' => 6,
+ );
+ foreach (@files){
+ if (-r $_){
+ $name = $_;
+ $name =~ s|^/.*/||;
+ $data{$name} = reader($_,'strip',0);
+ if ($name eq 'max_link_speed' || $name eq 'current_link_speed'){
+ $data{$name} =~ s/\.0\b| PCIe$//g; # trim .0 off in 5.0, 8.0
+ }
+ }
+ }
+ # print Data::Dumper::Dumper \%data;
+ # Maximum PCIe Bandwidth = SPEED * WIDTH * (1 - ENCODING) - 1Gb/s.
+ if ($data{'current_link_speed'} && $data{'current_link_width'}){
+ $$rows[$j]->{key($$num++,1,2,'pcie')} = '';
+ if ($b_admin && $gen{$data{'current_link_speed'}}){
+ $$rows[$j]{key($$num++,0,3,'gen')} = $gen{$data{'current_link_speed'}};
+ }
+ $$rows[$j]{key($$num++,0,3,'speed')} = $data{'current_link_speed'};
+ $$rows[$j]->{key($$num++,0,3,'lanes')} = $data{'current_link_width'};
+ if ($b_admin && (($data{'max_link_speed'} &&
+ $data{'max_link_speed'} ne $data{'current_link_speed'}) ||
+ ($data{'max_link_width'} &&
+ $data{'max_link_width'} ne $data{'current_link_width'}))){
+ $$rows[$j]->{key($$num++,1,3,'link-max')} = '';
+ if ($data{'max_link_speed'} &&
+ $data{'max_link_speed'} ne $data{'current_link_speed'}){
+ $$rows[$j]{key($$num++,0,4,'gen')} = $gen{$data{'max_link_speed'}};
+ $$rows[$j]->{key($$num++,0,4,'speed')} = $data{'max_link_speed'};
+ }
+ if ($data{'max_link_width'} &&
+ $data{'max_link_width'} ne $data{'current_link_width'}){
+ $$rows[$j]->{key($$num++,0,4,'lanes')} = $data{'max_link_width'};
+ }
+ }
+ }
+ if ($type eq 'gpu' && $data{'mem_info_vram_used'} && $data{'mem_info_vram_total'}){
+ $$rows[$j]->{key($$num++,1,2,'vram')} = '';
+ $$rows[$j]->{key($$num++,0,3,'total')} = get_size($data{'mem_info_vram_total'}/1024,'string');
+ my $used = get_size($data{'mem_info_vram_used'}/1024,'string');
+ $used .= ' (' . sprintf('%0.1f',($data{'mem_info_vram_used'}/$data{'mem_info_vram_total'}*100)) . '%)';
+ $$rows[$j]->{key($$num++,0,3,'used')} = $used;
+
+ }
+ eval $end if $b_log;
+}
+
+## PowerData: public method: get()
+# No BSD support currently. Test by !$bsd_type. Should any BSD data source
+# appear, make bsd_data() and add $bsd_type switch here, remove from caller.
+{
+package PowerData;
+my $power = {};
+
+# args: 0: $power by ref
+sub get {
eval $start if $b_log;
- my ($subsystem,$subsystem_id);
- @data = pci_grabber('lspci');
- #print Data::Dumper::Dumper \@data;
- foreach (@data){
- #print "$_\n";
- if ($device){
- if ($_ =~ /^~$/) {
- @temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
- $rev,$port,$driver,$modules,$driver_nu,$subsystem,$subsystem_id);
- assign_data('pci',@temp);
- $device = '';
- #print "$busid $device_id r:$rev p: $port\n$type\n$device\n";
- }
- elsif ($_ =~ /^Subsystem.*\[([a-f0-9]{4}:[a-f0-9]{4})\]/){
- $subsystem_id = $1;
- $subsystem = (split /^Subsystem:\s*/,$_)[1];
- $subsystem =~ s/(\s?\[[^\]]+\])+$//g;
- $subsystem = main::cleaner($subsystem);
- $subsystem = main::pci_cleaner($subsystem,'pci');
- $subsystem = main::pci_cleaner_subsystem($subsystem);
- #print "ss:$subsystem\n";
- }
- elsif ($_ =~ /^I\/O\sports/){
- $port = (split /\s+/,$_)[3];
- #print "p:$port\n";
- }
- elsif ($_ =~ /^Kernel\sdriver\sin\suse/){
- $driver = (split /:\s*/,$_)[1];
- }
- elsif ($_ =~ /^Kernel\smodules/i){
- $modules = (split /:\s*/,$_)[1];
- }
- }
- # note: arm servers can have more complicated patterns
- # 0002:01:02.0 Ethernet controller [0200]: Cavium, Inc. THUNDERX Network Interface Controller virtual function [177d:a034] (rev 08)
- elsif ($_ =~ /^(([0-9a-f]{2,4}:)?[0-9a-f]{2}:[0-9a-f]{2})[.:]([0-9a-f]+)\s(.*)\s\[([0-9a-f]{4}):([0-9a-f]{4})\](\s\(rev\s([^\)]+)\))?/){
- $busid = $1;
- $busid_nu = hex($3);
- @temp = split /:\s+/, $4;
- $device = $temp[1];
- $type = $temp[0];
- $vendor_id = $5;
- $chip_id = $6;
- $rev = ($8)? $8 : '';
- $device = main::cleaner($device);
- $temp[0] =~ /\[([^\]]+)\]$/;
- $type_id = $1;
- $b_hardware_raid = 1 if $type_id eq '0104';
- $type = lc($type);
- $type = main::pci_cleaner($type,'pci');
- $type =~ s/\s+$//;
- #print "$type\n";
- ($driver,$driver_nu,$modules,$subsystem,$subsystem_id) = ('','','','','');
- }
- }
- print Data::Dumper::Dumper \@devices if $test[4];
- main::log_data('dump','lspci @devices',\@devices) if $b_log;
+ sys_data();
eval $end if $b_log;
+ return $power;
}
-# em0@pci0:6:0:0: class=0x020000 card=0x10d315d9 chip=0x10d38086 rev=0x00 hdr=0x00
-# vendor = 'Intel Corporation'
-# device = 'Intel 82574L Gigabit Ethernet Controller (82574L)'
-# class = network
-# subclass = ethernet
-sub pciconf_data {
+sub sys_data {
eval $start if $b_log;
- @data = pci_grabber('pciconf');
- foreach (@data){
- if ($driver){
- if ($_ =~ /^~$/) {
- $vendor = main::cleaner($vendor);
- $device = main::cleaner($device);
- # handle possible regex in device name, like [ConnectX-3]
- # and which could make matches fail
- my $device_temp = main::regex_cleaner($device);
- if ($vendor && $device){
- if (main::regex_cleaner($vendor) !~ /\Q$device_temp\E/i){
- $device = "$vendor $device";
+ # Some systems also report > 1 wakeup events per wakeup with
+ # /sys/power/wakeup_count, thus, we are using /sys/power/suspend_stats/success
+ # which does not appear to have that issue. There is more info in suspend_stats
+ # which we might think of using, particularly fail events, which can be useful.
+ # this increments on suspend, but you can't see it until wake, numbers work.
+ # note: seen android instance where reading file wakeup_count hangs endlessly.
+ my %files = ('suspend-resumes' => '/sys/power/suspend_stats/success');
+ if ($extra > 2){
+ $files{'hibernate'} = '/sys/power/disk';
+ $files{'hibernate-image-size'} = '/sys/power/image_size';
+ $files{'suspend'} = '/sys/power/mem_sleep';
+ $files{'suspend-fails'} = '/sys/power/suspend_stats/fail';
+ $files{'states-avail'} = '/sys/power/state';
+ }
+ foreach (sort keys %files){
+ if (-r $files{$_}){
+ $power->{$_} = main::reader($files{$_}, 'strip', 0);
+ if ($_ eq 'states-avail'){
+ $power->{$_} =~ s/\s+/,/g if $power->{$_};
+ }
+ # seen: s2idle [deep] OR [s2idle] deep OR s2idle shallow [deep]
+ elsif ($_ eq 'hibernate' || $_ eq 'suspend'){
+ # [item] is currently selected/active option
+ if ($power->{$_}){
+ if ($power->{$_} =~ /\[([^\]]+)\]/){
+ $power->{$_ . '-active'} = $1;
+ $power->{$_} =~ s/\[$1\]//;
+ $power->{$_} =~ s/^\s+|\s+$//g;
+ }
+ # some of these can get pretty long, so handle with make_list_value
+ if ($power->{$_}){
+ main::make_list_value([split(/\s+/,$power->{$_})],\$power->{$_},',');
+ $power->{$_ . '-avail'} = $power->{$_};
}
}
- elsif (!$device){
- $device = $vendor;
- }
- @temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
- $rev,$port,$driver,$modules,$driver_nu);
- assign_data('pci',@temp);
- $driver = '';
- #print "$busid $device_id r:$rev p: $port\n$type\n$device\n";
}
- elsif ($_ =~ /^vendor/){
- $vendor = (split /\s+=\s+/,$_)[1];
- #print "p:$port\n";
- }
- elsif ($_ =~ /^device/){
- $device = (split /\s+=\s+/,$_)[1];
- }
- elsif ($_ =~ /^class/i){
- $type = (split /\s+=\s+/,$_)[1];
+ # size is in bytes
+ elsif ($_ eq 'hibernate-image-size'){
+ $power->{$_} = main::get_size(($power->{$_}/1024),'string') if defined $power->{$_};
}
}
- elsif (/^([^@]+)\@pci([0-9]{1,3}:[0-9]{1,3}:[0-9]{1,3}):([0-9]{1,3}).*class=([^\s]+)\scard=([^\s]+)\schip=([^\s]+)\srev=([^\s]+)/){
- $driver = $1;
- $busid = $2;
- $busid_nu = $3;
- $type_id = $4;
- #$vendor_id = $5;
- $vendor_id = substr($6,6,4);
- $chip_id = substr($6,2,4);
- $rev = $7;
- $driver =~ /(^[a-z]+)([0-9]+$)/;
- $driver = $1;
- $driver_nu = $2;
- # convert to 4 character, strip off 0x, and last trailing sub sub class.
- $type_id =~ s/^(0x)?([0-9a-f]{4}).*/$2/ if $type_id;
- ($device,$type,$vendor) = ('','','');
- }
}
- print Data::Dumper::Dumper \@devices if $test[4];
- main::log_data('dump','pciconf @devices',\@devices) if $b_log;
+ print 'power: ', Data::Dumper::Dumper $power if $dbg[58];
+ main::log_data('dump','$power',$power) if $b_log;
eval $end if $b_log;
}
+}
-sub pcidump_data {
- eval $start if $b_log;
- @data = pci_grabber('pcidump');
- foreach (@data){
- if ($_ =~ /^~$/ && $busid && $device) {
- @temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
- $rev,$port,$driver,$modules,$driver_nu);
- assign_data('pci',@temp);
- ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
- $rev,$port,$driver,$modules,$driver_nu) = undef;
- next;
- }
- if ($_ =~ /^([0-9a-f:]+):([0-9]+):\s([^:]+)$/i){
- $busid = $1;
- $busid_nu = $2;
- $device = main::cleaner($3);
- }
- elsif ($_ =~ /^0x[\S]{4}: Vendor ID: ([0-9a-f]{4}) Product ID: ([0-9a-f]{4})/ ){
- $vendor_id = $1;
- $chip_id = $2;
- }
- elsif ($_ =~ /^0x[\S]{4}: Class: ([0-9a-f]{2}) Subclass: ([0-9a-f]{2}) Interface: ([0-9a-f]+) Revision: ([0-9a-f]+)/){
- $type = pci_class($1);
- $type_id = "$1$2";
+# ProgramData
+# public methods:
+# full(): returns (print name, version nu, [full version data output]).
+# values(): returns program values array
+# version(): returns program version number
+{
+package ProgramData;
+my $output;
+
+# returns array of: 0: program print name 1: program version
+# args: 0: program values ID [usually program name];
+# 1: program alternate name, or path [allows for running different command];
+# 2: $extra level. Note that StartClient runs BEFORE -x levels are set!;
+# 3: [array ref/undef] return full version output block
+# Only use this function when you only need the name/version data returned
+sub full {
+ eval $start if $b_log;
+ my ($values_id,$version_id,$level,$b_return_full) = @_;
+ my @full;
+ $level = 0 if !$level;
+ # print "val_id: $values_id ver_id:$version_id lev:$level ex:$extra\n";
+ ProgramData::set_values() if !$loaded{'program-values'};
+ $version_id = $values_id if !$version_id;
+ if (my $values = $program_values{$values_id}){
+ $full[0] = $values->[3];
+ # programs that have no version method return 0 0 for index 1 and 2
+ if ($extra >= $level && $values->[1] && $values->[2]){
+ $full[1] = version($version_id,$values->[0],$values->[1],$values->[2],
+ $values->[5],$values->[6],$values->[7],$values->[8]);
}
}
- print Data::Dumper::Dumper \@devices if $test[4];
- main::log_data('dump','pcidump @devices',\@devices) if $b_log;
+ # should never trip since program should be whitelist, but mistakes happen!
+ $full[0] ||= $values_id;
+ $full[1] ||= '';
+ $full[2] = $output if $b_return_full;
eval $end if $b_log;
+ return @full;
}
-sub pci_grabber {
+
+# It's almost 1000 times slower to load these each time values() is called!!
+# %program_values: key: desktop/app command for --version => [0: search string;
+# 1: space print number; 2: [optional] version arg: -v, version, etc;
+# 3: print name; 4: console 0/1;
+# 5: [optional] exit first line 0/1 [alt: if version=file replace value with \s];
+# 6: [optional] 0/1 stderr output; 7: replace regex; 8: extra data]
+sub set_values {
+ $loaded{'program-values'} = 1;
+ %program_values = (
+ ## Clients (IRC,chat) ##
+ 'bitchx' => ['bitchx',2,'','BitchX',1,0,0,'',''],# special
+ 'finch' => ['finch',2,'-v','Finch',1,1,0,'',''],
+ 'gaim' => ['[0-9.]+',2,'-v','Gaim',0,1,0,'',''],
+ 'ircii' => ['[0-9.]+',3,'-v','ircII',1,1,0,'',''],
+ 'irssi' => ['irssi',2,'-v','Irssi',1,1,0,'',''],
+ 'irssi-text' => ['irssi',2,'-v','Irssi',1,1,0,'',''],
+ 'konversation' => ['konversation',2,'-v','Konversation',0,0,0,'',''],
+ 'kopete' => ['Kopete',2,'-v','Kopete',0,0,0,'',''],
+ 'ksirc' => ['KSirc',2,'-v','KSirc',0,0,0,'',''],
+ 'kvirc' => ['[0-9.]+',2,'-v','KVIrc',0,0,1,'',''], # special
+ 'pidgin' => ['[0-9.]+',2,'-v','Pidgin',0,1,0,'',''],
+ 'quassel' => ['',1,'-v','Quassel [M]',0,0,0,'',''], # special
+ 'quasselclient' => ['',1,'-v','Quassel',0,0,0,'',''],# special
+ 'quasselcore' => ['',1,'-v','Quassel (core)',0,0,0,'',''],# special
+ 'gribble' => ['^Supybot',2,'--version','Gribble',1,0,0,'',''],# special
+ 'limnoria' => ['^Supybot',2,'--version','Limnoria',1,0,0,'',''],# special
+ 'supybot' => ['^Supybot',2,'--version','Supybot',1,0,0,'',''],# special
+ 'weechat' => ['[0-9.]+',1,'-v','WeeChat',1,0,0,'',''],
+ 'weechat-curses' => ['[0-9.]+',1,'-v','WeeChat',1,0,0,'',''],
+ 'xchat-gnome' => ['[0-9.]+',2,'-v','X-Chat-Gnome',1,1,0,'',''],
+ 'xchat' => ['[0-9.]+',2,'-v','X-Chat',1,1,0,'',''],
+ ## Desktops / wm / compositors ##
+ '2bwm' => ['^2bwm',0,'0','2bWM',0,1,0,'',''], # unverified/based on mcwm
+ '3dwm' => ['^3dwm',0,'0','3Dwm',0,1,0,'',''], # unverified
+ '5dwm' => ['^5dwm',0,'0','5Dwm',0,1,0,'',''], # unverified
+ '9wm' => ['^9wm',3,'-version','9wm',0,1,0,'',''],
+ 'aewm' => ['^aewm',3,'--version','aewm',0,1,0,'',''],
+ 'aewm++' => ['^Version:',2,'-version','aewm++',0,1,0,'',''],
+ 'afterstep' => ['^afterstep',3,'--version','AfterStep',0,1,0,'',''],
+ 'amiwm' => ['^amiwm',0,'0','AmiWM',0,1,0,'',''], # no version
+ 'antiwm' => ['^antiwm',0,'0','AntiWM',0,1,0,'',''], # no version known
+ 'asc' => ['^asc',0,'0','asc',0,1,0,'',''],
+ 'awc' => ['^awc',0,'0','awc',0,1,0,'',''], # unverified
+ 'awesome' => ['^awesome',2,'--version','awesome',0,1,0,'',''],
+ 'beryl' => ['^beryl',0,'0','Beryl',0,1,0,'',''], # unverified; legacy
+ 'bismuth' => ['^bismuth',0,'0','Bismuth',0,1,0,'',''], # unverified
+ 'blackbox' => ['^Blackbox',2,'--version','Blackbox',0,1,0,'',''],
+ 'bspwm' => ['^\S',1,'-v','bspwm',0,1,0,'',''],
+ 'budgie-desktop' => ['^budgie-desktop',2,'--version','Budgie',0,1,0,'',''],
+ 'budgie-wm' => ['^budgie',0,'0','budgie-wm',0,1,0,'',''],
+ 'cage' => ['^cage',3,'-v','Cage',0,1,0,'',''],
+ 'cagebreak' => ['^Cagebreak',3,'-v','Cagebreak',0,1,0,'',''],
+ 'calmwm' => ['^calmwm',0,'0','CalmWM',0,1,0,'',''], # unverified
+ 'cardboard' => ['^cardboard',0,'0','Cardboard',0,1,0,'',''], # unverified
+ 'catwm' => ['^catwm',0,'0','catwm',0,1,0,'',''], # unverified
+ 'cde' => ['^cde',0,'0','CDE',0,1,0,'',''], # unverified
+ 'chameleonwm' => ['^chameleon',0,'0','ChameleonWM',0,1,0,'',''], # unverified
+ 'cinnamon' => ['^cinnamon',2,'--version','Cinnamon',0,1,0,'',''],
+ 'clfswm' => ['^clsfwm',0,'0','clfswm',0,1,0,'',''], # no version
+ 'comfc' => ['^comfc',0,'0','comfc',0,1,0,'',''], # unverified
+ 'compiz' => ['^compiz',2,'--version','Compiz',0,1,0,'',''],
+ 'compton' => ['^\d',1,'--version','Compton',0,1,0,'',''],
+ 'cosmic-comp' => ['^cosmic-comp',0,'0','cosmic-comp',0,1,0,'',''], # unverified
+ 'ctwm' => ['^\S',1,'-version','ctwm',0,1,0,'',''],
+ 'cwm' => ['^cwm',0,'0','CWM',0,1,0,'',''], # no version
+ 'dawn' => ['^dawn',1,'-v','dawn',0,1,1,'^dawn-',''], # to stderr, not verified
+ 'dcompmgr' => ['^dcompmgr',0,'0','dcompmgr',0,1,0,'',''], # unverified
+ 'deepin' => ['^Version',2,'file','Deepin',0,100,'=','','/etc/deepin-version'], # special
+ 'deepin-metacity' => ['^metacity',2,'--version','Deepin-Metacity',0,1,0,'',''],
+ 'deepin-mutter' => ['^mutter',2,'--version','Deepin-Mutter',0,1,0,'',''],
+ 'deepin-wm' => ['^gala',0,'0','DeepinWM',0,1,0,'',''], # no version
+ 'draco' => ['^draco',0,'0','Draco',0,1,0,'',''], # no version
+ 'dusk' => ['^dusk',1,'-v','dusk',0,1,1,'^dusk-',''], # to stderr, not verified
+ 'dtwm' => ['^dtwm',0,'0','dtwm',0,1,0,'',''],# no version
+ 'dwc' => ['^dwc',0,'0','dwc',0,1,0,'',''], # unverified
+ 'dwl' => ['^dwl',0,'0','dwl',0,1,0,'',''], # unverified
+ 'dwm' => ['^dwm',1,'-v','dwm',0,1,1,'^dwm-',''],
+ 'echinus' => ['^echinus',1,'-v','echinus',0,1,1,'',''], # echinus-0.4.9 (c)...
+ # only listed here for compositor values, version data comes from xprop
+ 'enlightenment' => ['^enlightenment',0,'0','Enlightenment',0,1,0,'',''], # no version. Starts new
+ 'epd-wm' => ['^epd-wm',0,'0','epd-wm',0,1,0,'',''], # unverified
+ 'evilwm' => ['evilwm',3,'-V','evilwm',0,1,0,'',''],# might use full path in match
+ 'feathers' => ['^feathers',0,'0','feathers',0,1,0,'',''], # unverified
+ 'fenestra' => ['^fenestra',0,'0','fenestra',0,1,0,'',''], # unverified
+ 'fireplace' => ['^fireplace',0,'0','fireplace',0,1,0,'',''], # unverified
+ 'fluxbox' => ['^fluxbox',2,'-v','Fluxbox',0,1,0,'',''],
+ 'flwm' => ['^flwm',0,'0','FLWM',0,0,1,'',''], # no version
+ # openbsd changed: version string: [FVWM[[main] Fvwm.. sigh, and outputs to stderr. Why?
+ 'fvwm' => ['^fvwm',2,'-version','FVWM',0,1,0,'',''],
+ 'fvwm1' => ['^Fvwm',3,'-version','FVWM1',0,1,1,'',''],
+ 'fvwm2' => ['^fvwm',2,'--version','FVWM2',0,1,0,'',''],
+ 'fvwm3' => ['^fvwm',2,'--version','FVWM3',0,1,0,'',''],
+ 'fvwm95' => ['^fvwm',2,'--version','FVWM95',0,1,1,'',''],
+ # Note: first line can be: FVWM-Cystal starting... so always use fvwm --version
+ 'fvwm-crystal' => ['^fvwm',2,'--version','FVWM-Crystal',0,0,0,'',''], # for print name fvwm
+ 'gala' => ['^gala',2,'--version','gala',0,1,0,'',''], # pantheon wm: can be slow result
+ 'gamescope' => ['^gamescope',0,'0','Gamescope',0,1,0,'',''], # unverified
+ 'glass' => ['^glass',3,'-v','Glass',0,1,0,'',''],
+ 'gnome' => ['^gnome',3,'--version','GNOME',0,1,0,'',''], # no version, print name
+ 'gnome-about' => ['^gnome',3,'--version','GNOME',0,1,0,'',''],
+ 'gnome-shell' => ['^gnome',3,'--version','gnome-shell',0,1,0,'',''],
+ 'greenfield' => ['^greenfield',0,'0','Greenfield',0,1,0,'',''], # unverified
+ 'grefson' => ['^grefson',0,'0','Grefson',0,1,0,'',''], # unverified
+ 'hackedbox' => ['^hackedbox',2,'-version','HackedBox',0,1,0,'',''], # unverified, assume blackbox
+ # note, herbstluftwm when launched with full path returns full path in version string
+ 'herbstluftwm' => ['herbstluftwm',2,'--version','herbstluftwm',0,1,0,'',''],
+ 'hikari' => ['^hikari',0,'0','hikari',0,1,0,'',''], # unverified
+ 'hopalong' => ['^hopalong',0,'0','Hopalong',0,1,0,'',''], # unverified
+ 'hyprctl' => ['^Tag:',2,'version','Hyprland',0,0,0,'',''], # method to get hyprland version
+ 'hyprland' => ['^hyprland',0,'0','Hyprland',0,0,0,'',''], # uses hyprctl for version
+ 'i3' => ['^i3',3,'--version','i3',0,1,0,'',''],
+ 'icewm' => ['^icewm',2,'--version','IceWM',0,1,0,'',''],
+ 'inaban' => ['^inaban',0,'0','inaban',0,1,0,'',''], # unverified
+ 'instantwm' => ['^instantwm',1,'-v','instantWM',0,1,1,'^instantwm-?(instantos-?)?',''],
+ 'ion3' => ['^ion3',0,'--version','Ion3',0,1,0,'',''], # unverified; also shell called ion
+ 'japokwm' => ['^japokwm',0,'0','japokwm',0,1,0,'',''], # unverified
+ 'jbwm' => ['jbwm',3,'-v','JBWM',0,1,0,'',''], # might use full path in match
+ 'jwm' => ['^jwm',2,'-v','JWM',0,1,0,'',''],
+ 'kded' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,0,0,'\sDevelopment Platform',''],
+ 'kded1' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,0,0,'\sDevelopment Platform',''],
+ 'kded2' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,0,0,'\sDevelopment Platform',''],
+ 'kded3' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,0,0,'\sDevelopment Platform',''],
+ 'kded4' => ['^KDE( Development Platform)?:',2,'--version','KDE Plasma',0,0,0,'\sDevelopment Platform',''],
+ 'kdesktop-trinity' => ['^TDE:',2,'--version','TDE (Trinity)',0,0,0],
+ 'kiwmi' => ['^kwimi',0,'0','kiwmi',0,1,0,'',''], # unverified
+ 'ksmcon' => ['^ksmcon',0,'0','ksmcon',0,1,0,'',''],# no version
+ 'kwin' => ['^kwin',0,'0','kwin',0,1,0,'',''],# no version, same as kde
+ 'kwin-kde' => ['^kwin',2,'--version','KDE Plasma',0,1,0,'',''],# only for 5+, same as KDE version
+ 'kwin_wayland' => ['^kwin_wayland',0,'0','kwin_wayland',0,1,0,'',''],# no version, same as kde
+ 'kwin_x11' => ['^kwin_x11',0,'0','kwin_x11',0,1,0,'',''],# no version, same as kde
+ 'kwinft' => ['^kwinft',0,'0','KWinFT',0,1,0,'',''], # unverified
+ 'labwc' => ['^labwc',0,'0','LabWC',0,1,0,'',''], # unverified
+ 'laikawm' => ['^laikawm',0,'0','LaikaWM',0,1,0,'',''], # unverified
+ 'larswm' => ['^larswm',2,'-v','larswm',0,1,1,'',''],
+ 'leftwm' => ['^leftwm',0,'0','LeftWM',0,1,0,'',''],# no version, in CHANGELOG
+ 'liri' => ['^liri',0,'0','liri',0,1,0,'',''],
+ 'lipstick' => ['^lipstick',0,'0','Lipstick',0,1,0,'',''], # unverified
+ 'liri' => ['^liri',0,'0','liri',0,1,0,'',''], # unverified
+ 'lumina-desktop' => ['^\S',1,'--version','Lumina',0,1,1,'',''],
+ 'lwm' => ['^lwm',0,'0','lwm',0,1,0,'',''], # no version
+ 'lxpanel' => ['^lxpanel',2,'--version','LXDE',0,1,0,'',''],
+ # command: lxqt-panel
+ 'lxqt-panel' => ['^lxqt-panel',2,'--version','LXQt',0,1,0,'',''],
+ 'lxqt-session' => ['^lxqt-session',2,'--version','LXQt',0,1,0,'',''],
+ 'lxqt-variant' => ['^lxqt-panel',0,'0','LXQt-Variant',0,1,0,'',''],
+ 'lxsession' => ['^lxsession',0,'0','lxsession',0,1,0,'',''],
+ 'mahogany' => ['^mahogany',0,'0','Mahogany',0,1,0,'',''], # unverified
+ 'manokwari' => ['^manokwari',0,'0','Manokwari',0,1,0,'',''],
+ 'marina' => ['^marina',0,'0','Marina',0,1,0,'',''], # unverified
+ 'marco' => ['^marco',2,'--version','marco',0,1,0,'',''],
+ 'matchbox' => ['^matchbox',0,'0','Matchbox',0,1,0,'',''],
+ 'matchbox-window-manager' => ['^matchbox',2,'--help','Matchbox',0,0,0,'',''],
+ 'mate-about' => ['^MATE[[:space:]]DESKTOP',-1,'--version','MATE',0,1,0,'',''],
+ # note, mate-session when launched with full path returns full path in version string
+ 'mate-session' => ['mate-session',-1,'--version','MATE',0,1,0,'',''],
+ 'maynard' => ['^maynard',0,'0','maynard',0,1,0,'',''], # unverified
+ 'maze' => ['^maze',0,'0','Maze',0,1,0,'',''], # unverified
+ 'mcompositor' => ['^mcompositor',0,'0','MCompositor',0,1,0,'',''], # unverified
+ 'mcwm' => ['^mcwm',0,'0','mcwm',0,1,0,'',''], # unverified/see 2bwm
+ 'metacity' => ['^metacity',2,'--version','Metacity',0,1,0,'',''],
+ 'metisse' => ['^metisse',0,'0','metisse',0,1,0,'',''],
+ 'mini' => ['^Mini',5,'--version','Mini',0,1,0,'',''],
+ 'mir' => ['^mir',0,'0','mir',0,1,0,'',''],# unverified
+ 'miwm' => ['^miwm',0,'0','MIWM',0,1,0,'',''], # no version
+ 'mlvwm' => ['^mlvwm',3,'--version','MLVWM',0,1,1,'',''],
+ 'moblin' => ['^moblin',0,'0','moblin',0,1,0,'',''],# unverified
+ 'moksha' => ['^\S',1,'-version','Moksha',0,1,0,'',''], # v: x.y.z
+ 'monsterwm' => ['^monsterwm',0,'0','monsterwm',0,1,0,'',''],# unverified
+ 'motorcar' => ['^motorcar',0,'0','motorcar',0,1,0,'',''],# unverified
+ 'muffin' => ['^mu(ffin|tter)',2,'--version','Muffin',0,1,0,'',''],
+ 'musca' => ['^musca',0,'-v','Musca',0,1,0,'',''], # unverified
+ 'mutter' => ['^mutter',2,'--version','Mutter',0,1,0,'',''],
+ 'mvwm' => ['^mvwm',0,'0','mvwm',0,1,0,'',''], # unverified
+ 'mwm' => ['^mwm',0,'0','MWM',0,1,0,'',''],# no version
+ 'nawm' => ['^nawm',0,'0','nawm',0,1,0,'',''],# unverified
+ 'newm' => ['^newm',0,'0','newm',0,1,0,'',''], # unverified
+ 'notion' => ['^.',1,'--version','Notion',0,1,0,'',''],
+ 'nscde' => ['^(fvwm|nscde)',2,'--version','NsCDE',0,1,0,'',''],
+ 'nucleus' => ['^nucleus',0,'0','Nucleus',0,1,0,'',''], # unverified
+ 'openbox' => ['^openbox',2,'--version','Openbox',0,1,0,'',''],
+ 'orbital' => ['^orbital',0,'0','Orbital',0,1,0,'',''],# unverified
+ 'orbment' => ['^orbment',0,'0','orbment',0,1,0,'',''], # unverified
+ 'pantheon' => ['^pantheon',0,'0','Pantheon',0,1,0,'',''],# no version
+ 'papyros' => ['^papyros',0,'0','papyros',0,1,0,'',''],# no version
+ 'pekwm' => ['^pekwm',3,'--version','PekWM',0,1,0,'',''],
+ 'penrose' => ['^penrose',0,'0','Penrose',0,1,0,'',''],# no version?
+ 'perceptia' => ['^perceptia',0,'0','perceptia',0,1,0,'',''],
+ 'phoc' => ['^phoc',0,'0','phoc',0,1,0,'',''], # unverified
+ 'picom' => ['^\S',1,'--version','Picom',0,1,0,'^v',''],
+ 'plasmashell' => ['^plasmashell',2,'--version','KDE Plasma',0,1,0,'',''],
+ 'polonium' => ['^polonium',0,'0','polonium',0,1,0,'',''], # unverified
+ 'pywm' => ['^pywm',0,'0','pywm',0,1,0,'',''], # unverified
+ 'qtile' => ['^',1,'--version','Qtile',0,1,0,'',''],
+ 'qvwm' => ['^qvwm',0,'0','qvwm',0,1,0,'',''], # unverified
+ 'razor-session' => ['^razor',0,'0','Razor-Qt',0,1,0,'',''],
+ 'ratpoison' => ['^ratpoison',2,'--version','Ratpoison',0,1,0,'',''],
+ 'river' => ['^river',0,'0','River',0,1,0,'',''], # unverified
+ 'rootston' => ['^rootston',0,'0','rootston',0,1,0,'',''], # unverified, wlroot ref
+ 'rustland' => ['^rustland',0,'0','rustland',0,1,0,'',''], # unverified
+ 'sapphire' => ['^version sapphire',3,'-version','sapphire',0,1,0,'',''],
+ 'sawfish' => ['^sawfish',3,'--version','Sawfish',0,1,0,'',''],
+ 'scrotwm' => ['^scrotwm',2,'-v','scrotwm',0,1,1,'welcome to scrotwm',''],
+ 'simulavr' => ['simulavr^',0,'0','SimulaVR',0,1,0,'',''], # unverified
+ 'skylight' => ['^skylight',0,'0','Skylight',0,1,0,'',''], # unverified
+ 'smithay' => ['^smithay',0,'0','Smithay',0,1,0,'',''], # unverified
+ 'sommelier' => ['^sommelier',0,'0','sommelier',0,1,0,'',''], # unverified
+ 'snapwm' => ['^snapwm',0,'0','snapwm',0,1,0,'',''], # unverified
+ 'spectrwm' => ['^spectrwm',2,'-v','spectrwm',0,1,1,'welcome to spectrwm',''],
+ # out of stump, 2 --version, but in tries to start new wm instance endless hang
+ 'stumpwm' => ['^SBCL',0,'--version','StumpWM',0,1,0,'',''], # hangs when run in wm
+ 'subtle' => ['^subtle',2,'--version','subtle',0,1,0,'',''],
+ 'surfaceflinger' => ['surfaceflinger^',0,'0','SurfaceFlinger',0,1,0,'',''], # Android, unverified
+ 'sway' => ['^sway',3,'-v','Sway',0,1,0,'',''],
+ 'swayfx' => ['^swayfx',0,'0','SwayFX',0,1,0,'',''], # probably same as sway, unverified
+ 'swayfx' => ['^sway',3,'-v','SwayFX',0,1,0,'',''], # not sure if safe
+ 'swc' => ['^swc',0,'0','swc',0,1,0,'',''], # unverified
+ 'swvkc' => ['^swvkc',0,'0','swvkc',0,1,0,'',''], # unverified
+ 'tabby' => ['^tabby',0,'0','Tabby',0,1,0,'',''], # unverified
+ 'taiwins' => ['^taiwins',0,'0','taiwins',0,1,0,'',''], # unverified
+ 'tinybox' => ['^tinybox',0,'0','tinybox',0,1,0,'',''], # unverified
+ 'tinywl' => ['^tinywl',0,'0','TinyWL',0,1,0,'',''], # unverified
+ 'tinywm' => ['^tinywm',0,'0','TinyWM',0,1,0,'',''], # no version
+ 'trinkster' => ['^trinkster',0,'0','Trinkster',0,1,0,'',''], # unverified
+ 'tvtwm' => ['^tvtwm',0,'0','tvtwm',0,1,0,'',''], # unverified
+ 'twin' => ['^Twin:',2,'--version','Twin',0,0,0,'',''],
+ 'twm' => ['^twm',0,'0','TWM',0,1,0,'',''], # no version
+ 'ukui' => ['^ukui-session',2,'--version','UKUI',0,1,0,'',''],
+ 'ukwm' => ['^ukwm',2,'--version','ukwm',0,1,0,'',''],
+ 'unagi' => ['^\S',1,'--version','unagi',0,1,0,'',''],
+ 'unity' => ['^unity',2,'--version','Unity',0,1,0,'',''],
+ 'unity-system-compositor' => ['^unity-system-compositor',2,'--version',
+ 'unity-system-compositor (mir)',0,0,0,'',''],
+ 'uwm' => ['^uwm',0,'0','UWM',0,1,0,'',''], # unverified
+ 'velox' => ['^velox',0,'0','Velox',0,1,0,'',''], # unverified
+ 'vimway' => ['^vimway',0,'0','vimway',0,1,0,'',''], # unverified
+ 'vivarium' => ['^vivarium',0,'0','Vivarium',0,1,0,'',''], # unverified
+ 'vtwm' => ['^vtwm',0,'0','vtwm',0,1,0,'',''], # no version
+ 'w9wm' => ['^w9wm',3,'-version','w9wm',0,1,0,'',''], # fork of 9wm, unverified
+ 'wavy' => ['^wavy',0,'0','wavy',0,1,0,'',''], # unverified
+ 'waybox' => ['^way',0,'0','waybox',0,1,0,'',''], # unverified
+ 'waycooler' => ['^way',3,'--version','way-cooler',0,1,0,'',''],
+ 'way-cooler' => ['^way',3,'--version','way-cooler',0,1,0,'',''],
+ 'wayfire' => ['^\d',1,'--version','wayfire',0,1,0,'',''], # -version/--version
+ 'wayhouse' => ['^wayhouse',0,'0','wayhouse',0,1,0,'',''], # unverified
+ 'waymonad' => ['^waymonad',0,'0','waymonad',0,1,0,'',''], # unverified
+ 'westeros' => ['^westeros',0,'0','westeros',0,1,0,'',''], # unverified
+ 'westford' => ['^westford',0,'0','westford',0,1,0,'',''], # unverified
+ 'weston' => ['^weston',2,'--version','Weston',0,1,0,'',''],
+ 'windowlab' => ['^windowlab',2,'-about','WindowLab',0,1,0,'',''],
+ 'windowmaker' => ['^Window\s*Maker',-1,'--version','WindowMaker',0,1,0,'',''], # uses wmaker
+ 'wingo' => ['^wingo',0,'0','Wingo',0,1,0,'',''], # unverified
+ 'wio' => ['^wio',0,'0','Wio',0,1,0,'',''], # unverified
+ 'wio' => ['^wio\+',0,'0','wio+',0,1,0,'',''], # unverified
+ 'wm2' => ['^wm2',0,'0','wm2',0,1,0,'',''], # no version
+ 'wmaker' => ['^Window\s*Maker',-1,'--version','WindowMaker',0,1,0,'',''],
+ 'wmfs' => ['^wmfs',0,'0','WMFS',0,1,0,'',''], # unverified
+ 'wmfs2' => ['^wmfs',0,'0','WMFS',0,1,0,'',''], # unverified
+ 'wmii' => ['^wmii',1,'-v','wmii',0,1,0,'^wmii[234]?-',''], # wmii is wmii3
+ 'wmii2' => ['^wmii2',1,'--version','wmii2',0,1,0,'^wmii[234]?-',''],
+ 'wmx' => ['^wmx',0,'0','wmx',0,1,0,'',''], # no version
+ 'wxrc' => ['^wx',0,'0','',0,1,0,'WXRC',''], # unverified
+ 'wxrd' => ['^wx',0,'0','',0,1,0,'WXRD',''], # unverified
+ 'x9wm' => ['^x9wm',3,'-version','x9wm',0,1,0,'',''], # fork of 9wm, unverified
+ 'xcompmgr' => ['^xcompmgr',0,'0','xcompmgr',0,1,0,'',''], # no version
+ 'xfce-panel' => ['^xfce-panel',2,'--version','Xfce',0,1,0,'',''],
+ 'xfce4-panel' => ['^xfce4-panel',2,'--version','Xfce',0,1,0,'',''],
+ 'xfce5-panel' => ['^xfce5-panel',2,'--version','Xfce',0,1,0,'',''],
+ 'xfdesktop' => ['xfdesktop\sversion',5,'--version','Xfce',0,1,0,'',''],
+ # ' This is xfwm4 version 4.16.1 (revision 5f61a84ad) for Xfce 4.16'
+ 'xfwm' => ['xfwm[3-8]? version',5,'--version','xfwm',0,1,0,'^^\s+',''],# unverified
+ 'xfwm3' => ['xfwm3? version',5,'--version','xfwm3',0,1,0,'^^\s+',''], # unverified
+ 'xfwm4' => ['xfwm4? version',5,'--version','xfwm4',0,1,0,'^^\s+',''],
+ 'xfwm5' => ['xfwm5? version',5,'--version','xfwm5',0,1,0,'^^\s+',''], # unverified
+ 'xmonad' => ['^xmonad',2,'--version','XMonad',0,1,0,'',''],
+ 'xuake' => ['^xuake',0,'0','xuake',0,1,0,'',''], # unverified
+ 'yeahwm' => ['^yeahwm',0,'--version','YeahWM',0,1,0,'',''], # unverified
+ ## Desktop Toolkits/Frameworks ##
+ 'efl-version' => ['^\S',1,'--version','EFL',0,1,0,'',''], # any arg returns v
+ 'gtk-launch' => ['^\S',1,'--version','GTK',0,1,0,'',''],
+ 'kded-qt' => ['^Qt',2,'--version','Qt',0,0,0,'',''],
+ # --version: kded5 5.110.0 (frameworks v, not kde)
+ 'kded5-frameworks' => ['^kded5',2,'--version','frameworks',0,1,0],
+ 'kded6-frameworks' => ['^kded6',2,'--version','frameworks',0,1,0],
+ 'kf-config-qt' => ['^^Qt',2,'--version','Qt',0,0,0,'',''],
+ 'qmake-qt' => ['^Using Qt version',4,'--version','Qt',0,0,0,'',''],
+ 'qtdiag-qt' => ['^qt',2,'--version','Qt',0,0,0,'',''],
+ # command: xfdesktop
+ 'xfdesktop-gtk' => ['Built\swith\sGTK',4,'--version','Gtk',0,0,0,'',''],
+ ## Display/Login Managers (dm,lm) ##
+ 'brzdm' => ['^brzdm version',3,'-v','brzdm',0,1,0,'',''], # unverified, slim fork
+ 'cdm' => ['^cdm',0,'0','CDM',0,1,0,'',''],
+ # might be xlogin, unknown output for -V
+ 'clogin' => ['^clogin',0,'-V','clogin',0,1,0,'',''], # unverified, cysco router
+ 'elogind' => ['^elogind',0,'0','elogind',0,1,0,'',''], # no version
+ 'emptty' => ['^emptty',0,'0','EMPTTY',0,1,0,'',''], # unverified
+ 'entranced' => ['^entrance',0,'0','Entrance',0,1,0,'',''],
+ 'gdm' => ['^gdm',2,'--version','GDM',0,1,0,'',''],
+ 'gdm3' => ['^gdm',2,'--version','GDM3',0,1,0,'',''],
+ 'greetd' => ['^greetd',0,'0','greetd',0,1,0,'',''], # no version
+ 'kdm' => ['^kdm',0,'0','KDM',0,1,0,'',''],
+ 'kdm3' => ['^kdm',0,'0','KDM',0,1,0,'',''],
+ 'kdmctl' => ['^kdm',0,'0','KDM',0,1,0,'',''],
+ 'ldm' => ['^ldm',0,'0','LDM',0,1,0,'',''],
+ 'lemurs' => ['^lemurs',0,'0','lemurs',0,1,0,'',''], # unverified
+ 'lightdm' => ['^lightdm',2,'--version','LightDM',0,1,1,'',''],
+ 'loginx' => ['^loginx',0,'0','loginx',0,1,0,'',''], # unverified
+ 'lxdm' => ['^lxdm',0,'0','LXDM',0,1,0,'',''],
+ 'ly' => ['^ly',3,'--version','Ly',0,1,0,'',''],
+ 'mdm' => ['^mdm',0,'0','MDM',0,1,0,'',''],
+ 'mlogind' => ['^mlogind',3,'-v','mlogind',0,1,0,'',''], # guess, unverified, BSD SLiM fork
+ 'nodm' => ['^nodm',0,'0','nodm',0,1,0,'',''],
+ 'pcdm' => ['^pcdm',0,'0','PCDM',0,1,0,'',''],
+ 'qingy' => ['^qingy',0,'0','qingy',0,1,0,'',''], # unverified
+ 'seatd' => ['^seatd',3,'-v','seatd',0,1,0,'',''],
+ 'sddm' => ['^sddm',0,'0','SDDM',0,1,0,'',''],
+ 'slim' => ['slim version',3,'-v','SLiM',0,1,0,'',''],
+ 'slimski' => ['slimski version',3,'-v','slimski',0,1,0,'',''], # slim fork
+ 'tbsm' => ['^tbsm',0,'0','tbsm',0,1,0,'',''], # unverified
+ 'tdm' => ['^tdm',0,'0','TDM',0,1,0,'',''], # could be consold-tdm or tizen dm
+ 'udm' => ['^udm',0,'0','udm',0,1,0,'',''],
+ 'wdm' => ['^wdm',0,'0','WINGs DM',0,1,0,'',''],
+ 'x3dm' => ['^x3dm',0,'0','X3DM',0,1,0,'',''], # unverified
+ 'xdm' => ['^xdm',0,'0','XDM',0,1,0,'',''],
+ 'xdmctl' => ['^xdm',0,'0','XDM',0,1,0,'',''],# opensuse/redhat may use this to start real dm
+ 'xenodm' => ['^xenodm',0,'0','xenodm',0,1,0,'',''],
+ 'xlogin' => ['^xlogin',0,'-V','xlogin',0,1,0,'',''], # unverified, cysco router
+ ## Shells - not checked: ion, eshell ##
+ ## See ShellData::shell_test() for unhandled but known shells
+ 'ash' => ['',3,'pkg','ash',1,0,0,'',''], # special; dash precursor
+ 'bash' => ['^GNU[[:space:]]bash',4,'--version','Bash',1,1,0,'',''],
+ 'busybox' => ['^busybox',0,'0','BusyBox',1,0,0,'',''], # unverified, hush/ash likely
+ 'cicada' => ['^\s*version',2,'cmd','cicada',1,1,0,'',''], # special
+ 'csh' => ['^tcsh',2,'--version','csh',1,1,0,'',''], # mapped to tcsh often
+ 'dash' => ['',3,'pkg','DASH',1,0,0,'',''], # no version, pkg query
+ 'elvish' => ['^\S',1,'--version','Elvish',1,0,0,'',''],
+ 'fish' => ['^fish',3,'--version','fish',1,0,0,'',''],
+ 'fizsh' => ['^fizsh',3,'--version','FIZSH',1,0,0,'',''],
+ # ksh/lksh/loksh/mksh/posh//pdksh need to print their own $VERSION info
+ 'ksh' => ['^\S',1,'cmd','ksh',1,0,0,'^(Version|.*KSH)\s*',''], # special
+ 'ksh93' => ['^\S',1,'cmd','ksh93',1,0,0,'^(Version|.*KSH)\s*',''], # special
+ 'lksh' => ['^\S',1,'cmd','lksh',1,0,0,'^.*KSH\s*',''], # special
+ 'loksh' => ['^\S',1,'cmd','loksh',1,0,0,'^.*KSH\s*',''], # special
+ 'mksh' => ['^\S',1,'cmd','mksh',1,0,0,'^.*KSH\s*',''], # special
+ 'nash' => ['^nash',0,'0','Nash',1,0,0,'',''], # unverified; rc based [no version]
+ 'oh' => ['^oh',0,'0','Oh',1,0,0,'',''], # no version yet
+ 'oil' => ['^Oil',3,'--version','Oil',1,1,0,'',''], # could use cmd $OIL_SHELL
+ 'osh' => ['^osh',3,'--version','OSH',1,1,0,'',''], # precursor of oil
+ 'pdksh' => ['^\S',1,'cmd','pdksh',1,0,0,'^.*KSH\s*',''], # special, in ksh family
+ 'posh' => ['^\S',1,'cmd','posh',1,0,0,'',''], # special, in ksh family
+ 'tcsh' => ['^tcsh',2,'--version','tcsh',1,1,0,'',''], # enhanced csh
+ 'xonsh' => ['^xonsh',1,'--version','xonsh',1,0,0,'^xonsh[\/-]',''],
+ 'yash' => ['^Y',5,'--version','yash',1,0,0,'',''],
+ 'zsh' => ['^zsh',2,'--version','Zsh',1,0,0,'',''],
+ ## Sound Servers ##
+ 'arts' => ['^artsd',2,'-v','aRts',0,1,0,'',''],
+ 'esound' => ['^Esound',3,'--version','EsounD',0,1,1,'',''],
+ 'jack' => ['^jackd',3,'--version','JACK',0,1,0,'',''],
+ 'nas' => ['^Network Audio',5,'-V','NAS',0,1,0,'',''],
+ 'pipewire' => ['^Compiled with libpipe',4,'--version','PipeWire',0,0,0,'',''],
+ 'pulseaudio' => ['^pulseaudio',2,'--version','PulseAudio',0,1,0,'',''],
+ 'roaraudio' => ['^roaraudio',0,'0','RoarAudio',0,1,0,'',''], # no version/unknown?
+ ## Tools: Compilers ##
+ 'clang' => ['clang',3,'--version','clang',1,1,0,'',''],
+ # gcc (Debian 6.3.0-18) 6.3.0 20170516
+ # gcc (GCC) 4.2.2 20070831 prerelease [FreeBSD]
+ 'gcc' => ['^gcc',2,'--version','GCC',1,0,0,'\([^\)]*\)',''],
+ 'gcc-apple' => ['Apple[[:space:]]LLVM',2,'--version','LLVM',1,0,0,'',''], # not used
+ 'zigcc' => ['zigcc',0,'0','zigcc',1,1,0,'',''], # unverified
+ ## Tools: Init ##
+ 'busybox' => ['busybox',2,'--help','BusyBox',0,1,1,'',''],
+ # Dinit version 0.15.1. [ends .]
+ 'dinit' => ['^Dinit',3,'--version','Dinit',0,1,0,'',''],
+ # version: Epoch Init System 1.0.1 "Sage"
+ 'epoch' => ['^Epoch',4,'version','Epoch',0,1,0,'',''],
+ 'finit' => ['^Finit',2,'-v','finit',0,1,0,'',''],
+ # /sbin/openrc --version: openrc (OpenRC) 0.13
+ 'openrc' => ['^openrc',3,'--version','OpenRC',0,1,0,'',''],
+ # /sbin/rc --version: rc (OpenRC) 0.11.8 (Gentoo Linux)
+ 'rc' => ['^rc',3,'--version','OpenRC',0,1,0,'',''],
+ 'shepherd' => ['^shepherd',4,'--version','Shepherd',0,1,0,'',''],
+ 'systemd' => ['^systemd',2,'--version','systemd',0,1,0,'',''],
+ 'upstart' => ['upstart',3,'--version','Upstart',0,1,0,'',''],
+ ## Tools: Miscellaneous ##
+ 'sudo' => ['^Sudo',3,'-V','Sudo',1,1,0,'',''], # sudo pre 1.7 does not have --version
+ 'udevadm' => ['^\d{3}',1,'--version','udevadm',0,1,0,'',''],
+ ## Tools: Package Managers ##
+ 'guix' => ['^guix',4,'--version','Guix',0,1,0,'',''], # used for distro ID
+ );
+}
+
+# returns array of:
+# 0: match string; 1: search word number; 2: version string [alt: file];
+# 3: Print name; 4: console 0/1;
+# 5: 0/1 exit version loop at 1 [alt: if version=file replace value with \s];
+# 6: 0/1 write to stderr [alt: if version=file, path for file];
+# 7: replace regex for further cleanup; 8: extra data
+# note: setting index 1 or 2 to 0 will trip flags to not do version
+# args: 0: program lower case name
+sub values {
+ my @values;
+ ProgramData::set_values() if !$loaded{'program-values'};
+ if (defined $program_values{$_[0]}){
+ @values = @{$program_values{$_[0]}};
+ }
+ # my $debug = Dumper \@values;
+ main::log_data('dump','@values',\@values) if $b_log;
+ return @values;
+}
+
+# args: 0: desktop/app command for --version; 1: search string;
+# 2: space print number; 3: [optional] version arg: -v, version, etc;
+# 4: [optional] exit 1st line 0/1; 5: [optional] 0/1 stderr output;
+# 6: replace regex; 7: extra data
+sub version {
eval $start if $b_log;
- my ($program) = @_;
- my ($args,$pattern,@working);
- if ($program eq 'lspci'){
- $args = ' -knnv';
- $pattern = '^[0-9a-f]+:';
+ my ($app,$search,$num,$version,$exit,$stderr,$replace,$extra) = @_;
+ my ($b_no_space,$cmd,$line);
+ my $version_nu = '';
+ my $count = 0;
+ my $app_name = $app;
+ $output = ();
+ $app_name =~ s%^.*/%%;
+ # print "app: $app :: appname: $app_name\n";
+ $exit ||= 100; # basically don't exit ever
+ $version ||= '--version';
+ # adjust to array index, not human readable
+ $num-- if (defined $num && $num > 0);
+ # konvi in particular doesn't like using $ENV{'PATH'} as set, so we need
+ # to always assign the full path if it hasn't already been done
+ if ($version ne 'file' && $app !~ /^\//){
+ if (my $program = main::check_program($app)){
+ $app = $program;
+ }
+ else {
+ main::log_data('data',"$app not found in path.") if $b_log;
+ return 0;
+ }
}
- elsif ($program eq 'pciconf'){
- $args = ' -lv';
- $pattern = '^([^@]+)\@pci';
+ if ($version eq 'file'){
+ return 0 unless $extra && -r $extra;
+ $output = main::reader($extra,'strip','ref');
+ @$output = map {s/$stderr/ /;$_} @$output if $stderr; # $stderr is the splitter
+ $cmd = '';
}
- elsif ($program eq 'pcidump'){
- $args = ' -v';
- $pattern = '^[0-9a-f]+:';
- }
- my $path = main::check_program($program);
- @data = main::grabber("$path $args 2>/dev/null",'','strip');
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/pciconf/pci-freebsd-8.2-2";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/pcidump/pci-openbsd-6.1-vm.txt";
- #my $file = "$ENV{HOME}/bin/scripts/inxi/data/lspci/racermach-1-knnv.txt";
- #my $file = "$ENV{HOME}/bin/scripts/inxi/data/lspci/rk016013-knnv.txt";
- #@data = main::reader($file,'strip');
- if (@data){
- $b_pci_tool = 1 if scalar @data > 10;
- foreach (@data){
- if ($_ =~ /$pattern/i){
- push @working, '~';
+ # These will mostly be shells that require running the shell command -c to get info data
+ elsif ($version eq 'cmd'){
+ ($cmd,$b_no_space) = version_cmd($app,$app_name,$extra);
+ return 0 if !$cmd;
+ }
+ # slow: use pkg manager to get version, avoid unless you really want version
+ elsif ($version eq 'pkg'){
+ ($cmd,$search) = version_pkg($app_name);
+ return 0 if !$cmd;
+ }
+ # note, some wm/apps send version info to stderr instead of stdout
+ elsif ($stderr){
+ $cmd = "$app $version 2>&1";
+ }
+ else {
+ $cmd = "$app $version 2>/dev/null";
+ }
+ # special case, in rare instances version comes from file
+ if ($version ne 'file'){
+ $output = main::grabber($cmd,'','strip','ref');
+ }
+ if ($b_log){
+ main::log_data('data',"version: $version num: $num search: $search command: $cmd");
+ main::log_data('dump','output',$output);
+ }
+ if ($dbg[64]){
+ print "::::::::::\nPD::version() cmd: $cmd\noutput:",Data::Dumper::Dumper $output;
+ }
+ # sample: dwm-5.8.2, ©.. etc, why no space? who knows. Also get rid of v in number string
+ # xfce, and other, output has , in it, so dump all commas and parentheses
+ if ($output && @$output){
+ foreach (@$output){
+ last if $count == $exit;
+ if ($_ =~ /$search/i){
+ # print "loop: $_ :: num: $num\n";
+ $_ =~ s/$replace//i if $replace;
+ $_ =~ s/\s/_/g if $b_no_space; # needed for some items with version > 1 word
+ my @data = split(/\s+/, $_);
+ $version_nu = $data[$num];
+ last if !defined $version_nu;
+ # some distros add their distro name before the version data, which
+ # breaks version detection. A quick fix attempt is to just add 1 to $num
+ # to get the next value.
+ $version_nu = $data[$num+1] if $data[$num+1] && $version_nu =~ /version/i;
+ $version_nu =~ s/(\([^)]+\)|,|"|\||\(|\)|\.$)//g if $version_nu;
+ # trim off leading v but only when followed by a number
+ $version_nu =~ s/^v([0-9])/$1/i if $version_nu;
+ # print "$version_nu\n";
+ last;
}
- push @working, $_;
+ $count++;
}
- push @working, '~';
}
- #print Data::Dumper::Dumper \@working;
+ main::log_data('data',"Program version: $version_nu") if $b_log;
eval $end if $b_log;
- return @working;
+ return $version_nu;
}
+# print version('bash', 'bash', 4) . "\n";
-sub soc_data {
+# returns ($cmdd, $b_no_space)
+# ksh: Version JM 93t+ 2010-03-05 [OR] Version A 2020.0.0
+# mksh: @(#)MIRBSD KSH R56 2018/03/09; lksh/pdksh: @(#)LEGACY KSH R56 2018/03/09
+# loksh: @(#)PD KSH v5.2.14 99/07/13.2; posh: 0.13.2
+sub version_cmd {
eval $start if $b_log;
- soc_devices_files();
- soc_devices();
- soc_devicetree();
- print Data::Dumper::Dumper \@devices if $test[4];
- main::log_data('dump','soc @devices',\@devices) if $b_log;
+ my ($app,$app_name,$extra) = @_;
+ my @data = ('',0);
+ if ($app_name eq 'cicada'){
+ $data[0] = $app . ' -c "' . $extra . '" 2>/dev/null';}
+ elsif ($app_name =~ /^(|l|lo|m|pd)ksh(93)?$/){
+ $data[0] = $app . ' -c \'printf %s "$KSH_VERSION"\' 2>/dev/null';
+ $data[1] = 1;}
+ elsif ($app_name eq 'posh'){
+ $data[0] = $app . ' -c \'printf %s "$POSH_VERSION"\' 2>/dev/null'}
+ # print "$data[0] :: $data[1]\n";
eval $end if $b_log;
+ return @data;
}
-# 1: /sys/devices/platform/soc/1c30000.ethernet/uevent:["DRIVER=dwmac-sun8i", "OF_NAME=ethernet",
-# "OF_FULLNAME=/soc/ethernet@1c30000", "OF_COMPATIBLE_0=allwinner,sun8i-h3-emac",
-# "OF_COMPATIBLE_N=1", "OF_ALIAS_0=ethernet0", # "MODALIAS=of:NethernetT<NULL>Callwinner,sun8i-h3-emac"]
-# 2: /sys/devices/platform/soc:audio/uevent:["DRIVER=bcm2835_audio", "OF_NAME=audio", "OF_FULLNAME=/soc/audio",
-# "OF_COMPATIBLE_0=brcm,bcm2835-audio", "OF_COMPATIBLE_N=1", "MODALIAS=of:NaudioT<NULL>Cbrcm,bcm2835-audio"]
-# 3: /sys/devices/platform/soc:fb/uevent:["DRIVER=bcm2708_fb", "OF_NAME=fb", "OF_FULLNAME=/soc/fb",
-# "OF_COMPATIBLE_0=brcm,bcm2708-fb", "OF_COMPATIBLE_N=1", "MODALIAS=of:NfbT<NULL>Cbrcm,bcm2708-fb"]
-# 4: /sys/devices/platform/soc/1c40000.gpu/uevent:["OF_NAME=gpu", "OF_FULLNAME=/soc/gpu@1c40000",
-# "OF_COMPATIBLE_0=allwinner,sun8i-h3-mali", "OF_COMPATIBLE_1=allwinner,sun7i-a20-mali",
-# "OF_COMPATIBLE_2=arm,mali-400", "OF_COMPATIBLE_N=3",
-# "MODALIAS=of:NgpuT<NULL>Callwinner,sun8i-h3-maliCallwinner,sun7i-a20-maliCarm,mali-400"]
-# 5: /sys/devices/platform/soc/soc:internal-regs/d0018180.gpio/uevent
-# 6: /sys/devices/soc.0/1180000001800.mdio/8001180000001800:05/uevent
-# ["DRIVER=AR8035", "OF_NAME=ethernet-phy"
-# 7: /sys/devices/soc.0/1c30000.eth/uevent
-# 8: /sys/devices/wlan.26/uevent [from pine64]
-# 9: /sys/devices/platform/audio/uevent:["DRIVER=bcm2835_AUD0", "OF_NAME=audio"
-# 10: /sys/devices/vio/71000002/uevent:["DRIVER=ibmveth", "OF_NAME=l-lan"
-# 11: /sys/devices/platform/soc:/soc:i2c-hdmi:/i2c-2/2-0050/uevent:['OF_NAME=hdmiddc'
-# 12: /sys/devices/platform/soc:/soc:i2c-hdmi:/uevent:['DRIVER=i2c-gpio', 'OF_NAME=i2c-hdmi'
-sub soc_devices_files {
+
+# returns $cmd, $search
+sub version_pkg {
eval $start if $b_log;
- if (-d '/sys/devices/platform/'){
- @files = main::globber('/sys/devices/platform/soc*/*/uevent');
- @temp2 = main::globber('/sys/devices/platform/soc*/*/*/uevent');
- @files = (@files,@temp2) if @temp2;
- @temp2 = main::globber('/sys/devices/platform/*/uevent');
- @files = (@files,@temp2) if @temp2;
+ my ($app) = @_;
+ my ($program,@data);
+ # note: version $num is 3 in dpkg-query/pacman/rpm, which is convenient
+ if ($program = main::check_program('dpkg-query')){
+ $data[0] = "$program -W -f='\${Package}\tversion\t\${Version}\n' $app 2>/dev/null";
+ $data[1] = "^$app\\b";
}
- if (main::globber('/sys/devices/soc*')){
- @temp2 = main::globber('/sys/devices/soc*/*/uevent');
- @files = (@files,@temp2) if @temp2;
- @temp2 = main::globber('/sys/devices/soc*/*/*/uevent');
- @files = (@files,@temp2) if @temp2;
+ elsif ($program = main::check_program('pacman')){
+ $data[0] = "$program -Q --info $app 2>/dev/null";
+ $data[1] = '^Version';
}
- @temp2 = main::globber('/sys/devices/*/uevent'); # see case 8
- @files = (@files,@temp2) if @temp2;
- @temp2 = main::globber('/sys/devices/*/*/uevent'); # see case 10
- @files = (@files,@temp2) if @temp2;
- @temp2 = undef;
- # not sure why, but even as root/sudo, /subsystem|driver/uevent are unreadable with -r test true
- @files = grep {!/\/(subsystem|driver)\//} @files if @files;
- @files = main::uniq(@files);
+ elsif ($program = main::check_program('rpm')){
+ $data[0] = "$program -qi --nodigest --nosignature $app 2>/dev/null";
+ $data[1] = '^Version';
+ }
+ # print "$data[0] :: $data[1]\n";
eval $end if $b_log;
+ return @data;
}
-sub soc_devices {
- eval $start if $b_log;
- my (@working);
- foreach $file (@files){
- next if -z $file;
- $chip_id = $file;
- # variants: /soc/20100000.ethernet/ /soc/soc:audio/ /soc:/ /soc@0/ /soc:/12cb0000.i2c:/
- # mips: /sys/devices/soc.0/1180000001800.mdio/8001180000001800:07/
- # ppc: /sys/devices/vio/71000002/
- $chip_id =~ /\/sys\/devices\/(platform\/)?(soc[^\/]*\/)?([^\/]+\/)?([^\/]+\/)?([^\/\.:]+)([\.:])?([^\/:]+)?:?\/uevent$/;
- $chip_id = $5;
- $temp = $7;
- @working = main::reader($file, 'strip') if -r $file;
- ($device,$driver,$handle,$type,$vendor_id) = (undef,undef,undef,undef,undef);
- foreach my $data (@working){
- @temp2 = split /=/, $data;
- if ($temp2[0] eq 'DRIVER'){
- $driver = $temp2[1];
- $driver =~ s/-/_/g if $driver; # kernel uses _, not - in module names
- }
- elsif ($temp2[0] eq 'OF_NAME'){
- $type = $temp2[1];
- }
- # we'll use these paths to test in device tree pci completer
- elsif ($temp2[0] eq 'OF_FULLNAME' && $temp2[1]){
- # we don't want the short names like /soc, /led and so on
- push @full_names, $temp2[1] if (() = $temp2[1] =~ /\//g) > 1;
- $handle = (split /@/, $temp2[1])[-1] if $temp2[1] =~ /@/;
- }
- elsif ($temp2[0] eq 'OF_COMPATIBLE_0'){
- @temp3 = split /,/, $temp2[1];
- $device = $temp3[-1];
- $vendor_id = $temp3[0];
- }
+}
+
+## PsData
+# public methods:
+# set_cmd(): sets @ps_aux, @ps_cmd
+# set_dm(): sets $ps_data{'dm-active'}
+# set_de_wm(): sets -S/-G de/wm/comp/tools items
+# set_power(): sets -I $ps_data{'power-services'}
+{
+package PsData;
+
+sub set_cmd {
+ eval $start if $b_log;
+ my ($b_busybox,$header,$ps,@temp);
+ $loaded{'ps-cmd'} = 1;
+ my $args = 'wwaux';
+ my $path = main::check_program('ps');
+ my $link = readlink($path);
+ if ($link && $link =~ /busybox/i){
+ $b_busybox = 1;
+ $args = '';
+ }
+ # note: some ps cut output based on terminal width, ww sets width unlimited
+ # old busybox returns error with args, new busybox ignores auxww
+ $ps = main::grabber("$path $args 2>/dev/null",'','strip','ref');
+ if (@$ps){
+ $header = shift @$ps; # get rid of header row
+ # handle busy box, which has 3 columns, regular ps aux has 11
+ # avoid deprecated implicit split error in older Perls
+ @temp = split(/\s+/, $header);
+ }
+ else {
+ return;
+ }
+ $ps_data{'header'}->[0] = $#temp; # the indexes, not the scalar count
+ for (my $i = 0; $i <= $#temp; $i++){
+ if ($temp[$i] eq 'PID'){$ps_data{'header'}->[1] = $i;}
+ elsif ($temp[$i] eq '%CPU'){$ps_data{'header'}->[2] = $i;}
+ # note: %mem is percent used
+ elsif ($temp[$i] eq '%MEM'){$ps_data{'header'}->[3] = $i;}
+ elsif ($temp[$i] eq 'RSS'){$ps_data{'header'}->[4] = $i;}
+ }
+ # we want more data from ps busybox, to get TinyX screen res
+ my $cols_use = ($b_busybox) ? 7 : 2;
+ my $pattern = 'brave|chrom(e|ium)|falkon|(fire|water)fox|gvfs|';
+ $pattern .= 'konqueror|mariadb|midori|mysql|openvpn|opera|';
+ $pattern .= 'pale|postgre|php|qtwebengine|smtp|vivald';
+ for (@$ps){
+ next if !$_;
+ next if $self_name eq 'inxi' && /\/$self_name\b/;
+ # $_ = lc;
+ push (@ps_aux,$_);
+ my @split = split(/\s+/, $_);
+ # slice out COMMAND to last elements of psrows
+ my $final = $#split;
+ # some stuff has a lot of data, chrome for example
+ $final = ($final > ($ps_data{'header'}->[0] + $cols_use)) ?
+ $ps_data{'header'}->[0] + $cols_use : $final;
+ # handle case of ps wrapping lines despite ww unlimited width, which
+ # should NOT be happening, except on busybox ps, which has no ww.
+ next if !defined $split[$ps_data{'header'}->[0]];
+ # we don't want zombie/system/kernel processes, or servers, browsers.
+ if ($split[$ps_data{'header'}->[0]] !~ /^([\[\(]|(\S+\/|)($pattern))/i){
+ push(@ps_cmd,join(' ', @split[$ps_data{'header'}->[0] .. $final]));
}
- # it's worthless, we can't use it
- next if ! defined $type;
- $type_id = $type;
- $chip_id = '' if ! defined $chip_id;
- $vendor_id = '' if ! defined $vendor_id;
- $driver = '' if ! defined $driver;
- $handle = '' if ! defined $handle;
- $busid = (defined $temp && main::is_int($temp)) ? $temp: 0;
- $type = soc_type($type,$vendor_id,$driver);
- ($busid_nu,$modules,$port,$rev) = (0,'','','');
- @temp3 = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,$rev,
- $port,$driver,$modules,'','','',$handle);
- assign_data('soc',@temp3);
}
+ # dump multiple instances, just need to see if process running
+ main::uniq(\@ps_cmd) if @ps_cmd;
+ # Use $dbg[61] to see @ps_cmd result
eval $end if $b_log;
}
-sub soc_devicetree {
+
+# only runs when no /run type dm found
+sub set_dm {
eval $start if $b_log;
- # now we want to fill in stuff that was not in /sys/devices/
- if (-d '/sys/firmware/devicetree/base/soc'){
- @files = main::globber('/sys/firmware/devicetree/base/soc/*/compatible');
- my $test = (@full_names) ? join('|', sort @full_names) : 'xxxxxx';
- foreach $file (@files){
- if ( $file !~ m%$test%){
- ($handle,$content,$device,$type,$type_id,$vendor_id) = ('','','','','','');
- $content = (main::reader($file, 'strip'))[0] if -r $file;
- $file =~ m%soc/([^@]+)@([^/]+)/compatible$%;
- $type = $1;
- next if !$type || !$content;
- $handle = $2 if $2;
- $type_id = $type;
- if ($content){
- @temp3 = split /,/, $content;
- $vendor_id = $temp3[0];
- $device = $temp3[-1];
- # strip off those weird device tree special characters
- $device =~ s/\x01|\x02|\x03|\x00//g;
- }
- $type = soc_type($type,$vendor_id,'');
- @temp3 = ($type,$type_id,0,0,$device,$vendor_id,'soc','','','','','','','',$handle);
- assign_data('soc',@temp3);
- main::log_data('dump','@devices @temp3',\@temp3) if $b_log;
- }
- }
- }
+ # startx: /bin/sh /usr/bin/startx
+ process_items(\@{$ps_data{'dm-active'}},join('|',qw(ly startx xinit))); # possible dm values
+ print '$ps_data{dm-active}: ', Data::Dumper::Dumper $ps_data{'dm-active'} if $dbg[5];
+ main::log_data('dump','$ps_data{dm-active}',$ps_data{'dm-active'}) if $b_log;
eval $end if $b_log;
}
-sub assign_data {
- my ($tool,@data) = @_;
- if (check_graphics($data[0],$data[1])){
- @devices_graphics = (@devices_graphics,[@data]);
- $b_soc_gfx = 1 if $tool eq 'soc';
- }
- # for hdmi, we need gfx/audio both
- if (check_audio($data[0],$data[1])){
- @devices_audio = (@devices_audio,[@data]);
- $b_soc_audio = 1 if $tool eq 'soc';
- }
- elsif (check_hwraid($data[0],$data[1])){
- @devices_hwraid = (@devices_hwraid,[@data]);
- $b_soc_net = 1 if $tool eq 'soc';
- }
- elsif (check_network($data[0],$data[1])){
- @devices_network = (@devices_network,[@data]);
- $b_soc_net = 1 if $tool eq 'soc';
- }
- elsif (check_timer($data[0],$data[1])){
- @devices_timer = (@devices_timer,[@data]);
- $b_soc_timer = 1;
+
+sub set_de_wm {
+ eval $start if $b_log;
+ $loaded{'ps-gui'} = 1;
+ my ($b_de_wm_comp,$b_wm_comp);
+ # desktops / wm (some wm also compositors)
+ if ($show{'system'}){
+ # some desktops detect via ps as fallback
+ process_items(\@{$ps_data{'de-ps-detect'}},join('|', qw(
+ razor-desktop razor-session lxsession lxqt-session nscde
+ tdelauncher tdeinit_phase1)));
+ # order matters!
+ process_items(\@{$ps_data{'wm-parent'}},join('|', qw(xfdesktop icewm fluxbox
+ blackbox)));
+ # regular wm
+ # unverfied: 2bwm catwm mcwm penrose snapwm uwm wmfs wmfs2 wingo wmii2
+ process_items(\@{$ps_data{'wm-main'}},join('|', qw(2bwm 9wm
+ afterstep aewm aewm\+\+ amiwm antiwm awesome
+ bspwm calmwm catwm cde clfswm ctwm (openbsd-)?cwm
+ dawn dtwm dusk dwm echinus evilwm flwm flwm_topside
+ fvwm.*-crystal\S* fvwm1 fvwm2 fvwm3 fvwm95 fvwm
+ hackedbox herbstluftwm i3 instantwm ion3 jbwm jwm larswm leftwm lwm
+ matchbox-window-manager mcwm mini miwm mlvwm monsterwm musca mvwm mwm
+ nawm notion openbox nscde pekwm penrose qvwm ratpoison
+ sapphire sawfish scrotwm snapwm spectrwm stumpwm subtle tinywm tvtwm twm
+ uwm vtwm windowlab [wW]indo[mM]aker w9wm wingo wm2 wmfs wmfs2 wmii2 wmii
+ wmx x9wm xmonad yeahwm)));
+ $b_wm_comp = 1;
+ # wm: note that for all but the listed wm, the wm and desktop would be the
+ # same, particularly with all smaller wayland wm/compositors.
+ $b_de_wm_comp = 1 if $extra > 1;
+ }
+ # compositors (for wayland these are also the server, note).
+ # for wayland always show, so always load these
+ if ($show{'graphic'}){
+ $b_de_wm_comp = 1;
+ $b_wm_comp = 1;
+ process_items(\@{$ps_data{'compositors-pure'}},join('|',qw(cairo compton dcompmgr
+ mcompositor picom steamcompmgr surfaceflinger xcompmgr unagi)));
+ }
+ if ($b_de_wm_comp){
+ process_items(\@{$ps_data{'de-wm-compositors'}},join('|',qw(budgie-wm compiz
+ deepin-wm enlightenment gala gnome-shell twin kwin_wayland kwin_x11 kwinft kwin
+ marco deepin-metacity metacity metisse mir moksha muffin deepin-mutter mutter
+ ukwm xfwm[345]?)));
+ }
+ if ($b_wm_comp){
+ # x11: 3dwm, qtile [originally], rest wayland
+ # wayland compositors generally are compositors and wm.
+ # These will be used globally to avoid having to redo it over and over.
+ process_items(\@{$ps_data{'wm-compositors'}},join('|',qw(3dwm asc awc bismuth
+ cage cagebreak cardboard chameleonwm clayland comfc
+ dwl dwc epd-wm fireplace feathers fenestra glass gamescope greenfield grefson
+ hikari hopalong [Hh]yprland inaban japokwm kiwmi labwc laikawm lipstick liri
+ mahogany marina maze maynard motorcar newm nucleus
+ orbital orbment perceptia phoc polonium pywm qtile river rootston rustland
+ simulavr skylight smithay sommelier sway swayfx swc swvkc
+ tabby taiwins tinybox tinywl trinkster velox vimway vivarium
+ wavy waybox way-?cooler wayfire wayhouse waymonad westeros westford
+ weston wio\+? wxr[cd] xuake)));
+ }
+ # info:/tools:
+ if ($show{'system'} && $extra > 2){
+ process_items(\@{$ps_data{'components-active'}},join('|', qw(
+ albert alltray awesomebar awn
+ bar barpanel bbdock bbpager bemenu bipolarbar bmpanel bmpanel2 budgie-panel
+ cairo-dock dde-dock deskmenu dmenu(-wayland)? dockbarx docker docky dzen dzen2
+ fbpanel fspanel fuzzel glx-dock gnome-panel hpanel
+ i3bar i3-status(-rs|-rust)? icewmtray jgmenu kdocker kicker krunner ksmoothdock
+ latte lavalauncher latte-dock lemonbar ltpanel luastatus lxpanel lxqt-panel
+ matchbox-panel mate-panel mauncher mopag nwg-(bar|dock|launchers|panel)
+ openbox-menu ourico perlpanel plank polybar pypanel razor(qt)?-panel rofi rootbar
+ sfwbar simplepanel sirula some_sorta_bar stalonetray swaybar
+ taffybar taskbar tint2 tofi trayer ukui-panel vala-panel
+ wapanel waybar wbar wharf wingpanel witray wldash wmdocker wmsystemtray wofi
+ xfce[45]?-panel xmobar yambar yabar yofi)));
+ # Generate tools: power manager daemons, then screensavers/lockers.
+ # Note that many lockers may not be services
+ @{$ps_data{'tools-test'}}=qw(away boinc-screensaver budgie-screensaver
+ cinnamon-screensaver gnome-screensaver gsd-screensaver-proxy gtklock i3lock
+ kscreenlocker light-locker lockscreen lxlock mate-screensaver nwg-lock
+ physlock rss-glx slock swayidle swaylock ukui-screensaver unicode-screensaver
+ xautolock xfce4-screensaver xlock xlockmore xscreensaver
+ xscreensaver-systemd xsecurelock xss-lock xtrlock);
+ process_items(\@{$ps_data{'tools-active'}},join('|',@{$ps_data{'tools-test'}}));
+ }
+ if ($dbg[63]){
+ main::feature_debugger('ps de-wm',
+ ['compositors-pure:',$ps_data{'compositors-pure'},
+ 'de-ps-detect:',$ps_data{'de-ps-detect'},
+ 'de-wm-compositors:',$ps_data{'de-wm-compositors'},
+ 'wm-main:',$ps_data{'wm-main'},
+ 'wm-parent:',$ps_data{'wm-parent'},
+ 'wm-compositors:',$ps_data{'wm-compositors'}],$dbg[63]);
+ }
+ print '%ps_data: ', Data::Dumper::Dumper \%ps_data if $dbg[5];
+ main::log_data('dump','%ps_data',\%ps_data) if $b_log;
+ eval $end if $b_log;
+}
+
+sub set_network {
+ eval $start if $b_log;
+ process_items(\@{$ps_data{'network-services'}},join('|', qw(apache\d?
+ cC]onn[mM]and? dhcpd dhcpleased fingerd ftpd gated httpd inetd ircd iwd
+ [mM]odem[mM]nager named networkd-dispatcher [nN]etwork[mM]anager nfsd nginx
+ ntpd proftpd routed smbd sshd systemd-networkd systemd-timesyncd tftpd
+ wicd wpa_supplicant xinetd xntpd)));
+ print '$ps_data{network-daemons}: ', Data::Dumper::Dumper $ps_data{'network-services'} if $dbg[5];
+ main::log_data('dump','$ps_data{network-daemons}',$ps_data{'network-services'}) if $b_log;
+ eval $end if $b_log;
+}
+
+sub set_power {
+ eval $start if $b_log;
+ process_items(\@{$ps_data{'power-services'}},join('|', qw(apmd csd-power
+ gnome-power-manager gsd-power kpowersave org\.dracolinux\.power
+ org_kde_powerdevil mate-power-manager power-profiles-daemon powersaved
+ tdepowersave thermald tlp upowerd ukui-power-manager xfce4-power-manager)));
+ print '$ps_data{power-daemons}: ', Data::Dumper::Dumper $ps_data{'power-services'} if $dbg[5];
+ main::log_data('dump','$ps_data{power-daemons}',$ps_data{'power-services'}) if $b_log;
+ eval $end if $b_log;
+}
+
+# args: 0: array ref or scalar to become ref; 1: 1: matches pattern
+sub process_items {
+ foreach (@ps_cmd){
+ # strip out python/lisp/*sh starters
+ if (/^(\/\S+?\/(c?lisp|perl|python|[a-z]{0,3}sh)\s+)?(|\S*?\/)($_[1])(:|\s|$)/i){
+ push(@{$_[0]},$4) ; # deal with duplicates with uniq
+ }
}
- # not used at this point, -M comes before ANG
- # $device_vm = check_vm($data[4]) if ( (!$b_ppc && !$b_mips) && !$device_vm );
- @devices = (@devices,[@data]);
+ main::uniq($_[0]) if @{$_[0]} && scalar @{$_[0]} > 1;
}
-# note: for soc, these have been converted in soc_type()
-sub check_audio {
- if ( ( $_[1] && length($_[1]) == 4 && $_[1] =~/^04/ ) ||
- ( $_[0] && $_[0] =~ /^(audio|hdmi|multimedia|sound)$/ )){
- return 1;
- }
- else {return 0}
}
-sub check_graphics {
- # note: multimedia class 04 is viddeo if 0400. 'tv' is risky I think
- if ( ( $_[1] && length($_[1]) == 4 && ($_[1] =~/^03/ || $_[1] eq '0400' ) ) ||
- ( $_[0] && $_[0] =~ /^(vga|display|hdmi|3d|video|tv|television)$/)){
- return 1;
+
+sub get_self_version {
+ eval $start if $b_log;
+ my $patch = $self_patch;
+ if ($patch ne ''){
+ # for cases where it was for example: 00-b1 clean to -b1
+ $patch =~ s/^[0]+-?//;
+ $patch = "-$patch" if $patch;
}
- else {return 0}
-}
-sub check_hwraid {
- return 1 if ( $_[1] && $_[1] eq '0104' );
+ eval $end if $b_log;
+ return $self_version . $patch;
}
-# NOTE: class 06 subclass 80
-# https://www-s.acm.illinois.edu/sigops/2007/roll_your_own/7.c.1.html
-sub check_network {
- if ( ( $_[1] && length($_[1]) == 4 && ($_[1] =~/^02/ || $_[1] eq '0680' ) ) ||
- ( $_[0] && $_[0] =~ /^(ethernet|network|wifi|wlan)$/ ) ){
- return 1;
+
+## ServiceData
+{
+package ServiceData;
+my ($key,$service,$type);
+
+sub get {
+ eval $start if $b_log;
+ ($type,$service) = @_;
+ my $value;
+ set() if !$loaded{'service-tool'};
+ $key = (keys %service_tool)[0] if %service_tool;
+ if ($key){
+ if ($type eq 'status'){
+ $value = process_status();
+ }
+ elsif ($type eq 'tool'){
+ $value = $service_tool{$key}->[1];
+ }
}
- else {return 0}
-}
-sub check_timer {
- return 1 if ( $_[0] && $_[0] eq 'timer' );
+ eval $end if $b_log;
+ return $value;
}
-sub check_vm {
- if ( $_[0] && $_[0] =~ /(innotek|vbox|virtualbox|vmware|qemu)/i ) {
- return $1
+
+sub process_status {
+ eval $start if $b_log;
+ my ($cmd,$status,@data);
+ my ($result,$value) = ('','');
+ my %translate = (
+ 'active' => 'running',
+ 'down' => 'stopped',
+ 'fail' => 'not found',
+ 'failed' => 'not found',
+ 'inactive' => 'stopped',
+ 'ok' => 'running',
+ 'not running' => 'stopped',
+ 'run' => 'running',
+ 'started' => 'running',
+ );
+ if ($key eq 'systemctl'){
+ $cmd = "$service_tool{$key}->[0] status $service";
+ }
+ # can be /etc/init.d or /etc/rc.d; ghostbsd/gentoo have this
+ elsif ($key eq 'rc-service'){
+ $cmd = "$service_tool{$key}->[0] $service status";
+ }
+ elsif ($key eq 'rcctl'){
+ $cmd = "$service_tool{$key}->[0] check $service";
+ }
+ # dragonfly/netbsd/freebsd have this. We prefer service over following since
+ # if it is present, the assumption is that it is being used, though multi id
+ # is probably better.
+ elsif ($key eq 'service'){
+ $cmd = "$service_tool{$key}->[0] $service status";
+ }
+ # upstart, legacy, and finit, needs more data
+ elsif ($key eq 'initctl' || $key eq 'dinitctl'){
+ $cmd = "$service_tool{$key}->[0] status $service";
+ }
+ # runit
+ elsif ($key eq 'sv'){
+ $cmd = "$service_tool{$key}->[0] status $service";
+ }
+ # s6: note, shows s6-rc but uses s6-svstat; -n makes human-readable. Needs
+ # real data samples before adding.
+ # elsif ($key eq 's6-rc'){
+ # $cmd = "$service_tool{$key}->[0] $service";
+ # }
+ # check or status or onestatus (netbsd)
+ elsif ($key eq 'rc.d'){
+ if (-e "$service_tool{$key}->[0]$service"){
+ $status = ($bsd_type && $bsd_type =~ /(dragonfly)/) ? 'status' : 'check';
+ $cmd = "$service_tool{$key}->[0]$service check";
+ }
+ else {
+ $result = 'not found';
+ }
}
- else {return ''}
+ elsif ($key eq 'init.d'){
+ if (-e "$service_tool{$key}->[0]$service"){
+ $cmd = "$service_tool{$key}->[0]$service status";
+ }
+ else {
+ $result = 'not found';
+ }
+ }
+ @data = main::grabber("$cmd 2>&1",'','strip') if $cmd;
+ # @data = ('bluetooth is running.');
+ print "key: $key\n", Data::Dumper::Dumper \@data if $dbg[29];
+ main::log_data('dump','service @data',\@data) if $b_log;
+ for my $row (@data){
+ my @working = split(/\s*:\s*/,$row);
+ ($value) = ('');
+ # print "$working[0]::$working[1]\n";
+ # Loaded: masked (Reason: Unit sddm.service is masked.)
+ if ($working[0] eq 'Loaded'){
+ # note: sshd shows ssh for ssh.service
+ $working[1] =~ /^(.+?)\s*\(.*?\.service;\s+(\S+?);.*/;
+ $result = lc($1) if $1;
+ $result = lc($2) if $2; # this will be enabled/disabled
+ }
+ # Active: inactive (dead)
+ elsif ($working[0] eq 'Active'){
+ $working[1] =~ /^(.+?)\s*\((\S+?)\).*/;
+ $value = lc($1) if $1 && (!$result || $result ne 'disabled');
+ $value = $translate{$value} if $value && $translate{$value};
+ $result .= ",$value" if ($result && $value);
+ last;
+ }
+ # Status : running
+ elsif ($working[0] eq 'Status' || $working[0] eq 'State'){
+ $result = lc($working[1]);
+ $result = $translate{$result} if $translate{$result};
+ last;
+ }
+ # valid syntax, but service does not exist
+ # * rc-service: service 'ntp' does not exist ::
+ # dinitctl: service not loaded [whether exists or not]
+ elsif ($row =~ /$service.*?(not (exist|(be )?found|loaded)|no such (directory|file)|unrecognized)/i){
+ $result = 'not found';
+ last;
+ }
+ # means command directive doesn't exist, we don't know if service exists or not
+ # * ntpd: unknown function 'disable' ::
+ elsif ($row =~ /unknown (directive|function)|Usage/i){
+ last;
+ }
+ # rc-service: * status: started :: * status: stopped, fail handled in not exist test
+ elsif ($working[0] eq '* status' && $working[1]){
+ $result = lc($working[1]);
+ $result = $translate{$result} if $translate{$result};
+ last;
+ }
+ ## start exists status detections
+ elsif ($working[0] =~ /\b$service is ([a-z\s]+?)(\s+as\s.*|\s+\.\.\..*)?\.?$/){
+ $result = lc($1);
+ $result = $translate{$result} if $translate{$result};
+ last;
+ }
+ # runit sv: run/down/fail - fail means not found
+ # run: udevd: (pid 631) 641s :: down: sshd: 9s, normally up
+ elsif ($working[1] && $working[1] eq $service && $working[0] =~ /^([a-z]+)$/){
+ $result = lc($1);
+ $result = $translate{$result} if $translate{$result};
+ $result = "enabled,$result" if $working[2] && $working[2] =~ /normally up/i;
+ }
+ # OpenBSD: sshd(ok)
+ elsif ($working[0] =~ /\b$service\s*\(([^\)]+)\)/){
+ $result = lc($1);
+ $result = $translate{$result} if $translate{$result};
+ last;
+ }
+ }
+ print "service result: $result\n" if $dbg[29];
+ main::log_data('data',"result: $result") if $b_log;
+ eval $end if $b_log;
+ return $result;
}
-sub soc_type {
- my ($type,$info,$driver) = @_;
- # I2S or i2s. I2C is i2 controller |[iI]2[Ss]. note: odroid hdmi item is sound only
- # snd_soc_dummy. simple-audio-amplifier driver: speaker_amp
- if ($type =~ /^(daudio|.*hifi.*|.*sound[_-]card|.*dac[0-9]?)$/ ||
- ($info && $info !~ /amp|codec|dummy/ && $info =~ /(sound|audio)/) ||
- ($driver && $driver !~ /(codec|dummy)/ && $driver =~ /(audio|snd|sound)/) ){
- $type = 'audio';
+sub set {
+ eval $start if $b_log;
+ $loaded{'service-tool'} = 1;
+ my ($path);
+ if ($path = main::check_program('systemctl')){
+ # systemctl status ssh :: Loaded: / Active:
+ %service_tool = ('systemctl' => [$path,'systemctl']);
}
- elsif ($type =~ /^((meson-?)?fb|disp|display(-[^\s]+)?|gpu|mali)$/){
- $type = 'display';
+ elsif ($path = main::check_program('rc-service')){
+ # rc-service ssh status :: * status: stopped
+ %service_tool = ('rc-service' => [$path,'rc-service']);
}
- # includes ethernet-phy, meson-eth
- elsif ($type =~ /^(([^\s]+-)?eth|ethernet(-[^\s]+)?|lan|l-lan)$/){
- $type = 'ethernet';
+ elsif ($path = main::check_program('rcctl')){
+ # rc-service ssh status :: * status: stopped
+ %service_tool = ('rcctl' => [$path,'rcctl']);
}
- elsif ($type =~ /^(.*wlan.*|.*wifi.*)$/){
- $type = 'wifi';
+ elsif ($path = main::check_program('service')){
+ # service sshd status
+ %service_tool = ('service' => [$path,'service']);
}
- # needs to catch variants like hdmi-tx but not hdmi-connector
- elsif ( (!$driver || $driver !~ /(codec|dummy)/) && $type =~ /^(.*hdmi(-?tx)?)$/){
- $type = 'hdmi';
+ elsif ($path = main::check_program('sv')){
+ %service_tool = ('sv' => [$path,'sv']);
}
- elsif ($type =~ /^timer$/){
- $type = 'timer';
+ # needs data, never seen output, but report if present
+ elsif ($path = main::check_program('s6-svstat')){
+ %service_tool = ('s6-rc' => [$path,'s6-rc']);
+ }
+ elsif ($path = main::check_program('dinitctl')){
+ %service_tool = ('dinitctl' => [$path,'dinitctl']);
+ }
+ # make it last in tools, need more data
+ elsif ($path = main::check_program('initctl')){
+ %service_tool = ('initctl' => [$path,'initctl']);
+ }
+ # freebsd does not have 'check', netbsd does not have status
+ elsif (-d '/etc/rc.d/'){
+ # /etc/rc.d/ssh check :: ssh(ok|failed)
+ %service_tool = ('rc.d' => ['/etc/rc.d/','/etc/rc.d']);
+ }
+ elsif (-d '/etc/init.d/'){
+ # /etc/init.d/ssh status :: Loaded: loaded (...)/ Active: active (...)
+ %service_tool = ('init.d' => ['/etc/init.d/','/etc/init.d']);
}
- return $type;
-}
-sub pci_class {
- eval $start if $b_log;
- my ($id) = @_;
- $id = lc($id);
- my %classes = (
- '00' => 'unclassified',
- '01' => 'mass-storage',
- '02' => 'network',
- '03' => 'display',
- '04' => 'audio',
- '05' => 'memory',
- '06' => 'bridge',
- '07' => 'communication',
- '08' => 'peripheral',
- '09' => 'input',
- '0a' => 'docking',
- '0b' => 'processor',
- '0c' => 'serialbus',
- '0d' => 'wireless',
- '0e' => 'intelligent',
- '0f' => 'satellite',
- '10' => 'encryption',
- '11' => 'signal-processing',
- '12' => 'processing-accelerators',
- '13' => 'non-essential-instrumentation',
- '40' => 'coprocessor',
- 'ff' => 'unassigned',
- );
- my $type = (defined $classes{$id}) ? $classes{$id}: 'unhandled';
eval $end if $b_log;
- return $type;
}
}
+# $dbg[29] = 1; set_path(); print ServiceData::get('status','bluetooth'),"\n";
-sub set_dmesg_boot_data {
+## ShellData
+{
+package ShellData;
+my $b_debug = 0; # disable all debugger output in case forget to comment out!
+
+# Public. This does not depend on using ps -jfp, open/netbsd do not at this
+# point support it, so we only want to use -jp to get parent $ppid set in
+# initialize(). shell_launcher will use -f so it only runs in case we got
+# $pppid. $client{'pppid'} will be used to trigger launcher tests. If started
+# with sshd via ssh user@address 'pinxi -Ia' will show sshd as shell, which is
+# fine, that's what it is.
+sub set {
eval $start if $b_log;
- my ($file,@temp);
- my ($counter) = (0);
- $b_dmesg_boot_check = 1;
- if (!$b_fake_dboot){
- $file = system_files('dmesg-boot');
+ my (@app,$cmd,$parent,$pppid,$shell);
+ $loaded{'shell-data'} = 1;
+ $cmd = "ps -wwp $ppid -o comm= 2>/dev/null";
+ $shell = qx($cmd);
+ # we'll be using these $client pppid/parent values in shell_launcher()
+ $pppid = $client{'pppid'} = get_pppid($ppid);
+ $pppid ||= '';
+ $client{'pppid'} ||= '';
+ # print "sh: $shell\n";
+ main::log_data('cmd',$cmd) if $b_log;
+ chomp($shell);
+ if ($shell){
+ # print "shell pre: $shell\n";
+ # when run in debugger subshell, would return sh as shell,
+ # and parent as perl, that is, pinxi itself, which is actually right.
+ # trim leading /.../ off just in case. ps -p should return the name, not path
+ # but at least one user dataset suggests otherwise so just do it for all.
+ $shell =~ s/^.*\///;
+ # NOTE: su -c "inxi -F" results in shell being su
+ # but: su - results in $parent being su
+ my $i=0;
+ $parent = $client{'parent'} = parent_name($pppid) if $pppid;
+ $parent ||= '';
+ print "1: shell: $shell $ppid parent: $parent $pppid\n" if $b_debug;
+ # this will fail in this case: sudo su -c 'inxi -Ia'
+ if ($shell =~ /^(doas|login|sudo|su)$/){
+ $client{'su-start'} = $shell if $shell ne 'login';
+ $shell = $parent if $parent;
+ }
+ # eg: su to root, then sudo
+ elsif ($parent && $client{'parent'} =~ /^(doas|sudo|su)$/){
+ $client{'su-start'} = $parent;
+ $parent = '';
+ }
+ print "2: shell: $shell parent: $parent\n" if $b_debug;
+ my $working = $ENV{'SHELL'};
+ if ($working){
+ $working =~ s/^.*\///;
+ # a few manual changes for known
+ # Note: parent when fizsh shows as zsh but SHELL is fizsh, but other times
+ # SHELL is default shell, but in zsh, SHELL is default shell, not zfs
+ if ($shell eq 'zsh' && $working eq 'fizsh'){
+ $shell = $working;
+ }
+ }
+ # print "3: shell post: $shell working: $working\n";
+ # since there are endless shells, we'll keep a list of non program value
+ # set shells since there is little point in adding those to program values
+ if (shell_test($shell)){
+ # do nothing, just leave $shell as is
+ }
+ # note: not all programs return version data. This may miss unhandled shells!
+ elsif ((@app = ProgramData::full(lc($shell),lc($shell),1)) && $app[0]){
+ $shell = $app[0];
+ $client{'version'} = $app[1] if $app[1];
+ print "3: app test $shell v: $client{'version'}\n" if $b_debug;
+ }
+ else {
+ # NOTE: we used to guess here with position 2 --version but this cuold lead
+ # to infinite loops when inxi called from a script 'infos' that is in PATH and
+ # script does not have any start arg handlers or bad arg handlers:
+ # eg: shell -> infos -> inxi -> sh -> infos --version -> infos -> inxi...
+ # Basically here we are hoping that the grandparent is a shell, or at least
+ # recognized as a known possible program
+ # print "app not shell?: $shell\n";
+ if ($shell){
+ print "shell 4: $shell StartClientVersionType: $parent\n" if $b_debug;
+ if ($parent){
+ if (shell_test($parent)){
+ $shell = $parent;
+ }
+ elsif ((@app = ProgramData::full(lc($parent),lc($parent),0)) && $app[0]){
+ $shell = $app[0];
+ $client{'version'} = $app[1] if $app[1];
+ }
+ print "shell 5: $shell version: $client{'version'}\n" if $b_debug;
+ }
+ }
+ else {
+ $client{'version'} = main::message('unknown-shell');
+ }
+ print "6: shell not app version: $client{'version'}\n" if $b_debug;
+ }
+ $client{'version'} ||= '';
+ $client{'version'} =~ s/(\(.*|-release|-version)// if $client{'version'};
+ $shell =~ s/^[\s-]+|[\s-]+$//g if $shell; # sometimes will be like -sh
+ $client{'name'} = lc($shell);
+ $client{'name-print'} = $shell;
+ print "7: shell: $client{'name-print'} version: $client{'version'}\n" if $b_debug;
+ if ($extra > 2 && $working && lc($shell) ne lc($working)){
+ if (@app = ProgramData::full(lc($working))){
+ $client{'default-shell'} = $app[0];
+ $client{'default-shell-v'} = $app[1];
+ $client{'default-shell-v'} =~ s/(\s*\(.*|-release|-version)// if $client{'default-shell-v'};
+ }
+ else {
+ $client{'default-shell'} = $working;
+ }
+ }
}
else {
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/bsd-disks-diabolus.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/freebsd-disks-solestar.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/freebsd-enceladus-1.txt";
- ## matches: toshiba: openbsd-5.6-sysctl-2.txt
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/openbsd-5.6-dmesg.boot-1.txt";
- ## matches: compaq: openbsd-5.6-sysctl-1.txt"
- $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/openbsd-dmesg.boot-1.txt";
- }
- if ($file){
- return if ! -r $file;
- @dmesg_boot = reader($file);
- # some dmesg repeats, so we need to dump the second and > iterations
- # replace all indented items with ~ so we can id them easily while
- # processing note that if user, may get error of read permissions
- # for some weird reason, real mem and avail mem are use a '=' separator,
- # who knows why, the others are ':'
- foreach (@dmesg_boot){
- $counter++ if /^(OpenBSD|DragonFly|FreeBSD is a registered trademark)/;
- last if $counter > 1;
- $_ =~ s/\s*=\s*|:\s*/:/;
- $_ =~ s/\"//g;
- $_ =~ s/^\s+/~/;
- $_ =~ s/\s\s/ /g;
- $_ =~ s/^(\S+)\sat\s/$1:at /; # ada0 at ahcich0
- push @temp, $_;
- if (/^bios[0-9]:(at|vendor)/){
- push @sysctl_machine, $_;
+ # last fallback to catch things like busybox shells
+ if (my $busybox = readlink(main::check_program('sh'))){
+ if ($busybox =~ m|busybox$|){
+ $client{'name'} = 'ash';
+ $client{'name-print'} = 'ash (busybox)';
}
}
- @dmesg_boot = @temp;
- # FreeBSD: 'da*' is a USB device 'ada*' is a SATA device 'mmcsd*' is an SD card
- if ($b_dm_boot_disk && @dmesg_boot){
- @dm_boot_disk = grep {/^(ad|ada|da|mmcblk|mmcsd|nvme[0-9]+n|sd|wd)[0-9]+(:|\sat\s)/} @dmesg_boot;
- log_data('dump','@dm_boot_disk',\@dm_boot_disk) if $b_log;
- print Dumper \@dm_boot_disk if $test[11];
- }
- if ($b_dm_boot_optical && @dmesg_boot){
- @dm_boot_optical = grep {/^(cd)[0-9]+(\([^)]+\))?(:|\sat\s)/} @dmesg_boot;
- log_data('dump','@dm_boot_optical',\@dm_boot_optical) if $b_log;
- print Dumper \@dm_boot_optical if $test[11];
+ print "8: shell: $client{'name-print'} version: $client{'version'}\n" if $b_debug;
+ if (!$client{'name'}) {
+ $client{'name'} = 'shell';
+ # handling na here, not on output, so we can test for !$client{'name-print'}
+ $client{'name-print'} = 'N/A';
}
}
- log_data('dump','@dmesg_boot',\@dmesg_boot) if $b_log;
- #print Dumper \@dmesg_boot if $test[11];
- eval $end if $b_log;
-}
-
-# note, all actual tests have already been run in check_tools so if we
-# got here, we're good.
-sub set_dmi_data {
- eval $start if $b_log;
- $_[0] = 1; # check boolean passed by reference
- if ($b_fake_dmidecode || $alerts{'dmidecode'}{'action'} eq 'use' ){
- set_dmidecode_data();
+ if (!$client{'su-start'}){
+ $client{'su-start'} = 'sudo' if $ENV{'SUDO_USER'};
+ $client{'su-start'} = 'doas' if $ENV{'DOAS_USER'};
+ }
+ if ($parent && $parent eq 'login'){
+ $client{'su-start'} = ($client{'su-start'}) ? $client{'su-start'} . ',' . $parent: $parent;
}
eval $end if $b_log;
}
-sub set_dmidecode_data {
+# Public: returns shell launcher, terminal, program, whatever
+# depends on $pppid so only runs if that is set.
+sub shell_launcher {
eval $start if $b_log;
- my ($content,@data,@working,$type,$handle);
- if ($b_fake_dmidecode){
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/pci-freebsd-8.2-2";
- # my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-loki-1.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-t41-1.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-mint-20180106.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-vmware-ram-1.txt";
- #open my $fh, '<', $file or die "can't open $file: $!";
- #chomp(@data = <$fh>);
- }
- else {
- my $path = check_program('dmidecode');
- $content = qx($path 2>/dev/null) if $path;
- @data = split /\n/, $content;
+ my (@data);
+ my ($msg,$pppid,$shell_parent) = ('','','');
+ $pppid = $client{'pppid'};
+ if ($b_log){
+ $msg = ($ppid) ? "pppid: $pppid ppid: $ppid": "ppid: undefined";
+ main::log_data('data',$msg);
}
- # we don't need the opener lines of dmidecode output
- # but we do want to preserve the indentation. Empty lines
- # won't matter, they will be skipped, so no need to handle them.
- # some dmidecodes do not use empty line separators
- splice @data, 0, 5 if @data;
- my $j = 0;
- my $b_skip = 1;
- foreach (@data){
- if (!/^Hand/){
- next if $b_skip;
- if (/^[^\s]/){
- $_ = lc($_);
- $_ =~ s/\s(information)//;
- push @working, $_;
- }
- elsif (/^\t/){
- $_ =~ s/^\t\t/~/;
- $_ =~ s/^\t|\s+$//g;
- push @working, $_;
- }
+ # print "self parent: $pppid ppid: $ppid\n";
+ if ($pppid){
+ $shell_parent = $client{'parent'};
+ # print "shell parent 1: $shell_parent\n";
+ if ($b_log){
+ $msg = ($shell_parent) ? "shell parent 1: $shell_parent": "shell parent 1: undefined";
+ main::log_data('data',$msg);
}
- elsif (/^Handle\s(0x[0-9A-Fa-f]+).*DMI\stype\s([0-9]+),.*/){
- $j = scalar @dmi;
- $handle = hex($1);
- $type = $2;
- $b_slot_tool = 1 if $type && $type == 9;
- $b_skip = ( $type > 126 )? 1 : 0;
- next if $b_skip;
- # we don't need 32, system boot, or 127, end of table
- if (@working){
- if ($working[0] != 32 && $working[0] < 127){
- $dmi[$j] = (
- [@working],
- );
- }
+ # in case sudo starts inxi, parent is shell (or perl inxi if run by debugger)
+ # so: perl (2) started pinxi with sudo (3) in sh (4) in terminal
+ my $shells = 'ash|bash|busybox|cicada|csh|dash|doas|elvish|fish|fizsh|ksh|';
+ $shells .= 'ksh93|lksh|login|loksh|mksh|nash|oh|oil|osh|pdksh|perl|posh|';
+ $shells .= 'su|sudo|tcsh|xonsh|yash|zsh';
+ $shells .= shell_test('return');
+ my $i = 0;
+ print "self::pppid-0: $pppid :: $shell_parent\n" if $b_debug;
+ # note that new shells not matched will keep this loop spinning until it ends.
+ # All we really can do about that is update with new shell name when we find them.
+ while ($i < 8 && $shell_parent && $shell_parent =~ /^($shells)$/){
+ # bash > su > parent
+ $i++;
+ $pppid = get_pppid($pppid);
+ $shell_parent = parent_name($pppid);
+ print "self::pppid-${i}: $pppid :: $shell_parent\n" if $b_debug;
+ if ($b_log){
+ $msg = ($shell_parent) ? "parent-$i: $shell_parent": "shell parent $i: undefined";
+ main::log_data('data',$msg);
}
- @working = ($type,$handle);
}
}
- if (@working && $working[0] != 32 && $working[0] != 127){
- $j = scalar @dmi;
- $dmi[$j] = (
- [@working],
- );
+ if ($b_log){
+ $pppid ||= '';
+ $shell_parent ||= '';
+ main::log_data('data',"parents: pppid: $pppid parent-name: $shell_parent");
}
- # last by not least, sort it by dmi type, now we don't have to worry
- # about random dmi type ordering in the data, which happens. Also sort
- # by handle, as secondary sort.
- @dmi = sort { $a->[0] <=> $b->[0] || $a->[1] <=> $b->[1] } @dmi;
- main::log_data('dump','@dmi',\@dmi) if $b_log;
- print Dumper \@dmi if $test[2];
eval $end if $b_log;
+ return $shell_parent;
}
-sub set_ip_data {
+# args: 0: parent id
+# returns SID/start ID
+sub get_pppid {
eval $start if $b_log;
- if ($alerts{'ip'}{'action'} eq 'use' ){
- set_ip_addr();
- }
- elsif ($alerts{'ifconfig'}{'action'} eq 'use'){
- set_ifconfig();
- }
+ my ($ppid) = @_;
+ return 0 if !$ppid;
+ # ps -j -fp : some bsds ps do not have -f for PPID, so we can't get the ppid
+ my $cmd = "ps -wwjfp $ppid 2>/dev/null";
+ main::log_data('cmd',$cmd) if $b_log;
+ my @data = main::grabber($cmd);
+ # shift @data if @data;
+ my $pppid = main::awk(\@data,"$ppid",3,'\s+');
eval $end if $b_log;
+ return $pppid;
}
-sub set_ip_addr {
+# args: 0: parent id
+# returns parent command name
+sub parent_name {
eval $start if $b_log;
- my $program = check_program('ip');
- my @data = grabber("$program addr 2>/dev/null",'\n','strip') if $program;
- # my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/if/scope-ipaddr-1.txt";
- # my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/networking/ip-addr-blue-advance.txt";
- #my @data = reader($file,'strip') or die $!;
- my ($b_skip,$broadcast,$if,$ip,@ips,$scope,$if_id,$type,@temp,@temp2);
- foreach (@data){
- if (/^[0-9]/){
- #print "$_\n";
- if (@ips){
- #print "$if\n";
- @temp = ($if,[@ips]);
- @ifs = (@ifs,@temp);
- @ips = ();
- }
- @temp = split /:\s+/,$_;
- $if = $temp[1];
- if ($if eq 'lo'){
- $b_skip = 1;
- $if = '';
- next;
- }
- $b_skip = 0;
- @temp = ();
- }
- elsif (!$b_skip && /^inet/){
- #print "$_\n";
- @temp = split /\s+/, $_;
- ($broadcast,$ip,$scope,$if_id,$type) = ('','','','','');
- $ip = $temp[1];
- $type = ($temp[0] eq 'inet') ? 4 : 6 ;
- if ($temp[2] eq 'brd'){
- $broadcast = $temp[3];
- }
- if (/scope\s([^\s]+)(\s(.+))?/){
- $scope = $1;
- $if_id = $3;
- }
- @temp = ($type,$ip,$broadcast,$scope,$if_id);
- @ips = (@ips,[@temp]);
- #print Dumper \@ips;
- }
- }
- #print Dumper \@ips if $test[4];
- if (@ips){
- @temp = ($if,[@ips]);
- @ifs = (@ifs,@temp);
+ my ($ppid) = @_;
+ return '' if !$ppid;
+ my ($parent_name);
+ # known issue, ps truncates long command names, like io.elementary.t[erminal]
+ my $cmd = "ps -wwjp $ppid 2>/dev/null";
+ main::log_data('cmd',$cmd) if $b_log;
+ my @data = main::grabber($cmd,'','strip');
+ # dump the headers if they exist
+ $parent_name = (grep {/$ppid/} @data)[0] if @data;
+ if ($parent_name){
+ # we don't want to worry about column position, just slice off all
+ # the first part before the command
+ $parent_name =~ s/^.*[0-9]+:[0-9\.]+\s+//;
+ # then get the command
+ $parent_name = (split(/\s+/,$parent_name))[0];
+ # get rid of /../ path info if present
+ $parent_name =~ s|^.*/|| if $parent_name;
+ # to work around a ps -p or gnome-terminal bug, which returns
+ # gnome-terminal- trim -/_ off start/end; _su, etc, which breaks detections
+ $parent_name =~ s/^[_-]|[_-]$//g;
}
- main::log_data('dump','@ifs',\@ifs) if $b_log;
- print Dumper \@ifs if $test[3];
eval $end if $b_log;
+ return $parent_name;
}
-sub set_ifconfig {
+# List of program_values non-handled shells, or known to have no version
+# Move shell to set_program_values for print name, or version if available
+# args: 0: return|[shell name to test
+# returns test list OR shell name/''
+sub shell_test {
+ my ($test) = @_;
+ # these shells are not verified or tested
+ my $shells = 'apush|ccsh|ch|esh?|eshell|heirloom|hush|';
+ $shells .= 'ion|imrsh|larryshell|mrsh|msh(ell)?|murex|nsh|nu(shell)?|';
+ $shells .= 'oksh|psh|pwsh|pysh(ell)?|rush|sash|xsh?|';
+ # these shells are tested and have no version info
+ $shells .= 'es|rc|scsh|sh';
+ return '|' . $shells if $test eq 'return';
+ return ($test =~ /^($shells)$/) ? $test : '';
+}
+
+# This will test against default IP like: (:0) vs full IP to determine
+# ssh status. Surprisingly easy test? Cross platform
+sub ssh_status {
eval $start if $b_log;
- my $program = check_program('ifconfig'); # not in user path, sbin
- my @data = grabber("$program 2>/dev/null",'\n','') if $program;
- #my @data = reader("$ENV{'HOME'}/bin/scripts/inxi/data/if/vps-ifconfig-1.txt",'') or die $!;
- my ($b_skip,$broadcast,$if,@ips_bsd,$ip,@ips,$scope,$if_id,$type,@temp,@temp2);
- my ($state,$speed,$duplex,$mac);
- foreach (@data){
- if (/^[\S]/i){
- #print "$_\n";
- if (@ips){
- #print "here\n";
- @temp = ($if,[@ips]);
- @ifs = (@ifs,@temp);
- @ips = ();
- }
- if ($mac){
- @temp = ($if,[($state,$speed,$duplex,$mac)]);
- @ifs_bsd = (@ifs_bsd,@temp);
- ($state,$speed,$duplex,$mac,$if_id) = ('','','','','');
- }
- $if = (split /\s+/,$_)[0];
- $if =~ s/:$//; # em0: flags=8843
- $if_id = $if;
- $if = (split /:/, $if)[0] if $if;
- if ($if =~ /^lo/){
- $b_skip = 1;
- $if = '';
- $if_id = '';
- next;
- }
- $b_skip = 0;
- }
- # lladdr openbsd
- elsif (!$b_skip && $bsd_type && /^\s+(ether|media|status|lladdr)/){
- $_ =~ s/^\s+//;
- # media: Ethernet 100baseTX <full-duplex> freebsd 7.3
- # media: Ethernet autoselect (1000baseT <full-duplex>) Freebsd 8.2
- #
- if (/^media/){
- # openbsd: media: Ethernet autoselect (1000baseT full-duplex)
- if ($bsd_type && $bsd_type eq 'openbsd'){
- $_ =~ /\s\([\S]+\s([\S]+)\)/;
- $duplex = $1;
- }
- else {
- $_ =~ /<([^>]+)>/;
- $duplex = $1;
- }
- $_ =~ /\s\(([1-9][\S]+\s)/;
- $speed = $1;
- $speed =~ s/\s+$// if $speed;
- }
- elsif (!$mac && /^ether|lladdr/){
- $mac = (split /\s+/, $_)[1];
- }
- elsif (/^status/){
- $state = (split /\s+/, $_)[1];
- }
- }
- elsif (!$b_skip && /^\s+inet/){
- #print "$_\n";
- $_ =~ s/^\s+//;
- $_ =~ s/addr:\s/addr:/;
- @temp = split /\s+/, $_;
- ($broadcast,$ip,$scope,$type) = ('','','','');
- $ip = $temp[1];
- # fe80::225:90ff:fe13:77ce%em0
-# $ip =~ s/^addr:|%([\S]+)//;
- if ($1 && $1 ne $if_id){
- $if_id = $1;
- }
- $type = ($temp[0] eq 'inet') ? 4 : 6 ;
- if (/(Bcast:|broadcast\s)([\S]+)/){
- $broadcast = $2;
- }
- if (/(scopeid\s[^<]+<|Scope:|scopeid\s)([^>]+)[>]?/){
- $scope = $2;
- }
- $scope = 'link' if $ip =~ /^fe80/;
- @temp = ($type,$ip,$broadcast,$scope,$if_id);
- @ips = (@ips,[@temp]);
- #print Dumper \@ips;
+ my ($b_ssh,$ssh);
+ # fred pts/10 2018-03-24 16:20 (:0.0)
+ # fred-remote pts/1 2018-03-27 17:13 (43.43.43.43)
+ if (my $program = main::check_program('who')){
+ $ssh = (main::grabber("$program am i 2>/dev/null"))[0];
+ # crude IP validation, v6 ::::::::, v4 x.x.x.x
+ if ($ssh && $ssh =~ /\(([:0-9a-f]{8,}|[1-9][\.0-9]{6,})\)$/){
+ $b_ssh = 1;
}
}
- if (@ips){
- @temp = ($if,[@ips]);
- @ifs = (@ifs,@temp);
- }
- if ($mac){
- @temp = ($if,[($state,$speed,$duplex,$mac)]);
- @ifs_bsd = (@ifs_bsd,@temp);
- ($state,$speed,$duplex,$mac) = ('','','','');
- }
- print Dumper \@ifs if $test[3];
- print Dumper \@ifs_bsd if $test[3];
- main::log_data('dump','@ifs',\@ifs) if $b_log;
- main::log_data('dump','@ifs_bsd',\@ifs_bsd) if $b_log;
eval $end if $b_log;
+ return $b_ssh;
}
-sub set_ps_aux {
+# If IRC: called if root for -S, -G, or if not in display for user.
+sub console_irc_tty {
eval $start if $b_log;
- my ($header,@temp);
- @ps_aux = grabber("ps aux 2>/dev/null",'','strip');
- if (@ps_aux){
- $header = shift @ps_aux; # get rid of header row
- # handle busy box, which has 3 columns, regular ps aux has 11
- # avoid deprecated implicit split error in older Perls
- @temp = split(/\s+/, $header);
+ $loaded{'con-irc-tty'} = 1;
+ # not set for root in or out of display
+ if (defined $ENV{'XDG_VTNR'}){
+ $client{'con-irc-tty'} = $ENV{'XDG_VTNR'};
}
- $ps_cols = $#temp;
- if ($ps_cols < 10){
- my $version = qx(ps --version 2>&1);
- $b_bb_ps = 1 if $version =~ /busybox/i;
- }
- return if !@ps_aux; # note: mips/openwrt ps has no 'a'
- $_=lc for @ps_aux; # this is a super fast way to set to lower
- # note: regular perl /.../inxi but sudo /.../inxi is added for sudo start
- # for pinxi, we want to see the useage data for cpu/ram
- @ps_aux = grep {!/\/$self_name\b/} @ps_aux if $self_name eq 'inxi';
- # this is for testing for the presence of the command
- @ps_cmd = grep {!/^\[/} map {
- my @split = split /\s+/, $_;
- # slice out 10th to last elements of ps aux rows
- my $final = $#split;
- # some stuff has a lot of data, chrome for example
- $final = ($final > ($ps_cols + 2) ) ? $ps_cols + 2 : $final;
- @split = @split[$ps_cols .. $final];
- join " ", @split;
- } @ps_aux;
- #@ps_cmd = grep {!/^\[/} @ps_cmd;
- # never, because ps loaded before option handler
- print Dumper \@ps_cmd if $test[5];
+ else {
+ # ppid won't work with name, so this is assuming there's only one client running
+ # if in display, -G returns vt size, not screen dimensions in rowsxcols.
+ $client{'con-irc-tty'} = main::awk(\@ps_aux,'.*\b' . $client{'name'} . '\b.*',7,'\s+');
+ $client{'con-irc-tty'} =~ s/^(tty|\?)// if defined $client{'con-irc-tty'};
+ }
+ $client{'con-irc-tty'} = '' if !defined $client{'con-irc-tty'};
+ main::log_data('data',"console-irc-tty:$client{'con-irc-tty'}") if $b_log;
eval $end if $b_log;
}
-sub set_ps_gui {
+sub tty_number {
eval $start if $b_log;
- $b_ps_gui = 1;
- my ($working,@match,@temp);
- # desktops / wm (some wm also compositors)
- if ($show{'system'}){
- @temp=qw(razor-desktop razor-session lxsession lxqt-session
- tdelauncher tdeinit_phase1);
- @match = (@match,@temp);
- @temp=qw(3dwm 9wm afterstep aewm aewm\+\+ amiwm antiwm awesome
- blackbox bspwm
- cagebreak calmwm (sh|c?lisp).*clfswm (openbsd-)?cwm dwm evilwm
- fluxbox flwm flwm_topside fvwm.*-crystal fvwm1 fvwm2 fvwm3 fvwm95 fvwm
- i3 instantwm ion3 jbwm jwm larswm lwm
- matchbox-window-manager mini musca mwm nawm notion
- openbox orbital pekwm perceptia python.*qtile qtile qvwm ratpoison
- sawfish scrotwm spectrwm (sh|c?lisp).*stumpwm sway
- tinywm tvtwm twm
- waycooler way-cooler windowlab WindowMaker wm2 wmii2 wmii wmx
- xfdesktop xmonad yeahwm);
- @match = (@match,@temp);
- }
- # wm:
- if ($show{'system'} && $extra > 1){
- @temp=qw(budgie-wm compiz deepin-wm gala gnome-shell
- twin kwin_wayland kwin_x11 kwin marco
- deepin-metacity metacity metisse mir muffin deepin-mutter mutter
- ukwm xfwm4 xfwm5);
- @match = (@match,@temp);
- # startx: /bin/sh /usr/bin/startx
- @temp=qw(ly .*startx xinit); # possible dm values
- @match = (@match,@temp);
- }
- # info: NOTE: glx-dock is cairo-dock
- if ($show{'system'} && $extra > 2){
- @temp=qw(alltray awn bar bmpanel bmpanel2 budgie-panel
- cairo-dock dde-dock dmenu dockbarx docker docky dzen dzen2
- fbpanel fspanel glx-dock gnome-panel hpanel i3bar icewmtray
- kdocker kicker latte latte-dock lemonbar ltpanel lxpanel lxqt-panel
- matchbox-panel mate-panel ourico
- perlpanel plank plasma-desktop plasma-netbook polybar pypanel
- razor-panel razorqt-panel stalonetray swaybar taskbar tint2 trayer
- ukui-panel vala-panel wbar wharf wingpanel witray
- xfce4-panel xfce5-panel xmobar yabar);
- @match = (@match,@temp);
- }
- # compositors (for wayland these are also the server, note.
- # for wayland always show, so always load these
- if ($show{'graphic'} && $extra > 0){
- @temp=qw(3dwm asc budgie-wm compiz compton deepin-wm dwc dcompmgr
- enlightenment fireplace gnome-shell grefson kmscon kwin_wayland kwin_x11
- liri marco metisse mir moblin motorcar muffin mutter
- orbital papyros perceptia picom rustland sommelier sway swc
- ukwm unagi unity-system-compositor
- wavy waycooler way-cooler wayfire wayhouse westford weston xcompmgr);
- @match = (@match,@temp);
- }
- @match = uniq(@match);
- my $matches = join '|', @match;
- foreach (@ps_cmd){
- if (/^(|[\S]*\/)($matches)(\/|\s|$)/){
- $working = $2;
- push @ps_gui, $working; # deal with duplicates with uniq
+ $loaded{'tty-number'} = 1;
+ # note: ttyname returns undefined if pinxi is > redirected output
+ # variants: /dev/pts/1 /dev/tty1 /dev/ttyp2 /dev/ttyra [hex number a]
+ $client{'tty-number'} = POSIX::ttyname(1);
+ # but tty direct works fine in that case
+ if (!defined $client{'tty-number'} && (my $program = main::check_program('tty'))){
+ chomp($client{'tty-number'} = qx($program 2>/dev/null));
+ if (defined $client{'tty-number'} && $client{'tty-number'} =~ /^not/){
+ undef $client{'tty-number'};
}
}
- @ps_gui = uniq(@ps_gui) if @ps_gui;
- print Dumper \@ps_gui if $test[5];
- log_data('dump','@ps_gui',\@ps_gui) if $b_log;
+ if (defined $client{'tty-number'}){
+ $client{'tty-number'} =~ s/^\/dev\/(tty)?//;
+ }
+ else {
+ $client{'tty-number'} = '';
+ }
+ # systemd only item, usually same as tty in console, not defined
+ # for root or non systemd systems.
+ if (defined $ENV{'XDG_VTNR'} && $client{'tty-number'} ne '' &&
+ $ENV{'XDG_VTNR'} ne $client{'tty-number'}){
+ $client{'tty-number'} = "$client{'tty-number'} (vt $ENV{'XDG_VTNR'})";
+ }
+ elsif ($client{'tty-number'} eq '' && defined $ENV{'XDG_VTNR'}){
+ $client{'tty-number'} = $ENV{'XDG_VTNR'};
+ }
+ main::log_data('data',"tty:$client{'tty-number'}") if $b_log;
eval $end if $b_log;
}
+}
+
sub set_sysctl_data {
eval $start if $b_log;
- return if $alerts{'sysctl'}{'action'} ne 'use';
+ return if !$alerts{'sysctl'} || $alerts{'sysctl'}->{'action'} ne 'use';
my (@temp);
# darwin sysctl has BOTH = and : separators, and repeats data. Why?
- if (!$b_fake_sysctl){
- my $program = check_program('sysctl');
- @temp = grabber("$program -a 2>/dev/null");
+ if (!$fake{'sysctl'}){
+ # just on odd chance we hit a bsd with /proc/cpuinfo, don't want to
+ # sleep 2x
+ if ($use{'bsd-sleep'} && !$system_files{'proc-cpuinfo'}){
+ if ($b_hires){
+ eval 'Time::HiRes::usleep($sleep)';
+ }
+ else {
+ select(undef, undef, undef, $cpu_sleep);
+ }
+ }
+ @temp = grabber($alerts{'sysctl'}->{'path'} . " -a 2>/dev/null");
}
else {
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/obsd_6.1_sysctl_soekris6501_root.txt";
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/obsd_6.1sysctl_lenovot500_user.txt";
+ my $file;
+ # $file = "$fake_data_dir/bsd/sysctl/obsd_6.1_sysctl_soekris6501_root.txt";
+ # $file = "$fake_data_dir/bsd/sysctl/obsd_6.1sysctl_lenovot500_user.txt";
## matches: compaq: openbsd-dmesg.boot-1.txt
- my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/openbsd-5.6-sysctl-1.txt";
+ # $file = "$fake_data_dir/bsd/sysctl/openbsd-5.6-sysctl-1.txt";
## matches: toshiba: openbsd-5.6-dmesg.boot-1.txt
- #my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/openbsd-5.6-sysctl-2.txt";
- @temp = reader($file);
+ # $file = "$fake_data_dir/bsd/sysctl/openbsd-5.6-sysctl-2.txt";
+ # $file = "$fake_data_dir/bsd/sysctl/obsd-6.8-sysctl-a-battery-sensor-1.txt";
+ # @temp = reader($file);
}
foreach (@temp){
$_ =~ s/\s*=\s*|:\s+/:/;
$_ =~ s/\"//g;
- push @sysctl, $_;
- # we're building these here so we can use these arrays to test
- # in each feature if we will try to build the feature for bsds
- if (/^hw\.sensors/ && !/^hw\.sensors\.acpi(bat|cmb)/ && !/^hw.sensors.softraid/){
- push @sysctl_sensors, $_;
- }
- elsif (/^hw\.(vendor|product|version|serialno|uuid)/){
- push @sysctl_machine, $_;
- }
- elsif (/^hw\.sensors\.acpi(bat|cmb)/){
- push @sysctl_battery, $_;
+ push(@{$sysctl{'main'}}, $_);
+ # we're building these here so we can use these arrays per feature
+ if ($use{'bsd-audio'} && /^hw\.snd\./){
+ push(@{$sysctl{'audio'}}, $_); # not used currently, just test data
+ }
+ # note: we could use ac0 to indicate plugged in but messes with battery output
+ elsif ($use{'bsd-battery'} && /^hw\.sensors\.acpi(bat|cmb)/){
+ push(@{$sysctl{'battery'}}, $_);
+ }
+ # hw.cpufreq.temperature: 40780 :: dev.cpu0.temperature
+ # hw.acpi.thermal.tz2.temperature: 27.9C :: hw.acpi.thermal.tz1.temperature: 42.1C
+ # hw.acpi.thermal.tz0.temperature: 42.1C
+ elsif ($use{'bsd-sensor'} &&((/^hw\.sensors/ && !/^hw\.sensors\.acpi(ac|bat|cmb)/ &&
+ !/^hw\.sensors\.softraid/) || /^hw\.acpi\.thermal/ || /^dev\.cpu\.[0-9]+\.temp/)){
+ push(@{$sysctl{'sensor'}}, $_);
+ }
+ # Must go AFTER sensor because sometimes freebsd puts sensors in dev.cpu
+ # hw.l1dcachesize hw.l2cachesize
+ elsif ($use{'bsd-cpu'} && (/^hw\.(busfreq|clock|n?cpu|l[123].?cach|model|smt)/ ||
+ /^dev\.cpu/ || /^machdep\.(cpu|hlt_logical_cpus)/)){
+ push(@{$sysctl{'cpu'}}, $_);
+ }
+ # only activate if using the diskname feature in dboot!! note assign to $dboot.
+ elsif ($use{'bsd-disk'} && /^hw\.disknames/){
+ push(@{$dboot{'disk'}}, $_);
+ }
+ elsif ($use{'bsd-kernel'} && /^kern.compiler_version/){
+ push(@{$sysctl{'kernel'}}, $_);
+ }
+ elsif ($use{'bsd-machine'} &&
+ /^(hw\.|machdep\.dmi\.(bios|board|system)-)(date|product|serial(no)?|uuid|vendor|version)/){
+ push(@{$sysctl{'machine'}}, $_);
+ }
+ # let's rely on dboot, we really just want the hardware specs for solid ID
+ # elsif ($use{'bsd-machine'} && !$dboot{'machine-vm'} &&
+ # /(\bhvm\b|innotek|\bkvm\b|microsoft.*virtual machine|openbsd[\s-]vmm|qemu|qumranet|vbox|virtio|virtualbox|vmware)/i){
+ # push(@{$dboot{'machine-vm'}}, $_);
+ # }
+ elsif ($use{'bsd-memory'} && /^(hw\.(physmem|usermem)|Free Memory)/){
+ push(@{$sysctl{'memory'}}, $_);
}
+
+ elsif ($use{'bsd-raid'} && /^hw\.sensors\.softraid[0-9]\.drive[0-9]/){
+ push(@{$sysctl{'softraid'}}, $_);
+ }
+ }
+ if ($dbg[7]){
+ print("main\n", Dumper $sysctl{'main'});
+ print("dboot-machine-vm\n", Dumper $dboot{'machine-vm'});
+ print("audio\n", Dumper $sysctl{'audio'});
+ print("battery\n", Dumper $sysctl{'battery'});
+ print("cpu\n", Dumper $sysctl{'cpu'});
+ print("kernel\n", Dumper $sysctl{'kernel'});
+ print("machine\n", Dumper $sysctl{'machine'});
+ print("memory\n", Dumper $sysctl{'memory'});
+ print("sensors\n", Dumper $sysctl{'sensor'});
+ print("softraid\n", Dumper $sysctl{'softraid'});
}
- print Dumper \@sysctl if $test[7];
# this thing can get really long.
if ($b_log){
- #main::log_data('dump','@sysctl',\@sysctl);
- }
- eval $end if $b_log;
-}
-
-## @usb array indexes
-# 0 - bus id / sort id
-# 1 - device id
-# 2 - path_id
-# 3 - path
-# 4 - class id
-# 5 - subclass id
-# 6 - protocol id
-# 7 - vendor:chip id
-# 8 - usb version
-# 9 - interfaces
-# 10 - ports
-# 11 - vendor
-# 12 - product
-# 13 - device-name
-# 14 - type string
-# 15 - driver
-# 16 - serial
-# 17 - speed
-# 18 - configuration - not used
-## USBData
+ main::log_data('dump','$sysctl{main}',$sysctl{'main'});
+ main::log_data('dump','$dboot{machine-vm}',$sysctl{'machine-vm'});
+ main::log_data('dump','$sysctl{audio}',$sysctl{'audio'});
+ main::log_data('dump','$sysctl{battery}',$sysctl{'battery'});
+ main::log_data('dump','$sysctl{cpu}',$sysctl{'cpu'});
+ main::log_data('dump','$sysctl{kernel}',$sysctl{'kernel'});
+ main::log_data('dump','$sysctl{machine}',$sysctl{'machine'});
+ main::log_data('dump','$sysctl{memory}',$sysctl{'memory'});
+ main::log_data('dump','$sysctl{sensors}',$sysctl{'sensor'});
+ main::log_data('dump','$sysctl{softraid}',$sysctl{'softraid'});
+ }
+ eval $end if $b_log;
+}
+
+sub get_uptime {
+ eval $start if $b_log;
+ my ($days,$hours,$minutes,$seconds,$sys_time,$uptime) = ('','','','','','');
+ if (check_program('uptime')){
+ $uptime = qx(uptime);
+ $uptime = trimmer($uptime);
+ if ($fake{'uptime'}){
+ # $uptime = '2:58PM up 437 days, 8:18, 3 users, load averages: 2.03, 1.72, 1.77';
+ # $uptime = '04:29:08 up 3:18, 3 users, load average: 0,00, 0,00, 0,00';
+ # $uptime = '10:23PM up 5 days, 16:17, 1 user, load averages: 0.85, 0.90, 1.00';
+ # $uptime = '05:36:47 up 1 day, 3:28, 4 users, load average: 1,88, 0,98, 0,62';
+ # $uptime = '05:36:47 up 1 day, 3 min, 4 users, load average: 1,88, 0,98, 0,62';
+ # $uptime = '04:41:23 up 2:16, load average: 7.13, 6.06, 3.41 # root openwrt';
+ # $uptime = '9:51 PM up 2 mins, 1 user, load average: 0:58, 0.27, 0.11';
+ # $uptime = '05:36:47 up 3 min, 4 users, load average: 1,88, 0,98, 0,62';
+ # $uptime = '9:51 PM up 49 secs, 1 user, load average: 0:58, 0.27, 0.11';
+ # $uptime = '04:11am up 0:00, 1 user, load average: 0.08, 0.03, 0.01'; # openSUSE 13.1 (Bottle)
+ # $uptime = '11:21:43 up 1 day 5:53, 4 users, load average: 0.48, 0.62, 0.48'; # openSUSE Tumbleweed 20210515
+ }
+ if ($uptime){
+ # trim off and store system time and up, and cut off user/load data
+ $uptime =~ s/^([0-9:])\s*([AP]M)?.+up\s+|,?\s*([0-9]+\suser|load).*$//gi;
+ # print "ut: $uptime\n";
+ if ($1){
+ $sys_time = $1;
+ $sys_time .= lc($2) if $2;
+ }
+ if ($uptime =~ /\b([0-9]+)\s+day[s]?\b/){
+ $days = ($1 + 0) . 'd';
+ }
+ if ($uptime =~ /\b([0-9]{1,2}):([0-9]{1,2})\b/){
+ $hours = ($1 + 0) . 'h';
+ $minutes = ($2 + 0) . 'm';
+ }
+ else {
+ if ($uptime =~ /\b([0-9]+)\smin[s]?\b/){
+ $minutes = ($1 + 0) . 'm';
+ }
+ if ($uptime =~ /\b([0-9]+)\ssec[s]?\b/){
+ $seconds = ($1 + 0) . 's';
+ }
+ }
+ $days .= ' ' if $days && ($hours || $minutes || $seconds);
+ $hours .= ' ' if $hours && $minutes;
+ $minutes .= ' ' if $minutes && $seconds;
+ $uptime = $days . $hours . $minutes . $seconds;
+ }
+ }
+ $uptime ||= 'N/A';
+ eval $end if $b_log;
+ return $uptime;
+}
+
+## UsbData
+# %usb array indexes
+# 0: bus id / sort id
+# 1: device id
+# 2: path_id
+# 3: path
+# 4: class id
+# 5: subclass id
+# 6: protocol id
+# 7: vendor:chip id
+# 8: usb version
+# 9: interfaces
+# 10: ports
+# 11: vendor
+# 12: product
+# 13: device-name
+# 14: type string
+# 15: driver
+# 16: serial
+# 17: speed (bits, Si base 10, [MG]bps)
+# 18: configuration - not used
+# 19: power mW bsd only, not used yet
+# 20: product rev number
+# 21: driver_nu [bsd only]
+# 22: admin usb rev info
+# 23: rx lanes
+# 24: tx lanes
+# 25: speed (Bytes, IEC base 2, [MG]iBs
+# 26: absolute path
{
-package USBData;
+package UsbData;
my (@working);
-my ($b_hub,$addr_id,$bus_id,$bus_id_alpha,$chip_id,$class_id,
-$device_id,$driver,$ids,$interfaces,$name,$path,$path_id,$product,
-$protocol_id,$serial,$speed,$subclass_id,$type,$version,$vendor,$vendor_id,);
+my (@asound_ids,$b_asound,$b_hub,$addr_id,$bus_id,$bus_id_alpha,
+$chip_id,$class_id,$device_id,$driver,$driver_nu,$ids,$interfaces,
+$name,$network_regex,$path,$path_id,$power,$product,$product_id,$protocol_id,
+$mode,$rev,$serial,$speed_si,$speed_iec,$subclass_id,$type,$version,
+$vendor,$vendor_id);
my $b_live = 1; # debugger file data
+
sub set {
eval $start if $b_log;
- $b_usb_check = 1;
+ ${$_[0]} = 1; # set checked boolean
+ # note: bsd package usbutils has lsusb in it, but we dont' want it for default
+ # usbdevs is best, has most data, and runs as user
+ if ($alerts{'usbdevs'}->{'action'} eq 'use'){
+ usbdevs_data();
+ }
+ # usbconfig has weak/poor output, and requires root, only fallback
+ elsif ($alerts{'usbconfig'}->{'action'} eq 'use'){
+ usbconfig_data();
+ }
# if user config sets USB_SYS you can override with --usb-tool
- if ((!$b_usb_sys || $b_usb_tool) && $alerts{'lsusb'}{'action'} eq 'use' ){
+ elsif ((!$force{'usb-sys'} || $force{'lsusb'}) && $alerts{'lsusb'}->{'action'} eq 'use'){
lsusb_data();
}
elsif (-d '/sys/bus/usb/devices'){
sys_data('main');
}
- elsif ( $alerts{'usbdevs'}{'action'} eq 'use'){
- usbdevs_data();
+ @{$usb{'main'}} = sort {$a->[0] cmp $b->[0]} @{$usb{'main'}} if $usb{'main'};
+ if ($b_log){
+ main::log_data('dump','$usb{audio}: ',$usb{'audio'});
+ main::log_data('dump','$usb{bluetooth}: ',$usb{'bluetooth'});
+ main::log_data('dump','$usb{disk}: ',$usb{'disk'});
+ main::log_data('dump','$usb{graphics}: ',$usb{'graphics'});
+ main::log_data('dump','$usb{network}: ',$usb{'network'});
+ }
+ if ($dbg[55]){
+ print '$usb{audio}: ', Data::Dumper::Dumper $usb{'audio'};
+ print '$usb{bluetooth}: ', Data::Dumper::Dumper $usb{'bluetooth'};
+ print '$usb{disk}: ', Data::Dumper::Dumper $usb{'disk'};
+ print '$usb{graphics}: ', Data::Dumper::Dumper $usb{'graphics'};
+ print '$usb{network}: ', Data::Dumper::Dumper $usb{'network'};
}
eval $end if $b_log;
}
@@ -20946,24 +36654,37 @@ sub set {
sub lsusb_data {
eval $start if $b_log;
my (@temp);
- my @data = data_grabber('lsusb');
+ my @data = usb_grabber('lsusb');
foreach (@data){
- next if /^\s*$|^Couldn't/; # expensive second call: || /UNAVAIL/
- @working = split /\s+/, $_;
+ next if /^~$|^Couldn't/; # expensive second call: || /UNAVAIL/
+ @working = split(/\s+/, $_);
+ next unless defined $working[1] && defined $working[3];
$working[3] =~ s/:$//;
+ # Don't use this fix, the data is garbage in general! Seen FreeBSD lsusb with:
+ # Bus /dev/usb Device /dev/ugen0.3: ID 24ae:1003 Shenzhen Rapoo Technology Co., Ltd.
+ # hub, note incomplete data: Bus /dev/usb Device /dev/ugen0.1: ID 0000:0000
+ # linux:
+ # Bus 005 Device 007: ID 0d8c:000c C-Media Electronics, Inc. Audio Adapter
+ # if ($working[3] =~ m|^/dev/ugen([0-9]+)\.([0-9]+)|){
+ # $working[1] = $1;
+ # $working[3] = $2;
+ # }
+ next unless main::is_numeric($working[1]) && main::is_numeric($working[3]);
$addr_id = int($working[3]);
$bus_id = int($working[1]);
$path_id = "$bus_id-$addr_id";
$chip_id = $working[5];
@temp = @working[6..$#working];
- $name = join ' ', @temp;
- $name = $name;
- #print "$name\n";
+ $name = main::remove_duplicates(join(' ', @temp));
+ # $type = check_type($name,'','');
+ $type ||= '';
+ # do NOT set bus_id_alpha here!!
+ # print "$name\n";
$working[0] = $bus_id;
$working[1] = $addr_id;
$working[2] = $path_id;
$working[3] = '';
- $working[4] = 0;
+ $working[4] = '00';
$working[5] = '';
$working[6] = '';
$working[7] = $chip_id;
@@ -20973,18 +36694,128 @@ sub lsusb_data {
$working[11] = '';
$working[12] = '';
$working[13] = $name;
- $working[14] = '';
+ $working[14] = '';# $type;
$working[15] = '';
$working[16] = '';
$working[17] = '';
$working[18] = '';
- @usb = (@usb,[@working]);
- #print join ("\n",@working),"\n\n=====\n";
+ $working[19] = '';
+ $working[20] = '';
+ push(@{$usb{'main'}},[@working]);
+ # print join("\n",@working),"\n\n=====\n";
}
- print Data::Dumper::Dumper \@usb if $test[6];
- sys_data('lsusb') if @usb;
- print Data::Dumper::Dumper \@usb if $test[6];
- main::log_data('dump','@usb: plain',\@usb) if $b_log;
+ print 'lsusb-pre-sys: ', Data::Dumper::Dumper $usb{'main'} if $dbg[6];
+ sys_data('lsusb') if $usb{'main'};
+ print 'lsusb-w-sys: ', Data::Dumper::Dumper $usb{'main'} if $dbg[6];
+ main::log_data('dump','$usb{main}: plain',$usb{'main'}) if $b_log;
+ eval $end if $b_log;
+}
+
+# ugen0.1: <Apple OHCI root HUB> at usbus0, cfg=0 md=HOST spd=FULL (12Mbps) pwr=SAVE (0mA)
+# ugen0.2: <MediaTek 802.11 n WLAN> at usbus0, cfg=0 md=HOST spd=FULL (12Mbps) pwr=ON (160mA)
+# note: tried getting driver/ports from dmesg, impossible, waste of time
+sub usbconfig_data {
+ eval $start if $b_log;
+ my ($cfg,$hub_id,$ports);
+ my @data = usb_grabber('usbconfig');
+ foreach (@data){
+ if ($_ eq '~' && @working){
+ $chip_id = ($vendor_id || $product_id) ? "$vendor_id:$product_id" : '';
+ $working[7] = $chip_id;
+ $product ||= '';
+ $vendor ||= '';
+ $working[13] = main::remove_duplicates("$vendor $product") if $product || $vendor;
+ # leave the ugly vendor/product ids unless chip-ID shows!
+ $working[13] = $chip_id if $extra < 2 && $chip_id && !$working[13];
+ if (defined $class_id && defined $subclass_id && defined $protocol_id){
+ $class_id = hex($class_id);
+ $subclass_id = hex($subclass_id);
+ $protocol_id = hex($protocol_id);
+ $type = device_type("$class_id/$subclass_id/$protocol_id");
+ }
+ if ($working[13] && (!$type || $type eq '<vendor defined>')){
+ $type = check_type($working[13],'','');
+ }
+ $working[14] = $type;
+ push(@{$usb{'main'}},[@working]);
+ assign_usb_type([@working]);
+ undef @working;
+ }
+ elsif (/^([a-z_-]+)([0-9]+)\.([0-9]+):\s+<[^>]+>\s+at usbus([0-9]+)\b/){
+ ($class_id,$cfg,$power,$rev,$mode,$speed_si,$speed_iec,$subclass_id,
+ $type) = ();
+ ($product,$product_id,$vendor,$vendor_id) = ('','','','');
+ $hub_id = $2;
+ $addr_id = $3;
+ $bus_id = $4;
+ $path_id = "$bus_id-$hub_id.$addr_id";
+ $bus_id_alpha = bus_id_alpha($path_id);
+ if (/\bcfg\s*=\s*([0-9]+)/){
+ $cfg = $1;
+ }
+ if (/\bmd\s*=\s*([\S]+)/){
+ # nothing
+ }
+ # odd, using \b after ) doesn't work as expected
+ # note that bsd spd=FULL has no interest since we get that from the speed
+ if (/\b(speed|spd)\s*=\s*([\S]+)\s+\(([^\)]+)\)/){
+ $speed_si = $3;
+ }
+ if (/\b(power|pwr)\s*=\s*([\S]+)\s+\(([0-9]+mA)\)/){
+ $power = $3;
+ process_power(\$power) if $power;
+ }
+ version_data('bsd',\$speed_si,\$speed_iec,\$rev,\$mode);
+ $working[0] = $bus_id_alpha;
+ $working[1] = $addr_id;
+ $working[2] = $path_id;
+ $working[3] = '';
+ $working[8] = $rev;
+ $working[9] = '';
+ $working[10] = $ports;
+ $working[15] = $driver;
+ $working[17] = $speed_si;
+ $working[18] = $cfg;
+ $working[19] = $power;
+ $working[20] = '';
+ $working[21] = $driver_nu;
+ $working[22] = $mode;
+ $working[25] = $speed_iec;
+ }
+ elsif (/^bDeviceClass\s*=\s*0x00([a-f0-9]{2})\s*(<([^>]+)>)?/){
+ $class_id = $1;
+ $working[4] = $class_id;
+ }
+ elsif (/^bDeviceSubClass\s*=\s*0x00([a-f0-9]{2})/){
+ $subclass_id = $1;
+ $working[5] = $subclass_id;
+ }
+ elsif (/^bDeviceProtocol\s*=\s*0x00([a-f0-9]{2})/){
+ $protocol_id = $1;
+ $working[6] = $protocol_id;
+ }
+ elsif (/^idVendor\s*=\s*0x([a-f0-9]{4})/){
+ $vendor_id = $1;
+ }
+ elsif (/^idProduct\s*=\s*0x([a-f0-9]{4})/){
+ $product_id = $1;
+ }
+ elsif (/^iManufacturer\s*=\s*0x([a-f0-9]{4})\s*(<([^>]+)>)?/){
+ $vendor = main::clean($3);
+ $vendor =~ s/^0x.*//; # seen case where vendor string was ID
+ $working[11] = $vendor;
+ }
+ elsif (/^iProduct\s*=\s*0x([a-f0-9]{4})\s*(<([^>]+)>)?/){
+ $product = main::clean($3);
+ $product =~ s/^0x.*//; # in case they put product ID in, sigh
+ $working[12] = $product;
+ }
+ elsif (/^iSerialNumber\s*=\s*0x([a-f0-9]{4})\s*(<([^>]+)>)?/){
+ $working[16] = main::clean($3);
+ }
+ }
+ main::log_data('dump','$usb{main}: usbconfig',$usb{'main'}) if $b_log;
+ print 'usbconfig: ', Data::Dumper::Dumper $usb{'main'} if $dbg[6];
eval $end if $b_log;
}
@@ -20994,198 +36825,332 @@ sub lsusb_data {
# port 2 powered
sub usbdevs_data {
eval $start if $b_log;
- my ($class,$hub_id,$port,$port_value);
- my ($ports,$j,$k) = (0,0,0);
- my @data = data_grabber('usbdevs');
+ my ($b_multi,$class,$config,$hub_id,$port,$port_value,$product_rev);
+ my ($ports) = (0);
+ my @data = usb_grabber('usbdevs');
foreach (@data){
- if (/^Controller\s\/dev\/usb([0-9]+)/){
- # $j = scalar @usb;
- ($j,$ports) = (0,0);
- $port_value = '';
+ if ($_ eq '~' && @working){
+ $working[10] = $ports;
+ push(@{$usb{'main'}},[@working]);
+ assign_usb_type([@working]);
+ undef @working;
+ ($config,$driver,$power,$rev) = ('','','','');
+ }
+ elsif (/^Controller\s\/dev\/usb([0-9]+)/){
$bus_id = $1;
- @working = ();
}
- elsif (/^addr\s([0-9]+):\s([^,]+),[^,]+,[^,]+,\s?([^,]+)\(0x([0-9a-f]{4})\),\s?([^,]+)\s?\(0x([0-9a-f]{4})\)/){
- $j = scalar @usb;
- $k = $j;
+ elsif (/^addr\s([0-9]+):\s([^,]+),[^,0-9]+([0-9]+ mA)?,\s+config\s+([0-9]+),\s?([^,]+)\(0x([0-9a-f]{4})\),\s?([^,]+)\s?\(0x([0-9a-f]{4})\)/){
+ ($mode,$rev,$speed_si,$speed_iec) = ();
$hub_id = $1;
$addr_id = $1;
- $speed = $2;
- $chip_id = "$4:$6";
- $name="$5 $3";
- #print "p1:$protocol\n";
+ $speed_si = $2; # requires prep
+ $power = $3;
+ $chip_id = "$6:$8";
+ $config = $4;
+ $name = main::remove_duplicates("$7 $5");
+ # print "p1:$protocol\n";
$path_id = "$bus_id-$hub_id";
+ $bus_id_alpha = bus_id_alpha($path_id);
+ $ports = 0;
+ process_power(\$power) if $power;
$port_value = '';
- $working[0] = $bus_id;
+ version_data('bsd',\$speed_si,\$speed_iec,\$rev,\$mode);
+ $working[0] = $bus_id_alpha;
$working[1] = $addr_id;
$working[2] = $path_id;
$working[3] = '';
- $working[4] = 9;
+ $working[4] = '09';
$working[5] = '';
$working[6] = '';
$working[7] = $chip_id;
- $working[8] = $speed;
+ $working[8] = $rev;
$working[9] = '';
- $working[10] = 0;
+ $working[10] = $ports;
$working[13] = $name;
$working[14] = 'Hub';
$working[15] = '';
$working[16] = '';
- $working[17] = '';
- $working[18] = '';
- $usb[$j] = ([@working],);
- @working = ();
- }
- elsif (/^\s+port\s([0-9]+)\saddr\s([0-9]+):\s([^,]+),[^,]+,[^,]+,\s?([^,]+)\(0x([0-9a-f]{4})\),\s?([^,]+)\s?\(0x([0-9a-f]{4})\)/){
- $j = scalar @usb;
+ $working[17] = $speed_si;
+ $working[18] = $config;
+ $working[19] = $power;
+ $working[20] = '';
+ $working[22] = $mode;
+ $working[25] = $speed_iec;
+ }
+ elsif (/^port\s([0-9]+)\saddr\s([0-9]+):\s([^,]+),[^,0-9]*([0-9]+\s?mA)?,\s+config\s+([0-9]+),\s?([^,]+)\(0x([0-9a-f]{4})\),\s?([^,]+)\s?\(0x([0-9a-f]{4})\)/){
+ ($rev,$mode,$speed_iec,$speed_si) = ();
$port = $1;
- $addr_id = "$2";
- $speed = "$3";
- $chip_id = "$5:$7";
- $name="$6 $4";
- #print "p2:$protocol\n";
+ $addr_id = $2;
+ $speed_si = $3;
+ $power = $4;
+ $config = $5;
+ $chip_id = "$7:$9";
+ $name = main::remove_duplicates("$8 $6");
+ $type = check_type($name,'','');
+ $type ||= '';
+ # print "p2:$protocol\n";
$ports++;
$path_id = "$bus_id-$hub_id.$port";
- $working[0] = $bus_id;
+ $bus_id_alpha = bus_id_alpha($path_id);
+ process_power(\$power) if $power;
+ version_data('bsd',\$speed_si,\$speed_iec,\$rev,\$mode);
+ $working[0] = $bus_id_alpha;
$working[1] = $addr_id;
$working[2] = $path_id;
$working[3] = '';
- $working[4] = 1;
+ $working[4] = '01';
$working[5] = '';
$working[6] = '';
$working[7] = $chip_id;
- $working[8] = $speed;
+ $working[8] = $rev;
$working[9] = '';
- $working[10] = 0;
+ $working[10] = $ports;
$working[11] = '';
$working[12] = '';
$working[13] = $name;
- $working[14] = '';
+ $working[14] = $type;
+ $working[15] = '';
+ $working[16] = '';
+ $working[17] = $speed_si;
+ $working[18] = $config;
+ $working[19] = $power;
+ $working[20] = '';
+ $working[22] = $mode;
+ $working[25] = $speed_iec;
+ }
+ elsif (/^port\s([0-9]+)\spowered/){
+ $ports++;
+ }
+ # newer openbsd usbdevs totally changed their syntax and layout, but it is better...
+ elsif (/^addr\s*([0-9a-f]+):\s+([a-f0-9]{4}:[a-f0-9]{4})\s*([^,]+)?(,\s[^,]+?)?,\s+([^,]+)$/){
+ $addr_id = $1;
+ $chip_id = $2;
+ $vendor = main::clean($3) if $3;
+ $vendor ||= '';
+ $name = main::remove_duplicates("$vendor $5");
+ $type = check_type($name,'','');
+ $class_id = ($name =~ /hub/i) ? '09': '01';
+ $path_id = "$bus_id-$addr_id";
+ $bus_id_alpha = bus_id_alpha($path_id);
+ $ports = 0;
+ $b_multi = 1;
+ $working[0] = $bus_id_alpha;
+ $working[1] = $addr_id;
+ $working[2] = $path_id;
+ $working[3] = '';
+ $working[4] = $class_id;
+ $working[5] = '';
+ $working[6] = '';
+ $working[7] = $chip_id;
+ $working[8] = '';
+ $working[9] = '';
+ $working[10] = $ports;
+ $working[11] = '';
+ $working[12] = '';
+ $working[13] = $name;
+ $working[14] = $type;
$working[15] = '';
$working[16] = '';
$working[17] = '';
$working[18] = '';
- $usb[$j] = ([@working],);
- ${$usb[$k]}[10] = $ports;
- @working = ();
- }
- elsif (/^\s+port\s([0-9]+)\spowered/){
+ $working[19] = '';
+ $working[20] = '';
+ }
+ elsif ($b_multi &&
+ /^([^,]+),\s+(self powered|power\s+([0-9]+\s+mA)),\s+config\s([0-9]+),\s+rev\s+([0-9\.]+)(,\s+i?Serial\s(\S*))?/i){
+ ($mode,$rev,$speed_iec,$speed_si) = ();
+ $speed_si = $1;
+ $power = $3;
+ process_power(\$power) if $power;
+ version_data('bsd',\$speed_si,\$speed_iec,\$rev,\$mode);
+ $working[8] = $rev;
+ $working[16] = $7 if $7;
+ $working[17] = $speed_si;
+ $working[18] = $4; # config number
+ $working[19] = $power;
+ $working[20] = $5; # product rev
+ $working[22] = $mode;
+ $working[25] = $speed_iec;
+ }
+ # 1 or more drivers supported
+ elsif ($b_multi && /^driver:\s*([^,]+)$/){
+ my $temp = $1;
+ $working[4] = '09' if $temp =~ /hub[0-9]/;
+ $temp =~ s/([0-9]+)$//;
+ $working[21] = $1; # driver nu
+ # drivers, note that when numbers trimmed off, drivers can have same name
+ $working[15] = ($working[15] && $working[15] !~ /\b$temp\b/) ? "$working[15],$temp" : $temp;
+ # now that we have the driver, let's recheck the type
+ if (!$type && $name && $working[15]){
+ $type = check_type($name,$working[15],'');
+ $working[14] = $type if $type;
+ }
+ }
+ elsif ($b_multi && /^port\s[0-9]/){
$ports++;
- ${$usb[$k]}[10] = $ports;
}
}
- if (@working){
- $j = scalar @usb;
- $usb[$j] = (
- [@working],
- );
- }
- main::log_data('dump','@usb: usbdevs',\@usb) if $b_log;
- print Data::Dumper::Dumper \@usb if $test[6];
+ main::log_data('dump','$usb{main}: usbdevs',$usb{'main'}) if $b_log;
+ print 'usbdevs: ', Data::Dumper::Dumper $usb{'main'} if $dbg[6];
eval $end if $b_log;
}
-sub data_grabber {
+sub usb_grabber {
eval $start if $b_log;
my ($program) = @_;
- my %args = ('lsusb' => '', 'usbdevs' => '-v');
- my (@data);
- if ($b_live && !$b_fake_usbdevs){
- my $path = main::check_program($program);
- @data = main::grabber("$path $args{$program} 2>/dev/null") if $path;
+ my ($args,$path,$pattern,@data,@working);
+ if ($program eq 'lsusb'){
+ $args = '';
+ $path = $alerts{'lsusb'}->{'path'};
+ $pattern = '^Bus [0-9]';
+ }
+ elsif ($program eq 'usbconfig'){
+ $args = 'dump_device_desc';
+ $path = $alerts{'usbconfig'}->{'path'};
+ $pattern = '^[a-z_-]+[0-9]+\.[0-9]+:';
+ }
+ elsif ($program eq 'usbdevs'){
+ $args = '-vv';
+ $path = $alerts{'usbdevs'}->{'path'};
+ $pattern = '^(addr\s[0-9a-f]+:|port\s[0-9]+\saddr\s[0-9]+:)';
+ }
+ if ($b_live && !$fake{'usbdevs'} && !$fake{'usbconfig'}){
+ @data = main::grabber("$path $args 2>/dev/null",'','strip');
}
else {
my $file;
- if ($b_fake_usbdevs){
- $file = "$ENV{'HOME'}/bin/scripts/inxi/data/lsusb/bsd-usbdevs-v-1.txt";
+ if ($fake{'usbdevs'}){
+ $file = "$fake_data_dir/usb/usbdevs/bsd-usbdevs-v-1.txt";
+ }
+ elsif ($fake{'usbconfig'}){
+ $file = "$fake_data_dir/usb/usbconfig/bsd-usbconfig-list-v-1.txt";
}
else {
- $file = "$ENV{'HOME'}/bin/scripts/inxi/data/lsusb/mdmarmer-lsusb.txt";
+ $file = "$fake_data_dir/usb/lsusb/mdmarmer-lsusb.txt";
}
- @data = main::reader($file);
+ @data = main::reader($file,'strip');
}
- #print Data::Dumper::Dumper \@data;
+ if (@data){
+ $use{'usb-tool'} = 1 if scalar @data > 2;
+ foreach (@data){
+ # this is the group separator and assign trigger
+ push(@working, '~') if $_ =~ /$pattern/i;
+ push(@working, $_);
+ }
+ push(@working, '~');
+ }
+ print Data::Dumper::Dumper \@working if $dbg[30];
eval $end if $b_log;
- return @data;
+ return @working;
}
sub sys_data {
eval $start if $b_log;
my ($source) = @_;
- my ($configuration,$ports,$usb_version);
+ my ($configuration,$lanes_rx,$lanes_tx,$ports,$mode,$rev);
my (@drivers,@uevent);
my $i = 0;
my @files = main::globber('/sys/bus/usb/devices/*');
# we want to get rid of the hubs with x-0: syntax, those are hubs found in /usbx
@files = grep {!/\/[0-9]+-0:/} @files;
- #print join "\n", @files;
- foreach (@files){
- @uevent = main::reader("$_/uevent") if -r "$_/uevent";
- $ids = main::awk(\@uevent,'^(DEVNAME|DEVICE\b)',2,'=');
- if ( $ids){
- @drivers = ();
+ # print join("\n", @files);
+ foreach my $file (@files){
+ # be careful, sometimes uevent is not readable
+ @uevent = (-r "$file/uevent") ? main::reader("$file/uevent") : undef;
+ if (@uevent && ($ids = main::awk(\@uevent,'^(DEVNAME|DEVICE\b)',2,'='))){
($b_hub,$class_id,$protocol_id,$subclass_id) = (0,0,0,0);
- ($configuration,$driver,$interfaces,$name,$ports,$product,$serial,$speed,
- $type,$usb_version,$vendor) = ('','','','','','','','','','','');
- #print Cwd::abs_path($_),"\n";
- #print "f1: $_\n";
- $path_id = $_;
+ (@drivers,$lanes_rx,$lanes_tx,$mode,$rev,$speed_iec,$speed_si) = ();
+ ($configuration,$driver,$interfaces,$name,$ports,$product,$serial,
+ $type,$vendor) = ('','','','','','','','','');
+ # print Cwd::abs_path($file),"\n";
+ # print "f1: $file\n";
+ $path_id = $file;
$path_id =~ s/^.*\///;
$path_id =~ s/^usb([0-9]+)/$1-0/;
# if DEVICE= then path = /proc/bus/usb/001/001 else: bus/usb/006/001
$ids =~ s/^\///;
- @working = split /\//, $ids;
+ @working = split('/', $ids);
shift @working if $working[0] eq 'proc';
$bus_id = int($working[2]);
$bus_id_alpha = bus_id_alpha($path_id);
$device_id = int($working[3]);
- $class_id = sys_item("$_/bDeviceClass");
+ # this will be a hex number
+ $class_id = sys_item("$file/bDeviceClass");
+ # $subclass_id = sys_item("$file/bDeviceSubClass");
+ # $protocol_id = sys_item("$file/bDeviceProtocol");
$class_id = hex($class_id) if $class_id;
- @drivers = uevent_data("$_/[0-9]*/uevent");
- @drivers = (@drivers, uevent_data("$_/[0-9]*/*/uevent")) if !$b_hub;
- $ports = sys_item("$_/maxchild") if $b_hub;
- $driver = join ',', sort(main::uniq(@drivers)) if @drivers;
- $interfaces = sys_item("$_/bNumInterfaces");
- $serial = sys_item("$_/serial");
- $usb_version = sys_item("$_/version");
- $speed = sys_item("$_/speed");
- $configuration = sys_item("$_/configuration");
+ # $subclass_id = hex($subclass_id) if $subclass_id;
+ # $protocol_id = hex($protocol_id) if $protocol_id;
+ # print "$path_id $class_id/$subclass_id/$protocol_id\n";
+ $power = sys_item("$file/bMaxPower");
+ process_power(\$power) if $power;
+ # this populates class, subclass, and protocol id with decimal numbers
+ @drivers = uevent_data("$file/[0-9]*/uevent");
+ push(@drivers, uevent_data("$file/[0-9]*/*/uevent")) if !$b_hub;
+ $ports = sys_item("$file/maxchild") if $b_hub;
+ if (@drivers){
+ main::uniq(\@drivers);
+ $driver = join(',', sort @drivers);
+ }
+ $interfaces = sys_item("$file/bNumInterfaces");
+ $lanes_rx = sys_item("$file/rx_lanes");
+ $lanes_tx = sys_item("$file/tx_lanes");
+ $serial = sys_item("$file/serial");
+ $rev = sys_item("$file/version");
+ $speed_si = sys_item("$file/speed");
+ version_data('sys',\$speed_si,\$speed_iec,\$rev,\$mode,$lanes_rx,$lanes_tx);
+ $configuration = sys_item("$file/configuration");
+ $power = sys_item("$file/bMaxPower");
+ process_power(\$power) if $power;
+ $class_id = sprintf("%02x", $class_id) if defined $class_id && $class_id ne '';
+ $subclass_id = sprintf("%02x", $subclass_id) if defined $subclass_id && $subclass_id ne '';
if ($source eq 'lsusb'){
- for ($i = 0; $i < scalar @usb; $i++){
- if (${$usb[$i]}[0] eq $bus_id && ${$usb[$i]}[1] == $device_id){
- #print $type,"\n";
- ${$usb[$i]}[0] = $bus_id_alpha;
- ${$usb[$i]}[2] = $path_id;
- ${$usb[$i]}[3] = $_;
- ${$usb[$i]}[4] = $class_id;
- ${$usb[$i]}[5] = $subclass_id;
- ${$usb[$i]}[6] = $protocol_id;
- ${$usb[$i]}[8] = $usb_version;
- ${$usb[$i]}[9] = $interfaces;
- ${$usb[$i]}[10] = $ports if $ports;
- if ($type && $b_hub && (!${$usb[$i]}[13] || ${$usb[$i]}[13] =~ /^linux foundation/i )){
- ${$usb[$i]}[13] = "$type";
+ for ($i = 0; $i < scalar @{$usb{'main'}}; $i++){
+ if ($usb{'main'}->[$i][0] eq $bus_id && $usb{'main'}->[$i][1] == $device_id){
+ if (!$b_hub && $usb{'main'}->[$i][13] && (!$type || $type eq '<vendor specific>')){
+ $type = check_type($usb{'main'}->[$i][13],$driver,$type);
+ }
+ $usb{'main'}->[$i][0] = $bus_id_alpha;
+ $usb{'main'}->[$i][2] = $path_id;
+ $usb{'main'}->[$i][3] = $file;
+ $usb{'main'}->[$i][4] = $class_id;
+ $usb{'main'}->[$i][5] = $subclass_id;
+ $usb{'main'}->[$i][6] = $protocol_id;
+ $usb{'main'}->[$i][8] = $rev;
+ $usb{'main'}->[$i][9] = $interfaces;
+ $usb{'main'}->[$i][10] = $ports if $ports;
+ if ($type && $b_hub && (!$usb{'main'}->[$i][13] ||
+ $usb{'main'}->[$i][13] =~ /^linux foundation/i)){
+ $usb{'main'}->[$i][13] = "$type";
}
- ${$usb[$i]}[14] = $type if ($type && !$b_hub);
- ${$usb[$i]}[15] = $driver if $driver;
- ${$usb[$i]}[16] = $serial if $serial;
- ${$usb[$i]}[17] = $speed if $speed;
- ${$usb[$i]}[18] = $configuration;
- #print join("\n",@{$usb[$i]}),"\n\n";# if !$b_hub;
+ $usb{'main'}->[$i][14] = $type if ($type && !$b_hub);
+ $usb{'main'}->[$i][15] = $driver if $driver;
+ $usb{'main'}->[$i][16] = $serial if $serial;
+ $usb{'main'}->[$i][17] = $speed_si if $speed_si;
+ $usb{'main'}->[$i][18] = $configuration;
+ $usb{'main'}->[$i][19] = $power;
+ $usb{'main'}->[$i][20] = '';
+ $usb{'main'}->[$i][22] = $mode;
+ $usb{'main'}->[$i][23] = $lanes_rx;
+ $usb{'main'}->[$i][24] = $lanes_tx;
+ $usb{'main'}->[$i][25] = $speed_iec if $speed_iec;
+ $usb{'main'}->[$i][26] = Cwd::abs_path($file);
+ assign_usb_type($usb{'main'}->[$i]);
+ # print join("\n",@{$usb{'main'}->[$i]}),"\n\n";# if !$b_hub;
last;
}
}
}
else {
- $chip_id = sys_item("$_/idProduct");
- $vendor_id = sys_item("$_/idVendor");
+ $chip_id = sys_item("$file/idProduct");
+ $vendor_id = sys_item("$file/idVendor");
# we don't want the device, it's probably a bad path in /sys/bus/usb/devices
next if !$vendor_id && !$chip_id;
- $product = sys_item("$_/product");
- $product = main::cleaner($product) if $product;
- $vendor = sys_item("$_/manufacturer");
- $vendor = main::cleaner($vendor) if $vendor;
- if (!$b_hub && ($product || $vendor )){
+ $product = sys_item("$file/product");
+ $product = main::clean($product) if $product;
+ $vendor = sys_item("$file/manufacturer");
+ $vendor = main::clean($vendor) if $vendor;
+ if (!$b_hub && ($product || $vendor)){
if ($vendor && $product && $product !~ /$vendor/){
$name = "$vendor $product";
}
@@ -21199,41 +37164,53 @@ sub sys_data {
elsif ($b_hub){
$name = $type;
}
+ $name = main::remove_duplicates($name) if $name;
+ if (!$b_hub && $name && (!$type || $type eq '<vendor specific>')){
+ $type = check_type($name,$driver,$type);
+ }
# this isn't that useful, but save in case something shows up
- #if ($configuration){
+ # if ($configuration){
# $name = ($name) ? "$name $configuration" : $configuration;
- #}
+ # }
$type = 'Hub' if $b_hub;
- ${$usb[$i]}[0] = $bus_id_alpha;
- ${$usb[$i]}[1] = $device_id;
- ${$usb[$i]}[2] = $path_id;
- ${$usb[$i]}[3] = $_;
- ${$usb[$i]}[4] = $class_id;
- ${$usb[$i]}[5] = $subclass_id;
- ${$usb[$i]}[6] = $protocol_id;
- ${$usb[$i]}[7] = "$vendor_id:$chip_id";
- ${$usb[$i]}[8] = $usb_version;
- ${$usb[$i]}[9] = $interfaces;
- ${$usb[$i]}[10] = $ports;
- ${$usb[$i]}[11] = $vendor;
- ${$usb[$i]}[12] = $product;
- ${$usb[$i]}[13] = $name;
- ${$usb[$i]}[14] = $type;
- ${$usb[$i]}[15] = $driver;
- ${$usb[$i]}[16] = $serial;
- ${$usb[$i]}[17] = $speed;
- ${$usb[$i]}[18] = $configuration;
+ $usb{'main'}->[$i][0] = $bus_id_alpha;
+ $usb{'main'}->[$i][1] = $device_id;
+ $usb{'main'}->[$i][2] = $path_id;
+ $usb{'main'}->[$i][3] = $file;
+ $usb{'main'}->[$i][4] = $class_id;
+ $usb{'main'}->[$i][5] = $subclass_id;
+ $usb{'main'}->[$i][6] = $protocol_id;
+ $usb{'main'}->[$i][7] = "$vendor_id:$chip_id";
+ $usb{'main'}->[$i][8] = $rev;
+ $usb{'main'}->[$i][9] = $interfaces;
+ $usb{'main'}->[$i][10] = $ports;
+ $usb{'main'}->[$i][11] = $vendor;
+ $usb{'main'}->[$i][12] = $product;
+ $usb{'main'}->[$i][13] = $name;
+ $usb{'main'}->[$i][14] = $type;
+ $usb{'main'}->[$i][15] = $driver;
+ $usb{'main'}->[$i][16] = $serial;
+ $usb{'main'}->[$i][17] = $speed_si;
+ $usb{'main'}->[$i][18] = $configuration;
+ $usb{'main'}->[$i][19] = $power;
+ $usb{'main'}->[$i][20] = '';
+ $usb{'main'}->[$i][22] = $mode;
+ $usb{'main'}->[$i][23] = $lanes_rx;
+ $usb{'main'}->[$i][24] = $lanes_tx;
+ $usb{'main'}->[$i][25] = $speed_iec;
+ $usb{'main'}->[$i][26] = Cwd::abs_path($file);
+ assign_usb_type($usb{'main'}->[$i]);
$i++;
}
- #print "$path_id ids: $bus_id:$device_id driver: $driver ports: $ports\n==========\n"; # if $test[6];;
+ # print "$path_id ids: $bus_id:$device_id driver: $driver ports: $ports\n==========\n"; # if $dbg[6];;
}
}
- @usb = sort { $a->[0] cmp $b->[0] } @usb;
- print Data::Dumper::Dumper \@usb if $source eq 'main' && $test[6];
- main::log_data('dump','@usb: sys',\@usb) if $source eq 'main' && $b_log;
+ print 'usb-sys: ', Data::Dumper::Dumper $usb{'main'} if $source eq 'main' && $dbg[6];
+ main::log_data('dump','$usb{main}: sys',$usb{'main'}) if $source eq 'main' && $b_log;
eval $end if $b_log;
}
-# get driver, interface [type:] data
+
+# Get driver, interface [type:] data
sub uevent_data {
my ($path) = @_;
my ($interface,$interfaces,$temp,@interfaces,@drivers);
@@ -21244,330 +37221,676 @@ sub uevent_data {
# print "f2: $_\n";
($interface) = ('');
@working = main::reader($_) if -r $_;
- #print join ("\n",@working), "\n";
+ # print join("\n",@working), "\n";
if (@working){
$driver = main::awk(\@working,'^DRIVER',2,'=');
- $interface = main::awk(\@working,'^INTERFACE',2,'=');
+ $interface = main::awk(\@working,'^INTERFACE',2,'=');
if ($interface){
+ # for hubs, we need the specific protocol, which is in TYPE
+ if ($interface eq '9/0/0' &&
+ (my $temp = main::awk(\@working,'^TYPE',2,'='))){
+ $interface = $temp;
+ }
+ # print "$interface\n";
$interface = device_type($interface);
if ($interface){
if ($interface ne '<vendor specific>'){
- push @interfaces, $interface;
+ push(@interfaces, $interface);
}
# networking requires more data but this test is reliable
- elsif (!@interfaces) {
+ elsif (!@interfaces){
$temp = $_;
$temp =~ s/\/uevent$//;
- push @interfaces, 'Network' if -d "$temp/net/";
+ push(@interfaces, 'Network') if -d "$temp/net/";
}
if (!@interfaces){
- push @interfaces, $interface;
+ push(@interfaces, $interface);
}
}
}
}
- #print "driver:$driver\n";
+ # print "driver:$driver\n";
$b_hub = 1 if $driver && $driver eq 'hub';
$driver = '' if $driver && ($driver eq 'usb' || $driver eq 'hub');
- push @drivers,$driver if $driver;
+ push(@drivers,$driver) if $driver;
}
if (@interfaces){
- @interfaces = main::uniq(@interfaces);
- # clear out values like: <vendor defined>,Printer
- if ( scalar @interfaces > 1 && (grep {/^<vendor/} @interfaces) && (grep {!/^<vendor/} @interfaces) ){
- @interfaces = grep {/^<vendor/} @interfaces;
+ main::uniq(\@interfaces);
+ # clear out values like: <vendor specific>,Printer
+ if (scalar @interfaces > 1 && (grep {!/^<vendor/} @interfaces) && (grep {/^<vendor/} @interfaces)){
+ @interfaces = grep {!/^<vendor/} @interfaces;
}
- $type = join ',', @interfaces;
+ $type = join(',', @interfaces) if @interfaces;
# print "type:$type\n";
}
return @drivers;
}
+
sub sys_item {
my ($path) = @_;
my ($item);
- $item = (main::reader($path))[0] if -r $path;
+ $item = main::reader($path,'',0) if -r $path;
$item = '' if ! defined $item;
$item = main::trimmer($item) if $item;
return $item;
}
+sub assign_usb_type {
+ my ($row) = @_;
+ # It's a hub. A device will always be the second or > device on the bus,
+ # although nested hubs of course can be > 1 too. No need to build these if
+ # none of lines are showing.
+ if (($row->[4] && $row->[4] eq '09') ||
+ ($row->[14] && lc($row->[14]) eq 'hub') || $row->[1] <= 1 ||
+ (!$show{'audio'} && !$show{'bluetooth'} && !$show{'disk'} &&
+ !$show{'graphic'} && !$show{'network'})){
+ return;
+ }
+ $row->[13] = '' if !defined $row->[13]; # product
+ $row->[14] = '' if !defined $row->[14]; # type
+ $row->[15] = '' if !defined $row->[15]; # driver
+ set_asound_ids() if $show{'audio'} && !$b_asound;
+ set_network_regex() if $show{'network'} && !$network_regex;
+ # NOTE: a device, like camera, can be audio+graphic
+ # NOTE: 13, 14 can be upper/lower case, so use i.
+ if ($show{'audio'} && (
+ (@asound_ids && $row->[7] && (grep {$row->[7] eq $_} @asound_ids)) ||
+ ($row->[14] && $row->[14] =~ /audio/i) ||
+ ($row->[15] && $row->[15] =~ /audio/) ||
+ ($row->[13] && lc($row->[13]) =~ /(audio|\bdac[0-9]*\b|headphone|\bmic(rophone)?\b)/i)
+ )){
+ push(@{$usb{'audio'}},$row);
+ }
+ if ($show{'graphic'} && (
+ ($row->[14] && $row->[14] =~ /video/i) ||
+ ($row->[15] && $row->[15] =~ /video/) ||
+ ($row->[13] && lc($row->[13]) =~ /(camera|\bdvb-t|\b(pc)?tv\b|video|webcam)/i)
+ )){
+ push(@{$usb{'graphics'}},$row);
+ }
+ # we want to catch bluetooth devices, which otherwise can trip network regex
+ elsif (($show{'bluetooth'} || $show{'network'}) && (
+ ($row->[14] && $row->[14] =~ /bluetooth/i) ||
+ ($row->[15] && $row->[15] =~ /\b(btusb|ubt)\b/) ||
+ ($row->[13] && $row->[13] =~ /bluetooth/i)
+ )){
+ push(@{$usb{'bluetooth'}},$row);
+ }
+ elsif ($show{'disk'} && (
+ ($row->[14] && $row->[14] =~ /mass storage/i) ||
+ ($row->[15] && $row->[15] =~ /storage/)
+ )){
+ push(@{$usb{'disk'}},$row);
+ }
+ elsif ($show{'network'} && (
+ ($row->[14] && $row->[14] =~ /(ethernet|network|wifi)/i) ||
+ ($row->[15] && $row->[15] =~ /(^ipw|^iwl|wifi)/) ||
+ ($row->[13] && $row->[13] =~ /($network_regex)/i)
+ )){
+ push(@{$usb{'network'}},$row);
+ }
+}
+
sub device_type {
my ($data) = @_;
my ($type);
- my @types = split /\//, $data if $data;
- #print @types,"\n";
+ # note: the 3/0/0 value passed will be decimal, not hex
+ my @types = split('/', $data) if $data;
+ # print @types,"\n";
+ if (!@types || $types[0] eq '0' || scalar @types != 3){return '';}
+ elsif ($types[0] eq '255'){ return '<vendor specific>';}
if (scalar @types == 3){
$class_id = $types[0];
$subclass_id = $types[1];
$protocol_id = $types[2];
}
- if (!@types || $types[0] eq '0' || scalar @types != 3) {return '';}
- elsif ($types[0] eq '255') { return '<vendor specific>';}
-
- if ($types[0] eq '1'){$type = 'Audio';}
+ if ($types[0] eq '1'){
+ $type = 'audio';}
elsif ($types[0] eq '2'){
- if ($types[1] eq '2'){$type = 'Abstract (modem)';}
- elsif ($types[1] eq '6'){$type = 'Ethernet Network';}
- elsif ($types[1] eq '10'){$type = 'Mobile Direct Line';}
- elsif ($types[1] eq '12'){$type = 'Ethernet Emulation';}
- else {$type = 'Communication';}
+ if ($types[1] eq '2'){
+ $type = 'abstract (modem)';}
+ elsif ($types[1] eq '6'){
+ $type = 'ethernet network';}
+ elsif ($types[1] eq '10'){
+ $type = 'mobile direct line';}
+ elsif ($types[1] eq '12'){
+ $type = 'ethernet emulation';}
+ else {
+ $type = 'communication';}
}
elsif ($types[0] eq '3'){
- if ($types[2] eq '0'){$type = 'HID';} # actual value: None
- elsif ($types[2] eq '1'){$type = 'Keyboard';}
- elsif ($types[2] eq '2'){$type = 'Mouse';}
- }
- elsif ($types[0] eq '6'){$type = 'Still Imaging';}
- elsif ($types[0] eq '7'){$type = 'Printer';}
- elsif ($types[0] eq '8'){$type = 'Mass Storage';}
+ if ($types[2] eq '0'){
+ $type = 'HID';} # actual value: None
+ elsif ($types[2] eq '1'){
+ $type = 'keyboard';}
+ elsif ($types[2] eq '2'){
+ $type = 'mouse';}
+ }
+ elsif ($types[0] eq '6'){
+ $type = 'still imaging';}
+ elsif ($types[0] eq '7'){
+ $type = 'printer';}
+ elsif ($types[0] eq '8'){
+ $type = 'mass storage';}
+ # note: there is a bug in linux kernel that always makes hubs 9/0/0
elsif ($types[0] eq '9'){
- if ($types[2] eq '0'){$type = 'Full speed (or root) Hub';}
- elsif ($types[2] eq '1'){$type = 'Hi-speed hub with single TT';}
- elsif ($types[2] eq '2'){$type = 'Hi-speed hub with multiple TTs';}
- }
- elsif ($types[0] eq '10'){$type = 'CDC-Data';}
- elsif ($types[0] eq '11'){$type = 'Smart Card';}
- elsif ($types[0] eq '13'){$type = 'Content Security';}
- elsif ($types[0] eq '14'){$type = 'Video';}
- elsif ($types[0] eq '15'){$type = 'Personal Healthcare';}
- elsif ($types[0] eq '16'){$type = 'Audio-Video';}
- elsif ($types[0] eq '17'){$type = 'Billboard';}
- elsif ($types[0] eq '18'){$type = 'Type-C Bridge';}
- elsif ($types[0] eq '88'){$type = 'Xbox';}
- elsif ($types[0] eq '220'){$type = 'Diagnostic';}
+ if ($types[2] eq '0'){
+ $type = 'full speed or root hub';}
+ elsif ($types[2] eq '1'){
+ $type = 'hi-speed hub with single TT';}
+ elsif ($types[2] eq '2'){
+ $type = 'hi-speed hub with multiple TTs';}
+ # seen protocol 3, usb3 type hub, but not documented on usb.org
+ elsif ($types[2] eq '3'){
+ $type = 'super-speed hub';}
+ # this is a guess, never seen it
+ elsif ($types[2] eq '4'){
+ $type = 'super-speed+ hub';}
+ }
+ elsif ($types[0] eq '10'){
+ $type = 'CDC-data';}
+ elsif ($types[0] eq '11'){
+ $type = 'smart card';}
+ elsif ($types[0] eq '13'){
+ $type = 'content security';}
+ elsif ($types[0] eq '14'){
+ $type = 'video';}
+ elsif ($types[0] eq '15'){
+ $type = 'personal healthcare';}
+ elsif ($types[0] eq '16'){
+ $type = 'audio-video';}
+ elsif ($types[0] eq '17'){
+ $type = 'billboard';}
+ elsif ($types[0] eq '18'){
+ $type = 'type-C bridge';}
+ elsif ($types[0] eq '88'){
+ $type = 'Xbox';}
+ elsif ($types[0] eq '220'){
+ $type = 'diagnostic';}
elsif ($types[0] eq '224'){
- if ($types[1] eq '1'){$type = 'Bluetooth';}
+ if ($types[1] eq '1'){
+ $type = 'bluetooth';}
elsif ($types[1] eq '2'){
- if ($types[2] eq '1'){$type = 'Host Wire Adapter';}
- elsif ($types[2] eq '2'){$type = 'Device Wire Adapter';}
- elsif ($types[2] eq '3'){$type = 'Device Wire Adapter';}
+ if ($types[2] eq '1'){
+ $type = 'host wire adapter';}
+ elsif ($types[2] eq '2'){
+ $type = 'device wire adapter';}
+ elsif ($types[2] eq '3'){
+ $type = 'device wire adapter';}
}
}
-
+ # print "$data: $type\n";
return $type;
}
-# this is used to create an alpha sortable bus id for main $usb[0]
+
+# Device name/driver string based test, return <vendor specific> if not detected
+# for linux based tests, and empty for bsd tests
+sub check_type {
+ my ($name,$driver,$type) = @_;
+ $name = lc($name);
+ if (($driver && $driver =~ /hub/) || $name =~ /\b(hub)/i){
+ $type = 'Hub';
+ }
+ elsif ($name =~ /(audio|\bdac[0-9]*\b|(head|micro|tele)phone|hifi|\bmidi\b|\bmic\b|sound)/){
+ $type = 'Audio';
+ }
+ # Broadcom HP Portable SoftSailing
+ elsif (($driver && $driver =~ /\b(btusb|ubt)\b/) || $name =~ /(bluetooth)/){
+ $type = 'Bluetooth'
+ }
+ elsif (($driver && $driver =~ /video/) ||
+ $name =~ /(camera|display|\bdvb-t|\b(pc)?tv\bvideo|webcam)/){
+ $type = 'Video';
+ }
+ elsif ($name =~ /(wlan|wi-?fi|802\.1[15]|(11|54|108|240|300|433|450|900|1300)\s?mbps|(11|54|108|240)g\b|wireless[\s-][bgn]\b|wireless.*adapter)/){
+ $type = 'WiFi';
+ }
+ # note, until freebsd match to actual drivers, these top level driver matches aren't interesting
+ elsif (($driver && $bsd_type && $driver =~ /\b(muge)\b/) ||
+ $name =~ /(ethernet|\blan|802\.3|100?\/1000?|gigabit|10\s?G(b|ig)?E)/){
+ $type = 'Ethernet';
+ }
+ # note: audio devices show HID sometimes, not sure why
+ elsif ($name =~ /(joystick|keyboard|mouse|trackball)/){
+ $type = 'HID';
+ }
+ elsif (($driver && $driver =~ /^(umass)$/) ||
+ $name =~ /\b(disk|drive|flash)\b/){
+ $type = 'Mass Storage';
+ }
+ return $type;
+}
+
+# linux only, will create a positive match to sound devices
+sub set_asound_ids {
+ $b_asound = 1;
+ if (-d '/proc/asound'){
+ # note: this will double the data, but it's easier this way.
+ # binxi tested for -L in the /proc/asound files, and used only those.
+ my @files = main::globber('/proc/asound/*/usbid');
+ foreach (@files){
+ my $id = main::reader($_,'',0);
+ push(@asound_ids, $id) if ($id && !(grep {/$id/} @asound_ids));
+ }
+ }
+ main::log_data('dump','@asound_ids',\@asound_ids) if $b_log;
+}
+
+# USB networking search string data, because some brands can have other products
+# than wifi/nic cards, they need further identifiers, with wildcards. Putting
+# the most common and likely first, then the less common, then some specifics
+sub set_network_regex {
+ # belkin=050d; d-link=07d1; netgear=0846; ralink=148f; realtek=0bda;
+ # Atmel, Atheros make other stuff. NOTE: exclude 'networks': IMC Networks
+ # intel, ralink bluetooth as well as networking; (WG|WND?A)[0-9][0-9][0-9] netgear IDs
+ $network_regex = 'Ethernet|gigabit|\bISDN|\bLAN\b|Mobile\s?Broadband|';
+ $network_regex .= '\bNIC\b|wi-?fi|Wireless[\s-][GN]\b|WLAN|';
+ $network_regex .= '802\.(1[15]|3)|(10|11|54|108|240|300|450|1300)\s?Mbps|(11|54|108|240)g\b|100?\/1000?|';
+ $network_regex .= '(100?|N)Base-?T\b|';
+ $network_regex .= '(Actiontec|AirLink|Asus|Belkin|Buffalo|Dell|D-Link|DWA-|ENUWI-|';
+ $network_regex .= 'Ralink|Realtek|Rosewill|RNX-|Samsung|Sony|TEW-|TP-Link|';
+ $network_regex .= 'Zonet.*ZEW.*).*Wireless|';
+ # Note: Intel Bluetooth wireless interface < should be caught by bluetooth tests
+ $network_regex .= '(\bD-Link|Network(ing)?|Wireless).*(Adapter|Interface)|';
+ $network_regex .= '(Linksys|Netgear|Davicom)|';
+ $network_regex .= 'Range(Booster|Max)|Samsung.*LinkStick|\b(WG|WND?A)[0-9][0-9][0-9]|';
+ $network_regex .= '\b(050d:935b|0bda:8189|0bda:8197)\b';
+}
+
+# For linux, process rev, get mode. For bsds, get rev, speed.
+# args: 0: sys/bsd; 1: speed_si; 2: speed_iec; 3: rev; 4: rev_info; 5: rx lanes;
+# 6: tx lanes
+# 1,2,3,4 passed by reference.
+sub version_data {
+ return if !${$_[1]};
+ if ($_[0] eq 'sys'){
+ if (${$_[3]} && main::is_numeric(${$_[3]})){
+ # as far as we know, 4 will not have subversions, but this may change,
+ # check how /sys reports this in coming year(s)
+ if (${$_[3]} =~ /^4/){
+ ${$_[3]} = ${$_[3]} + 0;
+ }
+ else {
+ ${$_[3]} = sprintf('%.1f',${$_[3]});
+ }
+ }
+ # BSD rev is synthetic, it's a hack. And no lane data, so not trying.
+ if ($b_admin && ${$_[1]} && ${$_[3]} && $_[5] && $_[6] &&
+ ${$_[3]} =~ /^[1234]/){
+ if (${$_[3]} =~ /^[12]/){
+ if (${$_[1]} == 1.5){
+ ${$_[4]} = '1.0';}
+ elsif (${$_[1]} == 12){
+ ${$_[4]} = '1.1';}
+ elsif (${$_[1]} == 480){
+ ${$_[4]} = '2.0';}
+ }
+ # Note: unless otherwise indicated, 1 lane is 1rx+1tx.
+ elsif (${$_[3]} =~ /^3/){
+ if (${$_[1]} == 5000){
+ ${$_[4]} = '3.2 gen-1x1';} # 1 lane
+ elsif (${$_[1]} == 10000){
+ if ($_[6] == 1){
+ ${$_[4]} = '3.2 gen-2x1';} # 1 lane
+ elsif ($_[6] == 2){
+ ${$_[4]} = '3.2 gen-1x2';} # 2 lane
+ }
+ elsif (${$_[1]} == 20000){
+ if ($_[6] == 1){
+ ${$_[4]} = '3.2 gen-3x1';} # 1 lane
+ elsif ($_[6] == 2){
+ ${$_[4]} = '3.2 gen-2x2';} # 2 lane
+ }
+ # just in case rev: 3.x shows these speeds
+ elsif (${$_[1]} == 40000){
+ if ($_[6] == 1){
+ ${$_[4]} = '4-v1 gen-4x1';} # 1 lane
+ elsif ($_[6] == 2){
+ ${$_[4]} = '4-v1 gen-3x2';} # 2 lane
+ }
+ elsif (${$_[1]} == 80000){
+ ${$_[4]} = '4-v2 gen-4x2'; # 2 lanes
+ }
+ ${$_[4]} = main::message('usb-mode-mismatch') if !${$_[4]};
+ }
+ # NOTE: no realworld usb4 data, unclear if these gen are reliable.
+ # possible /sys will expose v1/v2/v3. Check future data.
+ elsif (${$_[3]} =~ /^4/){
+ # gen 2: 10gb x 1 ln
+ if (${$_[1]} < 10001){
+ ${$_[4]} = '4-v1 gen-2x1';} # 1 lane
+ # gen2: 10gb x 2 ln; gen3: 20gb x 1 ln. Confirm
+ elsif (${$_[1]} < 20001){
+ if ($_[6] == 2){
+ ${$_[4]} = '4-v1 gen-2x2';} # 2 lanes
+ elsif ($_[6] == 1){
+ ${$_[4]} = '4-v1 gen-3x1';} # 1 lane
+ }
+ # gen3: 20gb x 2 ln; gen4 40gb x 1 ln. Confirm
+ elsif (${$_[1]} < 40001){
+ if ($_[6] == 2){
+ ${$_[4]} = '4-v1 gen-3x2';} # 2 lanes
+ elsif ($_[6] == 1){
+ ${$_[4]} = '4-v2 gen-4x1';} # 1 lane
+ }
+ # 40gb x 2 ln
+ elsif (${$_[1]} < 80001){
+ ${$_[4]} = '4-v2 gen-4x2';} # 2 lanes
+ # 3 lanes: 2 tx+tx @ 60gb, 1 rx+rx @ 40gb, wait for data
+ elsif (${$_[1]} < 120001){
+ ${$_[4]} = '4-v2 gen-4x3-asym'; # 3 lanes, asymmetric
+ }
+ ${$_[4]} = main::message('usb-mode-mismatch') if !${$_[4]};
+ }
+ }
+ }
+ else {
+ (${$_[1]},${$_[3]}) = prep_speed(${$_[1]});
+ # bsd rev hardcoded. We want this set to undef if bad data
+ ${$_[3]} = usb_rev(${$_[1]}) if !${$_[3]};
+ }
+ # Add Si/IEC units
+ if ($extra > 0 && ${$_[1]}){
+ # 1 == 1000000 bits
+ my $si = ${$_[1]};
+ if (${$_[1]} >= 1000){
+ ${$_[1]} = (${$_[1]}/1000) . ' Gb/s';
+ }
+ else {
+ ${$_[1]} = ${$_[1]} . ' Mb/s';
+ }
+ if ($b_admin){
+ $si = (($si*1000**2)/8);
+ if ($si < 1000000){
+ ${$_[2]} = sprintf('%0.0f KiB/s',($si/1024));
+ }
+ elsif ($si < 1000000000){
+ ${$_[2]} = sprintf('%0.1f MiB/s',$si/1024**2);
+ }
+ else {
+ ${$_[2]} = sprintf('%0.2f GiB/s',($si/1024**3));
+ }
+ }
+ }
+ # print Data::Dumper::Dumper \@_;
+}
+
+## BSD SPEED/REV ##
+# Mapping of speed string to known speeds. Unreliable, very inaccurate, and some
+# unconfirmed. Without real data source can never be better than a decent guess.
+# args: 0: speed string
+sub prep_speed {
+ return if !$_[0];
+ my $speed_si = $_[0];
+ my $rev;
+ if ($_[0] =~ /^([0-9\.]+)\s*Mb/){
+ $speed_si = $1;
+ }
+ elsif ($_[0] =~ /^([0-9\.]+)+\s*Gb/){
+ $speed_si = $1 * 1000;
+ }
+ elsif ($_[0] =~ /usb4?\s?120/i){
+ $speed_si = 120000;# 4 120Gbps
+ $rev = '4';
+ }
+ elsif ($_[0] =~ /usb4?\s?80/i){
+ $speed_si = 80000;# 4 80Gbps
+ $rev = '4';
+ }
+ elsif ($_[0] =~ /usb4?\s?40/i){
+ $speed_si = 40000;# 4 40Gbps
+ $rev = '4';
+ }
+ elsif ($_[0] =~ /usb4?\s?20/i){
+ $speed_si = 20000;# 4 20Gbps
+ $rev = '4';
+ }
+ elsif ($_[0] =~ /usb\s?20|super[\s-]?speed\s?(\+|plus) gen[\s-]?2x2/i){
+ $speed_si = 20000;# 3.2 20Gbps
+ $rev = '3.2';
+ }
+ # could be 3.2, 20000 too, also superspeed+
+ elsif ($_[0] =~ /super[\s-]?speed\s?(\+|plus)/i){
+ $speed_si = 10000;# 3.1; # can't trust bsds to use superspeed+ but we'll hope
+ $rev = '3.1';
+ }
+ elsif ($_[0] =~ /super[\s-]?speed/i){
+ $speed_si = 5000;# 3.0;
+ $rev = '3.0';
+ }
+ elsif ($_[0] =~ /hi(gh)?[\s-]?speed/i){
+ $speed_si = 480; # 2.0,
+ $rev = '2.0';
+ }
+ elsif ($_[0] =~ /full[\s-]?speed/i){
+ $speed_si = 12; # 1.1 - could be full speed 1.1/2.0
+ $rev = '1.1';
+ }
+ elsif ($_[0] =~ /low?[\s-]?speed/i){
+ $speed_si = 1.5; # 1.5 - could be 1.0, or low speed 1.1/2.0
+ $rev = '1.0';
+ }
+ else {
+ undef $speed_si; # we don't know what the syntax was
+ }
+ return ($speed_si,$rev);
+}
+
+# Try to guess at usb rev version from speed. Unreliable, very inaccurate.
+# Note: this will probably be so inaccurate with USB 3.2/4 that it might be best
+# to remove this feature at some point, unless better data sources found.
+# args: 0: speed
+sub usb_rev {
+ return if !$_[0] || !main::is_numeric($_[0]);
+ my $rev;
+ if ($_[0] < 2){
+ $rev = '1.0';}
+ elsif ($_[0] < 13)
+ {$rev = '1.1';}
+ elsif ($_[0] < 481){
+ $rev = '2.0';}
+ # 5 Gbps
+ elsif ($_[0] < 5001)
+ {$rev = '3.0';}
+ # 10 Gbps, this can be 3.1, 3.2 or 4
+ elsif ($_[0] < 10001){
+ $rev = '3.1';}
+ # SuperSpeed 'USB 20Gbps', this can be 3.2 or 4
+ elsif ($_[0] < 20001){
+ $rev = '3.2';}
+ # 4 does not use 4.x syntax, and real lanes/rev/speed data source required.
+ # 4: 10-120 Gbps. Update once data available for USB 3.2/4 speed strings
+ elsif ($_[0] < 120001){
+ $rev = '4';}
+ return $rev;
+}
+
+## UTILITIES ##
+# This is used to create an alpha sortable bus id for main $usb[0]
sub bus_id_alpha {
my ($id) = @_;
$id =~ s/^([1-9])-/0$1-/;
$id =~ s/([-\.:])([0-9])\b/${1}0$2/g;
return $id;
}
+
+sub process_power {
+ return if !${$_[0]};
+ ${$_[0]} =~ s/\s//g;
+ # ${$_[0]} = '' if ${$_[0]} eq '0mA'; # better to handle on output
+}
}
########################################################################
-#### GENERATE LINES
+#### GENERATE OUTPUT
########################################################################
-#### -------------------------------------------------------------------
-#### LINE CONTROLLERS
-#### -------------------------------------------------------------------
-
-sub assign_data {
- my (%row) = @_;
- return if ! %row;
- if ($output_type eq 'screen'){
- print_data(%row);
- }
- else {
- %rows = (%rows,%row);
- }
-}
+## OutputGenerator
+# Also creates Short, Info, and System items
+{
+package OutputGenerator;
+my ($items,$subs);
-sub generate_lines {
+sub generate {
eval $start if $b_log;
- my (%row,$b_pci_check,$b_dmi_check);
- set_ps_aux() if ! @ps_aux;
- set_sysctl_data() if $b_sysctl;
+ my ($item,%checks);
+ PsData::set_cmd() if !$loaded{'ps-cmd'};
+ main::set_sysctl_data() if $use{'sysctl'};
+ main::set_dboot_data() if $bsd_type && !$loaded{'dboot'};
# note: ps aux loads before logging starts, so create debugger data here
if ($b_log){
- # I don't think we need to see this, it's long, but leave in case we do
- #main::log_data('dump','@ps_aux',\@ps_aux);
+ # With logging, we already get ps wwwaux so no need to get it again here
+ # main::log_data('dump','@ps_aux',\@ps_aux);
main::log_data('dump','@ps_cmd',\@ps_cmd);
}
- if ( $show{'short'} ){
- set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
- %row = generate_short_data();
- assign_data(%row);
+ print Data::Dumper::Dumper \@ps_cmd if $dbg[61];
+ if ($show{'short'}){
+ $item = short_output();
+ assign_data($item);
}
else {
- if ( $show{'system'} ){
- %row = generate_system_data();
- assign_data(%row);
- }
- if ( $show{'machine'} ){
- set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
- set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
- %row = line_handler('Machine','machine');
- assign_data(%row);
- }
- if ( $show{'battery'} ){
- set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
- %row = line_handler('Battery','battery');
- if (%row || $show{'battery-forced'}){
- assign_data(%row);
- }
- }
- if ( $show{'ram'} ){
- set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
- %row = line_handler('Memory','ram');
- assign_data(%row);
- }
- if ( $show{'slot'} ){
- set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
- %row = line_handler('PCI Slots','slot');
- assign_data(%row);
- }
- if ( $show{'cpu'} || $show{'cpu-basic'} ){
- DeviceData::set($b_pci_check) if $b_arm && !$b_pci_check;
- set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
- set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
+ if ($show{'system'}){
+ $item = system_item();
+ assign_data($item);
+ }
+ if ($show{'machine'}){
+ DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'};
+ $item = item_handler('Machine','machine');
+ assign_data($item);
+ }
+ if ($show{'battery'}){
+ DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'};
+ $item = item_handler('Battery','battery');
+ if ($item || $show{'battery-forced'}){
+ assign_data($item);
+ }
+ }
+ if ($show{'ram'}){
+ DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'};
+ $item = item_handler('Memory','ram');
+ assign_data($item);
+ }
+ if ($show{'slot'}){
+ DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'};
+ $item = item_handler('PCI Slots','slot');
+ assign_data($item);
+ }
+ if ($show{'cpu'} || $show{'cpu-basic'}){
+ DeviceData::set(\$checks{'device'}) if %risc && !$checks{'device'};
+ DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'};
my $arg = ($show{'cpu-basic'}) ? 'basic' : 'full' ;
- %row = line_handler('CPU','cpu',$arg);
- assign_data(%row);
- }
- if ( $show{'graphic'} ){
- USBData::set() if !$b_usb_check;
- DeviceData::set($b_pci_check) if !$b_pci_check;
- %row = line_handler('Graphics','graphic');
- assign_data(%row);
- }
- if ( $show{'audio'} ){
- # Note: USBData is set internally in AudioData because it's only run in one case
- DeviceData::set($b_pci_check) if !$b_pci_check;
- %row = line_handler('Audio','audio');
- assign_data(%row);
- }
- if ( $show{'network'} ){
- USBData::set() if !$b_usb_check;
- DeviceData::set($b_pci_check) if !$b_pci_check;
- set_ip_data() if ($show{'ip'} || ($bsd_type && $show{'network-advanced'}));
- %row = line_handler('Network','network');
- assign_data(%row);
- }
- if ( $show{'disk'} || $show{'disk-basic'} || $show{'disk-total'} || $show{'optical'} ){
- set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
- %row = line_handler('Drives','disk');
- assign_data(%row);
- }
- if ( $show{'raid'} ){
- DeviceData::set() if !$b_pci_check;
- %row = line_handler('RAID','raid');
- assign_data(%row);
- }
- if ( $show{'partition'} || $show{'partition-full'}){
- %row = line_handler('Partition','partition');
- assign_data(%row);
- }
- if ( $show{'swap'} ){
- %row = line_handler('Swap','swap');
- assign_data(%row);
- }
- if ( $show{'unmounted'} ){
- %row = line_handler('Unmounted','unmounted');
- assign_data(%row);
- }
- if ( $show{'usb'} ){
- USBData::set() if !$b_usb_check;
- %row = line_handler('USB','usb');
- assign_data(%row);
- }
- if ( $show{'sensor'} ){
- %row = line_handler('Sensors','sensor');
- assign_data(%row);
- }
- if ( $show{'repo'} ){
- %row = line_handler('Repos','repo');
- assign_data(%row);
- }
- if ( $show{'process'} ){
- %row = line_handler('Processes','process');
- assign_data(%row);
- }
- if ( $show{'weather'} ){
- %row = line_handler('Weather','weather');
- assign_data(%row);
- }
- if ( $show{'info'} ){
- %row = generate_info_data();
- assign_data(%row);
- }
- }
- if ( $output_type ne 'screen' ){
- output_handler(%rows);
- }
- eval $end if $b_log;
-}
-
-sub line_handler {
- eval $start if $b_log;
- my ($key,$sub,$arg) = @_;
- my %subs = (
- 'audio' => \&AudioData::get,
- 'battery' => \&BatteryData::get,
- 'cpu' => \&CpuData::get,
- 'disk' => \&DiskData::get,
- 'graphic' => \&GraphicData::get,
- 'machine' => \&MachineData::get,
- 'network' => \&NetworkData::get,
- 'partition' => \&PartitionData::get,
- 'raid' => \&RaidData::get,
- 'ram' => \&RamData::get,
- 'repo' => \&RepoData::get,
- 'process' => \&ProcessData::get,
- 'sensor' => \&SensorData::get,
- 'slot' => \&SlotData::get,
- 'swap' => \&SwapData::get,
- 'unmounted' => \&UnmountedData::get,
- 'usb' => \&UsbData::get,
- 'weather' => \&WeatherData::get,
- );
- my (%data);
- my $data_name = main::key($prefix++,1,0,$key);
- my @rows = $subs{$sub}->($arg);
- if (@rows){
- %data = ($data_name => \@rows,);
+ $item = item_handler('CPU','cpu',$arg);
+ assign_data($item);
+ }
+ if ($show{'graphic'}){
+ UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+ DeviceData::set(\$checks{'device'}) if !$checks{'device'};
+ $item = item_handler('Graphics','graphic');
+ assign_data($item);
+ }
+ if ($show{'audio'}){
+ UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+ DeviceData::set(\$checks{'device'}) if !$checks{'device'};
+ $item = item_handler('Audio','audio');
+ assign_data($item);
+ }
+ if ($show{'network'}){
+ UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+ DeviceData::set(\$checks{'device'}) if !$checks{'device'};
+ IpData::set() if ($show{'ip'} || ($bsd_type && $show{'network-advanced'}));
+ $item = item_handler('Network','network');
+ assign_data($item);
+ }
+ if ($show{'bluetooth'}){
+ UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+ DeviceData::set(\$checks{'device'}) if !$checks{'device'};
+ $item = item_handler('Bluetooth','bluetooth');
+ assign_data($item);
+ }
+ if ($show{'logical'}){
+ $item = item_handler('Logical','logical');
+ assign_data($item);
+ }
+ if ($show{'raid'}){
+ DeviceData::set(\$checks{'device'}) if !$checks{'device'};
+ $item = item_handler('RAID','raid');
+ assign_data($item);
+ }
+ if ($show{'disk'} || $show{'disk-basic'} || $show{'disk-total'} || $show{'optical'}){
+ UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+ $item = item_handler('Drives','disk');
+ assign_data($item);
+ }
+ if ($show{'partition'} || $show{'partition-full'}){
+ $item = item_handler('Partition','partition');
+ assign_data($item);
+ }
+ if ($show{'swap'}){
+ $item = item_handler('Swap','swap');
+ assign_data($item);
+ }
+ if ($show{'unmounted'}){
+ $item = item_handler('Unmounted','unmounted');
+ assign_data($item);
+ }
+ if ($show{'usb'}){
+ UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+ $item = item_handler('USB','usb');
+ assign_data($item);
+ }
+ if ($show{'sensor'}){
+ $item = item_handler('Sensors','sensor');
+ assign_data($item);
+ }
+ if ($show{'repo'}){
+ $item = item_handler('Repos','repo');
+ assign_data($item);
+ }
+ if ($show{'process'}){
+ $item = item_handler('Processes','process');
+ assign_data($item);
+ }
+ if ($show{'weather'}){
+ $item = item_handler('Weather','weather');
+ assign_data($item);
+ }
+ if ($show{'info'}){
+ $item = info_item();
+ assign_data($item);
+ }
+ }
+ if ($output_type ne 'screen'){
+ main::output_handler($items);
}
eval $end if $b_log;
- return %data;
}
-#### -------------------------------------------------------------------
-#### SHORT, DEBUG
-#### -------------------------------------------------------------------
-
-sub generate_short_data {
+## Short, Info, System Items ##
+sub short_output {
eval $start if $b_log;
my $num = 0;
my $kernel_os = ($bsd_type) ? 'OS' : 'Kernel';
- my $client = $client{'name-print'};
- my $client_shell = ($b_irc) ? 'Client' : 'Shell';
- if ($client{'version'}){
- $client .= ' ' . $client{'version'};
- }
my ($cpu_string,$speed,$speed_key,$type) = ('','','speed','');
- my $memory = get_memory_data('string');
- my @cpu = CpuData::get('short');
- if (scalar @cpu > 1){
- $type = ($cpu[2]) ? " (-$cpu[2]-)" : '';
+ my $cpu = CpuItem::get('short');
+ if (ref $cpu eq 'ARRAY' && scalar @$cpu > 1){
+ $type = ($cpu->[2]) ? " (-$cpu->[2]-)" : '';
($speed,$speed_key) = ('','');
- if ($cpu[6]){
- $speed_key = "$cpu[3]/$cpu[5]";
- $cpu[4] =~ s/ MHz//;
- $speed = "$cpu[4]/$cpu[6]";
+ if ($cpu->[6]){
+ $speed_key = "$cpu->[3]/$cpu->[5]";
+ $speed = "$cpu->[4]/$cpu->[6] MHz";
}
else {
- $speed_key = $cpu[3];
- $speed = $cpu[4];
+ $speed_key = $cpu->[3];
+ $speed = "$cpu->[4] MHz";
}
- $cpu[1] ||= row_defaults('cpu-model-null');
- $cpu_string = $cpu[0] . ' ' . $cpu[1] . $type;
+ $cpu->[1] ||= main::message('cpu-model-null');
+ $cpu_string = $cpu->[0] . ' ' . $cpu->[1] . $type;
}
- elsif ($bsd_type) {
- if ($alerts{'sysctl'}{'action'}){
- if ($alerts{'sysctl'}{'action'} ne 'use'){
- $cpu_string = "sysctl $alerts{'sysctl'}{'action'}";
- $speed = "sysctl $alerts{'sysctl'}{'action'}";
+ elsif ($bsd_type){
+ if ($alerts{'sysctl'}->{'action'}){
+ if ($alerts{'sysctl'}->{'action'} ne 'use'){
+ $cpu_string = "sysctl $alerts{'sysctl'}->{'action'}";
+ $speed = "sysctl $alerts{'sysctl'}->{'action'}";
}
else {
$cpu_string = 'bsd support coming';
@@ -21575,307 +37898,485 @@ sub generate_short_data {
}
}
}
- my @disk = DiskData::get('short');
+ $speed ||= 'N/A'; # totally unexpected situation, what happened?
+ my $disk = DriveItem::get('short');
# print Dumper \@disk;
my $disk_string = 'N/A';
- my ($size,$used,$size_type,$used_type) = ('','','','');
- my (@temp,$size_holder,$used_holder);
- if (@disk){
- $size = $disk[0]{'size'};
+ my ($size,$used) = ('','');
+ my ($size_holder,$used_holder);
+ if (ref $disk eq 'ARRAY' && @$disk){
+ $size = ($disk->[0]{'logical-size'}) ? $disk->[0]{'logical-size'} : $disk->[0]{'size'};
# must be > 0
- if ($disk[0]{'size'} && main::is_numeric($disk[0]{'size'}) ){
- $size_holder = $disk[0]{'size'};
- @temp = get_size($size);
- $size = $temp[0];
- $size_type = " $temp[1]";
- }
- $used = $disk[0]{'used'};
- if (main::is_numeric($disk[0]{'used'}) ){
- $used_holder = $disk[0]{'used'};
- @temp = get_size($used);
- $used = $temp[0];
- $used_type = " $temp[1]";
+ if ($size && main::is_numeric($size)){
+ $size_holder = $size;
+ $size = main::get_size($size,'string');
+ }
+ $used = $disk->[0]{'used'};
+ if ($used && main::is_numeric($disk->[0]{'used'})){
+ $used_holder = $disk->[0]{'used'};
+ $used = main::get_size($used,'string');
}
# in some fringe cases size can be 0 so only assign 'N/A' if no percents etc
if ($size_holder && $used_holder){
my $percent = ' (' . sprintf("%.1f", $used_holder/$size_holder*100) . '% used)';
- $disk_string = "$size$size_type$percent";
+ $disk_string = "$size$percent";
}
else {
- $size ||= row_defaults('disk-size-0');
- $disk_string = "$used$used_type/$size$size_type";
- }
- }
- #print join '; ', @cpu, " sleep: $cpu_sleep\n";
- $memory ||= 'N/A';
- my @data = ({
- main::key($num++,0,0,'CPU') => $cpu_string,
- main::key($num++,0,0,$speed_key) => $speed,
- main::key($num++,0,0,$kernel_os) => &get_kernel_data(),
- main::key($num++,0,0,'Up') => &get_uptime(),
- main::key($num++,0,0,'Mem') => $memory,
- main::key($num++,0,0,'Storage') => $disk_string,
- # could make -1 for ps aux itself, -2 for ps aux and self
- main::key($num++,0,0,'Procs') => scalar @ps_aux,
- main::key($num++,0,0,$client_shell) => $client,
- main::key($num++,0,0,$self_name) => &get_self_version(),
- },);
- my %row = (
- main::key($prefix,1,0,'SHORT') => [(@data),],
- );
- eval $end if $b_log;
- return %row;
+ $size ||= main::message('disk-size-0');
+ $disk_string = "$used/$size";
+ }
+ }
+ my $memory = MemoryData::get('short');
+ $memory = 'N/A' if !$memory;
+ # print join('; ', @cpu), " sleep: $cpu_sleep\n";
+ if (!$loaded{'shell-data'} && $ppid && (!$b_irc || !$client{'name-print'})){
+ ShellData::set();
+ }
+ my $client = $client{'name-print'};
+ my $client_shell = ($b_irc) ? 'Client' : 'Shell';
+ if ($client{'version'}){
+ $client .= ' ' . $client{'version'};
+ }
+ my $data = [{
+ main::key($num++,0,0,'CPU') => $cpu_string,
+ main::key($num++,0,0,$speed_key) => $speed,
+ main::key($num++,0,0,$kernel_os) => join(' ', @{main::get_kernel_data()}),
+ main::key($num++,0,0,'Up') => main::get_uptime(),
+ main::key($num++,0,0,'Mem') => $memory,
+ main::key($num++,0,0,'Storage') => $disk_string,
+ # could make -1 for ps aux itself, -2 for ps aux and self
+ main::key($num++,0,0,'Procs') => scalar @ps_aux,
+ main::key($num++,0,0,$client_shell) => $client,
+ main::key($num++,0,0,$self_name) => main::get_self_version(),
+ },];
+ eval $end if $b_log;
+ return {
+ main::key($prefix,1,0,'SHORT') => $data,
+ };
}
-#### -------------------------------------------------------------------
-#### CONSTRUCTED LINES
-#### -------------------------------------------------------------------
-
-sub generate_info_data {
+sub info_item {
eval $start if $b_log;
my $num = 0;
- my $gcc_alt = '';
my $running_in = '';
my $data_name = main::key($prefix++,1,0,'Info');
- my ($b_gcc,$gcc,$index,$ref,%row);
- my ($gpu_ram,$parent,$percent,$total,$used) = (0,'','','','');
- my @gccs = get_gcc_data();
- if (@gccs){
- $gcc = shift @gccs;
- if ($extra > 1 && @gccs){
- $gcc_alt = join '/', @gccs;
- }
- $b_gcc = 1;
- }
- $gcc ||= 'N/A';
- get_shell_data($client{'ppid'}) if $client{'ppid'};
- my $client_shell = ($b_irc) ? 'Client' : 'Shell';
- my $client = $client{'name-print'};
- my %data = (
- $data_name => [{
- main::key($num++,0,1,'Processes') => scalar @ps_aux,
- main::key($num++,0,1,'Uptime') => &get_uptime(),
- },],
- );
- $index = scalar(@{ $data{$data_name} } ) - 1;
- if (!$b_mem){
- my $memory = get_memory_data('splits');
- if ($memory){
- my @temp = split /:/, $memory;
- my @temp2 = get_size($temp[0]);
- $gpu_ram = $temp[3] if $temp[3];
- $total = ($temp2[1]) ? $temp2[0] . ' ' . $temp2[1] : $temp2[0];
- @temp2 = get_size($temp[1]);
- $used = ($temp2[1]) ? $temp2[0] . ' ' . $temp2[1] : $temp2[0];
- $used .= " ($temp[2]%)" if $temp[2];
- if ($gpu_ram){
- @temp2 = get_size($gpu_ram);
- $gpu_ram = $temp2[0] . ' ' . $temp2[1] if $temp2[1];
+ my ($index);
+ my ($available,$gpu_ram,$parent,$percent,$used) = ('',0,'','','');
+ my $data = {
+ $data_name => [{}],
+ };
+ $index = 0;
+ if (!$loaded{'memory'}){
+ main::MemoryData::row('info',$data->{$data_name}[$index],\$num,1);
+ if ($gpu_ram){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'gpu')} = $gpu_ram;
+ }
+ $index++;
+ }
+ $data->{$data_name}[$index]{main::key($num++,0,1,'Processes')} = scalar @ps_aux;
+ my $uptime = main::get_uptime();
+ if ($bsd_type || $extra < 2){
+ $data->{$data_name}[$index]{main::key($num++,1,1,'Uptime')} = $uptime;
+ }
+ if (!$bsd_type && $extra > 1){
+ my $power = PowerData::get();
+ $data->{$data_name}[$index]{main::key($num++,1,1,'Power')} = '';
+ $data->{$data_name}[$index]{main::key($num++,0,2,'uptime')} = $uptime;
+ if ($power->{'states-avail'}){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'states')} = $power->{'states-avail'};
+ }
+ my $resumes = (defined $power->{'suspend-resumes'}) ? $power->{'suspend-resumes'} : undef;
+ if ($extra > 2){
+ my $suspend = (defined $power->{'suspend-active'}) ? $power->{'suspend-active'} : '';
+ $data->{$data_name}[$index]{main::key($num++,1,2,'suspend')} = $suspend;
+ if ($b_admin && $power->{'suspend-avail'}){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'avail')} = $power->{'suspend-avail'};
+ }
+ if (defined $resumes){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'wakeups')} = $resumes;
+ if ($b_admin && $power->{'suspend-fails'}){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'fails')} = $power->{'suspend-fails'};
+ }
+ }
+ if (defined $power->{'hibernate-active'}){
+ $data->{$data_name}[$index]{main::key($num++,1,2,'hibernate')} = $power->{'hibernate-active'};
+ if ($b_admin && $power->{'hibernate-avail'}){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'avail')} = $power->{'hibernate-avail'};
+ }
+ if ($b_admin && $power->{'hibernate-image-size'}){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'image')} = $power->{'hibernate-image-size'};
+ }
+ }
+ if ($b_admin){
+ PsData::set_power();
+ if (@{$ps_data{'power-services'}}){
+ my $services;
+ main::make_list_value($ps_data{'power-services'},\$services,',','sort');
+ $data->{$data_name}[$index]{main::key($num++,0,2,'services')} = $services;
+ }
+ }
+ }
+ else {
+ if (defined $resumes){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'wakeups')} = $resumes;
}
}
- $data{$data_name}[$index]{main::key($num++,1,1,'Memory')} = $total;
- $data{$data_name}[$index]{main::key($num++,0,2,'used')} = $used;
- }
- if ($gpu_ram){
- $data{$data_name}[$index]{main::key($num++,0,2,'gpu')} = $gpu_ram;
}
- if ( (!$b_display || $b_force_display) || $extra > 0 ){
- my %init = get_init_data();
- my $init_type = ($init{'init-type'}) ? $init{'init-type'}: 'N/A';
- $data{$data_name}[$index]{main::key($num++,1,1,'Init')} = $init_type;
- if ($extra > 1 ){
- my $init_version = ($init{'init-version'}) ? $init{'init-version'}: 'N/A';
- $data{$data_name}[$index]{main::key($num++,0,2,'v')} = $init_version;
+ if ((!$b_display || $force{'display'}) || $extra > 0){
+ my $init = InitData::get();
+ my $init_type = ($init->{'init-type'}) ? $init->{'init-type'}: 'N/A';
+ $data->{$data_name}[$index]{main::key($num++,1,1,'Init')} = $init_type;
+ if ($extra > 1){
+ my $init_version = ($init->{'init-version'}) ? $init->{'init-version'}: 'N/A';
+ $data->{$data_name}[$index]{main::key($num++,0,2,'v')} = $init_version;
}
- if ($init{'rc-type'}){
- $data{$data_name}[$index]{main::key($num++,1,2,'rc')} = $init{'rc-type'};
- if ($init{'rc-version'}){
- $data{$data_name}[$index]{main::key($num++,0,3,'v')} = $init{'rc-version'};
+ if ($init->{'rc-type'}){
+ $data->{$data_name}[$index]{main::key($num++,1,2,'rc')} = $init->{'rc-type'};
+ if ($init->{'rc-version'}){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'v')} = $init->{'rc-version'};
}
}
- if ($init{'runlevel'}){
- $data{$data_name}[$index]{main::key($num++,0,2,'runlevel')} = $init{'runlevel'};
+ if ($init->{'runlevel'}){
+ my $key = ($init->{'init-type'} && $init->{'init-type'} eq 'systemd') ? 'target' : 'runlevel';
+ $data->{$data_name}[$index]{main::key($num++,1,2,$key)} = $init->{'runlevel'};
}
- if ($extra > 1 ){
- if ($init{'default'}){
- my $default = ($init{'init-type'} eq 'systemd' && $init{'default'} =~ /[^0-9]$/ ) ? 'target' : 'default';
- $data{$data_name}[$index]{main::key($num++,0,2,$default)} = $init{'default'};
+ if ($extra > 1){
+ if ($init->{'default'}){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'default')} = $init->{'default'};
+ }
+ if ($b_admin && (my $tool = ServiceData::get('tool',''))){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'tool')} = $tool;
+ undef %service_tool;
}
}
}
- if ($extra > 0 ){
- my $b_clang;
- my $clang_version = '';
- if (my $path = check_program('clang')){
- $clang_version = program_version($path,'clang',3,'--version');
- $clang_version ||= 'N/A';
- $b_clang = 1;
+ $index++ if $extra > 0;
+ if ($extra > 0 && !$loaded{'package-data'}){
+ my $packages = PackageData::get('inner',\$num);
+
+ for (keys %$packages){
+ $data->{$data_name}[$index]{$_} = $packages->{$_};
}
- my $compiler = ($b_gcc || $b_clang) ? '': 'N/A';
- $data{$data_name}[$index]{main::key($num++,1,1,'Compilers')} = $compiler;
- if ($b_gcc){
- $data{$data_name}[$index]{main::key($num++,1,2,'gcc')} = $gcc;
- if ( $extra > 1 && $gcc_alt){
- $data{$data_name}[$index]{main::key($num++,0,3,'alt')} = $gcc_alt;
+ }
+ if ($extra > 0){
+ my (%cc,$path);
+ foreach my $compiler (qw(clang gcc zigcc)){
+ my $comps = main::get_compiler_data($compiler);
+ if (@$comps){
+ $cc{$compiler}->{'version'} = shift @$comps;
+ if ($extra > 1 && @$comps){
+ $cc{$compiler}->{'alt'} = join('/', @$comps);
+ }
+ $cc{$compiler}->{'version'} ||= 'N/A'; # should not be needed after fix but leave in case undef
}
}
- if ($b_clang){
- $data{$data_name}[$index]{main::key($num++,0,2,'clang')} = $clang_version;
+ my $cc_value = ($cc{'clang'} || $cc{'gcc'} || $cc{'zigcc'}) ? '': 'N/A';
+ $data->{$data_name}[$index]{main::key($num++,1,1,'Compilers')} = $cc_value;
+ foreach my $compiler (qw(clang gcc zigcc)){
+ if ($cc{$compiler}){
+ $data->{$data_name}[$index]{main::key($num++,0,2,$compiler)} = $cc{$compiler}->{'version'};
+ if ($extra > 1 && $cc{$compiler}->{'alt'}){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'alt')} = $cc{$compiler}->{'alt'};
+ }
+ }
}
}
- if ($extra > 0 && !$b_pkg){
- my %packages = PackageData::get('inner',\$num);
- for (keys %packages){
- $data{$data_name}[$index]{$_} = $packages{$_};
- }
- $b_pkg = 1;
+ # $index++ if $extra > 1 && !$loaded{'shell-data'};
+ if (!$loaded{'shell-data'} && $ppid && (!$b_irc || !$client{'name-print'})){
+ ShellData::set();
}
- if (!$b_irc && $extra > 1 ){
- # bsds don't support -f option to get PPID
- if (($b_display && !$b_force_display) && !$bsd_type){
- $parent = get_shell_source();
+ my $client_shell = ($b_irc) ? 'Client' : 'Shell';
+ my $client = $client{'name-print'};
+ if (!$b_irc && $extra > 1){
+ # some bsds don't support -f option to get PPPID
+ # note: root/su - does not have $DISPLAY usually
+ if ($b_display && !$force{'display'} && $ppid && $client{'pppid'}){
+ $parent = ShellData::shell_launcher();
}
else {
- $parent = get_tty_number();
- $parent = "tty $parent" if $parent ne '';
- }
- if ($parent eq 'login'){
- $client{'su-start'} = $parent if !$client{'su-start'};
- $parent = undef;
+ ShellData::tty_number() if !$loaded{'tty-number'};
+ if ($client{'tty-number'} ne ''){
+ my $tty_type = '';
+ if ($client{'tty-number'} =~ /^[a-f0-9]+$/i){
+ $tty_type = 'tty ';
+ }
+ elsif ($client{'tty-number'} =~ /pts/i){
+ $tty_type = 'pty ';
+ }
+ $parent = "$tty_type$client{'tty-number'}";
+ }
}
# can be tty 0 so test for defined
- $running_in = $parent if defined $parent;
- if ($extra > 2 && $running_in && get_ssh_status() ){
+ $running_in = $parent if $parent;
+ if ($extra > 2 && $running_in && ShellData::ssh_status()){
$running_in .= ' (SSH)';
}
+ if ($extra > 2 && $client{'su-start'}){
+ $client .= " ($client{'su-start'})";
+ }
}
- if ($extra > 2 && $client{'su-start'}){
- $client .= " ($client{'su-start'})";
- }
- $data{$data_name}[$index]{main::key($num++,1,1,$client_shell)} = $client;
+ $data->{$data_name}[$index]{main::key($num++,1,1,$client_shell)} = $client;
if ($extra > 0 && $client{'version'}){
- $data{$data_name}[$index]{main::key($num++,0,2,'v')} = $client{'version'};
+ $data->{$data_name}[$index]{main::key($num++,0,2,'v')} = $client{'version'};
}
- if ($extra > 2 && $client{'default-shell'}){
- $data{$data_name}[$index]{main::key($num++,1,2,'default')} = $client{'default-shell'};
- $data{$data_name}[$index]{main::key($num++,0,3,'v')} = $client{'default-shell-v'} if $client{'default-shell-v'};
- }
- if ( $running_in ){
- $data{$data_name}[$index]{main::key($num++,0,2,'running in')} = $running_in;
+ if (!$b_irc){
+ if ($extra > 2 && $client{'default-shell'}){
+ $data->{$data_name}[$index]{main::key($num++,1,2,'default')} = $client{'default-shell'};
+ $data->{$data_name}[$index]{main::key($num++,0,3,'v')} = $client{'default-shell-v'} if $client{'default-shell-v'};
+ }
+ if ($running_in){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'running-in')} = $running_in;
+ }
}
- $data{$data_name}[$index]{main::key($num++,0,1,$self_name)} = &get_self_version();
-
+ $data->{$data_name}[$index]{main::key($num++,0,1,$self_name)} = main::get_self_version();
eval $end if $b_log;
- return %data;
+ return $data;
}
-sub generate_system_data {
+sub system_item {
eval $start if $b_log;
my ($cont_desk,$ind_dm,$num) = (1,2,0);
- my (%row,$ref,$index,$val1);
+ my ($index);
my $data_name = main::key($prefix++,1,0,'System');
- my ($desktop,$desktop_info,$desktop_key,$dm_key,$toolkit,$wm) = ('','','Desktop','dm','','');
- my (@desktop_data,$desktop_version);
-
- my %data = (
+ my ($desktop,$desktop_key,$toolkit,$wm) = ('','Desktop','','');
+ my ($cs_curr,$cs_avail,@desktop_data,$de_components,$de_info,$de_info_v,
+ $de_version,$tools_running,$tools_avail,$tk_version,$wm_version);
+ my $data = {
$data_name => [{}],
- );
- $index = scalar(@{ $data{$data_name} } ) - 1;
+ };
+ $index = 0;
if ($show{'host'}){
- $data{$data_name}[$index]{main::key($num++,0,1,'Host')} = get_hostname();
- }
- $data{$data_name}[$index]{main::key($num++,1,1,'Kernel')} = get_kernel_data();
- $data{$data_name}[$index]{main::key($num++,0,2,'bits')} = get_kernel_bits();
+ $data->{$data_name}[$index]{main::key($num++,0,1,'Host')} = main::get_hostname();
+ }
+ my $dms = DmData::get();
+ my $dm_key = (!$dms->{'dm'} && $dms->{'lm'}) ? 'LM' : 'DM';
+ my $kernel_data = main::get_kernel_data();
+ $data->{$data_name}[$index]{main::key($num++,1,1,'Kernel')} = $kernel_data->[0];
+ $data->{$data_name}[$index]{main::key($num++,0,2,'arch')} = $kernel_data->[1];
+ $data->{$data_name}[$index]{main::key($num++,0,2,'bits')} = main::get_kernel_bits();
if ($extra > 0){
- my @compiler = get_compiler_version(); # get compiler data
- if (scalar @compiler != 2){
- @compiler = ('N/A', '');
+ my $compiler = KernelCompiler::get(); # get compiler data
+ if (scalar @$compiler != 2){
+ @$compiler = ('N/A', '');
}
- $data{$data_name}[$index]{main::key($num++,1,2,'compiler')} = $compiler[0];
+ $data->{$data_name}[$index]{main::key($num++,1,2,'compiler')} = $compiler->[0];
# if no compiler, obviously no version, so don't waste space showing.
- if ($compiler[0] ne 'N/A'){
- $compiler[1] ||= 'N/A';
- $data{$data_name}[$index]{main::key($num++,0,3,'v')} = $compiler[1];
+ if ($compiler->[0] ne 'N/A'){
+ $compiler->[1] ||= 'N/A';
+ $data->{$data_name}[$index]{main::key($num++,0,3,'v')} = $compiler->[1];
}
}
- if ($b_admin && (my $params = get_kernel_parameters())){
- $index = scalar(@{ $data{$data_name} } );
- #print "$params\n";
- $params = apply_partition_filter('system', $params, 'label') if $use{'filter-label'};
- $params = apply_partition_filter('system', $params, 'uuid') if $use{'filter-uuid'};
- $data{$data_name}[$index]{main::key($num++,0,2,'parameters')} = $params;
- $index = scalar(@{ $data{$data_name} } );
+ if ($extra > 2){
+ main::get_kernel_clocksource(\$cs_curr,\$cs_avail);
+ $cs_curr ||= 'N/A';
+ $data->{$data_name}[$index]{main::key($num++,1,2,'clocksource')} = $cs_curr;
+ if ($b_admin && $cs_avail){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'avail')} = $cs_avail;
+ }
}
+ if ($b_admin && (my $params = KernelParameters::get())){
+ # print "$params\n";
+ if ($use{'filter-label'}){
+ $params = main::filter_partition('system', $params, 'label');
+ }
+ if ($use{'filter-uuid'}){
+ $params = main::filter_partition('system', $params, 'uuid');
+ }
+ $data->{$data_name}[$index]{main::key($num++,0,2,'parameters')} = $params;
+
+ }
+ $index++;
# note: tty can have the value of 0 but the two tools
# return '' if undefined, so we test for explicit ''
if ($b_display){
- my @desktop_data = DesktopEnvironment::get();
- $desktop = $desktop_data[0] if $desktop_data[0];
- $desktop_version = $desktop_data[1] if $desktop_data[1];
- $desktop .= ' ' . $desktop_version if $desktop_version;
- if ($extra > 0 && $desktop_data[3]){
- #$desktop .= ' (' . $desktop_data[2];
- #$desktop .= ( $desktop_data[3] ) ? ' ' . $desktop_data[3] . ')' : ')';
- $toolkit = "$desktop_data[2] $desktop_data[3]";
- }
- if ($extra > 2 && $desktop_data[4]){
- $desktop_info = $desktop_data[4];
+ my $desktop_data = DesktopData::get();
+ $desktop = $desktop_data->[0] if $desktop_data->[0];
+ if ($desktop){
+ $de_version = ($desktop_data->[1]) ? $desktop_data->[1] : 'N/A';
+ if ($extra > 0 && $desktop_data->[2]){
+ $toolkit = $desktop_data->[2];
+ if ($desktop_data->[1] || $desktop_data->[3]){
+ $tk_version = ($desktop_data->[3]) ? $desktop_data->[3] : 'N/A';
+ }
+ }
+ if ($b_admin && $desktop_data->[9] && $desktop_data->[10]){
+ $de_info = $desktop_data->[9];
+ $de_info_v = $desktop_data->[10];
+ }
}
# don't print the desktop if it's a wm and the same
- if ($extra > 1 && $desktop_data[5] &&
- (!$desktop_data[0] || $desktop_data[5] =~ /^(deepin.+|gnome[\s_-]shell|budgie.+)$/i ||
- index(lc($desktop_data[5]),lc($desktop_data[0])) == -1 )){
- $wm = $desktop_data[5];
- $wm .= ' ' . $desktop_data[6] if $extra > 2 && $desktop_data[6];
+ if ($extra > 1 && $desktop_data->[5] &&
+ (!$desktop_data->[0] || $desktop_data->[5] =~ /^(deepin.+|gnome[\s_-]shell|budgie.+)$/i ||
+ index(lc($desktop_data->[5]),lc($desktop_data->[0])) == -1)){
+ $wm = $desktop_data->[5];
+ $wm_version = $desktop_data->[6] if $extra > 2 && $desktop_data->[6];
+ }
+ if ($extra > 2 && $desktop_data->[4]){
+ $de_components = $desktop_data->[4];
+ }
+ if ($extra > 2 && $desktop_data->[7]){
+ $tools_running = $desktop_data->[7];
+ }
+ if ($b_admin && $desktop_data->[8]){
+ $tools_avail = $desktop_data->[8];
}
}
- if (!$b_display || ( !$desktop && $b_root)) {
- my $tty = get_tty_number();
+ if (!$b_display || (!$desktop && $b_root)){
+ ShellData::tty_number() if !$loaded{'tty-number'};
+ my $tty = $client{'tty-number'};
if (!$desktop){
- $desktop_info = '';
+ $de_components = '';
}
# it is defined, as ''
- if ( $tty eq '' && $client{'console-irc'}){
- $tty = get_tty_console_irc('vtnr');
+ if ($tty eq '' && $client{'console-irc'}){
+ ShellData::console_irc_tty() if !$loaded{'con-irc-tty'};
+ $tty = $client{'con-irc-tty'};
+ }
+ if ($tty ne ''){
+ my $tty_type = '';
+ if ($tty =~ /^[a-f0-9]+$/i){
+ $tty_type = 'tty ';
+ }
+ elsif ($tty =~ /pts/i){
+ $tty_type = 'pty ';
+ }
+ $desktop = "$tty_type$tty";
}
- $desktop = "tty $tty" if $tty ne '';
$desktop_key = 'Console';
- $dm_key = 'DM';
$ind_dm = 1;
$cont_desk = 0;
}
- $desktop ||= 'N/A';
- $data{$data_name}[$index]{main::key($num++,$cont_desk,1,$desktop_key)} = $desktop;
- if ($toolkit){
- $data{$data_name}[$index]{main::key($num++,0,2,'tk')} = $toolkit;
+ else {
+ $dm_key = lc($dm_key);
}
- if ($extra > 2){
- if ($desktop_info){
- $data{$data_name}[$index]{main::key($num++,0,2,'info')} = $desktop_info;
+ $desktop ||= 'N/A';
+ $data->{$data_name}[$index]{main::key($num++,$cont_desk,1,$desktop_key)} = $desktop;
+ if ($b_display){
+ if ( $de_version){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'v')} = $de_version;
+ }
+ if ($toolkit){
+ $data->{$data_name}[$index]{main::key($num++,1,2,'tk')} = $toolkit;
+ if ($tk_version){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'v')} = $tk_version;
+ }
+ }
+ if ($de_info){
+ $data->{$data_name}[$index]{main::key($num++,1,2,'info')} = $de_info;
+ $data->{$data_name}[$index]{main::key($num++,0,3,'v')} = $de_info_v;
+ }
+ if ($extra > 1){
+ if ($wm){
+ $data->{$data_name}[$index]{main::key($num++,1,2,'wm')} = $wm;
+ if ($wm_version){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'v')} = $wm_version;
+ }
+ }
+ if ($extra > 2){
+ if ($de_components){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'with')} = $de_components;
+ }
+ if ($tools_running || $tools_avail){
+ $tools_running ||= '';
+ $data->{$data_name}[$index]{main::key($num++,1,2,'tools')} = $tools_running;
+ if ($tools_avail){
+ $data->{$data_name}[$index]{main::key($num++,0,3,'avail')} = $tools_avail;
+ }
+ }
+ if (defined $ENV{'XDG_VTNR'}){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'vt')} = $ENV{'XDG_VTNR'};
+ }
+ }
}
}
if ($extra > 1){
- $data{$data_name}[$index]{main::key($num++,0,2,'wm')} = $wm if $wm;
- my $dms = get_display_manager();
- if ($dms || $desktop_key ne 'Console'){
- $dms ||= 'N/A';
- $data{$data_name}[$index]{main::key($num++,0,$ind_dm,$dm_key)} = $dms;
+ # note: version only present if proper extra level so no need to test again
+ if (%$dms || $desktop_key ne 'Console'){
+ my $type = (!$dms->{'dm'} && $dms->{'lm'}) ? $dms->{'lm'}: $dms->{'dm'};
+ if ($type && @$type && scalar @$type > 1){
+ my $i = 0;
+ $data->{$data_name}[$index]{main::key($num++,1,$ind_dm,$dm_key)} = '';
+ foreach my $dm_data (@{$type}){
+ $i++;
+ $data->{$data_name}[$index]{main::key($num++,1,($ind_dm + 1),$i)} = $dm_data->[0];
+ if ($dm_data->[1]){
+ $data->{$data_name}[$index]{main::key($num++,0,($ind_dm + 2),'v')} = $dm_data->[1];
+ }
+ if ($dm_data->[2]){
+ $data->{$data_name}[$index]{main::key($num++,0,($ind_dm + 2),'note')} = $dm_data->[2];
+ }
+ }
+ }
+ else {
+ my $dm = ($type && $type->[0][0]) ? $type->[0][0] : 'N/A';
+ $data->{$data_name}[$index]{main::key($num++,1,$ind_dm,$dm_key)} = $dm;
+ if ($type && @{$type} && $type->[0][1]){
+ $data->{$data_name}[$index]{main::key($num++,0,($ind_dm + 1),'v')} = $type->[0][1];
+ }
+ }
}
}
- #if ($extra > 2 && $desktop_key ne 'Console'){
- # my $tty = get_tty_number();
- # $data{$data_name}[$index]{main::key($num++,0,1,'vc')} = $tty if $tty ne '';
- #}
+ # if ($extra > 2 && $desktop_key ne 'Console'){
+ # my $tty = ShellData::tty_number() if !$loaded{'tty-number'};
+ # $data->{$data_name}[$index]{main::key($num++,0,1,'vc')} = $tty if $tty ne '';
+ # }
my $distro_key = ($bsd_type) ? 'OS': 'Distro';
- my @distro_data = DistroData::get();
- my $distro = $distro_data[0];
- $distro ||= 'N/A';
- $data{$data_name}[$index]{main::key($num++,1,1,$distro_key)} = $distro;
- if ($extra > 0 && $distro_data[1]){
- $data{$data_name}[$index]{main::key($num++,0,2,'base')} = $distro_data[1];
+ my $distro = DistroData::get();
+ $distro->{'name'} ||= 'N/A';
+ $data->{$data_name}[$index]{main::key($num++,1,1,$distro_key)} = $distro->{'name'};
+ if ($extra > 0 && $distro->{'base'}){
+ $data->{$data_name}[$index]{main::key($num++,0,2,'base')} = $distro->{'base'};
}
eval $end if $b_log;
- return %data;
+ return $data;
+}
+
+## Item Processors ##
+sub assign_data {
+ return if !$_[0] || ref $_[0] ne 'HASH';
+ if ($output_type eq 'screen'){
+ main::print_data($_[0]);
+ }
+ else {
+ push(@$items,$_[0]);
+ }
+}
+
+sub item_handler {
+ eval $start if $b_log;
+ my ($key,$item,$arg) = @_;
+ set_subs() if !$subs;
+ my $rows = $subs->{$item}($arg);
+ eval $end if $b_log;
+ if (ref $rows eq 'ARRAY' && @$rows){
+ return {main::key($prefix++,1,0,$key) => $rows};
+ }
+}
+
+sub set_subs {
+ $subs = {
+ 'audio' => \&AudioItem::get,
+ 'battery' => \&BatteryItem::get,
+ 'bluetooth' => \&BluetoothItem::get,
+ 'cpu' => \&CpuItem::get,
+ 'disk' => \&DriveItem::get,
+ 'graphic' => \&GraphicItem::get,
+ 'logical' => \&LogicalItem::get,
+ 'machine' => \&MachineItem::get,
+ 'network' => \&NetworkItem::get,
+ 'partition' => \&PartitionItem::get,
+ 'raid' => \&RaidItem::get,
+ 'ram' => \&RamItem::get,
+ 'repo' => \&RepoItem::get,
+ 'process' => \&ProcessItem::get,
+ 'sensor' => \&SensorItem::get,
+ 'slot' => \&SlotItem::get,
+ 'swap' => \&SwapItem::get,
+ 'unmounted' => \&UnmountedItem::get,
+ 'usb' => \&UsbItem::get,
+ 'weather' => \&WeatherItem::get,
+ };
+}
}
#######################################################################
@@ -21884,5 +38385,5 @@ sub generate_system_data {
main(); ## From the End comes the Beginning
-## note: this EOF is needed for smxi handling, this is what triggers the full download ok
+## note: this EOF is needed for self updater, triggers the full download ok
###**EOF**###
diff --git a/inxi.1 b/inxi.1
index 0964f22..d515dbb 100644
--- a/inxi.1
+++ b/inxi.1
@@ -1,31 +1,51 @@
-.TH INXI 1 "2020\-07\-26" inxi "inxi manual"
+.\" inxi.1 - manpage for inxi system information tool
+.\" Copyright (C) 2024 Harald Hope
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
+.\" with this program; if not, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.\"
+.TH INXI 1 "2024\-02-06"inxi" "inxi manual"
.SH NAME
-inxi \- Command line system information script for console and IRC
+inxi \- Command line system information script for console and IRC
.SH SYNOPSIS
\fBinxi\fR
-\fBinxi\fR [\fB\-AbBCdDfFGhijJIlmMnNopPrRsSuUVwzZ\fR]
+\fBinxi\fR [\fB\-AbBCdDEfFGhiIjJlLmMnNopPrRsSuUwyYzZ\fR]
-\fBinxi\fR [\fB\-c NUMBER\fR] [\fB\-t\fR
-[\fBc\fR|\fBm\fR|\fBcm\fR|\fBmc\fR][\fBNUMBER\fR]]
-[\fB\-v NUMBER\fR] [\fB\-W LOCATION\fR]
+\fBinxi\fR [\fB\-c -NUMBER\fR]
+[\fB\-\-sensors\-exclude SENSORS\fR] [\fB\-\-sensors\-use SENSORS\fR]
+[\fB\-t\fR [\fBc\fR|\fBm\fR|\fBcm\fR|\fBmc\fR][\fBNUMBER\fR]]
+[\fB\-v NUMBER\fR] [\fB\-w [LOCATION]\fR]
[\fB\-\-weather\-unit\fR {\fBm\fR|\fBi\fR|\fBmi\fR|\fBim\fR}] [\fB\-y WIDTH\fR]
-\fBinxi\fR [\fB\-\-memory\-modules\fR] [\fB\-\-memory\-short\fR]
-[\fB\-\-recommends\fR] [\fB\-\-slots\fR]
+\fBinxi\fR [\fB\-\-edid\fR] [\fB\-\-memory\-modules\fR]
+[\fB\-\-memory\-short\fR] [\fB\-\-recommends\fR] [\fB\-\-sensors\-default\fR]
+[\fB\-\-slots\fR] [\fB\-\-version\fR] [\fB\-\-version\-short\fR]
\fBinxi\fB [\fB\-x\fR|\fB\-xx\fR|\fB\-xxx\fR|\fB\-a\fR] \fB\-OPTION(s)\fR
-All short form options have long form variants \- see below for these and more advanced options.
+All short form options have long form variants \- see below for these and more
+advanced options.
.SH DESCRIPTION
-\fBinxi\fR is a command line system information script built for console
-and IRC. It is also used a debugging tool for forum technical support
-to quickly ascertain users' system configurations and hardware. inxi shows
-system hardware, CPU, drivers, Xorg, Desktop, Kernel, gcc version(s), Processes,
-RAM usage, and a wide variety of other useful information.
+\fBinxi\fR is a command line system information script built for console and
+IRC. It is also used a debugging tool for forum technical support to quickly
+ascertain users' system configurations and hardware. inxi shows system hardware,
+CPU, drivers, Xorg, Desktop, Kernel, compiler version(s), Processes, RAM usage,
+and a wide variety of other useful information.
\fBinxi\fR output varies depending on whether it is being used on CLI or IRC,
with some default filters and color options applied only for IRC use.
@@ -39,12 +59,57 @@ username directory in partitions, and a few other items.
Because inxi is often used on forums for support, you can also trigger this
filtering with the \fB\-z\fR option (\fB\-Fz\fR, for example). To override
-the IRC filter, you can use the \fB\-Z\fR option. This can be useful in debugging
-network connection issues online in a private chat, for example.
+the IRC filter, you can use the \fB\-Z\fR option. This can be useful in
+debugging network connection issues online in a private chat, for example.
+
+.SH TABLE OF CONTENTS
+This man page is pretty long and information packed. It is divided into the
+following sections:
+
+* \fBUSING OPTIONS\fR How to use the command line options.
+
+* \fBSTANDARD OPTIONS\fR Primary data types trigger items.
+
+* \fBFILTER OPTIONS\fR Apply a variety of output filters.
+
+* \fBOUTPUT CONTROL OPTIONS\fR Change default colors, widths, heights, output
+types, etc.
+
+* \fBEXTRA DATA OPTIONS\fR What \fB\-x\fR, \fB\-xx\fR, and \fB\-xxx\fR add to
+the output per primary data type.
+
+* \fBADMIN EXTRA DATA OPTIONS\fR What \fB\-a\fR adds to the output per primary
+data type. These have a lot of information because this is advanced admin data,
+which are not always intuitive or easy to understand.
+
+* \fBADVANCED OPTIONS\fR Modify behavior or choice of data sources, and other
+advanced switches.
+
+* \fBDEBUGGING OPTIONS\fR For development use mainly, or contributing datasets
+to the project.
+
+* \fBDEBUGGING OPTIONS TO DEBUG DEBUGGER FAILURES\fR Only for advanced users,
+sometimes something will hang the debuggers, this shows you various ways to get
+around those failures.
+
+* \fBSUPPORTED IRC CLIENTS\fR List of known good IRC clients. Not checked often,
+let us know if something is not working.
+
+* \fBRUNNING IN IRC CLIENT\fR How to run inxi in various IRC clients.
+
+* \fBCONFIGURATION FILE\fR Configuration file locations and priority in using.
+
+* \fBCONFIGURATION OPTIONS\fR Most of the commonly used configuration options,
+along with sample values.
+
+* \fBBUGS\fR How and where to report bugs.
+
+* \fBHOMEPAGE\fR, \fBAUTHOR AND CONTRIBUTORS TO CODE\fR, \fBSPECIAL THANKS TO
+THE FOLLOWING\fR These are self explanitory.
.SH USING OPTIONS
-Options can be combined if they do not conflict. You can either group the letters
-together or separate them.
+Options can be combined if they do not conflict. You can either group the
+letters together or separate them.
Letters with numbers can have no gap or a gap at your discretion, except when
using \fB \-t\fR. Note that if you use an option that requires an additional
@@ -62,92 +127,98 @@ keep things simple.
.SH STANDARD OPTIONS
.TP
-.B \-A\fR,\fB \-\-audio\fR
-Show Audio/sound card(s) information, including card driver.
+.B \-A \fR, \fB\-\-audio\fR
+Show Audio/sound device(s) information, including device driver. Shows active
+sound API(s) and sound server(s).
+
+Supported APIs: ALSA, OSS, sndio. Supported servers: aRts (artsd), Enlightened
+Sound Daemon (esound, esd), JACK, NAS (Network Audio System, nasd), PipeWire,
+PulseAudio, RoarAudio, sndiod.
+
+Use \fB\-Ax\fR to show all sound APIs/servers detected, including inactive,
+\fB\-Axx\fR to see API/Server helper daemons/plugin/modules, and \fB\-Aa\fR to
+see API/sound server tools.
+
+.nf
+\fBAudio:
+ Device\-1: C-Media CMI8788 [Oxygen HD Audio] driver: snd_virtuoso
+ Device\-2: AMD Cedar HDMI Audio [Radeon HD 5400/6300/7300 Series]
+ driver: snd_hda_intel
+ Device\-3: AMD Family 17h HD Audio driver: snd_hda_intel
+ API: ALSA v: k5.19.0\-16.2\-liquorix\-amd64 status: kernel\-api
+ Server\-1: PulseAudio v: 16.1 status: active\fR
+.fi
.TP
-.B \-b\fR,\fB \-\-basic\fR
+.B \-b \fR, \fB\-\-basic\fR
Show basic output, short form. Same as: \fBinxi \-v 2\fR
.TP
-.B \-B\fR,\fB \-\-battery\fR
-Show system battery (\fBID\-x\fR) data, charge, condition, plus extra information
-(if battery present). Uses \fB/sys\fR or, for BSDs without systctl battery data,
-\fBdmidecode\fR. \fBdmidecode\fR does not have very much information, and none
-about current battery state/charge/voltage. Supports multiple batteries when
-using \fB/sys\fR data.
+.B \-B \fR, \fB\-\-battery\fR
+Show system battery (\fBID\-x\fR) data, charge, condition, plus extra
+information (if battery present). Uses \fB/sys\fR or, for BSDs without systctl
+battery data, use \fB\-\-dmidecode\fR to force its use. \fBdmidecode\fR does
+not have very much information, and none about current battery
+state/charge/voltage. Supports multiple batteries when using \fB/sys\fR or
+\fBsysctl\fR data.
-Note that for \fBcharge\fR, the output shows the current charge, as well as its
-value as a percentage of the available capacity, which can be less than the original design
-capacity. In the following example, the actual current available capacity of the battery
-is \fB22.2 Wh\fR.
+Note that for \fBcharge:\fR, the output shows the current charge, as well as
+its value as a percentage of the available capacity, which can be less than
+the original design capacity. In the following example, the actual current
+available capacity of the battery is \fB22.2 Wh\fR.
-\fBcharge: 20.1 Wh 95.4%\fR
+\fBcharge: 20.1 Wh (95.4%)\fR
-The \fBcondition\fR item shows the remaining available capacity / original design
-capacity, and then this figure as a percentage of original capacity available in the battery.
+The \fBcondition:\fR item shows the remaining available capacity / original
+design capacity, and then this figure as a percentage of original capacity
+available in the battery.
\fBcondition: 22.2/36.4 Wh (61%)\fR
-With \fB\-x\fR shows attached \fBDevice\-x\fR information (mouse, keyboard, etc.)
-if they are battery powered.
-
-.TP
-.B \-c\fR,\fB \-\-color\fR \fR[\fB0\fR\-\fB42\fR]
-Set color scheme. If no scheme number is supplied, 0 is assumed.
-
-.TP
-.B \-c \fR[\fB94\fR\-\fB99\fR]
+With \fB\-x\fR, or if voltage difference is critical, \fBvolts:\fR item shows
+the current voltage, and the \fBmin:\fR voltage. Note that if the current is
+below the minimum listed the battery is essentially dead and will not charge.
+Test that to confirm, but that's technically how it's supposed to work.
-These color selectors run a color selector option prior to inxi starting which lets
-you set the config file value for the selection.
+\fBvolts: 12.0 min: 11.4\fR
-NOTE: All configuration file set color values are removed when output is
-piped or redirected. You must use the explicit runtime \fB\-c <color number>\fR option
-if you want color codes to be present in the piped/redirected output.
-
-Color selectors for each type display (NOTE: IRC and global only show safe color set):
-
-.TP
-.B \-c 94\fR
-\- Console, out of X.
-
-.TP
-.B \-c 95\fR
-\- Terminal, running in X \- like xTerm.
+With \fB\-x\fR shows attached \fBDevice\-x\fR information (mouse, keyboard,
+etc.) if they are battery powered.
.TP
-.B \-c 96\fR
-\- GUI IRC, running in X \- like XChat, Quassel,
-Konversation etc.
+.B \-\-bluetooth\fR
+.br
+See \fB\-E\fR.
.TP
-.B \-c 97\fR
-\- Console IRC running in X \- like irssi in xTerm.
+.B \-c \fR, \fB\-\-color\fR
+.br
+See \fBOUTPUT CONTROL OPTIONS\fR.
.TP
-.B \-c 98\fR
-\- Console IRC not in X.
+.B \-\-config\fR, \fB\-\-configuration\fR
+Show active configuration values, by file, and exit.
.TP
-.B \-c 99\fR
-\- Global \- Overrides/removes all settings.
+.B \-C \fR, \fB\-\-cpu\fR
+Show full CPU output (if each item available): basic CPU topology, model, type,
+L2 cache, average speed of all cores (if > 1 core, otherwise speed of the core),
+min/max speeds for CPU, and per CPU clock speed. More data available with
+\fB\-x\fR, \fB\-xxx\fR, and \fB\-a\fR options.
-Setting a specific color type removes the global color selection.
+Explanation of CPU type (\fBtype: MT MCP\fR) abbreviations:
-.TP
-.B \-C\fR,\fB \-\-cpu\fR
-Show full CPU output, including per CPU clock speed and CPU max speed (if available).
-If max speed data present, shows \fB(max)\fR in short output formats (\fBinxi\fR,
-\fBinxi \-b\fR) if actual CPU speed matches max CPU speed. If max CPU speed does
-not match actual CPU speed, shows both actual and max speed information.
-See \fB\-x\fR for more options.
+* \fBAMCP\fR \- Asymmetric Multi Core Processor. More than 1 core per CPU, and
+more than one core type (single and multithreaded cores in the same CPU).
-For certain CPUs (some ARM, and AMD Zen family) shows CPU die count.
+* \fBAMP\fR \- Asymmetric Multi Processing (more than 1 physical CPU, but not
+identical in terms of core counts or min/max speeds).
-The details for each CPU include a technical description e.g. \fBtype: MT MCP\fR
+* \fBMT\fR \- Multi/Hyper Threaded CPU (more than 1 thread per core, previously
+\fBHT\fR).
-* \fBMT\fR \- Multi/Hyper Threaded CPU, more than 1 thread per core (previously \fBHT\fR).
+* \fBMST\fR \- Multi and Single Threaded CPU (a CPU with both Single and Multi
+Threaded cores).
* \fBMCM\fR \- Multi Chip Model (more than 1 die per CPU).
@@ -157,253 +228,549 @@ The details for each CPU include a technical description e.g. \fBtype: MT MCP\fR
* \fBUP\fR \- Uni (single core) Processor.
-Note that \fBmin/max:\fR speeds are not necessarily true in cases of overclocked CPUs
-or CPUs in turbo/boost mode. See \fB\-Ca\fR for alternate \fBbase/boost:\fR speed data.
+Note that \fBmin/max:\fR speeds are not necessarily true in cases of
+overclocked CPUs or CPUs in turbo/boost mode. See \fB\-Ca\fR for alternate
+\fBbase/boost:\fR speed data, more granular cache data, and more.
+
+Sample:
+.nf
+\fBCPU:
+ Info: 2x 8\-core model: Intel Xeon E5\-2620 v4 bits: 64 type: MT MCP SMP
+ cache: L2: 2x 2 MiB (4 MiB)
+ Speed (MHz): avg: 1601 min/max: 1200/3000 cores: 1: 1280 2: 1595 3: 1416
+ ... 32: 1634\fR
+.fi
.TP
-.B \-d\fR,\fB \-\-disk\-full\fR,\fB\-\-optical\fR
-Show optical drive data as well as \fB\-D\fR hard drive data. With \fB\-x\fR, adds a
-feature line to the output. Also shows floppy disks if present. Note that there is
-no current way to get any information about the floppy device that we are aware of,
-so it will simply show the floppy ID without any extra data. \fB\-xx\fR adds a
-few more features.
+.B \-d \fR, \fB\-\-disk\-full\fR,\fB\-\-optical\fR
+Show optical drive data as well as \fB\-D\fR HDD/SSD drive data. With \fB\-x\fR,
+adds a feature line to the output. Also shows floppy disks if present. Note
+that there is no current way to get any information about the floppy device
+that we are aware of, so it will simply show the floppy ID without any extra
+data. \fB\-xx\fR adds a few more features.
.TP
-.B \-D\fR,\fB \-\-disk\fR
-Show Hard Disk info. Shows total disk space and used percentage. The disk used
-percentage includes space used by swap partition(s), since those are not usable
-for data storage. Note that with RAID disks, the percentage will be wrong since
-the total is computed from the disk sizes, but used is computed from mounted
-partition used percentages. This small defect may get corrected in the future.
-Also, unmounted partitions are not counted in disk use percentages since inxi
-has no access to the used amount.
+.B \-D \fR, \fB\-\-disk\fR
+Show HDD/SSD drive info. Shows total drive space and used percentage. The drive
+used percentage includes space used by swap partition(s), since those are not
+usable for data storage. Also, unmounted partitions are not counted in drive use
+percentages since inxi has no access to the used amount.
+
+If the system has RAID or other logical storage, and if inxi can determine
+the size of those vs their components, you will see the storage total raw and
+usable sizes, plus the percent used of the usable size. The no argument short
+form of inxi will show only the usable (or total if no usable) and used
+percent. If there is no logical storage detected, only \fBtotal:\fR and
+\fBused:\fR will show. Sample (with RAID logical size calculated):
+
+\fBLocal Storage: total: raw: 5.49 TiB usable: 2.80 TiB used: 1.35 TiB
+(48.3%)\fR
-Also shows per disk information: Disk ID, type (if present), vendor (if detected),
-model, and size. See \fBExtra Data Options\fR (\fB\-x\fR options) and
-\fBAdmin Extra Data Options\fR (\fB\-\-admin\fR options) for many more features.
+Without logical storage detected:
+
+\fBLocal Storage: total: 2.89 TiB used: 1.51 TiB (52.3%)\fR
+
+Also shows per drive information: Disk ID, type (FireWire, Removable, USB if
+present), vendor (if detected), model, and size. See \fBExtra Data Options\fR
+(\fB\-x\fR options) and \fBAdmin Extra Data Options\fR (\fB\-\-admin\fR options)
+for many more features.
.TP
-.B \-\-filter\fR,\fB \-\-filter\-override\fR \- See \fB\-z\fR, \fB\-Z\fR.
+.B \-E\fR, \fB\-\-bluetooth\fR
+Show bluetooth device(s), drivers. Show \fBReport:\fR with HCI ID, state,
+address per device (requires \fBbtmgmt\fR, \fBbt\-adapter\fR, or
+\fBhciconfig\fR), and if available (hciconfig, btmgmt only) bluetooth version
+(\fBbt\-v\fR). See \fBExtra Data Options\fR for more.
+
+If bluetooth shows as \fBstatus: down\fR, shows \fBbt\-service:\fR\fB state
+and rfkill\fR software and hardware blocked states, and rfkill ID.
+
+Note that \fBReport\-ID:\fR indicates that the HCI item was not able to be
+linked to a specific device, similar to \fBIF\-ID:\fR in \fB\-n\fR.
+
+If your internal bluetooth device does not show, it's possible that
+it has been disabled, if you try enabling it using for example:
+
+\fBhciconfig hci0 up\fR
+
+and it returns a blocked by RF\-Kill error, you can do one of these:
+
+\fBconnmanctl enable bluetooth\fR
+
+or
+
+\fBrfkill list bluetooth\fR
+
+\fBrfkill unblock bluetooth\fR
.TP
-.B \-\-filter\-label\fR
-Filter partition label names from \fB\-j\fR, \fB\-o\fR, \fB\-p\fR,
-\fB\-P\fR, and \fB\-Sa\fR (root=LABEL=...). Generally only useful in
-very specialized cases.
+.B \-\-edid\fR
+.br
+Triggers full \fBEDID\fR data in Graphics, activates \fB\-G\fR and \fB\-a\fR.
+
+\- Adds monitor chromacity (\fBchroma: red:..green:...blue:...white:\fR).
+
+\- Shows all available monitor modes if > 2 present, in comma separated list.
+
+\- Shows \fBEDID\fR errors and warnings if any present.
.TP
-.B \-\-filter\-uuid\fR
-Filter partition UUIDs from \fB\-j\fR, \fB\-o\fR, \fB\-p\fR,
-\fB\-P\fR, and \fB\-Sa\fR (root=UUID=...). Generally only useful in
-very specialized cases.
+.B \-\-filter\fR, \fB\-z\fR
+.br
+See \fBFILTER OPTIONS\fR.
.TP
-.B \-f\fR,\fB \-\-flags\fR
-Show all CPU flags used, not just the short list. Not shown with \fB\-F\fR in order
-to avoid spamming. ARM CPUs: show \fBfeatures\fR items.
+.B \-f \fR, \fB\-\-flags\fR
+Show all CPU flags used, not just the short list. Not shown with \fB\-F\fR
+in order to avoid spamming. ARM CPUs: show \fBfeatures\fR items.
.TP
-.B \-F\fR,\fB \-\-full\fR
-Show Full output for inxi. Includes all Upper Case line letters except \fB\-W\fR,
-plus \fB\-\-swap\fR, \fB\-s\fR and \fB\-n\fR. Does not show extra verbose options such as
-\fB\-d \-f \-i \-l \-m \-o \-p \-r \-t \-u \-x\fR unless you use those arguments in
-the command, e.g.: \fBinxi \-Frmxx\fR
+.B \-F \fR, \fB\-\-full\fR
+Show Full output for inxi. Includes all Upper Case line letters (except
+\fB\-J\fR, plus \fB\-\-swap\fR, \fB\-s\fR and \fB\-n\fR. Does not show extra
+verbose options such as \fB\-d \-f \-i -J \-l \-m \-o \-p \-r \-t \-u \-x\fR
+unless you use those arguments in the command, e.g.: \fBinxi \-Frmxx\fR
.TP
-.B \-G\fR,\fB \-\-graphics\fR
-Show Graphic card(s) information, including details of card and card driver,
-display protocol (if available), display server (and/or Wayland compositor),
-vendor and version number, e.g.:
+.B \-G \fR, \fB\-\-graphics\fR
+Show Graphic device(s) information, including details of device and display
+drivers (\fBX:\fR \fBloaded:\fR, and, if applicable: \fBunloaded:\fR,
+\fBfailed:\fR, \fBdri:\fR (if X and different from loaded X drivers) drivers,
+and active \fBgpu:\fR drivers), display protocol (if available), display server
+(and/or Wayland compositor), vendor and version number, e.g.:
+
+\fBDisplay: x11 server: Xorg v: 1.15.1\fR
-\fBDisplay: x11 server: Xorg 1.15.1\fR
+or:
+
+\fBDisplay: wayland server: X.org v: 1.20.1 with: Xwayland v: 20.1\fR
If protocol is not detected, shows:
\fBDisplay: server: Xorg 1.15.1\fR
-Also shows screen resolution(s) (per monitor/X screen), OpenGL renderer,
-OpenGL core profile version/OpenGL version.
+Adds \fBwith: Xwayland v:...\fR if xwayland server is installed, regardless of
+protocol.
+
+Also shows screen resolution(s) (per monitor/X screen). Shows graphics API
+information (if available). EGL: EGL version, drivers, acdtive platforms;
+OpenGL: renderer, OpenGL core profile version/OpenGL version (if core/compat
+versions different, shows that as well); Vulkan: Vulkan version, drivers,
+surfaces;VESA: data (for Xvesa).
-Compositor information will show if detected using \fB\-xx\fR option
-or always if detected and Wayland.
+Compositor information will show if detected using \fB\-xx\fR option or always
+if detected and Wayland since the compositor is the server with Wayland.
+
+\fB\-Gxx\fR shows monitor data as well, if detected. \fB\-\-edid\fR shows
+advanced monitor data (full modes, chroma, etc.).
+
+.TP
+.B \-h \fR, \fB\-\-help\fR
+The help menu. Features dynamic sizing to fit into terminal window. Set script
+global \fBCOLS_MAX_CONSOLE\fR if you want a different default value, or use
+\fB\-y [width]\fR to temporarily override the defaults or actual window width.
.TP
-.B \-h\fR,\fB \-\-help\fR
-The help menu. Features dynamic sizing to fit into terminal window. Set script
-global \fBCOLS_MAX_CONSOLE\fR if you want a different default value, or
-use \fB\-y <width>\fR to temporarily override the defaults or actual window width.
+.B \-i \fR, \fB\-\-ip\fR
+Show WAN IP address and local interfaces (latter requires \fBifconfig\fR or
+\fBip\fR network tool), as well as network output from \fB\-n\fR. Not shown with
+\fB\-F\fR for user security reasons. You shouldn't paste your local/WAN IP.
+Shows both IPv4 and IPv6 link IP addresses.
.TP
-.B \-i\fR,\fB \-\-ip\fR
-Show WAN IP address and local interfaces (latter requires \fBifconfig\fR or
-\fBip\fR network tool), as well as network output from \fB\-n\fR.
-Not shown with \fB\-F\fR for user security reasons. You shouldn't paste your
-local/WAN IP. Shows both IPv4 and IPv6 link IP addresses.
+.B \-\-ip\-limit\fR, \fB\-\-limit [\-1 \- x]\fR
+Raise or lower max output limit of IP addresses for \fB\-i\fR. \fB\-1\fR
+removes limit.
.TP
-.B \-I\fR,\fB \-\-info\fR
-Show Information: processes, uptime, memory, IRC client (or shell type if run in
-shell, not IRC), inxi version. See \fB\-Ix\fR, \fB\-Ixx\fR, and \fB\-Ia\fR
-for extra information (init type/version, runlevel, packages).
+.B \-I \fR, \fB\-\-info\fR
+Show Information: processes, uptime, memory, IRC client (or shell type if run
+in shell, not IRC), inxi version. See \fB\-Ix\fR, \fB\-Ixx\fR, and \fB\-Ia\fR
+for extra information (init type/version, runlevel/target, packages).
-Note: if \fB\-m\fR is used or triggered, the memory item will show in the main
-Memory: report of \fB\-m\fR, not in \fB\Info:\fR.
+Note: if \fB\-m\fR or \fB\-tm\fR are active, the memory item will show in the
+main Memory: report of \fB\-m\fR/\fB\-tm\fR/, not in \fB\Info:\fR.
-Rasberry Pi only: uses \fBvcgencmd get_mem gpu\fR to get gpu RAM amount,
-if user is in video group and \fBvcgencmd\fR is installed. Uses
-this result to increase the \fBMemory:\fR amount and \fBused:\fR amounts.
+See \fB\-m\fR for explanation of \fBMemory:\fR fields and values..
.TP
.B \-j\fR, \fB\-\-swap\fR
Shows all active swap types (partition, file, zram). When this option is used,
swap partition(s) will not show on the \fB\-P\fR line to avoid redundancy.
+To show partition labels or UUIDs (when available and relevant), use with
+\fB\-l\fR or\fB \-u\fR.
+
.TP
-.B \-J\fR,\fB \-\-usb\fR
-Show USB data for attached Hubs and Devices. Hubs also show number of ports.
-Be aware that a port is not always external, some may be internal, and either
-used or unused (for example, a motherboard USB header connector that is not used).
+.B \-J \fR, \fB\-\-usb\fR
+Show USB data for attached Hubs and Devices. Hubs also show number of ports. Be
+aware that a port is not always external, some may be internal, and either used
+or unused (for example, a motherboard USB header connector that is not used).
Hubs and Devices are listed in order of BusID.
BusID is generally in this format: BusID\-port[.port][.port]:DeviceID
-Device ID is a number created by the kernel, and has no necessary ordering
-or sequence connection, but can be used to match this output to lsusb
-values, which generally shows BusID / DeviceID (except for tree view, which
-shows ports).
+Device ID is a number created by the kernel, and has no necessary ordering or
+sequence connection, but can be used to match this output to lsusb values, which
+generally shows BusID / DeviceID (except for tree view, which shows ports).
Examples: \fBDevice\-3: 4\-3.2.1:2\fR or \fBHub: 4\-0:1\fR
The \fBrev: 2.0\fR item refers to the USB revision number, like \fB1.0\fR or
-\fB3.1\fR.
+\fB3.1\fR.
+
+Use \fB\-Jx\fR for basic Si base 10 bits/s speed, \fB\-Jxx\fR for Si and IEC
+base 2 Bytes/s speeds. \fB\-Ja\fR adds USB mode.
.TP
-.B \-l\fR,\fB \-\-label\fR
-Show partition labels. Default: main partitions \fB\-P\fR. For full \fB\-p\fR output,
-use: \fB\-pl\fR.
+.B \-l \fR, \fB\-\-label\fR
+Show partition labels. Use with \fB\-j\fR, \fB\-o\fR, \fB\-p\fR, and \fB\-P\fR
+to show partition labels. Requires one of those options.
+
+Sample: \fB\-ojpl\fR.
.TP
-.B \-m\fR,\fB \-\-memory\fR
-Memory (RAM) data. Does not display with \fB\-b\fR or \fB\-F\fR unless you use \fB\-m\fR
-explicitly. Ordered by system board physical system memory array(s) (\fBArray\-[number]\fR),
-and individual memory devices (\fBDevice\-[number]\fR). Physical memory
-array data shows array capacity, number of devices supported, and Error Correction
-information. Devices shows locator data (highly variable in syntax), size, speed,
-type (eg: \fBtype: DDR3\fR).
+.B \-L\fR, \fB\-\-logical\fR
+Show Logical volume information, for LVM, LUKS, bcache, etc. Shows size, free
+space (for LVM VG). For LVM, shows \fBDevice\-[xx]: VG:\fR (Volume Group)
+size/free, \fBLV\-[xx]\fR (Logical Volume). LV shows type, size, and components.
+Note that components are made up of either containers (aka, logical devices), or
+physical devices. The full report requires doas/sudo/root.
+
+Logical block devices can be thought of as devices that are made up out of
+either other logical devices, or physical devices. inxi does its best to show
+what each logical device is made out of. RAID devices form a subset of all
+possible Logical devices, but have their own section, \fB\-R\fR.
-Note: \fB\-m\fR uses \fBdmidecode\fR, which must be run as root (or start
-\fBinxi\fR with \fBsudo\fR), unless you figure out how to set up sudo to permit
-dmidecode to read \fB/dev/mem\fR as user. \fBspeed\fR and \fBbus width\fR will not
-show if \fBNo Module Installed\fR is found in \fBsize\fR.
+If \fB\-R\fR is used with \fB\-Lxx\fR, \fB\-Lxx\fR will not show RAID
+information for LVM RAID devices since it's redundant. If \fB\-R\fR is not used,
+a simple RAID line will appear for LVM RAID in \fB\-Lxx\fR.
-Note: If \fB\-m\fR is triggered RAM total/used report will appear in this section,
-not in \fB\-I\fR or \fB\-tm\fR items.
+\fB\-Lxx\fR also shows all components and devices. Note that since components
+can go in many levels, each level per primary component is indicated by either
+another 'c', or ends with a 'p' device, the physical device. The number of c's
+or p's indicates the depth, so you can see which component belongs to which.
-Because \fBdmidecode\fR data is extremely unreliable, inxi will try to make best guesses.
-If you see \fB(check)\fR after the capacity number, you should check it with the
-specifications. \fB(est)\fR is slightly more reliable, but you should still check
-the real specifications before buying RAM. Unfortunately there is nothing \fBinxi\fR
-can do to get truly reliable data about the system RAM; maybe one day the kernel devs
-will put this data into \fB/sys\fR, and make it real data, taken from the actual system,
-not dmi data. For most people, the data will be right, but a significant percentage of
-users will have either a wrong max module size, if present, or max capacity.
+\fB\-L\fR shows only the top level components/devices (like \fB\-R\fR).
+\fB\-La\fR shows component/device size, maj:min ID, mapped name (if applicable),
+and puts each component/device on its own line.
-See \fB\-\-memory\-modules\fR and \fB\-\-memory\-short\fR if you want a shorter report.
+Sample:
+
+.nf
+\fB Device\-10: mybackup type: LUKS dm: dm\-28 size: 6.36 GiB Components:
+ c\-1: md1 cc\-1: dm\-26 ppp\-1: sdj2 cc\-2: dm\-27 ppp\-1: sdk2\fR
+ \fBLV\-5: lvm_raid1 type: raid1 dm: dm\-16 size: 4.88 GiB
+ RAID: stripes: 2 sync: idle copied: 100% mismatches: 0
+ Components: c\-1: dm\-10 pp\-1: sdd1 c\-2: dm\-11 pp\-1: sdd1 c\-3: dm\-13
+ pp\-1: sde1 c\-4: dm\-15 pp\-1: sde1\fR
+.fi
+
+It is easier to follow the flow of components and devices using \fB\-y1\fR. In
+this example, there is one primary component (c\-1), md1, which is made up of
+two components (cc\-1,2), dm\-26 and dm\-27. These are respectively made from
+physical devices (p\-1) sdj2 and sdk2.
+
+.nf
+\fBDevice\-10: mybackup
+ maj\-min: 254:28
+ type: LUKS
+ dm: dm\-28
+ size: 6.36 GiB
+ Components:
+ c\-1: md1
+ maj\-min: 9:1
+ size: 6.37 GiB
+ cc\-1: dm\-26
+ maj\-min: 254:26
+ mapped: vg5\-level1a
+ size: 12.28 GiB
+ ppp\-1: sdj2
+ maj\-min: 8:146
+ size: 12.79 GiB
+ cc\-2: dm\-27
+ maj\-min: 254:27
+ mapped: vg5\-level1b
+ size: 6.38 GiB
+ ppp\-1: sdk2
+ maj\-min: 8:162
+ size: 12.79 GiB\fR
+.fi
+
+Other types of logical block handling like LUKS, bcache show as:
+
+\fBDevice\-[xx] [name/id] type: [LUKS|Crypto|bcache]:\fR
.TP
-.B \-\-memory\-modules\fR
+.B \-m \fR, \fB\-\-memory\fR
+Memory (RAM) data. Does not display with \fB\-b\fR or \fB\-F\fR unless you use
+\fB\-m\fR explicitly. Ordered by system board physical system memory array(s)
+(\fBArray\-[number]\fR), and individual memory devices (\fBDevice\-[number]\fR).
+Physical memory array data shows array capacity, number of devices supported,
+and Error Correction information. Devices shows locator data (highly variable in
+syntax), type (eg: \fBtype: DDR3\fR)size, speed.
+
+Note: \fBinxi \-m\fR uses either \fBdboot\fR (BSDs), \fBdmidecode\fR, or
+\fBudevadm\fR (Linux) to collect the RAM data. Not all boards have DMI RAM data
+available.
+
+\fBdmidecode\fR must be run as root (or start \fBinxi\fR with \fBdoas/sudo\fR),
+unless you figure out how to set up doas/sudo to permit dmidecode to read
+\fB/dev/mem\fR as user.
+
+\fBudevadm\fR can be run by non\-superuser, or if dmidecode is not installed
+(Linux only). It has a slightly less reliable dmi table outut, and does not seem
+to support more than 1 board memory array, but is pretty good. Voltages may be
+wrong however.
+
+Both \fBdmidecode\fR and \fBudevadm\fR need a DMI table with RAM data to create
+the report. Most SBC/SOC boards don't have dmi based RAM data. But most other
+machines do.
+
+\fBspeed\fR and \fBbus\-width\fR will not show if \fBno module installed\fR is
+found in \fBsize\fR.
+
+Note: If \fB\-m\fR is triggered RAM available/used report will appear in this
+section, not in \fB\-I\fR or \fB\-tm\fR items.
+
+Because \fBdmi\fR source data is somewhat unreliable, inxi will try to make
+best guesses. If you see \fB(check)\fR after the capacity number, you should
+check it with the specifications. \fB(est)\fR is slightly more reliable, but
+you should still check the real specifications before buying RAM. Unfortunately
+there is nothing \fBinxi\fR can do to get truly reliable data about the system
+RAM; maybe one day the kernel devs will put this data into \fB/sys\fR, and make
+it real data, taken from the actual system, not dmi data. For most people, the
+data will be right, but a significant percentage of users will have either a
+wrong max module size, if available, or max capacity.
+
+Under dmidecode/udevadm, \fBspeed:\fR is the expected speed of the memory
+(\fBspec:\fR, what is advertised on the memory spec sheet) and \fBactual:\fR,
+what the actual speed is now. To handle this, if speed and configured speed
+values are different, you will see this instead:
+
+\fBspeed: spec: [specified speed] MT/s actual: [actual] MT/s\fR
+
+Also, if DDR, and speed in MHz, will change to: \fBspeed: [speed] MT/s
+([speed] MHz)\fR
+
+If the detected speed is logically absurd, like 1 MT/s or 69910 MT/s, adds:
+\fBnote: check\fR. Sample:
+
+.nf
+\fBMemory:
+ System RAM: total: 32 GiB note: est. available: 31.38 GiB
+ used: 20.65 GiB (65.8%)
+ Array\-1: capacity: N/A slots: 4 note: check EC: N/A
+ Device\-1: DIMM_A1 type: DDR3 size: 8 GiB speed: 1600 MT/s (800 MHz)
+ Device\-2: DIMM_A2 type: DDR3 size: 8 GiB speed: spec: 1600 MT/s (800 MHz)
+ actual: 61910 MT/s (30955 MHz) note: check
+ Device\-3: DIMM_B1 type: DDR3 size: 8 GiB speed: 1600 MT/s (800 MHz)
+ Device\-4: DIMM_B2 type: DDR3 size: 8 GiB speed: spec: 1600 MT/s (800 MHz)
+ actual: 2 MT/s (1 MHz) note: check\fR
+.fi
+
+See \fB\-\-memory\-modules\fR and \fB\-\-memory\-short\fR if you want a
+shorter report.
+
+Notes on \fBSystem RAM:\fR / \fBMemory:\fR report item:
+
+* \fBtotal:\fR and \fBigpu:\fR do not show for short form.
+
+* The \fBtotal:\fR can come from several possible sources:
+
+\- If not superuser, and if \fI/sys/devices/system/memory\fR exists, it will
+estimate the total RAM based on how many RAM blocks and their size. Sometimes
+the block count is not an exact match to installed RAM, and inxi will attempt to
+guess the actual RAM amount, except for virtual machines. When it synthesizes
+the actual physical RAM total, it will show \fBnote: est.\fR.
+
+Note that not all kernels are compiled to support generating this /sys
+directory (kernel needs to be compiled with \fBCONFIG_MEMORY_HOTPLUG\fR).
+
+\- For OpenBSD and not superuser, the total comes from the detected RAM in
+dboot, if available.
+
+\- If superuser, and if \fB\-m\fR used, it comes from the dmidecode RAM totals
+if available, and if not, it comes from counting up the System RAM ranges in
+\fI/proc/iomem\fR (Linux only), then rounding up, since that total is usually
+slightly under the actual physical RAM total. If inxi is unsure about the total,
+it will show \fBnote: est.\fB.
+
+If no total data found, shows \fBtotal: N/A\fB.
+
+* The \fBavailable:\fR item is the total installed RAM minus some reserved and
+kernel code RAM (and in some cases iGPU assigned main system RAM) that is
+allocated on system boot, and thus is generally less than the actual physical
+RAM installed. This is called MemTotal in free/meminfo even though it isn't,
+though it is the total available the kernel has to work with.
+
+* The \fBused:\fR is the percent of the available RAM used, NOT of the total
+physical RAM.
+
+* The \fBigpu:\fR item either comes from Raspberry Pi gpu RAM, or from
+\fI/proc/iomem\fR. The latter source is Linux + superuser only, and is not
+guaranteed to be accurate, but sometimes is. That is for iGPU system RAM used,
+not for standalone GPUs with their own internal RAM. Not all types of internal
+VRAM are detectable, it depends on how the hardware assigns RAM to iGPU.
+
+Raspberry Pi uses \fBvcgencmd get_mem gpu\fR to get gpu RAM amount, if
+user is in video group and \fBvcgencmd\fR is installed.
+
+.TP
+.B \-\-memory\-modules\fR, \fB\-\-mm\fR
Memory (RAM) data. Show only RAM arrays and modules in Memory report.
Skip empty slots. See \fB\-m\fR.
.TP
-.B \-\-memory\-short\fR
+.B \-\-memory\-short\fR, \fB\-\-ms\fR
Memory (RAM) data. Show a one line RAM report in Memory. See \fB\-m\fR.
Sample: \fBReport: arrays: 1 slots: 4 modules: 2 type: DDR4\fR
.TP
-.B \-M\fR,\fB \-\-machine\fR
-Show machine data. Device, Motherboard, BIOS, and if present, System Builder (Like Lenovo).
-Older systems/kernels without the required \fB/sys\fR data can use \fBdmidecode\fR instead, run
-as root. If using \fBdmidecode\fR, may also show BIOS/UEFI revision as well as version.
-\fB\-\-dmidecode\fR forces use of \fBdmidecode\fR data instead of \fB/sys\fR.
-Will also attempt to show if the system was booted by BIOS, UEFI, or UEFI [Legacy], the
-latter being legacy BIOS boot mode in a system board using UEFI.
+.B \-M \fR, \fB\-\-machine\fR
+Show machine data. Device, Motherboard, BIOS, and if present, System Builder
+(Like Lenovo). Older systems/kernels without the required \fB/sys\fR data can
+use \fBdmidecode\fR instead, run as root. If using \fBdmidecode\fR, may also
+show BIOS/UEFI revision as well as version. \fB\-\-dmidecode\fR forces use of
+\fBdmidecode\fR data instead of \fB/sys\fR. Will also attempt to show if the
+system was booted by BIOS, UEFI, or UEFI [Legacy], the latter being legacy
+BIOS boot mode in a system board using UEFI.
-Device information requires either \fB/sys\fR or \fBdmidecode\fR. Note that 'other\-vm?'
-is a type that means it's usually a VM, but inxi failed to detect which type, or
-positively confirm which VM it is. Primary VM identification is via systemd\-detect\-virt
-but fallback tests that should also support some BSDs are used. Less commonly
-used or harder to detect VMs may not be correctly detected. If you get an incorrect output,
-post an issue and we'll get it fixed if possible.
+Device information requires either \fB/sys\fR or \fBdmidecode\fR. Note that
+\fBother\-vm?\fR is a type that means it's usually a VM, but inxi failed to
+detect which type, or positively confirm which VM it is. Primary VM
+identification is via systemd\-detect\-virt but fallback tests that should also
+support some BSDs are used. Less commonly used or harder to detect VMs may not
+be correctly detected. If you get an incorrect output, post an issue and we'll
+get it fixed if possible.
-Due to unreliable vendor data, device type will show: desktop, laptop, notebook, server,
-blade, plus some obscure stuff that inxi is unlikely to ever run on.
+Due to unreliable vendor data, device type will show: desktop, laptop,
+notebook, server, blade, plus some obscure stuff that inxi is unlikely to
+ever run on.
.TP
-.B \-n\fR,\fB \-\-network\-advanced\fR
-Show Advanced Network card information in addition to that produced by \fB\-N\fR.
-Shows interface, speed, MAC ID, state, etc.
+.B \-n \fR, \fB\-\-network\-advanced\fR
+Show Advanced Network device information in addition to that produced by
+\fB\-N\fR. Shows interface, speed, MAC ID, state, etc.
.TP
-.B \-N\fR,\fB \-\-network\fR
-Show Network card(s) information, including card driver. With \fB\-x\fR, shows PCI BusID,
-Port number.
-
+.B \-N \fR, \fB\-\-network\fR
+Show Network device(s) information, including device driver. With \fB\-x\fR,
+shows Bus ID, Port number.
+
.TP
-.B \-o\fR,\fB \-\-unmounted\fR
+.B \-o \fR, \fB\-\-unmounted\fR
Show unmounted partition information (includes UUID and LABEL if available).
-Shows file system type if you have \fBlsblk\fR installed (Linux only). For BSD/GNU Linux:
-shows file system type if \fBfile\fR is installed, and if you are root or
-if you have added to \fB/etc/sudoers\fR (sudo v. 1.7 or newer):
+Shows file system type if you have \fBlsblk\fR installed (Linux only). For
+BSD/GNU Linux: shows file system type if \fBfile\fR is installed, and if you
+are root or if you have added to \fB/etc/sudoers\fR (sudo v. 1.7 or newer):
.B <username> ALL = NOPASSWD: /usr/bin/file (sample)
-Does not show components (partitions that create the md\-raid array) of md\-raid arrays.
+doas users: see \fBman doas.conf\fR for setup.
+
+Does not show components (partitions that create the md\-raid array) of
+md\-raid arrays.
+
+To show partition labels or UUIDs (when available and relevant), use with
+\fB\-l\fR or\fB \-u\fR.
.TP
-.B \-p\fR,\fB \-\-partitions\-full\fR
-Show full Partition information (\fB\-P\fR plus all other detected mounted partitions).
+.B \-p \fR, \fB\-\-partitions\-full\fR
+Show full Partition information (\fB\-P\fR plus all other detected mounted
+partitions).
+
+To show partition labels or UUIDs (when available and relevant), use with
+\fB\-l\fR or\fB \-u\fR.
.TP
-.B \-P\fR,\fB \-\-partitions\fR
+.B \-\-partitions\-sort\fR, \fB\-\-ps\fR \
+[dev\-base|fs|id|label|percent\-used|size|uuid|used]\fR
+Change default sort order of partition output. Corresponds to
+\fBPARTITION_SORT\fR configuration item. These are the available sort options:
+
+\fBdev\-base\fR - \fB/dev\fR partition identifier, like \fB/dev/sda1\fR.
+Note that it's an alphabetic sort, so \fBsda12\fR is before \fBsda2\fR.
+
+\fBfs\fR \- Partition filesystem. Note that sorts will be somewhat random if
+all filesystems are the same.
+
+\fBid\fR \- Mount point of partition (default).
+
+\fBlabel\fR \- Label of partition. If partitions have no labels,
+sort will be random.
+
+\fBpercent\-used\fR - Percentage of partition size used.
+
+\fBsize\fR \- KiB size of partition.
+
+\fBuuid\fR \- UUID of the partition.
+
+\fBused\fR \- KiB used of partition.
+
+.TP
+.B \-P \fR, \fB\-\-partitions\fR
Show basic Partition information.
-Shows, if detected: \fB/ /boot /home /opt /tmp /usr /usr/home /var /var/tmp /var/log\fR.
-If \fB\-\-swap\fR is not used, shows active swap partitions (never shows file or
-zram type swap).
-Use \fB\-p\fR to see all mounted partitions.
+Shows, if detected: \fB/ /boot /boot/efi /home /opt /tmp /usr /usr/home /var
+/var/tmp /var/log\fR (for android, shows \fB/cache /data /firmware /system\fR).
+If \fB\-\-swap\fR is not used, shows active swap partitions (never shows file
+or zram type swap). Use \fB\-p\fR to see all mounted partitions.
+
+To show partition labels or UUIDs (when available and relevant), use with
+\fB\-l\fR or\fB \-u\fR.
.TP
-.B \-\-processes\fR \- See \fB\-t\fR
+.B \-\-processes\fR
+.br
+See \fB\-t\fR.
.TP
-.B \-r\fR,\fB \-\-repos\fR
+.B \-r \fR, \fB\-\-repos\fR
Show distro repository data. Currently supported repo types:
\fBAPK\fR (Alpine Linux + derived versions)
-\fBAPT\fR (Debian, Ubuntu + derived versions, as well as RPM based
-APT distros like PCLinuxOS or Alt\-Linux)
+\fBAPT\fR (Debian, Ubuntu + derived versions, as well as rpm based
+apt distros like PCLinuxOS or Alt\-Linux)
\fBCARDS\fR (NuTyX + derived versions)
\fBEOPKG\fR (Solus)
+\fBNETPKG\fR (Zenwalk/Slackware)
+
+\fBNIX\fR (NixOS + other distros as alternate package manager)
+
\fBPACMAN\fR (Arch Linux, KaOS + derived versions)
\fBPACMAN\-G2\fR (Frugalware + derived versions)
\fBPISI\fR (Pardus + derived versions)
+\fBPKG\fR (OpenBSD, FreeBSD, NetBSD + derived OS types)
+
\fBPORTAGE\fR (Gentoo, Sabayon + derived versions)
\fBPORTS\fR (OpenBSD, FreeBSD, NetBSD + derived OS types)
+\fBSBOPKG\fR (Slackware + derived versions)
+
+\fBSBOUI\fR (Slackware + derived versions)
+
+\fBSCRATCHPKG\fR (Venom + derived versions)
+
\fBSLACKPKG\fR (Slackware + derived versions)
+\fBSLAPT_GET\fR (Slackware + derived versions)
+
+\fBSLPKG\fR (Slackware + derived versions)
+
\fBTCE\fR (TinyCore)
+\fBTAZPKG\fR (Slitaz)
+
\fBURPMI\fR (Mandriva, Mageia + derived versions)
\fBXBPS\fR (Void)
@@ -413,18 +780,23 @@ APT distros like PCLinuxOS or Alt\-Linux)
More will be added as distro data is collected. If yours is missing please
show us how to get this information and we'll try to add it.
-See \fB\-rx\fR, \fB\-rxx\fR, and \fB\-ra\fR for installed package count information.
+See \fB\-rx\fR, \fB\-rxx\fR, and \fB\-ra\fR for installed package count
+information.
.TP
-.B \-R\fR,\fB \-\-raid\fR
-Show RAID data. Shows RAID devices, states, levels and components, and
-extra data with \fB\-x\fR / \fB\-xx\fR.
+.B \-R \fR, \fB\-\-raid\fR
+Show RAID data. Shows RAID devices, states, levels, device/array size,
+and components. See extra data with \fB\-x\fR / \fB\-xx\fR.
md\-raid: If device is resyncing, also shows resync progress line.
-Note: Only md\-raid and ZFS are currently supported. Other software RAID types could
-be added, but only if users supply all data required, and if the software
-RAID actually can be made to give the required output.
+Note: supported types: lvm raid, md\-raid, softraid, ZFS, and hardware RAID.
+Other software RAID types may be added, if the software RAID can be made to
+give the required output.
+
+The component ID numbers work like this: mdraid: the numerator is the actual
+mdraid component number; lvm/softraid/ZFS: the numerator is auto\-incremented
+counter only. Eg. \fBOnline: 1: sdb1\fR
If hardware RAID is detected, shows basic information. Due to complexity
of adding hardware RAID device disk / RAID reports, those will only be added
@@ -436,33 +808,44 @@ Checks inxi application dependencies and recommends, as well as directories,
then shows what package(s) you need to install to add support for each feature.
.TP
-.B \-s\fR,\fB \-\-sensors\fR
-Show output from sensors if sensors installed/configured: Motherboard/CPU/GPU
-temperatures; detected fan speeds. GPU temperature when available. Nvidia shows
-screen number for multiple screens. IPMI sensors are also used (root required)
-if present.
+.B \-s \fR, \fB\-\-sensors\fR
+Show output from sensors if sensors installed/configured: Motherboard/CPU/GPU
+temperatures; detected fan speeds. GPU temperature when available. Nvidia shows
+screen number for multiple screens. IPMI sensors are also used (root required)
+if present.
+
+See Advanced options \fB\-\-sensors\-use\fR or \fB\-\-sensors\-exclude\fR if you
+want to use only a subset of all sensors, or exclude one (currently only for
+\fBlm\-sensors\fR and \fB/sys\fR sourced data).
+
+For current Linux, will fallback gracefully to using \fB/sys/class/hwmon\fR as
+sensor data source if \fBlm\-sensors\fR is not installed. You can compare the
+two by using \fB\-\-force sensors\-sys\fR option with \fB\-s\fR.
.
.TP
.B \-\-slots\fR
Show PCI slots with type, speed, and status information.
.TP
-.B \-\-swap\fR \- See \fB\-j\fR
+.B \-\-swap\fR
+.br
+See \fB\-j\fR
.TP
-.B \-S\fR,\fB \-\-system\fR
+.B \-S \fR, \fB\-\-system\fR
Show System information: host name, kernel, desktop environment (if in X),
distro. With \fB\-xx\fR show dm \- or startx \- (only shows if present and
running if out of X), and if in X, with \fB\-xxx\fR show more desktop info,
e.g. taskbar or panel.
.TP
-.B \-t\fR,\fB \-\-processes\fR
-[\fBc\fR|\fBm\fR|\fBcm\fR|\fBmc NUMBER\fR] Show processes. If no arguments, defaults to \fBcm\fR.
-If followed by a number, shows that number of processes for each type
-(default: \fB5\fR; if in IRC, max: \fB5\fR)
+.B \-t \fR, \fB\-\-processes\fR
+[\fBc\fR|\fBm\fR|\fBcm\fR|\fBmc NUMBER\fR] Show processes. If no arguments,
+defaults to \fBcm\fR. If followed by a number, shows that number of processes
+for each type (default: \fB5\fR; if in IRC, max: \fB5\fR)
-Make sure that there is no space between letters and numbers (e.g. write as \fB\-t cm10\fR).
+Make sure that there is no space between letters and numbers (e.g. write as
+\fB\-t cm10\fR).
.TP
.B \-t c\fR
@@ -471,8 +854,10 @@ Make sure that there is no space between letters and numbers (e.g. write as \fB\
.TP
.B \-t m\fR
\- memory only. With \fB\-x\fR, also shows CPU for that process on same line.
-If the \-I line is not triggered, will also show the system RAM used/total
-information.
+If the \fB\-I\fR or \fB\-m\fR lines are not triggered, will also show the
+system RAM used/total information.
+
+See \fB\-m\fR for explanation of \fBSystem RAM:\fR fields and values.
.TP
.B \-t cm\fR
@@ -480,33 +865,55 @@ information.
same line.
.TP
-.B \-u\fR,\fB \-\-uuid\fR
-Show partition UUIDs. Default: main partitions \fB\-P\fR. For full \fB\-p\fR
-output, use: \fB\-pu\fR.
+.B \-u \fR, \fB\-\-uuid\fR
+Show UUIDs. Use with \fB\-j\fR, \fB\-M\fR \fB\-o\fR, \fB\-p\fR, and \fB\-P\fR to
+show partition/system board (not common) UUIDs. Requires one of those options.
+
+Sample: \fB\-opju\fR.
.TP
-.B \-U\fR,\fB \-\-update\fR
+.B \-U \fR, \fB\-\-update\fR
Note \- Maintainer may have disabled this function.
If inxi \fB\-h\fR has no listing for \fB\-U\fR then it's disabled.
-Auto\-update script. Note: if you installed as root, you must be root to
-update, otherwise user is fine. Also installs / updates this man page to:
+Auto\-update inxi or pinxi. Note: if you installed as root, you must be root to
+update, otherwise user is fine. Also installs / updates current man page to:
\fB/usr/local/share/man/man1\fR (if \fB/usr/local/share/man/\fR exists
AND there is no inxi man page in \fB/usr/share/man/man1\fR, otherwise it
goes to \fB/usr/share/man/man1\fR). This requires that you be root to write
to that directory. See \fB\-\-man\fR or \fB\-\-no\-man\fR to force or disable
man install.
-.TP
-.B \-\-usb\fR \- See \fB\-J\fR
+\fB\-U\fR accepts the following options (inxi and pinxi):
+
+No arg \- Get from main git branch.
+
+3 \- Get the dev server (smxi.org) version. Be aware that pinxi when taken from
+here can be very unstable during active development! The inxi version is the
+stable master branch version. Also useful to update if you have SSL issues and
+\fB\-\-no\-ssl\fR works.
+
+4 \- Get the dev server (smxi.org) FTP version (same as 3 version). Use if SSL
+issues and \fB\-\-no\-ssl\fR doesn't work. For very old systems with SSL 1, you
+will probably need to use this option, which bypasses HTTP downloading, and uses
+straight FTP to get the file from smxi.org server.
+
+[http|https|ftp] \- Get a version of $self_name from your own server. Use the
+full download path, e.g.
+
+\fB\inxi -U https://myserver.com/inxi\fR
+
+For failed downloads, use the debug option \fB\-\-dbg 1\fR in addition to get
+more verbose failure reports.
.TP
-.B \-V\fR, \fB\-\-version\fR
-inxi version information. Prints information then exits.
+.B \-\-usb\fR
+.br
+See \fB\-J\fR.
.TP
-.B \-v\fR,\fB \-\-verbosity\fR
+.B \-v \fR, \fB\-\-verbosity\fR
Script verbosity levels. If no verbosity level number is given, 0 is assumed.
Should not be used with \fB\-b\fR or \fB\-F\fR.
@@ -518,123 +925,337 @@ Supported levels: \fB0\-8\fR Examples :\fB inxi \-v 4 \fR or \fB inxi \-v4\fR
.TP
.B \-v 1
-\- Basic verbose, \fB\-S\fR + basic CPU (cores, type, clock speed, and min/max
-speeds, if available) + \fB\-G\fR + basic Disk + \fB\-I\fR.
+\- Basic verbose, \fB\-S\fR + basic CPU (cores, type, average clock speed, and
+min/max speeds, if available) + \fB\-G\fR + basic Disk + \fB\-I\fR.
.TP
.B \-v 2
-\- Adds networking card (\fB\-N\fR), Machine (\fB\-M\fR) data, Battery (\fB\-B\fR)
-(if available). Same as: \fBinxi \-b\fR
+\- Adds networking device (\fB\-N\fR), Machine (\fB\-M\fR) data, Battery
+(\fB\-B\fR) (if available). Same as: \fBinxi \-b\fR
.TP
.B \-v 3
-\- Adds advanced CPU (\fB\-C\fR) and network (\fB\-n\fR) data; triggers \fB\-x\fR
-advanced data option.
+\- Adds advanced CPU (\fB\-C\fR) and network (\fB\-n\fR) data; triggers
+\fB\-x\fR advanced data option.
.TP
.B \-v 4
-\- Adds partition size/used data (\fB\-P\fR) for (if present):
-\fB/ /home /var/ /boot\fR. Shows full disk data (\fB\-D\fR)
+\- Adds partition size/used data (\fB\-P\fR) for (if present): \fB/ /home /var/
+/boot\fR. Shows full drive data (\fB\-D\fR)
.TP
.B \-v 5
-\- Adds audio card (\fB\-A\fR), memory/RAM (\fB\-m\fR), sensors (\fB\-s\fR),
-partition label (\fB\-l\fR), UUID (\fB\-u\fR), full swap data (\fB\-j\fR),
-and short form of optical drives.
+\- Adds audio device (\fB\-A\fR), memory/RAM (\fB\-m\fR), bluetooth data
+(\fB\-E\fR) (if present), sensors (\fB\-s\fR), RAID data (if present), partition
+label (\fB\-l\fR), UUID (\fB\-u\fR), full swap data (\fB\-j\fR), and short form
+of optical drives.
.TP
.B \-v 6
-\- Adds full mounted partition data (\fB\-p\fR),
-unmounted partition data (\fB\-o\fR), optical drive data (\fB\-d\fR),
-USB (\fB\-J\fR); triggers \fB\-xx\fR extra data option.
+\- Adds full mounted partition data (\fB\-p\fR), unmounted partition data
+(\fB\-o\fR), optical drive data (\fB\-d\fR), USB (\fB\-J\fR); triggers
+\fB\-xx\fR extra data option.
.TP
.B \-v 7
-\- Adds network IP data (\fB\-i\fR); triggers \fB\-xxx\fR
+\- Adds network IP data (\fB\-i\fR), forced bluetooth (\fB\-E\fR), Logical
+(\fB\-L\fR), RAID (\fB\-R\fR), full CPU flags/features (\fB\-f\fR), triggers
+\fB\-xxx\fR
.TP
.B \-v 8
-\- All system data available. Adds Repos (\fB\-r\fR), PCI slots (\fB\-\-slots\fR),
-processes (\fB\-tcm\fR), admin (\fB\-\-admin\fR). Useful for testing output and to
-see what data you can get from your system.
+\- All system data available. Adds advanced EDID data (\fB\-\-edid\fR), Repos
+(\fB\-r\fR), PCI slots (\fB\-\-slots\fR), processes (\fB\-tcm\fR), admin
+(\fB\-\-admin\fR). Useful for testing output and to see what data you can get
+from your system.
.TP
-.B \-w\fR,\fB \-\-weather\fR
-Adds weather line. To get weather for an alternate location, use
-\fB\-W [location]\fR. See also \fB\-x\fR, \fB\-xx\fR, \fB\-xxx\fR options.
-Please note that your distribution's maintainer may chose to disable this feature.
+.B \-\-version\fR, \fB\-\-vf\fR
+inxi full version and license information. Prints information then exits.
-DO NOT USE THIS FEATURE FOR AUTOMATED WEATHER UPDATES! You will be blocked
-from any further access. This feature is not meant for widget type
-weather monitoring, or Conky type use. It is meant to get weather when you need to
-see it, for example, on a remote server.
+.TP
+.B \-\-version\-short\fR, \fB\-\-vs\fR
+inxi single line version information. Prints information if not short form
+(which shows version info already). Does not exit unless used without any other
+options. Can be used with normal line options, and prints version info line as
+first line of output.
.TP
-.B \-W\fR, \fB\-\-weather\-location <location_string>\fR
-Get weather/time for an alternate location. Accepts postal/zip code[, country],
-city,state pair, or latitude,longitude. Note: city/country/state names must not
-contain spaces. Replace spaces with '\fB+\fR' sign. Don't place spaces around
-any commas. Postal code is not reliable except for North America and maybe the UK.
-Try postal codes with and without country code added. Note that City,State applies
-only to USA, otherwise it's City,Country. If country name (english) does not work,
-try 2 character country code (e.g. Spain: es; Great Britain: gb).
+.B \-w \fR, \fB\-\-weather [location]\fR
+DO NOT USE THIS FEATURE FOR AUTOMATED WEATHER UPDATES! Automated or excessive
+use will lead to your being blocked from any further access. This feature is not
+meant for widget type weather monitoring, or Conky type use. It is meant to get
+weather when you need to see it, for example, on a remote server. If you did not
+type the weather option in manually, it's an automated request.
-See \fIhttps://en.wikipedia.org/wiki/ISO_3166\-1_alpha\-2\fR for current 2 letter
-country codes.
+Adds weather line for your current location (by IP address) if no location
+requested. To get weather for an alternate location, add \fB[location]\fR. See
+also \fB\-x\fR, \fB\-xx\fR, \fB\-xxx\fR options. Please note that your
+distribution's maintainer may chose to disable this feature.
+
+With optional \fB[location]\fR \- get weather/time for an alternate location.
+Accepts postal/zip code[, country], city,state pair, or latitude,longitude.
+Note: city/country/state names must not contain spaces. Replace spaces with
+the '\fB+\fR' sign. Don't place spaces around any commas. Postal code is not
+reliable except for North America and maybe the UK. Try postal codes with and
+without country code added. Note that City,State applies only to USA, otherwise
+it's City,Country. If country name (english) does not work, try 2 character
+country code (e.g. Spain: es; Great Britain: gb).
+
+See \fIhttps://en.wikipedia.org/wiki/ISO_3166\-1_alpha\-2\fR for current 2
+letter country codes.
Use only ASCII letters in city/state/country names.
-Examples: \fB\-W 95623,us\fR OR \fB\-W Boston,MA\fR OR
-\fB\-W 45.5234,\-122.6762\fR OR \fB\-W new+york,ny\fR OR \fB\-W bodo,norway\fR.
+Examples: \fB\-w\fR OR \fB\-w 95623,us\fR OR \fB\-w Boston,MA\fR OR
+\fB\-w 45.5234,\-122.6762\fR OR \fB\-w new+york,ny\fR OR \fB\-w bodo,norway\fR.
+
+.TP
+.B \-\-weather\-source\fR, \fB\-\-ws [source-id]\fR
+[\fB1\-9\fR] Switches weather data source. Possible values are \fB1\-9\fR.
+\fB1\-4\fR will generally be active, and \fB5\-9\fR may or may not be active,
+so check. \fB1\fR may not support city / country names with spaces (even if
+you use the \fB+\fR sign instead of space). \fB2\fR offers pretty good data,
+but may not have all small city names for \fB\-w location\fR.
-DO NOT USE THIS FEATURE FOR AUTOMATED WEATHER UPDATES! Use of automated queries,
-will result in your access being blocked. If you try to work around the ban, you
-will be permanently banned from this service.
+Please note that the data sources are not static per value, and can change any
+time, or be removed, so always test to verify which source is being used for
+each value if that is important to you. Data sources may be added or removed
+on occasions, so try each one and see which you prefer. If you get unsupported
+source message, it means that number has not been implemented.
.TP
-.B \-\-weather\-source\fR, \fB\-\-ws <unit>\fR
-[\fB1\-9\fR] Switches weather data source. Possible values are \fB1\-9\fR. \fB1\-4\fR
-will generally be active, and \fB5\-9\fR may or may not be active, so check.
-\fB1\fR may not support city / country names with spaces (even if you use the \fB+\fR
-sign instead of space). \fB2\fR offers pretty good data, but may not have all small
-city names for \fB\-W\fR.
+.B \-\-weather\-unit\fR, \fB\-\-wu [unit]\fR
+[\fBm\fR|\fBi\fR|\fBmi\fR|\fBim\fR] Sets weather units to metric (\fBm\fR),
+imperial (\fBi\fR), metric (imperial) (\fBmi\fR, default), imperial (metric)
+(\fBim\fR). If metric or imperial not found,sets to default value, or \fBN/A\fR.
-Please note that the data sources are not static per value, and can change any time,
-or be removed, so always test to verify which source is being used for each value
-if that is important to you. Data sources may be added or removed on occasions, so
-try each one and see which you prefer. If you get unsupported source message, it means
-that number has not been implemented.
+.SH FILTER OPTIONS
+The following options allow for applying various types of filtering to the
+output.
.TP
-.B \-\-weather\-unit <unit>\fR
-[\fBm\fR|\fBi\fR|\fBmi\fR|\fBim\fR] Sets weather units to metric (\fBm\fR), imperial (\fBi\fR),
-metric (imperial) (\fBmi\fR, default), imperial (metric) (\fBim\fR). If metric or imperial
-not found,sets to default value, or \fBN/A\fR.
+.B \-\-filter \fR, \fB\-\-filter\-override\fR
+.br
+See \fB\-z\fR, \fB\-Z\fR.
.TP
-.B \-y\fR,\fB \-\-width [integer]\fR
-This is an absolute width override which sets the output line width max.
-Overrides \fBCOLS_MAX_IRC\fR / \fBCOLS_MAX_CONSOLE\fR globals, or the
-actual widths of the terminal. \fB80\fR is the minimum width supported.
-\fB\-1\fR removes width limits. 1 switches to a single indented key/value
-pair per line, and removes all long line wrapping (similar to
-\fBdmidecode\fR output).
+.B \-\-filter\-label\fR, \fB\-\-filter\-uuid\fR, \fB\-\-filter\-vulnerabilities\fR
+.br
+See \fB\-\-zl\fR, \fB\-\-zu\fR, \fB\-\-zv\fR.
-If no integer value is given, sets width to default of 80.
+.TP
+.B \-\-host\fR
+Turns on hostname in System line. Overrides inxi config file value (if set):
-Examples: \fBinxi \-Fxx\ \-y 130\fR or \fBinxi \-Fxxy\fR or \fBinxi \-bay1\fR
+\fBSHOW_HOST='false'\fR \- Same as: \fBSHOW_HOST='true'\fR
+
+This is an absolute override, the host will always show no matter what
+other switches you use.
.TP
-.B \-z\fR,\fB \-\-filter\fR
-Adds security filters for IP addresses, serial numbers, MAC,
-location (\fB\-w\fR), and user home directory name. Removes Host:.
-On by default for IRC clients.
+.B \-\-no\-host\fR
+Turns off hostname in System line. This is default when using \fB\-z\fR,
+for anonymizing inxi output for posting on forums or IRC. Overrides
+configuration value (if set):
+
+\fBSHOW_HOST='true'\fR \- Same as: \fBSHOW_HOST='false'\fR
+
+This is an absolute override, the host will not show no matter what other
+switches you use.
+
+.TP
+.B \-z\fR, \fB\-\-filter\fR
+Adds security filters for IP addresses, serial numbers, MAC, location
+(\fB\-w\fR), and user home directory name. Removes Host:. On by default for IRC
+clients.
+
+.TP
+.B \-\-za\fR, \fB\-\-filter\-all\fR
+Shortcut to trigger \fB\-z\fR, \fB\-\-zl\fR, \fB\-\-zu\fR, \fB\-\-zv\fR. All the
+filters, that is.
.TP
-.B \-Z\fR,\fB \-\-filter\-override\fR
+.B \-\-zl\fR, \fB\-\-filter\-label\fR
+Filter partition label names from \fB\-j\fR, \fB\-o\fR, \fB\-p\fR, \fB\-P\fR,
+and \fB\-Sa\fR (root=LABEL=...). Generally only useful in very specialized
+cases.
+
+.TP
+.B \-\-zu\fR, \fB\-\-filter\-uuid\fR
+Filter partition UUIDs from \fB\-j\fR, \fB\-o\fR, \fB\-p\fR, \fB\-P\fR,
+\fB\-Sa\fR (root=UUID=...), \fB\-Mxxx\fR board UUID. Useful in specialized
+cases.
+
+.TP
+.B \-\-zv\fR, \fB\-\-filter\-v\fR, \fB\-\-filter\-vulnerabilities\fR
+Filter Vulnerabilities report from \fB\-Ca\fR. Generally only useful in very
+specialized cases.
+
+.TP
+.B \-Z \fR, \fB\-\-filter\-override \fR, \fB\-\-no\-filter\fR
Absolute override for output filters. Useful for debugging networking
issues in IRC for example.
+.SH OUTPUT CONTROL OPTIONS
+The following options allow for modifying the output in various ways.
+
+.TP
+.B \-c \fR, \fB\-\-color\fR \fR[\fB0\fR\-\fB42\fR]
+Set color scheme. If no scheme number is supplied, 0 is assumed.
+
+.TP
+.B \-c \fR [\fB94\fR\-\fB99\fR]
+These color selectors run a color selector option prior to inxi starting
+which lets you set the config file value for the selection.
+
+NOTE: All configuration file set color values are removed when output is
+piped or redirected. You must use the explicit runtime \fB\-c [color number]\fR
+option if you want color codes to be present in the piped/redirected output.
+
+Color selectors for each type display (NOTE: IRC and global only show safe
+color set):
+
+.TP
+.B \-c 94\fR
+\- Console, out of X.
+
+.TP
+.B \-c 95\fR
+\- Terminal, running in X \- like xTerm.
+
+.TP
+.B \-c 96\fR
+\- GUI IRC, running in X \- like XChat, Quassel,
+Konversation etc.
+
+.TP
+.B \-c 97\fR
+\- Console IRC running in X \- like irssi in xTerm.
+
+.TP
+.B \-c 98\fR
+\- Console IRC not in X.
+
+.TP
+.B \-c 99\fR
+\- Global \- Overrides/removes all settings.
+
+Setting a specific color type removes the global color selection.
+
+.TP
+.B \-\-export [json|screen|xml]\fR
+.br
+See \fB\-\-output\fR.
+
+.TP
+.B \-\-indent [11\-xx]\fR
+Change primary wide indent width. Generally useless. Only applied if output
+width is greater than max wrap width (see \fB\-\-max\-wrap\fR). Use
+configuration item \fBINDENT\fR to make permanent.
+
+.TP
+.B \-\-indents [0\-10]\fR
+Change primary wrap mode, second, and \fB\-y1\fR level indents. First indent
+level only applied if output width is less than max wrap width (see
+\fB\-\-max\-wrap\fR). 0 disables all wrapped indents and all second level
+indents. Use configuration item \fBINDENTS\fR to make permanent.
+
+.TP
+.B \-\-max\-wrap\fR, \fB\-\-wrap\-max [integer]\fR
+Overrides default or configuration set line starter wrap width value. Wrap max
+is the maximum width that inxi will wrap line starters (e.g. \fBInfo:\fR) to
+their own lines, with data lines indented default 2 columns (use
+\fB\-\-indents\fR to change).
+
+If terminal/console width or \fB\-\-width\fR is less than wrap width, wrapping
+of line starter occurs. If \fB80\fR or less, no wrapping will occur. Overrides
+internal default value (110) and user configuration value \fBMAX_WRAP\fR.
+
+.TP
+.B \-\-output\fR, \fB \-\-export [json|screen|xml]\fR
+Change data output type. Requires \-\-output\-file if not \fBscreen\fR.
+
+See this page \fIhttps://smxi.org/docs/inxi-json-xml-output.htm\fR BEFORE you
+post an issue about not understanding, or being unable to use, the output
+format! That gives a fairly complete explanation of what the output means, and
+how to work with it. It is not a tutorial, and it will not teach you to program,
+if you don't know how to work with json/xml structures using a proper language,
+then this feature is not meant for you.
+
+.TP
+.B \-\-output\-file, \fB \-\-export\-file [full path to output file|print]\fR
+The given directory path must exist. The directory path given must exist,
+The \fBprint\fR options prints to stdout.
+Required for non\-screen \fB\-\-output\fR formats (json|xml).
+
+.TP
+.B \-\-separator\fR, \fB\-\-sep [character(s)]\fR
+Change the default output key: value separator \fB:\fR to something else. Make
+permanent with configuration item \fBSEP2_CONSOLE\fR.
+
+.TP
+.B \-\-wrap\-max [integer]\fR
+.br
+See \fB\-\-max-wrap\fR.
+
+.TP
+.B \-y\fR, \fB\-\-width [integer]\fR
+This is an absolute width override which sets the output line width max.
+Overrides \fBCOLS_MAX_IRC\fR, \fBCOLS_MAX_NO_DISPLAY\fR, \fBCOLS_MAX_CONSOLE\fR
+configuration items, or the actual widths of the terminal.
+
+* \fB\-y\fR \- sets default width of 80 columns.
+.br
+* \fB\-y [60-xxx]\fR \- sets width to given number. Must be 60 or more.
+.br
+* \fB\-y 1\fR \- switches to a single indented key/value pair per line, and
+removes all long line wrapping (similar to \fBdmidecode\fR output). Not
+recommended for use with \fB\-Y\fR;
+.br
+* \fB\-y \-1\fR \- removes width limits (if assigned by configuration items).
+
+Examples:
+.br
+\fBinxi \-Fxx \-y 130\fR
+.br
+\fBinxi \-Fxxy\fR
+.br
+\fBinxi \-bay1\fR
+
+.TP
+.B \-Y\fR, \fB\-\-height\fR, \fB\-\-less [\-3\-[integer]\fR
+Control output height. Useful when in console, and scrollback not available.
+Breaks output flow based on values provided.
+
+* \fB\-Y 0\fR or \fB\-Y\fR \- Set default max height to terminal height.
+.br
+* \fB\-Y [1\-xxx]\fR \- set max output block height height in lines.
+.br
+* \fB\-Y \-1\fR \- Print out one primary data item block (like \fBCPU:\fR,
+\fBSystem:\fR) at a time. Useful for very long outputs like \fB\-Fa\fR,
+\fB\-v8\fR, etc. Not available for \fB\-h\fR.
+.br
+* \fB\-Y \-2\fR \- Do not disable output colors when redirected or piped to
+another program. Useful if piping output to \fBless \-R\fR for example. This
+does not limit the height otherwise since the expectation it is being piped to
+another program like \fBless\fR which will handle that.
+.br
+* \fB\-Y \-3\fR \- Restore default unlimited output lines if \fBLINES_MAX\fR
+configuration item set.
+
+Recommended to use the following for very clean up and down scrollable output
+out of display, while retaining the color schemes, which are normally removed
+with piping or redirect:
+
+\fBpinxi \-v8Y \-2 | less \-R\fR
+
+Note: since it's not possible for inxi to know how many actual terminal lines
+are being used by terminal wrapped output, with \fB\-y 1\fR , it may be better
+in general to use a fixed height like:
+
+\fB\-y 1 \-Y 20\fR instead of: \fB\-y 1 \-Y\fR
+
.SH EXTRA DATA OPTIONS
These options can be triggered by one or more \fB\-x\fR.
Alternatively, the \fB\-v\fR options trigger them in the following
@@ -646,25 +1267,26 @@ data on various options. They can be added to any long form option list,
e.g.: \fB\-bxx\fR or \fB\-Sxxx\fR
There are 3 extra data levels:
-
+.br
\fB\-x\fR, \fB\-xx\fR, \fB\-xxx\fR
-
+.br
OR
-
+.br
\fB\-\-extra 1\fR, \fB\-\-extra 2\fR, \fB\-\-extra 3\fR
-The following details show which lines / items display extra information for each
-extra data level.
+The following details show which lines / items display extra information for
+each extra data level.
.TP
.B \-x \-A\fR
-\- Adds (if available and/or relevant) \fBvendor:\fR item, which shows
-specific vendor [product] information.
+\- Adds (if available and/or relevant) \fBvendor:\fR item, which shows specific
+vendor [product] information.
-\- Adds version/port(s)/driver version (if available) for each Audio
-device.
+\- Adds version/port(s)/driver version (if available) for each device.
-\- Adds PCI Bus ID/USB ID number of each Audio device.
+\- Adds PCI/USB ID of each device.
+
+\- Adds inactive sound servers/APIs, if detected.
.TP
.B \-x \-B\fR
@@ -673,17 +1295,43 @@ device.
\- Adds attached battery powered peripherals (\fBDevice\-[number]:\fR) if
detected (keyboard, mouse, etc.).
+\- Adds battery \fBvolts:\fR, \fBmin:\fR voltages. Note that if difference is
+critical, that is current voltage is too close to minimum voltage, shows without
+\fB\-x\fR.
+
.TP
.B \-x \-C\fR
-\- Adds bogomips on CPU (if available)
+\- Adds bogomips to CPU speed report (if available).
+
+\- Adds \fBL1:\fR and \fBL3:\fR cache types if either are present/available. For
+BSD or legacy Linux, uses dmidecode + doas/sudo/root. Force use of dmidecode
+cache values by adding \fB\-\-dmidecode\fR. This will override /sys based cache
+data, which tends to be better, so in general don't do that.
+
+\- Adds \fBboost: [enabled|disabled]\fR if detected, aka \fBturbo\fR. Not all
+CPUs have this feature.
\- Adds CPU Flags (short list). Use \fB\-f\fR to see full flag/feature list.
-\- Adds CPU microarchitecture + revision (e.g. Sandy Bridge, K8, ARMv8, P6,
-etc.). Only shows data if detected. Newer microarchitectures will have
-to be added as they appear, and require the CPU family ID and model ID.
+\- Adds CPU microarchitecture + revision (e.g. Sandy Bridge, K8, ARMv8, P6,
+etc.). Only shows data if detected. Newer microarchitectures will have to be
+added as they appear, and require the CPU family ID, model ID, and stepping.
+
+\- Adds, if smt (Simultaneous MultiThreading) is available but disabled, after
+\fBtype:\fR data \fBsmt: disabled\fR. \fBtype: MT\fR means it's enabled. See
+\fB\-Cxxx\fR.
+
+Examples:
+.br
+\fBarch: Sandy Bridge rev: 2\fR
+.br
+\fBarch: K8 rev.F+ rev: 2\fR
-Examples: \fBarch: Sandy Bridge rev: 2\fR, \fBarch: K8 rev.F+ rev: 2\fR
+If unable to non\-ambiguosly determine architecture, will show something like:
+\fBarch: Amber Lake note: check rev: 9\fR
+
+\- Adds CPU highest speed after \fBavg: [speed] high: [speed]\fR if greater than
+1 core and cores have different speeds. Linux only.
.TP
.B \-x \-d\fR
@@ -692,21 +1340,72 @@ dds rev version to optical drive.
.TP
.B \-x \-D\fR
-\- Adds HDD temperature with disk data if you have hddtemp installed, if you are root
+\- Adds drive temperature with disk data.
+
+Method 1: Systems running Linux kernels ~5.6 and newer should have
+\fBdrivetemp\fR module data available. If so, drive temps will come from
+/sys data for each drive, and will not require root or hddtemp. This method
+is MUCH faster than using hddtemp. Note that NVMe drives do not require
+\fBdrivetemp\fR.
+
+If your \fBdrivetemp\fR module is not enabled, enable it:
+
+\fBmodprobe drivetemp\fR
+
+Once enabled, add \fBdrivetemp\fR to \fB/etc/modules\fR or
+\fB/etc/modules\-load.d/***.conf\fR so it starts automatically.
+
+If you see drive temps running as regular user and you did not configure system
+to use doas/sudo hddtemp, then your system supports this feature. If no /sys
+data is found, inxi will try to use hddtemp methods instead for that drive.
+Hint: if temp is /sys sourced, the temp will be to 1 decimal, like 34.8, if
+hddtemp sourced, they will be integers.
+
+Method 2: if you have hddtemp installed, if you are root
or if you have added to \fB/etc/sudoers\fR (sudo v. 1.7 or newer):
.B <username> ALL = NOPASSWD: /usr/sbin/hddtemp (sample)
+doas users: see \fBman doas.conf\fR for setup.
+
+You can force use of \fBhddtemp\fR for all drives using \fB\-\-hddtemp\fR.
+
+\- If free LVM volume group size detected (root required), show \fBlvm\-free:\fR
+on Local Storage line. This is how much unused space the VGs contain, that is,
+space not assigned to LVs.
+
+.TP
+.B \-x \-E\fR (\fB\-\-bluetooth\fR)
+\- Adds (if available and/or relevant) \fBvendor:\fR item, which shows
+specific vendor [product] information.
+
+\- Adds PCI/USB Bus ID of each device.
+
+\- Adds driver version (if available) for each device.
+
+\- Adds (if available, \fBbtmgmt\fR, \fBhciconfig\fR only) LMP (HCI if no LMP
+data, and HCI if HCI/LMP versions are different) version (if available) for each
+HCI ID.
+
.TP
.B \-x \-G\fR
+\- Adds GPU micro\-architecture (if AMD/Intel/Nvidia and detected).
+
+\- Adds PCI/USB ID of each device.
+
\- Adds (if available and/or relevant) \fBvendor:\fR item, which shows
specific vendor [product] information.
-\- Adds direct rendering status.
+\- \fBX.org:\fR Adds (for single GPU, nvidia driver) screen number that GPU is
+running on.
+
+\- Adds device temperature for each discrete device (Linux only).
+
+\- For EGL, adds active/inactive platform report.
-\- Adds (for single GPU, nvidia driver) screen number that GPU is running on.
+\- For OpenGL (\fBX.org\fR only) adds direct render status, GLX version.
-\- Adds PCI Bus ID/USB ID number of each Graphics card.
+\- For Vulkan, adds device count.
.TP
.B \-x \-i\fR
@@ -738,10 +1437,10 @@ values, as with global temporary, and global temporary deprecated.
\- Adds current init system (and init rc in some cases, like OpenRC).
With \fB\-xx\fR, shows init/rc version number, if available.
-\- Adds default system gcc. With \fB\-xx\fR, also show other installed gcc
-versions.
+\- Adds default system compilers. With \fB\-xx\fR, also show other installed
+compiler versions.
-\- Adds current runlevel (not available with all init systems).
+\- Adds current runlevel/target (not available with all init systems).
\- Adds total packages discovered in system. See \fB\-xx\fR and \fB\-a\fR
for per package manager types output. Moves to \fBRepos\fR if \fB\-rx\fR.
@@ -751,28 +1450,51 @@ That requires the full output of the query or method to discover all installed
packages on your system, as well of course as the command or method used to
discover those.
-\- If in shell (i.e. not in IRC client), adds shell version number, if available.
+\- If in shell (i.e. not in IRC client), adds shell version number, if
+available.
+
+.TP
+.B \-x \-j\fR (\fB\-\-swap\fR)
+Add \fBmapper:\fR. See \fB\-x \-o\fR.
.TP
.B \-x \-J\fR (\fB\-\-usb\fR)
\- For Devices, adds driver(s).
+\- Adds, if available, USB speed in base 10 bits/s (Si) units \fBMb/s\fR or
+\fBGb/s\fR (may be incorrect on BSDs due to non reliable data source). These are
+base 10 bits per second. This unit corresponds to the standard units the USB
+consortium uses to indicate speeds, but not to how most of the rest of your
+system reports sizes. Use \fB\-Jxx\fR to add base 2 IEC Byte/second speeds.
+
+.TP
+.B \-x \-L\fR (\fB\-\-logical\fR)
+\- Adds \fBdm: dm-x\fR to VG > LV and other Device types. This can help
+tracking down which device belongs to what.
+
.TP
.B \-x \-m\fR, \fB\-\-memory\-modules\fR
\- If present, adds maximum memory module/device size in the Array line.
Only some systems will have this data available. Shows estimate if it can
generate one.
-\- Adds device type in the Device line.
-
.TP
.B \-x \-N\fR
\- Adds (if available and/or relevant) \fBvendor:\fR item, which shows
specific vendor [product] information.
-\- Adds version/port(s)/driver version (if available) for each Network card;
+\- Adds version/port(s)/driver version (if available) for each device;
+
+\- Adds PCI/USB ID of each device.
+
+\- Adds device temperature for each discrete device (Linux only).
-\- Adds PCI Bus ID/USB ID number of each Network card.
+.TP
+.B \-x \-o\fR, \fB\-x \-p\fR, \fB\-x \-P\fR
+\- Adds \fBmapper:\fR (the \fB/dev/mapper/\fR partition ID)
+if mapped partition.
+
+Example: \fBID\-4: /home ... dev: /dev/dm-6 mapped: ar0-home\fR
.TP
.B \-x \-r\fR
@@ -783,21 +1505,27 @@ specific vendor [product] information.
\- md\-raid: Adds second RAID Info line with extra data: blocks, chunk size,
bitmap (if present). Resync line, shows blocks synced/total blocks.
-\- Hardware RAID: Adds driver version, bus ID.
+\- Hardware RAID: Adds driver version, Bus ID.
.TP
.B \-x \-s\fR
-\- Adds basic voltages: 12v, 5v, 3.3v, vbat (\fBipmi\fR, \fBlm-sensors\fR if present).
+\- Adds basic voltages: 12v, 5v, 3.3v, vbat (\fBipmi\fR, \fBlm\-sensors /
+/sys/class/hwmon\fR if present).
.TP
.B \-x \-S\fR
-\- Adds Kernel gcc version.
+\- Adds Kernel compiler version.
-\- Adds to \fBDistro:\fR \fBbase:\fR if detected. System base will only be seen on
-a subset of distributions. The distro must be both derived from a parent distro (e.g. Mint from
-Ubuntu), and explicitly added to the supported distributions for this feature. Due to
-the complexity of distribution identification, these will only be added as relatively solid
-methods are found for each distribution system base detection.
+\- Adds to \fBDistro:\fR \fBbase:\fR if detected. System base will only be
+seen on a subset of distributions. The distro must be both derived from a
+parent distro (e.g. Mint from Ubuntu), and explicitly added to the supported
+distributions for this feature. Due to the complexity of distribution
+identification, these will only be added as relatively solid methods are
+found for each distribution system base detection.
+
+.TP
+.B \-x \-\-slots\fR
+\- Adds slot \fBbus\-ID:\fR, if found.
.TP
.B \-x \-t\fR (\fB\-\-processes\fR)
@@ -805,38 +1533,41 @@ methods are found for each distribution system base detection.
(\fB\-xt m\fR).
.TP
-.B \-x \-w\fR,\fB \-W\fR
+.B \-x \-w\fR
\- Adds humidity and barometric pressure.
\- Adds wind speed and direction.
.TP
.B \-xx \-A\fR
-\- Adds vendor:product ID for each Audio device.
+\- Adds vendor:product ID for each device.
+
+\- Adds PCIe speed and lanes item (Linux only, if detected).
+
+\- Adds for USB devices USB rev, speed, lanes (lanes Linux only).
+
+\- Adds \fBwith: [item] \fBstatus: [state/plugin]\fR helper daemons/plugins for
+the sound API/server.
.TP
.B \-xx \-B\fR
-\- Adds serial number, voltage (if available). Note that \fBvolts\fR shows the
-data (if available) as the voltage now / minimum design voltage.
+\- Adds current power use, in watts.
-.TP
-.B \-xx \-C\fR
-\- Adds \fBL1 cache:\fR and \fBL3 cache:\fR if either are available. Requires
-dmidecode and sudo/root.
+\- Adds serial number.
.TP
.B \-xx \-D\fR
-\- Adds disk serial number.
+\- Adds HDD/SSD drive serial number.
-\- Adds disk speed (if available). This is the theoretical top speed of the
-device as reported. This speed may be restricted by system board limits, eg.
-a SATA 3 drive on a SATA 2 board may report SATA 2 speeds, but this is not
-completely consistent, sometimes a SATA 3 device on a SATA 2 board reports
+\- Adds drive speed (if available). This is the theoretical top speed of the
+device as reported. This speed may be restricted by system board limits,
+eg. a SATA 3 drive on a SATA 2 board may report SATA 2 speeds, but this is
+not completely consistent, sometimes a SATA 3 device on a SATA 2 board reports
its design speed.
NVMe drives: adds lanes, and (per direction) speed is calculated with
lane speed * lanes * PCIe overhead. PCIe 1 and 2 have data rates of
-GT/s * .8 = Gb/s (10 bits required to transfer 8 bits of data).
+GT/s * .8 = Gb/s (10 bits required to transfer 8 bits of data).
PCIe 3 and greater transfer data at a rate of GT/s * 128/130 * lanes = Gb/s
(130 bits required to transfer 128 bits of data).
@@ -845,46 +1576,143 @@ For a PCIe 3 NVMe drive, with speed of \fB8 GT/s\fR and \fB4\fR lanes
\fBspeed: 31.6 Gb/s lanes: 4\fR
+\- Adds HDD/SSD drive duid, if available. Some BSDs have it.
+
+\- Adds for USB drives USB rev, speed, lanes (lanes Linux only).
+
+.TP
+.B \-xx \-E\fR (\fB\-\-bluetooth\fR)
+\- Adds vendor:product ID of each device.
+
+\- Adds PCIe speed and lanes item (Linux only, and if PCIe bluetooth, which is
+rare).
+
+\- Adds for USB devices USB rev, speed, lanes (lanes Linux only).
+
+\- Adds (\fBhciconfig \fRonly) LMP subversion (and/or HCI revision if
+applicable) for each device.
+
.TP
.B \-xx \-G\fR
-\- Adds vendor:product ID of each Graphics card.
+Triggers much more complete Screen/Monitor output.
+
+\fBX.org:\fR requires \fBxdpyinfo\fR or \fBxrandr\fR, and the advanced per
+monitor feature requires \fBxrandr\fR.
+
+\fBWayland:\fR requires any tool capable of showing monitor and resolution
+information. \fBSway\fR has \fBswaymsg\fR, \fBweston\-info\fR or
+\fBwayland\-info\fR can show Wayland information on any Wayland compositor, and
+\fBwlr\-randr\fR can show Wayland information for any \fBwlroots\fR based
+compositor.
-\- Adds Xorg compositor, if found (always shows for Wayland systems).
+Further note that all references to \fBDisplays\fR, \fBScreens\fR, and
+\fBMonitors\fR are referring to the \fBX\fR or \fBWayland\fR technical terms,
+not normal consumer usage.
-\- For free drivers, adds OpenGL compatibility version number if available.
-For nonfree drivers, the core version and compatibility versions are usually
-the same. Example:
+\fBX.org:\fR 1 \fBDisplay\fR runs 1 or more \fBScreens\fR, and 1 \fBScreen\fR
+runs 1 or more \fBMonitors\fR.
-\fBv: 3.3 Mesa 11.2.0 compat\-v: 3.0\fR
+\fBWayland:\fR The \fBDisplay\fR is the primary container, and it can contain 1
+or more \fBMonitors\fR.
-\- If available, shows \fBalternate:\fR Xorg drivers. This means a driver on
-the default list of drivers Xorg automatically checks for the card, but which
-is not installed. For example, if you have \fBnouveau\fR driver, \fBnvidia\fR would
-show as alternate if it was not installed. Note that \fBalternate:\fR does NOT mean you
-should have it, it's just one of the drivers Xorg checks to see if is present
-and loaded when checking the card. This can let you know there are other driver options.
-Note that if you have explicitly set the driver in \fBxorg.conf\fR, Xorg will not
-create this automatic check driver list.
+\- Adds vendor:product ID of each device.
-\- If available, shows Xorg dpi (\fBs-dpi:\fR) for the active Xorg \fBScreen\fR
-(not physical monitor). Note that the physical monitor dpi and the Xorg
-dpi are not necessarily the same thing, and can vary widely.
+\- Adds PCIe speed and lanes item (Linux only, and if PCIe device and detected).
+
+\- Adds for USB devices USB rev, speed, lanes (lanes Linux only).
+
+\- Adds output port IDs, active, off (connected but disabled, like a closed
+laptop lid) and empty. Example:
+
+\fBports: active: DVI\-I\-1,VGA\-1 empty: HDMI\-A\-1\fR
+
+\- Adds \fBDisplay\fR ID. X.org: the Display running the Screen that runs the
+Monitors; Wayland: the Display that runs the monitors.
+
+\- Adds compositor, if found (always shows for Wayland).
+
+\- \fBWayland:\fR Adds to \fBDisplay\fR \fBd-rect:\fR if > 1 monitors in
+Display. This is the size of the rectangle Wayland creates to situate the
+monitors in.
+
+\- \fBX.org:\fR If available, shows \fBalternate:\fR Xorg drivers. This means a
+driver on the default list of drivers Xorg automatically checks for the device,
+but which is not installed. For example, if you have \fBnouveau\fR driver,
+\fBnvidia\fR would show as alternate if it was not installed. Note that
+\fBalternate:\fR does NOT mean you should have it, it's just one of the drivers
+Xorg checks to see if is present and loaded when checking the device. This can
+let you know there are other driver options. Note that if you have explicitly
+set the driver in \fBxorg.conf\fR, Xorg will not create this automatic check
+driver list.
+
+\- \fBXorg:\fR Adds total number of \fBScreens\fR listed for the current
+\fBDisplay\fR.
+
+\- \fBXorg:\fR Adds default \fBScreen\fR ID if Screen (not monitor!) total is
+greater than 1.
+
+\- \fBX.org:\fR Adds \fBScreen\fR line, which includes the ID (\fBScreen: 0\fR)
+then \fBs-res\fR (Screen resolution), \fBs\-dpi\fR. Remember, this is an Xorg
+\fBScreen\fR, NOT a monitor screen, and the information listed is about the Xorg
+Screen! It may at times be the same as a single monitor system, but usually it's
+different in some ways. Note that the physical monitor dpi and the Xorg dpi are
+not necessarily the same thing, and can vary widely.
+
+\- Adds \fBMonitor\fR lines. Monitors are a subset of a \fBScreen\fR (X.org) or
+\fBDisplay\fR (Wayland), each of which can have one or more monitors. Normally a
+dual monitor setup is 2 monitors run by one Xorg Screen/Wayland Display.
+
+\- \fBpos: [primary,]{position string|row\-col}\fR (X.org: requires
+\fBxrandr\fR; Wayland: requires \fBswaymsg\fR [sway], \fBwlr\-randr\fR [wlroots
+based compositors], \fBweston\-info\fR / \fBwayland\-info\fR [all]). Uses either
+explicit \fBprimary\fR value or +0+0 position if no primary monitor value set.
+\fBpos:\fR does not show for single monitor setups, or if no position data was
+found.
+
+Position is text (left, center, center-l, center\-r, right, top, top\-left,
+top\-center, top\-right, middle, middle\-c, middle\-r, bottom, bottom\-l,
+bottom\-c, bottom\-r) if monitors fit within the following grids: 1x2, 1x3, 1x4,
+2x1, 2x2, 2x3, 3x1, 3x2, 3x3. If layout not supported in text, uses
+[row\-nu]\-[column\-nu] instead to indicate the monitor's position in its grid.
+
+The position is based on the upper left corner of each monitor relative to the
+grid of monitors that the \fBXorg\fR \fBScreen\fR is composed of.
+
+\- \fBdiag:\fR monitor screen diagonal in mm (inches). Note that this is the
+real monitor size, not the Xorg full Screen diagonal size, which can be quite
+different.
+
+\- For EGL, shows platform by specific platforms, with driver and egl version if
+different from the main one.
+
+\- For OpenGL, adds ES version (\fBes\-v\fR) if available. If the Display line
+did not find an X11 display ID, the ID (e.g. \fB:0.0\fR) will show here instead.
+
+\- For OpenGL, Vulkan, adds \fBdevice-\ID\fR, if available.
+
+\- For Vulkan, adds per Device ID report (type, driver, device\-ID).
.TP
.B \-xx \-I\fR
+\- Addes \fBPower:\fR parent for power data children \fBuptime:\fR and adds
+\fBwakeups:\fR. Wakeups shows how many times the machine has been woken from
+suspend state during current uptime period (if available, Linux only). 0 value
+means the machine has not been suspended.
+
\- Adds init type version number (and rc if present).
-\- Adds other detected installed gcc versions (if present).
+\- Adds alternate (\fBalt:\fR) detected installed compiler versions (if
+present).
-\- Adds system default runlevel, if detected. Supports Systemd/Upstart/SysVinit
-type defaults.
+\- Adds system default runlevel/target, if detected. Supports Systemd / Upstart
+/SysVinit type defaults.
-\- Shows \fBPackages:\fR counts by discovered package manager types. In cases where
-only 1 type had results, does not show total after \fBPackages:\fR. Does not
-show installed package managers wtih 0 packages. See \fB\-a\fR for full output.
-Moves to \fBRepos\fR if \fB\-rxx\fR.
+\- Shows \fBPackages:\fR counts by discovered package manager types (\fBpm:\fR).
+In cases where only 1 pm had results, does not show total after \fBPackages:\fR.
+Does not show installed package managers with 0 packages. See \fB\-a\fR for full
+output. Moves to \fBRepos\fR if \fB\-rxx\fR.
-\- Adds parent program (or tty) that started shell, if not IRC client.
+\- Adds parent program (or pty/tty) that started shell, if not IRC client.
.TP
.B \-xx \-j\fR (\fB\-\-swap\fR), \fB\-xx \-p\fR, \fB\-xx \-P\fR
@@ -895,31 +1723,56 @@ swap types (for \fB\-j\fR).
.B \-xx \-J\fR (\fB\-\-usb\fR)
\- Adds vendor:chip id.
+\- Adds USB lanes. Uses tx (transmit) lane count for total unless rx and tx
+counts are different (eg: \fBlanes: rx: 2 tx: 4\fR). Linux only.
+See \fB\-Ja\fR for sample output.
+
+.TP
+.B \-xx \-L\fR (\fB\-\-logical\fR)
+\- Adds internal LVM Logical volumes, like raid image and meta data volumes.
+
+\- Adds full list of Components, sub\-components, and their physical devices.
+
+\- For LVM RAID, adds a RAID report line (if not \fB\-R\fR). Read up on LVM
+documentation to better understand their use of the term 'stripes'.
+
.TP
.B \-xx \-m\fR, \fB\-\-memory\-modules\fR
\- Adds memory device Manufacturer.
-\- Adds memory device Part Number (\fBpart\-no:\fR). Useful for ordering new or
-replacement memory sticks etc. Part numbers are unique, particularly
-if you use the word \fBmemory\fR in the search as well. With \fB\-xxx\fR,
-also shows serial number.
+\- Adds memory device Part Number (\fBpart\-no:\fR). Useful for ordering new
+or replacement memory sticks etc. Part numbers are unique, particularly if you
+use the word \fBmemory\fR in the search as well. With \fB\-xxx\fR, also shows
+serial number.
-\- Adds single/double bank memory, if data is found. Note, this may not be 100% right
-all of the time since it depends on the order that data is found in \fBdmidecode\fR
-output for \fBtype 6\fR and \fBtype 17\fR.
+\- Adds single/double bank memory, if data is found. Note, this may not be
+100% right all of the time since it depends on the order that data is found
+in \fBdmidecode\fR output for \fBtype 6\fR and \fBtype 17\fR.
+
+\- Adds, if present, memory array voltage. Only some legacy systems will have
+this data available.
+
+\- Adds memory module current configured operating voltage, if available.
.TP
.B \-xx \-M\fR
\- Adds chassis information, if data is available. Also shows BIOS
ROM size if using \fBdmidecode\fR.
+\- Adds board part number (\fBpart\-nu:\fR) if available. This is not commonly
+found.
+
.TP
.B \-xx \-N\fR
-\- Adds vendor:product ID for each Network card.
+\- Adds vendor:product ID for each device.
+
+\- Adds PCIe speed and lanes item (Linux only, and if PCIe device and detected).
+
+\- Adds for USB devices USB rev, speed, lanes (lanes Linux only).
.TP
.B \-xx \-r\fR
-\- Adds Packages info. See \fB\-Ixx\fR
+\- Adds to \fBPackages:\fR info. See \fB\-Ixx\fR
.TP
.B \-xx \-R\fR
@@ -934,24 +1787,28 @@ shows progress bar.
.TP
.B \-xx \-S\fR
-\- Adds display manager (\fBdm\fR) type, if present. If none, shows N/A.
-Supports most known display managers, including gdm, gdm3,
-idm, kdm, lightdm, lxdm, mdm, nodm, sddm, slim, tint, wdm, and xdm.
-\- Adds, if run in X, window manager type (\fBwm\fR), if available.
-Not all window managers are supported. Some desktops support using more than one
-window manager, so this can be useful to see what window manager is actually running.
-If none found, shows nothing. Uses a less accurate fallback tool \fBwmctrl\fR
-if \fBps\fR tests fail to find data.
+\- Adds desktop toolkit (\fBtk:\fR), if available (Xfce/KDE/Trinity/Gnome etc).
+
+\- Adds, if run in X, window manager (\fBwm:\fR), if available. Not all window
+managers are supported. File issue to request a missing one. Some desktops
+support using more than one window manager, so this can be useful to see what
+window manager is actually running. If none found, shows nothing. Uses a less
+accurate fallback tool \fBwmctrl\fR if \fBps\fR tests fail to find data.
-\- Adds desktop toolkit (\fBtk\fR), if available (Xfce/KDE/Trinity).
+\- Adds display/login manager (\fBdm:\fR/\fBlm:\fR), if present. If none, shows
+N/A. Supports most known display/login managers, including elogind, entrance,
+gdm, gdm3, greetd, kdm, lemurs, lightdm, lxdm, ly, mdm, mlogind, nodm, sddm,
+seatd, slim, slimski, tint, wdm, xdm, and several others, added as discovered.
.TP
.B \-xx \-\-slots\fR
\- Adds slot length.
+\- Adds slot voltage, if available.
+
.TP
-.B \-xx \-w\fR,\fB \-W\fR
+.B \-xx \-w\fR
\- Adds wind chill, heat index, and dew point, if available.
\- Adds cloud cover, rain, snow, or precipitation (amount in previous hour
@@ -961,6 +1818,8 @@ to observation time), if available.
.B \-xxx \-A\fR
\- Adds, if present, serial number.
+\- Adds, if present, PCI/USB class ID.
+
.TP
.B \-xxx \-B\fR
\- Adds battery chemistry (e.g. \fBLi\-ion\fR), cycles (NOTE: there appears to
@@ -973,33 +1832,85 @@ data is simply not available as of 2018\-04\-03), location (only available from
.TP
.B \-xxx \-C\fR
-\- Adds \fBboost: [enabled|disabled]\fR if detected, aka \fBturbo\fR. Not all CPUs
-have this feature.
-
\- Adds CPU voltage and external clock speed (this is the motherboard speed).
-Requires sudo/root and \fBdmidecode\fR.
+Requires doas/sudo/root and \fBdmidecode\fR.
+
+\- Adds, if smt (Simultaneous MultiThreading) data is available, after
+\fBtype:\fR data \fBsmt: [status]\fR.
+.br
+\fBsmt: [status]\fR
+.br
+\fBMT\fR in \fBtype:\fR will show if smt is enabled in general. 3 values are
+possible: [\fBenabled|disabled|<unsupported>\fR]. \fB<unsupported>\fR means the
+CPU does not support SMT.
.TP
.B \-xxx \-D\fR
-\- Adds disk firmware revision number (if available).
+\- Adds HDD/SSD drive firmware revision number (if available).
+
+\- Adds drive partition scheme (in most cases), e.g. \fBscheme: GPT\fR.
+Currently not able to detect all schemes, but handles the most common, e.g.
+\fBGPT\fR or \fBMBR\fR.
+
+\- Adds drive tech (\fBHDD\fR/\fBSSD\fR), rotation speed (in some but not all
+cases), e.g. \fBtech: HDD rpm: 7200\fR, or \fBtech: SSD\fR if positive SSD
+identification was made. If no HDD, rotation, or positive SSD ID found, shows
+\fBtech: N/A\fR. Not all HDD spinning disks report their speed, so even if they
+are spinning, no rpm data will show.
+
+.TP
+.B \-xxx \-E\fR (\fB\-\-bluetooth\fR)
+\- Adds, if present, PCI/USB class ID.
+
+\- Adds, if present, bluetooth device class ID.
+
+\- Adds (\fBhciconfig \fRonly) HCI version, revision.
+
+.TP
+.B \-xxx \-G\fR
+\- Adds, if present, Device PCI/USB class ID.
+
+\- Adds to Device \fBserial:\fR number (if found).
+
+\- \fBXorg:\fR Adds to \fBScreen:\fR \fBs\-size:\fR and \fBs\-diag:\fR. (Screen
+size data requires \fBxdpyinfo\fR). This is the X.org Screen dimensions, NOT the
+Monitor size!
+
+\- Adds to Monitors (if detected) frequency (\fBhz:\fR).
+
+\- Adds to Monitors (if detected) size (\fBsize: 277x156mm (10.9x6.1")\fR). Note
+that this is the real physical monitor size, not the Xorg Screen/Wayland Display
+size, which can be quite different (1 Xorg Screen / Wayland Display can for
+instance contain two or more monitors).
+
+\- Adds to Monitors \fBmodes: min: max:\fR (if detected). These are the smallest
+and largest monitor modes found, using an inexact method, so might not always be
+right.
+
+\- Adds to Monitors \fBserial:\fR number (if detected).
+
+\- \fBWayland:\fR Adds to Monitors \fBscale:\fR (if detected).
-\- Adds disk partition scheme (in most cases), e.g. \fBscheme: GPT\fR. Currently not
-able to detect all schemes, but handles the most common, e.g. \fBGPT\fR or \fBMBR\fR.
+\- For EGL, shows hardware based driver(s) (\fBhw:\fR), with the related
+hardware, like AMD or Intel.
-\- Adds disk rotation speed (in some but not all cases), e.g. \fBrotation: 7200 rpm\fR.
-Only appears if detected (SSD drives do not have rotation speeds, for example). If none
-found, nothing shows. Not all disks report this speed, so even if they are spinnning,
-no data will show.
+\- For Vulkan, adds layer count, per device driver hardware vendor (not
+displayed if device name is present with \fB\-a\fR).
.TP
.B \-xxx \-I\fR
+\- For \fBPower:\fR adds supported system power \fBstates:\fR, active
+\fBsuspend:\fR type, active \fBhibernate:\fR type. See
+\fIhttps://www.kernel.org/doc/html/v4.15/admin-guide/pm/sleep-states.html\fR
+for full explanation of states and actions.
+
\- For \fBShell:\fR adds \fB(su|sudo|login)\fR to shell name if present.
\- For \fBShell:\fR adds \fBdefault:\fR shell if different from
running shell, and default shell \fBv:\fR, if available.
-\- For \fBrunning in:\fR adds \fB(SSH)\fR to parent, if present. SSH detection
-uses the \fBwho am i\fR test.
+\- For \fBrunning\-in:\fR adds \fB(SSH)\fR to parent, if present. SSH detection
+uses the \fBwhoami\fR test.
.TP
.B \-xxx \-J\fR (\fB\-\-usb\fR)
@@ -1007,29 +1918,46 @@ uses the \fBwho am i\fR test.
\- Adds \fBinterfaces:\fR for non hub devices.
-\- Adds, if available, USB speed in \fBMbits/s\fR or \fBGbits/s\fR.
+\- Adds, if present, USB class ID.
+
+\- Adds, if non 0, max power in mA.
.TP
.B \-xxx \-m\fR, \fB\-\-memory\-modules\fR
\- Adds memory bus width: primary bus width, and if present, total width. e.g.
-\fBbus width: 64 bit (total: 72 bits)\fR. Note that total / data widths are mixed up
-sometimes in dmidecode output, so inxi will take the larger value as the total if
-present. If no total width data is found, then inxi will not show that item.
-\- Adds device Type Detail, e.g. \fBdetail: DDR3 (Synchronous)\fR.
+\fBwidth (bits): data: 64 total: 72\fR
+
+Note that total / data widths are mixed up sometimes in dmidecode output, so
+inxi will take the larger value as the total if present. \fBData\fR width
+usually corresponds to the CPU bits. \fBTotal\fR can reflect EEC or Dual Channel
+widths. If no total width data is found, shows:
-\- Adds, if present, memory module voltage. Only some systems will have this
-data available.
+\fBwidth: N/A\fR
+
+\- Adds device type detail, e.g. \fBtype: DDR3 detail: Synchronous\fR.
\- Adds device serial number.
+\- Adds memory module current, max, and min voltages, if they are available and
+different from each other. If they are the identical, displays same as
+\fB\-xxm\fR voltage report. Use \fB\-ma\fR to always see them.
+
+.TP
+.B \-xxx \-M\fR
+\- Adds, if present, board/chassis UUID, This is also activated by
+\fB\-\-uuid\fR.
+
.TP
.B \-xxx \-N\fR
\- Adds, if present, serial number.
+\- Adds, if present, PCI/USB class ID.
+
.TP
.B \-xxx \-R\fR
-\- md\-raid: Adds system mdraid support types (kernel support, read ahead, RAID events)
+\- md\-raid: Adds system mdraid support types (kernel support, read ahead,
+RAID events)
\- zfs\-raid: Adds portion allocated (used) by RAID array/device.
@@ -1038,85 +1966,200 @@ data available.
.TP
.B \-xxx \-S\fR
-\- Adds, if in X, or with \fB--display\fR, bar/dock/panel/tray items
-(\fBinfo\fR). If none found, shows nothing. Supports desktop items like gnome\-panel,
-lxpanel, xfce4\-panel, lxqt\-panel, tint2, cairo-dock, trayer, and many others.
+\- Adds current kernel clock source, if available (Linux only).
\- Adds (if present), window manager (\fBwm\fR) version number.
-\- Adds (if present), display manager (\fBdm\fR) version number.
+\- Adds, if in X, or with \fB--display\fR, bar/dock/menu/panel/tray components
+(\fBwith:\fR). If none found, shows nothing. Examples: cairo-dock, docky,
+gnome\-panel, lxpanel, tint2, trayer, lxqt\-panel, xfce4\-panel and many
+others.
+
+\- Adds (if present) \fBtools:\fR item for all detected running screensavers,
+screen lockers. Note that not all screen lockers run as daemons/services, some
+are just programs called by other tools or actions.
+
+\- Adds (if available, and in display), virtual terminal (\fBvt\fR) number.
+These are the same as \fBctrl+alt+F[x]\fR numbers usually. Some systems
+have this, some don't, it varies.
+
+\- Adds (if present), display/login manager (\fBdm\fR) version number.
.TP
-.B \-xxx \-w\fR,\fB \-W\fR
+.B \-xxx \-w \fR
\- Adds location (city state country), observation altitude (if available),
weather observation time (if available), sunset/sunrise (if available).
.SH ADMIN EXTRA DATA OPTIONS
-These options are triggered with \fB\-\-admin\fR or \fB\-a\fR. Admin options are
-advanced output options, and are more technical, and mostly of interest to system
-administrators or other machine admins.
+These options are triggered with \fB\-\-admin\fR or \fB\-a\fR. Admin options
+are advanced output options, and are more technical, and mostly of interest to
+system administrators or other machine admins.
The \fB\-\-admin\fR option sets \fB\-xxx\fR, and only has to be used once.
It will trigger the following features:
.TP
.B \-a \-A\fR
-\- Adds, if present, possible \fBalternate:\fR kernel modules capable of driving
-each \fBDevice\-x\fR (not including the current \fBdriver:\fR). If no non\-driver
-modules found, shows nothing. NOTE: just because it lists a module does NOT mean it is
-available in the system, it's just something the kernel knows could possibly be used
-instead.
+\- Adds, if present, possible \fBalternate:\fR kernel modules capable of
+driving each \fBDevice\-x\fR (not including the current \fBdriver:\fR). If no
+non\-driver modules found, shows nothing. NOTE: just because it lists a module
+does NOT mean it is available in the system, it's just something the kernel
+knows could possibly be used instead.
+
+\- Adds PCIe generation, and, if different than running PCIe generation, speed
+or lanes, \fBlink\-max: gen: speed: lanes:\fR (only items different from primary
+shown).
+
+\- Adds list of detected audio server tools (\fBtools: [tools]\fR) to API/Server
+lines, like alsamixer, jack_control, pactl, pavuctl, pw-cli, sndioctl, etc.
+
+\- Adds for USB devices USB mode (Linux only).
.TP
.B \-a \-C\fR
+.br
+\- Adds CPU generation, process node, and built years, if detected. For Intel,
+only will show if Core generation, otherwise the arch value is enough. For AMD,
+only shows Zen generation.
+
+\- Adds microarchitecture \fBlevel:\fR (v1,v2,v3,v4) (64 bit Intel/AMD CPUs
+only). This information is used for setting compile time optimization switches
+in for example GCC. These levels were introduced in 2020.
+
+Because this a CPU flag based test, and these levels when > 2 are not always
+100% based on exposed CPU flags (eg OSXSAVE), for > v2, adds \fBnote: check\fR.
+
\- Adds CPU family, model\-id, and stepping (replaces \fBrev\fR of \fB\-Cx\fR).
-Format is \fBhexadecimal (decimal)\fR if greater than 9, otherwise \fBhexadecimal\fR.
+Format is \fBhexadecimal (decimal)\fR if greater than 9, otherwise
+\fBhexadecimal\fR.
\- Adds CPU microcode. Format is \fBhexadecimal\fR.
-\- Adds socket type (for motherboard CPU socket, if available). If results doubtful
-will list two socket types and \fBnote: check\fR. Requires sudo/root and \fBdmidecode\fR.
-The item in parentheses may simply be a different syntax for the same socket,
-but in general, check this before trusting it.
-.nf
+\- Adds socket type (for motherboard CPU socket, if available). If results
+doubtful will list two socket types and \fBnote: check\fR. Requires
+doas/sudo/root and \fBdmidecode\fR. The item in parentheses may simply be a
+different syntax for the same socket, but in general, check this before trusting
+it.
+
Sample: \fBsocket: 775 (478) note: check\fR
+.br
Sample: \fBsocket: AM4\fR
-.fi
-\- Adds DMI CPU base and boost/turbo speeds. Requires sudo/root and \fBdmidecode\fR.
-In some cases, like with overclocking or 'turbo' or 'boost' modes, voltage and
-external clock speeds may be increased, or short term limits raised on max CPU speeds.
-These are often not reflected in /sys based CPU \fBmin/max:\fR speed results,
-but often are using this source.
+\- Adds DMI CPU base and boost/turbo speeds. Requires doas/sudo/root and
+\fBdmidecode\fR. In some cases, like with overclocking or 'turbo' or 'boost'
+modes, voltage and external clock speeds may be increased, or short term limits
+raised on max CPU speeds. These are often not reflected in /sys based CPU
+\fBmin/max:\fR speed results, but often are using this source.
Samples:
-.nf
+.br
CPU not overclocked, with boost, like Ryzen:
-\fBSpeed: 2861 MHz min/max: 1550/3400 MHz boost: enabled base/boost: 3400/3900\fR
-
+.nf
+\fBSpeed (MHz):
+ avg: 2861
+ high: 3250
+ min/max: 1550/3400
+ boost: enabled
+ base/boost: 3400/3900\fR
+.fi
Overclocked 2900 MHz CPU, with no boost available:
-\fBSpeed: 2900 MHz min/max: 800/2900 MHz base/boost: 3350/3000\fR
-
+.nf
+\fBSpeed (MHz):
+ avg: 2345
+ high: 2900
+ min/max: 800/2900
+ base/boost: 3350/3000\fR
+.fi
Overclocked 3000 MHz CPU, with boosted max speed:
-\fBSpeed: 4190 MHz min/max: 1200/3001 MHz base/boost: 3000/4000\fR
+.nf
+\fBSpeed (MHz):
+ avg: 3260
+ high: 4190
+ min/max: 1200/3001
+ base/boost: 3000/4000\fR
.fi
Note that these numbers can be confusing, but basically, the \fBbase\fR
-number is the actual normal top speed the CPU runs at without boost mode, and the
-\fBboost\fR number is the max speed the CPU reports itself able to run at.
-The actual max speed may be higher than either value, or lower.
-The \fBboost\fR number appears to be hard\-coded into the CPU DMI data,
-and does not seem to reflect actual max speeds that overclocking or
-other combinations of speed boosters can enable, as you can see from the
-example where the CPU is running at a speed faster than
-the min/max or base/boost values.
+number is the actual normal top speed the CPU runs at without boost mode, and
+the \fBboost\fR number is the max speed the CPU reports itself able to run at.
+The actual max speed may be higher than either value, or lower. The \fBboost\fR
+number appears to be hard\-coded into the CPU DMI data, and does not seem to
+reflect actual max speeds that overclocking or other combinations of speed
+boosters can enable, as you can see from the example where the CPU is running
+at a speed faster than the min/max or base/boost values.
Note that the normal \fBmin/max:\fR speeds do NOT show actual overclocked OR
boost/turbo mode speeds, and appear to be hard\-coded values, not dynamic real
values. The \fBbase/boost:\fR values are sometimes real, and sometimes not.
\fBbase\fR appears in general to be real.
-\- Adds CPU Vulnerabilities (bugs) as known by your current kernel. Lists by
+\- Adds frequency \fBscaling: governor:.. driver:..\fR if found/available. Also
+adds scaling min/max speeds if different from standard CPU min/max spees (not
+common).
+
+\- Adds description of cache topology per cpu. Linux only.
+
+\- Creates new \fBTopology:\fR line after the \fBInfo:\fR line. Moves cache data
+to this line from \fBInfo:\fR line.
+
+Topology line contains, if available and/or relevant: physical CPU count
+(\fBcpus:\fR); per physical cpu core count (cores:\fR); threads per core, if > 1
+(\fBtpc:\fR); how many \fBthreads:\fR (if more threads than cores); \fBdies:\fR
+(rarely detected, but if so, if > 1); smt status (if no smt status found, shows
+\fBN/A\fR).
+
+If complex CPU type, like Alder lake, cores; will have a more granular breakdown
+of how many mt (multi\-threaded) and how many st (single\-threaded) cores there
+in the physical cpu ( \fBmt\-cores:\fR, \fBst\-cores:\fR); For complex CPU
+types like ARM SoC devices with 2 CPU types, with different core counts and/or
+\fBmin/max:\fR) frequencies, \fBvariant:\fR per type found, with relevant
+differences shown, like \fBcores:\fR, \fBmin/max:\fR, etc.
+
+.nf
+\fBCPU:
+ Info:
+ model: AMD EPYC 7281
+ bits: 64
+ type: MT MCP MCM SMP
+ arch: Zen
+ gen: 1
+ level: v3
+ note: check
+ process: GF 14nm
+ built: 2017\-19
+ family:0x17 (23)
+ model\-id:1
+ stepping: 2
+ microcode: 0x8001250
+ Topology:
+ cpus: 2
+ cores: 16
+ tpc: 2
+ threads: 32
+ dies: 4
+ cache:
+ L1: 2x 1.5 MiB (3 MiB)
+ desc: d\-16x32 KiB; i\-16x64 KiB
+ L2: 2x 8 MiB (16 MiB)
+ desc: 16x512 KiB
+ L3: 2x 32 MiB (64 MiB)
+ desc: 8x4 MiB
+ Speed (MHz):
+ avg: 1195
+ high: 1197
+ min/max: 1200/2100
+ boost: enabled
+ scaling:
+ driver: acpi\-cpufreq
+ governor: ondemand
+ cores:
+ 1: 1195
+ 2: 1196
+ ....
+ bogomips: 267823\fR
+.fi
+
+\- Adds CPU Vulnerabilities (bugs) as known by your current kernel. Lists by
\fBType: ... (status|mitigation): ....\fR for systems that support this feature
(Linux kernel 4.14 or newer, or patched older kernels).
@@ -1124,142 +2167,311 @@ values. The \fBbase/boost:\fR values are sometimes real, and sometimes not.
.B \-a \-d\fR,\fB\-a \-D\fR
\- Adds logical and physical block size in bytes.
-Using \fBsmartctl\fR (requires sudo/root privileges).
+Using \fBsmartctl\fR (requires doas/sudo/root privileges).
\- Adds device model family, like \fBCaviar Black\fR, if available.
\- Adds SATA type (eg 1.0, 2.6, 3.0) if a SATA device.
-\- Adds SMART report line: status, enabled/disabled, health, powered on,
-cycles, and some error cases if out of range values. Note that for Pre\-fail items,
-it will show the VALUE and THRESHOLD numbers. It will also fall back for unknown
-attributes that are or have been failing and print out the Attribute name, value,
-threshold, and failing message. This way even for unhandled Attribute names,
-you should get a solid report for full failure cases. Other cases may show
-if inxi believes that the item may be approaching failure. This is a guess so
-make sure to check the drive and smartctl full output to verify before
-taking any further action.
+\- Adds device kernel major:minor number (Linux only).
+
+\- Adds SMART report line: status, enabled/disabled, health, powered on, cycles,
+and some error cases if out of range values. Note that for Pre\-fail items, it
+will show the VALUE and THRESHOLD numbers. It will also fall back for unknown
+attributes that are or have been failing and print out the Attribute name,
+value, threshold, and failing message. This way even for unhandled Attribute
+names, you should get a solid report for full failure cases. Other cases may
+show if inxi believes that the item may be approaching failure. This is a guess
+so make sure to check the drive and smartctl full output to verify before taking
+any further action.
-\- Adds, for USB or other external drives, actual model name/serial if
-available, and different from enclosure model/serial, and corrects block
-sizes if necessary. Adds in drive temperature for some drives as well,
-and other useful data.
+\- Adds, for USB or other external drives, actual model name/serial if
+available, and different from enclosure model/serial, and corrects block sizes
+if necessary.
+
+\- Adds for USB drives USB mode (Linux only).
+
+\- Adds in drive temperature for some drives as well, and other useful data.
.TP
-.B \-a \-G\fR
-Triggers a much more complete Screen/Monitor output on the
-\fBDisplay:\fR line of \fB\-G\fR. Note that the
-basic feature requires \fBxdpyinfo\fR, and the advanced per monitor
-feature requires \fBxrandr\fR.
+.B \-a \-E\fR (\fB\-\-bluetooth\fR)
+\- Adds (\fBhciconfig\fR only) extra line to \fBReport:\fR, \fBInfo:\fR.
+Includes, if available, ACL MTU, SCO MTU, Link policy, Link mode,
+and Service Classes.
+
+\- Adds PCIe generation, and, if different than running PCIe generation, speed
+or lanes, \fBlink\-max: gen: speed: lanes:\fR (only items different from primary
+shown. Bluetooth PCIe rare).
-No support currently exists for \fBWayland\fR since we so far can find
-no documentation or easy methods to extract this information from \fBWayland\fR
-compositors. This unfortunate situation may change in the future, hopefully.
-However, most \fBWayland\fR systems also come with \fBxwayland\fR,
-which should supply the tools necessary for the time being.
+\- Adds for USB devices USB mode (Linux only).
-Further note that all references to \fBDisplays\fR, \fBScreens\fR,
-and \fBMonitors\fR are referring to the \fBX\fR technical terms,
-not normal consumer usage. 1 \fBDisplay\fR runs 1 or more
-\fBScreens\fR, and a \fBScreen\fR runs 1 or more \fBMonitors\fR.
+\- Adds, if present, bluetooth \fBstatus:\fR discoverable, active discoverable,
+and pairing items.
-\- Adds \fBDisplay\fR ID, for the Display running the Screen that runs the Monitors.
+.TP
+.B \-a \-G\fR
+\- Adds, if present, possible \fBalternate:\fR kernel modules capable of driving
+each \fBDevice\-x\fR (not including the current \fBloaded:\fR). If no
+non\-driver modules found, shows nothing. NOTE: just because it lists a module
+does NOT mean it is available in the system, it's just something the kernel
+knows could possibly be used instead.
+
+\- Adds (AMD/Intel/Nvidia, if available) \fBprocess: [node] built: [years]\fR
+to \fBarch:\fR item.
-\- Adds total number of \fBScreens\fR listed for the current \fBDisplay\fR.
+\- Adds (if Linux and Nvidia device) non\-free support information (if
+available). This can be useful for forum support people to determine if the card
+supports current active legacy Nvidia driver branches, or if the card nonfree
+driver is EOL or active. Note that if card is current, shows basic series and
+status.
-\- Adds default \fBScreen\fR ID if Screen (not monitor!) total is greater than 1.
+Includes extended non free Nvidia legacy informatin (Linux and Nvidia only), and
+\fBarch:\fR reports (AMD/Intel/Nvidia). Useful to help diagnose driver support
+issues, shows extra data that can help diagnose/debug. Adds \fBcode:\fR item if
+found and not the same as \fBarch:\fR.
-\- Adds \fBScreen\fR line, which includes the ID (\fBScreen: 0\fR) then \fBs-res\fR
-(Screen resolution), \fBs\-dpi\fR, \fBs\-size\fR and \fBs\-diag\fR. Remember, this is an
-Xorg \fBScreen\fR, NOT a monitor screen, and the information listed is about
-the Xorg Screen! It may at times be the same as a single monitor system,
-but usually it's different in some ways.
+\- Adds for USB devices USB mode (Linux only).
+
+.nf
+\fBinxi \-Gaz
+Graphics:
+ Device\-1: NVIDIA NV34 [GeForce FX 5200] driver: nouveau v: kernel
+ non\-free: 173.14.xx status: legacy (EOL) last: kernel: 3.12 xorg: 1.15
+ release: 173.14.39 arch: Rankine code: NV3x process: 130\-150nm
+ built: 2003\-05 ports: active: VGA\-1 empty: DVI\-I\-1,TV\-1
+ bus\-ID: 01:00.0 chip\-ID: 10de:0322 class\-ID: 0300
+ Display: x11 server: X.Org v: 21.1.3 driver: X: loaded: nouveau
+ unloaded: fbdev,modesetting,vesa alternate: nv,nvidia gpu: nouveau
+ display\-ID: :0 screens: 1\fR
+.fi
-\- Adds \fBMonitor\fR ID(s). Monitors are a subset of a Screen, each of which
-can have one or more monitors. Normally a dual monitor setup is 2 monitors
-run by one Xorg Screen. Each monitor has the following data, if available:
+With \fB\-y1\fR:
-\- \fBres:\fR resolution in pixels. This is the individual monitor's
-reported pixel dimensions.
+.nf
+\fBinxi \-Gaz \-y1
+Graphics:
+ Device\-1: NVIDIA NV34 [GeForce FX 5200]
+ driver: nouveau
+ v: kernel
+ non\-free:
+ series: 173.14.xx
+ status: legacy (EOL)
+ last:
+ kernel: 3.12
+ xorg: 1.15
+ release: 173.14.39
+ arch: Rankine
+ code: NV3x
+ process: 130\-150nm
+ built: 2003\-05
+ ports:
+ active: VGA\-1
+ empty: DVI\-I\-1,TV\-1
+ bus\-ID: 01:00.0
+ chip\-ID: 10de:0322
+ class\-ID: 0300\fR
+.fi
-\- \fBhz:\fR frequency in Herz, as reported to Xorg. Note that there have been
-and may continue to be bugs with how Xorg treats > 1 monitor frequencies.
+\- Adds PCIe generation, and, if different than running PCIe generation, speed
+or lanes, \fBlink\-max: gen: speed: lanes:\fR (only items different from primary
+shown).
-\- \fBdpi:\fR dpi (dots per inch), aka, ppi (pixels per inch). This is the
-physical screen dpi, which is calculated using the screen dimensions and its
-resolution.
+\- Adds to Monitors \fBbuilt:\fR, \fBgamma:\fR, \fBratio:\fR (if found).
-\- \fBsize:\fR size in mm (inches). Note that this is the real monitor size,
-not the Xorg Screen size, which can be quite different (1 Xorg Screen can
-for instance contain two or more monitors).
+\- Adds to OpenGL device memory and unified status, if present.
-\- \fBdiag:\fR monitor screen diagonal in mm (inches). Note that this is
-the real monitor size, not the Xorg full Screen diagonal size, which
-can be quite different.
+\- Adds to Vulkan full device report, with full device names, ids, drivers,
+driver versions, surfaces.
-Sample (with both \fBxdpyinfo\fR and \fBxrandr\fR data available):
+X.org sample (with both \fBxdpyinfo\fR and \fBxrandr\fR data available):
.nf
-\fBinxi \-aG
+\fBinxi \-aGz
Graphics:
- ....
-Display: x11 server: X.Org 1.20.6 driver: modesetting
-display ID: :0.0 screens: 1
-Screen\-1: 0 s\-res: 2560x1024 s\-dpi: 96 s\-size: 677x271mm (26.7x10.7")
-s\-diag: 729mm (28.7")
-Monitor\-1: DVI\-I\-0 res: 1280x1024 hz: 60 dpi: 96
-size: 338x270mm (13.3x10.6") diag: 433mm (17")
-Monitor\-2: VGA\-0 res: 1280x1024 hz: 60 dpi: 86
-size: 376x301mm (14.8x11.9") diag: 482mm (19")
- ....\fR
+ Device\-1: AMD Cedar [Radeon HD 5000/6000/7350/8350 Series]
+ vendor: XFX Pine driver: radeon v: kernel alternate: amdgpu
+ arch: TeraScale\-2 code: Evergreen process: TSMC 32\-40nm
+ built: 2009\-15 pcie: gen: 1 speed: 2.5 GT/s lanes: 16 link\-max:
+ gen: 2 speed: 5 GT/s ports: active: DVI\-I\-1,VGA\-1 empty: HDMI\-A\-1
+ bus\-ID: 0a:00.0 chip\-ID: 1002:68f9 class\-ID: 0300 temp: 58.0 C
+ Display: x11 server: X.Org v: 1.21.1.7 with: Xwayland v: 22.1.9
+ compositor: xfwm v: 4.18.0 driver: X: loaded: modesetting dri: r600
+ gpu: radeon display\-ID: :0.0 screens: 1
+ Screen\-1: 0 s\-res: 2560x1024 s\-dpi: 96
+ s\-size: 677x270mm (26.65x10.63") s\-diag: 729mm (28.7")
+ Monitor\-1: DVI\-I\-1 pos: primary,left model: Samsung SyncMaster
+ serial: H9NX842662 built: 2004 res: 1280x1024 hz: 60 dpi: 96
+ gamma: 1.2 size: 338x270mm (13.31x10.63") diag: 433mm (17")
+ ratio: 5:4 modes: max: 1280x1024 min: 720x400
+ Monitor\-2: VGA\-1 pos: right model: Dell 1908FP
+ serial: G434H87HRA2D built: 2008 res: 1280x1024 hz: 60 dpi: 86
+ gamma: 1.4 size: 376x301mm (14.8x11.85") diag: 482mm (19")
+ ratio: 5:4 modes: max: 1280x1024 min: 720x400
+ API: EGL v: 1.5 hw: drv: amd r600 platforms: device: 0 drv: r600
+ device: 1 drv: swrast gbm: egl: 1.4 drv: kms_swrast surfaceless:
+ drv: r600 x11: drv: r600 inactive: wayland
+ API: OpenGL v: 4.5 vendor: x.org mesa v: 22.3.6 glx\-v: 1.4
+ es\-v: 3.1 direct\-render: yes renderer: AMD CEDAR (DRM 2.50.0 /
+ 6.4.3\-1\-liquorix\-amd64 LLVM 15.0.6) device\-ID: 1002:68f9
+ memory: 1000 MiB unified: no
+ API: Vulkan v: 1.3.250 layers: 3 device: 0 type: cpu
+ name: llvmpipe (LLVM 15.0.6 256 bits) driver: mesa llvmpipe
+ v: 22.3.6 (LLVM 15.0.6) device\-ID: 10005:0000 surfaces: xcb,xlib\fR
+.fi
+
+Wayland sample, with Sway/swaymsg:
+.nf
+\fB
+inxi \-aGz
+Graphics:
+ Device\-1: AMD Cedar [Radeon HD 5000/6000/7350/8350 Series] vendor: XFX Pine
+ driver: radeon v: kernel alternate: amdgpu arch: TeraScale 2
+ process: TSMC 32\-40nm pcie: gen: 1 speed: 2.5 GT/s lanes: 16 link\-max:
+ gen: 2 speed: 5 GT/s ports: active: DVI\-I\-1,VGA\-1 empty: HDMI\-A\-1
+ bus\-ID: 0a:00.0 chip\-ID: 1002:68f9 class\-ID: 0300
+ Display: wayland server: Xwayland v: 21.1.4 compositor: sway v: 1.6.1
+ driver: dri: r600 gpu: radeon d\-rect: 2560x1024
+ Monitor-1: DVI\-I\-1 pos: right model: SyncMaster serial: <filter>
+ built: 2004 res: 1280x1024 hz: 60 dpi: 96 gamma: 1.2
+ size: 340x270mm (13.4x10.6") diag: 434mm (17.1") ratio: 5:4 modes:
+ max: 1280x1024 min: 720x400
+ Monitor\-2: VGA-1 pos: primary,left model: DELL 1908FP serial: <filter>
+ res: 1280x1024 hz: 60 gamma: 1.4 dpi: 86 gamma: 1.4
+ size: 380x300mm (15.0x11.8") diag: 484mm (19.1") ratio: 5:4 modes:
+ max: 1280x1024 min: 720x400
+ API: OpenGL v: 4.6 compat\-v: 4.5 vendor: x.org mesa v: 22.3.6
+ glx\-v: 1.4 direct\-render: yes renderer: AMD CEDAR (DRM 2.50.0 /
+ 6.4.3\-1\-liquorix\-amd64 LLVM 15.0.6) device\-ID: 1002:68f9
+ API: EGL v: 1.5 hw: drv: amd r600 platforms: device: 0
+ drv: r600 device: 1 drv: swrast surfaceless: drv: r600 wayland:
+ drv: r600 inactive: gbm,x11
.fi
-\- Adds, if present, possible \fBalternate:\fR kernel modules capable of driving
-each \fBDevice\-x\fR (not including the current \fBdriver:\fR). If no non\-driver
-modules found, shows nothing. NOTE: just because it lists a module does NOT mean it is
-available in the system, it's just something the kernel knows could possibly be used
-instead.
.TP
.B \-a \-I\fR
-Adds Packages, totals, per package manager totals, and number of lib
-packages detected per package manager. Also adds detected package managers
-with 0 packages listed. Moves to \fBRepos\fR if \fB\-ra\fR.
+\- Adds to \fBPower:\fR other hibernate and suspend available (\fBavail:\fR)
+states, hibernate suspend \fBimage:\fR size, and if any suspend failures
+(\fBfails:\fR), how many.
+
+\- Adds power daemons/services (\fBservices:\fR) running. Note not all services
+are daemons.
+
+\- Adds to Packages number of lib packages detected per package manager. Also
+adds detected package managers with 0 packages listed. Adds package manager
+tools (supported: rpm, dpkg, pkgtool) Moves to \fBRepos\fR if \fB\-ra\fR.
+
+\- Adds service control tool, tested for in the following order: \fBsystemctl
+rc\-service rcctl service sv /etc/rc.d /etc/init.d\fR. Can be useful to know
+which you need when using an unfamiliar machine.
.nf
\fBinxi \-aI
Info:
- ....
- Init: systemd v: 245 runlevel: 5 Compilers: gcc: 9.3.0 alt: 5/6/7/8/9
- Packages: apt: 3681 lib: 2096 rpm: 0 Shell: ksh v: A_2020.0.0 default: Bash
- v: 5.0.16 running in: kate inxi: 3.1.04
+ Memory: total: N/A available: 31.27 GiB used: 14.9 GiB (47.7%)
+ Processes: 651 Power: uptime: 8d 21h 32m states: freeze,mem,disk
+ suspend: deep avail: s2idle wakeups: 14 fails: 3 hibernate: platform
+ avail: shutdown,reboot,suspend,test_resume image: 12.49 GiB
+ services: upowerd,xfce4\-power\-manager Init: systemd v: 255
+ target: graphical (5) default: graphical tool: systemctl
+ Packages: pm: dpkg pkgs: 3960 libs: 2184 tools: apt,apt\-get,aptitude
+ pm: rpm pkgs: 0 Compilers: gcc: 13.2.0 alt: 5/6/8/9/10/11/12 Shell: Bash
+ v: 5.2.21 running\-in: xfce4\-terminal pinxi: 3.3.32\fR
.fi
.TP
-.B \-a \-j\fR, \fB\-a \-P\fR , \fB\-a \-P\fR
-\- Adds swappiness and vfs cache pressure, and a message to indicate
-if the value is the default value or not (Linux only, and only if available).
-If not the default value, shows default value as well, e.g.
+.B \-a \-j\fR (\fB\-\-swap\fR), \fB\-a \-P\fR [swap], \fB\-a \-P\fR [swap]
+\- Adds swappiness and vfs cache pressure, and a message to indicate if the
+value is the default value or not (Linux only, and only if available). If not
+the default value, shows default value as well, e.g.
For \fB\-P\fR per swap physical partition:
-\fBswappiness: 60 (default) cache pressure: 90 (default 100)\fR
+\fBswappiness: 60 (default) cache\-pressure: 90 (default 100)\fR
For \fB\-j\fR row 1 output:
-\fBKernel: swappiness: 60 (default) cache pressure: 90 (default 100)\fR
+\fBKernel: swappiness: 60 (default) cache\-pressure: 90 (default 100)\fR
+
+\- Adds zswap data for row 1 output:
+
+\fBzswap: [yes/no] compressor: [type] max-pool: xx%\fR
+
+\- Adds for zram swap type: active compression type, available compression
+types, and max compression streams.
+
+\- Adds device kernel major:minor number (Linux only).
+
+.TP
+.B \-a \-J\fR (\fB\-\-usb)\fR
+\- Adds, if available, USB speed in IEC units \fBMiB/s\fR or \fBGiB/s\fR (may
+be incorrect on BSDs due to non reliable data source). These are base 2 Bytes
+per second.
+
+\- Adds USB mode (Linux only), which is the technical terms the USB group uses
+to describe USB revisions. In cases where speed and rev are an unknown
+combination, (and probably at least one is wrong) shows message.
+
+There are no granular data sources in BSDs for accurate revision/lane/speed
+information, so mode cannot be determined.
+
+Sample:
+.nf
+\fB
+Hub\-1: 1\-0:1 info: hi\-speed hub with single TT ports: 14 rev: 2.0
+ speed: 480 Mb/s (57.2 MiB/s) lanes: 1 mode: 2.0 chip\-ID: 1d6b:0002
+ class\-ID: 0900
+Device\-1: 1-4:2 info: Wacom ET\-0405A [Graphire2 (4x5)] type: mouse
+ driver: usbhid,wacom interfaces: 1 rev: 1.1 speed: 1.5 Mb/s (183 KiB/s)
+ lanes: 1 mode: 1.0 power: 40mA chip\-ID: 056a:0011 class\-ID: 0301
+Hub\-2: 2\-0:1 info: Super\-speed hub ports: 8 rev: 3.1
+ speed: 10 Gb/s (1.16 GiB/s) lanes: 1 mode: 3.2 gen\-2x1 chip\-ID: 1d6b:0003
+ class\-ID: 0900
+Device\-1: 2\-8:5 info: SanDisk Ultra type: mass storage driver: usb\-storage
+ interfaces: 1 rev: 3.0 speed: 5 Gb/s (596.0 MiB/s) lanes: 1 mode: 3.2 gen\-1x1
+ power: 896mA chip\-ID: 0781:5581 class\-ID: 0806
+ serial: <filter>\fR
+.fi
+
+.TP
+.B \-a \-L\fR (\fB\-\-logical)
+\- Expands Component report, shows size / maj-min of components and devices, and
+mapped name for logical components. Puts each component/device on its own line.
+
+\- Adds maj-min to LV and other devices.
+
+.TP
+.B \-a \-m\fR
+\- Expands volts to include curr/min/max values even if they are all identical.
+
+\- Adds RAM module firmware version, if detected. Not common.
.TP
.B \-a \-n\fR, \fB\-a \-N\fR, \fB\-a \-i\fR
\- Adds, if present, possible \fBalternate:\fR kernel modules capable of driving
-each \fBDevice\-x\fR (not including the current \fBdriver:\fR). If no non\-driver
-modules found, shows nothing. NOTE: just because it lists a module does NOT mean it is
-available in the system, it's just something the kernel knows could possibly be used
-instead.
+each \fBDevice\-x\fR (not including the current \fBdriver:\fR). If no
+non\-driver modules found, shows nothing. NOTE: just because it lists a module
+does NOT mean it is available in the system, it's just something the kernel
+knows could possibly be used instead.
+
+\- Adds PCIe generation, and, if different than running PCIe generation, speed
+or lanes, \fBlink\-max: gen: speed: lanes:\fR (only items different from primary
+shown).
+
+\- Adds for USB devices USB mode (Linux only).
+
+\- Adds \fBInfo:\fR line (\fB\-n\fR, \fB\-i\fR only), with running network type
+\fBservices:\fR. Note not all services are daemons. For example,
+\fBNetworkManager\fR can be started with \fB\-\-no\-daemon\fR flag.
+
+.TP
+.B \-a \-o\fR
+\- Adds device kernel major:minor number (Linux only).
.TP
.B \-a \-p\fR,\fB\-a \-P\fR
-\- Adds raw partition size, including file system overhead, partition table, e.g.
+\- Adds raw partition size, including file system overhead, partition table,
+e.g.
-\fBraw size: 60.00 GiB\fR.
+\fBraw\-size: 60.00 GiB\fR.
\- Adds percent of raw size available to \fBsize:\fR item, e.g.
@@ -1270,181 +2482,315 @@ not the raw size.
\- Adds partition filesystem block size if found (requires root and blockdev).
+\- Adds device kernel major:minor number (Linux only).
+
.TP
.B \-a \-r\fR
-\- Adds Packages. See \fB\-Ia\fR
+\- Adds to \fBPackages:\fR report. See \fB\-Ia\fR
+
+.TP
+.B \-a \-R\fR
+\- Adds device kernel major:minor number (mdraid, Linux only).
+
+\- Adds, if available, component size, major:minor number (Linux only). Turns
+Component report to 1 component per line.
.TP
.B \-a \-S\fR
+\- Adds alternate kernel clock sources, if available (Linux only).
+
\- Adds kernel boot parameters to \fBKernel\fR section (if detected). Support
varies by OS type.
+\- Adds advanced desktop (\fBinfo:\fR) item, and version. Currently supports KDE
+Frameworks and version.
+
+\- Adds other available (\fBavail:\fR) screensavers/lockers in \fBtools:\fR
+section. These are ones installed, but not necessarily active or running.
+
+.TP
+.B \-a \-\-slots\fR
+\- Adds PCI children of the main slot bus ID, and their types and class IDs,
+recursively. Linux only, and only if detected. Sample:
+
+.nf
+\fBSlot: 0
+ type: PCIe
+ lanes: 16
+ status: in use
+ length: long
+ volts: 3.3
+ bus\-ID: 00:03.1
+ children:
+ 1: 07:00.0
+ class\-ID: 0300
+ type: display
+ 2: 07:00.1
+ class\-ID: 0403
+ type: audio\fR
+.fi
+
.SH ADVANCED OPTIONS
.TP
.B \-\-alt 40\fR
-Bypass \fBPerl\fR as a downloader option. Priority is: Perl (HTTP::Tiny),
-Curl, Wget, Fetch, (OpenBSD only) ftp.
+Bypass \fBPerl\fR as a downloader option. Priority is: Perl (HTTP::Tiny), Curl,
+Wget, Fetch, (OpenBSD only) ftp.
.TP
.B \-\-alt 41\fR
-Bypass \fBCurl\fR as a downloader option. Priority is: Perl (HTTP::Tiny),
-Curl, Wget, Fetch, (OpenBSD only) ftp.
+Bypass \fBCurl\fR as a downloader option. Priority is: Perl (HTTP::Tiny), Curl,
+Wget, Fetch, (OpenBSD only) ftp.
.TP
.B \-\-alt 42\fR
-Bypass \fBFetch\fR as a downloader option. Priority is: Perl (HTTP::Tiny),
-Curl, Wget, Fetch, (OpenBSD only) ftp.
+Bypass \fBFetch\fR as a downloader option. Priority is: Perl (HTTP::Tiny), Curl,
+Wget, Fetch, (OpenBSD only) ftp.
.TP
.B \-\-alt 43\fR
-Bypass \fBWget\fR as a downloader option. Priority is: Perl (HTTP::Tiny),
-Curl, Wget, Fetch, OpenBSD only: ftp
+Bypass \fBWget\fR as a downloader option. Priority is: Perl (HTTP::Tiny), Curl,
+Wget, Fetch, OpenBSD only: ftp
.TP
.B \-\-alt 44\fR
-Bypass \fBCurl\fR, \fBFetch\fR, and \fBWget\fR as downloader options. This
-basically forces the downloader selection to use \fBPerl 5.x\fR \fBHTTP::Tiny\fR,
-which is generally slower than \fBCurl\fR or \fBWget\fR but it may help bypass
-issues with downloading.
+Bypass \fBCurl\fR, \fBFetch\fR, and \fBWget\fR as downloader options. This
+basically forces the downloader selection to use \fBPerl 5.x\fR
+\fBHTTP::Tiny\fR, which is generally slower than \fBCurl\fR or \fBWget\fR but it
+may help bypass issues with downloading.
+
+.TP
+.B \-\-bt\-tool [bt\-adapter|btmgmt|hciconfig|rfkill]\fR
+See \fB\-\-force [tool name]\fR. Used to set \fB\-E\fR report tool.
.TP
.B \-\-dig\fR
-Temporary override of \fBNO_DIG\fR configuration item. Only use to test w/wo dig.
-Restores default behavior for WAN IP, which is use dig if present.
+Temporary override of \fBNO_DIG\fR configuration item. Only use to test w/wo
+dig. Restores default behavior for WAN IP, which is use dig if present.
.TP
.B \-\-display [:<integer>]\fR
-Will try to get display data out of X (does not usually work as root user).
-Default gets display info from display \fB:0\fR. If you use the format
-\fB\-\-display :1\fR then it would get it from display \fB1\fR instead,
-or any display you specify.
+Will try to get display data out of X (does not usually work as root user).
+Default gets display info from display \fB:0\fR. If you use the format
+\fB\-\-display :1\fR then it would get it from display \fB1\fR instead, or any
+display you specify.
-Note that in some cases, \fB\-\-display\fR will cause inxi to hang endlessly when
-running the option in console with Intel graphics. The situation regarding
-other free drivers such as nouveau/ATI is currently unknown. It may be that
-this is a bug with the Intel graphics driver \- more information is required.
+Note that in some cases, \fB\-\-display\fR will cause inxi to hang endlessly
+when running the option in console with Intel graphics. The situation regarding
+other free drivers such as nouveau/ATI is currently unknown. It may be that this
+is a bug with the Intel graphics driver \- more information is required.
-You can test this easily by running the following command out of X/display server:
-\fBglxinfo \-display :0\fR
+You can test this easily by running the following command out of X/display
+server: \fBglxinfo \-display :0\fR
If it hangs, \fB\-\-display\fR will not work.
.TP
.B \-\-dmidecode\fR
-Force use of \fBdmidecode\fR. This will override \fB/sys\fR data in some lines,
-e.g. \fB\-M\fR or \fB\-B\fR.
+Shortcut. See \fB\-\-force dmidecode\fR.
.TP
.B \-\-downloader [curl|fetch|perl|wget]\fR
Force inxi to use Curl, Fetch, Perl, or Wget for downloads.
.TP
-.B \-\-host\fR
-Turns on hostname in System line. Overrides inxi config file value (if set):
+.B \-\-force [option(s)]\fR
+Various force options to allow users to override defaults. Values can be given
+as a comma separated list:
-\fBSHOW_HOST='false'\fR \- Same as: \fBSHOW_HOST='true'\fR
+\fBinxi \-MJ --force dmidecode,lsusb\fR
-This is an absolute override, the host will always show no matter what
-other switches you use.
+\- \fBbt\-adapter\fR \- Force use of bt\-adapter tool in \fB\-E\fR.
+
+\- \fBbtmgmt\fR \- Force use of btmgmt tool in \fB\-E\fR.
+
+\- \fBcolors\fR \- Same as \fB\-Y \-2\fR . Do not remove colors from piped or
+redirected output.
+
+\- \fBdmidecode\fR \- Force use of \fBdmidecode\fR. This will override
+\fB/sys\fR data in some lines, e.g. \fB\-M\fR or \fB\-B\fR.
+
+\- \fBhddtemp\fR \- Force use of hddtemp instead of /sys temp data for disks.
+
+\- \fBifconfig\fR \- Force use of IF tool ifconfig for \fB\-i\fR.
+
+\- \fBip\fR \- Force use of IF ip tool for \fB\-i\fR (default).
+
+\- \fBlsusb\fR \- Forces the USB data generator to use \fBlsusb\fR as data
+source (default). Overrides \fBUSB_SYS\fR in user configuration file(s).
+
+\- \fBrfkill\fR \- Force use of rfkill tool in \fB\-E\fR. \fBrfkill\fR does not
+support mac address data.
+
+\- \fBrpm\fR, \fBpkg\fR \- Force override of disabled rpm package counts on
+primarily rpm run systems due to unacceptably slow execution times for this
+command:
+
+.nf
+\fBrpm \-qa \-\-nodigest \-\-nosignature\fR
+.fi
+
+Even on newer rpm systems, in virtual machines, running rpm package list query
+takes more than 0.15 seconds (compared to 0.01 to 0.05 for dpkg, pacman, pkgtool
+etc) for just this single feature, which is north of 10% of total execution time
+for \fBinxi \-bar\fR. On bare metal this can hit 1 second or more in our tests.
+Older systems have taken up to 30 seconds to run this command!
+
+For systems that support running rpm along with the primary package installer
+(dpkg/apt, pacman, and pkgtool/slackpkg), there are not going to be many rpms,
+if any, installed, so the command runs in those cases (if inxi can determine it
+is running in that type of system).
+
+\- \fBsensors\-sys\fR \- Force use of \fB/sys/class/hwmon\fR data for sensors
+(excluding ipmi sensors, which are their own line if present), skip
+\fBlm\-sensors\fR. Generally useful for testing since sys data is used if no
+lm\-sensors data was found anyway, but if \fBlm\-sensors\fR was installed, and
+returned no data, it's most likely if not nearly certain that \fB/sys\fR will
+also not return data.
+
+\- \fBudevadm\fR \- Forces use of udevadm as data source (currently \fB\-m\fR
+RAM data).
+
+\- \fBusb\-sys\fR \- Forces the USB data generator to use \fB/sys\fR as data
+source instead of \fBlsusb\fR (Linux only).
+
+\- \fBvmstat\fR \- Forces use of vmstat for memory data.
+
+\- \fBwayland\fR \- Forces use of Wayland, disables x tools glxinfo, xrandr,
+xdpyinfo.
+
+\- \fBwmctrl\fR \- Force \fBSystem\fR item \fBwm\fR to use \fBwmctrl\fR as data
+source, override default \fBps\fR source.
.TP
-.B \-\-indent\-min [integer]\fR
-Overrides default indent minimum value. This is the value that makes inxi change from
-wrapped line starters [like \fBInfo\fR] to non wrapped. If less than \fB80\fR,
-no wrapping will occur. Overrides internal default value and user configuration value:
+.B \-\-hddtemp\fR
+Shortcut. See \fB\-\-force hddtemp\fR.
-\fBINDENT_MIN=85\fR
+.TP
+.B \-\-html\-wan\fR
+Temporary override of \fBNO_HTML_WAN\fR configuration item. Only use to test
+w/wo HTML downloaders for WAN IP. Restores default behavior for WAN IP, which is
+use HTML downloader if present and if dig failed.
.TP
-.B \-\-limit [\-1 \- x]\fR
-Raise or lower max output limit of IP addresses for \fB\-i\fR. \fB\-1\fR removes limit.
+.B \-\-ifconfig\fR
+Shortcut. See \fB\-\-force ifconfig\fR.
.TP
.B \-\-man\fR
-Updates / installs man page with \fB\-U\fR if \fBpinxi\fR or using \fB\-U 3\fR dev branch.
-(Only active if \fB\-U\fR is is not disabled by maintainers).
+Updates / installs man page with \fB\-U\fR if \fBpinxi\fR or using \fB\-U 3\fR
+dev branch. (Only active if \fB\-U\fR is is not disabled by maintainers).
.TP
.B \-\-no\-dig\fR
Overrides default use of \fBdig\fR to get WAN IP address. Allows use of normal
-downloader tool to get IP addresses. Only use if dig is failing, since dig is much
-faster and more reliable in general than other methods.
+downloader tool to get IP addresses. Only use if dig is failing, since dig is
+much faster and more reliable in general than other methods.
.TP
-.B \-\-no\-host\fR
-Turns off hostname in System line. This is default when using \fB\-z\fR,
-for anonymizing inxi output for posting on forums or IRC. Overrides
-configuration value (if set):
+.B \-\-no\-doas\fR
+Skips the use of doas to run certain internal features (like \fBhddtemp\fR,
+\fBfile\fR) with doas. Not related to running inxi itself with doas/sudo or
+super user. Some systems will register errors which will then trigger admin
+emails in such cases, so if you want to disable regular user use of doas
+(which requires configuration to setup anyway for these options) just use
+this option, or \fBNO_DOAS\fR configuration item. See \fB\-\-no\-sudo\fR if
+you need to disable both types.
-\fBSHOW_HOST='true'\fR \- Same as: \fBSHOW_HOST='false'\fR
+.TP
+.B \-\-no\-html-wan\fR
+Overrides use of HTML downloaders to get WAN IP address. Use either only dig,
+or do not get wan IP. Only use if dig is failing, and the HTML downloaders are
+taking too long, or are hanging or failing.
-This is an absolute override, the host will not show no matter what other
-switches you use.
+Make permanent with \fBNO_HTML_WAN='true'\fR
.TP
.B \-\-no\-man\fR
-Disables man page install with \fB\-U\fR for master and active development branches.
-(Only active if \fB\-U\fR is is not disabled by maintainers).
+Disables man page install with \fB\-U\fR for master and active development
+branches. (Only active if \fB\-U\fR is is not disabled by maintainers).
+
+.TP
+.B \-\-no\-sensor\-force\fR
+Overrides user set \fBSENSOR_FORCE\fR configuration value. Restores default
+behavior.
.TP
.B \-\-no\-ssl\fR
-Skip SSL certificate checks for all downloader actions (\fB\-U\fR, \fB\-w\fR,
-\fB\-W\fR, \fB\-i\fR). Use if your system does not have current SSL certificate
-lists, or if you have problems making a connection for any reason. Works with
-\fBWget\fR, \fBCurl\fR, \fBPerl HTTP::Tiny\fRand \fBFetch\fR.
+Skip SSL certificate checks for all downloader actions (\fB\-U\fR, \fB\-w\fR,
+\fB\-i\fR). Use if your system does not have current SSL certificate lists, or
+if you have problems making a connection for any reason. Works with \fBWget\fR,
+\fBCurl\fR, \fBPerl HTTP::Tiny\fR and \fBFetch\fR.
.TP
.B \-\-no\-sudo\fR
-Skips the use of sudo to run certain internal features (like \fBhddtemp\fR, \fBfile\fR)
-with sudo. Not related to running inxi itself with sudo or super user. Some systems will
-register errors which will then trigger admin emails in such cases, so if you want to disable
-regular user use of sudo (which requires configuration to setup anyway for these options)
-just use this option, or \fBNO_SUDO\fR configuration item.
+Skips the use of sudo to run certain internal features (like \fBhddtemp\fR,
+\fBfile\fR) with sudo. Not related to running inxi itself with sudo or
+superuser. Some systems will register errors which will then trigger admin
+emails in such cases, so if you want to disable regular user use of sudo (which
+requires configuration to setup anyway for these options) just use this option,
+or \fBNO_SUDO\fR configuration item.
.TP
-.B \-\-output [json|screen|xml]\fR
-Change data output type. Requires \-\-output\-file if not \fBscreen\fR.
+.B \-\-pm\-type [package manager name]\fR
+For distro package maintainers only, and only for non apt, rpm, or pacman
+based systems. To be used to test replacement package lists for recommends
+for that package manager.
.TP
-.B \-\-output\-file [full path to output file|print]\fR
-The given directory path must exist. The directory path given must exist,
-The \fBprint\fR options prints to stdout.
-Required for non\-screen \fB\-\-output\fR formats (json|xml).
+.B \-\-rpm\fR, \fB\-\-pkg\fR
+Shortcut. See \fB\-\-force rpm\fR.
.TP
-.B \-\-partition\-sort [dev\-base|fs|id|label|percent\-used|size|uuid|used]\fR
-Change default sort order of partition output. Corresponds to \fBPARTITION_SORT\fR
-configuration item. These are the available sort options:
+.B \-\-sensors\-default\fR
+Overrides configuration values \fBSENSORS_USE\fR or \fBSENSORS_EXCLUDE\fR
+on a one time basis.
-\fBdev\-base\fR - \fB/dev\fR partition identifier, like \fB/dev/sda1\fR.
-Note that it's an alphabetic sort, so \fBsda12\fR is before \fBsda2\fR.
+.TP
+.B \-\-sensors\-exclude\fR
+Linux only. Similar to \fB\-\-sensors\-use\fR except removes listed sensors from
+sensor data. Make permanent with \fBSENSORS_EXCLUDE\fR configuration item. Note
+that gpu, network, disk, and other specific device monitor chips are excluded by
+default.
-\fBfs\fR \- Partition filesystem. Note that sorts will be somewhat random if all
-filesystems are the same.
+Example: \fBinxi \-sxx \-\-sensors\-exclude k10temp-pci-00c3\fR
-\fBid\fR \- Mount point of partition (default).
+.TP
+.B \-\-sensors\-sys\fR
+Shortcut. See \fB\-\-force sensors\-sys\fR
-\fBlabel\fR \- Label of partition. If partitions have no labels,
-sort will be random.
+.TP
+.B \-\-sensors\-use\fR
+Linux only. Use only the (comma separated) sensor arrays for \fB\-s\fR output.
+Make permanent with \fBSENSORS_USE\fR configuration item. Sensor array ID value
+must be the exact value shown in lm\-sensors sensors output (lm-sensors only) or
+use \fB\-s \-\-dbg 18\fR ('main' =>.. section) to see the sensor ID strings used
+internally. If you only want to exclude one (or more) sensors from the output,
+use \fB\-\-sensors\-exclude\fR.
-\fBpercent\-used\fR - Percentage of partition size used.
+Can be useful if the default sensor data used by inxi is not from the right
+sensor array. Note that all other sensor data will be removed, which may lead
+to undesired consequences. Please be aware that this can lead to many
+undesirable side\-effects, since default behavior is to use all the sensors
+arrays and select which values to use from them following a set sequence of
+rules. So if you force one to be used, you may lose data that was used from
+another one.
-\fBsize\fR \- KiB size of partition.
+Most likely best use is when one (or two) of the sensor arrays has all the
+sensor data you want, and you just want to make sure inxi doesn't use data
+from another array that has inaccurate or misleading data.
-\fBuuid\fR \- UUID of the partition.
+Note that gpu, network, disk, and other specific device monitor chips are
+excluded by default, and should not be added since they do not provide cpu,
+board, system, etc, sensor data.
-\fBused\fR \- KiB used of partition.
-
-.TP
-.B \-\-pm\-type [package manager name]\fR
-For distro package maintainers only, and only for non apt, rpm, or pacman based systems.
-To be used to test replacement package lists for recommends for that package manager.
+Example: \fBinxi \-sxx \-\-sensors\-use nct6791-isa-0290,k10temp-pci-00c3\fR
.TP
.B \-\-sleep [0\-x.x]\fR
Usually in decimals. Change CPU sleep time for \fB\-C\fR (current: \fB\0.35\fR).
-Sleep is used to let the system catch up and show a more accurate CPU use. Example:
+Sleep is used to let the system catch up and show a more accurate CPU use.
+Example:
\fBinxi \-Cxxx \-\-sleep 0.15\fR
@@ -1454,67 +2800,69 @@ Overrides default internal value and user configuration value:
.TP
.B \-\-tty\fR
-Forces internal IRC flag to off. Used in unhandled cases where the program running
-inxi may not be seen as a shell/tty, but it is not an IRC client. Put \fB\-\-tty\fR
-first in option list to avoid unexpected errors. If you want a specific
-output width, use the \fB\-\-width\fR option. If you want normal color codes in
-the output, use the \fB\-c [color ID]\fR flag.
+Forces internal IRC flag to off. Used in unhandled cases where the program
+running inxi may not be seen as a shell/pty/tty, but it is not an IRC client.
+Put \fB\-\-tty\fR first in option list to avoid unexpected errors. If you want
+a specific output width, use the \fB\-\-width\fR option. If you want normal
+color codes in the output, use the \fB\-c [color ID]\fR flag.
+
+The sign you need to use this is extra numbers before the key/value pairs of
+the output of your program. These are IRC, not TTY, color codes. Please post a
+codeberg.org issue if you find you need to use \fB\-\-tty\fR (including the full
+\fB\-Ixxx\fR line) so we can figure out how to add your program to the list of
+whitelisted programs.
-The sign you need to use this is extra numbers before the key/value pairs of the
-output of your program. These are IRC, not TTY, color codes. Please post a github
-issue if you find you need to use \fB\-\-tty\fR (including the full
-\fB\-Ixxx\fR line) so we can figure out how to add your program to the list
-of whitelisted programs.
+You can see what inxi believed started it in the \fB\-Ixxx\fR line,
+\fBShell:\fR or \fBClient:\fR item. Please let us know what that result was
+so we can add it to the parent start program whitelist.
-You can see what inxi believed started it in the \fB\-Ixxx\fR line, \fBShell:\fR or
-\fBClient:\fR item. Please let us know what that result was so we can add it to the
-parent start program whitelist.
+In some cases, you may want to also use \fB\-\-no\-filter\fR/\fB\-Z\fR option if
+you want to see filtered values. Filtering is turned on by default if \fBinxi\fR
+believes it is running in an IRC client.
.TP
.B \-\-usb\-sys\fR
-Forces the USB data generator to use \fB/sys\fR as data source
-instead of \fBlsusb\fR.
+Shortcut. See \fB\-\-force usb\-sys\fR
.TP
.B \-\-usb\-tool\fR
-Forces the USB data generator to use \fBlsusb\fR as data source. Overrides
-\fBUSB_SYS\fR in user configuration file(s).
+Shortcut. See \fB\-\-force lsusb\fR
.TP
.B \-\-wan\-ip\-url [URL]\fR
Force \fB\-i\fR to use supplied URL as WAN IP source. Overrides dig or
default IP source urls. URL must start with http[s] or ftp.
-The IP address from the URL must be the last item on the last (non\-empty) line
-of the page content source code.
+The IP address from the URL must be the last item on the last (non\-empty)
+line of the page content source code.
Same as configuration value (example):
\fBWAN_IP_URL='https://mysite.com/ip.php'\fR
.TP
+.B \-\-wayland\fR, \fB\-\-wl\fR
+Shortcut. See \fB\-\-force wayland\fR.
+
+.TP
.B \-\-wm\fR
-Force \fBSystem\fR item \fBwm\fR to use \fBwmctrl\fR as data source,
-override default \fBps\fR source.
+Shortcut. See \fB\-\-force wmctl\fR.
.SH DEBUGGING OPTIONS
-
.TP
-.B \-\-dbg 1\fR
-\- Debug downloader failures. Turns off silent/quiet mode for curl, wget, and
-fetch. Shows more downloader action information. Shows some more information
+.B \-\-dbg {[1\-x][,[1\-x]]}\fR
+Accepts one or more comma separated dbg specific debugging numbers.
+
+\fB1\fR \- Debug downloader failures. Turns off silent/quiet mode for curl, wget,
+and fetch. Shows more downloader action information. Shows some more information
for Perl downloader.
-.TP
-.B \-\-dbg [2\-xx]\fR
-\- See github \fBinxi-perl/docs/inxi-values.txt\fR for specific specialized debugging
-options. These can vary but tend to not change much, though they are added as
-needed.
+\fB1\-xx\fR \- See codeberg.org \fBinxi\-perl/docs/inxi\-values.txt\fR for
+specific specialized debugging options. There are a lot.
.TP
.B \-\-debug [1\-3]\fR
-\- On screen debugger output. Output varies depending on current needs
-Usually nothing changes.
+\- On screen debugger output.
.TP
.B \-\-debug 10\fR
@@ -1539,31 +2887,42 @@ other system data.
.TP
.B \-\-debug 21\fR
-Automatically uploads debugger data tar.gz file to \fIftp.techpatterns.com\fR,
+Automatically uploads debugger data tar.gz file to \fIftp.smxi.org\fR,
then removes the debug data directory, but leaves the debug tar.gz file.
See \fB\-\-ftp\fR for uploading to alternate locations.
.TP
.B \-\-debug 22\fR
-Automatically uploads debugger data tar.gz file to \fIftp.techpatterns.com\fR, then
+Automatically uploads debugger data tar.gz file to \fIftp.smxi.org\fR, then
removes the debug data directory and the tar.gz file.
See \fB\-\-ftp\fR for uploading to alternate locations.
.TP
+.B \-\-debug\-id [string]\fR
+Insert string to file name for debugger. This is helpful so you can add for
+instance a username to a debugger dataset to make it easy to find.
+
+Sample: \fB\-\-debug 22 \-\-debug\-id mrmazda\fR
+
+.TP
+.B \-\-fake\-data\-dir\fR
+Developer only: Change default location of $fake_data_dir, which is where files
+are for \fB\-\-fake {item}\fR items.
+
+.TP
.B \-\-ftp [ftp.yoursite.com/incoming]\fR
For alternate ftp upload locations: Example:
\fBinxi \-\-ftp \fIftp.yourserver.com/incoming\fB \-\-debug 21\fR
.SH DEBUGGING OPTIONS TO DEBUG DEBUGGER FAILURES
-
-Only used the following in conjunction with \fB\-\-debug 2[012]\fR, and only
+Only use the following in conjunction with \fB\-\-debug 2[012]\fR, and only
use if you experienced a failure or hang, or were instructed to do so.
.TP
.B \-\-debug\-proc\fR
-Force debugger to parse \fB/proc\fR directory data when run as root. Normally this is
-disabled due to unpredictable data in /proc tree.
+Force debugger to parse \fB/proc\fR directory data when run as root. Normally
+this is disabled due to unpredictable data in /proc tree.
.TP
.B \-\-debug\-proc\-print\fR
@@ -1583,16 +2942,16 @@ Skip /sys debugging in case of a hang.
.TP
.B \-\-debug\-sys\fR
-Force PowerPC debugger parsing of /sys as sudo/root.
+Force PowerPC debugger parsing of /sys as doas/sudo/root.
.TP
.B \-\-debug\-sys\-print\fR
Use this to locate file that /sys debugger hangs on.
.SH SUPPORTED IRC CLIENTS
-BitchX, Gaim/Pidgin, ircII, Irssi, Konversation, Kopete, KSirc, KVIrc, Weechat,
-and Xchat. Plus any others that are capable of displaying either built\-in or external
-script output.
+BitchX, Gaim/Pidgin, ircII, Irssi, Konversation, Kopete, KSirc, KVIrc,
+Weechat, and Xchat. Plus any others that are capable of displaying either
+built\-in or external script output.
.SH RUNNING IN IRC CLIENT
To trigger inxi output in your IRC client, pick the appropriate method from the
@@ -1608,8 +2967,8 @@ IRC client.
.B /cmd inxi
\fR[\fBoptions\fR]
-To run inxi in Konversation as a native script if your distribution or inxi package
-hasn't already done this for you, create this symbolic link:
+To run inxi in Konversation as a native script if your distribution or inxi
+package hasn't already done this for you, create this symbolic link:
KDE 4:
.B ln \-s /usr/local/bin/inxi /usr/share/kde4/apps/konversation/scripts/inxi
@@ -1625,6 +2984,13 @@ the Konversation \fR/inxi\fR command to work:
.B ln \-s /usr/share/konversation /usr/share/apps/
+Make sure you also have the \fRqdbus\-qt5\fR package (Debian/Ubuntu + derived),
+\fRqt5\-qttools\fR (Fedora/RHEL/SUSE + derived), \fRqt5\-tools\fR (Arch +
+derived) installed (for KDE 5/QT 5, check distros for future package names),
+\fRqt5\-tools\fR (Arch + derived). Check your distro if the program is missing.
+Depending on the distro, \fR/usr/lib/qt5/bin/qdbus\fR is required, which in
+Debian+ is provided by the above package.
+
Then you can start inxi directly, like this:
.B /inxi
@@ -1646,15 +3012,31 @@ have dropped the \fB\-curses\fR part of their program name, i.e.:
inxi will read its configuration/initialization files in the
following order:
-\fB/etc/inxi.conf\fR contains the default configurations. These can be overridden
-by user configurations found in one of the following locations (inxi will
-store its config file using the following precedence:
+\fB/etc/inxi.conf\fR contains the default configurations. These can be
+overridden by creating a \fB/etc/inxi.conf.d/inxi.conf\fR file (global
+override), which will prevent distro packages from changing or overwriting your
+edits. This method is recommended if you are using a distro packaged inxi and
+want to override some global configuration items from the package's default
+\fB/etc/inxi.conf\fR file but don't want to lose your changes on a package
+update.
+
+In case the distro is using either \fB/usr/etc\fR or \fB/usr/local/etc\fR as non
+core tool default location, inxi will use those paths instead, with the
+\fBinxi.conf.d/inxi.conf\fR override option.
+
+You can also override, per user, with a user configuration file found in one of
+the following locations (inxi will store its config file using the following
+precedence):
+
if \fB$XDG_CONFIG_HOME\fR is not empty, it will go there, else if
-\fB$HOME/.conf/inxi.conf\fR exists, it will go there, and as a last default,
+\fB$HOME/.config/inxi.conf\fR exists, it will go there, and as a last default,
the legacy location is used), i.e.:
-\fB$XDG_CONFIG_HOME/inxi.conf\fR > \fB$HOME/.conf/inxi.conf\fR >
-\fB$HOME/.inxi/inxi.conf\fR
+\fB$XDG_CONFIG_HOME/inxi.conf\fR > \fB$HOME/.config/inxi.conf\fR >
+\fB$HOME/.inxi/inxi.conf\fR > \fB/usr/etc/inxi.conf\fR >
+\fB/usr/etc/inxi.conf.d/inxi.conf\fR > \fB/usr/local/etc/inxi.conf\fR >
+\fB/usr/local/etc/inxi.conf.d/inxi.conf\fR > \fB/etc/inxi.conf.d/inxi.conf\fR >
+\fB/etc/inxi.conf\fR
.SH CONFIGURATION OPTIONS
@@ -1666,76 +3048,111 @@ these up, and for a complete list of options:
.B Basic Options
Here's a brief overview of the basic options you are likely to want to use:
-\fBCOLS_MAX_CONSOLE\fR The max display column width on terminal.
+\fBCOLS_MAX_CONSOLE\fR The max display column width on terminal. If
+terminal/console width or \fB\-\-width\fR is less than wrap width, wrapping of
+line starter occurs
\fBCOLS_MAX_IRC\fR The max display column width on IRC clients.
-\fBCOLS_MAX_NO_DISPLAY\fR The max display column width in console, out of GUI desktop.
+\fBCOLS_MAX_NO_DISPLAY\fR The max display column width in out of X / Wayland /
+desktop / window manager.
-\fBCPU_SLEEP\fR Decimal value \fB0\fR or more. Default is usually around \fB0.35\fR
-seconds. Time that inxi will 'sleep' before getting CPU speed data, so that it
-reflects actual system state.
+\fBCPU_SLEEP\fR Decimal value \fB0\fR or more. Default is usually around
+\fB0.35\fR seconds. Time that inxi will 'sleep' before getting CPU speed data,
+so that it reflects actual system state.
\fBDOWNLOADER\fR Sets default inxi downloader: curl, fetch, ftp, perl, wget.
-See \fB\-\-recommends\fR output for more information on downloaders and Perl downloaders.
+See \fB\-\-recommends\fR output for more information on downloaders and Perl
+downloaders.
-\fBFILTER_STRING\fR Default \fB<filter>\fR. Any string you prefer to see instead
-for filtered values.
+\fBFILTER_STRING\fR Default \fB<filter>\fR. Any string you prefer to see
+instead for filtered values.
-\fBINDENT_MIN\fR The point where the line starter wrapping to its own line happens.
-Overrides default. See \fB\-\-indent\-min\fR. If \fB80\fR or less, wrap will never happen.
+\fBINDENT\fR Change primary indent width of wide mode output. See
+\fB\-\-indent\fR.
-\fBLIMIT\fR Overrides default of \fB10\fR IP addresses per IF. This is only of interest
-to sys admins running servers with many IP addresses.
+\fBINDENTS\fR Change primary indents of narrow wrapped mode output, and second
+level indents. See \fB\-\-indents\fR.
-\fBNO_DIG\fR Set to \fB1\fR or \fBtrue\fR to disable WAN IP use of \fBdig\fR and force
-use of alternate downloaders.
+\fBLIMIT\fR Overrides default of \fB10\fR IP addresses per IF. This is only of
+interest to sys admins running servers with many IP addresses.
-\fBNO_SUDO\fR Set to \fB1\fR or \fBtrue\fR to disable internal use of \fBsudo\fR.
+\fBLINES_MAX\fR Values: [\-2\-xxx]. See \fB\-Y\fR for explanation and values.
+Use \fB\-Y \-3\fR to restore default unlimited output lines. Avoid using this in
+general unless the machine is a headless system and you want the output to be
+always controlled.
+
+\fBMAX_WRAP\fR (or \fBWRAP_MAX\fR) The maximum width where the line starter
+wraps to its own line. If terminal/console width or \fB\-\-width\fR is less than
+wrap width, wrapping of line starter occurs. Overrides default. See
+\fB\-\-max\-wrap\fR. If \fB80\fR or less, wrap will never happen.
+
+\fBNO_DIG\fR Set to \fB1\fR or \fBtrue\fR to disable WAN IP use of \fBdig\fR
+and force use of alternate downloaders.
+
+\fBNO_DOAS\fR Set to \fB1\fR or \fBtrue\fR to disable internal use of
+\fBdoas\fR.
+
+\fBNO_HTML_WAN\fR Set to \fB1\fR or \fBtrue\fR to disable WAN IP use of
+\fBHTML Downloaders\fR and force use of dig only, or nothing if dig disabled
+as well. Same as \fB\-\-no\-html\-wan\fR. Only use if dig is failing, and
+HTML downloaders are hanging.
+
+\fBNO_SUDO\fR Set to \fB1\fR or \fBtrue\fR to disable internal use of
+\fBsudo\fR.
\fBPARTITION_SORT\fR Overrides default partition output sort. See
\fB\-\-partition\-sort\fR for options.
-\fBPS_COUNT\fR The default number of items showing per \fB\-t\fR type, \fBm\fR or
-\fBc\fR. Default is 5.
+\fBPS_COUNT\fR The default number of items showing per \fB\-t\fR type, \fBm\fR
+or \fBc\fR. Default is 5.
+
+\fBSENSORS_CPU_NO\fR In cases of ambiguous temp1/temp2 (inxi can't figure out
+which is the CPU), forces sensors to use either value 1 or 2 as CPU
+temperature. See the above configuration page on smxi.org for full info.
-\fBSENSORS_CPU_NO\fR In cases of ambiguous temp1/temp2 (inxi can't figure out which
-is the CPU), forces sensors to use either value 1 or 2 as CPU temperature. See the
-above configuration page on smxi.org for full info.
+\fBSENSORS_EXCLUDE\fR Exclude supplied sensor array[s] from sensor output.
+Override with \fB\-\-sensors\-default\fR. See \fB\-\-sensors\-exclude\fR.
-\fBSEP2_CONSOLE\fR Replaces default key / value separator of '\fB:\fR'.
+\fBSENSORS_USE\fR Use only supplied sensor array[s]. Override with
+\fB\-\-sensors\-default\fR. See \fB\-\-sensors\-use\fR.
+
+\fBSEP2_CONSOLE\fR Replaces default key / value separator of '\fB:\fR'. Test
+with \fB\-\-separator\fR.
\fBUSB_SYS\fR Forces all USB data to use \fB/sys\fR instead of \fBlsusb\fR.
-\fBWAN_IP_URL\fR Forces \fB\-i\fR to use supplied URL, and to not use dig (dig is
-generally much faster). URL must begin with http or ftp. Note that if you use this,
-the downloader set tests will run each time you start inxi whether a downloader feature
-is going to be used or not.
+\fBWAN_IP_URL\fR Forces \fB\-i\fR to use supplied URL, and to not use dig
+(dig is generally much faster). URL must begin with http or ftp. Note that if
+you use this, the downloader set tests will run each time you start inxi
+whether a downloader feature is going to be used or not.
-The IP address from the URL must be the last item on the last (non\-empty) line of
-the URL's page content source code.
+The IP address from the URL must be the last item on the last (non\-empty)
+line of the URL's page content source code.
Same as \fB\-\-wan\-ip\-url [URL]\fR
-\fBWEATHER_SOURCE\fR Values: [\fB0-9\fR]. Same as \fB\-\-weather\-source\fR. Values
-4\-9 are not currently supported, but this can change at any time.
+\fBWEATHER_SOURCE\fR Values: [\fB0-9\fR]. Same as \fB\-\-weather\-source\fR.
+Values 4\-9 are not currently supported, but this can change at any time.
-\fBWEATHER_UNIT\fR Values: [\fBm\fR|\fBi\fR|\fBmi\fR|\fBim\fR]. Same as \fB\-\-weather\-unit\fR.
+\fBWEATHER_UNIT\fR Values: [\fBm\fR|\fBi\fR|\fBmi\fR|\fBim\fR]. Same as
+\fB\-\-weather\-unit\fR.
.TP
.B Color Options
-It's best to use the \fB\-c [94\-99]\fR color selector tool to set the following values
-because it will correctly update the configuration file and remove any invalid
-or conflicting items, but if you prefer to create your own configuration files,
-here are the options. All take the integer value from the options available in
-\fB\-c 94\-99\fR.
+It's best to use the \fB\-c [94\-99]\fR color selector tool to set the
+following values because it will correctly update the configuration file and
+remove any invalid or conflicting items, but if you prefer to create your own
+configuration files, here are the options. All take the integer value from the
+options available in \fB\-c 94\-99\fR.
-NOTE: All default and configuration file set color values are removed when output is
-piped or redirected. You must use the explicit \fB\-c <color number>\fR option
-if you want colors to be present in the piped/redirected output (creating a PDF for
-example).
+NOTE: All default and configuration file set color values are removed when
+output is piped or redirected. You must use the explicit
+\fB\-c [color number]\fR option if you want colors to be present in the
+piped/redirected output (creating a PDF for example).
-\fBCONSOLE_COLOR_SCHEME\fR The color scheme for console output (not in X/Wayland).
+\fBCONSOLE_COLOR_SCHEME\fR The color scheme for console output (not in
+X/Wayland).
\fBGLOBAL_COLOR_SCHEME\fR Overrides all other color schemes.
@@ -1745,33 +3162,48 @@ example).
\fBIRC_X_TERM_COLOR_SCHEME\fR In X/Wayland IRC client terminal color scheme.
-\fBVIRT_TERM_COLOR_SCHEME\fR Color scheme for virtual terminal output (in X/Wayland).
+\fBVIRT_TERM_COLOR_SCHEME\fR Color scheme for virtual terminal output (in
+X/Wayland).
+
+.TP
+.B Developer Options
+These are useful only for developers.
+
+\fBFAKE_DATA_DIR\fR \- change default fake data directory location. See
+\fB\-\-fake\-data\-dir\fR.
.SH BUGS
Please report bugs using the following resources.
-You may be asked to run the inxi debugger tool (see \fB\-\-debug 21/22\fR), which will
-upload a data dump of system files for use in debugging inxi. These data dumps are
-very important since they provide us with all the real system data inxi uses to parse
-out its report.
+You may be asked to run the inxi debugger tool (see \fB\-\-debug 21/22\fR),
+which will upload a data dump of system files for use in debugging inxi. These
+data dumps are very important since they provide us with all the real system
+data inxi uses to parse out its report.
.TP
.B Issue Report
File an issue report:
-.I https://github.com/smxi/inxi/issues
+.I https://codeberg.org/smxi/inxi/issues
.TP
-.B Developer Forums
-Post on inxi developer forums:
-.I https://techpatterns.com/forums/forum\-32.html
+.B Forums
+Post on inxi forums:
+.I https://techpatterns.com/forums/forum\-33.html
.TP
-.B IRC irc.oftc.net#smxi
-You can also visit
-.I irc.oftc.net
-\fRchannel:\fI #smxi\fR to post issues.
+.B IRC irc.oftc.net\fR / \fBirc.libera.chat\fR
+You can also visit \fRchannel:\fI #smxi\fR to post issues on either network.
.SH HOMEPAGE
-.I https://github.com/smxi/inxi
+.I https://codeberg.org/smxi/inxi
+\fR \- Home of inxi source repository
+
+.I https://codeberg.org/smxi/pinxi
+\fR \- Home of pinxi (inxi development version), docs and data.
.I https://smxi.org/docs/inxi.htm
+\fR \- The main docs for inxi. See pinxi repository for more technical
+resources.
+
+.I https://fosstodon.org/@smxi
+\fR \- Follow @smxi on Mastodon!
.SH AUTHOR AND CONTRIBUTORS TO CODE
@@ -1779,16 +3211,17 @@ You can also visit
is a fork of \fBlocsmif\fR's very clever \fBinfobash\fR script.
Original infobash author and copyright holder:
-Copyright (C) 2005\-2007 Michiel de Boer aka locsmif
+Copyright (C) 2005\-2007 Michiel de Boer aka locsmif
-inxi version: Copyright (C) 2008\-20 Harald Hope
+inxi version: Copyright (C) 2008\-2023 Harald Hope
This man page was originally created by Gordon Spencer (aka aus9) and is
maintained by Harald Hope (aka h2 or TechAdmin).
Initial CPU logic, konversation version logic, occasional maintenance fixes,
and the initial xiin.py tool for /sys parsing (obsolete, but still very much
-appreciated for all the valuable debugger data it helped generate): Scott Rogers
+appreciated for all the valuable debugger data it helped generate):
+Scott Rogers
Further fixes (listed as known):
@@ -1796,18 +3229,23 @@ Horst Tritremmel <hjt at sidux.com>
Steven Barrett (aka: damentz) \- USB audio patch; swap percent used patch.
-Jarett.Stevens \- \fBdmidecode \-M\fR patch for older systems with no \fB/sys\fR.
+Jarett.Stevens \- \fBdmidecode \-M\fR patch for older systems with no
+\fB/sys\fR.
.SH SPECIAL THANKS TO THE FOLLOWING
-The nice people at irc.oftc.net channels #linux\-smokers\-club and #smxi,
-who all really have to be considered to be co\-developers because of their
-non\-stop enthusiasm and willingness to provide real\-time testing and debugging
-of inxi development.
+The nice people at irc.oftc.net channels #linux\-smokers\-club and #smxi, who
+all really have to be considered to be co\-developers because of their non\-stop
+enthusiasm and willingness to provide real\-time testing and debugging of inxi
+development over the years.
-Siduction forum members, who have helped get some features working by providing
-a large number of datasets that have revealed possible variations, particularly for the
-RAM \fB\-m\fR option.
+LinuxQuestions.org Slackware forum members, for major help with development and
+debugging new or refactored features, particularly the redone CPU logic of
+2021\-12.
+
+Siduction forum members, who have helped get some features working by providing
+a large number of datasets that have revealed possible variations, particularly
+for the RAM \fB\-m\fR option.
AntiX users and admins, who have helped greatly with testing and debugging,
particularly for the 3.0.0 release.
@@ -1816,17 +3254,27 @@ ArcherSeven (Max), Brett Bohnenkamper (aka KittyKatt), and Iotaka, who always
manage to find the weirdest or most extreme hardware and setups that help make
inxi much more robust.
-For the vastly underrated skill of output error/glitch catching, Pete Haddow. His
-patience and focus in going through inxi repeatedly to find errors and inconsistencies
-is much appreciated.
+For the vastly underrated skill of output error/glitch catching, Pete Haddow.
+His patience and focus in going through inxi repeatedly to find errors and
+inconsistencies is much appreciated.
+
+For a huge boost to BSD support, Stan Vandiver, who did a lot of testing
+and setup many remote access systems for testing and development.
+
+For testing, bug finding, suggestions, feature requests, MrMazda. He has over
+the years has helped shape inxi into what it is today, in particular but not
+limited to, the Graphics features.
All the inxi package maintainers, distro support people, forum moderators,
and in particular, sys admins with their particular issues, which almost always
-help make inxi better, and any others who contribute ideas, suggestions, and patches.
+help make inxi better, and any others who contribute ideas, suggestions, and
+patches.
+
+Without a wide range of diverse Linux kernel\-based Free Desktop systems to
+test on, we could never have gotten inxi to be as reliable and solid as it's
+turning out to be.
-Without a wide range of diverse Linux kernel\-based Free Desktop systems to test
-on, we could never have gotten inxi to be as reliable and solid as it's turning
-out to be.
+And of course, a big thanks to locsmif, who figured out a lot of the core
+ideas, logic, and tricks originally used in inxi Gawk/Bash.
-And of course, a big thanks to locsmif, who figured out a lot of the core methods,
-logic, and tricks originally used in inxi Gawk/Bash.
+.\" EOF
diff --git a/inxi.changelog b/inxi.changelog
index 83b7cbe..b1fb5b5 100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,281 +1,8815 @@
-=====================================================================================
+================================================================================
+Version: 3.3.33
+Patch: 00
+Date: 2024-02-06
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+A quick point release, one critical bug fix, and a few new features and
+enhancements. Extended the running service from Info: Power: services: to
+Network: Info: services:. The PsData refactor makes this quite easy to do. So
+why not?
+
+Also in terms of general usability, added an error handler for options that
+require primary options to be meaningful, that was already there for --label and
+--uuid, but there are several other similar modifier options that were not
+handled.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. GRAPHICS: Codeberg user malcolmlewis, for being the first to find a fatal bug
+(see BUGS 1) in the newly shipped inxi 3.3.32 codebase. Not complex bug, just
+stupid coding error.
+
+2. OPTIONS: mrmazda has been wanting an options handler that tells users when
+they use an option that only modifies another, without using the primary option.
+That is now working.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. INFO/NETWORK: Terminology: daemon/service/process: following:
+https://serverfault.com/questions/129055/is-there-a-difference-between-a-\
+daemon-and-a-service
+
+* A "Service" could refer to either a Daemon or a Service.
+
+* A daemon is a subset of services that always run in memory waiting to service
+a request.
+
+For example, NetworkManager can be started with --no-daemon option, but still
+be running as an active service, thus, there is a difference.
+
+Note that to remove this ambiguity we use the term: services:
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. GRAPHICS: GraphicsItem::map_monitor_ids(): a stray bit of old syntax tripped
+an impossible data error. Cause was accidentally make a array index be an index
+pointing to an array reference index, leading to failure. Thanks codeberg user
+malcolmlewis for triggering this case, which is not super easy to trip. Never
+tripped in any recent testing, but valid and a bug.
+https://codeberg.org/smxi/inxi/issues/298
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. DistroData: Removed a stray print debugger.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. SYSTEM: DistroData: Added final distro/base name cleaners, remove duplicate
+'words' that are not numbers from the distro name if they occur in base name.
+Also handles a corner case where name and base are the same string, then it
+just sets base to empty. Only runs with -Sx and successful name and base
+detection.
+
+2. OPTIONS: Moved and updated these from Output Control section to main options:
+
+* Added --ip-limit as synonym for --limit so it fits better with --ip.
+
+* Added --partition-sort, --ps to --partitions-sort, that makes it fit better
+with --partition/--partition-full. It only shows --partitions*, but supports
+either syntax so it doesn't matter how you remember it.
+
+* Added new error handler type: arg-modifier which is used to show missing
+primary option when primary option modifier is used, like --sleep/-C,
+-p/--partitions-sort, -l/-p, and so on.
+
+3. MACHINE: --uuid/-u now also activates UUID item, like partitions. Keeping
+-a adding behavior since we want all that info, but make use of -u consistent
+now that using uuid in machine report. Not common though.
+
+4. NETWORK: -n/-i -a now trip a services: report, with a new line:
+Info: services: [services]. These can be daemons or services, same as with Power
+services:.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1a. MAN/OPTIONS: Re-arranged option locations, moved back to their modified
+options in primary options. Those didn't fit there, they should have been next
+to the options they modify.
+
+* Moved --partition-sort back up to --partitions [from Output Control sections]
+
+* Moved --limit to --ip-limit next to --ip [from Output Control sections].
+
+1b. MAN/OPTIONS: changed daemons: to services:
+
+2. INFO: changed Power:... daemons: to services: due to the fact not all
+services are daemons, and some potential daemons can be started explicitly with
+--no-daemon flag (like NetworkManager), which means it is false to say it's a
+daemon.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1a. MAN/OPTIONS: See Change 1, moved --partitions-sort, --limit, back up to main
+options they modify to make it more readily obvious they belong together.
+
+2a. DOCS: inxi-battery.txt: updated, added TLP/tlp-stat info.
+
+2b. DOCS: inxi-network.txt: added DAEMONS tools section.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1a. DEBUG: moved the DesktopData::de_wm_debugger() to
+main::feature_debugger(). This is a useful tool and will be used for other
+complex user data debugging requirements where clear output helps develop and
+debug issue. Very useful for --dbg 63 so making general tool. Also used for new
+--dbg 66, DistroData, which works in similar way.
+
+1b. DEBUG: Added to SystemDebugger 'tlp-stat -s', forgot that one.
+
+1c. DEBUG: Added --dbg 66 for DistroData, like 63 for DesktopData.
+
+2. SYSTEM: DistroData: refactored to use primary $distro hash ref, this is also
+what is passed back to the System line generator now. Switched most variables to
+be hash keys, this allows for debugging and tracking what trips the distro data
+for --dbg 66, for logging, and to more rapidly check/add/update distro/base IDs.
+
+3a. CORE: OptionsHandler: small refactor, moved pledge block to set_pledge(),
+and moved all option modifier tests to check_modifiers(). This makes it more
+obvious each set is its own set of actions, and is easier to maintain.
+
+3b. CORE: main::error_handler(): new type: arg-modifier: used in 3a.
+
+3c. CORE: main::make_list_value() replaces main::set_join_sep(), now lists that
+can be too long and require a space after separator are generated all by
+reference, making for easier and more consistent long value outputs.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 06 Feb 2024 15:16:01 -0800
+
+================================================================================
+Version: 3.3.32
+Patch: 00
+Date: 2024-01-30
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+PACKAGERS: The code repo for inxi is codeberg.org/smxi/inxi. If you have not yet
+changed your packaging source url, you will need to do that. I have extended for
+a few months the mirror of codeberg inxi to github, but I will turn that mirror
+off fairly soon. The pinxi inxi-perl branch mirror is already turned off.
+
+--------------------------------------------------------------------------------
+
+This is a massive upgrade, featuring many core tool refactors, leading to
+significantly enhanced abilities to debug and add support for various features,
+particularly desktop type data, but any software type version reports as well.
+
+Many parts of the core logic have been touched, and the testing has been the
+most vigorous in recent memory, thanks to antiX and Slackware, and mrmazda, in
+particular for their significant help making these new features and upgrades
+far less buggy out of the box than would have otherwise been possible.
+
+* Finally, a reasonable quality RAM report for Linux with dmi table RAM data,
+without needing dmidecode or root! Uses udevadm, which despite some fairly
+significant weak poinots, is ok, except for issues like module voltage, which
+are stuck at a false value of 1. Also multi memory array system boards have poor
+to no native handling, so inxi tries to work around that failing.
+
+* A big improvement in ability to match xrandr X port ID to DRM port IDs, using
+a stable value found in each. This has been a long standing weak spot for multi
+monitor display IDs.
+
+* Power data, for suspend/hibernate, screensavers, closes a recent issue #292
+from chromer030. This also extended to running power daemons, and in -S, Desktop
+report, added screensaver and lockers in tools:.
+
+* A huge upgrade to all core Desktop/wm data, including new data types, complete
+internal refactoring, including of all program version data, ps based data, etc.
+This will massively reduce the risk of errors, bugs, etc, in the future, and
+also makes debugging and adding support for new de/wm far easier.
+
+* Note this change: Desktop info: has been repurposed to the new advanced DE
+info report (KDE Frameworks only currently), and the old info:, which was never
+well named, now is called with:, because it's a report on the various parts, or
+components, that make up the de/wm. Also the order was changed in the Desktop
+line: Desktop: v: [tk: [v:]] [info: v:] [wm: [v:]] [with:] [tools:] [dm:/lm:].
+
+* A big upgrade in the TinyX logic, which should work now to get resolutions for
+TinyCore and possibly other tiny x using distros. That includes detections for
+all known TinyX servers, not just Xvesa.
+
+* With TinyX fixes, now has full support for Slitaz, package manager, distro id,
+repos. And Alpine Linux was enhanced and upgraded re support as well with these
+fixes.
+
+OPTIONS REMOVAL/DEPRECATION:
+To free up upper case single letter options, merged -W with -w and removed -W,
+which now trips a removed option error. To prepare for -V being removed, that
+shows a deprecated message then the full version.
+
+Note that if you really care and want -V retained, file an issue, or contact
+inxi and say so. It will only really take one person who has a preference to
+retain -V to keep it. That will be decided next inxi, if nobody cared, then -V
+will be removed. Ideally say why you care, and why typing --vf is too much.
+
+The use of -W was always an error, forced I think by some options handling
+limits of bash. -V was just to have a single letter --version, but I think given
+-v is verbosity, -V is actually slightly confusing. Also, single letter options
+are in short supply now, and there's no point in wasting them on stuff where
+it's not really needed to get fast easy output for features.
+
+Also removed the long since deprecated --gpu, --nvidia, --nv, were removed, and
+will show option removed message.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. GRAPHICS: Android compositor: Thanks codeberg.org/smxi/inxi issue poster
+Mhowser for providing an Android data set from a rooted FxTec Pro1-X phone,
+which gave enough info to polish up and add some more Android support. But only
+on rooted devices, but Android doesn't let you learn much if the device is not
+rooted. That issue is lost because it was put on pinxi issues, before pinxi
+was switched to use inxi issues to avoid confusion.
+
+2. DOCS: data/audio/audio-datasets: mrmazda provided his large collection of
+audio data debuggers, which have alsa, systemctl, pulse, etc, debugging data.
+
+3. ONGOING: mrmazda, for finding and forwarding subtle to not so subtle issues.
+See Bugs 4, Fixes 6b. In this case pointed me to the relevant forum posting that
+exposed the error, which was enough to track it down.
+
+4. SYSTEM: DesktopData: The people over at antiX forums were really helpful
+finding/testing the new desktop/wm etc logic. Many glitches, errors, bugs, etc,
+found and corrected thanks to the excellent testing. ile and abc-nix in
+particular found some significant issues that were finally resolved. Also thanks
+to Brian Masinick, rokytnji, anticapitalista for helping making antiX for all
+these years.
+
+https://www.antixforum.com/forums/topic/testing-pinxi-next-inxi-user-ram-\
+report-no-root-sudo-and-much-more/
+
+5. RAM: The new udevadm was significantly improved and corrected thanks to the
+Slackware forums people. As is often the case, when it comes to having complex
+non-standard hardware, they came though, and exposed some key problems which let
+this new feature come out the door in much better shape than it would otherwise
+have done.
+
+https://www.linuxquestions.org/questions/slackware-14/new-inxi-pinxi-\
+features-user-ram-reports-and-much-more-testers-4175732843/
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1a. SYSTEM: DistroData: no obvious way to detect edubuntu, bunsenlabs, sorry.
+
+1b. SYSTEM: CompilerVersion::version_proc(): the /proc/version string is far
+too unreliable because distros keep making up new syntaxes, which makes regex
+parsing fail consistently over time. Ubuntu was the latest culprit. Need a
+better data source, ideally from /sys. Latest breaks handled with much looser
+regex, but only matter of time before a new string pattern breaks it.
+
+2. GRAPHICS: No API type data so far for non Xvesa TinyX servers. They don't
+seem to support the -list option like Xvesa does.
+
+3a. CORE: very old busybox ps did not accept any arguments, so will always fail.
+However, this is not important since new busybox has supported that for a long
+time.
+
+3b. CORE: in some cases, ps -wwjp $pppid truncates long command names, like
+io.elementary.t[erminal]. No idea why since -ww is supposed to make it not
+truncate.
+
+4. CPU: for at least AMD Threadripper 2950x 16 core, 2 die, core counts are
+wrong, but since I never got the required data, and can't guess, that will
+remain wrong until I get data from a comparable CPU to debug it using the CPU
+data pairs required to figure it out. Why people file issues that only their
+system data can resolve, then refuse to supply that data, is beyond me, I was
+hoping to get away from this type of problem by going to codeberg, but
+apparently it's a universal issue. My guess is that for the Zen+ only series, >
+1 die, the core numbers were per die, not per physical CPU as with all other
+AMDs and Intels. Just a guess though, not going to act on it because fix is very
+hard if that's the case, and I won't work on it without the real data.
+
+5. RAM: udevadm data:
+
+* For some reason, voltages are reported as 1, for all types, or not at all.
+This is almost certainly a bug with udevadm or the way it collects data, so inxi
+shows note: check when they are all equal to 1.
+
+* Unfortunately the udevadm authors neglected to provide RAM array and matching
+device handles so we can easily match array to device, and they also totally
+neglected reporting on actual arrays found, for systems with > 1 array, they
+list only the specs for the one array. inxi has to do the work to actually try
+to generate the array capacities etc. This relies on a weak hack, assume that
+Node [x] refers to the array, which so far has been the case, but very weak, and
+very poor execution by udevadm ram feature authors, sad to say.
+
+* As far as we can tell, udevadm does not support:
+udevadm info -p /devices/virtual/dmi/id
+option until somewhere between v245 (no support) and v249 (supported). This
+means that some distros that ship a pre 249 version will not get user RAM data.
+Known is Slackware 15.0 (but is in Current), TinyCore 14, and probably other
+tiny distros. Many LTS type frozen pool distros will probably not support it.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. SYSTEM: kernel gcc version: see FIXES 4a. While this is not a bug per se,
+since who can predict when a distro will change format to /proc/version, users
+might see it as one. This impacted various distros.
+
+2. INFO: init detection for busybox /sbin/init hung forever on slitaz, now
+works, and adds the busybox version as well. This was exposed by slitaz. Also
+was showing sysvinit for TinyCore, the slitaz fix also fixed the failure to ID
+BusyBox init on TC.
+
+3. CORE: see Fix 7b, inxi used wrong path for its .d config locations, never
+spotted it since I never use those, showed up in codeberg issue #295 when that
+did not work.
+
+4. GRAPHICS: EGL: see Fix 6b. Was missing one error message type, leading to
+undefined value print error.
+
+5. CPU: vascom in issue #297 reported an unset value error in disabled smt
+cpu speeds, see CODE 8. This required a CPU debugger data upgrade to handle
+more cleanly. It appears that a Perl behavior has changed, it was returning ''
+for undefined read, now seems to be returning the correct undefined. Or could
+be kernel that changed that, can't say, but creates buggy looking output with
+Perl errors. No actual data bugs though.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. DOWNLOADER: Small error in assignment could lead to onscreen error output.
+Not worth a new release fix. Added to inxi master as 3.3.31-2.
+
+2. SENSORS: corner case with undefined value where it's almost always defined
+for load_sys_data(). Shows undefined on screen output. Never seen this until
+today, but that's how it goes. Also added to inxi master as 3.3.31-2.
+
+3a. PARTITIONS: added possible filter path: /dev/(block/)?loop[0-9]+, saw that
+on Android.
+
+3b. PARTITIONS: added vboxsf, not a typo, that's a client mounted host fs for
+vbox, works like nfs/smb re filters etc. Never seen that one before, probably
+because I almost never use the host > guest shared folder feature of vbox.
+
+4a. SYSTEM: CompilerData: kernel gcc version: found _more_ syntaxes for the gcc
+string in /proc/version. The randomness of this string generation forced a redo
+of the regex, which should now catch almost any gcc/clang version number no
+matter how weird the syntax is. The new regex is much looser and handles all
+known variants.
+
+4b. SYSTEM: DesktopData:
+
+* Fixed broken fvwm-crystal ID, that one is tricky, and it got broken by
+accident a while back.
+
+* Fixed broken echinus hackedbox mvwm detections, had neglected to add those in
+PsData::set_gui() for some weird reason. Also had forgotten to add some of those
+to ProgramData::set_values(). Also note that TinyCore ships with hacked box, but
+their -version is broken, shows v: 2001 because they forgot to add in the actual
+version in the string. Forgetting to update all the locations of those string
+lists was a big reason that the ps handler was fully refactored, and all uses of
+its data, too hard to maintain when having to update in multiple locations the
+same value.
+
+* Fixed broken KDE 4 version, qt data. That has been broken for a while.
+
+* Fixed corner case where wm is detected, and is the same as de/wm parent, and
+is rejected, but then since wm is not populated, it runs wmctrl anyway, which
+can result in wrong results, like showing wm: wlroots wm [a generic term] for
+Hyprland wayland wm.
+
+* Fixed broken Muffin (Cinnamon wm) detection.
+
+* Added tk: GTK for Budgie, Pantheon. Added tk: Qt for lxqt variants. These
+often worked before, but now are more robust.
+
+* Fixed bad JWM wm version, was using --version, -v is right.
+
+* Fixed xfwm, was not showing xfwm4 etc, just xfwm.
+
+* Fixed spectrwm version detection, the old verbose string was simplified to:
+spectrwm x.y.z Build: a.b.c. Used filter method to dump the old verbose part.
+
+5. RECOMMENDS: wrong package name for pacman eglinfo, glxinfo.
+
+6a. GRAPHICS: gl_data():
+
+* fixed use of undefined $platform, missed some, those can and did spew out
+errors in some cases due to trying to use undefined hash key name.
+
+* fixed case where EGL version was not fully numeric: 1.4 (DRI2)
+
+6b. GRAPHICS: API data: see Bug 4. Was missing one api data error message type.
+This led to output of undefined value print errors. The real cause however was
+inconsistent naming of the gfx api message types, which is the main fix, along
+with adding the missing one. Now they all match and are easy to scan. Making
+things consistent internally has been a main goal of the 3.3.32 release.
+
+7a. CORE: See CODE 7b, fixed corner cases ps failures for older or more stripped
+down busybox ps. Now should handle all cases automatically.
+
+7b. CORE: Configs::set() had the wrong paths for all the .d directories, making
+those fail. Was missing the .conf part of the path, just showed inxi.d/. Oops.
+
+7c. CORE: main::set_basics(): found case where $ENV{'HOME'} undefined, which
+trips undefined concat errors. Attempt to set it manually with whoami and paths.
+
+8. PROCESSES: Long standing error, probably imported from original bash inxi,
+with -tm showed broken throttled message even though no throttling occured. This
+only happened with -tm, not -tc or -tcm.
+
+9. INFO: GCC versions: switched to ProgramData::full(). Fixed regex to allow the
+primary version number (12.2,9,4.8, etc)) for alt, we don't care about sub-sub
+versions there, but we do care about sub versions. Sort numeric for results,
+which corrects the odd order created by alpha sorts before. Fixed broken filter
+to exclude default gcc version from alt list.
+
+This fix also exposed alt gcc version detection failure on FreeBSD, different
+path, and different executable name syntax (/usr/bin/gcc-9 vs
+/usr/local/bin/gcc9 as well as an odd legacy numbering format for 4.8, 4.9
+(gcc48,gcc49).
+
+10. MACHINE: Fixed some BSD sysctl machine field name assignments that may have
+resulted in those fields never showing in output. Added some conditional tests
+as well. Also fixed and normalized some dmidecode mobo/chassis field names.
+
+11a. RAM: In some cases, module locator is only DIMM 1, without the channel. If
+Channel [A-Z]] is found in branch locator, prepend that to DIMM X to make actual
+location more obvious.
+
+11b. RAM: In cases of > 1 RAM array, failed to reset the slots active counter
+in each array. This led to silly looking active slots totals for the arrays.
+
+12. REPOS/INFO: PackageData for cases where distro uses a package manager non
+natively, like AltLinux with apt-get, but no dpkg, so can't get package counts.
+Now detects pm and uses right command to get package list and show tools.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1a. SYSTEM: DistroData:
+
+* Adding initial support for Ubuntu internal spins, like Kubuntu, Lubuntu,
+Xubuntu. Shows project name for distro, and adds base: Ubuntu for -Sx.
+
+* Forcing os-release use for Fedora, that captures spins like Onyx
+automatically. Was using redhat-release, which had the Fedora version string,
+but best to use os-release explicitly. Too bad we can't default everything to
+use os-release, but that's not reality.
+
+* Added in Fedora system base for variety of Fedora based distros. This corrects
+many from IDing as RHEL 39 etc, now shows Fedora. As with all derived distros,
+these ids are not all tested, but often work. Confirmed: Nobara, risiOS,
+Ultramarine. Not all are identifiable.
+
+* Added Devuan system base distros: crowz, dowse, etertics, exe, fluxuan,
+gnuinos gobmis, heads, miyo, refracta, star, virage. This should in many cases
+automatically cover the specific derived distro ID as well since those usually
+are in the 'PRETTY_NAME' field of /etc/os-release. Not exe, not star, I believe.
+
+* Added in Debian/Devuan system base support for Peppermint, that requires
+custom rule since the base can be either. Selection based on presence/absence of
+/etc/devuan_version.
+
+* Added special distro id where distro id is from distro-version file, but ID is
+only numeric. Slitaz does this for example. Takes file, slices off
+{-version,release}, then concatenates the distro name and number. This is
+uncommon, but should anyone else do it that way, easy to add now.
+
+1b. SYSTEM: DesktopData:
+
+* Added screensaver/locker (tools:) to -Sxxx/-Sa. -Sxxx shows running tools, and
+-Sa adds avail: for any installed, but not running. That's because many of these
+tools are not daemons, but are triggered by a daemon.
+
+* Added wm dawn, dusk. Those are dwm forks so assuming -v works the same for
+version (to stderr). Added wms w9wm, x9wm - assuming -version info same as for
+9wm, which is what they were forked from I believe.
+
+* Added CDE and dtwm, because, well, why not? No version for either. And NsCDE,
+which uses FVWM2 for wm.
+
+* Added Draco (a Lumina spin) support.
+
+* For -a and KDE, added advanced data info: frameworks v: x.y.z. Other desktops
+with comparable and detectable advanced data will be added as we find them. Note
+that this repurposed the previous use of the info: field name, which is now
+with:.
+
+* For qtile, spectrwm, and maybe others, they give wmctrl a false wm id, for
+some reason, now inxi gets rid of that since it's a fictional result, done
+deliberately, but is not the wm.
+
+* Item: info: added more bars, panels, menus, launchers.
+
+* Added --dbg 63 user debugger so we can track down how de/wm/tk detections
+happen, their data sources, etc. See CODE 4c. Much easier to say add --dbg 63
+than to say all the stuff to echo etc. antiX testers showed how useful this
+could be right away, as did dev vm testing for de/wm.
+
+* Added ELF toolkit data (Enlightenment, Moksha). The elf-version tool is not
+always there, but if it is, tk is easy to get.
+
+1c. SYSTEM/GRAPHICS: Added bismuth, maynard, orbment, polonium, swayfs
+compositors.
+
+1d. SYSTEM: DmData:
+
+* Added lm: (login mamager) type fallback, if no dm detected. Added seatd,
+elogind, greetd to the fallback lm. Some of those were in the main dm block
+before, but now they are detected as login managers in case where no dm was
+detected. This handles de, wm, wayland compositors using seatd, elogind, etc.
+
+* Added lemurs display manager. Not verified, don't know if --version info.
+
+2a. GRAPHICS: tentatively trying for Android Surfaceflinger, and other display
+data.
+
+2b. GRAPHICS: a long standing weakness, fuzzy mapping of X.org port IDs to
+DRM port IDs may be finally resulved, assuming xrandr --prop and drm device in
+/sys. Now matching connector_id to CONNECTOR_ID, which is an absolute match
+using an integer value ID. This now precedes all other mapping tests in the
+port ID mapper.
+
+2c. GRAPHICS: added support for all known tiny X display servers:
+
+Xchips Xfbdev Xi810 Xigs Xipaq Xmach64 Xmga Xmodesetting Xneomagic Xsavage
+Xsis530 Xtrident Xtrio Xts300 Xvesa
+
+I had no idea anything other than Xvesa existed, but apparently there's a bunch!
+Found this when testing TinyCore Pure64, which uses Xfbdev. I did not know that
+Xvesa only supports 32 bit either. This was exposed when testing on TinyCore
+Pure64.
+
+Also changed to dynamic detection using ps data, which then allows for sometimes
+getting the screen resolution as well from ps for TinyX servers. Also avoids
+cases where > 1 were installed but only 1 is running, of course.
+
+2d. GRAPHICS: Xfbdev may expose the virtual_size of screen assuming
+/sys/devices/platform/*/graphics/*/virtual_size exists.
+In test system, that's:
+/sys/devices/platform/vesa-framebuffer.0/graphics/fb0/virtual_size
+
+This allows showing resolution for at least Xfbdev TinyX systems, like TinyCore
+Pure64. No idea if this is a general thing or I just happened to find a case
+where it works.
+
+This goes along with adding the resolution from ps start string if present.
+
+2e. GRAPHICS: gfx vendor ID updates: AMD, Intel, Nvidia. This finally saw more
+IDs generated for their latest generation gpus, which had been sparse before.
+
+3a. INFO/REPOS: PackageData: added pm tools:
+
+* pacman: added baph, pacseek.
+
+* deb/apt: added muon.
+
+3b. INFO/REPOS: PackageData/RepoItem: added tazpkg (slitaz pm).
+
+3a. INFO: Power: added to wakeups, and created Power: type that turns on with
+-Ixxx:
+* uptime
+* states - suspend/hibernate types supported
+* suspend: active type
+ * other available types [-Ia]
+ * wakeups
+* hibernate: active type
+ * other available types [-Ia]
+ * hibernate image size [-Ia]
+
+-Ia: Adds Power daemons running.
+
+This closes issue #292 for adding power state report.
+
+3b. INFO: Compiler: added tentative support for zigcc. Also extended to support
+clang alt versions, along with BSD alt paths for clang, gcc alt locations. This
+adds support also for BSD type /usr/local/bin alt gcc/clang paths, so that data
+will suddenly appear for the inxi BSD users out there.
+
+4. VERSION: Along with deprecating -V, added --vf (--version shortcut), which
+goes along with --vs / --version-short to maybe easier to remember?
+
+5. WEATHER: Added --wu as short-cut for --weather-unit, no idea why that wasn't
+done already.
+
+6. REPOS: Added tazpkg (slitaz).
+
+7. CORE: Added /usr/etc, /usr/etc/inxi.conf.d, /usr/local/etc,
+/usr/local/etc/inxi.conf.d as possible default paths for inxi.conf files.
+Apparently IBM-Redhat is pushing for that change, which will ship first in
+Fedora. Also, the /usr/local/etc paths would let BSDs, that use /usr/local for
+non core, to put the inxi config in there instead, if they wanted. Though as far
+as I know, none of the BSDs is actively packaging inxi.
+
+8a. MACHINE: For -Mxx, show board part number (part-nu) if available. This
+usually comes from /sys product_sku or SKU Number in dmidecode, but can be
+sourced on other systems from different data sources.
+
+8b. MACHINE: Add (if detectable, bad data sources) device type for Elbrus.
+
+8c. MACHINE: Show board UUID with -Mxxx, if available. Filtered with --zu.
+
+9a. RAM: Added udevadm as possible non root RAM array/module data source.
+
+9b. RAM: Added for case of > 1 RAM system board array a Report: line for totals
+of arrays, capacity, used capacity, slots, used slots, eec, module type.
+
+10. CPU: more CPU microarch CPUID product IDs, for some future cpus as well.
+
+11. RECOMMENDS: Added wayland-info to display recommends now that it finally hit
+the repos.
+
+12. DRIVES: More disk vendors, new ID matches! Yes, it never ends, like the Way,
+like a river flowing from the mountains, like the sun and the moon...
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. DOCS: data/audio: renamed and removed some stray gz files.
+
+2a. INFO: split into up to 3 separate primary lines, Memory, Power/Process/Init,
+Packages, depending on verbosity levels. This really cleans up something that
+has gotten increasingly messy and random over the years as features were added.
+
+2b. INFO: -Ixx triggers wakeups, instead of -Ixxx. Also, -Ixx triggers the
+parent Power: item that contains uptime:, wakeups:, and all the other power
+items from -Ixx and higher verbosity levels.
+
+2c. INFO: Compilers: changed order of detected compilers to be alphabetic
+(clang, gcc, zigcc), now that zigcc added might as well make it not gcc-centric
+as in past.
+
+3a. OPTIONS: -W/--weather-location are removed, and location is merged into -w
+[location], thus freeing up a redundant use of a primary single letter for a
+feature. Also, upper case letters were supposed to be used mainly for core,
+unique, features, not just a secondary feature of a secondary feature. Lower
+case only is what should have been used, like with -s. I am guessing that in
+inxi bash/gawk, I could not handle optional args, and thus had to use
+lower/upper, one for no arg, one for arg.
+
+3b. OPTIONS: -V is deprecated, and will show message. --vf/--version will
+activate full version info, along with --vs/--version-short for the 1 liner
+special short version.
+
+Also done to reclaim an upper case primary letter. If nobody complains, will
+remove -V next release, if someone complains, will keep -V / --version and
+remove deprecation message.
+
+-V is removed from help/man however so new users won't guess to use it, meaning
+eventually we can get rid of that -V and free it for better use.
+
+3c. OPTIONS: --gpu, --nvidia, --nv are removed. Those were replaced by -Ga a
+while ago. They were only temporary options used when the feature was first
+created, when it was not sure to remain.
+
+4a. SYSTEM: Display Manager (dm:) now is dynamically assigned, in cases where no
+dm but a login/seat manager like seatd, elogind running, which is more common
+with Wayland starts, now shows lm: (login manager) instead if one was found.
+Goes with CODE 3c refactor.
+
+4b. SYSTEM: changed Desktop info: to with: (for bars, docks, menu, panels,
+trays), which is more accurate, and switched info: to advanced de data, like KDE
+frameworks.
+
+4c. SYSTEM: changed output order, put wm: after de tk: info: and before with:.
+This turns it into a sentence: DE: + tk: + info: + wm: + with: + tools: + dm/lm:
+
+5. CORE: Configs::set() had wrong paths testing for config files, missing the
+.conf in inxi.conf.d. The old version was an accident. Just on off chance anyone
+actually used the wrong path, leaving those in the config path tests, but
+removed from man/options etc.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1a. DOCS: docs/inxi-graphics.txt: added ANDROID DATA, following some new
+information and research re Android display/compositors. Also refactored the doc
+file, and added more and better navigation and organization, particularly for
+DISPLAY SERVER DATA and MONITOR DATA. Moved COMPOSiTOR DATA to
+inxi-desktop-wms.txt.
+
+1b. DOCS: docs/inxi-distros.txt: updated for more distros and system base info.
+
+1c. DOCS: docs/inxi-power.txt: power state, screensaver/locker data.
+
+1d. DOCS: docs/inxi-tools-mapping.txt: added POWER section for screensaver/
+lockers.
+
+1e. DOCS: docs/inxi-values.txt: reorganized, improved navigation and
+organization. Ongoing updates to values for new features and debuggers.
+
+1f. DOCS: docs/inxi-init.txt: added BusyBox init, updated Upstart with warnings
+about pre-tests required.
+
+1g. DOCS: docs/inxi-desktop-wm.txt: These upgrades were done in conjunction with
+the related refactors, particularly of PsData and ProgramData.
+
+*added DISPLAY/LOGIN MANAGERS section, and documented all the dm/lm used. This
+goes with refactor into DmData of CODE 3c.
+
+* Added COMPOSITOR DATA (moved from inxi-graphics.txt) to make easier to match
+up wm/compositor data.
+
+* Added DESKTOP/WM INFO TOOLS itemized bars, docks, launchers, panels, menus,
+trays.
+
+2. DATA: data/audio: added huge collection of audio datasets from mrmazda.
+Thanks!
+
+3a. MAN/OPTIONS: Updates for power data for -Sxxx/-Sa, -Ixx/-Ixxx/-Ia.
+
+3b. MAN/OPTIONS: Removed references to -V, -W options, merged -W with -w.
+
+3c. MAN/OPTIONS: Edits, fixes, proofreading corrections of issues that have
+crept in over time.
+
+3d. MAN/OPTIONS: Removed --gpu, --nvidia, --nv, which were merged into -Ga a
+while ago.
+
+3e. MAN/OPTIONS: Changed gcc specific compiler to compiler generics, since now
+the old gcc\-centric compiler data supports clang alt versions, and zigcc.
+
+3f. MAN/OPTIONS: Updated -m for new udevadm DMI RAM data source.
+
+4. OPTIONS: Fixed some indentation errors.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Fixes 1, 2 were both due to some undefined values being improperly handled. 2
+was odd because it's literally never shown up before (using regex on undefined
+hash key), but it was a mistake in 3.3.31, just a Perl language thing that
+didn't do what I thought it would do..
+
+2a. GRAPHICS: xrandr_data(): switched to direct qx() for xrandr data, this
+allows checking for error return, which allows using --prop, which was not
+supported until xrandr 1.2 (~2009). Debian Etch had 1.1, for example. Also
+switched to array data since it's local to function. This is to get
+connector-id.
+
+2b. GRAPHICS: map_monitor_ids() now first tries to map via connector ID, and
+only falls back to the less reliable mapper tests if a match failed.
+
+2c. GRAPHICS: abstracted away from Xvesa only tests to TinyX X server tests.
+Note that so far only Xvesa appears to have an API via -list command.
+
+2d. GRAPHICS: failed to set empty array ref to $x_drivers when --force wayland
+is used, which made the @$x_drivers tests fail. Only devs would ever see this.
+
+3a. SYSTEM: DistroData: made debian_id() also support devuan ID via switch.
+Added redundancy testers for os_release codename append as well, using same
+logic. This refactor also removed some tests that would never have been true.
+
+3b. SYSTEM: main::get_display_manager(), had a silly error with creating
+globbing pattern that could have made it fail in the case, > 1 directories used
+to glob; refactored get_display_manager into DmData, which now also handles
+Display Managers and Login Managers, like greetd, seatd, elogind.
+
+3c. SYSTEM: DesktopData:
+* Changed DesktopEnvironment to DesktopData, to be more consistent.
+
+* Reordered, renamed subs, organized entire package to be more maintainable and
+consistent with newer inxi style.
+
+* DesktopData::wm_ps_xprop_data(). Reversed order, first now does ps tests, then
+xprop, was getting false detections for blackbox.
+
+* DesktopData::de_wm_debugger(). See 4c.
+
+* DesktopData: improved methods for getting gtk/qt desktop data, using new
+ProgramData::full version data return coupled with item_from_version(), avoids
+extra subshells to get the same data we already collected, but threw away.
+
+* DesktoppData::item_from_version(). Works with new ProgramData::full() option to get
+full version data ref returned, this avoids making multiple subshell calls to
+get two bits of data from same thing. Used for GTK and Qt data currently.
+
+* DesktoppData::set_xprop(): Fully refactored all xprop data to be more
+maintainable and clean.
+
+3d. SYSTEM: changed CompilerVersion which is for kernel compiler to the more
+obvious KernelCompiler, then moved it with the other kernel data tools.
+
+4a. DEBUGGING: SystemDebugger:
+
+* display_data(): added in xrandr --prop/--verbose to match upgraded xrandr data
+parsing.
+
+* system_data(): added fruid_print, udevadm commands.
+
+* system_files(): added/proc/bootdata.
+
+4b. DEBUGGING: added @dbg switches:
+
+* --dbg 58: $power data.
+
+* --dbg 59: $desktop data array (long overdue, no idea why that was left off).
+
+* --dbg 60: display_mamager $found].
+
+* --dbg 61: PsData::set_cmd(), print out @ps_cmd result working ps data.
+
+* --dbg 62: $compilers main::get_compiler_data().
+
+* --dbg 63: DesktopData::de_wm_debugger() for ps wm/comp/de output, and for
+DesktopData step by step results, so we know what detected what and how.
+
+* --dbg 64: ProgramData::version() print out full version data block.
+
+* --dbg 65: PackageData: print out raw %pms hash.
+
+5. ERROR HANDLER: Added option-deprecated, option-removed items, for -V, -W,
+--gpu/--nvidia/--nv type change/remove scenario.
+
+6a. CORE: fixed two stray redeclares of $start in OpticalItem::get() and
+RepoItem::get() which Perl 5.008.0 correctly notes is redeclaring it, but for
+some reason all newer Perl's accept. Funny things that show up testing on
+ancient systems, in this case, I'd say the original Perl was right and the new
+one is allowing something to happen it should not. Also changed $start in
+PartitionItem::set_filters to $begin to avoid that pussible clash.
+
+6b. CORE: Added filter type to main::filter, that way it can be used for other
+filters, like filter-uuid for non partitions.
+
+6c. CORE: Full ps logic refactor: PsData package created, merged in old
+set_ps_aux, set_ps_de_wm and changed them to methods set_cmd and set_de_wm.
+Refactored set_cmd to be much more robust and handle busybox automatically.
+
+* Changed global $load{'ps-aux'} to $load{'ps-cmd'} which makes more sense since
+that is what it was loading.
+
+* Old busybox failed if you supplied it with standard ps args, but new busybox
+accepts and ignores them. Now inxi checks if busybox ps, then dumps the args,
+and sets a busybox switch to allow for more ps data for busybox ps, which will
+be used to detect TinyX screen dimensions.
+
+* Got rid of global $b_busybox_ps and test for that, it is not used anymore.
+Added switch for busybox to use more columns of ps to try to trap -screen
+resolution for TinyX servers. Only some show that in ps.
+
+* Optimized subsequent uses of @ps_cmd by dumping stuff inxi will never need,
+like browsers, various servers, etc. Also run uniq() on result since we only
+nned one instance of each command for subsequent tests.
+
+* Switched to using full %ps_data, including for header position counts, which
+helps make much more robust odd ps types that might have CPU or RSS or MEM
+but not in the expected order, or incomplete. Before relied on hoping it would
+work and be consistent, which is not the case for BusyBox ps. Now all the hard
+coded indexes are dynamically set, using the header positions grabbed in
+PsData::set_cmd(). Specific detections added: info-active, tools-active,
+tools-test to avoid duplicating test arrays globally.
+
+* Got rid of @ps_gui global, replaced fully with granular de/wm/comp $ps_data
+hash arrays, which are then assembled as needed in each section, desktop and
+compositor, that might use them. This allowed, finally, for getting rid of all
+those redundant wm/comp items, now the wm/comp/de ids are set in only one place,
+PsData::set_gui(). This had been a long standing problem because I would forget
+to update one set of wm/comp, and had to do loops over and over when all that is
+required now is the initial searches through @ps_cmd, which is also much
+shorter, containing only the stuff inxi will need to check.
+
+Now to add a detection, wm, comp, tool, info, dm item, just need to add it in
+one place, ps_de_wm, and there are also no repetitions in there, which there
+were before. I expect this will make it much easier and less error prone to add
+new items to the various lists.
+
+* Added PsData::set_dm() to handle fallback dm detection, when none found in
+/run type directories. Only fires when nothing else found.
+
+* Added PsData::set_power() to handle power daemon detections.
+
+* Added --dbg 61 to print out @ps_cmd in output section, where it's also logged.
+Leaving it out was an oversight.
+
+6d. CORE: Program data refactor into package: ProgramData
+
+* Converted program_{data,values,version} and related subs into package
+ProgramData with public methods full(), values(), version().
+
+* Moved the entire package code block into the Items Data generator section.
+
+* Moved more program version that used hardcoded values in the caller to use
+full() and set_values() data instead, wherever practical.
+
+* Made version() use array refs from start to finish, and dumped the old method
+of using open on the text block from file or program version command result. Not
+clear why I ever did it that way, probably I did not understand refs when that
+was originally translated.
+
+* Added version data array ref return option, useful to avoid having to make
+double calls when getting stuff like toolkit version. Used for example in
+DesktopData::item_from_version().
+
+6e. CORE: Corrected paths for development fake data files, I'd forgotten to use
+$fake_data_dir global in many places, now all fake data paths use that single
+source, which can be changed using config or --fake-data-dir option.
+
+6f. CORE: main::grabber(): made sure all commands for this include the proper
+redirect, usually 2>/dev/null, several were missing that, which could in theory
+have led to visible error output on the screen.
+
+7a. INFO: InitData: got rid of redundant readlink /sbin/init, that's now read
+at first to $link, which is then what is tested in all following tests.
+
+7b. INFO: Refactored get_gcc_data() into get_compiler_data, which now supports
+gcc and clang to do FIX 9. Cleaned up, switched to ProgramData::full(), fixed
+weak globbing pattern, fixed broken compiler alt version exclude default
+installed compiler version.
+
+8a. CPU: Refactored, now all cpu fake data files are set in
+CpuItem::set_fake_data(), makes it easier to manage.
+
+8b. CPU: a change in either kernel /sys or Perl made Perl return udefined value
+where before it returned '' in cpuinfo data() (now cpuinfo_speed_sys()) speeds.
+
+8c. CPU: split out cpuinfo_speed_sys() from cpuinfo_data().
+
+9a. RAM: refactored dmidecode_data module data into separate functions so they
+can be used by udevadm_data_process as well. Made process_locator,
+process_manufacturer.
+
+9b. RAM: refactored the speed logic, now uses raw numeric plus units, so they
+can be worked with then reassembled more readily.
+
+9c. RAM: refactored speed_mapper, BSD matching table, to avoid loading entire
+mapping table each time. Brings logic closer to Linux logic.
+
+9d. RAM: refactored ram_output, split out arrays_output, which now handles
+--memory-short/--ms, and case of > 1 array detected, same format for both.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 30 Jan 2024 18:47:20 -0700
+
+================================================================================
+Version: 3.3.31
+Patch: 00
+Date: 2023-10-31
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Packagers: remember, inxi repos and issue reports are now on codeberg.org - make
+sure to change your package scripts and URLs. Github will be mirrored for inxi
+for a little bit more, maybe I will extend it one more quarter depending, but
+source repos should be changed.
+
+--------------------------------------------------------------------------------
+
+A small point release, mainly for fixes and bugs, plus a few minor matching
+table updates. Also some core tools updates, which make supporting gpu devices
+easier over time, particularly nvidia ones. Also some gpu data updates, new
+nvidia 545, which was unexpected, came out, extending the time to next legacy by
+some months.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. GRAPHICS: GPU DATA: codeberg user malcolmlewis who also posted both the first
+pinxi issue, and the first codeberg issue. I had not thought nvidia would forget
+to add their own device IDs to their lists, but they did. This prompted an
+upgrade to the gpu_raw.pl/gpu_ids.pl to better handle manual add files for
+Nvidia, as well as better overall consistency for gpu data files and processing.
+
+2. SYSTEM: Wakeups: Mint user senjoz for alerting me to the well done but
+unfortunately localized to mint forums report on the wrong wakeup count report,
+because the data source was not what I thought it was.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Any distro forum person who finds issues related to inxi maybe being wrong or
+operating from false assumptions in terms of data sources should ideally find a
+way to report these issues directly, either via a codeberg issue, an email, or
+something else. It's not possible or practical to track every forum that uses
+inxi to debug user issues, so if members of those forums can be more proactive
+in terms of sending what appear to be valid issue reports to the inxi project,
+that will help a lot.
+
+2. GRAPHICS: GPU: no data for things like Biren and other non AMD/Intel/Nvidia
+GPUs. If you are into GPUs, by all means, help us out here!
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. INFO: main::get_wakeups(): I'd say that despite in the past largely being
+correct, using /sys/power/wakeup_count is a bug, but a bug that is excusable
+because the docs are just too opaque about what this thing actually refers to.
+My assumption re its meaning was clearly wrong.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. INFO: main::get_wakeups(): Issue reported via a Mint forum posting which I
+was alerted to.
+
+https://forums.linuxmint.com/viewtopic.php?p=2378107#p2378107
+
+This would have made it into inxi 3.3.30 easily since the patch is changing file
+name, but I unfortunetly did not become aware of it until right after the
+release, On my system, for example, with systemctl suspend instead of the not
+working xfce suspend from gui, I get 7 wakeup_count type events counted for each
+suspend event. On another system I have, almost same everything, except fully
+functioning xfce suspend feature, the success and wakeup_counts are matched.
+
+I found a value of 49000+ digging through my datasets, and I can find no
+pattern, nor can I find this clearly documented, so the behavior is simply going
+to be use the value, including 0, from /sys/power/suspend_stats/success and
+using it if it is defined, and getting rid of /sys/power/wakeup_count completely
+as a data source, which I am now no longer sure at all about the meaning of. 1
+of my systems has 7 events per resume, one, almost the same setup, has 1.
+
+2. GRAPHICS: GPU DATA: Many nvidia fixes, device ID lists updated and corrected.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1a. PARTITIONS: added puzzlefs, atomfs to excludes. It's unclear, but both sound
+like they are like isofs or something like that.
+
+2a. GRAPHICS: GPU DATA: added Nvidia Pascal, Hopper, Lovelace device IDs. See
+Code 1 for fixes to detections. Added AMD, Intel newer GPU IDs, going with Code
+1 and GPU data fixes.
+
+2b. GRAPHICS: GPU DATA: updated lists, added Nvidia current EOL data, added
+newer kernel/X.org last supported. Added two more memssage types for current,
+legacy messages. Found a site that lists EOL for the drivers, that helps.
+
+2c. GRAPHICS: GPU_DATA: added new 545 driver IDs, updated nv current to 545
+
+3. SYSTEM: Distro: Added ubuntu noble 24.04 system base ID.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. DATA: pinxi/tools/lists: made file names consistent for gpu data types.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. DOCS: docs/inxi-graphics.txt, docs/inxi-partitions.txt - ongoing updates for
+features. More GPU data added, new file system types.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1a. GRAPHICS: GPU DATA: pinxi/tools/gpu_raw.pl, pinxi/tools/gpu_ids.pl. Upgraded
+to enable basic manual additions to nvidia drivers. Also fixed detections for
+Hopper and Lovelace, those were too tight and I missed some device IDs there.
+
+Redid tools/gpu_raw.pl and gpu_ids.pl to have the more predictable file names.
+
+Also changed the file names to be consistent for nv data in pinxi/tools/lists/
+ gpu.[amd|intel].full
+ gpu.[amd|intel].full.sorted
+ gpu.[amd|intel].manual
+ gpu.amd.github
+ gpu.intel.com
+ gpu.nv.[driver].full
+ gpu.nv.[driver].full.sorted
+ gpu.nv.[driver].manual
+ gpu.nv.[driver].raw
+
+This let me bring all the lists up to date, and some manual fixes added in to
+some driver sets.
+
+1b. GRAPHICS: GPU_DATA: pinxi/tools/gpu_ids.pl - updated for Nvidia: new
+messages, current eol, filled out legacy drivers with their eol based on last
+nvidia driver release date.
+
+2. CORE: there were some pointless globals being used, as part of the overall
+effort to get rid of globals where sensible, else move them into hashes/arrays,
+makes code easier to maintain long term.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 31 Oct 2023 13:08:12 -0700
+
+================================================================================
+Version: 3.3.30
+Patch: 00
+Date: 2023-09-25
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+PACKAGERS! inxi repos are moved to https://codeberg.org/smxi/inxi
+
+The repos will mirror to github for a short amount of time, until after 3.3.30
+is released, then I am probably going to do some big changes in the structure of
+the inxi repo. Make sure to update your packaging tools and scripts for this
+change.
+
+--------------------------------------------------------------------------------
+
+Finally, a huge upgrade for Wayland future proofing, and other futures that are
+maybe coming, by adding EGL API, and Vulkan for good measure. This should handle
+wayland finally, that's been a stub forever, but finally realized eglinfo was a
+thing, and that vulkan as well could be a contender to replace OpenGL, at least
+that's what Mesa says on their site, and they should know.
+
+This handles one of the longest standing weak points of inxi graphics, being
+completely X11-centric, even though wayland support exists fairly extensively,
+but this glxinfo dependent feature was a niggling annoyance, now it's fairly
+ambivalent about which api tool you throw at it, the hardest is to give the
+right message for no data, or incomplete data. Note that eglinfo supplies at
+least software rendering out of X11 or Wayland, so we can now get some API data
+in console, including if supported, OpenGL data. Not all of it, but some of it.
+
+Also since now all the docs are split and granular, with the Graphics API
+upgrades, added data sample files from glxinfo, eglinfo, vulkaninfo, and vainfo
+for good measure, just to have some of the latter. This is one of the first time
+all the data used to develope a feature, docs for that feature, and the feature
+itself, are being shared and released at the same time.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1a. GRAPHICS: API: Arch user Chrome30 on github for requesting vulkan data, and
+providing the initial datasamples that made it possible to think about this new
+API feature.
+
+1b. CheckRecommends: Display packages: mrmazda, a frequent helper, checked and
+updated OpenSUSE and Fedora vulkan/egl/glx API tool package names. Those have
+been a bit fluid and many of the names I had were not right.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1a. GRAPHICS: nothing is perfect, for sudo/root the detections fail for OpenGL
+API messages, but fallbacks will make it a bit nicer than it was, with some
+data, instead of none as before.
+
+1b. GRAPHICS: API: I'm assuming that the greatest EGL version number found is
+the actual version, and lower versions are what that platform supports. This is
+an assumption, not a known fact, but finding this stuff clearly documented tends
+towards near impossibility, or takes forever to determine, so that's the
+assumption that is being used. Correct via issue and clear explanation with
+links to resources if this is incorrect.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Nothing to speak of.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. PARTITIONS: had wekafs as a zfs type fs, it's not, it's more like NAS, cloud.
+Added to distributed list, and removed from zfs|btrfs|hammer list. I know, I
+know, will it ever matter? Probably not. But just in case, wouldn't want your
+local machine to report with petabytes of storage now would we!
+
+2. CheckRecommends: corrected some Fedora, SUSE package names.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1a. SYSTEM: DistroData: added Bodhi id method, /etc/bodhi/info file which is
+similar to /etc/lsb_release, updated system base detection as well. System base
+comes from /etc/os-release.
+
+1b. SYSTEM: DistroData: Added Nitrux system base (debian). Why they try hide
+this is beyond me. Maybe because they are not using a real PM, and don't include
+apt, who knows.
+
+2a. GRAPHICS: new nvidia gpu ids.
+
+2b. Graphics: EGL API data:
+* Shows eglinfo missing if appropriate, no data messages if appropriate.
+* -G shows EGL version(s), drivers, active platforms.
+* -Gx adds active/inactive platforms as sub items of platforms.
+* -Gxx shows platforms by platform, with egl version, driver. EGL version only
+shows if there were more than 1 detected, otherwise it shows with EGL v:
+* -Gxxx shows hw based on driver, if found, like vulkan.
+
+To avoid excess verbosity, does not show renderer OpenGL name per platform
+because it would be way too long and repetetive. And besides, that would show
+in OpenGL anyway, more or less, unless there are two different GPUs, which is a
+case that is not fully handled.
+
+2c. GRAPHICS: OpenGL data:
+* If glxinfo not present, or with null output due to root/no display, and if
+eglinfo available, and has OpenGL items, will populate most of OpenGL API with
+data, except for Direct Rendering and GLX version. Shows appropriate messages
+indicating it's EGL sourced for console, root, no data, or glxinfo missing.
+* -Gx adds GLX version, if detected.
+* -Gxx add: ES version, if detected; device-ID, if available. Also adds
+display-ID, if Display-ID was not found in the Display line (which probably
+means that xdpyinfo or xrandr were not installed). Does not always show since it
+already appeared in Display line if it was discovered.
+* -Ga adds device memory, and unified memory status (yes/no).
+
+2d. GRAPHICS: Vulkan API data:
+* Shows appropriate messages if vulkaninfo present, but no data found.
+* -G shows Vulkan version, drivers, and surfaces.
+* -Gx device counts.
+* -Gxx adds device by id, type, driver report.
+* -Gxxx adds layer count; adds device hardware vendor, based on mesa driver. Not
+for nvidia driver, since that is self evident. Goes away with -Ga if device name
+exists.
+* -Ga adds full device report, including per device names, ids, drivers, driver
+versions, surfaces.
+
+3. UPDATE: Because the smxi.org server no longer accepts TSL 1.1 based HTTP
+requests, added for extreme legacy systems a new update option, -U 4, which
+uses direct FTP download from smxi.org ftp server. If system set to default to
+perl downloader HTTP::Tiny it switches to using a non perl downloader
+automatically, like wget or curl.
+
+4. CPU: Microarch: got early zen5 possible IDs. Both Intel/AMD may have rough
+ID working well before they ship in public. CPU stuff has slowed down a lot,
+the 4,3n nodes are not easy, obviously.
+
+5. DRIVES: Many more drive vendors and drive IDs.
+
+6. RAM: More RAM vendors. Note that it's not unusual for a Drive vendor to also
+make RAM, and vice versa.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1a. GRAPHICS: For API, show OpenGL mesa-v: x.x.x separate from main API v:
+string. Also only shows the actual API version with v: now, like v: 4.5. Also
+shows vendor: nvidia v: 340.23 for nvidia, without mesa. Falls back for
+unhandled cases or syntaxes to the whole version string for v:.
+
+1b. GRAPHICS: For OpenGL, shows compat-v: always if present, that was a mistake
+not to show it unless -Gx, since otherwise you'd think you are running a
+different version. Not a common situation, but on legacy hardware, can happen.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1a. DOCS: docs/inxi-cpu.txt - reorganized into more coherent sections, like with
+like, etc. Added better top Sections navigation since there is so much data.
+
+1b. DOCS: docs/inxi-resources.txt - moved last code tricks to
+docs/tips-tricks.txt.
+
+1c. DOCS: new docs/ files inxi-battery.txt, inxi-debuggers.txt,
+inxi-devices.txt, inxi-kernel.txt, inxi-machine.txt, inxi-network.txt,
+inxi-raid-logical.txt, inxi-start-client.txt, inxi-tty.txt, inxi-weather.
+
+These new files cleaned out docs/inxi-data.txt and docs/inxi-resources.txt,
+which are now merely placeholder files, and have no data in them beyond pointers
+to the actual data files.
+
+1d. DOCS: docs/inxi-custom-recommends.txt updated for SUSE/Fedora packag name
+fixes and new eglinfo and vulkaninfo items.
+
+2a. DATA: moved more data from non public data to shared. Refactored directories
+to be better organized, and to follow the overall inxi data structures better.
+
+2b. DATA: added many more eglinfo, glxinfo, vulkaninfo to data/graphics. Also
+added some clinfo, vainfo just in case decide to support those APIs.
+
+3a. MAN/OPTIONS: updated for new graphics API features, new verbsity features,
+etc.
+
+3b. MAN/OPTIONS: added -U arguments for man, for some reason I'd left those out.
+Also removed options references to -U 1, 2, because those should never be used,
+if those versions of inxi even exist, they are ancient. Added -U 4 option, and
+explanation of when/why to use it.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1a. FAKE DATA: updated paths for fake data to reflect data reorganization.
+
+1b. FAKE DATA: Added --fake egl,glx,vulkan for GRAPHICS API.
+
+2. GRAPHICS: Fully refactored opengl_output, moved to gl_data/opengl_output.
+Added egl_data, egl_output, and vulkan_data, vulkan_output, and some other
+tools.
+
+3. UPDATE: if downloader is set to 'perl', aka, Tiny::HTTP, and -U 4 is used,
+which is a direct FTP download of the inxi/pinxi files, tiny is disabled, and
+the next available downloader (wget/curl/fetch) is used instead.
+
+4. DEBUGGER: added clinfo, eglinfo, es2_info, vainfo, vdpauinfo, vulkaninfo.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 25 Sep 2023 15:03:45 -0700
+
+================================================================================
+Version: 3.3.29
+Patch: 00
+Date: 2023-08-15
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Some significant bugs, 1 showstopper for FreeBSD, and one universal one for USB
+network devices, and possibly some other USB device types. Also some nice new
+features.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. SYSTEM: Github user chromer030 in issue #285 - a very nice small enhancement
+to -Sxxx line, adding kernel clocksource, and with -Sa, adding available
+clocksources. I wish all issues were this clean and easy to implemment, with
+such clear benefit.
+
+2. BLUETOOTH: Github user chromer030, issue #286 - extending and adding
+bluetooth report feature. This required refactors and some cleanup of bad logic
+to make -E more able to handle new data sources, and also made me fix the docs
+and add debugger data files to make testing changes for various bluetooth
+datasources easier. Adding btmgmt turned out to have a lot of long term benefits
+to the bluetooth feature and internal inxi logic, I hadn't realized how hacked
+on bluetooth feature was, but code review showed it clearly.
+
+3. SYSTEM: Github user oleg-indeez found a break in FreeBSD compiler data, 2
+glitches, one made inxi crash due to is array test on undefined reference, the
+other maybe a bad copy paste in the past that assigned compiler data to wrong
+hash. See CODE 3 for details on the ref issue.
+
+4. SWAP: Github user chromer030, again, issue #290 suggested some swap
+zram/zswap data enhancements, seems good, so thanks.
+
+5. UsbData: Slackware/Linuxquestions.org poster J_W for posting on a device
+missing in his output as of 3.3.27 inxi. This exposed bug 3, which usually was
+npt visible since the fallback was catching most of the network matches, but
+since he had a TP-Link, and it went missing, it triggered the issues, and also
+exposed the inconsistent upper/lower case use in device type from kernel.
+
+6. NETWORK: Slackware user babydr on linuxquestions.org tripped a bug in
+network, was not counting correctly to limit IP list. Led to showing limit
+message on 10th row of network report, not 10th IP of a device. See Bug 4.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Nothing new.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. BLUETOOTH: with hciconfig, would show wrong LMP/HCI version because either
+the syntax changed for those strings, or it was wrong always. I think it changed
+because this worked correctly at one point. Should now show the right hci/lmp
+versions, and the bluetooth version as expected for hcicconfig/btmgmt.
+
+2. SYSTEM: CPU compiler broke for FreeBSD 13.2, caused by bad test for undefined
+array in CompilerVersion::version_bsd(), and also, assigned kernel compiler data
+to %dboot instead of %sysctl hash. Thanks oleg-indeez for spotting that one and
+figuring it out.
+
+3a. UsbData: Failure to use /i caseinsensitive on regex led to failure to detect
+USB type using standard defaults, but then a further regex error, subtle, missed
+a | between two elements of a pattern, led to the last fallback case for network
+detection failing. This was coupled with a change in the Kernel, which now uses
+Uppercase first sometimes, and sometimes lowercase first. I think that's a
+change anyway. This resulted in some usb type hashes failing to load specific
+devices, network in this case, TP-Link, which was the fallback pattern that
+broke.
+
+3b. UsbData::assign_usb_type() improper nesting of tests led to failures that
+should not have happened, like a bluetooth device cascading down to network.
+
+4. NETWORK: IP limit was limiting based on total row count, not the actual count
+of IPs for that device. Not sure how that slipped up. Now correctly limits the
+IPs, not the previous total rows in Network report. Thanks babydr / Slackware
+forums for finding yet more issues.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1a. BLUETOOTH: added in switches for fake bluetooth data for all bluetooth data
+sources.
+
+1b. BLUETOOTH: made --bt-tool load $force{[tool]} to be consistent with rest of
+logic in inxi for forcing use of specific tools. No idea why I made a standalone
+one only for Bluetooth.
+
+1c. BLUETOOTH: the HCI/LMP version generators were mixing up bluetooth version
+string and LMP, leading to wrong results. See BUGS 1. I think this was a syntax
+change because I would not have generated this originally if the syntax had not
+worked, at least I don't think I would have. See also DOCS DATA item, added in
+samples for dev purposes to avoid this type of issue in future.
+
+2. UsbData: Device type from /sys could be upper/lower case first, but inxi was
+not testing for anything but lower case, which would lead to fallback tests for
+Bluetooth, Network, at least, maybe others. This goes with BUG 3, which exposed
+a small torrent of such potential failure cases. The fallback block of regex is
+really only designed to catch the few that don't get caught by the generic type
+tests.
+
+3. NETWORK: UsbData::set_network_regex(). Bad regex caused bluetooth device:
+"Intel Bluetooth wireless interface" to trip an overly loose regex for wireless.
+See BUG 3b. The real issue was incorrect test nesting which led to a bluetooth
+device falling down to network regex, which it should not have done. It also
+failed test the product name for bluetooth, which led to failure as well.
+
+4. SWAP: Was failing to capture some zram syntaxes, regex was too tight. Failed:
+/run/initramfs/dev/zram0.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. SYSTEM: added kernel current clocksource for -Sxxx, and alternates for -Sa.
+
+2. BLUETOOTH: added btmgmt as first fallback to hciconfig, that one also
+supplies bt version via lmp version, like hciconfig. Note this tool has very
+little useful information.
+
+3. Added back in discoverable, active discovery, and pairing status with -Ea.
+This data is also crudely available from btmgmt but I would not bet on those
+items actually being right. I'm not totally convinced that's good data, so
+making it admin for now. Put these in a 'status:' parent container.
+
+4a. SWAP: Added zswap enabled, compressor, max_pool_percent for -ja swap general
+features line. If no zswap data and Linux, shows 'N/A'.
+https://www.kernel.org/doc/Documentation/vm/zswap.txt
+
+4b. SWAP: Added zram comp_algorithm max_comp_streams to -j per line report, only
+for zram, of course.
+https://docs.kernel.org/admin-guide/blockdev/zram.html
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. None that are obvious.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. DATA: Added new data/bluetooth/, with several sample 'btmgmt info' and
+'hciconfig -a' outputs for debugging and reference purposes. These work with
+the revised debuggers and force/fake data switches for bluetooth. Should add
+some bt-adapter --info samples too to make testing/debugging easier.
+
+2a. DOCS: Made new docs/inxi-bluetooth.txt doc.
+
+2b. DOCS: Moved more data out of inxi-data.txt and inxi-resources.txt, into
+inxi-bluetooth.txt, tips-tricks.txt, man-pages.txt. While I'm not going to do it
+all at once, I am trying to move relevant data into granular doc file as I hit
+that during dev.
+
+2c. DOCS: Updated and organized docs/inxi-tools-mapping.txt more, new mapping
+tools added. inxi has so many manually updated mapping tools that it's going to
+get more and more important that this document is accurate, and is updated when
+required.
+
+3a. MAN/OPTIONS: Added BT tools to --force lists, and updated --bt-tool list.
+Also added -Ea options, the status: stuff.
+
+3b. MAN/OPTIONS: Made consistent, lower case rpm, both PM type rpm and rpm as
+rotation were switching between RPM and rpm randomly.
+
+3b. MAN/OPTIONS: Updated for --force ip/ifconfig, --ifconfig.
+
+3c. MAN/OPTIONS: Updated for zswap, zram extra -ja data.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. BLUETOOTH: added %force bluetoothctrl, bt-adapter, btmgmt, hciconfig, rfkill,
+and added checks to enable $fake{'bluetooth'} in the main callers for each type.
+This makes debugging and development a lot easier. Also removed the force tool
+block in CheckTools, no idea, again, why I did it that way only for bluetooth.
+
+2. CheckTools: got rid of set_forced_tools(), which was only used for bluetooth
+tools, and didn't fit with the rest of the core logic.
+
+3. SYSTEM: CompilerVersion: used array refs wrong, or rather, used refs wrong,
+which led to various errors that were confusing. Corrected to start out with an
+array ref, then to pass that as is, leaving it the same ref all through, for bsd
+and linux. This is the method inxi should have always used for passing array/
+hash refs around, create as ref, then pass around, and update, without assigning
+a new ref to it.
+
+I had failed to verify that the same ref was being used through the sequence.
+Unfortunately this error is probably very widespread in inxi, because no
+consistent rule was created and enforced from the first lines of Perl.
+
+4. UsbData: added source type to --dbg 6 output, and added --dbg 55 to output
+the per type arrays.
+
+5. NETWORK: IpData:: added --ifconfig/--force [ip|ifconfig], --fake ip-if to
+allow for basic debugging for -n / -i IP data sources. Not super useful since so
+much comes from /sys, but there was nothing there at all, which is weird for
+networking.
+
+6. SWAP: Changed to passing data using scalar references, not returning an
+array of the items, and got rid of the copies in the swap_data_advanced() tool.
+It's less readable, but incurs basically very little overhead, and with the new
+function / method arg lists I'm using more now, it's clear what the references
+are.
+
+7. IpData: got rid of extra array copies for push, pointless.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 15 Aug 2023 19:45:54 -0700
+
+================================================================================
+Version: 3.3.28
+Patch: 00
+Date: 2023-07-10
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new man. Continuing the Memory info rollout started in 3.3.27.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. Thanks to linuxquestions.org Slackware forums for poking around a bit at the
+new Memory total logic.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1a. MEMORY: The memory total: has to be synthesized in some cases, based on some
+math and educated guessing. When these guesses fall outside of predetermined
+ranges, inxi will show note: est. to let the user know the total was synthesized
+and possibly incorrect. For detected virtual machines, inxi does not try to
+synthesize the total because a VM can have any amount of RAM assigned.
+
+If superuser, and -m used, shows the real total from dmidecode if any RAM was
+found. Not all systems have DMI RAM data however, or have dmidecode installed.
+Will fallback to sythetic method in that case, which is usually right.
+
+1b. MEMORY: With the superuser /proc/iomem method, if on a VM and not using even
+GiB sized RAM ollocation, and -M is not triggered (which usually lets inxi know
+it's a VM), the total will get rounded up or down based on a set of rules. For
+example, 2.5 GiB real would become 3 GiB. I don't see any solution to this,
+either assume the /proc/iomem is right but needs rounding up, or assume the /sys
+block counts are right, or remove the feature.
+
+Shows note: est. in cases where the rounded total is greater than a dynamic
+factor difference from the internal total amount.
+
+2. GENERAL/GRAPHICS: The problem of users showing up, requesting a feature, then
+not doing any work, research, supplying energy, interest, and dare I say,
+passion - nothing, expecting 'someone else' to do the work for them, continues,
+sadly, with the recent request for vulkan data for Graphics. This appears to be
+a problem more with the modern generation of free software users, I don't
+remember this type of attitude 20 years ago, but I did watch it as it started
+getting more common. Demotivating to be honest, but maybe one day someone will
+show up who actually cares enough to help get the features they want developed.
+
+While I am leaving that up as a low priority feature request, I am not
+personally interested in that feature, nor is anyone else I asked, and given how
+much raw data there is, and how difficult it is to parse, I'll just leave it as
+an existing issue which might get work in a few years time, or not, basically
+will require someone showing up who actually actively cares.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. DISK: total: used: report could have had wrong results for used:, like used
+being > total: because the filter lists were missing some file systems for
+exclusion. More of a fix than a bug, but users might see it as a bug.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. INFO: get_gcc_data(): was showing same GCC version as main and alternate.
+Failed to filter out the discovered primary, that is. This is because usually
+name is gcc-11 but sometimes it's the whole version, like gcc-11.2.0, the full
+version string. This is the case in Slackware for example.
+
+2. SHORT: MEMORY: BSD: did not show '%' for memory used percent, just the
+number.
+
+3. DRIVES/PARTITIONS: PartitionItem::set_filters() added many more exclude
+types, that will help avoid both creating wrong disk used totals, and also not
+show label:/uuid: fields for filesystem types that don't have uuid/labels. There
+were a lot missing: encrypted, distributed, stackable, remote. Should clean up
+wrong disk used values in some cases.
+
+4a. PARTITIONS: PartitionItem::set_filters(). Added a lot of file systems, many
+fuse, distributed, stackable types.
+
+4b. PARTITIONS: Extended remote file system ID by fs, and added fuse fs for
+local mounts, like gvfs, mtp, ptp and many other variants, that's things like
+mounting apple partition, android, iphone, archives, etc. This should correct an
+entire class of source: ERR-102 outputs.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. BATTERY: Added 'power' to battery report. That's the amount of watts its
+using at that moment, so not super useful since it's running inxi at that
+moment. But the data was there, so might as well show it. Only for -Bxx since it
+will be so variable. Shows after the charge/condition item.
+
+2. SYSTEM: DistroData: added Oracle id and system base. Added Springdale/PUIAS
+system base support. Note, unusually, Eurolinux, ScientificLinux 'just worked'
+re id and system base even though that had never been explicitly added. This is
+because their os-release file contains 'centos' string.
+
+3. SYSTEM: DistroData: Added ubuntu mantic minotaur to ubuntu id matching table.
+This only really is used by Mint, but there you have it. Also added Debian 14
+codename Forky.
+
+4a. MEMORY: Add total RAM from one of following:
+
+* /sys/devices/system/memory (if it's available). This directory has to be
+compiled into kernel, so is not always present. This source has advantage of
+being user readable. If out of set bounds, shows note: est. to let user know
+it's an estimate.
+
+* If superuser and /proc/iomme, gets the total from /proc/iomem using some
+tricks and synthetic methods, which in general is pretty accurate, but when out
+of the bounds set, shows note: est. to let user know results are only estimates.
+This overrides /sys total.
+
+* If -m and dmidecode data found, uses the real RAM module total. For Linux and
+superuser. This overrides iomem and /sys totals.
+
+4b. MEMORY: add iGPU RAM from /proc/iomem when detected. Requires sudo/root.
+
+4c. MEMORY: using the real -m/RAM total for memory total when available, since
+that is the actual value we want, not the estimated stuff from /proc/iomem or
+/sys/devices/system.
+
+5. RAM: added a long time oversight, lack of per array RAM installed size and
+occupied slots (modules). Those are now part of the Array line for each set of
+modules. Since total already shows in System RAM line above, the granular per
+array installed size total only shows if > 1 array is present, ie, almost never.
+
+6. DRIVES: disk vendors, added more matches and vendors. We'll know the world is
+changing in a significant way when no new vendors appear for a while, but that's
+unlikely in the near term.
+
+7. CPU: cpu_arch(), a few new ids added.
+
+8. GRAPHICS: new amd, intel, nvidia ids, updates to driver version etc.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. SHORT: for Memory:, switched to using MiB/GiB/TiB, these numbers are just
+getting too big to be readable. This is also dynamic, if both used and available
+are the same unit, shows x/y [unit], otherwise shows x [unit]/y [unit].
+
+2. MEMORY: changed gpu: to igpu: to avoid confusing it with standalone gpu.
+Since only raspberry pi had gpu ram data before, almost nobody would have seen
+this in general anyway.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. MAN/OPTIONS: Updated for -Bxx, battery power now.
+
+2. MAN: updated to better define where the System RAM: total:.. available etc
+come from, and what they refer to. Also added explanation in -m section about
+what the stuff is, and what the field names refer to.
+
+2a. DOCS: docs/inxi-ram.txt added, and more info moved from inxi-data.txt and
+inxi-resources.txt. Goal is to remove both those files and move all their data,
+and any new data, into granular inxi-xxx.txt files. Also moved some RAM data
+from inx-unit-handling.txt to inxi-ram.txt.
+
+2b. DOCS: docs/inxi-unit-handling.txt: updated with more ram / memory units,
+code, etc, to better fit with the concept of the inxi-unit-handling.txt doc.
+
+2c. DOCS: docs/inxi-partitions.txt: updated, added more sources for partition
+file system types, cleaned up, more useful as a reference now.
+
+2d. DOCS: docs/inxi-distros.txt: NEW, merged data from inxi-data.txt,
+inxi-resources.txt. Updated and added more info.
+
+2e. DOCS: docs/inxi-tools-mapping.txt split off from inxi-tools.txt, makes it
+easier to find the mapping functions and features, which are hard to remember.
+Also updated and improved its usability. This is kind of a key document because
+it's hard to remember all the mapping tools internally, and this also connects
+those tools to their relevant granular inxi-xxx.txt docs. Not that it will help
+get helpers for these tedious tasks, but one can always dream, can't one?
+
+3. DATA: data/graphics/ added for first vulkaninfo output file.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1a. RAM: Fixed an irregularity, for RamItem, it used MiB as internal unit, this
+was silly because inxi uses KiB everywhere else. This correction was relatively
+easy to do, and allows the values to be used by other parts of inxi, like
+MemoryData.
+
+1b. RAM: Added return of ram total for memory.
+
+2a. INFO/RAM/PROCESSES: When MEMORY active, now uses row reference to create the
+fields. For INFO, now uses MemoryData::row() to generate the row fields instead
+of doing the logic in the info line generator. This simplifies the processing
+and allows for more granular control of output.
+
+2b. INFO/RAM/PROCESSES: Added debugger switches --dbg 53 (show raw KiB/count
+values for /sys/devices/system/memory and /proc/iomem. Added --dbg 54, which
+shows per line size for iomem, in human readable units, and a final summary
+report of iomem and /sys data, this speeds up debugging.
+
+2c. INFO/RAM/PROCESSES: Added --fake iomem, --fake sys-mem for debugging and
+testing.
+
+3. MEMORY: MemoryData::short_data(): added so one tool generates output for all
+sources for short data. Easier to track and make consistent, and to make more
+granular and robust.
+
+4. DRIVES/PARTITIONS: PartitionItem::partition_filters(),
+PartitionItem::fs_excludes(): refactored into PartitionItem::get_filters(),
+PartitionItem::set_filters(). Cleaned up, organized better, made comments much
+more useful. Goes with DOCS 2c updates. Now there's just one sub that does this
+filter/exclude work, which makes it easier to maintain long term.
+
+5. GLOBAL: Used a trick I just learned, declaring variables in the bracket scope
+of a class, but not inside the package/class declaration. This makes it work
+like a static variable, which Perl 5.008 doesn't support. You have to use a sub
+inside the bracket scope to return the data outside that scope, but that is easy
+to do.
+
+6. MACHINE: Added return of b_vm for VM detection in MEMORY.
+
+7. SYSTEM: CompilerVersion: Failed to properly use references when passing
+$compiler around, not actually sure why it worked, but now is consistent.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 10 July 2023 14:00:04 -0700
+
+================================================================================
+Version: 3.3.27
+Patch: 00
+Date: 2023-05-07
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Completion of the audio fixes and improvements of 3.3.26. Added less common
+sound servers like EsounD and aRts, and made state reports more accurate for
+ALSA.
+
+Major USB code and data upgrades/refactors. The USB changes prepare inxi for USB
+4, and adds lanes and Si/IEC speeds to the report. It is important to determine
+what USB mode you are running in with 3.x and 4. These changes conform more
+closely to how the USB consortium wants USB speeds refered to.
+
+With more robust USB data, this data now appears in a similar form as pcie: data
+for Devices, -A, -E, -G, -N, and for -D drives, as usb: plus rev, speed, lanes,
+mode, with the -xx/-a options, like pcie. This has been a long standing
+oversight and weakness of inxi USB and Device data, but now the two are fully
+integrated, including for drives, which was quite tricky to get working.
+
+Added netpkg and Zenwalk support to packages and repos. Also added repos support
+for sbopkg and slpkg, and updated package tools for Slackware.
+
+And more distros added to system base feature, and a few more for main ID.
+
+Improved --recommends report quite a bit, now it's more granular for missing
+packages and package manager reports, and also fixed a long standing missing
+current shell + version issue. Added the final package manager type, pkgtool
+(Slackware), that will be supported, which makes for 4, which is enough. Note
+that other package managers can be added following the documentation
+instructions for packagers, but this is enough for out of the box pm handling.
+
+Fixed a long standing oddity with how free / /proc/meminfo report MemTotal vs
+the actual physical RAM. I believe this issue also showed with GPU assigned RAM,
+but now for all but short form, shows Memory/RAM: available: ... used: ...
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. To the Slackware people at linuxquestions.org forums, who helped, again, on
+this audio feature, even finding current or not too old systems that use some of
+the new / old audio servers (EsoundD) running in the wild, which I never
+expected to see. And also for exposing some weak spots in the USB advanced
+logic, and helping with the sbopkg and slpkg repo logic and tools reports.
+
+2. To the Manjaro forum users, for providing cases that show where inxi can be
+improved. The audio server/api issue, the current USB 3/4 upgrade, were
+initiated by threads pointing to things that could be improved in inxi. So I
+guess the real thanks are for using inxi enough to trigger cases that show where
+it's weak or can be better. Note that this requires that I follow roughly their
+forums, however I only look at threads that seem like they might be of general
+interest, or which suggest a possible weak spot in inxi, and I don't follow them
+consistently. More reliable is to file github issues, since I will always see
+those.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. DesktopData: at one point, BunsenLabs Debian OpenBox had XDG_CURRENT_DESKTOP
+set to XFCE, which it isn't, but inxi can't work around such hacks, plus I don't
+even know if Bunsen is around anymore anyway.
+
+2. DesktopData: CODE 1 reminds us that the time to depend on x tools like xprop
+for anything re desktop/wm detections is fast drawing to a close, true Wayland
+will not have xprop, unless it's running on xwayland, which is not something
+that should be relied on. Maybe recheck Moksha/Enlightenment which depend on
+xprop for version detection.
+
+The list of xprop detected wm/desktops in get_env_xprop_misc_data() is almost
+all X only wm/desktops, so those should be safe unless one of them decides to
+work on a wayland comositor.
+
+3. BSD: ongoing weaknesses in BSD data sources make maintaining feature parity
+impossible, but I am trying to get the BSD data as clean and consistent as
+possible. I wish this were not the case, but the fact is, /sys is expanding and
+creating excellent and reliable data sources with every major Linux kernel
+update, and so far nothing comparable has appeared in the BSDs. This is just
+reality, it's not a condemnation, but something like the /proc then /sys file
+systems are an excellent idea, well worth emulating.
+
+4. For the RAM available/total clarification, there's a slight issue because
+free/meminfo show MemAvailable as Free for use RAM, but dmesg shows available
+meaning what was available to the system during boot, minus the reserved
+percentage. Since we needed one term, available to System offers the closest
+in terms of technical precision without being too verbose. Technically available
+in this context means: total physical minus 'kernel code' minus 'reserved'.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. CheckRecommends: See Fix 6b, more or less a bug, but really just a fix.
+
+2. AUDIO: for USB devices, put extra data into row 0, no matter which row the
+USB device is. This led to the extra data for USB being assigned to the wrong
+row. Sigh.
+
+3. OptionsHandler: When show{'ram'} was set, for bsd, set use{'bsd-raid'}, which
+makes both show raid and ram fail for BSD. Oops. User mode RAM data only seen in
+OpenBSD so far. This made loading $dboot{'ram'} fail, and any raid as well,
+sigh, unless -m was also tripped.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. DistroData: typo for Arch base: was ctios, was supposed to be ctlos.
+
+2a. DesktopData: found case where xprop -root not present (Void Linux), so xfce
+test failed. Split to new function dedicated to xfce detection that doesn't use
+xprop data. Also, XFCE is working on their Wayland version, which would in
+theory not even have xprop by default.
+
+Also, the base version number test for xfce depended on xprop, but
+xprop doesn't even have that xfce version data anymore, so just checking if
+xfce(4|5|)-panel exist and assigning primary version based on that test.
+
+2b. DesktopData: Also see See CODE 1a,1b for further xprop and test fixes that
+could have led to false positive or negative test conditions for the items that
+used xprop tests. These tests are all xprop agnostic now, if it's there, they
+will use it, if not, do the best they can.
+
+3. PackageData: fixed legacy dpkg-query, old version did not support -f shortcut
+for --showformat. This made dpkg package listing fail.
+
+4a. GRAPHICS: Added legacy XFree86.0.log to X log path detection, that was an
+oversight. Also added legacy module syntax _drv.o (not _drv.so). This gets X
+driver data now for very old systems.
+
+4b. GRAPHICS: fixed corner case where no x driver data, running as root, was not
+supposed to show 'note: X driver n/a' message, that was a holdover from before
+driver output was cleaned up and driver: N/A shows when no drivers at all found.
+Just forgot to remove it when doing recent updates in the driver section, maybe?
+
+5. REPOS/PackageData: For netpkg Zenwalk Slackware systems, showed only slackpkg
+repo data, empty, and showed the Slackware pm, not netpkg for pm. See
+Enhancements 5, 6.
+
+6. REPOS: removed slapt_get file /etc/slapt-get/pubring.kbx, that's not a repo
+file. Thanks chrisreturn for pointing that out.
+
+7a. CheckRecommends: See also CODE 6. Fixed case where > 1 package manager is
+detected on system, now lists them one by one for detected, and shows package
+install options as well. Before only picked first detected, which could lead
+to wrong results for Missing Package lists.
+
+7b. CheckRecommends: Fixed glitch, forgot to update the current shell/version
+when ShellData was refactored, this led to no current shell + version showing
+up in recommends core tools report.
+
+8. RAM: fixed speed_mapper string match to allow for older syntaxes. This is as
+far as known OpenBSD only, from dboot data. Matches then converts PC2700 to
+PC-2700 which then allows for mapping.
+
+9. RAM/PROCESSES/INFO/SHORT: Finally tracked down a long time oddity, where for
+example:
+ RAM: total: 31.28 GiB
+does not match 32 GiB physical installed. This is because that is the total
+available after kernel and system reserved RAM is deducted, and in some cases,
+GPU allocated RAM. There are also corner cases where the listed amount can be
+less due to physical RAM damage, but that's uncommon.
+
+Added explanation of why it's different, and what available is referring to in
+man -m/--memory.
+
+Changed -m, -tm to show:
+
+System RAM: available: 31.28 GiB used 26.23 GiB (83.9%)
+
+and -I to show:
+
+Memory: available: 31.28 GiB used 26.23 GiB (83.9%)
+
+You can get the 'reserved' and 'kernel code' data from dmesg, but since Debian
+made that root/sudo tool, can't count on being able to parse that out of dmesg,
+plus you can never count no dmesg anyway since it can get overwritten by kernel
+oops or wonky device etc. inxi doesn't use dmesg data for Linux for this reason.
+
+... [ 0.000000] Memory: 32784756K/33435864K available (10252K kernel code,
+1243K rwdata, 3324K rodata, 1584K init, 2280K bss, 651108K reserved, 0K
+cma-reserved)
+
+Also removed Raspberry Pi video RAM added back in to total now that it's clear
+it's what is available. This may also make systems with GPU using system RAM
+more correct.
+
+9. SENSORS: sensors /sys tried to create concatenated string with $unit $value
+but these are not necessarily defined, that needed to be protected with defined
+tests.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1a. AUDIO: JACK: added helper nsmd (new session manager), and its recommended
+gui agordejo. That's the drop in replacement for non-session-manager, the dev of
+which apparently lost interest in that project. But the ID method will work fine
+for for either, since both ran as nsmd.
+
+1b. AUDIO: PULSE: added pulseaudio-alsa plugin support for helpers. This is like
+pipewire-alsa plugin, just alsa config file. Only seen in Arch Linux so far, but
+if others use similar paths for the glob pattern, they will also work fine.
+
+Also added pulseaudio-esound-compat plugin, which is easier to detect with
+/usr/bin/esdcompat.
+
+Also added paman, pulseaudio manager.
+
+1c. AUDIO: ESOUND,ARTS: added legacy esd (EsounD aka: Enlightened Sound Daemon)
+and aRts sound server support, with basic help/tools. These are quite old, but
+are still occasionally seen in the wild on newer systems, surprisingly enough.
+
+1d. AUDIO: ALSA: added alsactl to alsa tools. Missed that one, it's an /sbin
+type utility.
+
+1e. AUDIO: ALSA: First try at ALSA compiled in but inactive report, previously
+depended on active only state of the API. Now uses compiled in SND_ kernel
+switch using the /boot/config-[kernel] file, which is a big expensive parse but
+only will activate on Linux kernels with no /proc/asound present. This fallback
+fails if kernel config file not present: /boot/config-$(uname -r).
+
+1f. AUDIO: OSS: added tool ossctl.
+
+1g. AUDIO: NAS: added helper: audiooss which is an OSS compat layer.
+
+2a. DistroData: added Arch base distros: ArchEX, Bridge Linux, Condres OS,
+Feliz, LiriOS, Magpie, Namib, Porteus, RevengeOS, SalientOS, VeltOS.
+
+None of these are verified. Some don't exist anymore.
+Source: https://www.slant.co/topics/7603/~arch-linux-based-distributions
+
+2b. DistroData: added ubuntu lunar 23-4 release id.
+
+2c. DistroData: added porteux, added porteux, zenwalk to slackware systembase
+
+3. DesktopData/GRAPHICS: added Smithay Wayland compositor. Not verified.
+
+4a. UsbData/UsbItem: added USB lanes (-Jxx) and mode (-Ja), to add more useful
+data about USB revision and mode names the USB group has created. Otherwise it's
+too difficult to try to explain it. Note that -Jxx lanes follows other inxi
+items that show PCIe lanes as an -xx item to try to keep it consistent.
+
+This also consolidates the bsd and linux data sources, see CODE 5.
+
+Note modes and lanes are Linux only because the revision number, lanes, and
+speed used to determine mode are only natively available in Linux as actual
+internal data values. If this changes BSD support will be added in the future.
+
+The BSD rev and speed data is synthesized completely by inxi using some string
+values, and thus is not reliable, which means that pretending inxi can get this
+granular with data that is not coming directly from the system itself is
+probably not a good idea.
+
+Following wikipedia mode names: https://en.wikipedia.org/wiki/USB4
+
+These are the known possible combinations:
+rev: 1.0 mode: 1.0 lanes: 1 speed: 1.5 Mbps
+rev: 1.1 mode: 1.0 lanes: 1 speed: 1.5 Mbps
+rev: 1.1 mode: 1.1 lanes: 1 speed: 12 Mbps
+rev: 2.0 mode: 1.0 lanes: 1 speed: 1.5 Mbps
+rev: 2.0 mode: 1.1 lanes: 1 speed: 12 Mbps
+rev: 2.0 mode: 2.0 lanes: 1 speed: 480 Mbps
+rev: 2.1 mode: 2.0 lanes: 1 speed: 480 Mbps
+rev: 3.0 mode: 3.2 gen-1x1 lanes: 1 speed: 5 Gbps
+rev: 3.0 mode: 3.2 gen-1x2 lanes: 2 speed: 10 Gbps
+rev: 3.1 mode: 3.2 gen-1x1 lanes: 1 speed: 5 Gbps
+rev: 3.1 mode: 3.2 gen-1x2 lanes: 2 speed: 10 Gbps
+rev: 3.1 mode: 3.2 gen-2x2 lanes: 2 speed: 20 Gbps [seen this case]
+rev: 3.2 mode: 3.2 gen-1x1 lanes: 1 speed: 5 Gbps [wrong rev: seen this case]
+rev: 3.2 mode: 3.2 gen-1x2 lanes: 2 speed: 10 Gbps [wrong rev: possible case]
+rev: 3.2 mode: 3.2 gen-2x1 lanes: 1 speed: 10 Gbps
+rev: 3.2 mode: 3.2 gen-2x2 lanes: 2 speed: 20 Gbps
+rev: 3.2 mode: 4-v1 gen-3x2 lanes: 2 speed: 40 Gbps [not seen, but possible]
+rev: 4 mode: 4-v1 gen-2x1 lanes; 1 speed: 10 Gbps
+rev: 4 mode: 4-v1 gen-2x2 lanes: 2 speed: 20 Gbps
+rev: 4 mode: 4-v1 gen-3x1 lanes: 1 speed: 20 Gbps
+rev: 4 mode: 4-v2 gen-3x2 lanes: 2 speed: 40 Gbps
+rev: 4 mode: 4-v2 gen-4x1 lanes: 1 speed: 40 Gbps
+rev: 4 mode: 4-v2 gen-4x2 lanes: 2 speed: 80 Gbps
+rev: 4 mode: 4-v2 gen-4x3-asymmetric lanes: 3 up, 1 down speed:120 Gbps
+
+I believe 120Gbps takes the 2 lanes of tx/rx and converts 2 rx lanes to tx so
+the entire lane is dedicated to transmit. and the third lane is dedicated to rx.
+
+Includes error message for unknown usb 3/4 rev/speed match combos. These can be
+bad hardware self reporting or unknown other issues.
+
+4b. USB: Added Si/IEC speeds (base 2, base 10). -Ja triggers extra IEC, base 2
+Bytes (xxx [MG]iB/s). -Jx triggers basic standard Si xxx [MG]b/s base 10 bits.
+
+5a. PackageData: added netpkg as package tool. This stores data in same location
+as slackpkg, but assume if exists directory /var/netpkg, then the system is
+using netpkg as pm, not slackpkg.
+
+5b. PackageData: added Slackware sbopkg, sboui as tools for pkgtool and netpkg.
+
+6a. REPOS: added netpkg (Zenwalk Slackware based pm) repo report.
+
+6b. REPOS: added sbopkg basic repo report. This handles both value syntax types,
+as well as the ability of /root config file to overwrite /etc config repo.
+
+6c. REPOS: added slpkg repo report. This handles their old and newer syntax.
+
+7a. CheckRecommends: For Slackware users, added pkgtool missing package name,
+also will use netpkg so hopefully Zenwalk uses same package names.
+
+7b. CheckRecommends: Added radeon to kernel modules checks.
+
+8. AUDIO/BLUETOOTH/DRIVES/GRAPHICS/NETWORK: For USB, -[ADEGN]xx adds rev, speed,
+lanes. -[ADEGN]a adds mode.
+
+9. RAM: Updated RAM PC DDR in speed_mapper(), which is as far as I know only
+used by OpenBSD, which allows for MT/s speeds as non-root user, which is nice.
+That list hadn't been updated in a long time, so filled out DDR 1-5 PCx-yyyy
+ids.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1a. USB: For -Jxy1, speed is now a child of rev: parent. This goes along with
+mode: and lanes: being children of rev:. This follows how USB consortium wants
+to refer to USB revisions now: by speed, lanes, and modes, the latter being the
+technical term, the speed being the marketing term.
+
+1b. USB: If no speed data found, show N/A. This should almost never happen
+except for very old Linux and rarely with BSD.
+
+1c. USB: Device type is lower cased except for abbreviations (type-C, HID). This
+makes it more consistent as a value.
+
+1d. USB: Show basic Si speed with -Jx, and adds new IEC speed with -Ja.
+
+2. CheckRecommends: See ENHANCEMENT, CODE 6. Now showing row by row package
+managers and missing packages, by package manager(s).
+
+3. DRIVES: Changed long standing redundant use of 'type':
+type: USB ... type: HDD
+to:
+type: USB ... tech: HDD
+'tech:' means the technology used, HDD, SDD, and if we can ever figure out how
+to detect it, Hybrid Hard Drive (HHD),
+
+4. AUDIO/BLUETOOTH/DRIVES/GRAPHIC/NETWORK: moved 'type: USB' pair to after
+driver for -A/-E/-G/-N, which allows it to be the parent of the new USB data
+block. Negative is it moves it a bit further back in the line.
+
+For Drives, it moves it from after /dev.. maj-min to after block-size, However,
+with -D/-Dx, it's last in the line, which is nice. This is the only way I could
+find to make it more consistent across all possible USB device/drive type
+reports.
+
+5. INFO/RAM/PROCESSES: Changed -I:
+
+Memory: [total] used:
+to:
+Memory: available: [total] used:
+
+Changed -tm/-m to be consistent:
+
+Memory: RAM: total: .. used..
+to:
+Memory: System RAM: available: ... used:..
+
+This corrects a long standing inaccuracy where MemTotal is not actually the full
+system RAM, but is the RAM minus reserved stuff for system and kernel, and GPU
+memory in some cases.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1a. DOCS: docs/inxi-audio.txt: ongoing updates, adding more information, more
+on helpers, detection methods, etc.
+
+1b. DOCS: New: docs/inxi-usb.txt: USB info, update, added more, a work in
+progress.
+
+1c. DOCS: docs/inxi-custom-recommends.txt: name in inxi comment did not match,
+and updated to new comment cleaned up syntax in example. Fixed inxi comment file
+name.
+
+1d. DOCS: New: docs/inxi-unit-handling.txt: To document how inxi handles
+size/speed data internally, and ideally, to help integrate all those methods
+into one big tool one day, not spread across many area.
+
+1e. DOCS: New: docs/inxi-repo-package-manager.txt: To start to document arcana
+and methods and commands and outputs for package managers. Since this is a late
+start, will take time to complete, but better late than never.
+
+2a. MAN/OPTIONS: updated for USB -Jx, -Jxx, -Ja, adding lanes, mode, iec speed
+items.
+
+2b. MAN/OPTIONS: fixed error which had USB speed as -Jxxx instead of -Jxx. Also
+then changed speed to be -Jx.
+
+2c. MAN/OPTIONS: updated for repos for SBOPKG, SBOUI, SLPKG, and added
+SLAPT_GET, I'd forgotten that one.
+
+2d. MAN/OPTIONS: updated for -xx[ADEGN] USB rev, speed, lanes; for -a[ADEGN]
+updated for USB mode.
+
+2e. MAN/OPTIONS: updated for memory available/used changed.
+
+3. MAN: fixed some inconsistent use of short/long form display in extra data
+options.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1a. DesktopData: New function for xfce only detections, turns out xprop is not
+necessarily installed, Void Linux for example had failed ID. Old version
+required xprop to do the tests, which was not robust and failed in this case.
+Function: get_env_xfce_data(). Also made xprop data optional for all the
+xxx_xprop_data desktop tests, not just some of them. This will forward proof
+the desktops
+
+1b. DesktopData: Fixed bad parens in test cases, was not correctly organized.
+if (a || b || (c || d) && e)
+was supposed to be:
+if (a || b || ((c || d) && e))
+Odd how those types of glitches creep in, one fix is also to just make the lines
+break more reasonably so the conditions are easier to parse visually.
+
+2a. DEBUGGER: Added /etc/X11/XF86Config-4 xorg conf file to debugger.
+
+2b. DEBUGGER: audio_data(): added audio server versions to cover all known ones.
+
+3. MemoryData: changed all $memory to array references, got rid of split :
+separators, which were clearly legacy items leftover from bash/gawk days. Also
+changed MemoryData::get('splits') to get('full') to reflect this change.
+
+This change should be transparent though it may introduce corner case undefined
+value situation but that should not happen since array values are defined first.
+
+4. UsbData: Refactor of usb speed, rev, added lanes, mode. Refactored most of
+the bsd/linux rev/speed logic, merged some of bsd speed/rev into the new
+version_data() function, which loads all the data based on what is calling it.
+This helps consolidate the logic across usb data sources.
+
+5a. GLOBAL: made functions/methods use same comment syntax for args:
+ args: 0:...; 1:...
+always starting with 0, to match array index. Same syntax for return array index
+values. In some cases simply note a variable is passed by ref:
+ args: $value passed by reference.
+
+5b. GLOBAL: made all sub/functions/methods follow the same spacing syntax. This
+seems to be a good compromise for space/readability. Note that adding in these
+new lines added about 400 lines to the total length, plus the line breaks that
+were already there. Yes, inxi has a lot of sub routines! aka functions and
+sometimes aka methods.
+
+[empty line]
+[comments]
+sub [name] {
+
+Packages/classes now also all follow the same spacing rules:
+
+[empty line]
+[comments]
+# Package Name
+{
+package [name];
+[empty line]
+[comments]
+sub [name] {
+...
+}
+}
+
+Internally, subs generally do not use any empty lines unless it makes sense to
+do so for some specific reason.
+
+5c: GLOBAL: made start of sub comments be upper case, I have a bad habit of
+typing comments in lower case, easier to read if it's reads like a normal
+sentence.
+
+6. CheckRecommends: refactored entire items logic, set global hash for test
+items. Made support > 1 detected package manager.
+
+7. REPOS: cleaned up comments for package manager/repo blocks.
+
+8. SENSORS: sensors_sys failed to reset to undefined $unit and $value, and also
+failed to test if they were defined before using them in concatenation.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Sun, 7 May 2023 14:00:00 -0700
+
+================================================================================
+Version: 3.3.26
+Patch: 00
+Date: 2023-03-28
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Significant upgrade to sound server running detections, much more granular and
+hopefully more accurate, with more useful reporting values. Also added some nice
+useful audio api/server tool and info items.
+
+Packagers: this corrects possibly wrong or misleading audio server reports,
+particularly related to PulseAudio/PipeWire, which can lead to support issues
+and lack of clarity due to ambiguous or wrong reports about sound Servers
+present, active, or off. Upgrading your package is highly recommended.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. Thanks to people like Chimera dev Daniel "q66" Kolesa for experimenting with
+non systemd (uses dinit/dinitctl), non GCC, non GNU linux, and for making early
+pre-alpha versions run in vm, and for being easy to test!
+
+Not so much because I personally want or care about or view as a positive
+skipping GNU tools or GCC in favor of clang and BSD tools, but more because
+these experiments help make the general overall Linux ecosystem more robust.
+Including inxi.
+
+2. Thanks for the Manjaro people for noting this issue on their forums.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1a. AUDIO: jack_control and pw-cli won't run as root, exit with error. This
+forces back to fallback process present tests for active running state.
+
+1b. AUDIO: pactl will start pipewire/pipewire-pulse/pulseaudio if stopped and
+not masked, so not using since that would make inxi alter the state of the
+system.
+
+1c. AUDIO: pipewire-alsa, pulseaudio-jack depend on file exist globs, tested on
+Arch Linux, Debian base, but unknown if paths exist on other Linux pimary
+distros. Easy to add to globbing tests, but no going to check them all!
+
+2. SERVICES: systemctl status [service] can fail if service loaded using --user
+which is a new one on me, not sure how to handle that.
+
+3. It would be nice to get inxi issues like the sound server/api glitches
+handled by filing an issue on inxi github, and not to rely on my seeing a random
+distro forum post, which I only found by pure coincidence.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. AUDIO: See Fixes 3a,b,c. In some cases false report of pulseaudio and
+pipewire running: yes create unclear output and results, or misleading. Thanks
+to manjaro users to noticing this and mentioning it in a forum post.
+
+Note: it's much more effective to file issues on inxi github than to hope I will
+see a random forum post one day.
+
+2. DEBUGGER: Bug in debugger, somewhere introduced '-- list' (instead of
+'--list') for bluetoothctl which made older systems hang when running the
+debugger. No idea when or how that space got introduced.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. INFO: Compilers showed Compilers: gcc: N/A when clang/gcc not installed, this
+was not intended, but was a small glitch in main::get_gcc_data(), where it
+assigned undef as array contents when gcc not defined. This was exposed by
+Chimera, which uses clang, but would have happened any time gcc not installed on
+system.
+
+2. SYSTEM: tiny fix, was getting ',' at end of kernel compiler version.
+
+3a. AUDIO: For pipewire, made process detection test more robust, now excludes
+pipewire-pulse in case where that might be running without pipewire on/enabled.
+
+3b. AUDIO: bigger fix, more robust tests for audio servers running for jack,
+pipewire, pulseaudio, these look for more explicit server tool reports. Certain
+not to be reliable always, and fail for superuser, will probably need more
+tweaking. Also notes for jack, pulse, pipewire if only positive detection found
+via ps aux: active (process) to avoid incorrect data, and root specific messages
+depending on situation.
+
+3c. AUDIO: was testing for pactl to determine if pulseaudio installed, but found
+case where pactl could be installed without pulseaudio. Now tests for pulseaudio
+installed.
+
+3d. AUDIO: weak fix for Linux OSS4 version, using /etc/oss4/version.dat file,
+which may or may not exist on all distros.
+
+3e. AUDIO: alsa-oss compat can create /dev/sndstat file, which would then lead
+to positive OSS detection even if it's not present. This is corrected, and will
+not show if asound/version exists and no ossinfo. For linux, relying on ossinfo
+presence, which comes from oss4-base.
+
+3f. AUDIO: Older ALSA /proc/asound/version had a date string in parentheses
+after the Driver Version, so now explicitly get the string after Version.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. REPOS: added support for /etc/apk/repositories.d/*.list, which works pretty
+much the same as /etc/apt/sources.list.d/*.list. This is to make Chimera apk
+repos show up, previously only supported /etc/apk/repositories file read.
+
+2a. DistroData: Added Feren to distro system base. This was much trickier than
+it should be due to inconsistent use of os-release field names, but that's how
+it goes.
+
+2b. DistroData: new Arch derived distro XeroLinux added to system base. I know,
+I know, it's a never-ending endeavor (get it?) since these pop up all the time,
+but might as well add them now and then as they appear.
+
+3a. AUDIO: inxi now handles pipewire-pulse as top layer audio daemon, along with
+several other server/api helpers. Note that pw-jack does not appear to be a
+daemon, just a plugin, so shows 'plugin'. Extra sound server helpers added when
+discovered or requested.
+
+ API: ALSA
+ v: k5.19.0-16.2-liquorix-amd64
+ status: kernel-api
+ Server-1: PulseAudio
+ v: 16.1
+ status: off (on pipewire-pulse)
+ Server-2: PipeWire
+ v: 0.3.65
+ status: active
+ with:
+ 1: pipewire-pulse
+ status: active
+ 2: pw-jack
+ type: plugin
+
+3b. AUDIO: For -Aa, added tools: report. Currently supports these basic tools:
+
+alsa: alsamixer alsamixergui amixer
+jack: cadence jack_control jack_mixer qjackctl
+oss: dsbmixer mixer ossinfo ossmix ossxmix vmixctl
+nas: auctl auinfo
+pipewire: pw-cat pw-cli wpctl) [+pactl if pipewire-pulse and no pulseaudio
+pulse: pacat pactl pamix pamixer pavucontrol pulsemixer
+roar: roarcat roarctl
+sndiod: aucat midicat mixerctl sndioctl
+
+Note that inxi-perl/docs/inxi-audio.txt has lists of alternates or rejected
+helpers and tools, but we want to keep that output short and sane.
+
+3c. AUDIO: For BSDs, if sndiod is detected, adds an API line for sndio. Note
+this may create 2 API lines for FreeBSD using OSS.
+
+3d. AUDIO: Added basic support for roar sound server, NAS (Network Audio
+System).
+
+4. CPU: new Intel and AMD cpu model matches for latest and future, Luna Lake,
+Zen 4c.
+
+5. GRAPHICS: new nvidia current, AMD, and Intel GPU ids.
+
+6. DRIVES: more disk vendors, ids! The list never stops, but sadly, so many are
+not identifiable. Check: inxi-perl/tools/lists/disks_unhandled to see if you
+can positively identify any of those.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1a. AUDIO: Changed main API/Server running: to status: [status], that syntax is
+more able to handle different circumstances.
+
+1b. AUDIO: With change to status:, now uses granular fixes above, and adds root
+notes if no active detections.
+
+1c. AUDIO: Changed 'Sound API', 'Sound Server' to 'API', 'Server'. This avoids
+ambiguity with some types, it's the Audio section, and those are the APIs and
+Servers for that Audio section. Makes it match Graphics as well. and is shorter.
+
+1d. AUDIO: Changed 'Sound Interface' for sndiod to 'Server', which is how it's
+listed, and for BSD, added API: sndio item. Also changed 'sndio' to 'sndiod' for
+the Server: item.
+
+1e. AUDIO: Changed ALSA/BSD sndio to show: status: api since saying an api
+is running makes little sense, it's there or it's not there. OSS can be enabled
+or disabled so shows status: active/off for Linux, but kernel-api for BSDs.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1a. MAN: Added note for helpers item: with: pipewire-pulse/pw-jack etc to -Axx.
+
+1b. MAN: Added -Aa item for audio server tools.
+
+2. OPTIONS: Updated for -Axx helpers, -Aa tools.
+
+3. DOCS: Created inxi-perl/docs/inxi-audio.txt doc file. Too many odd factoids
+to forget about during this upgrade!
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. REPOS: Moved %keys to %repo_keys and set it only once with set_repo_keys(),
+those big hash assigns per iteration are really expensive, now stores it
+globally in RepoItem and sets only once.
+
+2. INFO: main::get_gcc_data() failed to handle case where there is no gcc at all
+installed, resulted in returning an array with content of 'undef', not an empty
+array as intended. This made the array not set test fail for Compilers, so gcc
+showed as N/A, which was not intended.
+
+3. DistroData: changed internal lsb/osr $distro to $distro_lsb/$distro_osr,
+which lets inxi update the distro name during system base processing in cases
+where the data is redundant. Stupid hack, sigh, should not be necessary, but
+that's life, /etc/os-release was poorly designed so it leads to such confusions.
+
+4a. AUDIO: Added --dbg 52 to output results of pw-cli.
+
+4b. AUDIO: refactored sound_data, renamed, added {jack,pipewire,pulse}_status(),
+sound_helpers(), sound_tools() utilities.
+
+5. DEBUGGER: added more pactl and pw-cli outputs, and pipewire-pulse,
+pipewire-jack --version.
+
+6. main::get_driver_modules(): add space after ',' if total string > 40
+characters to allow splitting very long unbroken strings of modules that
+otherwise would not break as expected.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tues, 28 Mar 2023 16:30:00 -0800
+
+================================================================================
+Version: 3.3.25
+Patch: 00
+Date: 2023-02-07
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+A small point release, various smaller items, ongoing updates to matching table
+features, bug fixes, but nothing major.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. Thanks Umio-Yasuno in github issue #281 for actually being proactive and
+finding some Intel/AMD gpu device id lists. I wish more issues would be like
+that.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. DEBUG: --debug-arg and --debug-arg-use must use the full format:
+--debug-arg="-GS", or else the command line eats the args, even if in quotes.
+The error handlers will then complain about no data supplied, and it will exit.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. GRAPHICS: An accidental 'and' instead of 'or' test (see Code 1) led to
+systems without gpu or dri graphics drivers not showing their xorg driver even
+when present. This was due to a mistake, and also due to how Perl handles || and
+&& in sequence, which made this bug not show up until I tested on a system with
+xorg graphics driver, but without dri or gpu drivers. Virtually no modern
+hardware or operating systems would trip this condition, but older hardware and
+operating systems, which may not have gpu or dri drivers, might. And did, in my
+case. This is by the way why I try to test on old hardware at least now and
+then.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. CODE: A poorly done attempt at optimization would have broken case
+insensitive pre-compiled regex with $pattern = qr/../ because you can't add
+/$pattern/i to precompiled pattern, but qr/.../i support only added perl 5.014.
+This should impact almost nobody, but it is/was a glitch. Basically qr/../ can
+only be used when no /i type modifier is required if supporting Perl less than
+5.014.
+
+See inxi-perl/docs/optimization.txt section REGEX for more on this.
+
+Note that Perl already compares the values in the variable each iteration via a
+simple equality test, so the only real gain from using qr// is not having to do
+that equality test each iteration of a loop.
+
+2. OUTPUT: Fixed a few small inner key name failures to use '-' instead of ' '
+to separate key terms:
+
+3. REPOS: Called urpm urpmq, which is the query tool, not the actual type.
+
+4. GRAPHICS: Fixed some gpu_id.pl matching rules. Thanks Umio-Yasuno in github
+issue #281 for noticing that some of the matching rules were either wrong or not
+loose enough.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1a. OPTIONS: Long time oversight, no option to test or do one time change of key:
+value separator string ':'. This goes along with existing config option
+SEP2_CONSOLE. Added --separator/--sep {character}.
+
+1b. OPTIONS: Added synonym for --output: --export, and for --output-file:
+--export-file.
+
+2a. GRAPHICS: New Intel gpu data source, from intel, finally. This let us add a
+lot more gpu ids. Thanks Umio-Yasuno in github issue #281 for finding these.
+
+2b. GRAPHICS: New AMD data source, from github. This let me fill in some more,
+albeit not as accurately as previous sources, but added more so fine. Thanks
+Umio-Yasuno in github issue #281 for finding these.
+
+3. CONFIG: In a first, took a feature from acxi, --config, and imported it into
+inxi! This shows active current configuration, by file.
+
+4. CPU: updated, fine tuned amd cpu microarch ids.
+
+5. DISKS: More disk vendors added. Not as many as usual, I think the high tech
+sanctions against China may be slowing the rate of new Chinese SSD/USB vendors.
+But still some new ones, as always. Not many new IDs for existing ones though,
+that is noteworthy. A few new data sources to help pinpoint vendor names found
+too, though those won't in general impact users, but can be used to determine if
+a string is in fact a company name.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. OUTPUT: Fix 2, -t 'started by:' key name changed to: started-by:
+-G 'direct render:' changed to 'direct-render:'.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1a. MAN: there were a few <...> instead of [...] for required option arguments.
+Fixed those.
+
+1b. MAN: also added --debug-id [string] since that is in general useful info.
+
+1c. MAN: Added qualifiers about when xwayland: and compositor: items appear for
+default -Ga output.
+
+1d. MAN: Typo in config path in man page, .conf/ should be .config/.
+
+1e. MAN: for --output json/xml, added pointer to doc page on smxi.org, people
+being unable to grasp the output is getting tiresome.
+
+1f. MAN: Added synonym for --output, --export.
+
+2a. SMXI.ORG DOCS: added --output json/xml documentation page:
+https://smxi.org/docs/inxi-json-xml-output.htm - this is also linked to from the
+github wiki page, though of course nobody is going to read it, as well as from
+a few pages in smxi.org.
+
+2b. Updated inxi-man,options,changelog.htm files.
+
+3. CHANGELOG: Changed to use same format as acxi.changelog, leading topic id's
+in upper case, makes it easier to scan read and organize.
+
+4a. DOCS: docs/inxi-cpu.txt - cleaned up, re-arranged a bit, added cpuid data
+explanation, and updated header on inxi-perl/data/cpu/microarch to better
+explain the way amd does ext fam / ext model, which are not the same,
+bizarrrely, very confusing.
+
+4b. DOCS: New: docs/inxi-disks.txt. Split out from inxi-resources.txt, part of
+the ongoing to documentation modularization, slowly splitting out sub topics
+from inxi-data.txt and inxi-resources.txt. Note this is in general only done
+when I'm working on that specific feature. But slowly, surely.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1a. GRAPHICS: Test when no gpu drivers and no dri drivers but x drivers never
+showed x driver. Was supposed to be all || for tests:
+
+if (@$gpu_drivers || $graphics{'dri-drivers'} && @$x_drivers){
+
+https://perldoc.perl.org/perlop. I believe this led to test 1 being false, test
+2 being false, and since that left tests 2 and 3 needing to be true for the &&
+logical and to be true. Since only one of the two was true, the last bit was
+seen as false.
+
+1b. GRAPHICS: Connected with 1, noticed that for some weird reason, I'd decided
+to assign the array ref for drivers like this:
+
+@$x_drivers = (a, b, c);
+when it was supposed to be:
+$x_drivers = [a,b,c];
+
+This did not cause any issues, since they mean the same thing, but it was silly
+to write it that way.
+
+2a. DEBUG: Added --debug-arg-use which allows testers to run a specific argument
+combination that may be causing issues.
+
+2b. DEBUG: Also added more validation, to make sure arg for --debug-arg /
+--debug-arg-use start with - or -- followed by a letter.
+
+3. START: Removed this code block from set_konvi_data. I had left this in place
+for a release or two to make sure no need for it was found, but it will never be
+used since it never worked in the first place.
+ # my $config_cmd = '';
+ # there's no current kde 5 konvi config tool that we're aware of. Correct if changes.
+ # This part may never have worked, but I don't have legacy data to determine.
+ # The idea was to get inxi.conf files from konvi data stores, but that was never right.
+ # if (main::check_program('kde4-config')){
+ # $config_cmd = 'kde4-config --path data';
+ # }
+ # kde5-coinfig never existed, was replaced by $XDG_DATA_HOME in KDE
+ # elsif (main::check_program('kde-config')){
+ # $config_cmd = 'kde-config --path data';
+ # }
+ # elsif (main::check_program('qtpaths')){
+ # $config_cmd = 'qtpaths --paths GenericDataLocation';
+ # }
+ # The section below is on request of Argonel from the Konversation developer team:
+ # it sources config files like $HOME/.kde/share/apps/konversation/scripts/inxi.conf
+ # if ($config_cmd){
+ # my @data = main::grabber("$config_cmd 2>/dev/null",':');
+ # Configs::set(\@data) if @data;
+ # main::log_data('dump',"kde config \@data",\@data) if $b_log;
+ # }
+
+4. OPTIONS: in OptionsHandler::post_process(), reorganized the various run and
+exit triggers, help, configs, recommends, version, etc. All on top now.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 7 Feb 2023 18:00:00 -0800
+
+================================================================================
+Version: 3.3.24
+Patch: 00
+Date: 2022-12-10
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+A small point release, mainly to get some bug fixes, and a few minor issues, and
+some ongoing updates to various matching rule features like CPU, Disk Vendors,
+etc.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. mrmazda, for continuing to poke around and finding oddities on occasion.
+
+2. The various packagers, for continuing to package inxi.
+
+3. Nothing else really comes to mind, so I'm thankful that no real issues popped
+up, and the ongoing attempt to stabilize and clean up the several year
+aggressive development cycle of code is proceeding quite well.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. I'm currently getting no data samples from new server type CPU systems,
+Nvidia Grace, Ampere, both ARM V2 based. The ARM cpu arch logic hasn't been
+updated in many years since I have gotten no meaningful data, currently
+Raspberry Pi 4 is the latest ARM generation I've seen data for, and no ARM
+server type for many years. So support there is really not happening, and won't
+be until I start getting real datasets on those server systems.
+
+Nvidia uses Neoverse V2 ARM core, but I have no information on that yet. Also
+nothing from the Amazon CPU, new Marvell datacenter type CPUs. But that's not
+surprising.Also, nothing from the N1 (2019) or V1 Neoverse (2021) ARM CPU family
+even though those have now been out a while.
+
+A lot of the advanced CPU data should 'just work' because of the huge CPU
+refactor done recently, but some of the more advanced data, particularly
+cpu_arch type data, isn't going to be available until I get real data sets so I
+can see what's going on. No idea how CPUID might work for ARM cpus, for example.
+
+Objectively many of these datacenter/machine learning focused CPUs will never
+see a system inxi will run on, though most I suspect will be running GNU/Linux
+in some form, so inxi can in theory run on them, but those people all know what
+their systems are doing, so the need isn't particularly pressing of course.
+
+With this said, I did used to have more access to cutting edge server stuff, but
+that has largely dried up, particularly ARM based chips.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Found while resolving Fix 2, it turns out > 1 X Screens would not have shown
+correctly due to failing to pass $j row counter by reference. This bug was
+introduced when the big Monitor updates were done, since you almost never see
+> 1 X Screens now, I never saw it until testing something for another reason.
+
+This led to > 1 Screen showing on the same line as the last monitor of the
+previous Screen.
+
+See also Fixes 2, 3, 4, and Code 1, 2, 3.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Changed Intel Saphire Rapids release data from 2021+ (what Intel had
+initially announced) to 2023+ (the actual release date). Not my fault!! They
+were too optimistic, inxi merely repeated their claims.
+
+2. While trying to figure out extra Screen showing up, found a series of subtle
+issues with how X Screens are handled. Added in more robust test for if Screen
+ID has been added by xdpyinfo_data, and other weird corner cases that might
+cause strange results in Display Screen-x.
+
+Created check_screen() to allow for more granular and debugable testing.
+
+This forum post helped focus attention on this issue:
+
+https://forum.endeavouros.com/t/\
+my-second-screen-is-not-working-after-installing-nvidia/33388
+
+3. %monitors was not correctly assigned in xrandr screen fallback.
+
+4. Set number of Screens found if no xdpyinfo or if xrandr found > xdpyinfo
+number of screens.
+
+5. Added Zhaoxin match to Centaur match, might show up on cpu string.
+
+6. OpenBSD's package manager was listed as pkg_info, but it's slightly more
+accurate to call it pkg_add. As far as I understand it, OpenBSD doesn't really
+have a 'package manager' per se, it has a suite of tools to manage packages.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added some Zhaoxin/Centaur IDs, unlikely to show up, but you never know.
+
+2. Added m68k to X display driver list. This was just added to kernel as a full
+drm driver! Very legacy, but has users in vm, qemu, etc.
+
+3. More disk vendors! I skipped updating this last time because, well,
+collecting the data is really boring, and slightly tedious, and really serves to
+simply remind that this is not the way towards a better world. Or are cheap SSDs
+the true path after all? I doubt it, but you never know.
+
+4. New AMD, Nvidia gpu ids.
+
+5. New Intel Cpu Microarch IDs.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. No changes to speak of, so I won't.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Various ongoing updates to inxi-perl/docs. These are very slowly being pulled
+into a more useful form. Emphasis on slowly.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. In Graphics::xdpyinfo_data() and Graphics::xrandr_data() got rid of extra
+step, now just assign hash reference directly to push anonymous hash reference
+into array. Had used intermidiate variable assignement of hash ref, but that is
+pointless.
+
+2. Added $fake{'xdpyinfo'}, hoping to get some debugger data to test weird
+extra 'Screen' seen with Endeavor user (see Fix 2, 3, Bug 1).
+
+3. Also, instead of using \%monitors, which creates a reference to the last
+value of %monitors, used the correct and safer {%monitors}, which creates an
+anonymous reference of the value %monitors had at that moment. This is a subtle
+Perl error which is easy to make in cases where the hash or array reference is
+almsot never > 1 instance, such as > 1 X Screens.
+
+This should at least help resolve the repeated 'monitors' rows in the output
+in Fixes 2, 3, 4.
+
+4. Added 'source' to $graphics{'screens'} to log where each detected screen came
+from, xdpyinfo or xrandr.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Sat, 12 Dec 2022 13:28:23 -0700
+
+================================================================================
+Version: 3.3.23
+Patch: 00
+Date: 2022-10-31
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+This release fixes another very long standing bug, which I was not sure was an
+inxi or a Konversation bug, which made tracking it down very difficult. The bug
+was that inxi simply did not run in Konversation, it would exit with error when
+run with /cmd or /inxi via symbolic links.
+
+This may not seem like a huge deal to many of you, but the actual history of
+inxi was directly linked to user support in mainly Konversation, so this feature
+not working I have alwyas found extremely annoying, but I could never figure out
+why it wasn't workiing, and didn't really know where to start until Argonel
+helped narrow it down to a specific Konversation function in inxi. At which
+point tracking down the real bug was fairly easy. Since testing in IRC is always
+a key test point for inxi features and releases, not working in my main GUI IRC
+client forced me to use CLI clients like irssi, via /exec -o inxi.
+
+There was a secondary cause of failure, which was missing a key qdbus package,
+which made figuring this one out a two step process.
+
+So inxi is once again working in all areas, with no known significant failure
+areas beyond known issues that have no current solution, or which I don't feel
+like doing.
+
+But possibly more important, a goal I have had for a while now of doing long
+needed code refactors, bug fixes, without huge new code blocks or features
+adding new future fixes and bugs, has been slowly happening.
+
+This was quite important, because inxi's codebase and logic is so complex and
+large now that at some point, it required rest and cleanup and corrections,
+without continuously adding new code and logic, which would then trigger new
+fixes and bugs. In other words, the code is taking a long needed, and well
+deserved, breather, to recover after huge increases in the overall LOC and
+feature sets.
+
+--------------------------------------------------------------------------------
+SPECIAL THANKS:
+
+1. MrMazda, for finding even more failure and corner case issues. See Bug 1.
+
+2. Github Issue #275, for finding and reporting and testing some WSL failures.
+
+3. argonel of Konversation, for helping me finally track down the inxi / pinxi
+failing to run in Konversation issue. Done, appropriately, on IRC channel
+#Konversation. And in particular, for directing my attention towards the likely
+cause area, and away from wrong ideas.
+
+4. Thanks delanym, who filed Gitbub issue #276 for reporting a ZFS problem,
+which also exposed some harder to trigger bugs in ZFS (Bug 3).
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. No known way to detect that the system might be Wayland for the Graphics:..
+API: fixes, unless Xwayland is installed if the wayland protocol detections
+failed, which they often do in console. Not practical to look for all compositor
+variants on system to determine if it could be Wayland if not X or Xvesa, so
+that one will just be what it is, which is fine, definitely better than it was
+before. Note this is only an issue if in Console, no Display. Note that if inxi
+is run as root, Wayland data also usually fails, even in Display.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Another corner case monitor position issue, applied fallback primary monitor
+rule when a primary monitor had already been located. This is corrected via a
+graphics global $b_primary which once set will disable this fallback feature.
+Objectively, the fallback feature should just be removed. The test is if that
+monitor is not primary, and if position is 0x0, then assume primary, without
+verifying no primary had been located yet.
+
+2. A super old bug, in current konversation, was failing to trip the konvi
+detections, which then resulted in not stripping off the first two args in
+@ARGV, which then resulted in bad args being passed to inxi on konvi start,
+which then resulted in silent failing. Many thanks to argonel of #konversation
+for the patience to help me figure out what was going on with this bug. He's
+been a Konversation developer probably longer than I've been doing inxi.
+
+Cause was very tricky and subtle, the ps aux path for konvi had changed
+slightly, not the path, but the pattern, it used to be:
+
+konversation -session [sessin id]
+but it's changed to:
+konversation -qwindowtitle Konversation
+or just plain:
+konversation as line ending.
+
+This led to failure to find konvi running, which then made the konvi ids fail.
+
+Also, this would not work if the qdbus-qt5 package was not installed, or other
+distros might have that packaged differently. Because of these dual causes, I
+was simply unable to figure out what was going on for many years. I suspect this
+stopped working with KDE 5/QT 5, but I'm not sure.
+
+3. Used wrong key names for some ZFS tests and fallbacks, those could have led
+to failures though very difficult to test and verify this. Also see fix 5, which
+of course also looks like a bug, acts like one, but was actually due to a new
+use of /dev/disk/by-partuuid for ZFS components in Ubuntu which inxi had not
+seen before.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Alternate ps IDs for appimage detection (try appimagelauncher), alternate
+paths for possible appimage storage locations (also try ~/.appimage/*). File
+names might be *.appimage or *.AppImage, probably other variants too.
+
+2. Going along with Change 1, made tests more granular for missing graphics API
+type data. Also updated messages to be more correct and clear, in and out of
+display. This corrects an issue I'd seen but never resolved, which was on
+headless systems showing this message:
+
+Message: GL data unavailable in console. Try -G --display
+
+Now the tests are far more granular, and only show that if glxinfo is installed,
+and also shows specific messages if glxinfo not installed, but X/Xorg present,
+or, for Wayland, if Xwayland present. These all get their own specific messages
+now, and generally will also show which API is being used, or API: N/A if
+nothing is detected, as in the case of a headless system with no X, Wayland,
+etc.
+
+3. Github issue #275 on of all things Microsoft WSL environment, has a small
+glitch with undefined display hz, but otherwise inxi seems to work in that
+environment, albeit missing many data types!
+
+4. Made tests for konversation more robust, including test for
+$ENV{'PYTHONPATH'} containing konversation in path, which I believe will work
+for all new Konversations (KDE 5 and newer), and be much faster. The previous
+tests are now more robust and less prone to failure, and only activate when
+PYTHONPATH is not present with konversation string present as well.
+
+5. Fix for ZFS using /dev/disk/by-partuuid for partition id in zfs,
+which can lead to wrong usable disk total size report, along with failure
+to show components.
+
+6. Exposed by issue #276, case where line was wrapping value when value was too
+short visually to value: used: 34.4 GiB (4.5%) due to the 3 or more words
+trigger to enable wrapping of value, but noticed that if length of line was
+exactly max-width, not > or <, it might vanish.
+
+7. Case where no X or GPU drivers found, but dri driver detected, was not
+showing, now does.
+
+8. OpenRC is the init system in some cases, that is: readlink /sbin/init >
+/sbin/openrc-init, where /proc/1/comm == init. Was showing only as OpenRC rc
+type, which wasn't actually correct.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. New nvidia gpu product ids for Turing, Ampere, Lovelace, Hopper. New Intel
+GPU ids.
+
+2. Added Zinc to systembase/distro, needs slightly special handling to get both
+names right. Also added Tuxedo, which could use existing methods.
+
+3. Added dpkg tool nala, which is sort of a CLI front end for apt, zinc uses it,
+but it's also in Debian main package pool. Also deb-get, which is another zinc
+thing for package management.
+
+4. Full support for dinit: version, dinitctl w/status in ServiceData
+
+4. Added initial support for init systems: 31init (31 line C program, no
+--version), Hummingbird (unknown if -v/--version).
+
+5. A few new CPU arch ids (new Intels).
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Going somewhat along with the change in Audio to call ALSA a Sound API
+instead of a sound server, changed key name OpenGL: to API: OpenGL in Graphics.
+Also for EGL wayland, calling that the api too.
+
+https://en.wikipedia.org/wiki/OpenGL
+
+This conforms more closely to how these things are defined. Note that once
+again, a value had been used as a key name, which almost always indicates a
+failure to understand something about the core tech.
+
+2. Changed wrapping of values from 3 words or more to 3 or more words AND length
+> 24 characters. Saw example of:
+ .... used: 28.45 GiB
+ (4.5%)
+
+which isn't desirable.
+
+3. Changed minimum wrap to 60 columns, the new wrapper features are working so
+well that if users want output that short, it will usually work fine, except of
+course for very long word strings like a kernel name or parameter.
+
+Note that this does not truncate long 'words' that might be wrapped, or going
+along with Change 2, long 'sentences' of 2 words, those will always appear on
+the same line regardless. For 'sentences' of 3 or more words, however, it goes
+word by word, so it could well wrap after the first word, and so on. Obviously,
+a 24 or fewer character value will never be wrapped, which was the intended
+correction of change 2.
+
+4. Going with Fix 8, OpenRc is an init system when it owns /proc/1/comm, had not
+realized that /proc/1/comm == init can map to dinit, openrc as init. Now will
+only show OpenRc as rc: type if not init as well.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Updates in man for Change 1.
+
+2. Added to docs/inxi-graphics.txt good quote re EGL/GBM, as well as VBE/GOP for
+vesa. Trying to find docs where they actually say clearly it's an API is
+remarkably difficult.
+
+3. Man page, added note about Konversation requiring qdbus-qt5 (Debian+),
+qt5-qttool (RHEL+/SUSE+), qt-tools (Arch+) for inxi to work inside it. Also
+updated smxi.org/docs/inxi-usage.txt to note requirements for Konversation use
+and setup.
+
+4. Man, help, changed min width for -y/--width from 80 to 60.
+
+5. docs/inxi-values.txt updated for --cygwin, --wsl fake OS type switches. Not
+technically the OS, more the environment, but close enough.
+
+6. docs/inxi-init.txt updated for new init types.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Refactored tools/gpu_ids.pl to correct and enhance some features.
+
+2. Renamed functions and sections to better reflect that the display interface
+is an API, this makes stuff less odd internally, and makes the function/variable
+names correspond better to what the stuff really is.
+
+3. Commented out kde konversation data source config collector, that logic looks
+like it never worked, and couldn't work, since it never actually located
+inxi.conf files, just paths to the data directories.
+
+4. Expanded release.pl to handle acxi docs as well, makes it all consistent and
+a lot easier to do long term.
+
+5. Fake --wsl WSL switch, not really used, but in case.
+
+6. Changed $b_cygwin to $windows{'cygwin'} and added $windows{'wsl'}.
+
+7. Added -WSL to debugger string generator once WSL type is detected.
+
+8. Refactored init, runlevel functions get_init_data() (now InitData::get()),
+get_runlevel_data() (now InitData::get_runlevel()), get_runlevel_default() (now
+InitData::get_runlevel_default()) into one package/class: InitData. This should
+have been done a long time ago, to follow the general rule "if > 1 functions for
+a tool refactor it into a class/package" for when to create a package/class
+internally.
+
+9. Completed gpu_ids.pl, now outputs the full hash set per item, so entire
+blocks can be copied/pasted over. Something of a pain to get comments included,
+which aren't strictly necessary in pinxi itself, but they do help read the
+hashes for gpu data.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 31 Oct 2022 16:45:37 -0700
+
+================================================================================
+Version: 3.3.22
+Patch: 00
+Date: 2022-10-08
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Another big one, with a long time to-do item done! /sys based sensors data is
+now used as a fallback, with fully revised error messages to handle this new
+sensor data variant. Due to potential bugs this might create, this was left off
+of the 3.3.21 release, which needed to go out on a schedule, but there is plenty
+of time for 3.3.22 to be debugged.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. inxi can't currently handle raw in[0-9] voltage sensor data from
+/sys/class/hwmon, that may get corrected, but I've honestly never seen a system
+that shows raw in[0-9] values as field names, so it's probably not very
+pressing, but it can happen. Similar that is to how default fanx and tempx field
+names are processed.
+
+2. Currently only checking -Gx, -Nx device temp for bus IDs ending in .0, which
+is the primary PCI device. I think that's the only one that will have a temp,
+.1, which is a second device on the same hardware, doesn't have that data in
+tests. Saves some requests since it's a big glob of /sys.
+
+3. Spiral Linux has no obvious way to determine that it is Spiral and not Debian
+11 as base distro. No /etc/ files for distro ID contain anything for spiral, so
+leaving that one alone.
+
+4. Can't get 100% reliable cpu level > v2 due to it not being a pure cpu flag
+based test, which is kind of sadly typical for the originators of this idea, but
+since the choice was dump the feature, or just use the note: check for > v2,
+opted for note: check. One wants to ask questions here, but honestly I already
+know the answer so why bother asking the question... The docs for this are
+awful, inadequate, incomplete.
+
+My strong suspicion is that this is NOT intended to be a distro-wide feature
+beyond v2 support minimum, but rather is for specific compile options for a
+package or daemon or server or whatever that can benefit from this type of
+fine-tuning. One thinks of Gentoo for example back when such fine-tunings could
+actually deliver noticeable differences in performance. A per system type
+feature that is, not a distro-wide feature. At least that's my initial feeling,
+but this is probably about all the time I will spend on it since inxi can't get
+it more accurate anyway.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Bug in monitor position logic, the horizontal/vertical sorts were being done
+alphanumerically, leading to absurd results where 800 > 2560 or whatever.
+Basically all x / y positions less than 1000 would have forced the smaller
+number to be considered as the greatest value. Another corner case find by
+mrmazda. Thanks mrmazda!
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Added i350bb sensor to network sensor type.
+
+2. Small glitch with some scenarios with missing fan1 in sensors, showed fan1 0
+rpm, but then showed fan 3: empty. That was a slight error in how undefined vs
+'' empty was treated.
+
+3. Added fix for defective fan speeds, skip fan item if > 15000, which is a bug
+in the fan speed report, making it useless. Seen 65535 reported RPM. Could
+probably make it 10000 upper limit but suspect that is a simple bug that creates
+an absurd value, 2^16 so won't be anything high unless bug active. This fix runs
+for ipmi, linux, and sysctl fan data.
+
+4. Trying for fix for dynamic gpu voltage, assumed always mV, but might be V.
+
+5. Inadequate or obscure or non-existent redhat/suse documentation led to some
+fixes for cpu v levels. Note that level v3/v4 can't be fully determined by cpu
+flag tests, but who cares? Certainly not me. Added 'note: check' for v3/v4.
+
+6. Nvidia device arch id was too loose, false id for non existing lovelace arch.
+Note that due to array reverse, the newest ids will always run first, which
+leads to possible false positives with first string match tests when no product
+IDs are available yet.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Elbrus CPU arch, process, year, arch data made more complete using new data
+resource. Thanks Elbrus guys!
+
+2. Finally, raw, basic /sys/class/hwmon temp data. Linux kernel docs note
+supports temp, fan, volts, amps, energy. But have only seen temps so far. Can
+force /sys use with --force sensors-sys / --sensors-sys, though there's no point
+to doing that except to test.
+
+Also changed --recommends to note lm-sensors not required for sensor data now.
+
+3. Adding device temp for -Gx, -Nx. Will only work for Linux and when found, and
+only for free drivers (I think).
+
+4. Added xdriinfo based dri drivers (with fallback to Xorg.0.log as data source,
+not as accurate), that will show if and only if that driver is not the same name
+as a detected X or gpu driver.
+
+5. Another big upgrade to cp_cpu_arch, added and corrected many AMD/Intel
+matches.
+
+6. A few more gpu product ids, Intel, added.
+
+7. More disk vendors, ids, the list, as we are now well aware, is endless,
+reflecting perhaps the futility of pursuing the infinite using finite means.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Slight changes in how inxi supplies no sensor data messages, and in the
+fallback cases and handling. More accurate and precise, and more robust overall.
+
+2. Due to complexity of understanding level: and the fact not all cpu flags are
+exposed that are required, moved -Cxx level: to -Ca.
+
+3. Changing slightly inaccurate Sound Server for ALSA/OSS to Sound API, which is
+the closest I can come to explaining clearly what it is. Note that you can only
+load one API type audio subsystem/driver, so you will be running one or the
+other, never both, from what I understand.
+
+Since OpenBSD sndio includes sndiod, calling that a sound server is basically
+fine, since it's both the server and the interface, if I understand it right,
+and there won't be a second sound server listed, actually won't be for any BSD
+that I know of, it's going to be sndio or OSS or nothing, unless something has
+changed.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Man page, updates for /sys/class/hwmon based sensor data.
+
+2. Small update for cpu level v3/v4, added note: check explanation, though it's
+too hard to really explain this stuff since the docs are... not wonderful, when
+they even exist and don't contradict each other.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Refined significantly sensors missing data and error messages to be much more
+accurate and granular. Also enables more sensors tools, though hopefully they
+won't appear since those are a real pain to implement, but it's more open to
+being sensor tool agnostic now due to these refinements than before.
+
+2. Added xdpiinfo to debugger.
+
+3. Switched x_drivers to return ref of array of refs, use join for output only,
+that lets us use the drivers to test dri stuff also (if we want or need to), and
+keeps it consistent with how most of inxi does that type of data
+handling/testing. If undef, it means no array ref exists, which makes testing
+easy.
+
+Not truly understanding hash/array refs when inxi rewrite to Perl started is
+probably one of the bigger causes of glitches and ongoing optimizations.
+Basically, in all but very small array cases, it's almost always better to start
+with a ref from the start as soon as the hash/array moves between functions,
+with one exception, when it's a globally stored data item. Then it depends. But
+this requires a consistent testing for null data as well, which is harder if you
+did it in different ways from the start. But slowly and surely chipping away at
+these.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Sat, 7 Oct 2022 11:15:12 -0700
+
+================================================================================
+Version: 3.3.21
+Patch: 00
+Date: 2022-08-22
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+A small point release, some nice enhancements, a few bug fixes, and some fixes
+to correct or update some issues. Main new features:
+* -rx,-rxx,-ra/-Ix,-Ixx,-Ia: enhanced Packages: report
+* -Cxx: microarchitecture level. This is a relatively new convention, used to
+set various compile flags.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Can't safely look for pm tool KDE Discover because apt calls it
+plasma-discover, but other packaging systems call it discover, which is already
+a non-related program (hardware data). Since it's not really core to any package
+manager, it's not really a necessary thing to report anyway, though
+gnome-software is added because that appears to be more like syntaptic than
+anything else.
+
+There's also a qt variant of the rpm packagekit, packagekit-qt, which is
+available in for example Arch, but again, it's too granular, and not really
+core.
+
+2. At some point, sensors should add /sys hwmon sensor data, then switch to
+using lm-sensors as a fallback, and remove one recommended tool from newer linux
+systems. I don't think that's too hard, just a bunch of little steps to
+integrate that into the main logic.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. For Slackware slackpkg/pkgtool:
+a: Failed to show package counts at all because of bad globbing path, forgot /*.
+b. Failed to show lib counts for packages due to having wrong counter for path.
+
+2. If no ipmi sensor data was found but the tools are present, could result in
+an undefined hash reference error for sensors. The most likely cause for this is
+that one of the ipmi commands:
+"ipmi-tool sensors" or "ipmi-sensors"
+had an error, and since errors are sent to /dev/null, inxi saw null data, then
+returned an undefined value instead of the hash reference it was supposed to.
+This is the first time I've seen this happen with ipmi, but there have not been
+a lot of ipmi samples.
+
+[update: the bug was running ipmitool sensors instead of ipmitool sensor]
+
+Thanks issue poster #274 for having systems that triggered this scenario.
+
+3. $source for ipmi was set to lm-sensors by accident.
+
+4. For sensors, with > 1 sensor type, like lm-sensors + ipmi, sensor data from
+second sensor type was getting written to first sensor type row. See Fixes 9 for
+more sensors fixes.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Force CPU bits to 64 if LM flag is present, if it reports as i686. This fix
+only runs for non RISC CPUs that show as 32 bit, so it won't run very often. If
+no LM found, remains 32 bit.
+
+This fix goes along with enhancement 1, which only applies to 64 bit CPUs.
+
+2. In --recommends, JSON::PP module package names were wrong, they were copied
+from JSON::Cpanel::XS and hadn't been changed to the right package names. Note
+that for most distros, this is in Perl Core Modules, but not all.
+
+3. Samsung ram vendor id was too tight, loosened it up a bit. Missed this one:
+K3LK7K70BM
+
+4. With Bug 1, extended possible package manager tool detection for slackware
+type systems. Slackware is kind of unique in that it is not actually made out of
+a core package manager as a collection of packages, but uses package managers as
+a kind of layer on top of that, but none of those tools is required to run the
+system.
+
+5. Found another corner case indentation glitch, was adding in level 2 on -I
+which is has no second level indentation.
+
+6. Forgot to add $force{'pkg'} to -v8.
+
+7. Small fix, if -Z is used, forgot to force --zl, --zu, --zv to false as well
+as -z.
+
+8. Small fix, for saphire rapids, alder lake, added + to year built, since those
+are ongoing.
+
+9. Sensors:
+a. in one case, with an array of fan speeds, set to '' instead of undef, which
+made test fail, and showed empty fan item.
+b. added wildcards for possible voltage/power matches, was too restrictive for
+ipmi sensors values.
+c. added better space regex for ipmi temps [\s_-]?
+d. DIMM voltage/temp excluded > 9 numbering, like DIMM 19
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. New feature: -Cxx shows for AMD / Intel 64 bit CPUs the microarchitecture
+level (v1,v2,v3,v4). v1 is baseline. GCC supports this I believe in latest
+versions, and some distros use it to determine CPU support levels for compile
+time optimizations. This was introduced in 2020 via a collaboration between AMD,
+Intel, SUSE, and Redhat. Now you know. This is a simple test based on which CPU
+flags/features are present.
+
+These levels can be used for Go language optimization (GOAMD64), GCC
+optimization switches (GCC -O2 for example), and probably more.
+
+2. Expanded YMTC (Yangtze Memory) RAM vendor ids and detections.
+
+3. Added [unverified] window managers CDE and NsCDE. No data, only using ps aux
+method.
+
+4a. Added slax ID to distro id, added slax to system base support. Currently
+only work on slackware based 15.0, not debian based 11.4.
+
+4b. Added SteamOS debian/arch for system base.
+
+4c. Added os-release VERSION_CODENAME to enhance distro ID data (eg steamos)
+
+5. Added to -ra/-Ia package tools installed report, this goes along with change
+2, which changes apt to dpkg, the low level tool. Now with -a, shows the package
+manager tools installed, like slackpkg, apt, apt-get, dnf, yum, zypper, etc.
+
+rpm installed as secondary pm requires some further tests. Currently known pm
+that have tools (and rpm tests if detected):
+All these are known to support rpm secondary pm:
+* dpkg - Debian, Ubuntu, and apt-rpm based distros like PCLinuxOS, Alt Linux
+* pacman - Arch based distros
+* pkgtool - Slackware based distros
+* tce - TinyCore Linux
+
+6. A few more pci product IDs for GPU matches. Slow going.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Changed --pkg to --rpm, the original intention was that this could apply to
+more than RPM package manager, but that's the only one that it's used for. This
+leads to unclear output for other distributions where the user might have rpm
+installed alongside their standard package manager.
+
+2. Changed package pm: 'apt' to 'dpkg', to go along with type rpm (suse,redhat)
+and pkgtool (slackware). Note that dpkg is the actual package manager of Debian,
+inxi had this wrong, apt interacts with dpkg.
+
+3. Changed -h -a section, to follow after -x, -xx, -xxx, like on man page.
+
+4. For rpm notes, after running some tests to determine whether to use rpm or
+not, will show the rpm note: see --rpm in pm: rpm note:... This allows for
+more granular errors which will be more useful to users.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Docs were wrong for -ra/-Ia packages, from original when the package report
+was only an -a option, but it got moved to -rx, -rxx for basic features, and -a
+for advanced features.
+
+2. Updated for --pkg/--rpm and --force rpm/pkg
+
+3. See change 3, I think people tend to miss the sequence of -x, -xx, -xxx, -a
+because -a came before -x, -xx, -xxx in -h menu, but on man page, -a correctly
+comes after the -xxx options. Better to be consistent.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Added convert to change --force rpm/--rpm to switch on $force{pkg}.
+
+2. Refactored package PackageData to be more granular.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 22 Aug 2022 18:46:23 -0700
+
+================================================================================
+Version: 3.3.20
+Patch: 00
+Date: 2022-07-27
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+A good bug fix, and several very good indentation fixes that had always been
+around, and some of them known. More fine tuning of CPU process/built data. Bit
+by bit it's getting filled out.
+
+Thanks again mrmazda for all the suggestions and watchful eyes.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. CPU built, process are not perfect and complete and always right. Like life,
+it's not perfect, but it is ok. Help complete the feature if it bothers you.
+
+2. Intel Raptor Lake and related APUs are trickling out, but I have not found
+cpuid data for the cpu, or generation data for the apu. Was hoping to squeeze
+that into 3.3.20, but looks like it will have to go into 3.3.21 or later.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. MrMazda pointed this out, the printer was not correctly indenting long values
+in specific cases, not adding indentation level 1 when the key: value pair was
+not the last item on the logical line. Subtle, but could hit Device, OpenGL, and
+a few other cases.
+
+2. When SMT is disabled, cpu speed from /sys can return <unknown>, which is a
+string, not the numeric value inxi expected. This trips multipe errors when
+speed cleaner is used. Thanks issue #273 reporter iamc for this one. My guess is
+all during all cpu testing, none of us thought to disable smt to see what would
+happen.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. On disk vendors, Initio isn't a vendor, it's either a misconfigured ide hdd,
+slave/master wrong, or bad usb controller. Initio is a default controller, not a
+vendor. Added pre-filter in disk_vendor() to remove that string if it appears.
+
+2. Going along with bug 1, finally fixed long standing weakness with long value
+wrapping, now continues to build line until it's done, and does not force a new
+line after the last long value item.
+
+3. Another glitch where last key: value pair was less than working width, but
+total width was greater, was not wrapping correctly.
+
+4. Saw a corner case Intel Core name: Core i7-1165G7 which did not use the
+expected intel (core number)(3 digits), modified to look for 3 digits after core
+numer OR 2 digits + letter + digit.
+
+5. Added 'tar' installed test for debugger, found cases in actual distros that
+shipped without it in their minimal installs. Times sure have changed!
+
+6. Another Centos type change, amazingly, this was shipped without lspci as
+well! No idea what went into the install ISO if this stuff didn't include the
+most elementary Linux tools. Added lspci missing error if linux and not risc and
+no pci_tool detected. I have to admit this is really surprising to me, I mean, I
+thought the entire purpose of the rhel family was to provide enterprise
+solutions, but to leave out such elementary tools required by every sys admin is
+very difficult to understand. This was centos 7.5. I believe Alma and Rocky 9
+minimal have those basic tools, so that's an improvement, though they didn't
+have tar.
+
+7. Added a '-' between gen and gen number for Intel GPU generation output. Even
+though it's documented as for example gen9.5, it looks odd to see it that way,
+it's easier to read it as gen-9.5 I think.
+
+8. Did same for AMD arch/codes, for numbered arch/codes like Rage 9, easier to
+read as Rage-9.
+
+9. Extreme corner case spotted by mrmazda, if KDE is started by TDE, inxi showed
+Trinity, not KDE-Plasma as the desktop. Further, it failed to show Trinity
+version, maybe because Trinity was not installed?
+
+10. Finally found cause of Tdie vanishing in favor of Tctl, a bad decision to
+hide Tdie if Tdie == Tctl, why they did that, I don't know, but at least nwo,
+there will be AMD Zen cpu temp again.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1a. More or less completed verification of AMD cpu microarch/built/process, and
+added more accurate fallback cases for stray model IDs.
+* family 5h: K5, K6
+* family 6h: K7
+* family 7h: K8 - mostly done, needs some checks.
+* family 10h: K10
+* family 11h: K11 Turion X2. Note there is some uncertainy about this family
+name. Built years n/a yet. Mix of K8/K10
+* family 12h: K12 Fusion, K10 based, first APU type?
+
+1b. Extended Intel cpu data a bit more as well. Thanks linuxdaddy from slackware
+for the research help there.
+* family 4: mostly new, fine tuned, granular
+* family 5: more granular, better date/process info.
+* family 6: built dates added
+* family F: corrected some overly specific stuff
+
+2. Tentative support for finit init system (fast init). Runs in /proc/1/comm,
+uses initctl, which may have been revived from its upstart days, not sure. Added
+potential support for nosh, linux only, don't know how to detect other bsd init
+system.
+
+3. Added amd/intel gpu product IDs.
+
+4. Added shortcut --filter-all/--za, activates all filters: -z, --zl, --zu,
+--zv. Why not?
+
+5. Added support for dm types kdmctl and xdmctl, opensuse and maybe redhat use
+the latter to start the actual dm running the desktop/wm. You want to see that
+because you need to do systemctl restart xdm to restart the actual dm. Thanks
+mrmazda for pointing out this one.
+
+6. Added AlmaLinux, RockyLinux, CentosStream to system base (RHEL derived).
+
+7. Basic Raptor Lake gpu/apu support added, with patterns to detect since few
+product ids yet. Same applies to Arctic and Alchemist, which still have no
+product IDs.
+
+8. More disk vendors and disk vendor ids, never stops - the waters flow on, the
+rain falls, then the sun comes out. Until one day it doesn't.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Deprecated --gpu, now it works the same as -Ga, that was too granular and
+nobody would use it I think. Now that the new gpu features are solid, no need
+for this special feature.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Updated docs/inxi-values.txt, it didn't have all the --debug-xxx options
+listed.
+
+2. Split out some BSD data into docs/inxi-bsd.txt.
+
+3. Big update on docs/inxi-init.txt, moved data to it from other files, updated
+the init/service tool data.
+
+4. Renamed init-data.txt to inxi-init.txt, renamed cpu-flags to
+inxi-cpu-flags.txt to be more consistent.
+
+5. Updated help, man for new --filter-all option.
+
+6. Updated help and man for --gpu deprecation.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Moved required perl modules and system programs checks to
+check_required_items() in debugger, why not? Also added an error handler for
+missing required programs, this is really the only one, and only for
+--debug >= 20
+This is the only required program test inxi has in it I believe, really amazing
+that such a core tool would be left out of an OS today.
+
+2. Removed this redundant block of code from Network device_output() end
+section, that repeated in the main get() so didn't seem to serve any purpose.
+The test in get() is if n!@rows and if !%risc, same as here, so can't see any
+use for it. I'm leaving this here in case that did have some use, but I don't
+see it.
+
+# we want to handle ARM errors in main get
+if (!@$rows && !%risc){
+ my $key = 'Message';
+ my $type = 'pci-card-data';
+ if ($pci_tool && $alerts{$pci_tool}->{'action'} eq 'permissions'){
+ $type = 'pci-card-data-root';
+ }
+ @$rows = ({
+ main::key($num++,0,1,$key) => main::message($type,'')
+ });
+}
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Thu, 27 Jul 2022 11:58:32 -0700
+
+================================================================================
+Version: 3.3.19
+Patch: 00
+Date: 2022-06-16
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+This is a quick bug fix release, and one other fix, the bug only impact Debian/
+Ubuntu distros.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Nothing new.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Two repo_builders could create an undefined array ref situation, one in Antix
+I have no idea was triggered since it requires an apt file be not readable but
+existing, which just isn't a normal debian/ubuntu situation. Void linux was the
+other. Since those were the only two with a -r file test, there must be some
+case where the file was not readable, though I have no idea what that case might
+be.
+
+Further examination showed this can hit all apt based systems, the cause is no
+/etc/apt/sources.list file, which is a possible scenario across all apt systems.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Blacklisted all apcitz sensors that are not acpitz-virtual, which is the cpu
+temp. This may help resolve issues for some users where for example using
+acpitz-acpi, which is not the cpu sensor.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. A few more AMD family F empirical IDs made.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. None.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Started to split/merge inxi-data.txt and inxi-resources.txt into topic
+specific files, like inxi-sensors.txt, inxi-graphics.txt, etc. inxi-values and
+inxi-resources have just gotten too big over the years.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Corrected in RepoItem possible use of undefined array references.
+
+2. Finally, a full release tool!! inxi-perl/tools/release.pl. Validates man,
+verifies pinxi commands to avoid errors, then updates man/options/changelog
+html pages for smxi.org/docs, and then syncs pinxi* files to inxi*.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 16 Jun 2022 15:43:00 -0700
+
+================================================================================
+Version: 3.3.18
+Patch: 00
+Date: 2022-06-13
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug release, replace 3.3.17 asap, most users will not experience the bug, but if
+they do, inxi stops right before the -D line. Failed to do an if defined test on
+an array ref that could be undefined or an array ref. That makes Perl very
+unhappy!
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. AMD family F, K8 series, will need more granular treatments to get the data
+to be more accurate and less generic. We got 2 IDs nailed from raw visual data
+confirmations and cpuid values, which leaves many, but good start. We will chip
+away (pardon the pun) at these more ambiguous IDs over time, but don't need to
+get them all done instantly, just eventually. Thanks slackware person linuxdaddy
+for doing really good research and actually looking at the cpu to find dates
+etc.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Bug, fatal, caused by internal hash/array ref refactor of 3.3.17. Thanks
+alaymari github issue #271 for reporting this one.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. None except for code fixes to try to avoid the cause of the bug in Bugs 1.
+
+2. Fixed nvidia eol try --gpu, it was showing backwards, with --gpu, not
+without, sigh.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added slimski dm data. That's a new fork of SLiM. Also guessing that brzdm
+has same version -v output: brzdm version x.xx
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. None
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Refactors of core docs, ongoing, but will list those next release.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Cleaned up some array ref handling in subs, returned as: ($var1,$var2) =
+@{block_data(...)}, skipped initializing and creating scalar to hold the ref,
+just use it directly for DiskItem::block_data().
+
+2. Also switched to local ref scalar array in DiskItem::scsi_data(),
+DiskItem::block_data(). Not set local array, set local array ref, to keep it
+clear. Also made DriveItem::drive_speed() return straight ref, not array then
+ref. Same for many other subs, switched to ref assignment so it's the same ref
+all through all the sub and return.
+
+3. Fixed a redundant return \@$data to simply assigning to @$data ref, no return
+needed, in DiskItem::smartctl_data().
+
+4. Tightened some returns of ref so that tests if good test @$ref, not $ref.
+Trying to avoid more cases like issue #271.
+
+5. Going along with array ref local/return, switched all hash refs to local hash
+ref returning ref, and working local with ref. More efficient, avoids creating
+new refs over and over, dugh. This made a particularly large difference in CPU
+because in certain parts, new references were being created over and over, and
+subs were returning like \@arr or \%hash instead of declaring to start:
+my $arr = []; my $hash = {};
+
+Then working with the data from there on as an array or hash reference, to the
+same original reference, rather than creating new ones over and over, which Perl
+then has to track til they expire.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 13 Jun 2022 11:22:20 -0700
+
+================================================================================
+Version: 3.3.17
+Patch: 01
+Date: 2022-06-10
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Rollout of advanced microarchitecture info continues, added AMD/Intel gfx
+devices, CPU built dates, process nodes, generation (in some cases, where it
+makes sense), etc.
+
+Please note: the 3.3.16 > 17 releases require manual matching table updates. If
+you think disk or ram vendor, CPU or GPU process, release date, generation, etc,
+information is not correct:
+
+* FIRST: do the research, confirm it's wrong, using wikichips, techpowerup,
+wikipedia links, but also be aware, sometimes these slightly contradict each-
+other, so research. Don't make me do all your work for you.
+
+* Show the relevant data, like cpu model/stepping, to correct the issue, or
+model name string.
+
+* There are 4 main manually updated matching tables, which use either raw regex
+to generate the match based on the model name (ram, disk vendors), or vendor id
+matching (ram vendors), product id matching (gpu data), or cpu family / model /
+stepping id matching. Each of these has its own matching tool at:
+ inxi-perl/tools/[tool-name].pl
+which is used to generate either raw data used by the functions (ids for gpu
+data), or which contains the master copy of the function used to generate the
+regex matches (cp_cpu_arch/set_ram_vendors/set_disk_vendors).
+
+* Please use pinxi and inxi-perl branch for this data, inxi is only released
+when next stable is done, all development is done in inxi-perl branch. All
+development for the data or functions these tools are made for occurs in the
+tools, not in pinxi, and those results are moved into pinxi from the tools.
+
+* Saying something "doesn't work" is not helpful, provide the required data for
+the feature that needs updating, or ideally, find the correct answer yourself
+and do the research and then provide the updated data for matching.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. GPU/CPU process node sizes are marketing, not engineering, terms, but
+work-around is to list the fab too so you at least know which set of marketing
+terms you're dealing with. As of around 7nm, most of the fabs are not using nm
+in their names anymore, TSMC is using n7, Intel 7, for example. While these
+marketing terms do reflect changes from the previous process node, more
+efficient, faster, faster per watt, and so on, and these changes are often quite
+significant, 10-30%, or more, they do not reflect the size of the transistor
+gate like they used to up until about 350nm. Intel will move to A20 for the node
+after 4 or 5, 2nm, meaning 20 angstroms.
+
+Intel suggested million transistors per mm^2 as an objective measure (currently
+around 300+ million!! as of ~7nm), but TSMC didn't take them up on it.
+
+GlobalFoundries (GF) stepped away from these ultra small processes at around
+14nm, so you won't see GF very often in the data. AMD spun off its chip fabs to
+GF aound 2009, so you don't see AMD as foundry after GF was formed. ATI always
+used TSMC so GPU data for AMD/ATI is I think all TSMC. Intel has always been its
+own foundry.
+
+2. Wayland drops all its data and can't be detected if sudo or su is used to run
+inxi. That's unfortunate, but goes along with their dropping support for > 1
+user, which was one of the points of wayland, same reason you can do desktop
+sharing or ssh desktop forwarding etc. This means inxi doesn't show wayland as
+Display protocol, it is just blank, if you use su, or sudo start. This makes
+some internal inxi wayland triggers then fail. Still looking to see if there is
+a fix or workaround for this.
+
+3. In sensors, a new syntax for k10-pci temp, Tctl, which unfortunately is the
+only temp type present for AMD family 17h (zen) and newer cpus, but that is not
+an actual cpu temp, it's:
+https://www.kernel.org/doc/html/v5.12/hwmon/k10temp.html
+
+"Tctl is the processor temperature control value, used by the platform to
+control cooling systems. Tctl is a non-physical temperature on an arbitrary
+scale measured in degrees. It does _not_ represent an actual physical
+temperature like die or case temperature."
+
+Even worse, it replaced Tdie, which was, correctly, temp1_input, and, somewhat
+insanely, the non real cpu temp is now temp1_input, and if present, the real
+Tdie cpu temp is temp2_input. I don't know how to work around this problem.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Fallback test for Intel cpu arch was not doing anything, used wrong variable
+name.
+
+2. A very old bug, thanks mrmazda for spotting this one, runlevel in case of
+init 3 > init 5 showed 35, not 5. Doesn't show on systemd stuff often since it
+doesn't use runlevels in this way, but this bug has been around a really long
+time.
+
+3. SensorItem::gpu_data was always logging its data, missing the if $b_log.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Fixed some disk vendor detection rules.
+
+2. Failing to return default target for systemd/systemctl when no:
+ /etc/systemd/system/default.target
+file exists. Corrected to use systemctl get-default as fallback if file doesn't
+exist.
+
+3. Fixed indentation for default: runlevel, should be child of runlevel: /
+target:
+
+4. Fixed corner case where systemd has no /proc/1/comm file but is still the
+init system. Added fallback check for /run/systemd/units, if that exists, safe
+to assume systemd is running init.
+
+5. Fixed subtle case, -h/--recommends/--version/--version-short should not print
+to -y1 width, but rather to the original or modified widths >= 80 cols.
+Corrected this in print_basic() by using max-cols-basic.
+
+6. Forgot to add --pkg, --edid, and --gpu to debugger run_self() tool.
+
+7. Fixed broken sandisk vendor id.
+
+8. Finally found docs that explain, for some terrible reason, if Tctl and Tdie
+are the same, sensors or kernel does not show Tdie, sigh...
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added AMD and Intel GPU microarchitecture detections for -Gx. These are not
+as easy as Nvidia because there is no one reliable data source for product ids.
+
+2. Going with the -Ga process: .. built: item, -Ca will show process: [node] and
+built: years and sometimes gen: if available. Geeky, sure, not always perfect,
+or correct, but will generally be close. Due to difficultly in finding reliable
+release > build end years for example, not all cpus have all this data.
+
+Using CPU generation,where that data is available and makes sense. Like AMD
+Zen+ is zen gen: 2, for example,. Because Intel microarch names are often
+marketing driven, not engineering, it's too difficult to assign gen consistently
+based only on model names. Shows for Core intels like: gen: core 3
+
+That will cover most consumer Intel CPU users currently.
+
+3. Added initial Zen 3+ and Zen 4 ids for cp_cpu_arch(). There is very little
+info on these yet, so I'm going on what may prove to be incomplete or wrong
+data.
+
+4. Added GPU process, build years for -Ga.
+
+5. Added fallback test for gpus that we don't have product IDs for yet because
+dbs have not been updated. Only used for cases where it's the newest gpu series
+and no prodoct IDs have been found.
+
+6. Added AMD am386 support to cp_cpu_arch... ok ok, inxi takes 9 minutes to
+execute on that, but there you have it.
+
+7. Added unverified Hyprland wayland compositor detection.
+
+8. By request, added --version-short/--vs, which outputs version info in one
+line if used together with other options and if not short form. With any normal
+line option, will output version (date) info first line, without any other
+option, will output 1 line version info and exit.
+
+9. More disk vendors, ids! Much easier with new tool disk_vendors.pl.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Deprecated --nvidia/--nv in favor of more consistent --gpu, that's easier to
+work with multiple vendors for advanced gpu architecture. Note for non nvidia,
+--gpu only adds codename, if available and different from arch name. For nvidia,
+it adds a lot more data.
+
+2. Changed inxi-perl/tools tool names to more clearly reflect what function they
+serve.
+
+3. Going with runlevel fixes, changed 'runlevel:' to be 'target:' if systemd.
+Also changed incorrect 'target:' for 'default:'.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Updated man, help, docs/inxi-data.txt for new gpu data and tools, and to
+indicate switch to more generic --gpu trigger for advanced gpu data, instead of
+the now deprecated --nvidia/--nv, which probably will go down as the shortest
+lasting option documented, though of course inxi always keeps legacy syntax
+working, behind the scenes, it's just removed from the -h and man page in favor
+of --gpu. Also updated to show AMD/Intel/Nvidia now, since the data now roughly
+works for all three main gpus.
+
+2. Updated pinxi README.txt to reflect the tools and how to use them and what
+they are for.
+
+3. --help, man, updated for target/runlevel, default: changes for init data.
+
+4. Updated configuration html and man for --fake-data-dir.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Upgraded tools/gpu_ids.pl to handle nvidia, intel, or amd data, added data
+files in tools/lists/ for amd. First changed name from ids.pl to gpu_ids.pl
+
+2. New data files added for amd/intel pci ids, and a new tool to merge them and
+prep them for gpu_ids.pl -j amd|intel handling. All work. Took a while to get
+these things sorted, but don't want to get stuck in future with manual updates,
+it needs to be automated as much as possible, same as with disk_vendors.pl etc,
+if I'm going to try to maintain this over time.
+
+3. Made all gpu data file names use consistent formats, and made disk data files
+also follow this format.
+
+4. Changed raw_ids.pl to gpu_raw.pl, trying to keep things easy to remember and
+consistent here.
+
+5. Refactored core gpu data logic, now all types use the same sub, and just
+assign various data depending on the type.
+
+6. Changed vendors.pl name to disk_vendors.pl
+
+7. Big redo of array/hash handling in OutputHandler, was partially by reference,
+now is completely by reference. All Items now use and return $rows array ref as
+well, from start to finish, unlike previously, where @rows was copied
+repeatedly.
+
+8. Going along with 7, made most internal passing of hash/arrays use hash/array
+references instead, where it makes sense, and doesn't make the code harder to
+work with.
+
+9. Refactored WeatherItem, split apart the parts from output to be more like
+normal Items in terms of error handling etc.
+
+10. Added 'ref' return option for reader() and grabber(). Only useful for very
+large data sets, added also default 'arr' if no value is provided for that
+argument.
+
+11. Switched some features to use grabber/reader by ref on the off chance that
+will dump some execution time.
+
+12. A few places added qr/.../ precompiled regex, in simple form, for loops,
+maybe it helps a little. I don't know.
+
+13. Added global $fake_data_dir, this can be changed via configuration item:
+FAKE_DATA_DIR or one time by --fake-data-dir.
+
+14. Created data directory, and initial data items. cpu is the fake data used to
+test CPU info. More will be added as data is checked and sanitized.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Fri, 10 June 2022 13:05:17 -0700
+
+================================================================================
+Version: 3.3.16
+Patch: 00
+Date: 2022-05-19
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+A nice release, some good corner case bug and glitch fixes, along with some much
+needed documentation fixes to bring inxi-values.txt up to date for changes that
+have been evolving steadily. And a useful option for nvidia legacy card info.
+
+I'm hoping that will help support people and users as nvidia open source driver
+gets more usable in the future, since that will never support legacy cards, only
+the current series supported by 510/515 drivers.
+
+Also, in inxi-perl/tools, new tools and data so you can reproduce certain arcane
+data assembly features like disk vendors and nvidia product ids.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Not known yet if you can get Wayland display drivers along with kernel gpu
+drivers. In other words, is a similar use of kernel/display driver as in Xorg
+found with Wayland? Hard to dig up actual answers to questions like this.
+
+2. Similarly, unknown if it's possible to get current active xorg display
+driver, not just the list from Xorg.0.log file. No idea how to discover that,
+there are cases where past use of Xorg leaves log file present, but drivers are
+not used with Wayland, leading to confusing driver reports. Issues 1 and 2 are
+similar but probably have similar solutions.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Very subtle failure caused by odd mount point in partitions: a too loose
+regex rule designed to capture spaces in device names was running loose to the
+end of the string, where it was triggered by a number in the mount point.
+
+Fix was to make rule much more strict, now needs to match 3 number space in a
+row after the initial part, and then a number%
+
+2. Bug in corner case, with Monitors, if > 2 connected monitors, and 1 disabled,
+inxi was trying to test numeric position values for the disabled monitor, which
+with xrandr, has no position values, thus tripping undefined pos-x and pos-y
+errors. Thanks to fourtysixandtwo for spotting this corner case.
+
+3. Bug in wan IP, if dig failed, set_dowloader() is not set unless other
+parameters were used, which results in failing to set parameters for downloader,
+which leads to screen errors spraying out. Thanks to Manjaro user exaveal for
+posting this issue, with error outputs, which helped pinpoint the cause.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. More absurd xorg port ID variations: DP-1 kernel, DP1-1 X driver. Wny?
+Trying to add in XX-?\d+-\d+ variation, which I think will be safe, made the
+first - optional, though it's just idiotic for this amount of randomness to be
+allowed to exist in the 21st century. If this reflects other discipline failures
+in Xorg, it starts to get somewhat more obvious why Wayland was considered as
+the only forward path, though that's just as chaotic and disorganized... but in
+different ways.
+
+2. Removed darwin distro version detection, which of course broke, and using
+standard fallback for BSD made out of uname array bits. If it works, it works,
+if not, who cares. This should handle issue #267 hopefully.
+
+3. Trying for more monitor matches, now in cases where 1 monitor display ID
+remained unmatched, and 1 sys kms id remains unused, assume the remaining
+nonitor ID is a match and overwrite the unmatched message for that ID. This
+will cover basically all single monitor match failure cases, and many multi
+monitor failures with only 1 out of x monitor ids unmatched. While guessing a
+bit, it's not a bad guess, and will slightly expand the number of matched
+monitor ids. This extends the previous guess where if single monitor and
+unmatched, use it to cover > 1 monitors, with 1 unmatched.
+
+4. LINES_MAX configuration item did not assign to right variable when -1 value.
+Used non-existing $size{'output-block'} instead of correct $use{'output-block'}
+
+5. Forgot to add pkg to --force, goes with --pkg.
+
+6. Finally! Added in busybox shell detection, it's not of course reliable if
+they change internal light shells, but all the docs say they use ash, so now
+it will show shell: ash (busybox) to make it clear. Hurray!! This means that
+tinycore users will get this long awaited feature! Ok, ok, long awaited by
+probably only me, but since I package inxi for TinyCore, it was on my todo list.
+
+7. Cleaned up and re-organized many disk vendor matching rules, made them easier
+to read and debug, going along with Code 3, vendors.pl development and release.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. New feature: in -Ga, if Nvidia card, shows last supported nvidia legacy
+series driver (like 304.xx), status, microarch. If --nvidia and EOL, shows
+last-supported: kernel: xorg: info. This should be useful for support people,
+we'll see.
+
+-Gx shows nvidia microarchitecture, if it was found. This is based on matching
+tables so will go out of date if you have non current inxi's, but that's life.
+
+If --nvidia or --nv shortcut is used instead, triggers -Ga and shows much more
+nvidia driver data for legacy, and for EOL drivers, last supported kernel, xorg,
+and last release version. --nvidia also adds process node if available.
+
+More important perhaps is the fact that as of May 2022, nvidia is starting the
+process of open sourcing its current latest driver (515, but Turing, Ampere
+architectures only so far), which will only support non legacy nvidia cards,
+making detection of legacy cards even more important to support people and end
+users, since that will be a common question support people will have: does my
+card support the open source driver?"
+
+Read about the new open sourcing of the 515 nvidia module:
+https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/
+https://github.com/NVIDIA/open-gpu-kernel-modules
+https://www.phoronix.com/scan.php?page=article&item=nvidia-open-kernel&num=1
+
+2. Going along with new and upgraded tools in Code 3, massive, huge, upgrade to
+disk vendors, 100s of new matches, biggest upgrade ever for disk vendors. This
+feature should work much better now with the new backend tools.
+
+3. Added shortcuts: --mm for --memory-modules, --ms for --memory-short.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. None.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Big update to docs/inxi-values.txt. This had gotten really out of date, with
+incorrect hash and other internal data assignments, all updated to be current,
+along with sample greps to make it easier to locate changes in the future as
+well. This makes this document fairly up to date and useful again for dev
+reference purposes, should such a dev ever appear, lol. Many values had not
+been updated after global refactors, like switching to the %risc data for all
+arm/mips/ppc platform types, and making %load, %use, %force, %fake uses more
+consistent. Doing this helped expose some subtle bugs and failure cases in
+inxi as well.
+
+2. Added to -h and man -Ga Nvidia option info. Fixed some typos and glitches.
+Includes new --nvidia / --nv options for full data.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Changed $dl{'no-ssl-opt'} to $use{'no-ssl'} and $dl{'no-ssl'}, that was a
+confusing inconsistency.
+
+2. Added comma separated list of --dbg numbers, since often > 1 is used. Saves
+some debugging time, otherwise nothing changes.
+
+3. Huge new public release of some back end tools in new section:
+inxi-perl/tools
+* vendors.pl - disk vendors tool, with data in lists/disks*.txt
+* ids.pl - nvidia product id generator tool, with data in lists/nv_*
+
+4. While doing vendors.pl, I noticed that the use of array ref for $vendors was
+not done correctly, that's fixed now, simplifies it slightly.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Thu, 19 May 2022 13:02:00 -0700
+
+================================================================================
+Version: 3.3.15
+Patch: 00
+Date: 2022-04-08
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug fix, it's a bad edid data bug, rare, but when it trips, kills inxi execution
+dead right before -G/Graphics shows. Also some nice fixes and enhancements.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Possible case of Gnome Wayland failing to set any gnome environmental
+variables, making wayland detection not possible. This was in anonymous dataset
+inxi-proBook4540s dataset. Person never appeared in real life so can't follow up
+on it. This cascaded down to other failures in display detection, and desktop
+detection, though in theory much of the data needed was present. I expect
+similar issues may appear with kde wayland. This is/was probably a configuration
+or build error I believe, though not enough data yet.
+
+It appears that sudo start disabled the display environmental variable
+detections, which is unfortunate, and the fallback loginctl tests do not appear
+to work for unknown reasons. I've confirmed this on Fedora stock Gnome as well.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Forgot to test that return from get_display_manager is array ref, this
+impacts only a tiny handful of distros probably, TinyCore was one, but it is a
+fatal failure, so fixed it. Never trips in console, only on tiny linux where no
+dm is used at all. Tripped with Xvesa, seen other bug reports, but not enough
+data to know for sure.
+
+[2022-04-09 update] It turns out that basically when $DISPLAY is set, but no DM
+detected, for example starting wayland sway from tty, the issue also appeared.
+See Debian issue:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009089
+inxi currently has no way to detect a tty start of a wayland compositor, or of
+xvesa, so this was an entire class of bug, corrected, but not actually handled.
+Ideally inxi could detect a tty compositor start, though technically showing
+dm: N/A is correct since there is none running, but dm: tty-start would be nicer
+since it would be more informative. But do not know how to do that yet.
+
+2. EDID errors and warnings had several bugs, errors a fatal critical bug which
+made execution stop. Had forgotten to pass the $edid hash reference to the error
+constructor. Also had used wrong hash key in output so would never have shown.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Corrected ram device indentation levels.
+
+2. Made memory width more clear with: width: data: total: which more
+accurately reflects the source data. Also in cases where no data or total
+values, only show width: N/A, not the data: total: sub items.
+
+3. Made edid errors/warnings output to numbered list of warnings/errors instead
+of using join() to made one long list. Much more consistent that way. This fixes
+issue #266 - thanks SheridanOAI for finding this bug.
+
+4. In --slots, -x wasn't loading the bus ID so it showed N/A, unnecessary data
+collection granularity, removed.
+
+5. For Display, if no X or gpu driver, show: driver: N/A. Showed driver: gpu:
+N/A before.
+
+6. For Display, remove filters for Xwayland tests, we always want to see
+xwayland data if it's installed. This was actually an error to not show it since
+display_server_data already had the correct tests to not redo Xorg data if found
+previously, which would be glxinfo based data. This is a partial fix also for
+Known Issue 1, at least we'll see Xwayland is present even if Wayland detections
+failed for unkonwn reasons.
+
+7. Added some ram value dmi filters, found some that had 'none' or 'unknown'.
+
+8. Show display protocol out of display!! Also handles most common root use
+cases as well, so in most cases, if the initial protocol detections failed, this
+will result in a decent attempt, though if root it is less reliable. sudo or
+regular user will be fine since looks for not tty/pts TTY type and username.
+
+This should also help narrow down Known Issue 1 failures, though there are more
+cases to be dealt with, but can only chip away since not enough data.
+
+9. Made info: item in slots more robust, and able to handle more diverse
+scenarios.
+
+10. Added alternate syntaxes for dmidecode permissions errors.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added brzdm clogin mlogind xlogin display managers. Not verified. Version for
+brzdm is probably like slim since brzdm is a fork of slim.
+
+2. Added voltages to ram module report, that had been left out. Note that it's
+common for voltages to be either 'unknown' or not present at all. This is as
+close as inxi can get to handling issue #265 since there is no other source for
+the requested data type (show DDR3L, low voltage DDR3, which doesn't exist as a
+type in dmidecode).
+
+3. Added voltages to --slots report, --slots -xx. Only shows if present.
+
+4. Added for --slots -a for Linux, if detected, the PCI children of the bus ID
+of the slot. This is recursive, so supports as many levels as are present,
+though it would be rare for there to be more than one level of children.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. In -m ram report, moved ram type before size/speed/voltage, that makes more
+sense.
+
+2. Also in -m ram report, make type: the default value (was an -x options
+before), which contains the no module found messages etc, making the order:
+ Device-1: DIMM 0 type: no module installed
+ Device-2: DIMM 1 type: DDR4 size: 16 GiB speed: 2400 MT/s
+
+This puts all the speed/size/voltage data together, and stops putting the no
+module found message in speed, which never made any sense.
+
+2. In -m, changed width data to more clearly reflect the data source:
+ width (bits):
+ data: 64
+ total: 72
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Man page, added a TABLE OF CONTENTS section which lists all the primary
+sections. Can help since the man page has gotten so darned long and man doesn't
+as far as I know support clickable internal links, sadly.
+
+2. For -m, updated for revised output syntax and -x levels. Note that the help
+and man actually had the type: as default for -m, not -mx, but for some reason,
+the code had it wrong. Oops.
+
+3. For -m, fixed some legacy output syntax in the examples.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Some refactors of slots, ram, as well as a bit more refactoring of edid stuff
+for graphics.
+
+2. Added $ENV{'DISPLAY'} to debugger data collector, no idea why that was left
+out.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Thu, 8 April 2022 22:46:26 -0700
+
+================================================================================
+Version: 3.3.14
+Patch: 00
+Date: 2022-03-24
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, man. Continuing development of EDID and monitor features, bug
+fixes, normal fixes.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Failed to handle case for monitor positions of array type: 2-2, 3-1, 1-3,
+4-4. I'm not sure what structure those are really arranged in, but might be
+worth adding in the x+y pos values along with the row-col values.
+
+2. For Monitors and graphics Device ports, if using non free nvidia driver and:
+nvidia-drm.modeset=1 not set in grub kernel boot parameters, there will be no
+/sys/class/drm data for the nvidia device, and thus no ports data, and no
+monitor data.
+
+3. A class of high count DP or DVI port IDs are changed by Xorg drivers to for
+example: DP-6 > DP-2-3. This is very difficult to handle and will in general
+probably fail unfortunately because that level of port ID abstraction is just
+reazlly hard to deal with dynamically.
+
+4. A to-do item: add bus ID children on --slots. This will probablby be in next
+inxi.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. None outside of the various fixes.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. In sensors, failed to pull out BAT sensor data. In most cases, this would not
+lead to any issues, but it could have.
+
+2. This one just slipped my mind, I'd meant to do it, but in Montitor-x:, the
+primary ID should have been the 'real' kernel ID, not the mapped: ID, which is
+the X.org ID when different from the kernel ID. So mapped should be the Xorg
+version when they are different from the kernel version.
+
+3. In Graphics, monitors can show > 1 ratio, failed to set all to :, resulting
+in: ratio: 3:2 or 16/10 modes:. Also fixed ParseEDID to output an array of
+ratios, which can then be processed as wanted.
+
+4. Monitor map fixes:
+* Handle case in monitors where display ID: eDP and sys ID: eDP-1, this only
+works if 1 monitor in array. There's a variety of this type of failure, when
+X.org or its drivers decide to call the port ID XYZ with no number at all. All
+those possible cases are now handled, like eDP > eDP-1, VGA > VGA-1, and so on.
+
+* Added fallback, if no match, and if only 1 monitor, just map them to eachother
+if other mappings failed. Prompted by things like: s: DP-6 > d: DP-2-3;
+s: eDP-1 > d: DP-4, which are just impossible to create logic to map.
+
+5. Removed 'ati' driver from xorg drivers list, it's simply a wrapper for r128,
+mach64, or radeon (and maybe amdgpu), and shows as failed, unloaded, or loaded,
+because of this. ati basically assigns the correct driver, that is, but is not
+itself a driver. Thanks mrmazda for spotting this issue.
+
+6. Typo on QDI => Quantum Data.
+
+7. Added fallback for monitor model, now using vendor code plus product code
+if nothing found for vendor nice name or model. This will show as 'model-id:'
+instead of model: to help differentiate the two.
+
+8. Added Monitor product_code to manufacturer if no model name is found.
+
+9. get_pci_vendor was trimming at ' / ' if the product string also contained
+' / '. Fix is to ignore 1 character 'words' in the logic.
+
+10. In Slots, failed to remove_duplicates in the slot info field, leading to
+redundant output strings. See Enhancement 3 and Code 4.
+
+11. See Change 3, finally made -S section use full key: value pair, which makes
+stuff more explicit, like:
+
+System:
+ Host: yawn
+ Kernel: 5.16.0-11.1-liquorix-amd64
+ arch: x86_64
+ bits: 64
+ compiler: gcc
+ v: 11.2.0
+ Desktop: Xfce
+ v: 4.16.0
+ tk: Gtk
+ v: 3.24.24
+ info: xfce4-panel
+ wm: xfwm
+ v: 4.16.1
+ vt: 7
+ dm:
+ 1: LightDM
+ v: 1.26.0
+ 2: SDDM
+ note: stopped
+ Distro: Debian GNU/Linux bookworm/sid
+
+12. Fix for mageia and lsb distro data, force use of os-release for mageia if
+detected. That overrides the forced use of lsb release for mandrake/mandriva,
+because for some reason mageia has decided to carry ALL the legacy distro files:
+'/etc/lsb-release',
+'/etc/lsb-release.d',
+'/etc/mageia-release',
+'/etc/mandrake-release',
+'/etc/mandrakelinux-release',
+'/etc/mandriva-release',
+'/etc/os-release',
+'/etc/redhat-release',
+'/etc/system-release'
+which is really not what this stuff is intended for, if it's an actual derived
+distro from a living base, then yes, include the base file, but all these have
+the same distro id data for mageia, none for the derived distros.
+
+Also, fixed an lsb release thing to avoid using codename if codename contains
+release number as well. Since lsb_release is totally legacy at this point, who
+cares if we might miss a specific codename here and there on legacy system.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added Color Characteristics to EDID parser, for some reason that had been
+left out.
+
+2. Added advanced EDID output option --edid, that allows for showing more
+advanced EDID data than is appropriate for most users cases. Ihcludes errors,
+color characteristics chroma: (chromacity), full modes, not just min/max.
+
+3. In --slots, added bus-ID.
+
+Also extended report quality, made more granular, got rid of single blob from
+Type and Designation and now get more accurate and useful data.
+
+4. In cases with > 1 DM, check to see if one or more are stopped or disabled, =
+and add (stopped) if it was detected in running service as stopped.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Reversed monitor ID and mapped: ID values, that was a mistake, the mapped:
+item was supposed to contain the X.org mapped name, and the primary ID was
+supposed to be the actual real ID the kernel uses. Not a huge deal either way,
+but there it is.
+
+2. Include disabled but connected Monitors. This works around nvidia bug showing
+monitors disabled when they are enabled, but also allows for showing connected
+monitors, though without as much data.
+
+3. Made the last holdout -S > -Sa use strict full key: value pair output, like
+Desktop: XFCE v: 4.14.12 and so on.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Added help/man for --edid info.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. In ParseEDID: made new key: edid_error, which contains an array ref of 1 or
+more edid errors. The previous version did a poor job and returned only the
+first error found, so there could have been > 1 error, and you'd never know it.
+
+This changes check_parsed_edid to _check_parsed_edid(). and adds a utility tool
+_edid_error, which grabs the message from main::message, giving better output
+integration.
+
+This also allows for future error handling expansion quite easily.
+
+2. In map_monitor_ids() fixed matching pattern, made more robust and explicit,
+to catch things like s: eDP-1 d: eDP or eDP-1-1, both have been seen. Also added
+fallback for single monitor, just map them to eachother if mapping failed.
+
+3. get_pci_vendor() added test for using anything that is 1 character length,
+to not break on 1 character length string matches.
+
+4. Fully refactored --slots, that was originally written purely as a proof of
+concept in terms of adding a new feature during the original inxi 2.9 rewrite,
+and was never actually touched after that.
+
+5. Added option to reader() to return array ref, if expecting a large file can
+be useful.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Thu, 24 Mar 2022 12:01:50 -0800
+
+================================================================================
+Version: 3.3.13
+Patch: 00
+Date: 2022-02-22
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Just as 3.3.10 > 3.3.11 were a huge set of CPU upgrades, including significant
+internal refactors, so too is 3.3.13 a significant Graphics upgrade, featuring
+significant upgrades to Wayland (and Xvesa/TinyX!) support, and allowing for
+much more granular output controls. The legacy -Ga showing
+Display/Screen/Monitors is now split apart, and can now work for some features
+in and out of display.
+
+This upgrade should be of significant interest to any Wayland using distro, as
+well as the tiny Xvesa based distros like TinyCore, Slitaz, and Puppy.
+
+--------------------------------------------------------------------------------
+NOTE TO MAINTAINERS AND PACKAGERS:
+
+If you had Cpanel::JSON::XS or JSON::XS Perl modules as dependencies, you can
+remove those, inxi now can use JSON::PP, which is in Core Modules since Perl
+5.14 (unless for some reason your distro removed that module from Core Modules).
+
+Basically inxi will simply look for whichever of the 3 is installed, and use
+that one.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. The free drivers for xorg like amdgpu, modesetting, alter the the internal
+kernel IDs for monitors/gfx device ports, which is somewhat bizarre since the
+ideal role of any ID is to be an identifier that always works. Due to this
+situation, inxi has to map the kernel ids to the x driver monitor IDs in order
+to show the advanced monitor data, like model: mapped: and modes:. This may not
+always work as expected since if the mapping fails, the data will fail to match
+to the monitors. While not enough data is in to make any conclusions, hoping
+that this issue does not exist on Wayland compositors.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Not sure if this was a bug, but I believe RAM vendor ID matches would never
+have generated results, and might have generated errors. That's corrected as
+part of Code fix 1.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Tiny indentation level issue, for -Ga, Monitor was not set to be a container
+for its data. This would only impact -y 1 or json and xml output cases, and would
+be subtle, but it was an oversight.
+
+2. Small fix for monitor dimensions, failed to switch the mm dimensions for
+monitors placed in a vertical, portait mode, instead of standard landscape mode.
+Now switches mm x and y if that is detected, which corrects dpi as well.
+
+3. For Xvesa:
+
+* Show vesa as display driver, Xvesa == vesa, dugh,lol.
+
+* Show better Interface and Screen resolution data missing messages.
+
+* See FIX 5 for adding in display-ID:.
+
+* Show TinX Xvesa string for server data, not just Xvesa.
+
+4. For Wayland, which currently has no EGL support in inxi, if no glxinfo
+present, show EGL Wayland specific Messsage: for advanced EGL data, not the
+generic glxinfo that were shown previously.
+
+5. Display was relying on xdpyinfo or a Wayland environmental variable to set
+display-ID:, now falls back always to $ENV{DISPLAY} if nothing else was found
+and that exists. I hadn't realized how much was depending on those x tools,
+which many people never had installed in the first place. This also supplies
+that for Xvesa as well, which has features that need the Display-ID to use.
+
+6. Intel family 6, model 17h, supposed to be yorkfield, was penryn, fixed.
+
+7. Small fix for remove_duplicates, it was not case insensitive so missed things
+like DELL Dell in strings.
+
+8. Failed to detect or get Xfree86 X server version number.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Extensive Graphics Upgrades:
+
+* -Gxx Devices: For some gpus / drivers, show vram total and used for -Gxx.
+amdgpu supports this, I believe it's the only one, but don't know for sure.
+
+* -Gxx Devices: (Linux only): Show active, off (connected but disabled, like a
+closed laptop screen with attached moniitor), and empty ports on devices. Not
+tested for USB yet.
+
+* -Gxx Devices: Show device ports (like VGA-1, DVI-I-1, HDMI-A-1), active, off
+(off is connected but disabled) and empty (linux only).
+
+* -G Display/Screen: Removed strict dependency on xdpyinfo to show advanced xorg
+screen and display data. Now it will show most of the data if xrandr is
+available, and all if xrandr and xdpyinfo are installed. More granular error
+messages as well.
+
+* -G Wayland Display: new type, d-rect: for > 1 monitor Wayland display layouts.
+Works roughly the same as Screen: s-res: does, except since Wayland has no
+'Screen' concept, that goes into Display. This is sort of a rough algo,
+basically it takes either the dimensions of the total of x and y resolutions, or
+the greatest x or y resolution found for any monitor, whichever is greater, and
+uses that to create the display rectangle resolution composite value.
+
+* -G Display, Monitors: Extended display tool options from just xrandr to
+swaymsg, wlr-xrandr, weston-info, wayland-info. Still nothing on kwin_wayland or
+gnome-shell and mutter data.
+
+*. -S, -G: compositors, full redo of list, now supported:
+
+asc awc cage cagebreak cardboard chameleonwm clayland comfc dwc dwl epd-wm
+fireplace feathers fenestra glass gamescope greenfield grefson hikari hopalong
+inaban japokwm kiwmi kwinft labwc laikawm lipstick liri mahogany marina maze
+motorcar newm nucleus orbital perceptia phoc pywm qtile river rustland simulavr
+skylight sommelier sway swc swvkc tabby taiwins tinybox tinywl trinkster velox
+vimway vivarium wavy waybox way-cooler wayfire wayhouse waymonad westeros
+westford weston wio+ wio wxrc wxrd xuake
+
+* -G Enhanced Interfaces/GL item, previously only type OpenGL forX, now has:
+
+ * X - OpenGL, requires glxinfo , same as before.
+
+ * Wayland - EGL, currently no tool available, stub in place. Allegedly this
+ data can be found but have no idea how or if a tool does that yet
+
+ * Xvesa - Interface: interface type (VBE/GOP). GOP not confirmed, no data
+ samples; v:, source:, dac: (no idea what it is, show it though), controller:,
+ and ram: items.
+
+ This is based on TinyX/Xvesa as found in TinyCore, but should work in Slitaz
+ and Puppy TinyX as well if those projects are still around.
+
+* -G Display/Screen/Monitor data: Created structures and abstractions that allow
+for Wayland/Xorg/Xvesa data, most new features will work with any of these. Or
+Arcan, if that actually makes it, and we get data for it. We'll wait on Arcan,
+heh.
+
+* -G Display server: For Xvesa, added type TinyX to server if detected. Added
+Xwayland, which was not handled previously. For Xwayland, if wayland running,
+and if Xorg also installed, shows:
+
+ server: X.org
+ v: 1.20.14
+ with: Xwayland
+ v: 21.01
+
+Otherwise shows:
+
+ server: Xwayland
+ v: 21.01
+
+* -G Compositors: fixed a long standing weak spot, if > 1 compositor detected
+running, not common, but could happen, shows all detected compositors.
+
+ Display: x11
+ server: X.Org
+ v: 1.20.13
+ compositors:
+ 1: Mutter
+ v: 41.1
+ 2: xfwm
+ v: 4.16.1
+ driver:
+ X:
+ loaded: modesetting
+ gpu: radeon
+
+* -G drivers: now shows if X or gpu driver, in each its own section. This makes
+it more obvious what is going on:
+
+ Display: x11
+ server: X.Org
+ v: 1.20.13
+ driver:
+ X:
+ loaded: modesetting
+ gpu: radeon
+ resolution:
+
+* -Gxx Monitors: Show primary monitor with pos: primary,right. Uses either
+xrandr 'primary' value, or if no 'primary' found in an Xorg Screen, uses +0+0
+positioned monitor. Position is based on the row and column number in the
+rectangular grid of monitors when monitors per Xorg Screen are > 1.
+
+For most common multi-monitor layouts, text positions are used, which are in
+general more clear and easy to understand than their internal numeric
+counterparts, that is, unless the layout is too complicated, it will show left,
+or top-left, instead of 1-1, and so on.
+
+Text mode positions are available for the following grid styles currently: 1x2,
+1x3, 1x4, 2x1, 2x2, 2x3, 3x1, 3x2, 3x3. 'top' means the top row if > 1 row,
+'bottom' means the bottom row, 'middle' is the middle row if 3 rows, 'left' is
+the first column, 'right' the last, 'center' if 3 columns, and 'center-l' (1-2),
+'center-r' (1-3) are the 2 center columns if 4 columns. 'bottom-l', 'bottom-c',
+'bottom-r'; 'middle-l', 'middle-c', 'middle-r'; 'top-left', 'top-center',
+'top-right' complete the possible values.
+
+If the grid of monitors is greater than the supported rows or columns, it will
+switch to numeric row-column mode, with column-row numbering starting at 1-1,
+top left.
+
+* -Gxx Monitors: show (if detected, Linux only) monitor model, and if the
+display ID (from Xorg or Wayland) is different from the /sys monitor ID, show
+mapped: to show the /sys id.
+
+* -Gxxx Monitors: show modes: max: XxY min: XxY, or mode: XxY (if only 1 mode
+found). Shows hz:
+
+* -Ga Monitors: shows serial, built year, gamma, ratio, if detected.
+
+2. Added impish 21-10 and jammy 22-04 to ubuntu id. That's for Mint base ID. Not
+huge point in updating if Mint doesn't update inxi, but there it is.
+
+3. For -Axx, -Exx, -Gxx, -Nxx, shows PCIe speed and lanes. With -a, shows max
+speed / lanes if different than current speeds/lanes. Note that for unknown
+reasons not all devices in a PCIe slot show this data.
+
+4. -Ixx: terminals added: foot, ate
+
+5. -Sxx: login/display managers added: emptty, greetd, qingy, tbsm. See CODE 5
+for more info on how this change was done.
+
+6. -Sxxx: status/dock/panel bars added: i3-status-rs, luastatus, nwg-bar,
+nwg-dock, nwg-panel, rootbar, sfwbar, wapanel, waybar, yambar
+
+7. Added a Tyan board IPMI sensor data set.
+
+8. Added support for fruid_print for Elbrus -M Machine data. Those boards don't
+have dmi tables, but do ship with Elbrus OS which has fruid_print.
+
+9. More disk vendors! Yes, you know the drill, the world turns, and with every
+turn, a flock of new vendors appears, like baby rabbits emerging from their
+warren, endlessly, a stream that is the life essence itself... or something.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. When xdpyinfo is not installed, user will still see advanced -Ga Monitor and
+Screen data as long as xrandr at least is installed. Better error messages as
+well now to explain which tool or tools missing caused the missing data.
+
+2. -Gxx will show basic Screen and Monitors, id, mapped, pos:, model, res, dpi,
+diag; -Gxxx adds Monitor modes; --Ga adds screen/monitor size, Screen diag.
+
+3. -ba/-v2 no longer show the full screens/monitor report, now it remains basic
+mode output, which it should have always done, unless -G is also explicitly
+added.
+
+4. Split apart x-server version to v:, which should always have been the case.
+
+5. Xvesa and Wayland no longer show glxinfo messages for no glxinfo for GL data.
+Now they show their own custom messages, appropriate to the case.
+
+6. json features now test for JSON::PP, JSON::XS, or Cpanel::JSON::XS modules,
+and use whichever is found. Note I did not realize JSON::PP was in core modules
+as of 5.14 so that makes sense to use, and will allow inxi to start using json
+data sources, which are a lot easier to parse.
+
+7. Changed -G drivers to show subsections for X and gpu drivers, and updated
+missing driver messages to account for this change. X drivers now show the sub
+sets of loaded/unloaded/failed/alternate, and gpu shows active gpu drivers,
+assuming such are detected.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Help and man page updates for -G Display/Screen/Monitor changes. Redid -G,
+-Gx, -Gxx, -Gxxx, -Ga. Added monitor layout position feature.
+
+2. Updated -Ga for xrandr/xdpyinfo changes.
+
+3. Updated --recommends to more accurately show function of xdpyinfo and xrandr
+for -G and -Ga.
+
+4. Reorganized and added complete table of contents to docs/inxi-data.txt
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Slightly optimized use of array loads on disk_vendor() and ram_vendor() based
+on how it's now done for monitor layouts, which is more efficient, use a scalar
+to hold a reference to the array, that avoids having the array ever exist in
+more than 1 place. Part of the ongoing process of avoiding extra hash and array
+copies globally.
+
+2. Moved to consistent undef behaviors.
+ * For lists of variables use () to undefine, changed all of the the following:
+ 1. (@a,$b,$c,%d) = (undef,undef,undef,undef);
+ 2. (@a,$b,$c,%d) = (undef);
+ 3. (@a,$b,$c,%d) = undef;
+ to use: (@a,$b,$c,%d) = (); This undefines all the variables in the list.
+ Note that assigning undef to @a in the first example creates an array of 1
+ key, with the value undef, and (@a,@b) = (undef,undef) creates arrays of 2
+ indexes, or something like that. Not what was wanted.
+ Examples 2 and 3 assign undef to @a: an array of 1 index, value undef, and
+ undefine the others variables in the list. This was not the desired behavior!
+ * For most scalars, arrays, and hashes, use: undef @a; undef $s; undef %h.
+ * For some hash and array index values, use $h{a} = undef. These cases may want
+ the key itself to exist, with the value of undef, though I believe:
+ undef $h{a};
+ is synonymous, but still have to verify that.
+
+I did some testing, and realized that some of the undef I had used in the
+various previous ways of using undef were not actually resulting in the expected
+behaviors.
+
+3. Refactored display_data_x into 3 functions, added display_data_xdpyinfo and
+display_data_xrandr, which allows for more granular handling of those
+dependencies, now inxi can show most advanced display data with only xrandr
+installed.
+
+4. Significantly improved all error handling and missing data for Wayland/Xorg.
+
+5. Refactored get_display_manager() to better handle corner case dm file or
+directory names, and to avoid endless loops. Much cleaner now. Required because
+greetd had varying file names, greetd.run, or just greet-546.sock. With some
+other dm's that use similar, or unreadable directories in /run, now just doing
+a glob of /run/ /var/run, /var/run/rc.d as detected and checking for the dms
+in the names, then just using the dms that were found. Simpler.
+
+6. Massively simplified and integrated compositor logic in Graphics, now using
+program_values() and program_data() as appropriate, and simple matching list
+to ps_gui data to get detected compositor[s], much simpler, far more efficient
+code, less to maintain. Also fixed long-standing weak spot of exiting on first
+detected compositor, now shows all detected, with version etc for each if
+available.
+
+7. With 6. also significantly simplified and optimized get_ps_de_data() for
+desktop data, that's the ps aux fallback case for wm desktop detections.
+
+8. Made $wl compositors list global to avoid having to update each section,
+that's now used in -G compositor, -S desktop/wm, and wm sections. It is set
+in ps_gui() on initial load.
+
+7. Settled on one and only way to do multiline conditionals, now use no space,
+use same indent level as starting if/elsif etc. I've been debating this one, but
+can't find any real way to handle that elegantly so I think best to just not
+try, and leave it up the code flow to show when it's wrapped condition tests.
+
+8. Refactored previous gl_output, expanded it to handle all interface types,
+OpenGL, EGL (not currently active due to no known tool to get EGL data for
+Wayland, and Interface: VBE type data for Xvesa. This roughly completed the
+breaking apart of the X.org centric logic for Display, Monitors, and GL data,
+and make all sections now fully agnostic to display server or protocol type.
+
+Should new display servers appear, it will now be far more simple to add support
+for them, since they would just plug into the existing abstraction layers.
+
+9. Added --debug-arg to allow for passing specific custom args to the debugger.
+
+10. Refactored display_server version, now works much better, creates lists of
+server/version, and xwayland as well if found.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 22 Feb 2022 15:30:24 -0800
+
+================================================================================
+Version: 3.3.12
+Patch: 00
+Date: 2022-01-18
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Small point release with some useful fixes, some bugs corrected, small
+enhancement.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Note on KNOWN ISSUES 2 from 3.3.10, I realized that the second level
+indentation actually takes care of that hanging parent, since now it's quite
+clear that its children are indented on the following line. So that issue took
+care of itself.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. In $bsd_type cases, specifically SunOS triggered this, where sysctl was not
+present (which it always is in all other BSD types), it tripped an error due to
+failure to update to revised $alerts{'sysctl'}->{'message'}, instead was using
+the old method. Failed to update that in refactor of CheckTools logic. Would
+impact no supported operating systems, but is a bug.
+
+2. Corner case, a combination I never used, inxi -a, triggers error in the RAID
+logic because the mdadm test was not run, generating an undefined eq error. Only
+happened when mdraid was present and used on system.
+
+3. Tiny bug, for st+mt cpus, like alder lake, was printing out second tpc by
+accident which made it look like it said st: 4 tpc: 2. Just a small output
+glitch.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Added some fallback 32 bit system tests, [2345]86, like i386, i686.
+
+2. Changed shell: Unknown Shell to shell: N/A, that was a legacy use, and was
+obviously redundant. N/A is more consistent with rest of output no value found
+handling. Due to requirement of doing empty tests, this is set in the data, not
+output, generator component.
+
+3. Refactored partition data logic to get rid of bsd tests for df -kTP, -kT, -k.
+Now tests only to see if returns data, cascades down until it gets something.
+Now will attempt to reconnect hanging lines when no -P feature available prior
+to main partition data processing. This makes it agnostic to os issues, and it
+just pays attention to feature support.
+
+Also adds in dynamic column count instead of hard-coded, this avoids oddities
+and future proofs to some degree. Now systems will adapt seamlessly if support
+for -P appears, or -T, or whatever.
+
+4. Partitions corner case, where has zram, but has no partitions, failed to show
+partitions no data found message since @partitions had data in it, but nothing
+for partitions output to print. Seen in TinyCore for example, but might happen
+in other ram based systems.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added Slint to distro ID, and slint/slackware to system base.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. None
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Typo in man page fixed.
+
+2. A few more edits and corrections on 3.3.10 changelong. That thing was written
+concurrently with the development, and thus had lingering errors when things
+were changed in midstream.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Added --cygwin and --android fake system type flag. Switches on $b_android/
+$b_cygwin flags.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 18 Jan 2022 14:02:54 -0800
+
+================================================================================
+Version: 3.3.11
+Patch: 00
+Date: 2021-12-16
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Quick bug fix release. With as many changes as we got in 3.3.10, there were
+bound to be a handful of oversights that were not caught in testing simply
+because those hardware scenarios were not present in the tested systems.
+
+Also minor feature enhancement for CPU scaling min/max speeds.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Due to the huge amount of changes, and the speed of change, while the new
+code is working as intended, it's somewhat lacking in coding elegance since a
+lot of it was hacked out very quickly, in near real time. This will get cleaned
+up and refactored to be less redundant if it does not impact execution speed,
+but is not pressing since there should be no functional difference.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Tiny oversight, in single case CPU model id would fail because it was using
+an undefined test from previous tests, not the right test, that is. Tripped
+error on Elbrus for example.
+
+2. Typo in battery secondary type status, created undefined value error. This
+was a recently created bug.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. PPC revision change broke Elbrus revision test for stepping. Added in more
+tests to show stepping for elbrus revision.
+
+2. Single core Elbrus in cpuinfo fallback mode failed to assign core multiplier
+so L1 cache failed.
+
+3. In cpuinfo fallback mode, Elbrus E2C3 cache data failed to appear, that data
+is not per block in cpuinfo, but is the last block, so those tests had to run
+on each block, not just the first one.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1a. Show for -Ca scaling min/max speeds if different from CPU min/max speeds.
+
+1b. If no cpuinfo_min/max_freq speeds found, and scaling_min/max_freq found, set
+overall min/max to use scaling min/max instead of cpuinfo min/max.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. None.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Cleaned up and proofread better 3.3.10 changelog, it had a lot of errors
+because stuff kept changing.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Small code optimizations.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 16 Dec 2021 16:14:08 -0800
+
+================================================================================
+Version: 3.3.10
+Patch: 00
+Date: 2021-12-13
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Huge refactor of CPU physical/core/cache logic. That was some very old logic
+with a lot of hacks and patches, but it had never been actually rewritten to
+take advantage of Perl's far more powerful and robust data structures and logic.
+This caused a continuous stream of error cases in subtle ways, or not so subtle,
+and fixes were just changing how the errors manifested.
+
+Tnanks very much to linuxquestions.org Slackware forum people for massive help,
+and also to linux.org forum members for ongoing help and data and debugging.
+
+Note Changes 5, change of default widths in display to 80 columns, and out (aka,
+console, or ssh into remote system), 100. You can still use other widths if you
+like something wider using the configuration options shown. Also upped max
+columns wrapping line starters to own rows to 110 columns from 90, again the
+idea being to make output more readable to other users when posted in public.
+
+I've been thinking of this change for a long time, but was hoping -y would
+register with users, but it hasn't gained enough traction, so the result is way
+too many super hard to read issue reports, forum posts, linux kernel issues,
+etc, it's honestly gotten sort of embarrassing because they make it look like
+inxi has bad output. Sidescrolling code blocks in forums in particular are
+absurdly hard to read and scan rapidly for data.
+
+Going along with the width and indentation changes, for most main row types, if
+they wrap to a second row, they are further indented 2 columns, to make it
+easier to see what they belong to. The two levels of indentation contain more
+useful visual cues as to what belongs to what.
+
+There was a temptation to release this as either 3.4.00 or 4.0.00 but in the
+end, I decided to follow the numbering rules, and to just roll it to 3.3.10
+since there aren't really any primary new features even though CPU was basically
+rewritten in large part, and big parts of inxi were also changed, upgraded, and
+enhanced. But no truly new features, just some display control items like -Y,
+--indent, --indents.
+
+I hope this refactor meets its primary goals, and that the new defaults for
+display help resolve public posting issues which have grown increasingly
+annoying for anyone trying to read those pasted in too long outputs.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Android seems to have CPU cache data, but does not show any 'size' item. But
+it does have the other data for each cache type internally, which is odd.
+
+2. [See KNOWN ISSUES 2 for 3.3.12 above] In some instances, the parent key:value
+pairs with '' as value, those are parents of children key:value pairs, are left
+hanging at end of line, with the children on the following line. This can look
+awkward, but in other cases, actually looks very good, it depends if it's at the
+start or end of the line.
+
+I won't say this is not correctable, but it would be very difficult, and outside
+the scope of this release, but that is something that I may look at for a future
+release now that the output generator logic was reworked slightly for Change 5b.
+
+It's tricky though, because in cases where it's the first item on the line, you
+want that behavior, but when it's last, you don't. But this may be worth
+revisiting in the future.
+
+3. In some cases, -Y + -y1 may lead to the start of the block scrolling off the
+top of the visible screen. This isn't really correctable, so if that's an issue
+for you, just don't use -y1 with -Y and all the output will wrap nicely.
+
+4. There is an unaccountable ~10-20ms delay reading cpufreq/scaling_cur_freq,
+per thread/core, which really adds up on high thread count CPUs. There is a
+workaround in inxi to use cpufreq_cur_freq if it is readable, ie, if you are
+root or use sudo, but to fallback to scaling_cur_freq if can't read cpuinfo_...
+
+This is a drag, and really looks like a kernel bug, or a frequency driver bug.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. 3.3.09 and 3.3.10 CPU bug fixes:
+* Failed to filter out certain virtual machine CPU core speeds, and showed more
+speeds than the instance actually has. Noticed this with KVM running on Xeon
+CPUs.
+* For many cases, L2 cache, particularly for Intel, was completely wrong, it was
+showing L3 caches, or L3+L2. Failed to handle cases where L2 cache belongs to
+more than 1 core, except for using a crude hack for AMD Bulldozer microarch.
+Older Intel Core 4 core CPUs would sometimes be 1 L2 per die, and the 4 cores
+were actually 2 core duo cpu dies, with one L2 cache per die.
+* Shows wrong core count for complex core complexes like those found in Intel
+Alder Lake, now shows correct count of actual cores, regardless of the MT or ST
+state of each core.
+* Showed invalid L3 cache values in some legacy cpus that had no L3 cache, that
+is due to a bug in the dmidecode data itself. Solution is to never use dmidecode
+cache data if any other valid L1, L2, or L3 cache data found for Linux, and to
+only use dmidecode data for bsds if no L1, or L2, or L3 data found. Or if forced
+with --dmidecode.
+
+2. An unfortunately long standing bug found and fixed, thanks slackware users!
+cp_cpu_arch was, and has been for a while, failing to convert hex stepping to
+decimal, or test if the string it gets is even a possible hex value, this
+resulted in all Intel CPUs with stepping > 9 failing to ID correctly for cpu
+arch.
+
+3. In a related bug, hex to decimal tool used to create --admin hex/decimal
+output for family/model/stepping was also not testing if the string was an
+actual valid hex number. Case in particular, power pc with revision field
+contained a long string, which was of course not a valid hex number, and that
+tripped a Perl error when it was asked to convert a non hex string to decimal.
+
+4. Long standing bug found while doing Change 5: inxi actually never applied
+separate in/out of dispay to widths because using a legacy boolean that was not
+updated, so it was always using out of display widths.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Incorrectly calling PowerPC 'revision' 'stepping' for -Ca, that is now stored
+as $cpu{'revision'} to avoid mixing up the logics there. For PowerPC shows as
+rev: [string].
+
+2. Microarch:
+* AMD family 15, model 2 as bulldozer, actually piledriver.
+* AMD family 17, model 18, was supposed to be zen/zen+, since I can't tell those
+apart, seen stepping 1 is zen+, but had incorrect match.
+* Intel family 6, model 25, stepping 2 as nehalem, should have been westmere.
+* Changed Penryn to Core Penryn, intel family 6, model 17
+* misc other micro arch fine tunings.
+
+3. Code fix 8, switched to global %risc for arm, mips, ppc, riscv, sparc. This
+corrects many sloppy handlers, and makes all risc processing the same, and calls
+device tree readers for all risc systems, not just arm or arm and mips.
+
+4. In cases where bogomips were 0 due to false values in risc results, show N/A.
+
+5. Removed all attempts to guess at what /proc/cpuinfo cache size: refers to,
+it can literally be anything, a per core L1, a per core or cpu L2, or an L3.
+So applying any math to it is just a random guess at that point. If any L1,2,3
+cache data is found, don't use the cache: value at all, but that will only be
+present if no /sys data was found anyway, and if cpuinfo had no specific cache
+type fields, only generic cache.
+
+6. Added failsafe tests for stepping and model id before doing conversion to
+hex. Make sure integer!
+
+7. Added L1 D cache, was only using I cache for BSDs. Output will show total for
+L1 A + L1 D. No idea why I didn't use L1 D, makes little sense, but that's how
+it goes.
+
+8. Made bogomips tests more granular, now only rejects low sub 50 bogomips
+values if %risc cpu type. Legacy ancient cpus like 486 could and did have
+bogomip counts below 50.
+https://tldp.org/HOWTO/BogoMips/bogo-list.html
+
+9. See Enhancement 12 as well. If OpenBSD, which has no per core data or
+physical cpu data, is running on MT capable cpu, but for security OpenBSD has
+disabled MT, will now force MT to be not shown via the hw.smt value. This
+removes a small glitch that would have bothered OpenBSD users who know that
+OpenBSD has disabled MT for security purposes.
+
+10. Changed BSD hack to use L2 cache totals to deduce > 1 physical cpus, that
+was flat out dumb, since we can just use dmidecode type 4 to iterate physical
+cpu counts and skip the pointless logic. Thus, if dmidecode, and if > 1
+dmidecode type 4 found, and if physical cpu counts equal 1, then replace the
+found counts with the dmidecode physical cpu counts.
+
+11. Corrected bad assumption that threads would always be 2 per core for MT
+tests. Revised logic should handle this case fine now, and show correct thread
+count per core.
+
+12. Fixed 'parameters:' going to its own line with -Sa, that wasn't supposed to.
+-S is two lines, the kernel / host stuff, and the desktop/console/distro stuff.
+
+13. Fixed case when key: value first word plus other parts of line longer than
+max width, failed to wrap as expected.
+
+14. Added start/end ' and " to existing start / end \s trims to main filters.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. CPU: most Linux will now show L1 and L3 cache with -Cx without needing
+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
+processor count * L1/L2/L3 total in parentheses, like: L2: 2x 1.5 MiB (3 MiB).
+
+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
+'high:' as well if > 1 cores, and if 1 or more cores have a higher speed than
+the other(s).
+
+4. CPU: Handles advanced cases of new architectures, like Alder Lake with
+Performance and Efficiency cores, future Zen, and existing ARM CPUs with 2 or
+more different core sets, with different max/min frequencies. Previously a hack
+was used to handle only ARM CPUs with this type of architecture. Will show
+correct CPU core counts, which previous inxi versions would fail to do for Alder
+Lake type scenarios of 8 single threaded CPUs and 4-8 multithreaded )MT)
+perforance cores.
+
+This should also in theory show different the different min/max speeds if they
+were detected. Those did not seem to be set correctly in Alder Lake sample data
+I saw however, P and E cores were set to the same min/max speeds.
+
+[Update 3.3.12: more research suggests that for now, 1 cpu physical body will
+contain one clock generator, so that is not a mistake. Future CPUs may add a
+second clock generator but that is probably very complicated to implement, which
+is why ARM complex cpus simply use two cpus, with different clock rates when
+they want to run different speeds for efficiency.]
+
+5. Added CPU types MST (Multi+Single Thread), AMP (Asymmetric Multi Processing),
+and AMCP (Asymmetrical Multi Core Processor). This will be applied to any CPU
+that has this type of complex topology that has been dynamically detected, like
+Alder Lake or different core count or min/max speed RISC CPUs.
+
+6. CPU: shows with -Ca for cases where different L1/L2/L3 caches found per
+physical CPU, as with Alder Lake, but also many other variants that were poorly
+or not at all handled before, how many of each cache type (L1 Data, instruction)
+were found, otherwise will show how many of each cache were found.
+
+7. CPU: shows with -Ca in Topology: report, for cases like Alder Lake with
+different core types in one physical CPU (type: MST AMCP), the number that are
+single threaded (st) and number that are multi-threaded (mt).
+
+8. Basic support for rsyc-v systems, going along with code fix 8, fix 3, now
+it's easy to add this type of support.
+
+9. Added shortcut options for --filter-label (--zl), --filter-uuid (--zu), and
+andded new filter option, --filter-vulnerabilities (--zv). The latter is added
+by request, a decent idea to have option to not show cpu vulnerabilities.
+
+10. Going with fix 7, switched to a sort of pseudo L1 d/i with desc report for
+any BSD with L1 I/D cache found, or elbrus cache0 (icache) / cache1 (d cache).
+Elbrus should hopefully be handled by the /sys tool. Guesses on the L1 are ok,
+since those are almost always per core, so it's fine. Didn't expect to enhance
+any BSD cpu data this time around, but there you go!! If they have the data,
+then it will be used. Not going to go overboard though in that, quite useless
+overall since usually can't see how many CPUs are present, at least not usually.
+
+11. For -Ca, full CPU topology report if any complex topogy is detected,
+otherwise shows the same basic Info: 2x 6-core or Info: dual core as before, no
+point in wasting a line for something with no more data than the short string.
+Complex types include MT CPUs since they will have different thread counts etc,
+and will have 2 or more threads per core, which will also be listed.
+
+12. If smt status is defined (0/1), shows smt: enabled|disabled in Topology
+section, can be useful for systems with disabled MT, but supporting it. If no
+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).
+
+13. For -Ca Speed: report, added scaling: report, with childrend 'governor:'.
+Can show 1 or more active governors. Also shows scaling driver:. Shows if either
+is available.
+
+scaling:
+ driver: ..
+ governor: ..
+
+These may be quite useful over time to help diagnose or debug scaling issues.
+
+14. Output height (in lines) control: -Y [-3|-2|-1|0|1-xxx]]. This lets you
+break up any of the output into whatever number of lines you want. Also useful
+out of DISPLAY for reading -h options menu items etc.
+
+It came tp my attention that the long standing shift+pgup/pgdown (aka
+'softscrollback) behavior had stopped working in kernel framebuffer mode, and in
+fact has been removed from the current Linux kernel, at least until it is
+rewritten to be more clean and understandable. Read more about it in these
+kernel post/commit messages:
+
+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/
+
+Options for -Y are:
+* -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.
+* -Y -2: Do not remove color codes when piped or redirected. Mostly useful for
+ piping to less -R, to preserve color codes.
+* -Y -3: Restore default unlimited height if LINES_MAX configuration item used.
+
+15. And finally, more disk vendors/vendor ids. As usual. As expected.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. If /sys or /proc/cpuinfo speed data available:
+* For -b CPU item:
+ speed: [speed MHz] min/max: [min]/[max] MHz
+ becomes:
+ speed (MHz): avg: [speed] min/max: [min]/[max]
+* For -C, Speed item
+ Speed: [speed MHz] min/max: [min]/[max] MHz Cores (MHz): ...
+ becomes:
+ Speed (MHz): avg: [speed] min/max: [min]/[max] cores: ...
+* For short form, shows speed/min/max but uses average speed if available.
+
+For -b and -C, only shows one MHz in Speed line starter, which slightly shortens
+the line even with the added 'avg:' item since 3 MHz are replaced with 1.
+
+2. Going with change 1, now the 'avg:' item shows not the fastest cpu speed
+found, which was the case before, but shows an average of all cpu speeds found.
+Showing the fastest made some sense back in the days of single core, or even
+dual core CPUs, but makes little sense today with many core/threaded cpus.
+
+With -x, it will show the high: [speed] item as well, after 'avg:'.
+
+3. By suggestion, wrapped first Type item in Vulnerabilities to its own line,
+that's a verbose --admin option after all, no need to save lines!
+
+4. Going along with Fix 5, give up on trying to pretend we can guess at L2
+cache, now if only 'cache' data was available from cpuinfo, will just say:
+cache: [cache size]
+ note: check
+
+and call it a day.
+
+5a. Change default width to 80 columns in display, and 100 and out. Too many
+users are posting horribly wrapping inxi output in forums, issue trackers, etc,
+and it frankly makes inxi look really bad, creates awful side scrolling code
+boxes, etc. So now default widths in and out of console are 80/100 (since often
+data is generated in SSH or out of X/Wayland) for issues.
+
+This essentially makes -y 80/-y the default width in display, and a wrapped 100
+out. This is what I've been using for a few years now, and after seeing far too
+many side scrolling or badly wrapping inxi outputs online, I think it's probably
+time to just force 80 column widths as default 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_CONSOLE=115 # in display, terminal client max width
+ COLS_MAX_IRC=100
+ COLS_MAX_NO_DISPLAY=130 # not in display, no X/Wayland running
+
+5b. Made second and greater rows of a line indent +2 to make it more clear that
+it is a child row of its parent row. Note that because no arg short form and -I
+are special types of rows, this behavior is not used, they just print out as
+usual. This makes for more readable and easy to follow flow of output data.
+
+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.
+
+7. Only show die counts for CPU (on rare occasions > 1 found) with -xx. Not
+particularly important bit of data afterall.
+
+8. Make L1, L3 cache data show with -Cx, not -Cxx, now that it's working well.
+
+9. Removed CPU die for -Cxx, that's only going to show with -Ca now.
+
+10. If -Ca, and if certain complexity conditions are met, shows a separate
+Topology line rather than the Info: 6-core type item. For -b, short, -Cx, -Cxxx
+shows the Info: topology short form.
+
+11. Bogomips always shows before flags data, whether -f or just -Cx trips flag
+output. This places bogomips at end of Speed: line, after the core speeds.
+
+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:
+
+1. Updated man/help for new CPU extra data options and output changes.
+
+2. Cleaned up and added sample outputs for man CPU items.
+
+3. Now that doas is getting into Linux distros, removed all mentions of doas as
+a BSD option, and made it a general doas/sudo item. Glad to see doas making it
+into linux distros, it's a good tool, much easier to configure and use than
+sudo. Good job OpenBSD guys. Note that inxi already has had full doas support
+for a while now, but this finalizes it, and makes it fully agnostic. Internally
+doas is actually preferred over sudo, by the way.
+
+4. Added documention items for INDENT (--indent), INDENTS (--indents).
+
+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
+OPTIONS sections to make finding stuff easier.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Removed legacy /sys cpu functions: cpu_bugs_sys(); get_boost_status();
+set_cpu_speeds_sys(). get_caches() was only a placeholder for the full featured
+cpu_sys data source, and was removed; cpu_speeds() no longer needed, integrated
+into other logic; cpu_dies_sys() removed, integrated into other logic.
+
+This logic is now integrated into cpu_data_sys() data generator.
+
+2. Changed the main CpuItems functions to use array/hash references, not passing
+full hashes or arrays in most cases now.
+
+3. For machine_data_soc(), switched to CpuItem::cpuinfo_grabber() which then
+sets the global @cpuinfo and %cpuinfo_machine items, which will be used again
+in Cpu if cpu data is requested. This gets rid of a full parsing of cpuinfo
+just to get the machine data section, and also makes it so cpuinfo in cpu does
+not need to worry about the machine data block, which is not related to the
+processor blocks anyway, that was always a hack done by the kernel guys to toss
+that SOC data somewhere as far as I can tell.
+
+4. New tools:
+* get_defined() - takes a list, and returns the first defined element of list.
+* regex_range() - generate ranges from comma, space, or ranges like 2-29, or any
+combination of those, like 3,6,12-29
+
+5. Added --force cpuinfo to bypass all /sys based cpu logic, useful for testing
+to see what would have happened using old logic.
+
+6. Added --dbg switches 39, 40, 41, for the new cpu sys data features, also made
+more consistent --dbg 8 and --dbg 38 switches.
+
+7. Added sys/cpuinfo pair debugger to support debugging complex sys/cpuinfo
+issues.
+
+8. Got rid of $b_arm,$b_mips,$b_ppc,$b_sparc, replaced with global %risc, also
+added $risc{'riscv'} type. this makes general risc type feature testing a lot
+easier since inxi can either test for %risc defined, or for a specific type of
+risc cpu. This is much cleaner, and use $risc{'id'} for print purposes, which
+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.
+
+13. Made help menu code more or less wrap to 80 columns, or close. Ongoing to
+bring to 80 columns where practical, but never at expense of clarity or logic.
+
+10. Changed all xxx_cleaner subs to clean_xxx, all filter subs to filter_xxx,
+and row_defaults() to message().
+
+11. Dumped redundant fallback logic in get_kernel_bits, if first getconf method
+fails, use $sys_bits, and call it good, it was repeating the 32/64 bit tests
+pointlessly.
+
+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
+
+================================================================================
+Version: 3.3.09
+Patch: 01
+Date: 2021-11-22
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Thanks manjaro user alven for finding a bunch of corner and not so corner case
+errors, glitches, documentation oversights, etc.
+
+This is a point release between the coming full CPU refactor and the current
+set of bug fixes and issue handlings.
+
+This release also contains the debuggers for the new CPU data logic, which are
+important to get this CPU refactor stable and reliable across old/new systems,
+different operating systems and platforms.
+
+Wanted to do this intermediate releaase to get the current fixes out, which
+make inxi overall better for CPU issues, but do not handle the core requirement
+to do a full refactor.
+
+--------------------------------------------------------------------------------
+
+CORRECTION:
+
+1. On release notes for 3.3.08: due to a long delay to get real debugger data
+from the person who had the issue, but finally getting it after the release of
+3.3.08, there was NO bug in ps wwaux output. Something else was creating the
+linewraps, maybe the subshell, it's basically impossible to know since we never
+got a real debugger data set, which is the only real way to get the actual same
+data inxi will see.
+
+Was it a subshell wrapping the output? We just can't know, nor are we likely to
+ever find out.
+
+This highlights very well however why some issues are essentially impossible to
+ever fully resolve without the --debug 22 dataset. This bug/fix is definitely in
+that class of issues.
+
+It's never good to accuse another program of having a bug when it doesn't, so
+sorry to ps authors, no bug or issue exists for ps in this area.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. wiryonolau issue #259 points out that if --tty is used, default IRC filter
+rule is still active and on. Because his case appears to be from an autostart
+using Bash, which then gives up to find the parent at dash, which then makes
+inxi believe it's in an IRC shell client, that issue doesn't appear to be
+resolvable.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Documentation, help menu and man page showed wmctl instead of wmctrl,
+which for someone who reads the help man, leads to command --fake wmctl failing.
+Thanks manjaro user alven for finding this typo.
+
+2. For dmidecode cpu data, had global total values for cache that could result
+in wrong output values, 2x or more wrong for L1 / L3 cache on linux. Difficulty
+is preserving that data for bsd, which in general do not show phys cpu counts,
+and thus make showing totals off. Created new '-total' item for each L cache
+type, which will handle > 1 cpus, and also can be used to determine if > 1 cpus
+present!.
+
+3. Manjaro user pointed out that hub types were wrong, this is because inxi was
+using the INTERFACE ID values for hubs instead of the TYPE values. For all other
+device types, INTERFACE is correct, but for hubs, we needed TYPE, so fix is to
+detect INTERFACE 9/0/0 and if TYPE present for that, swap.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. For > 1 cpu systems, with dmidecode sourced cpu cache data, can now determine
+physical cpu count based on comparing L2 and L2-total values. This means that
+when dmidecode is used on BSD for CPU data, inxi may now be able to deduce that
+it is a > 1 cpu system.
+
+2. Forgot to set $run{'filter'} to 0 for whitelist start client detection.
+
+3. Going along with bug 3, changed 'Full speed (or root) hub' to:
+Full speed or root hub, to make more clear that it's one or the other, or both.
+
+4. For apply_filter(), added test if <superuser required> just return the
+string.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Going with bug 1, and fix 1, for > 1 cpu systems, will now show for all
+cache: items L1: 2x 1.5 MiB (3 MiB), same for L2 and L3. This is far less
+confusing than showing the totals without explaining what they are.
+
+2. Going along with 1, now root is not required to show L1 and L3 -Cxx on Linux
+as long as the system is reasonably new, about after 2008, and has getconf -a
+supported. That support is came in somewhere around 2.10, not sure exactly when.
+Debian Etch had it, Sarge did not, Ubuntu 9.10 had it. Tinycore does not have
+getconf at all. This will probably be replaced by a more robust full cpu /sys
+data tool.
+
+3. Added ht to default short -Cx flag list, that should show, and it's short.
+
+4. Added --no-filter to activate -Z, --filter-override isn't consistent with
+other --no-xxx options, even I forgot it. No changes, just another way to use
+-Z.
+
+5. For issue #260 added pch as a new sensor output type, it's kind of a builtin
+southbridge / northbridge in the CPU die, but it's not a core, and has a
+different temp. Will anyone even know what pch is? probably not, but who cares.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. No longer showing for > 1 physical cpu systems the sum total of L1/2/3 cache
+data. Now shows per cpu L1/L2/L3, and if > 1 cpu, shows for example:
+
+cache: L1: 2x 512 KiB (1024 KiB) L2: 2x 2 MiB (4 MiB) L3: 2x 20 MiB (40 MiB)
+
+For single physical cpu output remains the same:
+
+cache: L1: 576 KiB L2: 3 MiB L3: 16 MiB
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Updated help/man for L1/L3 cache -Cxx changes.
+
+2. Updated man and help to suggest -Z for --tty.
+
+3. Forgot to note -v 7 adds -f, added to man/help.
+
+--------------------------------------------------------------------------------
+CODE:
+
+* Added 'getconf -a' to debugger, that may be usable for cpu cache data, need to
+gather data on that to confirm. that's regading issue #257 cache glitches.
+
+2. Removed all * $physical_count for cache data in cpu_properties, that is now
+handled by creating string with cpu count, per cpu caches, and total in parens.
+
+3. Added in fallback failure case for the ZFS file system issue exposed by
+accident in issue #258 - will now log in debugger the error, so we can try to
+find what is going on there, impossible to reproduce until we find what zfs or
+more likely, freebsd, changed there. Could be hyper specific, some weird thing
+like a person making a zfs device name with space, impossible to guess. Note
+that since the freebsd user declined to supply any data to help resolve this
+issue, then closed it, we're back where we usually end up with FreeBSD issues,
+either a Linux user (or worse, me) willing and able to find the issue and supply
+the debugger data required shows up, OR the issue is ignored as valid but
+impossible to resolve.
+
+RANT: Note that this also confirmed to me that in order to preserve my own
+sanity and not waste endless hours trying to get data, from now on, unless
+utterly trivial, if a FreeBSD user refuses to promptly supply the required data,
+the issue will be closed with a freebsd-closed-no-data-supplied label, which
+means, valid but not possible to solve due to user refusing to help me help
+them.
+
+Come on FreeBSD users!! If you want help, and inxi to support your distro, help
+me help you!! If not, then why are you even filing an issue in the first place?
+Do you expect faeries to spread magic bug / issue fixing faerie dust over inxi
+and then activate it with their little wands? This is growing tiresome to be
+honest because it's so utterly predictable.
+
+4. Shuffled order of sensor type detections, there was a slim chance that a non
+gpu sensor type could have string intel in it, so put the gpu sensors second
+to last, before 'main'.
+
+5. Started refactor of cpu core/cache logic. Added feature to cpu_arch, and
+changed it to cpu_info since now it gives by vendor/family/model/stepping both
+micorarch and cache/core math array returns. Also started refactor to make more
+predictable, with increased comments, about what is going on in cpu_properties
+to avoid breaking existing correct results.
+
+6. Added to --debug /sys cpu data globber tool, that will help debugging the new
+/sys cpu data feature, will let me insert the file data directly into the logic.
+
+7. Added CpuItem::cpu_data_sys() with debuggers, that will now start collecting
+user cpu data whenever the debugger is run, though it's not active yet.
+
+8. Set $Data::Dumper::SortKeys = 1; dugh, could have saved big headaches if had
+found this before. Makes all keys sorted cleanly, gets rid of random hash sorts.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 22 Nov 2021 12:45:00 -0700
+
+================================================================================
+Version: 3.3.08
+Patch: 00
+Date: 2021-10-21
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug fix release. 2 bugs that can impact all users under the right circumstances
+were detected and fixed. Thanks manjaro users there for finding and reporting
+those. No other changes.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+None.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Manjaro user ben81 located a critical bug in hardware raid output, this bug
+impacts ALL users of hwraid that run inxi with -xx option. Bug was a bad copy
+paste, the classic, had updated all the pci type data blocks at once, and hw
+raid unfortunately had a slightly different logic due to being part of the more
+complex RAID block of logic. Was trying to use an array, not a hash, reference.
+
+Thanks ben81, I would never have spotted this one, and it would impact 100% of
+all inxi users with hwraid on their machine who ran inxi with -xx option.
+
+2. Also, ps wwaux parser was spitting out an undefined index error. This is
+caused by one of two things:
+
+* ps has an issue, and is apparently at times failing to respect ww, unlimited
+line length, and wrapping anyway. This is the likely cause.
+* the user terminal for some inexpicable reason has decided to hard wrap long
+lines. This is very unlikely, but has to be considered as a possible cause.
+Since these commands run in a subshell, this is VERY unlikely.
+
+Workaround this failure by double checking that line split item is defined, if
+not, next row. Thanks Carpenter for finding that one.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+None.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+None.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+None.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+None.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Added workarounds for bug 2. Corrected silly copy/paste error for bug 1.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Thu, 21 Oct 2021 12:28:15 -0700
+
+================================================================================
+Version: 3.3.07
+Patch: 00
+Date: 2021-10-11
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Some very nice issue reports have helped correct various corner case issues.
+Mint users helped find a big one with lspci.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Unsure how to handle Android case where inxi correctly does -r test, see bug
+3 fixes 6, but android incorrectly claims it is readable when it is not
+readable, then the reader tool can't read the file and fails with permissions
+error. This is one of those weird android errors that are pretty much impossible
+to fully work around, but we can get rid of the readline() errors when reader()
+was trying to work on a file handle that did not exist, that part was an inxi
+bug.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. dm detection was not using case sensitive search for duplicates, leading to
+cases where dm like slim / SLiM failed to get detected and then repeated in
+output. Anonymous BSD debugger dataset exposed this issue, thanks.
+
+2. In certain corner cases, like ARM Android, sub reader got passed a file that
+had passed the is readable -r test, but it still failed with permissions error,
+which then led reader to try to keep working with a null $fh. While in theory
+nothing non readable should be passed to reader(), that fails when the OS fails
+to actually follow correct readable rules, as in this case. Added protections in
+reader() to handle this case, now will show error, but will not try to work with
+$fh, that is how it should have been all along, but this is a very corner case.
+Exposed by an anoymous ARM debugger dataset.
+
+Thanks Termux user for creating the debugger dataset that exposed this issue.
+
+3. lspci parser didn't null port value each iteration, resulting in all pci
+items getting port values. Not a big deal, port is only used one place, but good
+to find and correct that error.
+
+4. Not an inxi bug, but would appear so to end users: lspsci -nnv implements a
+truncating routine and breaks the first line for each bus id. See Fix 6 and Code
+fix 3.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. -S and -I would show Console: tty pts/3 even though pts device is a pty, not
+a tty. The only time this happened was when connecting to a remote system using
+ssh or something like that. Local console still shows Console: tty 2 since that
+was correct, but Console: tty pts/2 was confusing since technically it's not a
+tty, it's a pty, pseudo terminal.
+
+Now shows, when relevant: Console: tty 2 OR Console: pty pts/2.
+
+2. Issue #252 notes that Emacs (and possibly other code/text editors with native
+embedded terminals) includes a native virtual terminal that also follows
+configuration rules from the editor to highlight trailing spaces. This created
+odd looking screen output in Emacs vt mode since inxi always sets key/value
+pairs with a white space ending as separator for next key value pair for screen
+output mode, resulting always in a trailing space on each vt screen line. Fix
+was to remove the last trailing space just prior to the print line point to
+avoid this issue.
+
+As a general thing, I'm curious to learn if any editor other than Emacs actually
+contains its own virtual terminal that also follows the editor rules for output.
+Or if any virtual terminal has such a highlight trailing space rule, which would
+be imo so annoying it's hard to understand why a vt would implement it. Easy to
+understand why Emacs (or any editor) does it, but an editor also being a vt AND
+applying certain editor display configurations to the vt is a very specific and
+unique circumstance I'd say.
+
+Odd, historical, but there it is, why not handle it?
+
+3. ARM / Android case where certain files passed the read -r test, but failed
+with permission denied error. This tripped a further glitch where reader() would
+then try to work with the failed $fh, see bug 2. This was really more a fix
+than a bug, since the bug in this case was in android permissions tests, not
+inxi, but it appears to be a bug to end users, so it's handled now.
+
+4. Another ARM/Android, there was a voltage regulator IP that contained the term
+wlan so it tripped false positive for network match. Added a new type,
+regulator, to filter out those, like codec and dummy do already.
+
+5. For issue #254, fix for cygwin ERR-102 in partitions, add cygwin test, new
+dev type, 'windows', dev base then becomes E: or whatever. To avoid confusing D:
+for a key: with no value, added D:/ slash.
+
+6. Mint people discovered lspci issue, lspci -nnv has a bug where it will
+truncate the output of the first line per bus ID if it's over some arbitrary
+amount, then tack on rev and other items to end of that string, which leads to
+the block: [vendorID:productID] getting truncated or removed altogether. Clearly
+an oversight, at least I hope it's an oversight on lspci's part, but have to
+work around the issue anyway since it may never get fixed, and has been around a
+long time. Bug is in lspci 3.7, 3.6.4, and probably earlier.
+
+Also added in a fillin tool for this rare case, lspci -n data is used to replace
+the missing values.
+
+Note that while lspci recommends using -mmv, for machine parsing, apparently
+nobody noticed that -mmv doesn't have the same data items as -nnv, sigh.
+
+7. Issue #255 noted that the combination of:
+GoogleDrive Hogne: fuse.rclone 15728640
+which is two word remote fs AND a fs type with a '.' in it would fail to trip
+the handler for that multi word remote mount name. Also failed to detect as
+remote fs, added fs specific test since the actual mount name doesn't permit
+reliable detection as remote type. Testing for trailing ':' isn't safe since
+':' alone is not an invalid character in a file system name as far as I know.
+
+Further, this exposed that the ^^ space replacements for $row[0] fs > 1 word
+name were not being reset soon enough in the logic, that's also corrected.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Neglected to support standard package config file override
+/etc/inxi.d/inxi.conf item. This is mainly useful for packaged inxi's who want
+to override the distro maintainer /etc/inxi.conf file. Test priority is the same
+except /etc/inxi.d/inxi.conf comes right after /etc/inxi.conf now in the test
+sequence.
+
+2. Added basic cygwin id, yes, inxi works in cygwin, apparently, with some
+issues. Added cygwin os id to distro ids.
+
+3. Added --version info for debugger, sometimes we want to know what verion of
+a tool, like lspci, in case it has a bug or something.
+
+4. Added exfat and apfs to unmounted fs types.
+
+5. More disk vendors!! New vendor ID matches!! Yes, yes, you've heard it all
+before, the list never ends!! The eternal chaos of existence manifested in just
+how many IDs can be generated for new and old disk vendors alike!!!
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. No changes this release.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Pull request #253 corrected typos, urls, and other errors in man page,
+inxi/pinxi comments, pinxi.1/inxi.1, README.txt, and updated LICENSE.txt to
+current gnu wording.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Forgot to add lspci debugger fake data option, that's corrected. That's
+--fake lspci, now works, didn't before, only the bsd pci tools had fake switches
+previously, since lspci never needs debugging really, but did now to test an
+issue report.
+
+2. Added -CYGWIN to debugger file name. Added -ANDROID if ARM and if android.
+
+3. With Fix 6, refactored entire lspci_data block, added lspci_n_data item,
+which matches bus id of lspci -nnv when corruption occurs and replaces vendor,
+product, and if also missing, rev version. I kind of knew I'd have to do this
+fix one day, that was the same fix logic used on the BSD pci tools, which have
+similar issues with consistency in output, or lack thereof.
+
+This refactor is long term very good because it avoids an entire class of
+possible errors, and makes pci detections far more robust.
+
+4. Created new repo, for legacy code, inxi-legacy. Moved branch inxi-c to
+inxi-legacy/xorg-c, moved branch xiin to /xiin, moved branch inxi-legacy (binxi)
+to inxi-legacy/inxi-legacy. Those directories each contain all the files each
+branch had in it.
+
+This gets rid of some branches clutter, and nobody needs to see those anymore,
+but if they care, they can look at them. Note that to do this, I had to merge
+their histories, which was not that nice, but git is just really bad at this
+type of stuff, so that's how it goes.
+
+Times like this really make me miss svn's directory based branch approach...
+
+5. Simplified sub fs_excludes, simplified regex constructors for all function
+that use this data, made list more fault tolerate by adding global (fs)?(\d{0,2}
+which means all file systems can have or not have 'fs' at end, and all can have
+or not have a version number in string.
+
+6. Exposed by issue #255, refactored slightly ordering of partition filter
+logics and variable resets in the df output processing loop.
+
+7. Added --fake partitions, to help debug odd corner cases like cygwin glitches.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 11 Oct 2021 19:01:15 -0700
+
+================================================================================
+Version: 3.3.06
+Patch: 00
+Date: 2021-07-21
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version! Fixes!! Bug fixes! More bug fixes!! Cleanups!
+
+Most of these were exposed by issue #251 filed by LukasNickel, then further
+revealed via his debugger data set, which showed two more bugs. Well, bugs,
+changed syntaxes, same difference to end users.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Work is ongoing to add btrfs support to -R (similar to softraid or zfs),
+basic stubs and debuggers added, but reporting tools are not as robust (and
+often require sudo/root for reasons that escape me) as I would have hoped, so
+it's slow. One of these days... Normally would not release with working stubs,
+but there were enough real issues/bugs to warrant just getting 3.3.06 out the
+door, then going on with the btrfs feature for -R. But so far I view the
+reporting tools as inadequate, unfortunately.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. As initially discovered in issue #251 there are alternate syntaxes which had
+never been seen before for remote mounts, fuse mounts, etc. In this case, it was
+fuse.sshfs that was not removed from the Disk total:... used: leading to silly
+1000+% used percentage. Note that while technically inxi could try to be clever
+about reporting impossible percentages, so far those have led to bugs getting
+reported, then fixed, so I think it worth leaving it as is.
+
+2. When --swap/-j is used with no other arguments, failed to show uuid or label.
+Discovered this while testing fix 2.
+
+3. Bug which is not a bug but will appear as such to users, nvme temps were
+failing in -Dx due to a change in how those values are located in /sys. See fix
+3.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Going along with Bug 1, and considering that only in 3.3.05 was the nfs4
+remote fs failure to identify/exclude, the entire section involving remote/ fuse
+etc file systems was refactored, and extended to add many more previously
+non-handled remote and fuse type file systems. Significant extension of known
+remote filesystem types, distributed file systems, overlay file systems, all to
+try to avoid having more distributed/remote/fuse file system issues. Also added
+test to support fuse. or fuseblk. type prefixes for any of these. Hopefully
+there will be fewer issues related to distributed and remote and overlay type
+file systems in the future.
+
+2. Made all label/uuid triggers global, that is, -ol shows unmounted with
+labels, -ju shows swap with uuid, and so on. This may require a bit more tweaks
+to get exactly right, but in general, this is a purely cosmetic fix, that is,
+try not to show label/uuid for partition/mounts that probably can't have those
+values.
+
+3. There was a change in the way nvme /sys temperature paths were handled, an
+actually understandable, albeit as always annoying, one, because inxi actually
+had to do a sort of convoluted hack to get the nvme block devices temperatore
+paths before, now that hack is not required for newer kernels (5.12+), though
+for kernels that had the old paths (5,8, 5.9 at least, don't know when paths
+changed) left in the old method. Now tests are more granular, and inxi should
+find temperatures regardless of which method is used for nvme and sd type
+drives.
+
+4. Another somewhat irksome random change, again, understandable since the new
+syntax is more consistent in output than the previous one, but still breaks all
+existing parsers that use the changed field names. Lsblk did NOT change the -o
+input field names, but DID change the output field names, which broke the
+internal inxi parser, and led to null lsblk data.
+
+Changes were - or : separators in input values are output as _ always. that is,
+MAJ:MIN becomes MAJ_MIN. Also corrected the debugger lsblk to use the same
+output fields for -P -o as the actual lsblk parser uses internally so these
+failures can be spotted more readily, as it was, it was literally only because
+someone submitted the debugger dataset, and was running lsblk 2.37, where I
+believe this behavior change happened. Solution was to just use regex patterns
+instead, [:_-], in the parser. Big fear now is that they will randomly stop
+supporting the -o input field names that contain - or : and change that too
+without any real warning or deprecation notice.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Going with bug and fix 1, added avfs, afs, archivemount, avfs, ceph, gfs,
+glusterfs, gmailfs, hdfs, ipfs, kosmos/kfs, lafs, mergerfs, mhddfs, moosefs,
+ocfs, openafs, orangefs, overlayfs, pvfs, s3fs, sheepdog, vmfs, and several
+others to the exclude list for disk used and show label/uuids for partitions.
+
+2. A smattering of disk vendors added.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Going with fix 2, -l and -u no longer will trigger -P by default, now if -l
+or -u are used without -j, -o, -p, -P, an error will explain that you must use
+one of those together with -l or -u. This was the only way to get the -l and -u
+switches to turn off/on label/uuid reports in swap, unmounted, and partitions
+consistently. Triggering -P was really a legacy behavior from when the only
+options were -p or -P, and --swap and --unmounted did not exist. I found it
+increasingly odd that unmounted would show label/uuid always but partitions only
+with -l/-u.
+
+2. This was a pet peeve, sometimes field names just bug me (like 'Topology: did
+for CPU, now corrected to Info:), the Drive: rotation: was one such annoyance.
+I had recycled that to indicate SSD, which was a feature request, but that was
+always a sloppy solution, and made no sense, since SSD isn't a rotation speed.
+
+Now it reports a much more logical:
+
+ID-1:...... type: HDD rpm: 7200
+or
+ID-1:...... type: SSD
+or
+ID-1:...... type: N/A
+
+This also corresponds to the intended meaning much better. The HDD type was
+always present internally if rotation speed is detected, but was not used. Now
+will also show type: N/A if reliable type detection failed, which will also be
+more consistent.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Brought most of inxi.changelog (this file) into a consistent state, re
+whitespaces, readability, consistent use of various header / section names.
+Ideally while I don't expect anyone to ever sit down and read this changelog, it
+will be now much easier to scan to find whatever interests you. This change goes
+along with ongoing changes in docs to in general try to be usually 80 columns
+wide.
+
+2. inxi-resources.txt, inxi-data.txt are updated with more raid, partition, file
+system values and data to go along with bug, fix, enhancement 1.
+
+3. Man and help updated to indicate -u and -l no longer trigger -P by default.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Ongoing refactors, bringing the codebase to the point that matches current
+coding styles. Removed remainder of whitespaces in conditions and for/while
+loops, for example:
+
+if ( condition ) {
+becomes:
+if (condition){
+and
+if ( ( test set 1 ) && ( test set 2 ) ) {
+becomes:
+if ((test set 1) && (test set 2)){
+
+and so on. That dropped over 2 KiB of whitespaces. This went along with fixes
+that have been ongoing to change to this whitespace use style, but previously it
+was only being done when that situation was hit in a local block, now it's been
+completed globally.
+
+This continues the style refactor that has been ongoing for a while now, to
+bring inxi into a consistent state, since when it started, it was more pressing
+to get the bash/gawk mess translated to Perl than it was to get the Perl itself
+to be as good/consistent as possible, so now those issues are being slowly
+unravelled, and hopefully will set inxi on course for its next 10 years.
+
+It was starting to get annoying, because some parts of inxi used those spaces,
+and all newer ones didn't in general. Now it's one behavior throughout the whole
+program file.
+
+2. Refactored the entire fs exclude for disk used data, and integrated those
+values into a global tool that is used either to exclude file systems from disk
+used totals, or to not show uuid/labels for the excluded
+remote/distributed/overlay type file systems, which in general don't have uuid
+or labels.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Wed, 21 Jul 2021 18:23:21 -0700
+
+================================================================================
+Version: 3.3.05
+Patch: 00
+Date: 2021-07-11
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Many small updates, enhancements, bug fixes!!! We've been saving them up!! Here
+they are!! Don't wait!!
+
+Thanks mr. mazda for many issue finds, and suggestions.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Due to unfixable rpm slowdowns, removed package counts for default output for
+rpm based systems. We were seeing delays of up to 30+ seconds just to list the
+rpm package count, which is absurd, even after the rpm optimizations inxi
+already runs. To allow rpm users to get excluded by default for rpm package list
+counts, added --pkg flag plus a short message telling them to use that flag to
+get the installed package count if they want it.
+
+Changes like this are very unfortunate, but in 2021 for a package manager at
+times to require over 30 seconds to generate a trivial installed package list is
+just not acceptable. One of the reasons this release was delayed was this was
+not an easy decision to make, it's very rare support for a feature is removed
+for specific tools due to how badly the tools may perform. Note that whatever
+higher level tool is used, like dnf, zypp, it's still the same speed, they all
+appear to use the same core engine.
+
+Basically this decision was forced since either inxi looks really bad and slow,
+when it's not, or the actual cause was removed from default outputs.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Small bug in nfs blacklist for disk used led to nfs used being added, which
+leads to silly used percents. This is corrected.
+
+2. If ram vendor ID failed, inxi would delete the part number. Oops. This was
+related to the Mushkin failures.
+
+3. Close to a bug, though not one internally, but to users would appear as one:
+ZFS does not act as expected, zpool list did not in fact return the pool size,
+which I had always assumed to be the case, but in a very strange decision, does
+return something very close to the pool size for mirrors, but NOT for z1 or z2
+pools, then it returns the total size of the drives that make up the pool. To
+call this strange behavior would be an understatement. The fix was to modify the
+logic to use zfs list instead to get the size data. This also makes the drive
+total report far more accurate, since it lists usable space now for ZFS as was
+always intended. The cause of this was simply that I'd always had access to zfs
+mirrors, not z1 or z2 arrays.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. OpenSuse and maybe others use kdm3 for Trinity, not kdm, so dm was failing.
+
+2. Going along with fix 1, made kde version detection more robust so may catch
+more fringe / corner cases for kde desktops. These were mainly added to correct
+Trinity desktop version detections.
+
+3. Mushkin ram vendor ID was failing, that is or should be corrected.
+
+4. Added in /dev/disk/by-id handlers for zpool components, there are several
+variants, wwn-, pci-, scsi-, ata-, but they all map to the real /dev drive IDs.
+Failure to unmap these led to failing to match components and get size info
+etc for zfs.
+
+5. See DOCUMENTATION: 2, language changes for weather feature abuse.
+
+6. Failed uptime report data due to yet another random syntax change in the
+data. See Code Change 1 for details on the fix.
+
+7. A change at some point made sensors show 0 instead of N/A due to improperly
+setting undefined sensor values as 0. This in particular happened with mobo
+temps on systems without known mobo temp sensors.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Going along with the rpm issues, added dnf.conf support to yum/dnf repo
+types. Not sure how that one was missed, but there it is. This should tighten
+repo reports for dnf/yum/zypp types.
+
+2. Added LeftWM. LeftWM confirmed working. Added unverifed detections for:
+penrose, 2bwm, 5dwm, catwm, mcwm, monsterwm, snapwm, uwm, wingo, wmfs, wmfs2.
+
+3. Added xfwm as a compositor type, that had been left out, somewhat on purpose,
+since xfwm can run in compositing or non compositing mode. But should show since
+many users use compositing mode now.
+
+4. Added OpenMediaVault distro ID and systembase handlers.
+
+5. Going along with zfs bug fix 3, using zfs list data for free, size,
+allocated. Trying to understand how zfs developers actually thought about this
+is nearly impossible so just used what seems to correspond to reality most. Also
+shows raw values for zfs data in RAID along with regular ones to make clear
+which is which value.
+
+6. Added more CPU architecture ID matches for AMD Zen and a variety of Intel.
+Both vendors finally released some new CPUs and the data became available, which
+doesn't always happen quickly.
+
+7. A bunch of new disk vendors and vendor IDs added. Never stops, like the sands
+of time, like the ocean waves, like the scuttling crabs scrounging around in the
+seaweed in the foam where the outgoing wave left its mark...
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Added leftwm keybindinigs to inxi-data.txt desktop/wm section. Updated more
+wm in that section as well, and list more info on wms for future reference etc.
+Also reorganized and made more readable wm section.
+
+2. Help/Man now make more clear that automated requests or excessive use of the
+inxi weather feature are not under any circumstance permitted. There had been
+some ambiguity and lack of clarity about what abuse is, now it should be more
+clear.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Refactored uptime parser logic, the code and regex was just getting too messy
+and difficult to work with and debug, now it works similar to how the revised
+BSD parsers run, the regex are pulled apart and made more granular so a small
+syntax change ideally won't break the detections as easily.
+
+2. Cleaned up sub cpu_arch() and made all the arch values line up nicely, over
+time I notice that almost invariably stuff done to save lines of code makes
+code harder to read as the feature expands, so it's generally worth just
+unravelling it so it all stacks and is easy to scan/read. Also removed extra
+white space in parens, which is something I'm leaning more towards but it's not
+worth fixing all at once so it's just done where it's noticed.
+
+That's using:
+if ( /test/ ){
+rather than:
+if (/test/){
+
+I believe using more white space helped with Perl comprehension in the
+intermediate stages, but is not required anymore and just looks like extra
+whitespace now.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Sun, 11 Jul 2021 18:36:42 -0700
+
+================================================================================
+Version: 3.3.04
+Patch: 00
+Date: 2021-04-16
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Enhanced features!! Huge BSD upgrades! Bug Fixes!! Elbrus Fixes!! More bluetooth
+fixes!! What are you waiting for?!!?
+
+A special thanks for significant help, ongoing, leading to a huge boost to BSD
+support, Stan Vandiver, who did a lot of BSD testing, and setup many remote
+access systems for testing and development of the latest BSD upgrades. If you're
+a BSD user, you can thank him for helping to expand BSD support!
+
+An ongoing thanks to Mr. Mazda, for continuous testing, suggestions, and helpful
+ideas.
+
+Take special note of the code folding fixes in Fix 1, those open up possible
+free software code editors that can be used to work with inxi to more than just
+Kwrite/Kate, to include scite and geany, nice lightweight code editors. You
+can't do real work in inxi without code folding, so getting this finally
+resolved was I think worth it.
+
+Also, for the first time ever!! inxi is now using Pledge, well, if
+OpenBSD::Pledge module is available, which is currently only in OpenBSD, since
+that's the only system that supports Pledge security, except for Serenity, but
+inxi doesn't support Serenity. Note that OpenBSD was smart and added
+OpenBSD::Pledge and OpenBSD::Unveil to Perl Core modules, thus removing any hoop
+that might stop a Perl program from implementing it. Nice going OpenBSD guys!
+
+The addition of OpenBSD softraid support for RAID and CRYPTO types highlights
+the problem with --raid and --logical, where --raid is really just a subset of
+Logical volume management. Note that while the hardware RAID feature only lists
+the actual PCI RAID device, OpenBSD bioctl supports hardware RAID out of the
+box, something I'd thought of doing in inxi for a few years, but it's too much
+work, but bioctl has done the work, which is impressive. Can't do much without a
+lot of debugger data there though, but it's worth being aware of. In this case,
+since softraid is the primary device, I opted to call Crypto and RAID types all
+RAID, same as with linear zfs.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. FreeBSD: USB drivers. I really gave this a try, but could not get any logic
+to be stable across systems and varying syntaxes used. Will wait for FreeBSD to
+add drivers to usbconfig -vl. Note that this makes it not possible to correctly
+match USB networking devices to their respective IF data, so USB networking IF
+will fall back to the undetected IF-ID, which means it was found but not
+connected to a specific hardware device.
+
+2. FreeBSD Battery Report: there are non-objective values for Battery state data
+in sysctl output, as in minutes remaining, which has no meaning, and percent
+charge (percent of what? original design capacity? current actual capacity?). If
+data with voltages, design/current capacity in Ah or Wh, is made available,
+support will be added. Note that there are 3rd party tools that do supply this
+data in a usable format, but they are not in core so no point.
+
+3. BSDs All: have found no way to get physical CPU counts. this will lead to odd
+outputs in some cases, like a 2 cpu system reporting itself as a 2x the actual
+core counts single CPU, but the data just isn't there as far as I know.
+Dragonfly in some cases appears to have that data.
+
+4. BSDs All: so far no way to get live per core cpu speeds using a file or fast
+command query. Thought I'd found a way in FreeBSD but that was not the correct
+clockrate values, or inconsistently right/wrong, so not using it. Also saw the
+same issue with max/min frequencies in FreeBSD so removed that item, it's
+better to show nothing than data that is not reliable or actually not even
+referring to what it seems to be.
+
+5. BSD SOC Support: An issue poster asked why FreeBSD (but really BSD in
+general) SOC ARM device, like RaPi, support, was so weak in inxi. The reason is
+simple: to do SOC ARM device data in a meaningful way requires a complete path
+based data structure, which the BSDs do not appear to have, at least from what
+I've seen so far. See Linux's /sys data structures for examples of what is
+required to add or expand inxi SOC device support in inxi. It's hard even with
+that type of rich path based data, and without it I won't try.
+
+The bright side is inxi runs perfectly on such devices, no errors, which was
+amazing to see, and spoke volumes of the recent work done to extend support for
+the BSDs.
+
+6. Perl / inxi, when run as root, shows read error when trying to open a 200 /
+--w------- permission /sys uevent file for reading. The test works as expected
+as user, but not as root. Perl will try to read it when run as root even though
+it has no read permissions, only write. This in reality only manifests on very
+old /sys, from Debian Etch kernel 2.26 days.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. tput + urxvt / FreeBSD: There appears to be a bug in Arch Linux urxvt that
+leads to failed terminal/console size from tput. Also while trying to resolve
+this bug, discovered that if you use "tput cols 2>/dev/null" in FreeBSD, for
+some inexplicable reason tput puts out defaults 80 cols x 24 rows. Why? Who
+knows. Added in non numeric tests of output to handle errors from tput instead.
+
+The bug appears to be what rxvt reports itself as vs what it is actually running
+as. This issue isn't present in any other distro I tried, but could just be a
+new bug in urxvt, don't know.
+
+2. Elbrus CPU: Ongoing issue #197 Elbrus poster gave sample of new 2C3 cpuinfo,
+that exposed some bugs internally in inxi Elbrus handling, I was using integer
+values instead of hex for model IDs in the Elbrus logic, which would fail after
+model 9.
+
+3. BSD dmesg.boot: The logic used for dmesg.boot data processing had errors, and
+had to be fully redone because of the need to detect in a reliable way the
+current state of USB drives. This logic now is much more robust and reliable,
+and no longer relies on using 'uniq' values per line, which would fail in all
+kinds of situations.
+
+4. OpenBSD USB Speeds: bugs fixed for OpenBSD speeds, these were found during
+the USB data refactor testing process.
+
+5. BSDs: in some cases, wrong memory used values were being generated, this
+should be largely corrected now. Also pulled the weird NetBSD use of
+/proc/meminfo which had wrong data in it, and now use vmstat for all BSDs, which
+after the used bug fixes, is more reliable for BSDs.
+
+6. All systems: CPU stepping would report as N/A if stepping 0, luckily I came
+across some systems with an actual stepping: 0, which are not common.
+
+7. FreeBSD: dmidecode sourced L2 cache data failed to show correct totals in
+some cases. Due to no MT detection possible for FreeBSD currently, these totals
+will still be wrong, but now it says note; check to let users know.
+
+8. dmidecode: some cases were getting the wrong failure error message, this bug
+became exposed due to OpenBSD locking /dev/mem even to root, which then failed
+to show the expected message. This was a bug, and is now corrected.
+
+9. FreeBSD: partition swap size didn't show in at least some cases, that's
+corrected.
+
+10. Linux Partitions: partitions would let doubled swap items through in several
+cases, and also failed to create in rare cases matches for hidden partition
+mapped id's. Finally tracked down the actual cause, when moving the partition
+filters I'd forgotten to add swap into the filter list, oops. But now it will
+catch duplicates in several different ways, so that's fine.
+
+11. Unmounted: Failed to properly handle detecting RAID components in the case
+of lvm, mdraid, it was only working for zfs. This was an accident, and should
+now be corrected.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Code Folding: Note that this was NOT a bug or failure in inxi, it was a bug
+in scintilla/scite geany code editors with folding, basically if you commented
+out logic, without using a space or other marker after the comment #, folding
+would break in weird ways. Obviously the core scintilla engine should IGNORE the
+darned # commented out lines, but it doesn't, which is a real bug. But not in
+inxi.
+
+This was however worth working around, because without folding, you can't work
+on or learn how inxi works, and the only editor I know of in the free software
+eco-system that can handle folding reasonably accurately was until now
+Kwrite/Kate code editors, and those have some real, long standing, weaknesses,
+and bugs around folding that have never been resolved, and yes, did notify them
+about them, and no, they remain unfixed after years, or they were fixed briefly,
+then broke again.
+
+So it was important to expand the base of possible code editors to more than
+just the KDE stuff. Fixing this was tedious, but I think worth it. On the bright
+side, geany/scite folding / unfolding is FAST, and once the code issues that
+triggered folding failures were resolved, very accurate, much better than Kate's
+to be honest, though Kate isn't as picky, but Kate's unfold top nodes has been
+broken more often than it's worked.
+
+To avoid this issue, it's also important to configure geany/scite to use a space
+after the comment when using keyboard shortcuts to comment out lines/blocks.
+Same goes for Kate/Kwrite, by the way.
+
+2. Battery: Forgot to add battery-force to -v7, which means you would never see
+the battery line in full output if there was no battery present, this is similar
+to how raid-forced worked, it was just an oversight which I hadn't noticed until
+testing the new BSD battery logic.
+
+3. Indentation: small indentation fixes on Sound Server data. Those are visible
+with -y1, that is.
+
+4. OpenBSD PCI: enabled Device matching to PCI networking device, this required
+an odd little hack, but seems to be pretty reliable, and allowed me to add
+driver to PCI device reports as well. Not sure why driver isn't in pcidump -v
+but it probably will be in the future. Note to self: add in support for that so
+if they include it in a future release, it will suddenly 'just work', assume
+they use the same basic syntax as usbdevs -vv output.
+
+5. BSDs: Added in some null data protections for BSDs, which do not always have
+all the data types found in Linux, those would trigger Perl undefined value
+errors, which are warnings that inxi failed internally to test for null data in
+that, but it's hard to know when to do that when the data is basically always
+there in Linux.
+
+6. Debugger: Added test for required Net::FTP module in debugger, had forgotten
+to make that test explicit, which led to odd failures.
+
+7. BSDs: nvme detections should be better now. But I have seen no live test
+system to confirm the fixes work as expected, plus, at least, OpenBSD swaps
+nvme0 to sd0 internally, so I'm not actually sure how that data will even work,
+we'll see how that goes.
+
+8. BSDs: oddly, despite using 0x hex numbers almost everywhere, for CPU
+stepping, the stepping is in decimal, which is even odder because CPU makers
+list their steppings as hex in many if not most cases. In case this is corrected
+in the future, if 0x appears before stepping number, will not then try to
+convert to hex since it already is.
+
+9a. CPU L3: Subtle, probably won't change behaviors, but L3 cache is per physical
+CPU in every case I've found, so never multiply value by cores for L3. Like
+everything, this may lead to corner cases being wrong, but that's life, it will
+also lead to the data being right for most users.
+
+9b. CPU L1: Different L1 syntaxes found so inxi now uses more loose detections,
+should cover most OpenBSD L1 variants at least.
+
+10. BSDs: inxi was using internal 'sleep' right before reading /proc/cpuinfo,
+but that was silly for BSDs since cpu speeds there come from sysctl, so the BSD
+sleeps are now running before sysctl if CPU data feature is required.
+
+11. Too many to remember, but lots of subtle message output changes to make more
+clear, more accurate, shorter, whatever.
+
+12. USB: a very subtle fix, some devices can be both audio and video, like
+cameras, but inxi would default to the first detected. Now it checks for both
+before going to the list of checks, and correctly assigns a type that is both
+audio and video to the audio and video hashes so both features will show the USB
+device, not just Audio.
+
+13: BSD: fixes for BSD ifconfig IF status, it was slicing off the full status
+string, like 'no network' to 'no', which is silly. Now shows full string.
+
+14. OpenBSD: restored USB Hub ports: xx item, I hadn't realized that the data
+was still there with usbdevs but it required an extra -v, like: usbdevs -vv to
+trigger, so now the OpenBSD USB ports works fine again.
+
+15. Fedora Xorg: updated --recommends to use the newer split apart xorg utils
+package names, only xrandr I think needed updating. Thanks Mr. Mazda for keeping
+up with that stuff!
+
+16. OpenBSD SMART: the actual device being queried turns out to the 'c'
+partition, the one that represents the entire disk, NOT the main device ID, like
+sd0, so now inxi tacks on 'c', sd0c, when smartctl runs, and it works fine. So
+previously SMART report would never have worked in OpenBSD.
+
+17. Partion labels/uuids: in Partitions and Unmounted, does not show label/uuid
+if fs type is ffs or if fs is a logical type one, like zfs, hammer, and remote
+fs mounts etc. This cleans up output, since these file system types will never
+have labels or uuids.
+
+18. Mr Mazda inxi was missing data and showing errors if run in Debian Etch with
+Perl 5.008, and I realized I'd slipped up and had used the -k option without
+testing lspci version, but -k was only available in 3.0 in Lenny. But -v turns
+on -k automatically, so the easy solution was just to remove the -k and leave
+the -nnv, which is the same thing, but does not cause errors in early lspci.
+
+There are also errors with reading as root some /sys uevent files, but upon
+examination, those had only root write permission, so the perl -r test isn't
+right. Don't think that can be fixed. See Can't/Won't fix for more.
+
+Another issue I noticed was that in some cases Perl seemed to lose track of some
+hash values in local %trigger in OptionsHandler, and just lose them, thus
+leading to things like --help --version --recommends not working. Moving
+%trigger to globals %show and %use fixed that one, but that's weird, no idea
+what happened, but it works now.
+
+Tested in Sarge 3.1, where core modules have to be explicitly installed, they
+were not included in base Perl install. Kernel 2.4 had some key differences,
+different lspci syntax, different /proc/partitions, so the block device output
+and device output is flawed, but otherwise inxi worked fine in Sarge, from 2005!
+But these issues will not be corrected, kernel 2.24 is just too old, lol.
+
+inxi should always run ok in very old systems, like Etch, back to when Perl 5.8
+was standard, so bugs like this are always welcome, it's easy to slip up and use
+something that didn't work in those old systems, then forget to test.
+
+19. Corner case SMART errors, sometimes occur much later in output than inxi
+expects, this is now corrected and errors should show in smart data no matter
+where the main error type occured.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Elbrus: Going along with Bug 2, Updated Elbrus microarch to use family 6,
+assuming models 10, 11, are the same, which they should be since 12 is the same
+as in family 4.
+
+2. IPMI Sensors: More sensor syntax detections, sensors will never be stable...
+
+3. OpenBSD: Rolled out live battery state feature, they have very good data,
+simple, but solid, that allows for a quality battery state report. Handles both
+Wh/Ah, though I am slightly suspicious of the reality of the arithmetic for Ah >
+Wh conversion, it seems to be too high. That's Ah * Design Voltage. But Linux
+battery data has the same issue, though I think in most cases, the data is in
+Wh, so this issue isn't BSD specific. My suspicion is that the voltages used to
+determine Ah may actually be slightly lower than the listed design voltage,
+which inxi calls min: but it's actually the design voltage.
+
+Unknown if NetBSD data is the same as OpenBSD for battery, was unable to locate
+any samples, so can't say, if you have a NetBSD laptop that correctly reports
+battery state in sysctl -a, please file an issue with some sample battery
+charge/voltage syntax and values, ideally from > 1 system. If the data is
+complete, it's easy to add support.
+
+4a. BSD USB rev: inxi now emulates USB rev versions for BSD USB speed/rev
+version data. Note that this is not guaranteed to be right, because USB devices
+can be different rev versions than the speed they run at, but as far as I could
+find, the USB revision data is not available in any practical sense, unless I
+create a complicated recursive tool to build up a snapshot of the usb system and
+devices from dmesg data, but I already blew a day on that attempt, so will wait
+for more complete data in the usb tools in future. The rev version is based on
+the device/hub speed, using a standard USB rev speed mapping. But a 12 Mbps
+device can be rev 2, not rev 1.1, for example, that is, it's actually a USB 2.0
+device, but a slow speed one.
+
+4b. USB Type: Expanded fallback USB device type tests, these are useful for
+cases where it's either a vendor defined type, or for Open/NetBSD, which do not
+yet show USB class/subclass data. But it's a good fallback tool, added Mass
+Storage, expanded detections.
+
+5. BSD Sensors: Going along with Enhancement 3, rolled out live sensors data.
+Confirmed working in OpenBSD and FreeBSD, not sure about NetBSD, no data,
+problem with vm testing is no sensors, but don't have any NetBSD hardware
+installs to verify. Stan gave it a good try, but could not get NetBSD running so
+far, maybe later.
+
+This basically means the -B and -s features are largely feature complete for the
+BSDs as far as practical, though due to difficulties in getting the data in a
+consistent clear way, some more advanced features, like gpu temps, which are now
+available in Linux kernel values and lm-sensors, do not yet appear to be present
+in the BSDs, though if this changes, the structures are in place to make
+updates to these logics very easy to implement now.
+
+Note that the --sensors-include and --sensors-exclude items, or config items,
+work fine with this BSD logic, though you have to figure out what exact syntax
+to use, but that's the same in Linux.
+
+6. OpenBSD Pledge: Yes, that's right, inxi is now Pledged!!! In OpenBSD, anyway,
+they did a really good job, and the OpenBSD Perl packager made a very nice Perl
+modules, OpenBSD::Pledge, which was very easy to implement. Now I know what inxi
+needs to run its features!!
+
+So far OpenBSD only, but Pledge seems like a really good idea, so I figured,
+let's give it a spin, even if it will only currently work on OpenBSD, but that's
+fine, inxi is pledged as tightly as I could make it, including unpledging
+features not required post options processing, once inxi knows what it's
+actually going to be doing.
+
+Note that I'm aware of OpenBSD::Unveil, but that's a lot harder to implement due
+to never really being sure about what files inxi will need to be looking at
+until well into the logic. I may look at that in the future.
+
+7. Bluetooth Rfkill: Due to ongoing failures in current inxi to show consistent
+Bluetooth hci report on Linux, added in one last fallback, rfkill state, which
+allows inxi to always fallback to at least that basic data. Also added in which
+tool is providing the report mostly, like: Report: bt-adapter ID: hci0 and so
+on.
+
+Also integrated into -xxx data, or for down state, the full rfkill report, since
+that can be quite useful.
+
+Note that bluetooth is a real pain for users to debug because you can have:
+
+ * Bluetooth Service: enabled/disabled
+ * Bluetooth Service: started/stopped
+ * bluetoothctl: start/stop
+ * bt-adapter: start/stop
+ * hciconfig: start/stop
+ * rfkill: software: block/unblock; hardware: block/unblock - however, for
+ hardware, that means a physical button has been pressed to disable it, on the
+ laptop that is.
+
+To make matters worse, one tool does not always even know when another tool has
+changed something, for example, if I rfkill blocked hci0, then unblocked it,
+hciconfig would keep seeing it as down until it was switched to on with
+hciconfig explicitly. This is I suspect one reason hciconfig is being dropped,
+it doesn't know how to listen to the newer tools like bluetoothctl, bt-adapter,
+or rfkill.
+
+8. OpenBSD: Going along with Code Change 1, now has disk serial (doas/root),
+more consistent physical block size data, more reliable disk data, and for -Dxx,
+duid, if available. Also added disk partition table scheme, aka MBR / GPT. Some
+of these new items may also work with NetBSD. See also Fix 17, SMART fix for
+OpenBSD.
+
+9. OpenBSD/NetBSD/FreeBSD: the DiskDataBSD refactor now allows Unmounted
+partitions report.
+
+10. OpenBSD: added in CPU MT detections using siblings data, I think only
+OpenBSD and Dragonfly support proper MT cpu core counts. Still no way to get
+physical cpu counts in OpenBSD or FreeBSD or NetBSD that I am aware of.
+
+11. OpenBSD: added in cpu speed min/max data, that was available in most cases,
+didn't realize that.
+
+12. BSDs: expanded and made more robust cpu L1/L2/L3 cache detections, now for
+example, OpenBSD will report its L1/L2/L3 cache without root. FreeBSD requires
+root since that data is coming from dmidecode.
+
+This logic update made BSD L-cache data much more reliable and consistent, and,
+important, easy to work with. This was directly connected to Code Changes 2 and
+3, which made dealing with those data sources a lot easier.
+
+Note that L1/L2 cache data if not from OpenBSD will show note: check because
+it's not possible to determine if it's a multithreaded MT cpu or not, and thus
+if L1/L2 * core count would so often be totally wrong that inxi won't try to
+guess, it will just list the single value found, and tell the user to check it
+themselves.
+
+13. OpenBSD: Added rcctl tool to init tools, I hadn't known about that one, that
+replaces the fallback default used before, /etc/rc.d.
+
+14. RAM Vendor: Issue #245 raised the point that it would be good to try to show
+RAM vendor data when the manufactorer field is empty, and since that logic is
+already present in disk_vendor, it was just matter of researching the product
+IDs to find the matching patterns for the RAM vendors, the initial list is
+pretty good, but will need updates now and then to correct errors. Also will
+override only vendor ID 4 character hex value and see if it can find a better
+value.
+
+15. OpenBSD RAM: data quality is decent (no vendor/product no, unfortunately).
+The data is often, but sadly not always, available. I'm not clear why sometimes
+it isn't, but since OpenBSD also defaults to blocking /dev/mem to even root
+user, which then blocks dmidecode, this is the only practical way to give basic
+RAM data for OpenBSD, so that's running fine now, when the data is available,
+with the added bonus of not needing doas/root.
+
+Note that due to the way that this data is present, I can have inxi deduce some
+things like how many arrays there are, and then guess at overall capacity, max
+stick size, and so on, but all Array-x: values are followed by note: est because
+they are never based on hard data, just extrapolations. I debated if inxi should
+even show the guesses, but I think by saying note: est after each Array-x: item,
+it's pretty clear that it's not hard data, and it does give an idea roughly. I
+made an initial guess at > 1 ram array but found no data samples to let me see
+if my guess was right or not, so > 1 array remains roughly theoretical until
+shown to work or not work empirically.
+
+While NetBSD sometimes has the system ram data in a similar way that OpenBSD
+does in dmesg.boot, it varies too much, and is too inconsistent. There are not
+enough data samples with good consistent data, and the samples I did see
+suggested that it would take too much code and convoluted logic to handle the
+variations, so I'm leaving this one alone. Also, NetBSD probably doesn't block
+/dev/mem so dmidecode should work fine.
+
+16. Using system clang version info for OpenBSD kernel compiler, the assumption
+being that a BSD is an OS, so the Clang version it shipped with would be the
+clang version that compiled the kernel. Please correct if this is wrong.
+
+17. OpenBSD RAID: support added for softraid, including for drive storage
+totals, unmounted raid component detections. Plugged in pretty smoothly, able to
+generate a partial report for non root, and shows message if not root.
+
+18. VM detections upgraded, particularly for BSDs, now includes vmm, hvm,
+hyper-v, kvm. Not all of these would have been detected before. Also cleaned up
+vm logic, moved all vm detections into $dboot{'machine-vm'}, and only use the
+first found item.
+
+19. Disk Vendors!!: Yes, last, but not least!! More disk vendors, vendor ID
+matches!! Yep. What else can I say? Eternity? Man's quest for something that
+cannot be found, yet these strivings never cease, here manifested by always new
+vendors and ID matches!
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Very significant ongoing upgrades to the docs in inxi-perl/docs/,
+particularly in inxi-values.txt, inxi-resources.txt, and inxi-data.txt. These
+are now increasingly useful, and I am trying to keep in particular
+inxi-values.txt up to date as a primary reference for various features, though
+it will always lag, because that's how it is, lol.
+
+2. Cleaned up changelog, made 80 cols wide for text, bars, etc, made numbered
+lists and headers consistent, but otherwise did not change any of the actual
+content.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Complete rewrite of BSD disk/partition data tools, now there is one core tool
+that generates a mega-disk/partition hash, which is then used for all features
+that need partition/disk data. This worked out super well, and allowed new
+features like BSD Unmounted disk data to be generated for the first time ever,
+along with filling in various block device fields that were missing before.
+
+2. Change 1 also went along with a refactor of dmesg data tool for BSDs, which
+allowed for much more granular data generation, along with a complex %dboot hash
+which stores all sub types as well as the main full dataset. This allowed inxi
+to stop looping through all of dmesg data each time a feature needed it. Now all
+the data types are assigned if required by a feature, and only then. This, along
+with change 1, worked really well.
+
+See also Bug 3, which mandated completely changing how dmesg.boot and dmesg live
+data were / are merged, the result is far more robust now, and far less prone to
+error.
+
+3. Similar to dmesg changes, used same methods for sysctl data, now all the data
+is assigned to %sysctl data structure based on if needed or not, so it only does
+the assignments one time, in one location. Much cleaner code this way, and
+allows for testing set/unset substructures, like $sysctl{'cpu'}.
+
+4. The %dboot and %sysctl refactors went so well that I switched the core USB
+and Devices to also use %usb and %devices structures. These updates let me dump
+a lot of global hashes and arrays, and leaned everything down a lot, and also
+removed basically all the testing loops for these data types, now the Item
+features just test to see if a reference to the specific type exists, if it
+does, it has data, if not, it doesn't, this is a lot easier to manage.
+
+5. Ongoing: moving related subroutines to Packages, the goal is to have pretty
+much all related subroutines (functions) contained in parent classes/packages,
+makes it easier to maintain.
+
+6. Ongoing: making all internal package tools have similar sub names, getting
+rid of the specific names for output and data generator functions. This makes
+each Item Generator increasingly like all the others, as much as practical.
+
+7. A big one, renamed all the feature generators to be XxxxxItem, instead of
+XxxxData, which was colliding as a package name with actual data generator
+tools, now all the Feature generators are [Feature]Item, and all the Data
+generators have Data type names where relevant. This avoided in particular the
+silly case where I was relying on case to differentiate UsbData and USBData,
+feature vs data generator.
+
+8. As part of the move to data hash global structures, also moved as many of the
+top global scalars and hashes and arrays to these now much more heavily utilized
+global hashes, like %alerts, %use, %fake, %force, and so on. There are now far
+fewer globals running than before, and where it makes sense, I keep moving them
+into global hashes, and giving the global hashes more work to do.
+
+9. Significantly expanded list of debuggers for specific data types always
+available, see docs/inxi-values.txt for list of options there. Decided for rapid
+development, it was too much of a pain to always be uncommenting the debuggers,
+so now am uncommenting, adding to @dbg supported items, then documenting. I
+guess this means the @dbg items are more or less stable and consistent now, give
+or take.
+
+10. Refactored UsbData and DeviceData, for in particular the BSDs, to be much
+more robust and to rely less on very fragile regex parsing patterns, takes more
+lines of code, but better than having the detections break every other BSD
+release. This was part of the %device and %usb refactors as well.
+
+11. Fixed system_files() too, which was really silly logic, it used a global
+packed hash of system files, then would do a function call for the paths when
+required, which was redundant since the values were already in a hash which
+could be used directly. This was a throwback to inxi gawk/bash, where hashes
+were not really used in this way, and the logic had been translated to Perl
+without thinking about it, but once I thought about it, I realized how silly
+that was. This must have knocked off a good 50 or more unnecessary, and always
+expensive, function calls.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Fri, 16 Apr 2021 20:37:35 -0700
+
+================================================================================
+Version: 3.3.03
+Patch: 00
+Date: 2021-03-17
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bugs!! Fixes! Spring cleaning!
+
+Because these are either newly created, or newly discovered, bugs, this release
+was pushed as early as possible to get them fixed asap.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Desktop: Lumina detection had a syntax error which made it not work. This has
+been broken for a while.
+
+2. Logical: if not root, and if LUKS / bcache detected, failed to load
+proc_partitions, which generates error on --logical --admin since the required
+components data was not loaded. This was an oversight.
+
+3. The 3.3.02 ShellData refactor created a bug for console IRC, showed shell,
+not irc client, name, and set default shell data which also showed.
+
+4. Console IRC tty: there was also an older bug that made -S, -G not work
+consistently, and there were errors that had been missed for many years in that
+logic. These should all be corrected, console irc out of display, or in display
+as root, should now show tty info, tty size in -G.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Memory: restored $BSD_type block on /proc/meminfo and force NetBSD to use a
+corrected vmstat. This leaves that block of logic to correct the NetBSD oddities
+in meminfo, but it may fix future isses that popup.
+
+2. -Sxxx man page item incorrectly said XDG_VTNR was systemd/linux, it's not,
+it's various things, GhostBSD has it, for example. See what you get for
+believing what people say!
+
+3. Logical: added in N/A for null maj-min in --logical report. While bug 2
+triggered those errors, there could be future cases where maj-min are null, like
+BSD lvm data etc.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Going along with Fix 1, added '--force meminfo' in case you really want that.
+
+2. Distro: System Base: Added TrueNAS detection.
+
+3. Package Data: Added mport [MidnightBSD] type. That requires root to run for
+some odd reason, so won't see the best output if not root.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Moved logical to -v7 from -v8, it's stable enough now.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Moved get_tty_number and get_tty_console_irc to ShellData:tty_number and
+ShellData::tty_console_irc.
+
+ShellData::tty_number was being loaded several times, added
+$loaded{'tty-number'} test, and made client{'tty-number'} to store value.
+
+tty_console_irc changed to console_irc_tty, which is what it gets, removed hacks
+and made it load once and store result in client hash.
+
+2. Optimization: retested sub vs package::method and they run at exactly the
+same time, give or take, so moving more stuff into packages to make it easier to
+maintain.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Wed, 17 Mar 2021 19:36:39 -0700
+
+================================================================================
+Version: 3.3.02
+Patch: 00
+Date: 2021-03-15
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Huge upgrade!! Bug Fixes!! Refactors!!! BSDs!!! More BSDs!!! raspberry pi!! New
+Features!!! Enhanced old features!!! Did I mention bluetooth?! USB? Audio? No?
+well, all hugely upgraded!
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Sadly, 3.3.01 went out with a bug, forgot to remove a debugger, resulted in
+hardcoded kernel compiler version always showing.
+
+Note that there is a new inxi-perl/docs/inxi-bugs.txt file to track such bugs,
+and matched to specific tagged releases so you know the line number and items to
+update to fix it.
+
+2. Typo in manjaro system base match resulted in failing to report system base
+as expected.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. OpenBSD made fvwm -version output an error along with the version, and not in
+the normal format for standard fvwm, this is just too complicated to work around
+for now, though it could be in theory by creating a dedicated fvwm-oBSD item in
+program_values. But that kind of granularity gets too hard to track, and they
+are likely to change or fix this in the future anyway. Best is they just restore
+default -version output to what it is elsewhere, not nested in error outputs.
+
+2. Discovered an oddity, don't know how widespread this is, but Intel SSDs take
+about 200 milliseconds to get the sys hwmon based drive temps, when it should
+take under a millisecond, this may be a similar cause as those drives having a
+noticeable SMART report delay, not sure. This is quite noticeable since 200 ms
+is about 15% of the total execution time on my test system.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. For --recommends, added different rpm SUSE xdpyinfo package name.
+
+2. Distro Data: added double term filter for lsb-release due to sometimes
+generating repeated names in distro.
+
+3. Packages: fix for appimage package counts.
+
+4. Desktop: fixed ID for some wm when no xprop installed, fallback to using
+@ps_cmd detections, which usually work fine.
+
+5a. When swap used was 0, showed N/A, fixed to correctly show 0 KiB.
+
+5b. If no swap devices found, BSDs were not correctly showing no swap data found
+message. Corrected.
+
+6a. Bluetooth: Removed hcidump from debugger, in some cases, that will just hang
+endlessly. Also wrapped bluetoothctl and bt-adapter debugger data collection
+with @ps_cmd bluetooth running test. Only run if bluetooth service is running.
+
+6b. Bluetooth: running detections have to be very strict, only bluetoothd, not
+bluetooth, the latter can show true when bluetoothd is not running, and did in
+my tests.
+
+7. USB: with Code Change 1, found a few places where fallback usb type
+detections were creating false matches, which resulted in say, bluetooth devices
+showing up as network devices due to the presence of the word 'wireless' in the
+device description. These matches are all updated and revised to be more
+accurate and less error prone.
+
+8. Battery: an oversight, had forgotten to have percent used of available
+capacity, which made Battery data hard to decipher, now it shows the percent of
+available total, as well as the condition percent, so it's easier to understand
+the data now, and hopefully more clear.
+
+9a. OpenBSD changed usbdevs output format sometime in the latest releases, which
+made the delicate matching patterns fail. Updated to handle both variants. They
+also changed pcidump -v formatting at some point, now inxi will try to handle
+either. Note that usbdevs updates also work fine on NetBSD.
+
+9b. FreeBSD also changed their pciconf output in beta 13.0, which also broke the
+detections completely, now checks for old and new formats. Sigh. It should not
+take this much work to parse tools whose output should be consistent and
+reliable. Luckily I ran the beta prior to this release, or all pci device
+detections would simply have failed, without fallback.
+
+9c. Dragonfly BSD also changed an output format, in vmstat, that made the RAM
+used report fail. Since it's clearly not predictable which BSD will change
+support for which vmstat options, now just running vmstat without options, and
+then using processing logic to determine what to do with the results.
+
+10. It turns out NetBSD is using /proc/meminfo, who would have thought? for
+memory data, but they use it in a weird way that could result in either negative
+or near 0 ram used. Added in some filters to not allow such values to print, now
+it tries to make an educated guess about how much ram the system is really using
+based on some tests.
+
+11. Something you'd only notice if testing a lot, uptime failed when the uptime
+was < 1 minute, it had failed to handle the seconds only option, now it does,
+seconds, minutes, hours:minutes, days hours:minutes, all work.
+
+12. Missed linsysfs type to exclude in partitons, that was a partner to
+linprocfs type, both are BSD types.
+
+13. Added -ww to ps arguments, that stops the cutting width to terminal size
+default behavior in BSDs, an easy fix, wish I'd known about that a long time
+ago.
+
+15. gpart seems to show sizes in bytes, not the expected KiB, so that's now
+handled internally. Hopefully that odd behavior won't randomly change in the
+future, sigh.
+
+16. Fixed slim dm detection, saw instance where it's got slim.pid like normal
+dms, not the slim.lock which inxi was looking for, so now inxi looks for both,
+and we're all happy!
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added in something that should have been there all along, now inxi validates
+the man page download as well as the self, this avoids corrupted downloads
+breaking the man.
+
+2. Init: added support for shepherd init system.
+
+3. Distro Data: added support for guix distro ID; added support for NomadBSD,
+GhostBSD, HardenedBSD system base. GhostBSD also shows the main package version
+for the distro version ID, which isn't quite the same as the version you
+download, but it's close. Also added os-release support for BSDs, using similar
+tests as for linux distros, that results in nicer outputs for example for
+Dragonfly BSD.
+
+4. Package Data: added guix/scratch [venom]/kiss/nix package managers. Update
+for slackware 15 package manager data directory relocation, now handles either
+legacy current or future one.
+
+5. Repos: added scratch/kiss/nix-channels; Added GhostBSD, HardenedBSD pkg
+repos.
+
+6. USB Data: added usbconfig. That's FreeBSD's, and related systems.
+
+7. Device Data: Added pcictl support, that's NetBSD's, I thought inxi had
+supported that, but then I remembered last time I tried to run netBSD in a vm, I
+couldn't get it figured out. Now debugged and working reasonably well.
+
+8. Raspberry Pi 3, 4: ethernet nic now detected; wifi device, which is on a
+special mmcnr type, now works, that stopped working in pi 3, due to the change,
+now it's handled cleanly. Also added support for pi bluetooth, which lives on a
+special serial bus, not usb. For Raspberry Pi OS, added system base detections,
+which are tricky. Also matched mmcnr devices to IF data, which was trickyy as
+well. Note that as far as I could discover, only pi puts wifi on mmcnr.
+
+9. Bluetooth: due to deprecated nature of the fine hciconfig utility, added in
+support for bt-adapter, which also allows matching of bluetooth data to device
+data, but is very sparse in info supplied compared to hciconfig. bluetoothctl
+does not have enough data to show the hci device, so it's not used, since inxi
+can't match the bluetooth data to the device (no hci[x]). This should help the
+distros that are moving away from hciconfig, in particular, AUR is only way arch
+users can get hciconfig, which isn't ideal.
+
+10. New tool and feature, ServiceData, this does two things, as cross platform
+as practical, show status of bluetooth service, this should help a lot in
+support people debugging bluetooth problems, since you have bluetooth enabled
+but down, or up, disabled, and you can also have the device itself down or up,
+so now it shows all that data together for when it's down, but when the device
+is up, it just shows the device status since the other stuff is redundant then.
+
+In -Sa, it now shows the OS service manager that inxi detected using a bunch of
+fallback tests, that's useful to admins who are on a machine they don't know,
+then you can see the service manager to use, like rc-service, systemctl,
+service, sv, etc.
+
+11. Big update for -A: Sound Servers: had always been really just only ALSA, now
+it shows all detected sound servers, and whether they are running or not.
+Includes: ALSA, OSS, PipeWire, PulseAudio, sndio, JACK. Note that OSS version is
+a guess, might be wrong source for the version info.
+
+12. Added USB device 'power:' item, that's in mA, not a terrible thing to have
+listed, -xxx. This new feature was launched cross platform, which is nice.
+Whether the BSD detections will break in the future of course depends on whether
+they change the output formats again or not. Also added in USB more chip IDs,
+which can be useful. For BSDs, also added in a synthetic USB rev, taken from the
+device/hub speeds. Yes, I know, USB 2 can have low speed, full speed, or high
+speed, and 1.1 can have low and full speeds, so you actually can't tell the USB
+revision version from the speeds, but it's close enough.
+
+13. Made all USB/Device data the same syntax and order, more predictable, bus,
+chip, class IDs all the same now.
+
+14. Added in support for hammer and null/nullfs file system types, which trigger
+'logical:' type device in partitions, that's also more correct than the source:
+Err-102 that used to show, which was really just a flag to alert me visibly that
+the partition type detection had simply failed internally. Now for detected
+types, like zfs tank/name or null/nullfs, it knows they are logical structures.
+
+15. Expanded BSD CPU data, where available, now can show L1/L2/ L3 cache, cpu
+arch, stepping, family/model ids, etc, which is kind of nifty, although, again,
+delicate fragile rules that will probably break in the future, but easier to fix
+now.
+
+16. By an old request, added full native BSD doas support. That's a nice little
+tool, and it plugged in fairly seamlessly to existing sudo support. Both the
+internal doas/sudo stuff should work the same, and the detection of sudo/doas
+start should work the same too.
+
+17a. Shell/Parent Data: Big refactor of the shell start/parent logic, into
+ShellData which helped resolve some issues with running-in showing shell name,
+not vt terminal or program name. Cause of that is lots of levels of parents
+before inxi could reach the actual program that was running inxi. Solution was
+to change to a longer loop, and let it iterate 8 times, until it finds something
+that is not a shell or sudo/doas/su type parent, this seems to work quite well,
+you can only make it fail now if you actually try to do it on purpose, which is
+fine.
+
+This was very old logic, and carried some mistakes and redundancies that made it
+very hard to understand, that's cleaned up now. Also restored the old (login)
+value, which shows when you use your normal login account on console, some
+system will also now show (sudo,login) if the login user sudos inxi, but that
+varies system to system.
+
+17b. BSD running-in: Some of the BSDs now support the -f flag for ps, which made
+the parent logic for running-in possible for BSDs, which was nice. Some still
+don't support it, like OpenBSD and NetBSD, but that's fine, inxi tests, and if
+no support detected, just shows tty number. Adding in more robust support here
+cleaned up some redundant logic internally as well.
+
+17c. Updated terminal and shell ID detections, there's quite a few new terminals
+this year, and a new shell or two. Those are needed for more reliable detections
+of when the parent is NOT a shell, which is how we find what it is.
+
+18. Added ctwm wm support, that's the new default for NetBSD, based on twm, has
+version numbers.
+
+19. Upgraded BSD support for gpart and glabel data, now should catch more more
+often.
+
+20. For things like zfs raid, added component size, that doesn't always work due
+to how zfs refers to its components, but it often does, which is better than
+never before.
+
+21. To make BSD support smoother, got rid of some OpenBSD only rules, which in
+fact often apply to NetBSD as well. That may lead to some glitches, but overall
+it's better to totally stay away from OpenBSD only tests, and all BSD variant
+tests, and just do dynamic testing that will work when it applies, and not when
+it doesn't. In this case, added ftp downloader support for netBSD by removing
+the openBSD only flag for that item.
+
+There's a bit of a risk there in a sense since if different ftp programs with
+different options were to be the fallback for something else, it might get used,
+but that's fine, it's a corner case, better to have them all work now than to
+worry about weird future things. But limiting it to only BSDs should get rid of
+most of the problem.
+
+vmstat and optical drive still use net/openBSD specifics because it is too
+tricky to figure out it out in any more dynamic way.
+
+22. For -Sxxx, added if systemd, display, virtual terminal number. Could be
+useful to debug subtle issues, if the user is for example not running their
+desktop in vt 7, the default for most systems.
+
+23. And, last but not least, yes, you guessed it!!! You've been paying
+attention!!! More disk vendors, more vendor IDs!!! As always, thanks linux-lite
+hardware database!!
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Moved battery voltage to -Bx output, the voltage is quite important to know
+since that is the key indicator of battery state. If voltage is within .5 volts
+of specified minimum, shows voltage for -B since that's a prefail condition,
+it's getting close to death.
+
+2. In partitions and raid, when the device was linear raid logical type layout,
+it said, no-raid, when it should be 'linear', that's now cleaner and more
+correct.
+
+3. When running-in is a tty value, it will now show the entire tty ID, minus the
+'/dev/tty', this will be more precise, and also may resolve cases where tty was
+fully alpha, no numbers, previously inxi filtered out everything that was not a
+number, but that can in some tty types remove critical tty data, so now it will
+show:
+
+running-in:
+tty 2 [not changed]; tty pts/2 [adds pts/]; tty E2 [adds the E];
+tty rx [would have not shown at ll before]
+
+--------------------------------------------------------------------------------
+CODE:
+
+NOTE: unlike the previous refactors, a lot of these changes were done to make
+inxi more maintainable, which means, slightly less optimized, which has been my
+preference in the past, but if the stuff can't be maintained, it doesn't matter
+how fast it runs!
+
+These changes have really enhanced the quality of the code and made it a lot
+easier to work with. It's also now a lot easier to add debuggers, force/fake
+data switches, etc, so it gets done, unlike before, when it was a pain, so it
+got skipped, and then caused bugs because of stray debuggers left in place, and
+so on.
+
+The bright side is while reading up on this, I learned that using very large
+subs is much more efficient than many small ones, which I've always felt was the
+case, and it is, so the style used internally in inxi proves to be the best one
+for optimizations.
+
+These refactors, ongoing, have now touched at least 1/3, almost 1/2, of the
+entire inxi codebase, so the stuff is getting more and more consistent and up to
+date, but given how old the logic is in places, there will be more refactors in
+the future, and maybe once the code is easier to maintain, some renewed
+optimizations!, if we can find anything that makes sense, like passing
+array/hash references back to the caller, already the first half is done,
+passing references to the sub/method always.
+
+The second part is started, using the Benchmark Perl module, which really speeds
+up testing and helps avoid pointless tweaks that do little re speed
+improvements.
+
+I could see with some care some areas where working on data directly via
+references could really speed things up, but it's hard to write and read that
+type of code, but it's already being done in the recursive data and output
+logics, and a few other places.
+
+1. Large refactor of USBData, that was done in part to help make it work for
+BSDs better, but also to get it better organized.
+
+This refactor also made all the device items, like -A,-G,-N,-E use the same
+methods for creating USB output, previously they had used a hodgepodge of
+methods, some super old, it was not possible to add USB support more extensively
+for BSDs without this change.
+
+Also added in some fallback usb type detection tools using several large online
+collections of that info to see what possible matching patterns could catch more
+devices and correctly match them to their type, which is the primary way now
+that usb output per type is created. This really helps with BSDs, though BSD usb
+utilities suffer from less data than lsusb so they don't always get device name
+strings in a form where they can be readily ID'ed, but it's way better than it
+was before, so that's fine!
+
+Moved all previous methods of detecting if a card/device was USB into USBData
+itself so it would all be in one place, and easier to maintain.
+
+All USB tools now use bus_id_alpha for sorting, and all now sort as well, that
+was an oversight, previously the BSD usb tools were not sorted, but those have
+been enhanced a lot, so sorting on alpha synthetic bus ids became possible.
+
+Removed lsusb as a BSD option, it's really unreliable, and the data is
+different, and also varies a lot, it didn't really work at all in Dragonfly, or
+had strange output, so lsusb is now a linux only item.
+
+2. Moved various booleans that were global to %force, %loaded, and some to the
+already present, but lightly used, %use hashes. It was getting too hard to add
+tests etc, which was causing bugs to happen. Yes, using hashes is slower than
+hardcoding in the boolean scalars, but this change was done to improve
+maintainability, which is starting to matter more.
+
+3. Moved several sets of subs to new packages, again, to help with debugging and
+maintainability. MemoryData, redone in part to handle the oddities with NetBSD
+reporting of free, cached, and buffers, but really just to make it easier to
+work with overall. Also moved kernel parameter logic to KernelParameters, gpart
+logic to GpartData, glabel logic to GlabelData, ip data IpData, check_tools to
+CheckTools, which was also enhanced largely, and simplified, making it much
+easier to work with.
+
+4. Wrapped more debugger logic in $fake{data} logic, that makes it harder to
+leave a debugger uncommented, now to run it, you have to trigger it with
+$fake{item} so the test runs, that way even if I forget to comment it out, it
+won't run for regular user.
+
+5. Big update to docs in branch inxi-perl/docs, those are now much more usable
+for development. Updated in particular inxi-values.txt to be primary reference
+doc for $fake, $dbg, %force, %use, etc types and values. Also updated
+inxi-optimization.txt and inxi-resources.txt to bring them closer to the
+present.
+
+Created inxi-bugs.txt as well, which will help to know which known bugs belonged
+to which frozen pools. These bugs will only refer to bugs known to exist in
+tagged releases in frozen pool distros.
+
+6. For sizes, moved most of the sizing to use main::translate_size, this is more
+predictable, though as noted, these types of changes make inxi a bit slower
+since it moved stuff out of inline to using quick expensive sub calls, but it's
+a lot easier to maintain, and that's getting to be more important to me now.
+
+7. In order to catch live events, added in dmesg to dmesg.boot data in BSDs,
+that's the only way I could find to readily detect usb flash drives that were
+plugged in after boot. Another hack, these will all come back to bite me, but
+that's fine, the base is easier to work on and debug now, so if I want to spend
+time revisiting the next major version BSD releases, it will be easier to
+resolve the next sets of failures.
+
+8. A big change, I learned about the non greedy operator for regex patterns, ?,
+as in, .*?(next match rule), it will now go up only to the next match rule. Not
+knowing this simple little thing made inxi use some really convoluted regex to
+avoid such greedy patterns. Still some gotchas with ?, like it ignores following
+rules that are zero or 1, ? type, and just treats it as zero instances. But
+that's easy to work with.
+
+9. Not totally done, but now moved more to having set data tools set their
+$loaded{item} value in get data, not externally, that makes it easier to track
+the stuff. Only where it makes sense, but there's a lot of those set/get items,
+they should probably all become package/classes, with set/get I think.
+
+10. Optimized reader() and grabber() and set_ps_aux_data(), all switched from
+using grep/map to using for loops, that means inxi doesn't have to go through
+each array 2x anymore, actually 4x in the case of set_ps_aux_data(). This saved
+a visible amount of execution time, I noticed this lag when running pinxi
+through NYTProf optimizer, there was a quite visible time difference between
+grabber/reader and the subshell time, these optimizations almost removed that
+difference, meaning only the subshell now really takes any time to run.
+
+Optimized url_cleaner and data_cleaner in RepoData, those now just work directy
+on the array references, no returns.
+
+Ran some more optimization tests, but will probably hold off on some of them,
+for example, using cleaner() by reference is about 50% faster than by copy, but
+redoing that requires adding in many copies from read only things like $1, so
+the change would lead to slightly less clean code, but may revisit this in the
+future, we'll see.
+
+But in theory, basically all the core internal tools that take a value and
+modify it should do that by reference purely since it's way faster, up to 10x.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 15 Mar 2021 18:42:04 -0700
+
+================================================================================
+Version: 3.3.01
+Patch: 00
+Date: 2021-02-08
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug fixes!! Fixes!!! Refactors!!! Edits!!!
+
+BUGS:
+1. Big bug, 3.2 appears to have introduced this bug, for disks, rotation and
+partition scheme would never show, oops.
+
+2. Tiny bug kept one specific smart value from ever showing, typo.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Accidentally followed Arch linux derived distro page, which claims KaOS as
+arch derived, when of course it's not, it's its own distro, own toolchain, etc.
+I kind of knew this but had forgotten, then I believed the Arch derived distro
+page, oh well. Resulted in KaOS being listed with arch linux as system base with
+-Sx. Arch should fix this, it's not like it's hard, just remove the distro from
+the page.
+
+2. Cleared up explanations for drivetemp vs hddtemp use, updated --recommends,
+man, and help to hopefully make this clear. Debian will be dropping hddtemp,
+which is not maintained, sometime in the coming years, sooner than later. Note
+that users unfortunately have to manually enable drivetemp module unless their
+distros enable it by default, but the man/recommands/help explain that.
+
+3. Fixed smart indentation issues, that went along with code change 1, was
+failing to indent one further level for failed/age values like it's supposed to.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added /proc/device to debugger, that will help track block device main
+numbers
+
+2. More disk vendors, more disk vendor IDs!!! As noted, the enternal flow flows
+eternally, thanks linux-lite hardware database users!! and other inxi users,
+whose outputs sometimes reveal a failure or two.
+
+3. Added loaded kernel module tests to --recommends, this was mostly to let
+users know that drivetemp is needed if you want non superuser fast drive temps,
+and that this came along with kernels 5.6 or newer. Hopefully word will start
+drifting out. Note that if inxi is using drivetemp values, drive temps will
+appear as regular user with -Dx, and will be to 1 decimal place. hddtemp temps
+are integers, and requires sudo to display the temps.
+
+4. To handle issue #239 which I'd thought of trying off and on, but never did,
+added option to -Dxxx to show SSD if a positive SSD ID was made to rotation: So
+rotation will show either nothing, if no rotation or ssd data is detected, the
+disk speed in rpm, or SSD if an SSD device. There may be corner cases where this
+is wrong, but I don't have data for that, for example, if a disk is parked and
+has zero rotation but is a HDD, not as SSD. I don't know what the data looksl
+ike in that case. Note that if sudo inxi -Da is used, and smartctl is installed,
+it should be right almost all the time, and with regular -Dxxx, it's going to be
+right almost always, with a few corner cases. That slight uncertainty is why I
+never implemented this before. Legacy drives also sometimes did not report
+rotation speeds even when HDD, so those may create issues, but inxi will only
+call it an SSD if it's an nvme, mmcblk device, both are easy to ID as SSD, or if
+it meets certain conditions. It will not call a drive an SSD if it was unable to
+meet those conditions.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Refactored the output logic for DiskData, that was messy, split it into a few
+subs, and also refactored the way smartctl data was loaded and used, that's much
+cleaner and easier to use now. Split the previous 1 big sub into:
+
+totals_output(), drives_output(), and smart_output().
+
+Also split out the smart field arrays into a separate sub, which loads
+references to avoid creating new arrays and copying them all over when
+outputting smart data. References are weird to work with directly but they are
+MUCH faster to use, so I'm moving as much of the internal logic to use array
+raferences instead of dereferenced arrays/hashes assigned to a new array, or
+hash.
+
+2. Redid all the output modules and renamed them to be more consistent and
+predictable, and redid the logic here and there to make the get() items be
+fairly similar on all the data builder packages. Now as with the data subs,
+which generally end in _data, now most of the output subs end with _output.
+
+3. Roughly finished the process started in 3.2, got rid of redundant array
+loads, changed:
+
+@something = something_data();
+push (@rows,@something);
+to:
+push (@rows,something_data());
+
+which avoids creating an extra array, this also let me remove many arrays
+overall.
+
+4. Missed a few hashes in machine data that were being passed directly, not as
+references, to other subs, corrected that. I think I missed those because they
+were %, so the search I did for @ in sub arg lists didn't catch the % hashes.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 08 Feb 2021 16:16:27 -0800
+
+================================================================================
+Version: 3.3.00
+Patch: 00
+Date: 2021-01-28
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug fixes!! New Feature!! Edits, cleanups!!
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Small bug, wrong regex would make mdraid unused report never show. Was
+looking for ^used, not ^unused. No idea how that happened, but it's fixed.
+
+2. Big RAID bug. Due to never having seen an 'inactive' state mdraid dataset,
+inxi had a bunch of bugs around that. I'd assumed active and inactive would have
+roughly the same syntax, but they don't. This is now corrected. Thanks Solus
+user for giving me the required data. This case when not corrected resulted in a
+spray of errors as RAID ran, and a fairly incomplete RAID report for mdraid.
+
+3. A bug that probably never impacted anyone, but in SMART the matching rules
+failed to match field name Size[s]? in the logical/physical block sizes.
+However, those were already coming in from I believe pre-existing /sys data for
+the drives but now it's fixed anyway. I had not realized that smartctl made it
+plural when logical/physical were different, and singular when they were the
+same.
+
+4. Failed to use all possible sd block device major number matches, which led to
+false disk total/used reports, that is, totals less than used.
+
+5. Bug probably introduced in 3.2, zfs single array device did not show raid
+level.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Going along with bug 2, fixed some other admin/non admin report glitches.
+Made patterns more aggressively matching, whitelist based to avoid the types of
+syntax issues that caused bug 2.
+
+2. Added 'faulty' type to mdraid matches, that had not been handled.
+
+3. Found even more of those pesky 'card' references in help and man page,
+replaced all of them with 'device[s]'.
+
+4. Subtle fix, for debugger data collectors, added -y1 support, which can be
+useful at times.
+
+5. Optimized PATH searches, now inxi only adds things to PATH if they exist in
+the system, not blindly.
+
+6. Added to path test /usr/X11R6/bin to defaults, that is needed, if present, by
+OpenBSD and maybe other BSDs for tools like glxinfo.
+
+7. Corrected missing PCI device data requires root message, that should have
+shown PCI device, not Device, since sometimes there is USB device data also
+next even if no permissions to read PCI device data tool, like in OpenBSD.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. In USB data grabber, added fallback case for unspecified type cases, now uses
+a simple name/driver string test to determine if it's graphics, audio, or
+bluetooth. This was mainly to make sure bluetooth usb devices get caught.
+
+2. New feature! -E/--bluetooth. Gives an -n like bluetooth Device-x/Report.
+Requires for the 'Report:' part hciconfig, which most all distros still have in
+their repos. With -a, shows an additional Info: line that has more obscure
+bluetooth hci data: acl-mtu sco-mtu, link-policy, link-mode, service-classes.
+
+This closes the ancient, venerable issue #79, filed by mikaela so many years
+ago. Better late than never!! However, features like this were really difficult
+in legacy bash/gawk inxi 2.x, and became fairly easy with inxi 3.x, so I guess
+we'll slowly whittle away at these things when the mood, and global pandemic
+lockdowns, make that seem like a good idea...
+
+Includes a small lookup table to match LMP number to Bluetooth version (bt-v:),
+hopefully that's a correct way to determine bluetooth version, there was some
+ambiguity about that.
+
+-x, -xx, and -xxx function pretty much the same way as with -A, -G, and -N
+devices, adding Chip IDs, Bus IDs, version info, and so on. Since this bluetooth
+report does not require root and is an upper case option, it's been added to
+default -F, similar to -R, and -v 5, where raid/bluetooth shows only if data is
+found. With -v7 or -R or -E, always shows, including no data found message.
+
+Includes a fallback report Report-ID: case where for some reason, inxi could not
+match the HCI ID with the device. That's similar to IF-ID in -n, which does the
+same when some of the IFs could not be matched to a specific device.
+
+3. For -A, -G, -N, and -E, new item for -xxx, class-ID, I realized this is
+actually useful for many cases of trying to figure out what devices are, though
+most users would not know what to do with that information, but that's why it's
+an -xxx option!
+
+4. Yes! You've been paying attention!! More disk vendors, and new vendor IDs!!
+The cornucopia flows its endless bounty over the grateful data collector, and,
+hopefully, inxi users!! Thanks as always, linux-lite hardware database, and
+linux-lite users who really seem set on the impossible project of obtaining all
+the disks/vendors known to man.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Small change in wording for mdraid report:
+'System supported mdraid' becomes 'Supported mdraid levels' which is cleaner and
+much more precise.
+
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Thu, 28 Jan 2021 19:34:17 -0800
+
+================================================================================
+Version: 3.2.02
+Patch: 00
+Date: 2021-01-10
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, man page, bug fixes, changes, adjustments and cleanups!!!
+
+Special thanks to mr. mazda for his ongoing suggestions, ideas, and
+observations.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. In certain corner cases, it appears that lsusb has blank lines, which tripped
+errors in inxi output when the usb parser was trying to access split keys that
+did not exist. Added in check to make sure split actually resulted in expected
+data.
+
+2. A red face bug, I'd left the output debugger switched on with json output, so
+it was printing out the json data structure with Dumper, that's now switched
+off. Hope this doesn't mess anyone up, but it would have mattered only if the
+person was using:
+--output json --output-type print
+It did not effect xml output.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Got rid of extra level of -L data structure and output handler. Not visible
+to users, but still irksome, so nice to get that fixed. Recursive structures are
+confusing, lol, but this extra level was pointless, but to fix it required
+redoing the logic a bit for both data generator and output feature.
+
+2. Added in support for --display :0.0, previously it did not support the .0
+addition, but why not, if it works for people, good, if not, makes no
+difference.
+
+3. There were some missing cases for LVM missing data messages, so the
+following fixes were added:
+ * In cases where lsblk is installed and user is non root, or lvs is not
+ installed, but no lvm data is present, inxi now shows the expected 'Message:
+ No LVM data found.' instead of the permissions or missing program error that
+ showed before. If lsblk is not installed, and lvm is installed (or missing),
+ with lvs not root readable, the permissiosn message (or missing program) will
+ show since at that point, inxi has no way to know if there is lvm data or not.
+
+ * Not an inxi, but rather an Arch Linux packaging bug, the maintainer of lvm
+ has made lvs and vgs fail to return error number on non root start, which is
+ a bug (pvs does return expected error return). Rather than wait for this bug
+ to be fixed, inxi will just test if lvs and lsblk lvm data, it will show
+ permissions message, otherwse the no lvm data message as expected.
+
+I think these cover the last unhandled LVM cases I came across, so ideally, the
+lvm data messages will be reasonably correct.
+
+4. Some man page lintian fixes.
+
+5. Changed usb data parser to use 'unless' instead of 'if' in tests since it's
+easier to read unless positive tests are true than if negative or negative etc.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Since I see too often things like -F --no-host -z which is redundant, the
+help and man now make it more clear that -z implies --no-host.
+
+2. Even though it's not that pointful, I added in derived Arch Linux system base
+like Ubuntu/Debian have. It's not that meaningful because unlike Ubuntu/Debian,
+where you want to know what version the derived distro is based on, Arch is
+rolling thus no versions, but I figured, why not, it's easy to do, so might as
+well make the system base feature a bit more complete.
+
+Note that the way I did this requires that the distro is ID'ed as its derived
+distro nanme, not Arch Linux, that will vary depending on how they did their
+os-release etc, or distro files, but that's not really an inxi issue, that's up
+to them. From what I've been seeing, it looks like more of the derived distros
+are being ID'ed in inxi as the derived name, so those should all work fine. Note
+that seeing 'base:' requires -Sx.
+
+3. More disk vendors!! More disk vendor IDs!!! I really dug into the stuff, and
+refactored slightly the backend tools I use, so it's now a bit easier to handle
+the data. Thanks linux-lite hardware database, as always, for having users that
+really seemt to use every disk variant known to humanity.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. In -G, made FAILED: lower case, and also moved it to be after unloaded: It
+was too easy to think that the loaded driver had failed. Also to make it more
+explicit, made output like this, in other words, driver: is a container for the
+possible children: loaded: unloaded: failed: alternate: which should be easier
+to parse and read without mixing up what belongs to what.
+
+driver: loaded: modesetting unloaded: nouvean,vesa alternate: nv
+driver: loaded: amdgpu unloaded: vesa failed: ati
+
+Note that if there is no unloaded: driver, failed: would still appear to come
+after loaded:, but hopefully it's more clear now.
+
+Basically what we found was that the presence of the uppercase FAILED: drew the
+eye so much that it was sometimes not noted that it was a key: following the
+driver: item, which itself because it did not list explicitly loaded: was not as
+clear as it could have been. By making failed: the same as the other key names
+visually, hopefully it will be less easy to think that the loaded: driver
+failed:
+
+In a sense, this is a legacy issue, because the original use of FAILED: was for
+non free video drivers, to see when xorg had failed to load them, but over more
+recent years, the most frequent thing I have been seeing is odd things like
+failed: ati, when xorg tries to load the legacy ati driver when amdgpu is being
+used.
+
+2. Likewise, for RAID mdraid and zfs changed FAILED: to Failed:, again, to make
+it more consistent with the other types.
+
+3. In help menu and man page, removed legacy 'card(s)' in -A, -G, -N, and
+replaced that with 'device(s)', which is the more accurate term, since the days
+when these things were only addon cards are long behind us. I had not noticed
+that, but it caught me eye and I realized it was a very deprecated and obsolete
+syntax, which did not match the way inxi describes devices today.
+
+4. It was pointed out how incoherent the naming of the item for setting wrap
+width, --indent-min and config item INDENT_MIN were super confusing, since it
+was neither indent or minimum, it was in fact wrap maximum, so the new options
+and config items are --wrap-max and WRAP_MAX. Note that the legacy values will
+keep working, but it was almost impossible in words to explain this option
+because the option text was almost the exact opposite of what the option
+actually does. Redid the man and help explanations to make the function of this
+option/config item more clear.
+
+5. Made -J/--usb Hub-xx: to fit with other repeating device types in inxi
+output, before Hub: was not numbered, but it struck me, it should be, like all
+the other auto-incremented counter line starters, like ID-xx:, Device-x:, and so
+on.
+
+6. Reorganized the main help menu to hopefully be more logical, now it shows the
+primary output triggers, then after, the extra data items, -a, -x, -xx, -xxx,
+separated by white space per type to make it easier to read. This also moved the
+stuff that had been under the -x items back to where they should be, together
+with the main output control options. For readability and usability, I think
+this will help, the help menu is really long, so the more visual cues it has to
+make it clear what each section is, the better I think. Previously -a was the
+first items, then way further down was -x, -xx, and -xxx, then under those was
+-z, -Z, -y.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Sun, 10 Jan 2021 18:25:48 -0800
+
+================================================================================
+Version: 3.2.01
+Patch: 00
+Date: 2020-12-17
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug Fixes!!! Continuing internal refactor!!
+
+This bug report came in right after 3.2.00 went out live, but I would never have
+found it myself in testing so better found than not found!
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. A bug was introduced to dmidecode data handlers in 3.2.00 resulted in the
+dmidecode data array basically eating itself up until errors appear. Quite
+difficult to trigger, but babydr from Slackware forums figured it out, using -F
+--dmidecode to force dmidecode use for all features that support it triggered
+thee bug always. This was a result of the refactor, previously inxi had worked
+on copies of referenced arrays, but in this case, it was working on the original
+array of arrays, subtle, but obvious. This method was only used on dmidecode
+arrays.
+
+2. A second bug was exposed almost by accident, for -M --dmidecode data, there
+was a missing field and also a missing is set test on that field that led to an
+error of using undefined value in string comparison. This was strictly speaking
+2 bugs, both very old, from 2.9 first rewrite, one failing to set/get the value,
+and the other failing to test if the value was set before using it.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. There were a few glitches in help menu and man page related to -L option,
+those are corrected.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. removed bug inducing splice use in some cases, and added parens to splice to
+make it fit the new way of with perl builtins, when taking 2 or more arguments,
+use parens.
+
+2. Found many more instances to add -> dereferencing operator. I have to say,
+not doing that consistently made the code much harder to read, and created
+situations where it's somewhat ambiguous what item belongs to what, with
+everything consistently -> operator run, the code is more clear and obvious, and
+some of the hacks I'd added because of the lack of clarity were also removed.
+
+3. Removed explicit setting of hash references with null value, that was done
+out of failure to use -> operators which clearly indicate to Perl and coder what
+is happening, so those crutches were removed. Also got rid of unnecessary array
+priming like: my @array = (); Some of these habits came from other languages,
+but in Perl, declaring my @array means it's an array that is null, and you don't
+need to do a further (). @array = () is obviously fine for resetting arrays in
+loops or whatever, but not in the initial declaration.
+
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Thu, 17 Dec 2020 14:27:13 -0800
+
+================================================================================
+Version: 3.2.00
+Patch: 00
+Date: 2020-12-15
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Huge upgrade, major rewrite/refactor, new features, everything is polished!!!
+
+Note that due to large number of internal changes to code, a separate INTERNAL
+CODE CHANGES section is at the bottom. Those are changes which in general do not
+impact what users see that much, but which definitely impact working on and with
+inxi! They also make errors less likely, and removed many possible bad data
+error situations.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Obscure, but very old Tyan Mobo used a form of dmidecode data for RAM that
+I'd never gotten a dataset for before, this tripped a series of errors in inxi,
+which were actually caused by small errors and failures to check certain things,
+as well as simply never assigning data in corner cases. This system used only
+dmi handles 5 and 6, which is a very rare setup, from the very early days of dmi
+data being settled, but it was valid data, and actually inxi was supposed to
+support it, because I'd never gotten a dataset containing such legacy hardware
+data, the support didn't work. There were actually several bugs discovered while
+tracking this down, all were corrected.
+
+2. Going along with the cpu fixes below, there was a bug that if stepping was 0,
+stepping would not show. I had not realized stepping could be 0, so did a
+true/false test instead of a defined test, which makes 0 in perl always test as
+false. This is corrected.
+
+3. While going through code, discovered that missing second argument to
+main::grabber would have made glabel tool (BSD I think mostly) always fail,
+without exception. That explains why BSD systems were never getting glabel data,
+heh.
+
+4. Many null get_size tests would not have worked because they were testing for
+null array but ('','') was actually being returned, which is not a null array.
+The testing and results for get_size were quite random, now they are all the
+same and consistent, and confirmed correct.
+
+5. In unmounted devices, the match sent to @lsblk to get extended device data
+would never work with dm-xx type names, failed to translate them to their mapped
+name, which is what is used in lsblk matches, this is corrected. This could lead
+to failures to match fs of members of luks, raid, etc, particularly noticeable
+with complex logical device structures. This means the fallback filters against
+internal logic volume names, various file system type matches, would always
+fail.
+
+6. A small host of further bugs found and fixed during the major refactor, but
+not all of them were noted, they were just fixed, sorry, those will be lost to
+history unless you compare with diffs the two versions, but that's thousands of
+lines, but there were more bugs fixed than listed above, just can't remember
+them all.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. There was some ambiguity about when inxi falls back to showing hardware
+graphics driver instead of xorg gfx driver when it can't find an xorg driver.
+That can happen for instance because of wayland, or because of obscure xorg
+drivers not yet supported. Now the message is very clear, it says the gfx
+software driver is n/a, and that it's showing the hardware gfx driver.
+
+2. Big redo of cpu microarch, finally handled cases where same stepping/model ID
+has two micorarches listed, now that is shown clearly to users, like AMD Zen
+family 17, model 18, which can be either Zen or Zen+, so now it shows that
+ambiguity, and a comment: note: check, like it shows for ram report when it's
+not sure. Shows for instance: arch: Zen/Zen+ note: check in such cases, in other
+words, it tells users that the naming convention basically changed during the
+same hardware/die cycle.
+
+3. There were some raid component errors in the unmounted tests which is
+supposed to test the raid components and remove them from the mounted list. Note
+that inxi now also tests better if something is a raid component, or an lvm
+component, or various other things, so unmounted will be right more often now,
+though it's still not perfect since there are still more unhandled logical
+storage components that will show as unmounted when tney are parts of logical
+volumes. Bit by bit!!
+
+4. Part of a significant android fine tuning and fix series, for -P, android
+uses different default names for partitions, so none showed, now a subset of
+standard android partitions, like /System, /firmware, etc, shows. Android will
+never work well though because google keeps locking down key file read/search
+permissions in /sys and /proc.
+
+5. More ARM device detections, that got tuned quite a bit and cleaned up, for
+instance, it was doing case sensitive checks, but found cases where the value is
+all upper case, so it was missing it. Now it does case insensitive device type
+searches.
+
+6. One of the oldest glitches in inxi was the failure to take the size of the
+raid arrays versus the size totals of the raid array components led to Local
+Storage results that were uselessly wrong, being based on what is now called
+'raw' disk totals, that's the raw physical total of all system disks. Now if
+raid is detected the old total: used:... is expanded to: total: raw:...
+usable:....used:, the usable being the actual disk space that can be used to
+store data. Also in the case of LVM systems, a further item is added, lvm-free:
+to report the unused but available volume group space, that is, space not
+currently taken by logical volumes. This can provide a useful overview of your
+system storage, and is much improved over the previous version, which was
+technically unable to solve that issue because the internal structures did not
+support it, now they do. LVM data requires sudo/ root unfortunately, so you will
+see different disk raw totals depending on if it's root or not if there is LVM
+RAID running.
+
+Sample: inxi -D
+Drives: Local Storage: total: raw: 340.19 GiB usable: 276.38 GiB
+ lvm-free: 84.61 GiB used: 8.49 GiB (3.1%)
+
+lvm-free is non assigned volume group size, that is, size not assigned to a
+logical volume in the volume group, but available in the volume group. raw: is
+the total of all detected block devices, usable is how much of that can be used
+in file systems, that is, raid is > 1 devices, but those devices are not
+available for storage, only the total of the raid volume is. Note that if you
+are not using LVM, you will never see lvm-free:.
+
+7. An anonymous user sent a dataset that contained a reasonable alternate
+syntax for sensors output, that made inxi fail to get the sensors data. That was
+prepending 'T' to temp items, and 'F' to fan items, which made enough sense
+though I'd never seen it before, so inxi now supports that alternate sensors
+temp/fan syntax, so that should expand the systems it supports by default out of
+the box.
+
+8. Finally was able to resolve a long standing issue of loading File::Find,
+which is only used in --debug 20-22 debugger, from top of inxi to require load
+in the debugger. I'd tried to fix this before, but failed, the problem is that
+redhat /fedora have broken apart Perl core modules, and made some of them into
+external modules, which made inxi fail to start due to missing use of required
+module that was not really required. Thanks to mrmazda for pointing this out to
+me, I'd tried to get this working before but failed, but this time I figured out
+how to recode some of the uses of File::Find so it would work when loaded
+without the package debugger, hard to figure it, turned out a specific sub
+routine call in that specific case required the parentheses that had been left
+off, very subtle.
+
+9. Subtle issue, unlike most of the other device data processors, the USB data
+parser did not use the remove duplicates tool, which led in some cases to
+duplicated company names in the output for USB, which looks silly.
+
+10. Somehow devtmpfs was not being detected in all cases to remove that from
+partitions report, that was added to the file systen filters to make sure it
+gets caught.
+
+11. Removed LVM image/meta/data data slices from unmounted report, those are LVM
+items, but they are internal LVM volumes, not available or usable. I believe
+there are other data/meta type variants for different LVM features but I have
+added as many types as I could find.. Also explictly now remove any _member type
+item, which is always part of some other logical structure, like RAID or LVM,
+those were not explicitly handled before.
+
+12. Corrected the various terms ZFS can use for spare drives, and due to how
+those describe slightly different situations than simply spare, changed the
+spare section header to Available, which is more accureate for ZFS.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Going along with FIX 2 is updating and adding to intel, elbrus microarch
+family/ model/stepping IDs (E8C2), so that is fairly up to date now.
+
+2. Added in a very crude and highly unreliable default fallback for intel:
+/sys/devices/cpu/caps/pmu_name which will show the basic internal name used
+which can be quite different from what the actual microarch name is, but the
+hope is that for new intel cpus that come out after these last inxi updates,
+something may show, instead of nothing. Note these names are often much more
+generic, like using skylake for many different microarches.
+
+3. More android enhancements, for androids that allow reading of
+/system/build.prop, which is a very useful informative system info file, more
+android data will show, like the device name and variant, and a few other
+specialized items. You can see if your android device lets inxi read build.prop
+if you see under -S Distro: Android 7.1 (2016-07-23) or just Android. If it
+shows just android, that means it can't read that file. Showing Android however
+is also new, since while inxi can't always read build.prop, if that file is
+there, it's android, so inxi finally can recognize it's in android, even though
+it can't give much info if it's locked down. Inxi in fact did not previously
+know it was running in android, which is quite different from ARM systems in
+some ways, but now it does.
+
+If the data is available, it will be used in Distro: and in Machine: data to add
+more information about the android version and device.
+
+4. A big one, for -p/-P/-o/-j now shows with -x the mapped device name, not just
+the /dev/dm-xx ID, which makes connecting the various new bits easier, for RAID,
+Logical reports. Note that /dev/mapper/ is removed from the mapped name since
+that's redundant and verbose and makes the output harder to read. For mapped
+devices, the new --logical / -L report lets you drill into the devices to find
+out what dm-xx is actually based on.
+
+5. More big ones, for -a -p/-P/-o/-j/-R/-L shows kernel device major:minor
+number, which again lets you trace each device around the system and report.
+
+6. Added mdadm if root for mdraid report, that let me add a few other details
+for mdraid not previously available. This added item 'state;' to the mdraid
+report with right -x options.
+
+7. Added vpu component type to ARM gfx device type detection, don't know how
+video processing vpu had escaped my notice.
+
+8. Added fio[a-z] block device, I'd never heard of that before, but saw use of
+it in dataset, so learned it's real, but was never handled as a valid block
+device type before, like sda, hda, vda, nvme, mmcblk, etc. fio works the same,
+it's fio + [a-z] + [0-9]+ partition number.
+
+9. Expanded to alternate syntax Elbrus cpu L1, L2, L3 reporting. Note that in
+their nomenclature, L0 and L1 are actually both L1, so add those together when
+detected.
+
+10. RAM, thanks to a Mint user, antikythera, learned, and handled something new,
+module 'speed:' vs module 'configured clock speed:'. To quote from supermicro:
+
+<<<
+Question: Under dmidecode, my 'Configured Clock Speed' is lower than my 'Speed'.
+What does each term mean and why are they not the same?
+
+Answer: Under dmidecode, Speed is the expected speed of the memory (what is
+advertised on the memory spec sheet) and Configured Clock Speed is what the
+actual speed is now. The cause could be many things but the main possibilities
+are mismatching memory and using a CPU that doesn't support your expected memory
+clock speed. Please use only one type of memory and make sure that your CPU
+supports your memory.
+>>>
+
+11. Since RAM was gettng a look, also changed cases where ddr ram speed is
+reported in MHz, now it will show the speeds as: [speed * 2] MT/S ([speed] MHz).
+This will let users make apples to apples speed comparisons between different
+systems. Since MT/S is largely standard now, there's no need to translate that
+to MHz.
+
+12. And, even more!! When RAM speeds are logically absurd, adds in note: check
+This is from a real user's data by the way, as you can see, it triggers all the
+new RAM per Device report features.
+
+Sample:
+Memory:
+ RAM: total: 31.38 GiB used: 20.65 GiB (65.8%)
+ Array-1: capacity: N/A slots: 4 note: check EC: N/A
+ Device-1: DIMM_A1 size: 8 GiB speed: 1600 MT/s (800 MHz)
+ Device-2: DIMM_A2 size: 8 GiB speed: spec: 1600 MT/s (800 MHz)
+ actual: 61910 MT/s (30955 MHz) note: check
+ Device-3: DIMM_B1 size: 8 GiB speed: 1600 MT/s (800 MHz)
+ Device-4: DIMM_B2 size: 8 GiB speed: spec: 1600 MT/s (800 MHz)
+ actual: 2 MT/s (1 MHz) note: check
+
+13. More disks vendor!!! More disk vendor IDs!!! Yes, that's right, eternity
+exists, here, now, and manifests every day!! Thanks to linux-lite hardware
+database for this eternally generating list. Never underestimate the creativity
+of mankind to make more disk drive companies, and to release new model IDs for
+existing companies. Yes, I feel that this is a metaphore for something much
+larger, but what that is, I'm not entirely clear about.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Recent kernel changes have added a lot more sensor data in /sys, although
+this varies system to system, but now, if your system supports it, you can get
+at least partial hdd temp reports without needing hddtemp or root. Early results
+suggest that nvme may have better support than spinning disks, but it really
+varies. inxi will now look for the /sys based temp first, then fall back to the
+much slower and root / sudo only hddtemp. You can force hddtemp always with
+--hddtemp option, which has a corresponding configuration item.
+
+2. The long requested and awaited yet arcane and obscure feature -L/--logical,
+which tries to give a reasonably good report on LVM, LUKS, VeraCrypt, as well as
+handling LVM raid, both regular and thin, is now working. This took a lot of
+testing, and is a very solid and good start in my view, going from nothing to
+something is always a big improvement!! LVM reports require root/sudo. This
+will, finally, close issue #135.
+
+3. Going along with -L, and serving as a model for the logic of -L, was the
+complete refactor of -R, RAID, which was a real mess internally, definitely one
+of the messiest and hardest to work with features of inxi before the refactor.
+It's now completely cleaned up and modularized, and is easy to add raid types,
+which was not possible before, now it cleanly supports zfs, mdraid, and lvm
+raid, with in depth reports and added items like mdraid size, raid component
+device sizes and maj:min numbers if the -a option is used. Note that LVM RAID
+requires root/sudo.
+
+4. Added some more sensors dimm, volts items, slight expansion. Note that the
+possible expansion of sensors made possible by the recently upgraded sensors
+output logic, as well as the new inxi internal sensors data structure, which is
+far more granular than the previous version, and allows for much more fine
+grained control and output, though only gpu data currently takes advantage of
+this new power under the covers, although as noted, the /sys based hdd temps use
+the same source, only straight from /sys, since it was actually easier using the
+data directly from sys than trying to map the drive locations to specific drives
+in sensors output. Well, to be accurate, since now only board type sensors are
+used for the temp/fan speed, voltage, etc, reports, the removal of entire sensor
+groups means less chance of wrong results.
+
+5. To bring the ancient RAID logic to fit the rest of inxi style, made zfs,
+mdraid, and lvm raid components use incrementing numbers, like cpu cores does.
+This got rid of the kind of ugly hacks used previously which were not the same
+for zfs or mdraid, but now they are all the same, except that the numbers for
+mdraid are the actual device numbers that mdraid supplies, and the LVM and ZFS
+numbers are just autoincremented, starting at 1.
+
+6. Changed message <root/superuser required> to <superuser required> because
+it's shorter and communicates the same thing.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Small, transparent test, tested on Perl 5.032 for Perl 7 compatibility. All
+tests passed, no legacy code issues in inxi as of now.
+
+2. Although most users won't notice, a big chunk of inxi was refactored
+internally, which is why the new -L, the revamped -R, and the fixed disk totals
+finally all can work now. This may hopefully result in more consistent output
+and fewer oddities and randomnesses, since more of the methods all use the same
+tools now under the covers. Ths refactor also significantly improved inxi's
+execution speed, by about 4-5%, but most of those gains are not visible due to
+the added new features, but the end result is new inxi runs roughly the same
+speed as pre 3.2.00 inxi, but does more, and does it better, internally at
+least. If you have a very good eye you may also note a few places where this
+manifests externally as well. Last I checked about 10-12% of the lines of inxi
+had been changed, but I think that number is higher now. Everything that could
+be optimized was, everything could be made more efficient was.
+
+3. Several core tools in inxi were expanded to work much more cleanly, like
+reader(), which now supports returning just the index value you want, that
+always happened on the caller end before, which led to extra code. get_size
+likewise was expanded to do a string return, which let me remove a lot of
+internal redundant code in creating the size unit output, like 32 MiB. uniq()
+was also redone to work exclusively by reference.
+
+4. Many bad reference and dereference practices that had slipped into inxi from
+the start are mostly corrected now, array assignments use push now, rather than
+assign to array, then add array to another array, and assign those to the master
+array. Several unnecessary and cpu/ram intensive copying steps, that is, were
+removed in many locations internally in inxi. Also now inxi uses more direct
+anonymous array and hash refernce assignments, which again removes redundant
+array/hash creation, copy, and assignment.
+
+5. Also added explicit -> dereferencing arrows to make the code more clear and
+readable, and to make it easier for perl to know what is happening. The lack of
+consistency actually created confusion, I was not aware of what certain code was
+doing, and didn't realize it was doing the same thing as other code because of
+using different methods and syntaxes for referencing array/hash components. I
+probably missed some, but I got many of them, most probably.
+
+6. Instituted a new perl builtin sub routine rule which is: if the sub takes 2
+or more arguments, always put in parentheses, it makes the code much easier to
+follow because you see the closing ), like: push(@rows,@row); Most perl builtins
+that take only one arg do not use parentheses, except length, which just looks
+weird when used in math tests, that is: length($var) > 13 looks better than
+length $var > 13. This resolved inconsistent uses that had grown over time, so
+now all the main builtins follow these rules consistently internally.
+
+Due to certain style elements, and the time required to carefully go through all
+these rules, grep and map do not yet consistently use these rules, that's
+because the tendency has been to use the grep {..test..} @array and map
+{...actions...} @array
+
+7. Mainly to deal with android failures to read standard system files due to
+google locking it down, moved most file queries to use -r, is readable, rather
+than -e, exists, or -f, is file, unless it only needs to know if it exists, of
+course. This fixed many null data errors in android even on locked androids.
+
+8. Added in %mapper and %dmmapper hashes to allow for easy mapping and unmapping
+of mapped block devices. Got rid of other ways of doing that, and made it
+consistent throughout inxi. These are globals that load once.
+
+9. Learned that perl builtin split() has a very strange and in my view
+originally terrible decision that involves treating as regex rules string
+characters in split string, like split('^^',$string), which should logically be
+a string value, not a ^ start search followed by a ^, but that's how it is, so
+that was carefully checked and made consistent as well. Also expanded split to
+take advantage of the number of splits to do, which I had only used occasionally
+before, but only updated field/value splits where I have a good idea of what the
+data is. This is very useful when the data is in the form of field: value, but
+value can contain : as well. You have to be very careful however, since some
+data we do want in fact the 2nd split, but not the subsequent ones, so I only
+updated the ones I was very sure about.
+
+10. Going along with the cpu microarch fixes, updated and cleaned up all the
+lists of model/stepping matches, now they are all in order and much easier to
+scan and find, that had gotten sloppy over the years.
+
+11. More ARM, moved dummy and codec device values into their own storage arrays,
+that let me remove the filters against those in the other detections. Makes
+logic easier to read and maintain as well.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 15 Dec 2020 15:08:05 -0800
+
+================================================================================
+Version: 3.1.09
+Patch: 00
+Date: 2020-11-11
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug fixes, new features!! Update now!! Or don't, it's up to you.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Let's call some of the android fixes and debugger failures bugs, why not?
+Those are fixed. Note that many of these fixes will impact any system that is
+ARM based, not just android.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Related to issue #226 which was a fine issue, fine tuned the debugger
+debuggers to allow for smoother handling of /sys parse failures. Also added
+debugger filters for common items that would make the /sys parser hang, oddly,
+most seem to be in /sys/power for android devices.
+
+2. Added some fine-tunings for possible mmcblk storage paths, in some cases, an
+extra /block is added, which made inxi think mounted drives were unmounted. I've
+never seen this extra /block except on mmcblk devices on android, but you never
+know, it could be more widespread.
+
+3. Also mainly related to android, but maybe other ARM devices, in some cases,
+an errant 'timer' device was appearing as a cpu variant, which is wrong. That
+was a corner case for sure, and part of the variant logic in fact uses timer
+values to assign the actual cpu variants, but it was wrong in this case because
+it was ....-timer-mem, not ...-timer, which led to non-existent CPU variants
+showing.
+
+4. Issue #236 by ChrisCheney pointed out that inxi had never updated its default
+/proc/meminfo value to use the newer MemAvailable as default if present, which
+led to incorrect memory used values showing up. That's because back in the old
+days, we had to construct a synthetic Memory used from MemFree, buffers, cache,
+etc, but that wasn't always right, since sometimes the cache actually isn't
+available, often is, but not always.
+
+https://github.com/torvalds/linux/commit/34e431b0ae398fc54ea69ff85ec700722c9da773
+
+This commit on the kernel explains it pretty clearly. Thanks Chris for bringing
+this to our attention.
+
+5. Kind of more future-proofing, got rid of a bunch of hard-coded strings
+internally and switched those to use the row_defaults values, which is where
+string messages are supposed to go. That was mostly in the initial program check
+messages on start-up, but also a few other stray ones. Also consolidated them a
+bit to get rid of redundant messages, and added more variable based messages,
+like for missing/permissions on programs etc. The idea in general is that all
+the strings are contained in subs so that in theory they could be swapped for
+other strings, eg, languages, but honestly, I no longer see this as very likely
+to ever happen. But it's still nice to be consistent internally and not get
+sloppy with english strings.
+
+This also got rid of some largely redundant items in row_defaults, and expanded
+the list of handled events, and of variable based events, so it shouldn't be as
+necessary to add new row_defaults items for similar events.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Debugger item to maybe try to find distro OEM, this was connected with issue
+#231 but the issue poster vanished, and didn't do the work required, so this one
+won't happen until someone who cares [not me, that is] does the required work.
+It's always funny to see how quickly people vanish when they have to do the
+actual boring research that they want me to do for them, lol. Or maybe, sigh is
+more appropriate than lol. But it is pretty much par for the course, sad to say.
+Or maybe this was an OEM hoping to have someone do their corporate work for them
+for free, who knows. Anyway, there's a certain category of items that I'm
+reasonably happy to implement, but NOT if I have to do all the boring research
+work, so such features being added will depend on the poster actually doing the
+boring work.
+
+I've gotten burned on this a few times, cpu arch: for example, some guy said
+he'd track that and provide updates, he never even made it to the first release,
+so I got stuck doing that one forever after. But that one at least has some
+general value, so that's ok more or less, but I definitely won't take on stuff
+that I really don't personally care at all about unless the person requesting
+the feature does all the work beforehand. The boring part, that is....
+
+2. Related to issue #226, much improved android ID and many small android fixes
+for machine data etc. Now uses /system/build.prop for some data, which is a nice
+source, sadly, most modern android devices seem to be locked down, with both
+build.prop and /sys locked down, which makes inxi unable to actually get any of
+that data, but if your device either does not have these root only readable, or
+if you have an android rooted phone, the android support will be more
+informative.
+
+Hint: if you run inxi in termux on your non rooted android device, and it shows
+you what android version you are using in System:... Distro: line, then your
+android is not locked down. I have one such phone, android 7.1, but I cannot say
+how usual or non usual this is. The poster of issue #226 for instance had to
+root his android 7 phone to get this data to display. So it seems to vary quite
+a bit.
+
+Note that due to these file system lockdowns, in general, trying to do android
+arm support remains largely a waste of time, but on some devices sometimes, you
+can now get quite nice system info. As I noted in the issue, if I can't get the
+features to work on a non rooted phone in my possession, I'm probably not going
+to try to do the work because it's too hard to try to work on android issues
+without having the device in front of you for testing and debugging. In this
+case, one of my phones did work, so I did the work just to see where android is
+at now.
+
+Android showed some slightly odd syntaxes for some devices, but those are now
+handled where I got a dataset for them that revealed the changes required.
+
+3. Also related to issue #226 for termux in android, will show -r info. That's
+an apt based package manager, but termux puts the apt files somewhere else so
+needed to change paths if those alternate paths existed for apt.
+
+4. Added PARTFLAGS to debugger to see what knd of data that will yield, that's a
+lsblk key/value pair.
+
+5. Just because it's easy to do, added new -Ixxx item, wakeups: which is a
+subset of Uptime, this will show how many times the system has been woken from
+suspend since the last boot. If the system has never been suspended, shows 0.
+
+6. Many more disk vendors and disk IDs. The list just never ends, possibly a
+metaphor for something, the endless spinning of maya, who knows?
+
+7. Added newest known ubuntu release, hirsute, to buntu ID logic. Might as well
+catch them early, that will be 21.04.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Wed, 11 Nov 2020 14:57:38 -0800
+
+================================================================================
+Version: 3.1.08
+Patch: 00
+Date: 2020-10-16
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug fixes, updates!!! Yes!! Why wait!!! Can't stay frozen forever!
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Not an inxi bug, but a weird change in defaults for ubuntu GNOME ENV variable
+values when running at least the gnome desktop, result to end users appears to
+be a bug. This resolves issue #228
+
+Note that so much weird non desktop data was put into those environmental
+variables that inxi simply could make no sense of it. The fix was to make the
+detections more robust, using regex instead of string compare, as well as to at
+least try to strip out such corrupted data values, though that can never be
+fully predictable.
+
+As far as I know, this issue only hits ubuntu gnome desktops, I've never seen
+these value corruptions on any other distro, or on any other ubuntu desktop,
+though they may be there, but I'm not going to test all the ubuntu spins to find
+out.
+
+I'm hoping the combination of logic fixes and junk data cleaning will handle
+most future instances of these types of corruptions automatically.
+
+Again, this only happens on relatively laste ubuntu gnomes as far as I know.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. An oversight, added sshd to list of whitelisted start clients. This permits
+expected output for: ssh <name@server> inxi -bay that is, running inxi as an ssh
+command string. Should have done that a while ago, but better late than never.
+
+This corrects issue #227, or at least, has a better default, it worked fine
+before, but required using --tty to reset to default terminal behavior. The
+problem is that if inxi can't determine what it's running in, it defaults to
+thinking it's in an IRC client, and switches to IRC color codes, among other
+changes. But it was nice to get sshd covered automatically so users don't have
+to know the --tty option.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. More disk vendors and vendor IDs!!! Yes, that's right, the list never ends!!
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Fri, 16 Oct 2020 13:43:40 -0700
+
+================================================================================
+Version: 3.1.07
+Patch: 00
+Date: 2020-09-29
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Bug fixes, feature updates, changes!!
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. There was a glitch in the pattern that made -D samsung / seagate not ID
+right, fixed.
+
+2. I do not like calling this a bug, because it's not an inxi bug, it's an
+upstream regression in the syntax used in /proc/version, they changed a fully
+predictable gcc version .... to a random series of embedded/nested parentheses
+and other random junk. inxi tries to deal with this regression, which will be
+perceived as a bug in systems running kernel 5.8 or newer and inxi 3.1.06 or
+older, since it will fail to show the kernel build compiler version since it
+can't find it in the string.
+
+I really dislike these types of regressions caused by bad ideas done badly and
+without any thought to the transmitted knowledge base, but that's how it goes,
+no discipline, I miss the graybeards, who cared about things like this.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. more -D nvme id changes, intel in this case.
+
+2. FreeBSD lsusb changed syntax, which triggered a series of errors when run.
+[hint BSD users, do NOT file issues that you want fixed and then not provide all
+the data required in a prompt and timely manner, otherwise, really, why did you
+file the issue?].
+
+Note: the fix basically just rejects any row from lsusb that does not have the
+expected syntax/value in the expected place, which was I think the right
+solution given that the change was random, broke expected syntax for lsusb, and
+wasn't really integrateable into existing inxi usb logic, so why fight it? Given
+that at least 99.99% of all lsusb output in the world, including by the way
+OpenBSD's [not sure about most recent version], shows the expected values in the
+expected place, I could see no value in creating a convoluted work-around for a
+non core BSD tool in the first place, so that's what I didn't do.
+
+See the README.txt for what to do to get issues really handed in BSDs.
+
+--------------------------------------------------------------------------------
+ENHANCMENTS:
+
+1. Added --dbg 19 switch to enable smart data debugging for -Da.
+
+--------------------------------------------------------------------------------
+CHANGES:
+1. -C 'boost' option changed from -xxx feature to -x feature. Consider it a
+promotion!
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Some new tools to handle impossible data values for some -D situations for
+SMART where the smart report contains gibberish values, that was issue #225 --
+tools were convert_hex and is_Hex. The utility for these is limited, but might
+be of use in some cases, like handling the above gibberish data value.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Tue, 29 Sep 2020 16:08:05 -0700
+
+================================================================================
+Version: 3.1.06
+Patch: 00
+Date: 2020-08-16
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New features, new changes, new bug fixes!!! Excitement!!! Thrills!!!
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Forgot to set get Shell logic in inxi short form, oops, so Shell remained
+blank, only inxi short, which I rarely use so I didn't notice.
+
+2. Failed to test pacman-g2 for packages, had wrong query argument, so it
+failed. Also failed to test for null data, so showed errors for packages as
+well. Both fixed.
+
+3. A big bug, subtle, and also at the same time, an enhancement, it turns out
+NVME drives do NOT follow the age old /proc/partitions logic where if the minor
+number is divisible by 16 or has remainder 8 when divided by 16, it's a primary
+drive, not a partition. nvme drives use a random numbering when > 1 nvme drives
+are present, and the old tests would fail for all nvme drivers more than the
+first one, which led to wrong disk size totals. Thanks gardotd426 who took the
+time to help figure this out in issue #223 - fix is to not do that test for nvme
+drives, or rather, to add a last fail test for nvme primary nvme[0-9]n[0-9]
+drive detections, not the minor number.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Corrected indentation for block sizes, children were not indented.
+
+2. Updated some older inxi-perl/docs pages, why not, once in a while?
+
+3. Kernel 5.8 introduces a changed syntax to gcc string location, this has been
+corrected, and the kernel gcc version now shows correctly for the previous
+syntax and the new one. Hopefully they do not change it again, sigh...
+
+4. Removed string 'hwmon' sensors from gpu, those are not gpu sensors, and are
+also usually not board/cpu sensors, but things like ath10, iwl, etc, network, or
+disk sensors, etc. In some cases hwmon sensor data would appear
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Big sensors refactor, now inxi supports two new sensors options:
+--sensors-exclude - which allows you to exclude any primary sensor type[s]. Note
+that in the refactored logic, and in the old logic, gpu sensors were already
+excluded. Now other hardware specific sensors like network are excluded as well.
+
+--sensors-use - use ONLY list of supplied sensor IDs, which have to match the
+syntax you see in lm-sensors sensors output.
+
+Both accept comma separated list of sensors, 1 or more, no spaces.
+
+The refactor however is more far reaching, now inxi stores and structures data
+not as a long line of sensors and data without differentiation, but by sensor
+array/chip ID, which is how the exclude and use features can work, and how
+granular default hardware sensor exclusions and uses can happen. This is now
+working in the gpu sensors, and will in the future be extended to the newer
+5.7/5.8 kernel disk temperature sensors values, which will lead in some cases to
+being able to get sensors data for disks without root or hddtemp. This is a
+complicated bit of logic, and I don't have time to do it right now, but the data
+is now there and stored and possible to use in the future.
+
+To see sensors structures, use: inxi -s --dbg 18 and that will show the sensors
+data and its structures, which makes debugger a lot easier for new features.
+
+This issue was originally generated by what was in my view an invalid complaint
+about some inxi sensors defaults, which led me to look more closely at sensors
+logic, which is severely lacking. More work on sensors will happen in the
+future, time, health, and energy permitting.
+
+2. Added Watts, mem temp, for amdgpu sensors, as -sxxx option. More gpu sensor
+data will be added as new data samples show what will be available for the free
+modules like amdgpu, nouvean, and the intel graphics modules.
+
+3. More disk vendors and IDs, as noted, the list never ends, and it hasn't
+ended, so statement remains true. Thanks linux-lite hardware database.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. This has always bugged me since it was introduced, the primary cpu line
+starter Topology: which was only technically accurate for its direct value, not
+its children, and also, in -b, cpu short form was using the value as the key,
+which is a no-no, I'd been meaning to fix that too, but finally realized if I
+just make the primary CPU line key be 'Info:', which is short, yet
+non-ambiguous, it would solve both problems.
+
+To keep the -b cpu line as short as before, I removed the 'type:' and integraged
+that value into the primary Info: string:
+
+CPU:
+ Info: 6-Core AMD Ryzen 5 2600 [MT MCP] speed: 2750 MHz min/max: 1550/3400 MHz
+
+-b 3.1.05 and earlier:
+CPU:
+ 6-Core: AMD Ryzen 5 2600 type: MT MCP speed: 1515 MHz min/max: 1550/3400 MHz
+
+These resolve something that has irked me for quite a while, 'Topology:' didn't
+fit, it was too geeky, and worst, it only applied to the value directly
+following it, NOT to the rest of the CPU information. It also could not be
+shortened or abbreviated since then it would have made no actual sense, like
+topo:, and the same issue with value being used for key in -b, and wrong word
+for line starter in -C would have existed. Besides, someone might think I was
+trying to make a subtle reference to the great Jodorowsky film 'El Topo', which
+would be silly, because that's art, and this is just some system specs that are
+reasonably readable...
+
+2. Was using opendns for WAN dig IP address, but apparently cysco bought that
+company, and now I've noticed the old opendns dig queries were failing more and
+more, so replaced that with akamai dig requests. Also made the WAN IP fallback
+to HTTP IP method if dig failed. New option: --no-http-wan and config item
+NO_HTTP_WAN with override --http-wan added to let you switch off http wan IP
+requests if you want. Note that if dig fails, you will get no wan ip address.
+Updated/improved error messages to handle this more complex set of wan ip
+options, so hopefully the error alert message will in most cases be right.
+
+3. To future proof inxi, switched debugger upload location to
+ftp.smxi.org/incoming from the old techpatterns.com/incoming. Updated man/help
+to remove those urls too.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Sun, 16 Aug 2020 14:28:58 -0700
+
+================================================================================
Version: 3.1.05
Patch: 00
Date: 2020-07-26
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
Bug fixes!!! New Features!! Why wait!!!
-Bugs:
-1. Issue #220 on github: inxi misidentified XFCE as Gnome. This was a kind of core
-issue, and pointed to some logic that needed updating, and some inadequate
-assumptions made, and some too loose cascade of tests. Hopefully now xfce will
-almost never get misidentified, and the other primary desktops ID'ed either from
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Issue #220 on github: inxi misidentified XFCE as Gnome. This was a kind of
+core issue, and pointed to some logic that needed updating, and some inadequate
+assumptions made, and some too loose cascade of tests. Hopefully now xfce will
+almost never get misidentified, and the other primary desktops ID'ed either from
$ENV or from xrop -root will be slightly more accurately identified as well.
-Note that this fix creates a possibility for obscure misconfigured desktops to
-be ID'ed wrong, but in this case, that will be technically a bug for them, but
-with the new fixes, that situation will be cleaner to handle internally in the
+Note that this fix creates a possibility for obscure misconfigured desktops to
+be ID'ed wrong, but in this case, that will be technically a bug for them, but
+with the new fixes, that situation will be cleaner to handle internally in the
desktop ID logic.
-Also tightened the final Gnome fallback detection to not trigger a possible
-false positive, it was testing for ^_GNOME but that is not adequate, because
-some gnome programs will trigger these values in xprop -root even if GNOME
-is not running. Should be safer now, hopefully no new bugs will be triggered
-by these changes.
+Also tightened the final Gnome fallback detection to not trigger a possible
+false positive, it was testing for ^_GNOME but that is not adequate, because
+some gnome programs will trigger these values in xprop -root even if GNOME is
+not running. Should be safer now, hopefully no new bugs will be triggered by
+these changes.
-Fixes:
-1. Missed an indentation level for -y1, gcc alt should have been indented in
-one more level, now it is.
+--------------------------------------------------------------------------------
+FIXES:
-2. In disk vendors/family, didn't clean items starting with '/', this is
-now corrected. Yes, some do, don't ask me why. Might be cases like:
-Crucial/Micron maybe, where the first ID is grabbed, not sure.
+1. Missed an indentation level for -y1, gcc alt should have been indented in one
+more level, now it is.
+2. In disk vendors/family, didn't clean items starting with '/', this is now
+corrected. Yes, some do, don't ask me why. Might be cases like: Crucial/Micron
+maybe, where the first ID is grabbed, not sure.
-Enhancements:
-1. New Disk vendors, vendor IDs!!! The list never ends!!! We've finally found
-infinity, and it is the unceasing wave of tiny and not so tiny disks and their
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. New Disk vendors, vendor IDs!!! The list never ends!!! We've finally found
+infinity, and it is the unceasing wave of tiny and not so tiny disks and their
Ids.
-2. New feature: for -Aa, -Na/-na/-ia, -Ga, now will add the modules the kernel
-could support if they were available on the Device-x lines of those items.
-This was made an -a option because it really makes no sense, if it's a regular
-option, users might think that for example an nvidia card had a nouveua driver
-when it didn't, when in fact, all the kernel is saying is that it knows those
-listed modules 'couid' be used or present. This corresponds to the Display:
-item in -Ga, that lists 'alternate:' drivers that Xorg knows about that could
+2. New feature: for -Aa, -Na/-na/-ia, -Ga, now will add the modules the kernel
+could support if they were available on the Device-x lines of those items. This
+was made an -a option because it really makes no sense, if it's a regular
+option, users might think that for example an nvidia card had a nouveua driver
+when it didn't, when in fact, all the kernel is saying is that it knows those
+listed modules 'couid' be used or present. This corresponds to the Display: item
+in -Ga, that lists 'alternate:' drivers that Xorg knows about that could
likewise be used, if they were on the system.
-In other words these are --admin options because otherwise users might get confused,
-so this is one where you want to know the man explanation before you ask for it.
+In other words these are --admin options because otherwise users might get
+confused, so this is one where you want to know the man explanation before you
+ask for it.
-It is useful however if you're not sure what your choices are for kernel modules.
+It is useful however if you're not sure what your choices are for kernel
+modules.
-When the alternate driver is the same as the active driver, or if none is found,
+When the alternate driver is the same as the active driver, or if none is found,
it does not show the alternate: item to avoid spamming.
-
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 26 Jul 2020 19:10:21 -0700
-=====================================================================================
+================================================================================
Version: 3.1.04
Patch: 00
Date: 2020-06-28
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man, huge update, bug fixes, cleanups, updates!!
What started as a relatively minor issue report ended up with a refactor of big
chunks of some of the oldest code and logic in inxi.
-So many bugs and fixes, updates, and enhancements, that I will probably miss some
-when I try to list them.
+So many bugs and fixes, updates, and enhancements, that I will probably miss
+some when I try to list them.
-Bugs:
-1. In the process of fixing an issue about sudo use triggering server admin
-emails on failure, when --sudo/--no-sudo and their respective configuration
-items were added, sudo was inadvertently disabled because the test ran before
+--------------------------------------------------------------------------------
+BUGS:
+
+1. In the process of fixing an issue about sudo use triggering server admin
+emails on failure, when --sudo/--no-sudo and their respective configuration
+items were added, sudo was inadvertently disabled because the test ran before
the options were processed, which meant the condition to set sudo data was
-always false, so sudo for internal use was never set. The solution was to
-set a flag in the option handler and set sudo after options or configs run.
-
-2. Issue #219 reported gentoo and one other repo type would fail to show
-enabled repos, and would show an error as well, this was due to forgetting
-to make the match test case insensitive. If only all bugs were this easy
-to fix!!
-
-3. I'd seen this bug before, and couldn't figure out why it existed.
-It turned out that the partition blacklist filters were running fine
-in the main partition data tool, but I had forgotten to add in corresponding
-lsblk partition data filters, lol, so when the logic went back and double
-checked for missing partitions. This feature had been, if i remember right,
-to be able to show hidden partitions, which the standard method didn't see,
-but lsblk did, anyway, when the double check and add missing partitions
-logic ran, inxi was putting back in the blacklisted partitions every time,
-despite the original blacklists working well and as intended.
-This was fixed by adding in all the required fs type blacklists, then
-adding in comments above each black list reminding coders that if they
-add or remove from one blacklist, they have to do the same on the other.
-
-4. Found while testing something unrelated on older vm, the fallback
-case for cpu bugs, which was supposed to show the basic /proc/cpuinfo
-cpu bugs, was failing inexplicably because the data was simply being
-put into the wrong variable name, sigh.
-
-Fixes:
+always false, so sudo for internal use was never set. The solution was to set a
+flag in the option handler and set sudo after options or configs run.
+
+2. Issue #219 reported gentoo and one other repo type would fail to show enabled
+repos, and would show an error as well, this was due to forgetting to make the
+match test case insensitive. If only all bugs were this easy to fix!!
+
+3. I'd seen this bug before, and couldn't figure out why it existed. It turned
+out that the partition blacklist filters were running fine in the main partition
+data tool, but I had forgotten to add in corresponding lsblk partition data
+filters, lol, so when the logic went back and double checked for missing
+partitions. This feature had been, if i remember right, to be able to show
+hidden partitions, which the standard method didn't see, but lsblk did, anyway,
+when the double check and add missing partitions logic ran, inxi was putting
+back in the blacklisted partitions every time, despite the original blacklists
+working well and as intended. This was fixed by adding in all the required fs
+type blacklists, then adding in comments above each black list reminding coders
+that if they add or remove from one blacklist, they have to do the same on the
+other.
+
+4. Found while testing something unrelated on older vm, the fallback case for
+cpu bugs, which was supposed to show the basic /proc/cpuinfo cpu bugs, was
+failing inexplicably because the data was simply being put into the wrong
+variable name, sigh.
+
+--------------------------------------------------------------------------------
+FIXES:
+
1. While not technically an inxi bug, it would certainly appear that way to
-anyone who triggered it. We'd gotten issue reports before on this, but they
-were never complete, so couldn't figure it out. Basically, if someone puts
-inxi into a simple script that is in $PATH [this was the missing fact needed to
-actually trigger this bug in order to fix it], the script [not inxi], will
-then enter into an endless loop as inxi queries it for its version number using
-<script name> --version. This issue didn't happen if the script calling inxi
-was not in PATH, which is why I'd never been able to figure it out before.
-
-Only simple scripts with no argument handlers could trigger this scenario,
-and only if they were in PATH.
-
-Fixing this required refactoring the entire start get_shell_data logic, which
-ended up with a full refactor of the program_version logic as well. The fix
-was to expand the list of shells known by inxi so it would be able to recognize
-when it was in a shell running a script running inxi.
-
-This resulted in several real improvements, for instance, inxi will now almost
-always be able to determine the actual shell running inxi, even when started
-by something else. It will also never use --version attempts on programs it does
+anyone who triggered it. We'd gotten issue reports before on this, but they were
+never complete, so couldn't figure it out. Basically, if someone puts inxi into
+a simple script that is in $PATH [this was the missing fact needed to actually
+trigger this bug in order to fix it], the script [not inxi], will then enter
+into an endless loop as inxi queries it for its version number using <script
+name> --version. This issue didn't happen if the script calling inxi was not in
+PATH, which is why I'd never been able to figure it out before.
+
+Only simple scripts with no argument handlers could trigger this scenario, and
+only if they were in PATH.
+
+Fixing this required refactoring the entire start get_shell_data logic, which
+ended up with a full refactor of the program_version logic as well. The fix was
+to expand the list of shells known by inxi so it would be able to recognize when
+it was in a shell running a script running inxi.
+
+This resulted in several real improvements, for instance, inxi will now almost
+always be able to determine the actual shell running inxi, even when started by
+something else. It will also never use --version attempts on programs it does
not know about in a whitelist.
So we lose slightly the abilty to get version data on unknown shells, but we
gain inxi never being able to trigger such an infinite loop situation.
-2. As part of the program_version refactor, a long standing failure to get ksh,
-lksh, loksh, pdksh, and the related posh shells, all of which ID their version
-numbers only if they are running the command in themselves. The mistake had
-been having the default shell run that command. These all now correctly identify
+2. As part of the program_version refactor, a long standing failure to get ksh,
+lksh, loksh, pdksh, and the related posh shells, all of which ID their version
+numbers only if they are running the command in themselves. The mistake had been
+having the default shell run that command. These all now correctly identify
themselves.
-3. As part of the wm upgrades, many small failures to ID version numbers, or
-even wm's, in some cases, were discovered when testing, and corrected. Some
-I had not tested, like qtile, and the lisp variants, were not being detected
+3. As part of the wm upgrades, many small failures to ID version numbers, or
+even wm's, in some cases, were discovered when testing, and corrected. Some I
+had not tested, like qtile, and the lisp variants, were not being detected
correctly by the tests due to the way python or lisp items are listed in ps aux.
-4. As part of the wm update and program_version refactor, updated and simplified
-many desktop and wm detections and logic blocks. Ideally this makes them more
+4. As part of the wm update and program_version refactor, updated and simplified
+many desktop and wm detections and logic blocks. Ideally this makes them more
predictable and easy to work on for the future.
-5. As some last tunings for the new -y1 key: value pair per line output option,
-fixed some small glitches in -b indentation. Also improved RAID indenting,
-and Weather, and made it all very clean and predictable in terms of indentations.
-
-6. Something I'd slightly noticed but never done anything about, while testing
-desktop fixes, I realized that for Desktop: item, dm: is a secondary data type,
-but if it's Console:, then DM: is a primary data type, not a secondary one. So
-now if Console: it becomes DM: which makes sense, previously it implied a dm:
-was used to start the console, which was silly. Also, since often the reason
-it's Console: with no dm in the first place is that it's a server with no dm.
-So now if console, and no dm detected, rather than showing DM: N/A it just
-doesn't show dm at all. Note that the -y1 display feature now makes catching
-and correcting such logic and level assignments much easier since you can
-see the error in the indentations directly.
-
-7. As part of the overall core refactor, the print_data logic was also refactored
-and simplified, by making -y1 a first class citizen, it led to significantly
-different way of being able to present inxi data on your screen, and now
-print_data logic is cleaner and reflects these changes more natively, all the
-initial hacks to get this working were removed, and the logic was made to be
-core, not tacked on.
-
-8. A small thing also revealed in issue #219, battery data was not being
-trimmed, not sure how I missed that, but in some cases, space padding was in the
+5. As some last tunings for the new -y1 key: value pair per line output option,
+fixed some small glitches in -b indentation. Also improved RAID indenting, and
+Weather, and made it all very clean and predictable in terms of indentations.
+
+6. Something I'd slightly noticed but never done anything about, while testing
+desktop fixes, I realized that for Desktop: item, dm: is a secondary data type,
+but if it's Console:, then DM: is a primary data type, not a secondary one. So
+now if Console: it becomes DM: which makes sense, previously it implied a dm:
+was used to start the console, which was silly. Also, since often the reason
+it's Console: with no dm in the first place is that it's a server with no dm. So
+now if console, and no dm detected, rather than showing DM: N/A it just doesn't
+show dm at all. Note that the -y1 display feature now makes catching and
+correcting such logic and level assignments much easier since you can see the
+error in the indentations directly.
+
+7. As part of the overall core refactor, the print_data logic was also
+refactored and simplified, by making -y1 a first class citizen, it led to
+significantly different way of being able to present inxi data on your screen,
+and now print_data logic is cleaner and reflects these changes more natively,
+all the initial hacks to get this working were removed, and the logic was made
+to be core, not tacked on.
+
+8. A small thing also revealed in issue #219, battery data was not being
+trimmed, not sure how I missed that, but in some cases, space padding was in the
values and was not removed, which leads to silly looking inxi output.
-9. Several massive internal optimizations, which were tested heavily, led to
-in one case, 8-900x faster execution the second time a data structure is used,
-previously in program_values the entire list was loaded each time program_values
-was called, now it's loaded into a variable on first load and the variable is
-used for the tests after that. This was also done for the vendor_version for
-disk vendors, which also features a very long data structure which can be
-loaded > 1 times for instances where a system has > 1 disk.
-
-I also tested while I was at it, to see if loading these types of data structures,
-arrays of arrays, or hashes of arrays, by reference, or by dereferencing their
-arrays, was faster, and it proved that it's about 20% faster to not
-dereference them, but to use them directly. So I've switched a number of the
-fixed data structures internally do use that method.
-
-Another tiny optimization was hard resetting the print_data iterator hash,
-while this would never matter in the real world, it showed that resetting
-the iterator hash manually was slightly more efficient than resetting it
-with a for loop.
-
-10. While not seen inside inxi, I updated and improved a number of the vm's
-used to test inxi and various software detections, so now I have a good selection,
-going back to 2008 or so, up to current. This is helpful because things like
-shells and window managers and desktops come and go, so it is hard to test
-old detections on new stuff when you can't install those anymore. You'll see
-these fixes in many of the less well known window managers, and in a few of
+9. Several massive internal optimizations, which were tested heavily, led to in
+one case, 8-900x faster execution the second time a data structure is used,
+previously in program_values the entire list was loaded each time program_values
+was called, now it's loaded into a variable on first load and the variable is
+used for the tests after that. This was also done for the vendor_version for
+disk vendors, which also features a very long data structure which can be loaded
+> 1 times for instances where a system has > 1 disk.
+
+I also tested while I was at it, to see if loading these types of data
+structures, arrays of arrays, or hashes of arrays, by reference, or by
+dereferencing their arrays, was faster, and it proved that it's about 20% faster
+to not dereference them, but to use them directly. So I've switched a number of
+the fixed data structures internally do use that method.
+
+Another tiny optimization was hard resetting the print_data iterator hash, while
+this would never matter in the real world, it showed that resetting the iterator
+hash manually was slightly more efficient than resetting it with a for loop.
+
+10. While not seen inside inxi, I updated and improved a number of the vm's
+used to test inxi and various software detections, so now I have a good
+selection, going back to 2008 or so, up to current. This is helpful because
+things like shells and window managers and desktops come and go, so it is hard
+to test old detections on new stuff when you can't install those anymore. You'll
+see these fixes in many of the less well known window managers, and in a few of
the better known ones, where in some cases the detections were damaged.
11. As part of the program_version refactor, updated and fixed file based
version detections, those, ideally, will almost never be used. Hopefully
-programmers of things like window managers, shells, and desktops, can
-learn how to handle --version requests, even though I realize that's a lot
-harder than copying someone's code and then rebranding as your own project, or
-whatever excuse people have for not including a --version item in their software.
-
-Enhancements:
-1. As a result of the shell, start shell, shell parent refactors, inxi was able
-to correctly in most cases determine also the user default shell and its version,
-so that was added as an -Ixxx option:
+programmers of things like window managers, shells, and desktops, can learn how
+to handle --version requests, even though I realize that's a lot harder than
+copying someone's code and then rebranding as your own project, or whatever
+excuse people have for not including a --version item in their software.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. As a result of the shell, start shell, shell parent refactors, inxi was able
+to correctly in most cases determine also the user default shell and its
+version, so that was added as an -Ixxx option:
+
Shell: ksh v: A_2020.0.0 default: Bash v: 5.0.16
-2. As part of the program_version refactor, a more robust version number
-cleaner was made, which now allows for much more manipulation of the version
-number string, which sometimes contains, without spaces, non version number '
-info right before the actual version.
+2. As part of the program_version refactor, a more robust version number cleaner
+was made, which now allows for much more manipulation of the version number
+string, which sometimes contains, without spaces, non version number ' info
+right before the actual version.
-3. Many more wm IDs were created and tested, and some old virtual machines
-that were used years ago were used again to test old window managers and
-their IDs, as well as new vms created to test newer ones. Many version
-IDs and WM ids were fixed in this process as well. All kinds of new ones
-added, though the list is basiclaly endless so ideally inxi would only use
-its internal data tables for window managers that have actual users, or did.
+3. Many more wm IDs were created and tested, and some old virtual machines that
+were used years ago were used again to test old window managers and their IDs,
+as well as new vms created to test newer ones. Many version IDs and WM ids were
+fixed in this process as well. All kinds of new ones added, though the list is
+basiclaly endless so ideally inxi would only use its internal data tables for
+window managers that have actual users, or did.
-4. First wayland datatype, now it may show Display ID: with -Ga, so far that's
+4. First wayland datatype, now it may show Display ID: with -Ga, so far that's
the only wayland screen/display data I can get reliably.
-5. As part of the shell parent/started in: updates and fixes, added every shell
-I could find, and installed and tested as many of them as possible to verify
-that either they have no version method, or that their version method works.
-This shell logic also is used to determine start parent. Obviously using
-whitelists of things that can change over time isn't ideal, but there was no
-way to actually do it otherwise. The best part of the fixes is that it's now
-remarkably difficult to trick inxi into reporting the wrong shell, and it
-generally will also get the default shell right, though I found cases in
-testing where a shell when started replaces the value in $SHELL with itself.
-
-6. I found a much faster and reasonably reliable way to determine toolkits
-used by gtk desktops, like cinnamon, gnome, and a few others. Test is to
-get version from gtk-launcher, which is MUCH faster than doing a package
-version query on the random libgtk toolkit that might be tested, and actually
-was tested for pacman, apt, and rpm in the old days, but that was removed
-because it was a silly hack. It's possible that now and then gtk desktops
-will be 0.0.1 versions off, but in most cases, the version matched, so I decided
-to restore the tk: item for a selection of gtk or gnome based desktops.
+5. As part of the shell parent/started in: updates and fixes, added every shell
+I could find, and installed and tested as many of them as possible to verify
+that either they have no version method, or that their version method works.
+This shell logic also is used to determine start parent. Obviously using
+whitelists of things that can change over time isn't ideal, but there was no way
+to actually do it otherwise. The best part of the fixes is that it's now
+remarkably difficult to trick inxi into reporting the wrong shell, and it
+generally will also get the default shell right, though I found cases in testing
+where a shell when started replaces the value in $SHELL with itself.
+
+6. I found a much faster and reasonably reliable way to determine toolkits used
+by gtk desktops, like cinnamon, gnome, and a few others. Test is to get version
+from gtk-launcher, which is MUCH faster than doing a package version query on
+the random libgtk toolkit that might be tested, and actually was tested for
+pacman, apt, and rpm in the old days, but that was removed because it was a
+silly hack. It's possible that now and then gtk desktops will be 0.0.1 versions
+off, but in most cases, the version matched, so I decided to restore the tk:
+item for a selection of gtk or gnome based desktops.
So now gtk desktops, except mate, which of course will be using gtk 2 for a
-while longer, toolkit version should be working again, and the new method
-works on everything, unlike the old nasty hack that was used, which required
-package queries and guessing at which gtk lib was actually running the desktop,
-it was such a slow nasty hack that it was dumped a while ago, but this new
-method works reliably in most cases and solves most of the issues.
-
-7. As part of the overall program_versions refactor, the package version
-tester tool was extended to support pacman, dpkg, and rpm, which in practical
-terms covers most gnu/linux users and systems. Since this feature is literally
-only used for ASH and DASH shell version detections, it was really just added
-as a proof of concept, and because it fit in well with the new Package counts
-feature of -I/-r.
+while longer, toolkit version should be working again, and the new method works
+on everything, unlike the old nasty hack that was used, which required package
+queries and guessing at which gtk lib was actually running the desktop, it was
+such a slow nasty hack that it was dumped a while ago, but this new method works
+reliably in most cases and solves most of the issues.
+
+7. As part of the overall program_versions refactor, the package version tester
+tool was extended to support pacman, dpkg, and rpm, which in practical terms
+covers most gnu/linux users and systems. Since this feature is literally only
+used for ASH and DASH shell version detections, it was really just added as a
+proof of concept, and because it fit in well with the new Package counts feature
+of -I/-r.
8. Updated for version info a few other programs, added compositors as well.
-9. Last but not least!! More disk vendor IDs, more disk vendors!! And found
+9. Last but not least!! More disk vendor IDs, more disk vendors!! And found
another source to double check vendor IDs, that's good.
-New Features:
+--------------------------------------------------------------------------------
+NEW:
+
1. For -Ix/-rx, -Ixx/-rxx, -Ia/-ra, now inxi shows package counts for most
package managers plus snap, flatpak, and appimage. I didn't test appimage so
I'm not 100% sure that works, but the others are all tested and work.
-If -r, Packages shows in the Repos item as first row, which makes sense, packages,
-repos, fits. Note that in some systems getting full package counts takes some
-time so it's an -x option not default.
+If -r, Packages shows in the Repos item as first row, which makes sense,
+packages, repos, fits. Note that in some systems getting full package counts
+takes some time so it's an -x option not default.
If -rx, -rxx, -ra, package info moved to -r section, and if -Ix, -Ixx, or -Ia,
the following data shows:
* -Ix or -rx: show total package counts: Packages: 2429
@@ -311,72 +8845,57 @@ Info:
running in: kate
pinxi: 3.1.04-1
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 28 Jun 2020 21:07:42 -0700
-=====================================================================================
+================================================================================
Version: 3.1.03
Patch: 00
Date: 2020-06-12
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
Big internal refactor!! Fully adjustable indentation logic, built in, native!
-NOTE: none of these changes have any impact on normal inxi -y -1, -y, or -y xx
-operation, everything will remain exactly the same, this only changes and
-makes robust -y 1 single key: value pair per line output.
+NOTE: none of these changes have any impact on normal inxi -y -1, -y, or -y xx
+operation, everything will remain exactly the same, this only changes and makes
+robust -y 1 single key: value pair per line output.
-3.1.03 finishes the -y1 introduced in 3.1.02, but makes it a core part of the inxi
-logic for line printing, not a tacked on afterthought.
+3.1.03 finishes the -y1 introduced in 3.1.02, but makes it a core part of the
+inxi logic for line printing, not a tacked on afterthought.
-Because the first draft of this in 3.1.02 was really a hack tacked onto the existing
-logic, which was not very flexible or robust, and required way too much literal test
-logic in the black box print_data() subroutine, which is supposed to be a 'dumb'
-logic, that just does what you give it automatically, I added in key changes that
-hard code the indentations per key, like so:
+Because the first draft of this in 3.1.02 was really a hack tacked onto the
+existing logic, which was not very flexible or robust, and required way too much
+literal test logic in the black box print_data() subroutine, which is supposed
+to be a 'dumb' logic, that just does what you give it automatically, I added in
+key changes that hard code the indentations per key, like so:
Now: 34#0#3#key-name
Before: 34#key-name
-Note that anyone using the json or XML output option may need to redo their code
-a bit to handle these extra 2 values that preface the actual key names.
+Note that anyone using the json or XML output option may need to redo their
+code a bit to handle these extra 2 values that preface the actual key names.
+
+--------------------------------------------------------------------------------
+FIXES:
-Fixes:
1. In order to make this work, changed a few small things internally, a few
key names were slightly altered to make them more clear.
-Changes:
-1. Redo of all internal full key strings, added two new # separated items:
- xx#x#y#key-name:
- * xx remains the main 0 padded 2 digit sorter per row/block.
- * x is a new 0/1 boolean, that shows if the value is a container or not. As
- currently implemented probably not hugely useful since it won't say when
- the following items it is a container of ends.
- Note that the following y value will always be 1 for the item contained by
- the container, so you can check that way if you want. the next item can
- also be a container, but it would have either the same indentation level
- as the previous container or be different.
- Thus, if a key is a container, it can contain either non containers, or
- other containers, but that primary container does not end until the indent
- value equals or is less than the indent value of the first container.
- If you are a programmer you should be able to figure this out.
- * y is the indentation level, 0-xx is supported, but in practical terms, only
- 4 levels are used. For single line output, these set the indentation for that
- key.
- * key-name remains the key string ID name.
+--------------------------------------------------------------------------------
+CHANGES:
-2. For -y 1 -G will show drivers then indented one more level unloaded, FAILED,
-and alternate: to make it clear those are a subset of drivers. driver: itself
-will contain the actual driver. In cases where no driver is loaded, a note
-will show indented after driver:
+1. For -y 1 -G will show drivers then indented one more level unloaded, FAILED,
+and alternate: to make it clear those are a subset of drivers. driver: itself
+will contain the actual driver. In cases where no driver is loaded, a note will
+show indented after driver:
-3. For -y 1, driver v: versions will be indented 1, and driver will be a container
-that contains that version key: value pair.
+2. For -y 1, driver v: versions will be indented 1, and driver will be a
+container that contains that version key: value pair.
Samples:
------------------------------------
+--------------------------------------------------------------------------------
inxi -Razy1
RAID:
Device-1: g23-home
@@ -398,7 +8917,7 @@ RAID:
Components:
online: sdd sde
------------------------------------
+--------------------------------------------------------------------------------
sudo inxi -dazy1
Drives:
Local Storage:
@@ -438,7 +8957,7 @@ Drives:
rw: cd-r,cd-rw,dvd-r,dvd-ram
state: running
------------------------------------
+--------------------------------------------------------------------------------
inxi -Aazy1
Audio:
Device-1: NVIDIA High Definition Audio
@@ -462,87 +8981,114 @@ Audio:
Sound Server: ALSA
v: k5.4.0-11.2-liquorix-amd64
------------------------------------
+--------------------------------------------------------------------------------
+CODE:
+
+1. Redo of all internal full key strings, added two new # separated items:
+ xx#x#y#key-name:
+ * xx remains the main 0 padded 2 digit sorter per row/block.
+ * x is a new 0/1 boolean, that shows if the value is a container or not. As
+ currently implemented probably not hugely useful since it won't say when
+ the following items it is a container of ends.
+ Note that the following y value will always be 1 for the item contained by
+ the container, so you can check that way if you want. the next item can
+ also be a container, but it would have either the same indentation level
+ as the previous container or be different.
+ Thus, if a key is a container, it can contain either non containers, or
+ other containers, but that primary container does not end until the indent
+ value equals or is less than the indent value of the first container.
+ If you are a programmer you should be able to figure this out.
+ * y is the indentation level, 0-xx is supported, but in practical terms, only
+ 4 levels are used. For single line output, these set the indentation for
+ that key.
+ * key-name remains the key string ID name.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 12 Jun 2020 19:02:08 -0700
-=====================================================================================
+================================================================================
Version: 3.1.02
Patch: 00
Date: 2020-06-12
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
Big change, cleanup, small bug fixes. Hot, grab it now!!
-The new -y 1 feature exposed several small and larger glitches with how sets
-of data were constructed in inxi output. See Changes: for list of changes made
-to improve or fix these glitches.
+The new -y 1 feature exposed several small and larger glitches with how sets of
+data were constructed in inxi output. See RELEASE NOTES: for list of changes made to
+improve or fix these glitches.
-These errors and minor output inconsistencies became very obvious when I was
-doing heavy testing of -y 1, so I decided to just fix all of them at the same
+These errors and minor output inconsistencies became very obvious when I was
+doing heavy testing of -y 1, so I decided to just fix all of them at the same
time, plus it was very hard to make the -y 1 indenter work as expected when the
key values were not being treated consistently.
Note that this completes the set of all possible -y results:
Full -y Options:
-1. -y [no integer given] :: set width to a default of 80. this is what you usually
-want for forum posts, or for online issue reports, because it won't wrap and be
-hard to read. Help us help your users and others!! Teach them to use for example
--Fxzy or -bay for their bug reports. Just add y to whatever collection of arguments
-you generally ask for in support forums or issue reports. Highly recommended,
-easy to type, and joins cleanly with other letters.
+1. -y [no integer given] :: set width to a default of 80. this is what you
+usually want for forum posts, or for online issue reports, because it won't wrap
+and be hard to read. Help us help your users and others!! Teach them to use for
+example -Fxzy or -bay for their bug reports. Just add y to whatever collection
+of arguments you generally ask for in support forums or issue reports. Highly
+recommended, easy to type, and joins cleanly with other letters.
2. -y -1 :: removes line width limits, this can lead to very long lines in some
cases, and removes all auto-wrapping of line widths.
-3. -y 1 :: Switch to stacked key: value pairs, with primary data blocks separated
-by a blank line. Think dmidecode type output, or other command line sys info tools.
-By request, a forum support guy noted it was hard for newbies to understand the
--G values, particularly -Ga when in lines, so this is another way to request
-data. WARNING: for lots of data, this gets really long!!! But if you are curious
-how inxi actually constructs its data internally, this sort of shows it.
+3. -y 1 :: Switch to stacked key: value pairs, with primary data blocks
+separated by a blank line. Think dmidecode type output, or other command line
+sys info tools. By request, a forum support guy noted it was hard for newbies to
+understand the -G values, particularly -Ga when in lines, so this is another way
+to request data. WARNING: for lots of data, this gets really long!!! But if you
+are curious how inxi actually constructs its data internally, this sort of shows
+it.
-4. -y 80-xx :: set width to 80 or greater. Note you can also set these in
-your configurations if you want using the various options supported.
+4. -y 80-xx :: set width to 80 or greater. Note you can also set these in your
+configurations if you want using the various options supported.
------------------------------------
+--------------------------------------------------------------------------------
+BUGS:
-Bugs:
1. Once again, no real bugs found beyond a few trivial things I can't remember.
-Fixes:
-1. When out of X, dm: showed after Console: and often said dm: N/A particularly
-on headless servers, which was silly. Now DM: only shows after Console: if
-a DM: was actually found. If regular Desktop output, either in X, or via
---display out of X, no changes.
-
-2. There was a pointless sudo test when sudo values are set initially, they
-were still running even if --no-sudo was used. Now they don't run in that case.
-
-Enhancements:
-1. The biggie, now inxi can output in a similar indented way as something like
-dmidecode if you use the -y 1 option. This feature was originally by request,
-though the initial request actually just wanted to see it stacked simply,
-but that was almost impossible to read for any output reasonably long, so
-I made the indentations very dynamic and deep, they go up to 4 levels in,
-which is roughly how deep in the inxi sub Categories go. This output format
-makes it very easy to see how inxi 'thinks' about its data, how it views
-sets, subsets, subsubsets, and subsubsubsets of data.
-
-Note that each data block, as with dmidecode data, is separated by a blank
-line. You know what this means!!! Yes, that's right!!! You can parse inxi
-output with awk!!, same way legacy bash+gawk inxi used to parse its data!!
-Or if your brain just does not like lines of data, you can make it appear in
-indented single key: value pairs.
-
-Here you can see for example that 1 Xorg Display has 1 or more Screens,
-and each Screen has one or more Monitors. Note that this -Ga data first
-appeared in inxi 3.1.00.
-
-Sample [with bug in OpenGL output!, and showing -Ga newer values as well
-for dual monitor setup, with one Xorg Screen]:
+--------------------------------------------------------------------------------
+FIXES:
+
+1. When out of X, dm: showed after Console: and often said dm: N/A particularly
+on headless servers, which was silly. Now DM: only shows after Console: if a DM:
+was actually found. If regular Desktop output, either in X, or via --display out
+of X, no changes.
+
+2. There was a pointless sudo test when sudo values are set initially, they were
+still running even if --no-sudo was used. Now they don't run in that case.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. The biggie, now inxi can output in a similar indented way as something like
+dmidecode if you use the -y 1 option. This feature was originally by request,
+though the initial request actually just wanted to see it stacked simply, but
+that was almost impossible to read for any output reasonably long, so I made the
+indentations very dynamic and deep, they go up to 4 levels in, which is roughly
+how deep in the inxi sub Categories go. This output format makes it very easy to
+see how inxi 'thinks' about its data, how it views sets, subsets, subsubsets,
+and subsubsubsets of data.
+
+Note that each data block, as with dmidecode data, is separated by a blank line.
+You know what this means!!! Yes, that's right!!! You can parse inxi output with
+awk!!, same way legacy bash+gawk inxi used to parse its data!! Or if your brain
+just does not like lines of data, you can make it appear in indented single key:
+value pairs.
+
+Here you can see for example that 1 Xorg Display has 1 or more Screens, and each
+Screen has one or more Monitors. Note that this -Ga data first appeared in inxi
+3.1.00.
+
+Sample [with bug in OpenGL output!, and showing -Ga newer values as well for
+dual monitor setup, with one Xorg Screen]:
inxi -aGy1
Graphics:
@@ -580,89 +9126,99 @@ Graphics:
v: N/A
direct render: N/A
-2. Refactored and cleaned up print_data(), got rid of some early testing code,
+2. Refactored and cleaned up print_data(), got rid of some early testing code,
dumped some unnecessary tests, simplified old tests, and optimized the new
-indentation logic reasonably well. Hopefully the print_data() will not be
-quite as much of a black box now as it was.
+indentation logic reasonably well. Hopefully the print_data() will not be quite
+as much of a black box now as it was.
-3. Even more drive vendors and ID matches!!! The list never ends!! An endless
-series of new vendors and IDs of existing vendors sprout up, then float away.
-And inxi follows them to the best of its ability. Thanks again to Linux-Lite
+3. Even more drive vendors and ID matches!!! The list never ends!! An endless
+series of new vendors and IDs of existing vendors sprout up, then float away.
+And inxi follows them to the best of its ability. Thanks again to Linux-Lite
hardware database, which help make this ever expanding list possible, since
their users appear to use every disk known to humankind.
-Changes:
-1. When out of Display, and Console: shows, -S will not show dm: if no
-display manager is detected, and if it is detected, it shows DM: since it's
-not part of the Console: set of data. If out of X and --display is used to
-get Xorg data out of X, it will show Desktop: set of data as normal, at least
-it will show the stuff it can find. This resolves the issue where dm: appeared
-to be a member of the set of Console: data, instead of either its own thing,
-DM:, or a member of the set of Desktop: data.
+--------------------------------------------------------------------------------
+CHANGES:
-2. For RAID Devices with sub Array-x: values, Array-x: is capitalized, it used
+1. When out of Display, and Console: shows, -S will not show dm: if no display
+manager is detected, and if it is detected, it shows DM: since it's not part of
+the Console: set of data. If out of X and --display is used to get Xorg data out
+of X, it will show Desktop: set of data as normal, at least it will show the
+stuff it can find. This resolves the issue where dm: appeared to be a member of
+the set of Console: data, instead of either its own thing, DM:, or a member of
+the set of Desktop: data.
+
+2. For RAID Devices with sub Array-x: values, Array-x: is capitalized, it used
to be array-x: That was silly.
-3. In USB, now Device-x: resets inside each Hub: so that the Device-x: are
-numbered starting at 1 within each Hub:. This makes the counter behavior act
-the same as it does in for example RAM Array-x: / Device-y:, where each Array-x:
-resets Device-y: count to 1. This changes the old default of having Device-x:
-not reset, to let you see the total number of devices plugged in or attached
-no matter which hub they were plugged into, but the output actually gets
-sort of confusing in single key: value pair mode per line.
-
-4. The key: value syntax for weather was changed completely, now it works
-like the rest of the features, with Report:... [Forecast:...] Locale:...
-and Source:. Locale makes the source of the times and other date related
-features, and the location if shown or available, much more obvious. Before
-it was never clear if Current Time referred to your local or the remote
-time, now it's clearly from the Locale: you specified with -W, or
-the default -w local info. Also made Report 1 line if unwrapped, Forecast 1
-line if not wrapped, and Locale: 1 line if not wrapped, which makes the output
-easier to read.
-
-NOTE: automated weather queries are NOT allowed, if you do it, you will be
-banned!! inxi is NOT a desktop weather app!! Don't confuse it with one!!
-Weather is just a small service to users who might for example want to check
-the weather on a remote system, or something like that, and is not intended
-to be used on a routine basis.
-
-5. Cleaned up and re-ordered the --version output. It had some pretty old
-contexts in the language, which were removed or cleaned up and brought up to
-date. If you're wondering, I roughly use rsync and nano --version as guides
-for what to show or not show there.
-
------------------------------------
+3. In USB, now Device-x: resets inside each Hub: so that the Device-x: are
+numbered starting at 1 within each Hub:. This makes the counter behavior act the
+same as it does in for example RAM Array-x: / Device-y:, where each Array-x:
+resets Device-y: count to 1. This changes the old default of having Device-x:
+not reset, to let you see the total number of devices plugged in or attached no
+matter which hub they were plugged into, but the output actually gets sort of
+confusing in single key: value pair mode per line.
+
+4. The key: value syntax for weather was changed completely, now it works like
+the rest of the features, with Report:... [Forecast:...] Locale:... and Source:.
+Locale makes the source of the times and other date related features, and the
+location if shown or available, much more obvious. Before it was never clear if
+Current Time referred to your local or the remote time, now it's clearly from
+the Locale: you specified with -W, or the default -w local info. Also made
+Report 1 line if unwrapped, Forecast 1 line if not wrapped, and Locale: 1 line
+if not wrapped, which makes the output easier to read.
+
+NOTE: automated weather queries are NOT allowed, if you do it, you will be
+banned!! inxi is NOT a desktop weather app!! Don't confuse it with one!! Weather
+is just a small service to users who might for example want to check the weather
+on a remote system, or something like that, and is not intended to be used on a
+routine basis.
+
+5. Cleaned up and re-ordered the --version output. It had some pretty old
+contexts in the language, which were removed or cleaned up and brought up to
+date. If you're wondering, I roughly use rsync and nano --version as guides for
+what to show or not show there.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 11 Jun 2020 23:53:30 -0700
-=====================================================================================
+================================================================================
Version: 3.1.01
Patch: 00
Date: 2020-05-31
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New inxi, man. New information types, fixes, man updates.
-Bugs:
+--------------------------------------------------------------------------------
+BUGS:
+
No bugs of any importance fixed or found!!
-Fixes:
-1. Tiny fix, didn't use partition/slice assignment in help menu. BSD
-interest only since default partition is standard for Linux.
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Tiny fix, didn't use partition/slice assignment in help menu. BSD interest
+only since default partition is standard for Linux.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Disc Vendors: added a large number of possible disk vendors, without having
+actual detection data available for all of them, using a different source. Also
+added, as usual, more disc vendor IDs from linux-lite hardware database, always
+ready with more vendors!
-Enhancements:
-1. Disc Vendors: added a large number of possible disk vendors, without having
-actual detection data available for all of them, using a different source.
-Also added, as usual, more disc vendor IDs from linux-lite hardware database,
-always ready with more vendors!
2. Added groovy gorilla ID for ubuntu
-3. Very nice usability change, mostly for support people, now if -y without
-an integer is supplied, it will assign default column width of 80, which
-is what you usually want for forums or issue reports, otherwise the output
-can wrap outside the post or issue report, which is hard to read. Hopefully
-support people will catch onto this one.
+
+3. Very nice usability change, mostly for support people, now if -y without an
+integer is supplied, it will assign default column width of 80, which is what
+you usually want for forums or issue reports, otherwise the output can wrap
+outside the post or issue report, which is hard to read. Hopefully support
+people will catch onto this one.
+
4. This closes issue #217 - Adds dmidecode based extra data:
-xxx - shows CPU voltage and external clock speeds
-a - shows CPU socket type and base/boost: speed items. These are --admin
@@ -680,26 +9236,28 @@ support people will catch onto this one.
if they have this data, and Intel CPUs will sometimes be right, sometimes
not, or empty. For > 1 CPU systems, the data is much less reliable.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 31 May 2020 14:26:37 -0700
-=====================================================================================
+================================================================================
Version: 3.1.00
Patch: 00
Date: 2020-04-22
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New inxi, new man. Huge update, new line types, huge graphics upgrade, new
switches, bug fixes, glitch fixes, enhancements, you name it, this has got it!!
-Note that since this features a new primary line item (-j / --swap Swap:),
-the version number has been bumped to 3.1.0, making this a major version
-upgrade, the first since the new Perl inxi rewrite was launched, though of
-course 3.0.0 contained many new line items as well, but this is the first
-actually new line item since then.
+Note that since this features a new primary line item (-j / --swap Swap:), the
+version number has been bumped to 3.1.0, making this a major version upgrade,
+the first since the new Perl inxi rewrite was launched, though of course 3.0.0
+contained many new line items as well, but this is the first actually new line
+item since then.
+
+--------------------------------------------------------------------------------
+BUGS:
-Bugs:
1. Big bug fix: if -z used, and -p, and user had partitions mounted in $HOME
directory, the partitions would buggily duplicate in the output.
@@ -707,58 +9265,61 @@ directory, the partitions would buggily duplicate in the output.
because it was using the wrong Xorg log, it was only searcing in the original
/var/log/Xorg.0.log file, not the newer alternative path locations.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. Both an enhancement and a fix, users reported Xorg log file location changes.
Fix is that now inxi uses wildcard searches of all readable locations that can
-contain the log files, then collects a list of them, and uses the last modified
-one. This ensures that the best possible guess is made about which actual
-log file is current, which should lead to significantly more reliable Xorg
-driver reports overall.
+contain the log files, then collects a list of them, and uses the last modified
+one. This ensures that the best possible guess is made about which actual log
+file is current, which should lead to significantly more reliable Xorg driver
+reports overall.
Note that this fix works for user level and root level, it will always use the
-most recent readable file no matter what. For root, that should translate to
-the most recent on an absolute level Xorg log file. This issue was caused by
-gdm moving from Xorg.0.log to Xorg.1.log on some systems, but not all, and
-also, the location is often but not always now:
-~/.local/share/xorg/Xorg.[01234..].log [except for root, which is why
-root has to search for all user Xorg log files to find the most recent one.
+most recent readable file no matter what. For root, that should translate to the
+most recent on an absolute level Xorg log file. This issue was caused by gdm
+moving from Xorg.0.log to Xorg.1.log on some systems, but not all, and also, the
+location is often but not always now: ~/.local/share/xorg/Xorg.[01234..].log
+[except for root, which is why root has to search for all user Xorg log files to
+find the most recent one.
There were many red-herrings in this issue report, so it took some research to
dig through those to the real data sources.
-2. Now that the compositor detection is out of early testing mode, enabled
-always on compositor detection for Wayland systems. Since the compositor
-is the Wayland display server, it makes sense to always show it if Wayland.
-Note that there is still no known way to actually reliably get Wayland data
-beyond simple environmental variables that let inxi detect Wayland is running
-the desktop. Lack of reliable logs or debugging tools across Wayland compositors
-makes this entire process about 10-50x more difficult than it should have been.
+2. Now that the compositor detection is out of early testing mode, enabled
+always on compositor detection for Wayland systems. Since the compositor is the
+Wayland display server, it makes sense to always show it if Wayland. Note that
+there is still no known way to actually reliably get Wayland data beyond simple
+environmental variables that let inxi detect Wayland is running the desktop.
+Lack of reliable logs or debugging tools across Wayland compositors makes this
+entire process about 10-50x more difficult than it should have been.
3. In keeping with 2., also moved compositor: item to be right after server:
item.
4. Debian bug:
-https://bugs.debian.org/cgi-bin/pkgreport.cgi?dist=unstable;package=inxi
-requested that HTTP::Tiny be set to default always check SSL certificates.
-Now inxi does that, and --no-ssl flag disables this, which makes the Perl
-http downloader now work roughly the same as wget, curl, etc.
-
-5. Man page fixes, added pointer placeholders for out of alphabetical order
-options, so you can find anything by looking down the alpha sorted lists, like:
---swap - See -j. Since inxi is running out of single letters that match new
-features, it's easier to point man readers to the right item without them
-having to already know it to find it. Also added --dbg [2-xx] pointer to
-github inxi-perl/docs/inxi-values.txt so people interested can learn how to
-trip the various per feature screen debuggers.
-
-Enhancements:
+https://bugs.debian.org/cgi-bin/pkgreport.cgi?dist=unstable;package=inxi
+requested that HTTP::Tiny be set to default always check SSL certificates. Now
+inxi does that, and --no-ssl flag disables this, which makes the Perl http
+downloader now work roughly the same as wget, curl, etc.
+
+5. Man page fixes, added pointer placeholders for out of alphabetical order
+options, so you can find anything by looking down the alpha sorted lists, like:
+--swap - See -j. Since inxi is running out of single letters that match new
+features, it's easier to point man readers to the right item without them having
+to already know it to find it. Also added --dbg [2-xx] pointer to github
+inxi-perl/docs/inxi-values.txt so people interested can learn how to trip the
+various per feature screen debuggers.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. updated ubuntu ids, added 'focal LTS'.
2. USB Graphic devices added. This will add support for USB graphics adapters,
an uncommon but existing category, often used in SOC boards, for example, but
-also on desktops, and things like USB webcams. Leaving these off was really
-just an oversight, the programming internally had the data, it just wasn't
-using it.
+also on desktops, and things like USB webcams. Leaving these off was really just
+an oversight, the programming internally had the data, it just wasn't using it.
3. Support added for TV card type multimedia devices in Graphics. That was
actually a long term oversight, I'd simply missed that in the device ID
@@ -772,14 +9333,15 @@ but if xrandr is missing, the Screen information shows.
Technically for -G, -Gxx, end users see very little difference except the per
Screen / per Monitor resolutions are listed with a 1: type counter per item.
-Note that Xorg Screens are NOT Monitors, they are a virtual space Xorg constructs
-out of the pieces of hardware that make up the Screen space. In many cases,
-1 Xorg Screen contains only 1 Monitor, but the dimensions or dpi are frequenty
-different.
+Note that Xorg Screens are NOT Monitors, they are a virtual space Xorg
+constructs out of the pieces of hardware that make up the Screen space. In many
+cases, 1 Xorg Screen contains only 1 Monitor, but the dimensions or dpi are
+frequenty different.
New output items:
-Display: ... display ID: [Xorg Screen identifier, like :0.0]; screens: [Total Xorg
-Screens in current Display]; [s-default: [if > 1 Screens, default Screen number]]
+Display: ... display ID: [Xorg Screen identifier, like :0.0]; screens: [Total
+Xorg Screens in current Display]; [s-default: [if > 1 Screens, default Screen
+number]]
Screen-x: [Screen number]; s-res: [Xorg Screen resolution];
s-dpi: [Xorg Screen dpi]; s-size: [Xorg Screen mm (inch) size;
@@ -790,69 +9352,70 @@ hz: [actual monitor reported frequency]; dpi: [actual monitor dpi as calculated
from actual monitor resolution/size; size: [actual monitor size in mm (inch);
diag: [actual diagonal size in mm (inch).
-4a. -Gxx now shows Xorg s-dpi: for the Screen as well, after the main resolution
+4a. -Gxx now shows Xorg s-dpi: for the Screen as well, after the main resolution
section for -G.
5. Big improvement in error messages and logging for Xorg driver detections,
-this logic is much more robust now, but after the main driver fix, also much less
-likely to ever be seen.
-
-6. Almost not visible to users, but major internal graphics refactor allows now
-for more modular treatment, and eventual Wayland data sourcing. Currently
-most Wayland data sourcing is in stub form, or only logically possible, but
-as it grows possible (if ever, since Wayland protocal appears to have totally
-neglected enforcing single location logging, and single tool debugging for
-the entire Wayland protocol of compositors, a massive oversight in my view).
-The -Ga refactors internally made this much more possible, and I integrated
-switches and tests, and fallbacks, and stubs in some locations, so it was
-clear where current Xorg specific logic is, and where future Wayland logic
-will fit in, sort of anyway.
+this logic is much more robust now, but after the main driver fix, also much
+less likely to ever be seen.
+
+6. Almost not visible to users, but major internal graphics refactor allows now
+for more modular treatment, and eventual Wayland data sourcing. Currently most
+Wayland data sourcing is in stub form, or only logically possible, but as it
+grows possible (if ever, since Wayland protocal appears to have totally
+neglected enforcing single location logging, and single tool debugging for the
+entire Wayland protocol of compositors, a massive oversight in my view). The -Ga
+refactors internally made this much more possible, and I integrated switches and
+tests, and fallbacks, and stubs in some locations, so it was clear where current
+Xorg specific logic is, and where future Wayland logic will fit in, sort of
+anyway.
7. Debugger tools added for new features, or most of them.
-8. New primary line item: --swap / -j. This moves all swap data to a dedicated
-Swap: line, which looks roughly the same as Partition: lines, but when -j/--swap
+8. New primary line item: --swap / -j. This moves all swap data to a dedicated
+Swap: line, which looks roughly the same as Partition: lines, but when -j/--swap
is used, all swap types, not only physical partition swaps, show. This should
make some users happy.
-9. Added more cpu family IDs for Zen 2 series of cpu, tweaked some later
-Intel cpu family ids in terms of cpu arch name tool.
-
-10. By request, added ability filter out all UUID or Partition Label
-strings in -j, -o, -Sa, -p, -P. Those are tripped by --filter-label and
---filter-uuid. Mostly useful in fringe cases, for example, replacing
-label or UUID from -Sa kernel boot parameters with root=LABEL=<filter>,
-or in cases you want to show full -v8 output without showing UUID or Labels,
-whatever.
-
-11. Added --no-dig/--dig plus configuration option NO_DIG=true. This disables
-dig in cases where dig is installed but failed due to maybe network firewall
-rules or something, and WAN IP detection fails. Normally you always want
-to use dig, it's faster, more reliable, and safer, than all the other regular
-downloader based methods, but we have seen server setups where for some reason
+9. Added more cpu family IDs for Zen 2 series of cpu, tweaked some later Intel
+cpu family ids in terms of cpu arch name tool.
+
+10. By request, added ability filter out all UUID or Partition Label strings in
+-j, -o, -Sa, -p, -P. Those are tripped by --filter-label and --filter-uuid.
+Mostly useful in fringe cases, for example, replacing label or UUID from -Sa
+kernel boot parameters with root=LABEL=<filter>, or in cases you want to show
+full -v8 output without showing UUID or Labels, whatever.
+
+11. Added --no-dig/--dig plus configuration option NO_DIG=true. This disables
+dig in cases where dig is installed but failed due to maybe network firewall
+rules or something, and WAN IP detection fails. Normally you always want to use
+dig, it's faster, more reliable, and safer, than all the other regular
+downloader based methods, but we have seen server setups where for some reason
those types of dig requests were blocked, thus disabling WAN IP detection.
-12. Added in WAN IP failure case, if dig was used, suggestion to try
-again with --no-dig, since most users are unlikely to learn about this issue,
-or the solution to it.
+12. Added in WAN IP failure case, if dig was used, suggestion to try again with
+--no-dig, since most users are unlikely to learn about this issue, or the
+solution to it.
-13. Added single letter shortcut -J for --usb, maybe this will help people
+13. Added single letter shortcut -J for --usb, maybe this will help people
discover usb component of inxi, now you can request for instance: inxi -FJaz
-14. Added xonsh to supported shells, that had tripped a perl undefined value
-for start client bug since xonsh uses single word for version, xonsh/234
-so the default value, 2nd word, was undefined.
+14. Added xonsh to supported shells, that had tripped a perl undefined value for
+start client bug since xonsh uses single word for version, xonsh/234 so the
+default value, 2nd word, was undefined.
+
+15. More SSD and USB drive vendors from the endless fountain over at Linux
+Hardware Database (linuxliteos.com).
-15. More SSD and USB drive vendors from the endless fountain over at
-Linux Hardware Database (linuxliteos.com).
+--------------------------------------------------------------------------------
+CHANGES:
-Changes:
-1. Small change in how screen resolutions are output in -G non -a mode,
-now each Screen / Monitor will increment by 1 the 1: [resolution~hz] key.
-This helps make it more readable. Note that in non -a mode, the increments
-are just based on Screen, then Monitor, Monitor, Screen, and so on, counts.
-Most users will only have one Screen systems, but more advanced setups may use
-the Xorg > 1 Screen, each screen able to run > 1 monitors.
+1. Small change in how screen resolutions are output in -G non -a mode, now each
+Screen / Monitor will increment by 1 the 1: [resolution~hz] key. This helps make
+it more readable. Note that in non -a mode, the increments are just based on
+Screen, then Monitor, Monitor, Screen, and so on, counts. Most users will only
+have one Screen systems, but more advanced setups may use the Xorg > 1 Screen,
+each screen able to run > 1 monitors.
The counts in say, a 2 Screen system, with 3 monitors, would be:
1: res1 [from screen 0, monitor 1] 2: res2 [from screen 0, monitor 2]
@@ -861,175 +9424,233 @@ The counts in say, a 2 Screen system, with 3 monitors, would be:
If xrandr is not installed, it would show:
1: res1 [from screen 0] 2: res2 [from screen 1]
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 22 Apr 2020 19:33:56 -0700
-=====================================================================================
+================================================================================
Version: 3.0.38
Patch: 00
Date: 2020-03-14
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, man page, exciting changes!!
-Bugs:
+--------------------------------------------------------------------------------
+BUGS:
+
1. Fixed undefined error that could happen, in rare cases, in hdd_temp logic.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. Fixed Elbrus cpu nazming, model 9 is 8CV, not 8CB (Cyrillic error)
+
2. Preventitive, was not using '-' quite correctly in all regex ranges.
+
3. Had wrong desktop string listed in Unity
-4. Reordered Family/Drive model in usb drive reports, it's to make it
-more obvious what is what.
+
+4. Reordered Family/Drive model in usb drive reports, it's to make it more
+obvious what is what.
+
5. Adjusted indexing of splits to get better results in corner cases.
+
6. Fixed some numbering issues.
-7. Added trimming n1 from nvme0 type names for nvme, this corrects some
-issues users were having.
+
+7. Added trimming n1 from nvme0 type names for nvme, this corrects some issues
+users were having.
+
8. Fixed a division by 0 error in smartctl data grabber.
+
9. Fixed a Perl issue, didn't realize perl treats 000 as a string, not 0.
-10. Another Perl fix, int() only wants to get numeric values sent to it,
-I'd assumed a different behavior, non numerics get converted to 0, but that's
-not how Perl sees things. Things like this, by the way, are why Perl is so
-absurdly fast.
-Enhancements:
-1. More disk vendors. The list will never be complete!! We have found eternal
+10. Another Perl fix, int() only wants to get numeric values sent to it, I'd
+assumed a different behavior, non numerics get converted to 0, but that's not
+how Perl sees things. Things like this, by the way, are why Perl is so absurdly
+fast.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. More disk vendors. The list will never be complete!! We have found eternal
churn!! Thanks to linux lite hardware database as always.
+
2. Big one!!! Now inxi uses smartctl data, if installed, for getting advanced
-drive information (with -a). See man and help for details. Will show failing drives,
-etc. Lots of info can be available, but sometimes data is not in smartctl db,
-so inxi can't find it, that's not an inxi bug, it's just how it is.
+drive information (with -a). See man and help for details. Will show failing
+drives, etc. Lots of info can be available, but sometimes data is not in
+smartctl db, so inxi can't find it, that's not an inxi bug, it's just how it is.
+
3. Made hours on more human readable, into days/hours, for -a smartctl disk
report.
-4. Added $test[12] for smartctl data printout, and $test[13] for disk array print out.
-Note that advanced debugger outputs can change or vary depending on what is being
-worked on so don't in general rely on these always being around. But they do
-tend to say stuck in place once I add them.
-5. Added some nvme stuff, spare reserve, if you need it, you'll appreciate it,
+
+4. Added $test[12] for smartctl data printout, and $test[13] for disk array
+print out. Note that advanced debugger outputs can change or vary depending on
+what is being worked on so don't in general rely on these always being around.
+But they do tend to say stuck in place once I add them.
+
+5. Added some nvme stuff, spare reserve, if you need it, you'll appreciate it,
if not, you'll never know it's there.
+
6. By request from some forum issue thread: made --host only be shown onif not
---filter or not --host. This makes -z remove hostname, but retains ability to
-do absolute overrides. Hostname should have always been filtered out like that,
-it was an oversight. I think that was Manjaro who asked that, but I forget.
-Note that this change, as usual, will not alter expected behaviors if users
-have config item for hostname set.
-7. Added support for picom compositor, thanks user codebling for that, I think
+--filter or not --host. This makes -z remove hostname, but retains ability to do
+absolute overrides. Hostname should have always been filtered out like that, it
+was an oversight. I think that was Manjaro who asked that, but I forget. Note
+that this change, as usual, will not alter expected behaviors if users have
+config item for hostname set.
+
+7. Added support for picom compositor, thanks user codebling for that, I think
that's compiz fork, the real branch that is that is being developed.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 14 Mar 2020 22:56:32 -0700
-=====================================================================================
+================================================================================
Version: 3.0.37
Patch: 00
Date: 2019-11-19
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, man page, exciting changes!!
-Bugs:
-1. issue #200 - forgot to add all variants for -p, now works with --partition-full
-and --partitions-full
-2. issue #199 - another one, forgot to add --disk to -D for long version. Thanks
+--------------------------------------------------------------------------------
+BUGS:
+
+1. issue #200 - forgot to add all variants for -p, now works with
+--partition-full and --partitions-full
+
+2. issue #199 - another one, forgot to add --disk to -D for long version. Thanks
adrian15 for both of these, he was testing something and discovered these were
missing.
-3. Issue #187 an issue with RAID syntax not being handled in a certain case,
-thanks EnochTheWise for following through on this one. This turned out to be
-a bad copy paste, a test pattern did not match the match pattern.
-Fixes:
+3. Issue #187 an issue with RAID syntax not being handled in a certain case,
+thanks EnochTheWise for following through on this one. This turned out to be a
+bad copy paste, a test pattern did not match the match pattern.
+
+--------------------------------------------------------------------------------
+FIXES:
+
1. Fixed some docs typos.
+
2. Issue #188 fixed protections and filters for some glxinfo output handlers.
+
3. Issue #195, for Elbrus bit detection.
-4. Added filter to cpu data, was not skipping if arm, so Model string
-was treated numerically.
-Enhancements:
-1. Added rescatux to Debian system base detections. This closes issue #202, again
-from adrian15, thanks.
+4. Added filter to cpu data, was not skipping if arm, so Model string was
+treated numerically.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added rescatux to Debian system base detections. This closes issue #202,
+again from adrian15, thanks.
+
2. For cpu architecture, updated for latest AMD ryzen and other families, like
Zen 3, which is just coming out re available data. Also latest Intel, which are
-trickier to ID right now, but I think I got the latest ones right,
-That's things like coffee lake, amber lake, comet lake, etc.
-3. Huge one, full (hopefully out of the box) Russian Elbrus CPU support. Thanks
-to the alt-linux and the others who helped provide data and feedback to get support.
-Note that this was also part of correcting 64 bit detection for e2k type, which
-is how Elbrus IDs internally. See issue #197 which I've left open for the time
-being for more information on this CPU and how it's now handled by inxi.
-Note all available data should now work for Elbrus, including physical cpu/core
-counts etc. Elbrus do not show flag information, nor do they use min/max speed,
-so that data isn't available, but everything else seems to work well.
-4. Eternal disk vendors. Thanks linux lite hardware database, you continue to
-help make the disk vendor feature work by supplying every known vendor ever seen.
-5. To close debian bug report https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=942194
-Note that the fix is simply to give the user the option to disable this behavior
-with the new --no-sudo and NO_SUDO configuration file options. This issue should
-never have been filed as a bug since even the poster admitted it was a wishlist
-item, but because of how debian bug tracker works, it's hard to get rid of
-invalid bugs. Note that this is the internal use of sudo for hddtemp and file,
-not starting inxi with sudo, so using this option or configuration item just
-removes sudo from the command. Note that because the user did not do as
-requested, and never actually filed a github wishlist issue, and since his
-request was vague and basically pointless, the fix is just to let you switch
-off sudo, that's all.
-Note that another user had commented on sudo firing off admin emails on servers,
-and that was in a different context, some time ago, that's what this option really
-is useful for, if you want to just disable sudo fires internally to avoid admin
-server email alerts, basically.
-
------------------------------------
+trickier to ID right now, but I think I got the latest ones right, That's things
+like coffee lake, amber lake, comet lake, etc.
+
+3. Huge one, full (hopefully out of the box) Russian Elbrus CPU support. Thanks
+to the alt-linux and the others who helped provide data and feedback to get
+support. Note that this was also part of correcting 64 bit detection for e2k
+type, which is how Elbrus IDs internally. See issue #197 which I've left open
+for the time being for more information on this CPU and how it's now handled by
+inxi. Note all available data should now work for Elbrus, including physical
+cpu/core counts etc. Elbrus do not show flag information, nor do they use
+min/max speed, so that data isn't available, but everything else seems to work
+well.
+
+4. Eternal disk vendors. Thanks linux lite hardware database, you continue to
+help make the disk vendor feature work by supplying every known vendor ever
+seen.
+
+5. To close debian bug report
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=942194 Note that the fix is
+simply to give the user the option to disable this behavior with the new
+--no-sudo and NO_SUDO configuration file options. This issue should never have
+been filed as a bug since even the poster admitted it was a wishlist item, but
+because of how debian bug tracker works, it's hard to get rid of invalid bugs.
+Note that this is the internal use of sudo for hddtemp and file, not starting
+inxi with sudo, so using this option or configuration item just removes sudo
+from the command. Note that because the user did not do as requested, and never
+actually filed a github wishlist issue, and since his request was vague and
+basically pointless, the fix is just to let you switch off sudo, that's all.
+
+Note that another user had commented on sudo firing off admin emails on servers,
+and that was in a different context, some time ago, that's what this option
+really is useful for, if you want to just disable sudo fires internally to avoid
+admin server email alerts, basically.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 19 Nov 2019 20:18:15 -0800
-=====================================================================================
+================================================================================
Version: 3.0.36
Patch: 00
Date: 2019-08-14
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, many small fixes.
-Bugs:
-1. Issue #188 exposed a situation in glxinfo where the required opengl fields are
-present but contain null data. This happens when a system does not have the required
-opengl drivers, which was the case here. inxi failed to handle that. Thanks
-LinuxMonger for posting the required data to figure this corner case out.
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Issue #187 EnochTheWise (?) did not supply the required debugger data so
+there is a RAID ZFS issue that will not get fixed until the required debugger
+data is supplied.
+
+Note that a key way we get issues here is from Perl errors on the screen, which
+are a frequent cause of someone realizing something is wrong. This is why I'm
+not going to do a hack fix for the RAID ZFS issue, then the error messages will
+go away, and it will likely never get handled.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Issue #188 exposed a situation in glxinfo where the required opengl fields
+are present but contain null data. This happens when a system does not have the
+required opengl drivers, which was the case here. inxi failed to handle that.
+Thanks LinuxMonger for posting the required data to figure this corner case out.
2. Fixed a long time bug in Disk vendor ID, there was an eq (string equals)
-where it was supposed to use regex pattern match. Oops. Would have led to
-disk vendor id failures in several cases.
+where it was supposed to use regex pattern match. Oops. Would have led to disk
+vendor id failures in several cases.
+
+--------------------------------------------------------------------------------
+FIXES:
-Fixes:
1. help, man updates for RAM/Memory data, more clarifications.
2. Refactored RepoData class/package, to make it easier to handle repo string
data, and make it all overall cleaner internally, and enable future extensions
to certain features in inxi that may or may not one day become active.
-3. Added to some regex compares \Q$VAR\E to disable regex characters in strings.
+3. Added to some regex compares \Q$VAR\E to disable regex characters in strings.
I should have used that a long time ago, oh well, better late than never!
-4. Found a horrible case were xdpyinfo uses 'preferred' instead of the actual
-pixel dimensions, shame on whoever allowed that output!!! shame! Had to add
-a workaround to make sure numeric values are present, if not, then use the
-fallback, which means, 2x more data parsing to get data that should not
-require that, but in this example, it did (an Arch derivative, but it could
-be xdpyinfo itself, don't know).
+4. Found a horrible case were xdpyinfo uses 'preferred' instead of the actual
+pixel dimensions, shame on whoever allowed that output!!! shame! Had to add a
+workaround to make sure numeric values are present, if not, then use the
+fallback, which means, 2x more data parsing to get data that should not require
+that, but in this example, it did (an Arch derivative, but it could be xdpyinfo
+itself, don't know).
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
-Enhancements:
-1. More fixes on issue #185. Thanks tubecleaner for finding and provding required
-data to really solve a set of RAM issues that apply particularly in production
-systems. This issue report led to 2 new options: --memory-short, which only
-shows a basic RAM report.
+1. More fixes on issue #185. Thanks tubecleaner for finding and provding
+required data to really solve a set of RAM issues that apply particularly in
+production systems. This issue report led to 2 new options: --memory-short,
+which only shows a basic RAM report.
Memory: RAM: total: 31.43 GiB used: 14.98 GiB (47.7%)
Report: arrays: 1 slots: 4 modules: 2 type: DDR4
-And a 2nd, --memory-modules, only shows the occupied slots. This can be
-useful in situations where it's a server or vm with a lot of slots, most empty:
+And a 2nd, --memory-modules, only shows the occupied slots. This can be useful
+in situations where it's a server or vm with a lot of slots, most empty:
Memory: RAM: total: 31.43 GiB used: 15.44 GiB (49.1%)
Array-1: capacity: 256 GiB slots: 4 EC: None
@@ -1038,643 +9659,813 @@ Memory: RAM: total: 31.43 GiB used: 15.44 GiB (49.1%)
Note that both of these options trigger -m, so -m itself is not required.
-2. More disk vendors!! The list never ends! Thanks linux-lite hardware database
-and users for supplying, and buying/obtaining, apparently every disk known to
+2. More disk vendors!! The list never ends! Thanks linux-lite hardware database
+and users for supplying, and buying/obtaining, apparently every disk known to
mankind.
3. Added fallback XFCE detection, in cases were the system does not have xprop
-installed, it's still possible to do a full detection of xfce, including toolkit,
-so now inxi does that, one less dependency to detect one more desktop.
+installed, it's still possible to do a full detection of xfce, including
+toolkit, so now inxi does that, one less dependency to detect one more desktop.
4. Added vmwgfx driver to xorg drivers list. Note, I've never actually seen this
-in the wild, but I did see it as the kernel reported driver from lspci, so it
+in the wild, but I did see it as the kernel reported driver from lspci, so it
may exist.
-Unfixed:
-1. Issue #187 EnochTheWise (?) did not supply the required debugger data so there
-is a RAID ZFS issue that will not get fixed until the required debugger data is
-supplied.
-
-Note that a key way we get issues here is from Perl errors on the screen, which are
-a frequent cause of someone realizing something is wrong. This is why I'm not going
-to do a hack fix for the RAID ZFS issue, then the error messages will go away, and
-it will likely never get handled.
-
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 14 Aug 2019 10:47:47 -0700
-=====================================================================================
+================================================================================
Version: 3.0.35
Patch: 00
Date: 2019-07-15
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version. Bug fixes, updates.
-Bugs:
-1. Issue #185 exposed a small long standing bug in ram max module size logic.
-Was not retaining the value each loop iteration, which could lead to way off
-max module size guesses. Note that this could lead to a VERY wrong max module size
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Issue #185 exposed a small long standing bug in ram max module size logic.
+Was not retaining the value each loop iteration, which could lead to way off max
+module size guesses. Note that this could lead to a VERY wrong max module size
report.
+
2. Issue #185 also exposed a rarely seen undefined value for ram reports, was
not tested for undefined, now is.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. cleanup of comments in start client debugger that made it unclear.
-2. Got rid of all the legacy development modules that were in inxi-perl/modules.
+
+2. Got rid of all the legacy development modules that were in inxi-perl/modules.
These were totally out of date and pointless to retain.
-Enhancements:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Added eoan ubuntu 19-10 release name
+
2. Added zen cpu model ID.
+
3. Disk vendors and new vendor IDs added. Thanks linuxlite hardware database.
+
4. Made a backend tool to check for new unhandled disks, this makes updating
disk/vendor IDs a lot easier.
+
5. Updated inxi-perl/docs with new links etc.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 15 Jul 2019 19:48:45 -0700
-=====================================================================================
+================================================================================
Version: 3.0.34
Patch: 00
Date: 2019-04-30
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man, new feature!! Bug fixes!
-Bugs:
-1. issue #182 - in freebsd, there was an oversight in the pciconf parser, it
-was using unfiltered strings as regex pattern, and of course, a string flipped
-an error. Fix was to add the regex cleaner to the string before it's used in test.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. issue #182 - in freeBSD, there was an oversight in the pciconf parser, it was
+using unfiltered strings as regex pattern, and of course, a string flipped an
+error. Fix was to add the regex cleaner to the string before it's used in test.
2. NOTE: issue #182 had a second bug, but the issue poster didn't follow up with
-data or output so it couldn't be fixed. This was related to a syntax change in
+data or output so it couldn't be fixed. This was related to a syntax change in
usbdevs -v output in FreeBSD. Such changes are too common, but it might also
-simply be a variant I have not seen or handled, but so far no data, so can't fix.
-Don't blame me if you get this bug, but do post requested debugger data if you
-want it fixed!
+simply be a variant I have not seen or handled, but so far no data, so can't
+fix. Don't blame me if you get this bug, but do post requested debugger data if
+you want it fixed!
+
+--------------------------------------------------------------------------------
+FIXES:
-Fixes:
1. Updated man for weather, explained more clearly how to use country codes for
-weather output. More clarifying in general about weather location, and weather
+weather output. More clarifying in general about weather location, and weather
restrictions.
-Enhancements:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Added avx/avx2 to default flag list in -C short form. Thanks damentz from
-liquorix for clarifying why that was a good idea. Note the initial issue came up
-in a Debian issue report, not here. People!! please post issues here, and don't bug
-maintainers with feature requests! Maintainers aren't in a position to add a feature,
-so you should go straight to the source.
+liquorix for clarifying why that was a good idea. Note the initial issue came up
+in a Debian issue report, not here. People!! please post issues here, and don't
+bug maintainers with feature requests! Maintainers aren't in a position to add a
+feature, so you should go straight to the source.
1.a. Created in inxi-perl/docs new doc file: cpu-flags.txt, which explains all
the flags, and also covers the short form flags and explains why they are used.
2. To resolve another issue, I made a new documentation file:
-inxi-perl/docs/inxi-custom-recommends.txt
-This is instructions for maintainers of distros who do not use rpm/apt/pacman but
-still want the --recommends feature to output their package pool package names for
-missing packages. I decided to not allow more than the default 3 package managers
-because no matter what people say, if I allow in more, the maintainer will vanish
-or lose interest, and I'll be stuck having to maintain their package lists forever.
+inxi-perl/docs/inxi-custom-recommends.txt This is instructions for maintainers
+of distros who do not use rpm/apt/pacman but still want the --recommends feature
+to output their package pool package names for missing packages. I decided to
+not allow more than the default 3 package managers because no matter what people
+say, if I allow in more, the maintainer will vanish or lose interest, and I'll
+be stuck having to maintain their package lists forever.
Also, it's silly to even include that package list for any distro that does not
-use rpm/apt/pacman, since the list is just wasted lines. Instructions in doc file
-show what to change, and how, and has an example to make it clear. Odds of this
-actually being used? Not high, lol, but that's fine, if people want it done, they
-can do it, if not, nothing bad happens, it just won't show any suggested install
-package, no big deal.
-
-3. Using the new disk vendor method, added even more disk vendors. Thanks
-linux lite hardware database!!
-
-4. EXCITING!! A new --admin/-a option, suggested by a user on techpatterns.com/forums/
-Now -S or -b or -F with -a option for GNU/Linux shows the kernel boot parameters,
-from /proc/cmdline. Didn't find anything comparable for BSDs, if you can tell me
-where to look, I'll add it for those too, but wasn't anywhere I looked. Do the
-BSDs even use that method? Don't know, but the logic is there, waiting to be used
-if someone shows me how to get it cleanly. The 'parameters:' item shows in the main
-'System:' -S output, and will just show the entire kernel parameters used to boot.
+use rpm/apt/pacman, since the list is just wasted lines. Instructions in doc
+file show what to change, and how, and has an example to make it clear. Odds of
+this actually being used? Not high, lol, but that's fine, if people want it
+done, they can do it, if not, nothing bad happens, it just won't show any
+suggested install package, no big deal.
+
+3. Using the new disk vendor method, added even more disk vendors. Thanks linux
+lite hardware database!!
+
+4. EXCITING!! A new --admin/-a option, suggested by a user on
+techpatterns.com/forums/ Now -S or -b or -F with -a option for GNU/Linux shows
+the kernel boot parameters, from /proc/cmdline. Didn't find anything comparable
+for BSDs, if you can tell me where to look, I'll add it for those too, but
+wasn't anywhere I looked. Do the BSDs even use that method? Don't know, but the
+logic is there, waiting to be used if someone shows me how to get it cleanly.
+The 'parameters:' item shows in the main 'System:' -S output, and will just show
+the entire kernel parameters used to boot.
This could be very helpful to distros who often have to determine if for example
-graphics blacklists are correctly applied for non free drivers, like nomodeset etc,
-or if the opposite is present.
+graphics blacklists are correctly applied for non free drivers, like nomodeset
+etc, or if the opposite is present.
For forum/distro support, they just have to ask for: inxi -ba and they will see
-the relevant graphics info, for instance, or -SGaxxx, or -Faxxx, whatever is used
-to trigger in this case the graphics and system lines.
+the relevant graphics info, for instance, or -SGaxxx, or -Faxxx, whatever is
+used to trigger in this case the graphics and system lines.
-5. Updated man/help for 4 as well, now explains what they will see with --admin/
--a options and -S. Good user suggestion, I wish all new features were this easy,
+5. Updated man/help for 4 as well, now explains what they will see with --admin/
+-a options and -S. Good user suggestion, I wish all new features were this easy,
heh.
-
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 30 Apr 2019 17:37:10 -0700
-=====================================================================================
+================================================================================
Version: 3.0.33
Patch: 00
Date: 2019-03-29
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Weather explanations, disks, bugs!!
-Bugs:
-1. For sensors, in some cases, gpu failed to show correctly. This fixed issue #175
-
-Fixes:
-1. Made help/man explanations of weather changes more clear.
-Particularly in regards to no automated query info. But also for supported
-location syntaxes.
-2. Some corner cases of null weather data return null and tripped
-a null data error. This is corrected.
-3. Added city duplicate filter to weather output, this hopefully will
-in some cases avoid printing city name twice, depends on weather source.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. For sensors, in some cases, gpu failed to show correctly. This fixed issue
+#175
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Made help/man explanations of weather changes more clear. Particularly in
+regards to no automated query info. But also for supported location syntaxes.
+
+2. Some corner cases of null weather data return null and tripped a null data
+error. This is corrected.
+
+3. Added city duplicate filter to weather output, this hopefully will in some
+cases avoid printing city name twice, depends on weather source.
+
4. Removed --weather-source option 0, that no longer works so all code was
removed.
-5. More deb822 fixes, loosened up even more syntax. That's a poorly designed
+
+5. More deb822 fixes, loosened up even more syntax. That's a poorly designed
config syntax, hard to work with.
-Enhancements:
-1. Lots of new disk vendors. So many!! Thanks linux-lite hardware database!
-switched to a new method of getting disk name/vendor data, now it's a lot easier
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Lots of new disk vendors. So many!! Thanks linux-lite hardware database!
+switched to a new method of getting disk name/vendor data, now it's a lot easier
to check for new ones.
+
2. Added fancybar to desktop info.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 29 Mar 2019 14:03:51 -0700
-=====================================================================================
+================================================================================
Version: 3.0.32
Patch: 00
Date: 2019-02-07
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. A few more modifications to weather.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. In case with zero wind speed, it now shows zero, not N/A, as expected.
-Enhancements:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Depending on weather source used:
* Shows precipitation, not rain/snow.
* Adds Sunrise/sunset (most sources do not have this)
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 07 Feb 2019 20:50:18 -0800
-=====================================================================================
+================================================================================
Version: 3.0.31
Patch: 00
Date: 2019-02-06
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man page. Big update! Get it in before your freeze!!
-Bugs:
-1. Maybe the vendor/product regex, which when + was used, would put out
-errors.
-2. Maybe Fix 4, since that could lead to incorrect behavior when sudo
-is involved depending on sudo configuration.
-3. BIG: current inxi weather will probably fail if not updated to this or
-newer versions!! Not an inxi bug per se, but your users will see it as one.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Maybe the vendor/product regex, which when + was used, would put out errors.
+
+2. Maybe Fix 4, since that could lead to incorrect behavior when sudo is
+involved depending on sudo configuration.
+
+3. BIG: current inxi weather will probably fail if not updated to this or newer
+versions!! Not an inxi bug per se, but your users will see it as one.
+
+--------------------------------------------------------------------------------
+FIXES:
-Fixes:
1. Fixed Patriot disk ID.
+
2. Fixes for PPC board handling.
-3. Regex cleaner fixes, this could lead to error in special cases of product
+
+3. Regex cleaner fixes, this could lead to error in special cases of product
vendor names.
-4. crazy from frugalware pointed out that $b_root detection was flawed, and
-relied on a bad assumption, particularly for sudo. As usual, he's right, that
-is now corrected, and uses $< Perl native to determine UID.
-Enhancements:
+4. crazy from frugalware pointed out that $b_root detection was flawed, and
+relied on a bad assumption, particularly for sudo. As usual, he's right, that is
+now corrected, and uses $< Perl native to determine UID.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Added septor to Debian system base.
+
2. Removed quiet filters for downloaders when using --dbg 1, now you see the
-entire download action for curl/wget downloads. This went along with
-issue # 174
+entire download action for curl/wget downloads. This went along with issue # 174
+
3. New feature: --wan-ip-url. This closed issue #174. Also has user config
option: WAN_IP_URL as well to make changes permanent.
+
4. Added --dbg 1 to man and help. The other --dbg options are random and can
change, but --dbg 1 is always for downloading, so might as well tell people
about it.
-5. To anticipate the loss of a major weather API, inxi is redone to use smxi.org
+
+5. To anticipate the loss of a major weather API, inxi is redone to use smxi.org
based robust API. This also allows for a new switch, --weather-source (or --ws
-for shorter version), options 0-9, which will trigger different APIs on smxi.org.
-Added WEATHER_SOURCE configuration option as well. Note that 4-9 are not
-currently active. Also added in better error handling for weather.
-The main benefit here is that inxi is now largely agnostic to the weather APIs
-used, and those can be changed with no impact to inxi users who are running
-frozen pool inxi's, or who have not updated their inxi versions.
-
-NOTE: all inxi versions older than 3.0.31 will probably fail for weather
-quite soon. So update your inxi version in your repos!!
+for shorter version), options 0-9, which will trigger different APIs on
+smxi.org. Added WEATHER_SOURCE configuration option as well. Note that 4-9 are
+not currently active. Also added in better error handling for weather. The main
+benefit here is that inxi is now largely agnostic to the weather APIs used, and
+those can be changed with no impact to inxi users who are running frozen pool
+inxi's, or who have not updated their inxi versions.
+
+NOTE: all inxi versions older than 3.0.31 will probably fail for weather quite
+soon. So update your inxi version in your repos!!
+
6. More disk vendors IDs and matches. Thanks linuxlite hardware database.
-7. Going along with weather changes, added, if present, cloud cover, rain, and
+
+7. Going along with weather changes, added, if present, cloud cover, rain, and
snow reports. Those are for previously observed hour.
+
8. Small change to Intel CPU architecture, taking a guess on stepping for
-skylake/Cascade lake ID. Guessing if stepping is > 4, it's cascade lake. But
-could not find this documented, so it's a guess. At worst, it means that Cascade
-lake, which must be a later steppingi than 4, will not be ID'ed as skylake.
+skylake/Cascade lake ID. Guessing if stepping is > 4, it's cascade lake. But
+could not find this documented, so it's a guess. At worst, it means that
+Cascade lake, which must be a later steppingi than 4, will not be ID'ed as
+skylake.
+
9. Documentation updates for data sources.
-Changes:
-1. inxi now uses a new system to get weather data. There is no longer a risk
-of weather failing if the API used locally in inxi fails or goes away. This
-change should be largely invisible to casual users.
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. inxi now uses a new system to get weather data. There is no longer a risk of
+weather failing if the API used locally in inxi fails or goes away. This change
+should be largely invisible to casual users.
+
2. In weather, moved dewpoint to be after humidity, which makes a little more
sense.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 06 Feb 2019 18:09:53 -0800
-=====================================================================================
+================================================================================
Version: 3.0.30
Patch: 00
Date: 2018-12-31
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man page.
-Bugs:
-1. Both a fix and a bug, in that inxi had an out of date list of Xorg drivers.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Both a fix and a bug, in that inxi had an out of date list of Xorg drivers.
This led to all the newer Intel devices failing to show their drivers in the
-Xorg driver lines, like i915, i965, and so on. Updated to full current list of
+Xorg driver lines, like i915, i965, and so on. Updated to full current list of
Xorg drivers. This is not technically a bug since it's simply things that came
into existence after that logic was last updated. But it looks like a bug.
-Fixes:
-1. Issues #170 and #168 showed a problem with inxi believing it was running in IRC
-when Ansible or MOTD started inxi. This is because they are not tty so trip the
-non tty flag, which assumes it's in IRC in that case. The fix was to add a
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Issues #170 and #168 showed a problem with inxi believing it was running in
+IRC when Ansible or MOTD started inxi. This is because they are not tty so trip
+the non tty flag, which assumes it's in IRC in that case. The fix was to add a
whitelist of known clients based on the parent name inxi discovers while running
-inside that parent. MOTD confirmed fixed, Ansible not confirmed. Why do people file
-issue reports then not follow up on them? Who knows.
+inside that parent. MOTD confirmed fixed, Ansible not confirmed. Why do people
+file issue reports then not follow up on them? Who knows.
+
Note that this issue is easy to trip by simply doing this: echo 'fred' | inxi
-which disables the tty test as well. To handle that scenario, that is, when inxi is
-not first in the pipe, I added many known terminal client names to the whitelists.
-This works in my tests, though the set of possible terminals, or programs with
-embedded terminals, is quite large, but inxi handles most of them automatically. When
-it doesn't, file an issue and I'll add your client ID to the whitelist, and use --tty
-in the meantime.
-2. Issue #171 by Vascom finally pinned down the wide character issue which manifests
-in some character sets, like greek or russian utf8. The fix was more of a work-around
-than a true fix, but inxi now simply checks the weather local time output for wide
-characters, and if detected, switches the local date/time format to iso standard,
-which does not contain non ascii characters as far as I can tell. This seemed to
-fix the issue.
+which disables the tty test as well. To handle that scenario, that is, when inxi
+is not first in the pipe, I added many known terminal client names to the
+whitelists. This works in my tests, though the set of possible terminals, or
+programs with embedded terminals, is quite large, but inxi handles most of them
+automatically. When it doesn't, file an issue and I'll add your client ID to the
+whitelist, and use --tty in the meantime.
+
+2. Issue #171 by Vascom finally pinned down the wide character issue which
+manifests in some character sets, like greek or russian utf8. The fix was more
+of a work-around than a true fix, but inxi now simply checks the weather local
+time output for wide characters, and if detected, switches the local date/time
+format to iso standard, which does not contain non ascii characters as far as I
+can tell. This seemed to fix the issue.
+
3. Added iso9660 from excluded file systems for partitions, not sure how inxi
missed that one for so long.
+
4. See bug 1, expanded and made current supported intel drivers, and a few other
-drivers, so now inxi has all the supported xorg drivers again. Updated docs as well
-to indicate where to get that data.
+drivers, so now inxi has all the supported xorg drivers again. Updated docs as
+well to indicate where to get that data.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
-Enhancements:
-1. As usual, more disk vendor/product ID matches, thanks to linuxlite hardware
+1. As usual, more disk vendor/product ID matches, thanks to linuxlite hardware
database, which never stops providing new or previously unseen disk ids. Latest
favorite? Swissarmy knife maker victorinox Swissflash usb device.
+
2. Added Elive system base ID.
+
3. Added Nutyx CARDS repo type.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 31 Dec 2018 20:54:08 -0800
-=====================================================================================
+================================================================================
Version: 3.0.29
Patch: 00
Date: 2018-12-10
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, fixes, updates, missing specs.
-Bugs:
+--------------------------------------------------------------------------------
+BUGS:
+
1. See fix 4, incorrect positioning of Trinity desktop detection logic.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. Vascom reports in issue #169 that some systems are making the /sys cpu
vulnerability data root read only. Added <root required> test and output.
-2. A while back, they added several chassis types in the smbios
-specifications. I used an older specification pdf file, this is now corrected.
-Note that realworld use of the new types exists, like tablet, mini pc, and so
-on. This missing data caused Machine report to list N/A as machine type when
-it was actually known. I'd been using an older specification PDF, and had
-failed to look at the actual spec download page, where you could clearly see
-the newer spec file. Corrected this in the inxi docs as well.
-3. Made gentoo repo reader check for case insensitive values for enabled.
-Also extended that to other repo readers that use similar syntax, they are
-all now case insensitive (Yes/yes/YES, that is)
-4. Fixed incorrect handling of Trinity desktop ID, that needed to happen in
-the kde ID block, as first test, not after it. Caused failure in Q4OS trinity,
-and maybe others. I'm not sure why inxi had the detection where it was, it
-made no real sense, so that's now nicely integrated, so these types of
-failures should not happen again. Thanks Q4OS for exposing that issue.
-
-Enhancements:
+
+2. A while back, they added several chassis types in the smbios specifications.
+I used an older specification pdf file, this is now corrected. Note that
+realworld use of the new types exists, like tablet, mini pc, and so on. This
+missing data caused Machine report to list N/A as machine type when it was
+actually known. I'd been using an older specification PDF, and had failed to
+look at the actual spec download page, where you could clearly see the newer
+spec file. Corrected this in the inxi docs as well.
+
+3. Made gentoo repo reader check for case insensitive values for enabled. Also
+extended that to other repo readers that use similar syntax, they are all now
+case insensitive (Yes/yes/YES, that is)
+
+4. Fixed incorrect handling of Trinity desktop ID, that needed to happen in the
+kde ID block, as first test, not after it. Caused failure in Q4OS trinity, and
+maybe others. I'm not sure why inxi had the detection where it was, it made no
+real sense, so that's now nicely integrated, so these types of failures should
+not happen again. Thanks Q4OS for exposing that issue.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Added TDM and CDM display managers. Never seen either (Q4OS uses TDM), TDM
corrected. CDM not confirmed, don't know if it's still around, but if it is
similar to TDM re cdm.pid in /run, it should be detected fine.
-2. Added more disk vendors/ids, the list never stops!! Thanks LinuxLite
-Hardware database, your users seem to use every disk known to humanity.
+
+2. Added more disk vendors/ids, the list never stops!! Thanks LinuxLite Hardware
+database, your users seem to use every disk known to humanity.
+
3. Added Debian derived Q4OS distro ID and system base handler.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 10 Dec 2018 11:08:47 -0800
-=====================================================================================
+================================================================================
Version: 3.0.28
Patch: 00
Date: 2018-11-28
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Fixes, enhancements.
-Bugs:
+--------------------------------------------------------------------------------
+BUGS:
+
1. ARM fix, odroid > 1 cpu speeds not showing correctly.
+
2. Ansible start fixes.
+
3. Fringe Battery failures, see Pinebook.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. Removed null data message 'old system' since that's not always the case.
+
2. Added support for > 1 CPU speeds in systems with > 1 CPU.
-3. Added is_numeric test for sudo version tests, that was tripping errors in
+
+3. Added is_numeric test for sudo version tests, that was tripping errors in
rare cases.
-4. Fine tuned terminal size setting to check that is int to correct the
-Ansible problem.
-5. ARM Pinebook fixes, battery, cpu. This also fixes corner cases where
-the battery charge state is missing but it is a systme battery.
-Enhancments:
+4. Fine tuned terminal size setting to check that is int to correct the Ansible
+problem.
+
+5. ARM Pinebook fixes, battery, cpu. This also fixes corner cases where the
+battery charge state is missing but it is a systme battery.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Added more disk ID matches/vendors. Thanks LinuxLite Hardware database!!
+
2. UKUI, ukwm, ukui-panel added to desktop data.
+
3. Added PopOS to system base.
+
4. Ansible/Chef user noted that inxi believes that it is running in IRC when
-started by Ansible / Chef (not sure about Chef but assuming it's the same).
+started by Ansible / Chef (not sure about Chef but assuming it's the same).
Added flag --tty flag to force inxi to believe it's running in shell no matter
what starts it. Note that this fix is not confirmed because the person didn't
confirm the fix. Annoying.
+
5. Added Ubuntu disco to ubuntu_id.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 29 Nov 2018 21:12:14 -0800
-=====================================================================================
+================================================================================
Version: 3.0.27
Patch: 00
Date: 2018-10-14
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man. Fixes, stitches, and returns!!
-Bugs:
-1. As a fix (3), failure to handle spaces in mount source names. More of a fix than
-a bug, since it was an old issue #63.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. As a fix (3), failure to handle spaces in mount source names. More of a fix
+than a bug, since it was an old issue #63.
+
2. OSX errors, BSD errors, but not really inxi errors or bugs, more weird data
-tripping null data or unreadable file errors, but I'll call those bugs since they
-look like bugs to end users. See Fixes for more.
+tripping null data or unreadable file errors, but I'll call those bugs since
+they look like bugs to end users. See Fixes for more.
+
3. See Fix 4, this is sort of a bug, inxi failed to return expected values on
success/failure.
-Fixes:
-1. One of the documented config items, COLS_MAX_NO_DISPLAY had not been implemented
-internally. This is now corrected.
+--------------------------------------------------------------------------------
+FIXES:
+
+1. One of the documented config items, COLS_MAX_NO_DISPLAY had not been
+implemented internally. This is now corrected.
+
2. Apple OSX was returning errors, those were fixed.
-3. Finally handled ancient issue #63, support now there for spaces in remote source
-name. This means that both spaces in source block name, and mount point name, are
-in theory both handled now. This was also to fix an osx issue #164 despite the
-fact that technically I do not support osx beyond fixing errors, but since in this
-case the issue was a long standing one, I fixed it for everything.
-4. Big fix, I'd completely left undone proper unix type error number returns in
-inxi, oops. Thanks Unit193 for noticing that and prompting me to fix it. Now inxi
-returns integer success/error numbers as expected.
-5. OSX xml based version info broke, of course, naturally it would, so I added in
-an osx fallback where if no distro version detected, use fallback unix method, which
-is what all the other unices use.
-6. Along with space in source name, fixed mapped handling a bit more too for
+
+3. Finally handled ancient issue #63, support now there for spaces in remote
+source name. This means that both spaces in source block name, and mount point
+name, are in theory both handled now. This was also to fix an osx issue #164
+despite the fact that technically I do not support osx beyond fixing errors, but
+since in this case the issue was a long standing one, I fixed it for everything.
+
+4. Big fix, I'd completely left undone proper unix type error number returns in
+inxi, oops. Thanks Unit193 for noticing that and prompting me to fix it. Now
+inxi returns integer success/error numbers as expected.
+
+5. OSX xml based version info broke, of course, naturally it would, so I added
+in an osx fallback where if no distro version detected, use fallback unix
+method, which is what all the other unices use.
+
+6. Along with space in source name, fixed mapped handling a bit more too for
partitions.
-6. Added cifs remote file system to disk size used blacklist, and iso9660. Not sure
-how I'd missed those for so long.
-7. OpenBSD vmstat in 6.3 changed the column order for avm/fre, and changed to a,
-sigh, human readable default format, in M, so to handle this for all bsds, I had
-to make a dynamic column detection for avm and fre, and use those after, and also
-i had to add in a M detection, if found, *1024 and strip out M, sigh.
-8. OpenBSD, another alternate ordering/syntax issue, the dmesg.boot data for disks
-does not always use the same order in comma separated list, saw user case where
-the first item after : was the MB size, not the second. Made detection dynamic.
-9. Due to Android case, found types where no cpu speed data was found, no max speed
-at least, which tripped an error due to null data for ARM, this is now handled,
-now cpu speed min/max read permissions in /sys are checked first before trying to
-read, and default failures are better handled.
-10. On man page, added in clarification of the moving of Memory: item from Info:
-line to ram Memory: line, explaining when it appears where. I am ambivalent about
-removing the item from -I, I may revert that change, I find it non-intuitive to
-move the Memory report around.
-
-Enhancements:
+
+6. Added cifs remote file system to disk size used blacklist, and iso9660. Not
+sure how I'd missed those for so long.
+
+7. OpenBSD vmstat in 6.3 changed the column order for avm/fre, and changed to a,
+sigh, human readable default format, in M, so to handle this for all BSDs, I had
+to make a dynamic column detection for avm and fre, and use those after, and
+also i had to add in a M detection, if found, *1024 and strip out M, sigh.
+
+8. OpenBSD, another alternate ordering/syntax issue, the dmesg.boot data for
+disks does not always use the same order in comma separated list, saw user case
+where the first item after : was the MB size, not the second. Made detection
+dynamic.
+
+9. Due to Android case, found types where no cpu speed data was found, no max
+speed at least, which tripped an error due to null data for ARM, this is now
+handled, now cpu speed min/max read permissions in /sys are checked first before
+trying to read, and default failures are better handled.
+
+10. On man page, added in clarification of the moving of Memory: item from Info:
+line to ram Memory: line, explaining when it appears where. I am ambivalent
+about removing the item from -I, I may revert that change, I find it
+non-intuitive to move the Memory report around.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Added display manager Ly, plus Ly version number. Thanks NamedKitten, this
closes issues #166 #165 #162
-2. Improved documentation a bit to avoid ambiguity re how to get colors in output.
-That handles issue #161, thanks fugo for the nudge to improve the documentation.
-3. First inxi on Android tests, using termux, which has a debian based apt
-type installer, got inxi running on at least two devices, including pixel2, but
+
+2. Improved documentation a bit to avoid ambiguity re how to get colors in
+output. That handles issue #161, thanks fugo for the nudge to improve the
+documentation.
+
+3. First inxi on Android tests, using termux, which has a debian based apt type
+installer, got inxi running on at least two devices, including pixel2, but
discovered that apparently as of android 5, /sys is now locked up in terms of
wildcard reads, but further analysis is required, but as of now, inxi works in
-termux, but fails to get any Device data for A, G, or N. Thus it also fails to match
-IF to Device, so none of the IP data shows up. The latter will probably be fixed
-since Android has ip and ifconfig already, or termux does, but so far I found no
-way to get device data for ARM in Android 5.x and greater (checked on
+termux, but fails to get any Device data for A, G, or N. Thus it also fails to
+match IF to Device, so none of the IP data shows up. The latter will probably be
+fixed since Android has ip and ifconfig already, or termux does, but so far I
+found no way to get device data for ARM in Android 5.x and greater (checked on
android 7 and 9 in real phones).
-4. More disk vendors!! thanks linuxlite / linux hardware database for offering an
-apparently never ending list of obscure and not so obscure disk vendors and
+
+4. More disk vendors!! thanks linuxlite / linux hardware database for offering
+an apparently never ending list of obscure and not so obscure disk vendors and
products.
-5. While I was unable to get confirmation or documentation on file names for
-tce repo files, I guessed that localmirrors would be used, but this may be
-any random text file in /opt at all, no extensions, I'd have to test to confirm
-or deny possible values.
+
+5. While I was unable to get confirmation or documentation on file names for tce
+repo files, I guessed that localmirrors would be used, but this may be any
+random text file in /opt at all, no extensions, I'd have to test to confirm or
+deny possible values.
+
6. To handle more complex debugger failures, added --debug-no-proc,
---debug-no-exit, to skip or enable completion where proc or sys debugger is hanging.
-
-Changes:
-1. Changed vendor in A, G, and N to -x, not -xxx, this data seems much more useful
-and reliable than I'd first expected when I made the feature, the -xxx was more
-an indication of my lack of trust in the method and source, but so far it seems
-pretty good, so I bumped it up to an -x option. Note that also, it's quite useful
-to know the vendor of, say, your network or graphics card, not just the actual
-device internal data, which is all inxi has ever shown previously.
-2. Small change, if no partition type data is found, dev, remote, mapped, default
-now says 'source:' instead of 'dev:' which makes more sense. Note that df calls
-that column 'source', so I decided to go with their language for the default not
-found case. Also changed mapped to say mapped. This was part of a bit of a
-refactor of the partition type logic, enhanced by adding mapped to existing types,
-and moved the entire type detection block into the main data generator, and out
-of the data line constructor.
-
-Optimizations:
-1. Tested, and dumped, List::Util first() as a possible way to speed up grep
-searches of arrays, where the goal is just to see if something is in an array. My
-expectation was that first(), returning the first found instance of the search term,
-would of course be faster since it will always exit the search loop was met with
-the sad fact that first() is about 2 to 4 times SLOWER than grep() native builtin.
-I tested this fairly carefully, and used NYTProf optimizer tool and the results were
-totally consistent, first() was always much slower than grep(), no matter what size
-the array is. I assume this means the core C programming that makes grep is simply
-much better than the File::Util module programming that makes first(). Removed
-first() and now know that nothing will be faster than grep so no need to look there
-for speed improvements.
+--debug-no-exit, to skip or enable completion where proc or sys debugger is
+hanging.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Changed vendor in A, G, and N to -x, not -xxx, this data seems much more
+useful and reliable than I'd first expected when I made the feature, the -xxx
+was more an indication of my lack of trust in the method and source, but so far
+it seems pretty good, so I bumped it up to an -x option. Note that also, it's
+quite useful to know the vendor of, say, your network or graphics card, not just
+the actual device internal data, which is all inxi has ever shown previously.
+
+2. Small change, if no partition type data is found, dev, remote, mapped,
+default now says 'source:' instead of 'dev:' which makes more sense. Note that
+df calls that column 'source', so I decided to go with their language for the
+default not found case. Also changed mapped to say mapped. This was part of a
+bit of a refactor of the partition type logic, enhanced by adding mapped to
+existing types, and moved the entire type detection block into the main data
+generator, and out of the data line constructor.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Optimizations: Tested, and dumped, List::Util first() as a possible way to
+speed up grep searches of arrays, where the goal is just to see if something is
+in an array. My expectation was that first(), returning the first found instance
+of the search term, would of course be faster since it will always exit the
+search loop was met with the sad fact that first() is about 2 to 4 times SLOWER
+than grep() native builtin.
+
+I tested this fairly carefully, and used NYTProf optimizer tool and the results
+were totally consistent, first() was always much slower than grep(), no matter
+what size the array is. I assume this means the core C programming that makes
+grep is simply much better than the File::Util module programming that makes
+first(). Removed first() and now know that nothing will be faster than grep so
+no need to look there for speed improvements.
+
The moral of the story: just because something should in theory be faster, does
sadly not mean it will be faster, for there are bigger things at work, skill of
-the programmers who made the logic, how perl handles external vs internal tools,
+the programmers who made the logic, how perl handles external vs internal tools,
and so on. As an aside, this forms a fairly consistent pattern where I've found
-Perl by itself to be faster than modules in many cases, that is, it's faster to
+Perl by itself to be faster than modules in many cases, that is, it's faster to
write the code out than to use a module in many cases that I have tested, so I
-will always test such ideas and dump every one that is in fact slower than native
-Perl builtins.
+will always test such ideas and dump every one that is in fact slower than
+native Perl builtins.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 14 Oct 2018 15:24:34 -0700
-=====================================================================================
+================================================================================
Version: 3.0.26
Patch: 00
Date: 2018-09-28
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man.
-Bugs:
-1. If you consider failure to identify a mounted yet hidden partition a bug, then
-that bug is fixed, but I consider that as more of a fix than a bug.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. If you consider failure to identify a mounted yet hidden partition a bug,
+then that bug is fixed, but I consider that as more of a fix than a bug.
+
+--------------------------------------------------------------------------------
+FIXES:
-Fixes:
1. Added more device pattern ID for odroid C1 and C2, these are now pretty well
supported.
+
2. inxi failed to handle a certain type of hidden partition, so far only seen
with udiskctl mounted TimeShift partitions, but this may be a more general udisk
issue, but so far not enough information. The fix is to use the lsblk data to
-build up missing partitions, so this fix is for non legacy Linux systems only.
-The fix works pretty well, but it's hard to know until we get a lot more real
+build up missing partitions, so this fix is for non legacy Linux systems only.
+The fix works pretty well, but it's hard to know until we get a lot more real
world data, but given so far I've received only one issue report on it, I
-suspect this is not a common situation, but you never know, it would never
-have shown up in datasets unless I had looked specifically for it, so it may
-be more common than I think.
+suspect this is not a common situation, but you never know, it would never have
+shown up in datasets unless I had looked specifically for it, so it may be more
+common than I think.
+
3. Cleaned up and simplified new --admin -p and -d logic.
+
4. Refactored deb822 apt handling due to utter randomness of syntax allowed.
-Enhancements:
-1. For debugging, renamed all user debugger switches to have prefix --debug.
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. For debugging, renamed all user debugger switches to have prefix --debug.
These options are to help debug debugger failures, and so far have been tested
and solved the failures, so I'm adding them all to the main man and help menu,
-thus raising them to the level of supported tools. These were enormously helpful
+thus raising them to the level of supported tools. These were enormously helpful
in solving proc or sys debugger hangs.
* --debug-proc
* --debug-proc-print
* --debug-no-sys
* --debug-sys
* --debug-sys-print
-2. Added findmnt output to debugger, that may be useful in the future. Also added
-df -kTPa to also catch hidden partitions in debugger.
-3. Added in another user level debugger, triggered with --debug-test-1 flag. This
-will do whatever operation is needed at the time for that user. Some issues can
-only be resolved by the user on their machine.
+
+2. Added findmnt output to debugger, that may be useful in the future. Also
+added df -kTPa to also catch hidden partitions in debugger.
+
+3. Added in another user level debugger, triggered with --debug-test-1 flag.
+This will do whatever operation is needed at the time for that user. Some issues
+can only be resolved by the user on their machine.
+
4. More disk vendors and matches!!! Thanks linuxlite/linux hardware database!
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 28 Sep 2018 13:47:03 -0700
-=====================================================================================
+================================================================================
Version: 3.0.25
Patch: 00
Date: 2018-09-24
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Huge set of changes. Excitement!! Thrills! Spills?
-Bugs:
+--------------------------------------------------------------------------------
+BUGS:
+
1. There was a missing main::is_int test that in some instances triggered
error. This is corrected.
2. More of a fix, but legacy devices were not matching NIC to IF because
the /sys path was not a link as it is now. I made a separate function to
handle that match test so it could be more readily worked with.
-Fixes:
-1. Arch/Manjaro presented yet another Xorg.wrapper path, this time /usr/lib. Why?
-who knows. That to me is a bug, but since if it's not handled in inxi, it makes
-it look like inxi has a server: -G bug, I worked around it. Again. This creates
-the bug when you do not use the actual true path of Xorg where Xorg.wrapper
-complains and will not show -version data. Why move this? why use that wrapper
-thing? I don't know, makes no sense to me.
-2. More MIPS data, thanks manjaro ARM people. This made MIPS much better, though
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Arch/Manjaro presented yet another Xorg.wrapper path, this time /usr/lib.
+Why? who knows. That to me is a bug, but since if it's not handled in inxi, it
+makes it look like inxi has a server: -G bug, I worked around it. Again. This
+creates the bug when you do not use the actual true path of Xorg where
+Xorg.wrapper complains and will not show -version data. Why move this? why use
+that wrapper thing? I don't know, makes no sense to me.
+
+2. More MIPS data, thanks manjaro ARM people. This made MIPS much better, though
it will certainly need more work.
+
3. Better ARM support, added in devicetree strings, which helps pad out the
-Devices IDs, albeit with very little data, but at least the devices are detected.
-Thanks Manjaro ARM people there again.
+Devices IDs, albeit with very little data, but at least the devices are
+detected. Thanks Manjaro ARM people there again.
+
4. Removed Upstart init test for arm/mips/sparc devices. This test made MIPS
-device totally puke and die, killed networking, so since very few upstart running
-systems will be arm/mips devices, I decided there better safe than sorry.
+device totally puke and die, killed networking, so since very few upstart
+running systems will be arm/mips devices, I decided there better safe than
+sorry.
+
5. Found another uptime syntax case, MIPS as root does not have the users item.
+
6. Many tweaks to SOC data generators, will catch more categories, but the lists
-will never be done since each device can be, and often is, random re the syntax.
+will never be done since each device can be, and often is, random re the syntax.
SOC types are now filtered through a function to create consistent device type
strings for the per device tool to use to assign each to its proper
@device_<type> array.
-7. USB networking failed to test usb type for 'network', which led to failed
-ids on some device strings.
-8. For pciconf/FreeBSD, cleaned up device class strings to get rid of 0x and
-trailing subsubclass values, this converts it into the same hex 4 item string
+
+7. USB networking failed to test usb type for 'network', which led to failed ids
+on some device strings.
+
+8. For pciconf/FreeBSD, cleaned up device class strings to get rid of 0x and
+trailing subsubclass values, this converts it into the same hex 4 item string
that is used by GNU/Linux/lspci so I can apply consistent rules to all pci
-types, no matter what the generator source is, lspci, pcidump, pciconf, and
-eventually pcictl if I can get netbsd running.
+types, no matter what the generator source is, lspci, pcidump, pciconf, and
+eventually pcictl if I can get netBSD running.
+
9. Fixed internal --dbg counts for various features, and updated docs for that.
+
10. Fixed ARM / MIPS missing data messages, they were redundant.
-11. Ongoing, moving excessive source comments to inxi-values.txt and inxi-data.txt.
-12. Added unity-system-compositor as mir detection, who knew? I guess that was
+
+11. Ongoing, moving excessive source comments to inxi-values.txt and
+inxi-data.txt.
+
+12. Added unity-system-compositor as mir detection, who knew? I guess that was
its production application name all along? Oh well.
-Enhancements:
-1. Added basic support for OpenIndiana/Solaris/SunOS as a bsd type. Just enough
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added basic support for OpenIndiana/Solaris/SunOS as a BSD type. Just enough
to make errors not happen.
-2. Future proofed unix/bsd detections just to avoid the unset $bsd_type of non
+
+2. Future proofed unix/BSD detections just to avoid the unset $BSD_type of non
BSD unix.
+
3. Added S6 init system to init tool.
-4. Added OpenBSD pcidump to new DeviceData feature. Includes now <root required>
+
+4. Added OpenBSD pcidump to new DeviceData feature. Includes now <root required>
message on Device-x: lines if not root. All working.
-5. Fully refactored the old pci stuff to DeviceData package/class, due to adding
+
+5. Fully refactored the old pci stuff to DeviceData package/class, due to adding
so many types to that, it made sense to make it a single class.
+
6. Did the same to USBData, because of lsusb, usbdevs, and /sys usb, made sense
to integrate the data grabber into one package/class
+
7. Added speed: item to USB:, it shows in Mb/s or Gb/s
+
8. Added Odroid C1/C2 handling, which is one big reason I opted to refactor the
devices data logic into DeviceData.
-9. Added ash shell, not sure if that detection will work, but if it does,
-it will show.
+
+9. Added ash shell, not sure if that detection will work, but if it does, it
+will show.
+
10. As part of the overall DeviceData refactor, I moved all per type data into
dedicated arrays, like @device_graphics, @device_audio, @device_network, etc,
which lets me totally dump all the per device item tests, and just check the
-arrays, which have already been tested for on the construction of the primary
-DeviceData set. Moved all per type detections into DeviceData so that is now
-one complete logic block, and the per type data generators don't need to know
-about any of that logic at all anymore.
+arrays, which have already been tested for on the construction of the primary
+DeviceData set. Moved all per type detections into DeviceData so that is now one
+complete logic block, and the per type data generators don't need to know about
+any of that logic at all anymore.
+
11. Added sway, swaybar, way-cooler as window managers, info items. Not 100%
-positive about the --version, their docs weren't very consistent, but I think
+positive about the --version, their docs weren't very consistent, but I think
the guess should be right if their docs weren't incorrect.
+
12. Added vendor: item to network, not sure why I kept that off when I added
vendor: to audio and graphics. It made sense at the time, but not now, so now
-GNA all have vendor: if detected.
+
13. More device vendors!! The list never ends. Thanks linuxlite/linux hardware
database, somehow you have users that manage to use every obscure usb/ssd/hdd
known to humanity.
+
14. Big update to --admin, now has the following:
A: partitions: shows 'raw size: ' of partition, this lets users see the amount
of file system overhead, along with the available size as usual.
@@ -1685,150 +10476,121 @@ known to humanity.
or (default [default value]) added. This apparently can help debugging some
kernel issues etc. Whatever, I'll take someone's word for that.
E: Disks: show block size: logical: physical:
+
15. New option and configuration item: --partition-sort / PARTITION_SORT
This lets users change default mount point sort order to any available ordering
in the partition item. Man page and help menu show options.
+
16. Going along with the MIPS fixes, added basic support for OpenWRT, which uses
an immensely stripped down busybox (no ps aux, for example), maybe because it
only runs as root user/ not sure, anyway, took many fixes.
+
17. Added Void Linux xbps repos to Repos section.
-Changes:
-1. Changed usb: 1.1 to rev: 1.1 because for linux, we have the USB revision number,
-like 3.1. Note that this is going to be wrong for BSDs, but that's fine.
-2. Changed slightly the output of Memory item, now it follows the following rules:
- A: if -m/--memory is triggered (> -v4, or -m) Memory line always shows in Memory:
- item, which makes sense. Note that -m overrides all other options of where Memory
- minireport could be located.
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Changed usb: 1.1 to rev: 1.1 because for linux, we have the USB revision
+number, like 3.1. Note that this is going to be wrong for BSDs, but that's fine.
+
+2. Changed slightly the output of Memory item, now it follows the following
+rules:
+ A: if -m/--memory is triggered (> -v4, or -m) Memory line always shows in
+ Memory: item, which makes sense. Note that -m overrides all other options of
+ where Memory minireport could be located.
B: if -tm is triggered, and -I is not triggered, Memory shows in in -tm
C: if -I is triggered, and -m is not triggered, Memory: shows in -I line.
D: no change in short form inxi no arg output, Memory is there.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 24 Sep 2018 15:58:00 -0700
-=====================================================================================
+================================================================================
Version: 3.0.24
Patch: 00
Date: 2018-09-10
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man page. Bug fix, enhancements, fixes.
-Bugs:
-1. Big bug found on certain systems, they use non system memory memory arrays, inxi
-failed to anticipate that situation, and would exit with error when run as root for
--m when it hit those array types. These arrays did not have modules listed, so the
-module array was undefined, which caused the failure. Thanks Manjaro anonymous
-debugger dataset 'loki' for finding this failure.
-This is literally the first dataset I've seen that had this issue, but who knows
-how many other system boards will show something like that as well.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Big bug found on certain systems, they use non system memory memory arrays,
+inxi failed to anticipate that situation, and would exit with error when run as
+root for -m when it hit those array types. These arrays did not have modules
+listed, so the module array was undefined, which caused the failure. Thanks
+Manjaro anonymous debugger dataset 'loki' for finding this failure. This is
+literally the first dataset I've seen that had this issue, but who knows how
+many other system boards will show something like that as well.
+
+--------------------------------------------------------------------------------
+FIXES:
-Fixes:
1. Related to bug 1, do not show the max module size item if not system memory
and size is less than 10 MiB. Assuming there that it's one of these odd boards.
-Enhancements:
-1. For bug 1, extended Memory: report to include array type if not system memory.
-That instance had Video Memory, Flash Memory, and Cache Memory arrays along with
-the regular System Memory array. Now shows: use: Video Memory for example if not
-System Memory to make it clear what is going on.
-2. Added basic Parrot system base, but for some inexplicable reason, Parrot changed
-the /etc/debian_version file to show 'stable' instead of the release number. Why?
-Who knows, it would be so much easier if people making these derived distros would
-be consistent and not change things for no good reason.
-3. Added a few more pattern matches to existing vendors for disks. As usual, thanks
-linuxlite/linux hardware database for the endless lists of disk data.
-4. Added internal dmidecode debugger switches, that makes it much easier to inject
-test dmidecode data from text files using debugger switches internally.
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. For bug 1, extended Memory: report to include array type if not system
+memory. That instance had Video Memory, Flash Memory, and Cache Memory arrays
+along with the regular System Memory array. Now shows: use: Video Memory for
+example if not System Memory to make it clear what is going on.
+
+2. Added basic Parrot system base, but for some inexplicable reason, Parrot
+changed the /etc/debian_version file to show 'stable' instead of the release
+number. Why? Who knows, it would be so much easier if people making these
+derived distros would be consistent and not change things for no good reason.
+
+3. Added a few more pattern matches to existing vendors for disks. As usual,
+thanks linuxlite/linux hardware database for the endless lists of disk data.
+
+4. Added internal dmidecode debugger switches, that makes it much easier to
+inject test dmidecode data from text files using debugger switches internally.
+
5. Added -Cxx item, which will run if root and -C are used, now grabs L1 and L3
-cache data from dmidecode and shows it. I didn't realize that data was there, not
-sure how I'd missed it all these years, I guess pinxi really is much easier to work
-on! This only runs if user has dmidecode permissions from root or sudo.
-6. Brought cpu architectures up to date, new intel, new amd. Note there's a slight
-confusion about what is coffee lake and what is kaby lake.
+cache data from dmidecode and shows it. I didn't realize that data was there,
+not sure how I'd missed it all these years, I guess pinxi really is much easier
+to work on! This only runs if user has dmidecode permissions from root or sudo.
------------------------------------
+6. Brought cpu architectures up to date, new intel, new amd. Note there's a
+slight confusion about what is coffee lake and what is kaby lake.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 10 Sep 2018 15:00:17 -0700
-=====================================================================================
+================================================================================
Version: 3.0.23
Patch: 00
Date: 2018-09-07
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, man page. Fixes, enhancements, changes.
Thanks:
1. AntiX forums, for testing -C --admin, suggestions, always helpful.
-Bugs:
-1. Added switch to set @ps_gui, I forgot case where info block was only thing
-that used ps_gui (Nitrux kde nomad latte case). This led to no info: data if
-other ps_gui switches not activated. Now each block that can use it activates it.
-
-Fixes:
-1. To clarify issue #161 added help/man explanation on how to get colors in cases
-where you want to preserve colors for piped or redirected output. Thanks fugo.
-2. LMDE 3.0 released, slightly different system base handling, so refactored to
-add Debian version, see enhancement 2. Tested on some old vm instances, improved
-old system Debian system base id, but it's empirical, distro by distro, there is
-no rule I can use to automatically do it, sadly.
-3. 'Motherboard' sensors field name added, a few small tweaks to sensors. This
-was in response to issue #159, which also raised a problem I was not really
-aware of, user generated sensor config files, that can have totally random
-field names. Longer term solution, start getting data from sys to pad out
-lm-sensors data, or to handle cases where no lm-sensors installed.
-4. Fixed kwin_11 and kwin_wayland compositor print names, I'd left out the _,
-which made it look strange, like there were two compositors or something.
-5. Fixed latte-dock ID, I thought the program name when running was latte, not
-latte-dock. inxi checks for both now. Thanks Nitrux for exposing that in vm test.
-6. Sensors: added in a small filter to motherboard temp, avoid values that are
-too high, like SYSTIN: 118 C, filters out to only use < 90 C. Very unlikely a
-mobo would be more than 90C unless it's a mistake or about to melt. This may
-correct anoymous debugger dataset report from rakasunka.
-
-Enhancements:
-1. Added --admin to -v 8 and to --debugger 2x
-2. Added -a to trigger --admin. This lets you run something like -Fxxxaz
-3. Expanded system base to use Debian version tool, like the ubuntu one, that
-lets me match version number to codename. The ubuntu one matches code names to
-release dates. Added Neptune, PureOS, Sparky, Tails, to new Debian system base
-handler.
-4. Big enhancement: --admin -C now shows a nice report on cpu vulnerabilities,
-and has a good error message if no data found. Report shows:
-Vulnerabilities: Type: [e.g. meltdown] status/mitigation: text explanation.
-Note: 'status' is for when no mitigation, either not applicable, or is vulnerable.
-'mitigation' is when it's handled, and how. Thanks issue #160 Vascom from Fedora
-for that request.
-5. The never-ending saga of disk vendor IDs continues. More obscure vendors,
-more matches to existing vendors. Thanks linuxlite/linux hardware database
-
-Changes:
-1. Reordered usb output, I don't know why I had Hubs and Devices use different
-ordering and different -x switch priorities, that was silly, and made it hard to
-read.
-Now shows:
-Device/Hub: bus-id-port-id[.port-id]:device-id info: [product info]
-type/ports: [devices/hubs] usb: [type, speed]
--x adds drivers for devices, and usb: speed is now default for devices, same as
-Hubs. Why I had those different is beyond me.
-The USB ordering is now more sensible, the various components of each
-matching whether hub or device.
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
-Unfixable or Won't Fix:
1. Unable to detect Nomad desktop. As far as I can tell, Nomad is only a theme
applied to KDE Plasma, there is no program by that name detectable, only a
reference in ps aux to a theme called nomad.
-2. Nitrux system base ID will not work until they correct their /etc/os-release file.
+
+2. Nitrux system base ID will not work until they correct their /etc/os-release
+file.
+
3. Tails live cd for some inexplicable reason uses non standard /etc/os-release
-field names, which forces me to either do a custom detection just for them, or for
-them to fix this bug. I opted for ignoring it, if I let each distro break standard
-formats then try to work around it, the distro ID will grow to be a 1000 lines long
-easily. Will file distro bug reports when I find these from now on.
+field names, which forces me to either do a custom detection just for them, or
+for them to fix this bug. I opted for ignoring it, if I let each distro break
+standard formats then try to work around it, the distro ID will grow to be a
+1000 lines long easily. Will file distro bug reports when I find these from now
+on.
Samples:
@@ -1878,171 +10640,293 @@ USB:
Hub: 6-0:1 info: Full speed (or root) Hub ports: 4 usb: 3.0
chip ID: 1d6b:0003
------------------------------------
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Added switch to set @ps_gui, I forgot case where info block was only thing
+that used ps_gui (Nitrux kde nomad latte case). This led to no info: data if
+other ps_gui switches not activated. Now each block that can use it activates
+it.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. To clarify issue #161 added help/man explanation on how to get colors in
+cases where you want to preserve colors for piped or redirected output. Thanks
+fugo.
+
+2. LMDE 3.0 released, slightly different system base handling, so refactored to
+add Debian version, see enhancement 2. Tested on some old vm instances, improved
+old system Debian system base id, but it's empirical, distro by distro, there is
+no rule I can use to automatically do it, sadly.
+
+3. 'Motherboard' sensors field name added, a few small tweaks to sensors. This
+was in response to issue #159, which also raised a problem I was not really
+aware of, user generated sensor config files, that can have totally random field
+names. Longer term solution, start getting data from sys to pad out lm-sensors
+data, or to handle cases where no lm-sensors installed.
+
+4. Fixed kwin_11 and kwin_wayland compositor print names, I'd left out the _,
+which made it look strange, like there were two compositors or something.
+
+5. Fixed latte-dock ID, I thought the program name when running was latte, not
+latte-dock. inxi checks for both now. Thanks Nitrux for exposing that in vm
+test.
+
+6. Sensors: added in a small filter to motherboard temp, avoid values that are
+too high, like SYSTIN: 118 C, filters out to only use < 90 C. Very unlikely a
+mobo would be more than 90C unless it's a mistake or about to melt. This may
+correct anoymous debugger dataset report from rakasunka.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added --admin to -v 8 and to --debugger 2x
+
+2. Added -a to trigger --admin. This lets you run something like -Fxxxaz
+
+3. Expanded system base to use Debian version tool, like the ubuntu one, that
+lets me match version number to codename. The ubuntu one matches code names to
+release dates. Added Neptune, PureOS, Sparky, Tails, to new Debian system base
+handler.
+
+4. Big enhancement: --admin -C now shows a nice report on cpu vulnerabilities,
+and has a good error message if no data found. Report shows: Vulnerabilities:
+Type: [e.g. meltdown] status/mitigation: text explanation. Note: 'status' is for
+when no mitigation, either not applicable, or is vulnerable. 'mitigation' is
+when it's handled, and how. Thanks issue #160 Vascom from Fedora for that
+request.
+
+5. The never-ending saga of disk vendor IDs continues. More obscure vendors,
+more matches to existing vendors. Thanks linuxlite/linux hardware database
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Reordered usb output, I don't know why I had Hubs and Devices use different
+ordering and different -x switch priorities, that was silly, and made it hard to
+read.
+Now shows:
+Device/Hub: bus-id-port-id[.port-id]:device-id info: [product info]
+type/ports: [devices/hubs] usb: [type, speed]
+-x adds drivers for devices, and usb: speed is now default for devices, same as
+Hubs. Why I had those different is beyond me.
+The USB ordering is now more sensible, the various components of each matching
+whether hub or device.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 07 Sep 2018 13:01:40 -0700
-=====================================================================================
+================================================================================
Version: 3.0.22
Patch: 00
Date: 2018-08-28
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, man page. Bug fixes, enhancements.
-Bugs:
-1. A long standing bug was finally identified and fixed. -n/-i would fail to match
-a Device to the right IF in cases where they had the same chip / vendor IDs. Added
-busID for non Soc type devices to fix that. I hope. This fix has been tested on a
-machine that had this bug, and it is now corrected. Thanks skynet for the dataset.
-2. deepin-wm was failing to get listed correctly with new fixes, this is corrected.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. A long standing bug was finally identified and fixed. -n/-i would fail to
+match a Device to the right IF in cases where they had the same chip / vendor
+IDs. Added busID for non Soc type devices to fix that. I hope. This fix has been
+tested on a machine that had this bug, and it is now corrected. Thanks skynet
+for the dataset.
+
+2. deepin-wm was failing to get listed correctly with new fixes, this is
+corrected.
+
+--------------------------------------------------------------------------------
+FIXES:
-Fixes:
1. mate version was depending on two tools, mate-about and mate-session, which
-somewhat randomly vary in which has the actual highest version number. Fix was to
-run both in MATE for version, and run those through a new version compare tool.
-Thanks mint/gm10 for reporting that bug.
-2. -Gxx compositors: added some missing ones that were being checked for in-
+somewhat randomly vary in which has the actual highest version number. Fix was
+to run both in MATE for version, and run those through a new version compare
+tool. Thanks mint/gm10 for reporting that bug.
+
+2. -Gxx compositors: added some missing ones that were being checked for in-
correctly.
-3. For distro id, fixed a glitch in the parser for files, now correctly removes
+
+3. For distro id, fixed a glitch in the parser for files, now correctly removes
empty () with or without spaces in it.
-4. Got rid of ' SOC?' part of no data for ram or slots, that also triggers in non
-SOC cases, so best to not guess if I can't get it right.
-Enhancements:
-1. More disk vendor ID matches, also, somehow missed QEMU as vendor, thanks to
+4. Got rid of ' SOC?' part of no data for ram or slots, that also triggers in
+non SOC cases, so best to not guess if I can't get it right.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. More disk vendor ID matches, also, somehow missed QEMU as vendor, thanks to
linux hardware database (linuxlite) for great samples of vendor/product strings.
-2. Added a bunch of compositors, found a new source that listed a lot inxi did not
-have already.
+
+2. Added a bunch of compositors, found a new source that listed a lot inxi did
+not have already.
+
3. Added version v: for some compositors in -Gxxx.
-4. New program_data() tool provides an easier to use simple program version/print
-name generator, including extra level tests, to get rid of some code that repeats.
+
+4. New program_data() tool provides an easier to use simple program
+version/print name generator, including extra level tests, to get rid of some
+code that repeats.
+
5. Found some useful QEMU virtual machines for ARM, MIPS, PPC, and SPARC, so
-made initial debugging for each type, so basic working error free support is well
-on its way for all 4 architectures, which was unexpected. More fine tunings to
-all of them to avoid bugs, and to catch more devices, as well.
-Note that QEMU images are hard to make, and they were not complete in terms of
-what you would see on physical hardware, so I don't know what features will work
-or not work, there may be further variants in audio/network/graphics IDs that
-remain unhandled, new datasets always welcome for such platforms!
-6. Found yet another desktop! Added Manokwari support, which is at this point
-a reworking of gnome, but it was identifiable, minus a version number.
-7. Added deepin and blankon to system base supported list, these hide their debian
-roots, so I had to use the manual method to provide system base.
-8. Extended -Sxxx info: item to include system trays, and a few more bars and
-panels. So this product now shows bars, panels, trays, and docks. And that's I
+made initial debugging for each type, so basic working error free support is
+well on its way for all 4 architectures, which was unexpected. More fine tunings
+to all of them to avoid bugs, and to catch more devices, as well. Note that QEMU
+images are hard to make, and they were not complete in terms of what you would
+see on physical hardware, so I don't know what features will work or not work,
+there may be further variants in audio/network/graphics IDs that remain
+unhandled, new datasets always welcome for such platforms!
+
+6. Found yet another desktop! Added Manokwari support, which is at this point a
+reworking of gnome, but it was identifiable, minus a version number.
+
+7. Added deepin and blankon to system base supported list, these hide their
+debian roots, so I had to use the manual method to provide system base.
+
+8. Extended -Sxxx info: item to include system trays, and a few more bars and
+panels. So this product now shows bars, panels, trays, and docks. And that's I
think good enough, since those are the basic tools most desktop/wm's will use.
-
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 28 Aug 2018 15:08:16 -0700
-=====================================================================================
+================================================================================
Version: 3.0.21
Patch: 00
Date: 2018-08-17
------------------------------------
-Changes:
------------------------------------
-
-New version, man page. Big set of changes. Full USB refactor, plus added features.
-
-Bugs:
-1. A result of the issue #156 USB refactor, I discovered that the --usb sort order,
-which was based on Bus+DeviceID, in fact is wrong, pure and simple. This was exposed
-by using a second USB hub on a bus, the Device IDs are not really related in any
-clearly logical way to the actual position on the bus. The solution was to fully
-refactor the entire USB logic and then use generated alpha sorters based on the full
-bus-port[.port] ID. Device ID is now printed last in the ID string, like so: 1-4:1.
-Note that Device IDs start at 1 for each bus, regardless of how many hubs you have
-attached to that port.
-2. Certain situations triggered a bug in Optical devices, I'd forgotten to change
-$_ to $key in two places. Since that part didn't normally get triggered, I'd never
-noticed that bug before. Thanks TinyCore for exposing that glitch!
-
-Fixes:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, man page. Big set of changes. Full USB refactor, plus added
+features.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. A result of the issue #156 USB refactor, I discovered that the --usb sort
+order, which was based on Bus+DeviceID, in fact is wrong, pure and simple. This
+was exposed by using a second USB hub on a bus, the Device IDs are not really
+related in any clearly logical way to the actual position on the bus. The
+solution was to fully refactor the entire USB logic and then use generated alpha
+sorters based on the full bus-port[.port] ID. Device ID is now printed last in
+the ID string, like so: 1-4:1. Note that Device IDs start at 1 for each bus,
+regardless of how many hubs you have attached to that port.
+
+2. Certain situations triggered a bug in Optical devices, I'd forgotten to
+change $_ to $key in two places. Since that part didn't normally get triggered,
+I'd never noticed that bug before. Thanks TinyCore for exposing that glitch!
+
+--------------------------------------------------------------------------------
+FIXES:
+
1. On legacy systems, fluxbox --version does not work, -v does. Corrected.
-2. for --usb, network devices should now show the correct 'type: Network'.
-For some weird reason, the people who made the usb types didn't seem to consider
+
+2. for --usb, network devices should now show the correct 'type: Network'. For
+some weird reason, the people who made the usb types didn't seem to consider
many key devices, scanners, wifi/ethernet adapters, and those are almost always
"Vendor defined class".
+
3. A really big fix, for instances where system is using only Busybox, like
TinyCore, or booting into any system running busybox for whatever reason, now
avoids the various errors when using busybox ps, which only for example outputs
-3, not 11, default columns for ps aux, and which does not support ps -j, which
-is used in the start/shell client information. This gets rid of a huge spray
-of errors, and actually allows for pretty complete output from systems that only
+
+3, not 11, default columns for ps aux, and which does not support ps -j, which
+is used in the start/shell client information. This gets rid of a huge spray of
+errors, and actually allows for pretty complete output from systems that only
have busybox tools installed. This should cover everything from TinyCore to MIPS
-to ARM systems that run minimalist Linux. Note that this fix goes along with the
+to ARM systems that run minimalist Linux. Note that this fix goes along with the
/sys based USB parser, since such systems may have USB, but are unlikely to have
lsusb installed, but do have /sys USB data.
-4. In some cases, strings /sbin/init would trigger a false version result, fixed
+
+4. In some cases, strings /sbin/init would trigger a false version result, fixed
that logic so now it rarely will do that.
-Enhancements:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Added Moksha desktop, that's a Bodhi fork of Enlightenment E17; added qtile
window manager (no version info).
+
2. Added Bodhi detection; Salix + base slackware; kde neon system base;
+
3. Added support for slaptget repos, basic, it may not be perfecct.
+
4. More disk vendors, and matches for existing vendors.
-5. Full rewrite of USB data, in --usb, -A, and -N, along with core usb data engines.
-This makes lsusb optional, though recommended (because it has a better vendor/
-product ID to string internal database than /sys data). This was in response
-to a second set of issues in #156 by gm10, USB drivers.
+
+5. Full rewrite of USB data, in --usb, -A, and -N, along with core usb data
+engines. This makes lsusb optional, though recommended (because it has a better
+vendor/product ID to string internal database than /sys data). This was in
+response to a second set of issues in #156 by gm10, USB drivers.
+
Depending on the system, using only /sys data, while slightly less informative,
is between 20 and 2000 milliseconds faster, so if you want speed, either use the
new --usb-sys option, or the configuration file USB_SYS=[true|false] option.
1. switched to cleaner more efficient data structures
- 2. added ports count to hub report, linux and bsd.
+ 2. added ports count to hub report, linux and BSD.
3. added [--usb|-A|-N] -xxx serial for Device items, if present.
4. added --usb -xx drivers, per interface, can be 1 or more drivers.
5. fully refactored -A and -N usb device logic, far cleaner and simple now,
much easier to work with, no more hacks to find things and match them.
6. USB type: now comes from /sys, and is in general going to be more accurate
than the lsusb -v based method, which was always an ugly and incomplete hack.
- As with drivers, it also now lists all the interface types found per device, not
- just the first one as with the previous method. Note that HID means the more
- verbose: Human Interface Device, but I shortened it. Now that the type: data is
- created by inxi reading the class/subclass/protocal IDs, and then figuring out
- what to do itself, I can have quite a bit more flexibility in terms of how type
- is generated.
+ As with drivers, it also now lists all the interface types found per device,
+ not just the first one as with the previous method. Note that HID means the
+ more verbose: Human Interface Device, but I shortened it. Now that the type:
+ data is created by inxi reading the class/subclass/protocal IDs, and then
+ figuring out what to do itself, I can have quite a bit more flexibility in
+ terms of how type is generated.
7. added --usb -xxx interfaces: [count] for devices, which lists the device
interface count. This can be useful to determine if say, a usb/keyboard adapter
is a 2 interface device. Note that Audio devices generally have many interfaces,
since they do more than 1 thing (audio output, microphone input, etc.).
- 8. Support for user configuration file item: USB_SYS=[true|false]. This is useful
- if you want to see only the /sys version of the data, or if you want the significant
- speed boost not using lsusb offers, particularly on older systems with a complex
- USB setup, many buses, many devices, etc.
+ 8. Support for user configuration file item: USB_SYS=[true|false]. This is
+ useful if you want to see only the /sys version of the data, or if you want the
+ significant speed boost not using lsusb offers, particularly on older systems
+ with a complex USB setup, many buses, many devices, etc.
New option --usb-tool overrides USB_SYS value, and forces lsusb use.
- 9. New options: --usb-sys - forces all usb items to use /sys data, and skip lsusb.
- Note that you still have to use the feature options, like --usb, -A, or -N. This
- can lead to a significant improvement in execution time for inxi.
- 10. Rather than the previous bus:device ID string, to go along with the internal
- sorting strings used, inxi now shows the real Bus / port /port ids, like:
+ 9. New options: --usb-sys - forces all usb items to use /sys data, and skip
+ lsusb. Note that you still have to use the feature options, like --usb, -A, or
+ -N. This can lead to a significant improvement in execution time for inxi.
+ 10. Rather than the previous bus:device ID string, to go along with the
+ internal sorting strings used, inxi now shows the real Bus / port /port ids,
+ like:
1-3.2.1:3 - Bus-Port[.port]:device id.
-6. Added support for Xvesa display server. Thanks for exposing that one, TinyCore!
+
+6. Added support for Xvesa display server. Thanks for exposing that one,
+TinyCore!
+
7. Added tce package manager to repos. That's the tinycore package manager.
-Changes:
-1. big one, after 10 plus years, the venerable 'Card-x:' for -A,-N, and -G has been
-replaced by the more neutral 'Device-x:'. This was a suggestion by gm10 from Mint
-in issue #156
-This makes sense because for a long time, most of these devices are not cards, they
-are SOC, motherboard builtin, USB devices, etc, so the one thing they all are is
-some form of a device, and the one thing that they are all not is a Card. Along with
-the recent change from HDD: to Local Storage in Disks: this brings inxi terminology
-out of the ancient times and into the present. Thanks for the nudge gm10.
-
-Removed:
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. big one, after 10 plus years, the venerable 'Card-x:' for -A,-N, and -G has
+been replaced by the more neutral 'Device-x:'. This was a suggestion by gm10
+from Mint in issue #156
+
+This makes sense because for a long time, most of these devices are not cards,
+they are SOC, motherboard builtin, USB devices, etc, so the one thing they all
+are is some form of a device, and the one thing that they are all not is a Card.
+Along with the recent change from HDD: to Local Storage in Disks: this brings
+inxi terminology out of the ancient times and into the present. Thanks for the
+nudge gm10.
+
+--------------------------------------------------------------------------------
+CODE:
+
See inxi-perl/docs/inxi-fragments.txt for removed blocks.
-1. Entire parser for lsusb -v, now it all runs either usbdevs or lsusb, and if Linux
-and not lsusb, it will use /sys exclusively, otherwise it uses /sys data to complete
-the lsusb vendor/product strings.
-2. Two functions that were used by -A and -N to match usb devices and get their /sys data,
-that became redundant since it all now goes through the /sys parser already, so those
-features can get the data pre-parsed from the @usb arrays.
+
+1. Entire parser for lsusb -v, now it all runs either usbdevs or lsusb, and if
+Linux and not lsusb, it will use /sys exclusively, otherwise it uses /sys data
+to complete the lsusb vendor/product strings.
+
+2. Two functions that were used by -A and -N to match usb devices and get their
+/sys data, that became redundant since it all now goes through the /sys parser
+already, so those features can get the data pre-parsed from the @usb arrays.
Output Examples:
@@ -2090,37 +10974,49 @@ USB:
Hub: 5-0:1 usb: 2.0 type: Full speed (or root) Hub ports: 4
Hub: 6-0:1 usb: 3.0 type: Full speed (or root) Hub ports: 4
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 17 Aug 2018 14:07:01 -0700
-=====================================================================================
+================================================================================
Version: 3.0.20
Patch: 00
Date: 2018-07-30
------------------------------------
-Changes:
------------------------------------
-New version, new man. ARM enhancements and updates, -S data ongoing enhancements.
-
-Fixes:
-1. Added support for new ARM SOC types, including chromebook ARM. Note that so far I
-have been unable to find a way to detect MMC networking, at least in a meaningful
-way. I know where the data is, but I can't figure out how to reasonably integrate it
-into the main ARM soc/device generator logic because it's fundamentally different
-from most platform or devicetree data.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new man. ARM enhancements and updates, -S data ongoing
+enhancements.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Added support for new ARM SOC types, including chromebook ARM. Note that so
+far I have been unable to find a way to detect MMC networking, at least in a
+meaningful way. I know where the data is, but I can't figure out how to
+reasonably integrate it into the main ARM soc/device generator logic because
+it's fundamentally different from most platform or devicetree data.
+
2. Added alternate battery tests, this should cover a wide range of alternate
-battery IDs, while still preserving the distinction between system power batteries,
-and device batteries. The detection is now far more dynamic, and can handle
-unknown syntax for battery ID, while not losing the ability to correctly identify
-device batteries (like mice, keyboards, etc).
-3. Trying a somewhat unreliable hack to get cpu variant for arm devices where the
-current method fails. this may be removed if it causes false ID in the future.
-4. Excluded all /driver/ paths from ARM SOC @pci generation, those give read errors
-even as root.
+battery IDs, while still preserving the distinction between system power
+batteries, and device batteries. The detection is now far more dynamic, and can
+handle unknown syntax for battery ID, while not losing the ability to correctly
+identify device batteries (like mice, keyboards, etc).
+
+3. Trying a somewhat unreliable hack to get cpu variant for arm devices where
+the current method fails. this may be removed if it causes false ID in the
+future.
+
+4. Excluded all /driver/ paths from ARM SOC @pci generation, those give read
+errors even as root.
+
5. Fixed a few defective wm version detections.
-Enhancements:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
The -S line continues to see many improvements.
+
1. Greatly expanded the set of info: items, now it covers all the toolbars,
panels, and docks that I could find, plus a few things like icewmtray, where the
wm has a built in panel. While there are probably more bar/panel/dock tools out
@@ -2128,1063 +11024,1330 @@ there, and more will get added if or when they are encountered, now info: shows
far more variants than ever before, and covers the range of options simpler wm
users have for bars, trays, and panels. If I missed one that is detectable, by
all means show how to detect it!
-2. Fine tuned and added a few more window managers, and added version for some that
-were not showing versions.
-3. Added 3 more dm version handlers, slim, gdm, gdm3, and refactored that code to
-use the same program_values/program_version logic that the other tools use.
+
+2. Fine tuned and added a few more window managers, and added version for some
+that were not showing versions.
+
+3. Added 3 more dm version handlers, slim, gdm, gdm3, and refactored that code
+to use the same program_values/program_version logic that the other tools use.
+
4. A few more obscure and usb stick vendor IDs added.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 30 Jul 2018 18:06:11 -0700
-=====================================================================================
+================================================================================
Version: 3.0.19
Patch: 00
Date: 2018-07-23
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Fixes, glitches, and stitches!
Fixed some subtle and not subtle issues that I've noticed recently.
-Bugs:
-1. The color scheme selector failed to remove the global value when a non global
-setting was used. This led to global values never getting removed, even though
+--------------------------------------------------------------------------------
+BUGS:
+
+1. The color scheme selector failed to remove the global value when a non global
+setting was used. This led to global values never getting removed, even though
the text output said it would be, which is confusing, obviously, and always
overriding the color selected. Thanks CentOS for helping find that one.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. Fixed possible corrupted user inxi.conf values. Now skips null values, and
fully validates as integer integer values.
-2. Fixed fvwm-crystal detections, integrated it into new refactored desktop logic.
-3. For systems without glxinfo or running inxi out of gui/desktop, Xorg was in many
-cases failing to show version, which made it not show anything for server: except
-N/A. This is caused by a relatively recent change in behaviors in xorg, where you
-have to run it directly from it's true path, which is something like /usr/lib/xorg
-or /usr/lib/server-xorg at which point the error:
-/usr/lib/xorg-server/Xorg.wrap: Only console users are allowed to run the X server
-Figuring this out was tricky, and who the heck knows why Xorg -version would even
-return such a silly error in the first place, but there you have it. Next time
-you wonder why inxi is so long, this is why, endless churn in basic and complex
-things! The fix is injecting the optional xorg paths into @paths right before,
-and removing them right after, which avoids adding clutter to the @paths.
+
+2. Fixed fvwm-crystal detections, integrated it into new refactored desktop
+logic.
+
+3. For systems without glxinfo or running inxi out of gui/desktop, Xorg was in
+many cases failing to show version, which made it not show anything for server:
+except N/A. This is caused by a relatively recent change in behaviors in xorg,
+where you have to run it directly from it's true path, which is something like
+/usr/lib/xorg or /usr/lib/server-xorg at which point the error:
+
+/usr/lib/xorg-server/Xorg.wrap: Only console users are allowed to run the X
+server
+
+Figuring this out was tricky, and who the heck knows why Xorg -version would
+even return such a silly error in the first place, but there you have it. Next
+time you wonder why inxi is so long, this is why, endless churn in basic and
+complex things! The fix is injecting the optional xorg paths into @paths right
+before, and removing them right after, which avoids adding clutter to the
+@paths.
+
4. A ZFS fix, I'd noticed this one a while back, but after looking at the zfs
-Ubuntu tutorial page, I realized that this is the norm now, which is building zfs
-with /dev/sda (no partitions). This lead to failing to detect the zfs components,
-and reporting a bunch of partitions as unmounted which were part of that /dev/sdb
-type component array. By allowing /dev/sd[a-z] I fixed both errors at the same time,
-but I don't know if this syntax extends to say, nvme zfs as well. Note that when
-you build zfs arrays with say, /dev/sdb /dev/sdc you'll see two partitions per
-disk, /dev/sdx1 which is the main data, and /dev/sdx2, which is a tiny 8mB partition,
-no idea what it's for.
+Ubuntu tutorial page, I realized that this is the norm now, which is building
+zfs with /dev/sda (no partitions). This lead to failing to detect the zfs
+components, and reporting a bunch of partitions as unmounted which were part of
+that /dev/sdb type component array. By allowing /dev/sd[a-z] I fixed both errors
+at the same time, but I don't know if this syntax extends to say, nvme zfs as
+well. Note that when you build zfs arrays with say, /dev/sdb /dev/sdc you'll see
+two partitions per disk, /dev/sdx1 which is the main data, and /dev/sdx2, which
+is a tiny 8mB partition, no idea what it's for.
+
5. Fixed missing konversation and hexchat version numbers in -I, finally found
-what was going on there. Note that hexchat --version used to pop up a gui, but
-I guess he finally fixed that, I am hoping.
-6. Fixed some gentoo repo detections, but also found more variants. Not sure what
-exactly is going on with repos there, will wait for gentoo user issue reports to
-really lock those down.
-7. BSD fixes, turns out FreeBSD uses that same map ... syntax in df -kT as OSX...
-Also made sure to load sysctl data for -S row, I'd forgotten about the compiler
-test there which needs that data.
-8. Fixed herbstluftwm version detection, turns out it's another one of those that
-passes the entire path to the version program, so it shows: /sbin/herbsuftwm 0.22.0
-which broke the regex, easy fix.
+what was going on there. Note that hexchat --version used to pop up a gui, but I
+guess he finally fixed that, I am hoping.
+
+6. Fixed some gentoo repo detections, but also found more variants. Not sure
+what exactly is going on with repos there, will wait for gentoo user issue
+reports to really lock those down.
+
+7. BSD fixes, turns out FreeBSD uses that same map ... syntax in df -kT as
+OSX... Also made sure to load sysctl data for -S row, I'd forgotten about the
+compiler test there which needs that data.
+
+8. Fixed herbstluftwm version detection, turns out it's another one of those
+that passes the entire path to the version program, so it shows:
+/sbin/herbsuftwm 0.22.0 which broke the regex, easy fix.
+
9. Completed refactoring of DesktopData, now it's all data array driven for most
-wm, desktops, etc, which makes adding/removing one very easy. All core data is now
-in program_values to allow for automated detections.
-
-Enhancements:
-1. With fix 1, added check_int and check_number utilities, these validate that inxi
-internal numeric or integer values actually are what they are supposed to be. This
-uses a neat Perl trick that makse the checks super fast and super accurate. Moved
-all internal int/numeric test regex to use these.
-2. Added file based version number detection, that was done for Deepin, which uses
-/etc/deepin-version for its version number, but it can be used for anything.
+wm, desktops, etc, which makes adding/removing one very easy. All core data is
+now in program_values to allow for automated detections.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. With fix 1, added check_int and check_number utilities, these validate that
+inxi internal numeric or integer values actually are what they are supposed to
+be. This uses a neat Perl trick that makse the checks super fast and super
+accurate. Moved all internal int/numeric test regex to use these.
+
+2. Added file based version number detection, that was done for Deepin, which
+uses /etc/deepin-version for its version number, but it can be used for
+anything.
+
3. Added Deepin and deepin window managers, Lumina, added bspwm wm, fixed muffin
-detections. Note that lumina has a weird behavior where when run outside of pinxi,
-it outputs to stdout, but inside of pinxi, to stderr, who the heck knows how that
-happens!
+detections. Note that lumina has a weird behavior where when run outside of
+pinxi, it outputs to stdout, but inside of pinxi, to stderr, who the heck knows
+how that happens!
+
4. Added zorin to supported base: distros.
-5. Even more disk vendors added! The list of no-name off brand chinese ssd vendors
-appears to be endless! Added some more specific ids to capture unique strings
-that can be linked to a vendor.
-6. Added /usr/home to default -P paths, that's used instead of /home in the real
+
+5. Even more disk vendors added! The list of no-name off brand chinese ssd
+vendors appears to be endless! Added some more specific ids to capture unique
+strings that can be linked to a vendor.
+
+6. Added /usr/home to default -P paths, that's used instead of /home in the real
world, so why not show it?
-7. Because qt detection is possible, I've extended qt toolkit detection, but it's
-also not super accurate, but it's far better than gtk tk was, so I'm leaving
-that in. I also extended it to more wm/desktops since more are using qt now.
-Note: budgie 11 is going to be qt, but there's no way to distinguish between 11 and
-gtk 10 without doing a bunch of hacks so I'm leaving that alone.
-8. Found a possible distro id source, added /etc/calamares detections to debugger,
-I'll see if that shows some consistent patterns before I implement a last fallback
-test for distro IDs. It may work.
-
-Removed:
+
+7. Because qt detection is possible, I've extended qt toolkit detection, but
+it's also not super accurate, but it's far better than gtk tk was, so I'm
+leaving that in. I also extended it to more wm/desktops since more are using qt
+now. Note: budgie 11 is going to be qt, but there's no way to distinguish
+between 11 and gtk 10 without doing a bunch of hacks so I'm leaving that alone.
+
+8. Found a possible distro id source, added /etc/calamares detections to
+debugger, I'll see if that shows some consistent patterns before I implement a
+last fallback test for distro IDs. It may work.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
1. Giving up on fake/slow/inaccurate GTK toolkit detections, removed the entire
codeblock and stored in docs/inxi-fragments.txt, but I'm not going to do package
-manager type version tests anymore, if we can't get the data directly from a program
-or file, it's not going to happen, plus the gtk installed on the system means nothing
-in relation to the gtk version used to build the desktop.
+manager type version tests anymore, if we can't get the data directly from a
+program or file, it's not going to happen, plus the gtk installed on the system
+means nothing in relation to the gtk version used to build the desktop.
-
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 23 Jul 2018 12:57:38 -0700
-=====================================================================================
+================================================================================
Version: 3.0.18
Patch: 00
Date: 2018-07-16
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Fixes, a few changes, enhancements.
-Fixes:
-1. Removed /dev/zram type data from swap partitions, since that's ram, it's
-not a partition, obviously.
-2. More alternate IPMI syntax found, that's clearly going to take a while to have
-most syntaxes handled.
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Removed /dev/zram type data from swap partitions, since that's ram, it's not
+a partition, obviously.
+
+2. More alternate IPMI syntax found, that's clearly going to take a while to
+have most syntaxes handled.
+
3. Small lm-sensors adjustment, fringe cases might scramble up hwmon and gpu
temps, this is now handled.
-Enhancements:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Added disk vendors, udinfo.
-2. Exciting! New Architecture: MIPS! First datasets, confirmed working. This led to
-more abstracting of the previously ARM specific logic to be for SOC in general.
+
+2. Exciting! New Architecture: MIPS! First datasets, confirmed working. This led
+to more abstracting of the previously ARM specific logic to be for SOC in
+general.
+
3. Related to 2, added in fallback busybox cases for partition data without fs.
-4. Added window managers, xmonad, ratpoison, 9dm, gala (for Pantheon), notion,
+
+4. Added window managers, xmonad, ratpoison, 9dm, gala (for Pantheon), notion,
windowlab
+
5. Added Pantheon desktop detection. Note, unable to find a way to get version
number.
+
6. IMPI sensors: added in psu fans, dimm temp.
+
7. New -Cxxx option: cpu boost (aka turbo), state enabled / disabled, only shows
if system has that option.
-Changes:
+--------------------------------------------------------------------------------
+CHANGES:
+
1. Made toolkit for -S be -xx instead of -x, only Trinity/KDE and XFCE have that
data.
------------------------------------
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 16 Jul 2018 17:31:30 -0700
-=====================================================================================
+================================================================================
Version: 3.0.17
Patch: 00
Date: 2018-07-12
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Changes, bug fixes, enhancements! Don't delay!
-Bugs:
+--------------------------------------------------------------------------------
+BUGS:
+
1. A real bug, the detection for true path of /dev/root had a mistake in it and
-would only have worked in half the cases. This was an easy fix, but a significant
-one since it also would lead to the actual root / partition showing in Unmounted.
-2. Related to the item Fixes-2, if two USB networking devices were attached,
-the second one's bus and chip ID would go on the wrong line of data if -n or -i
-option were used. Since that would be the line belonging to the previous device,
+would only have worked in half the cases. This was an easy fix, but a
+significant one since it also would lead to the actual root / partition showing
+in Unmounted.
+
+2. Related to the item Fixes-2, if two USB networking devices were attached,
+the second one's bus and chip ID would go on the wrong line of data if -n or -i
+option were used. Since that would be the line belonging to the previous device,
that obviously was weird and wrong.
-3. NEW: latest kernel can show hwmon data in sensors, for example from wifi chip.
-This broke CPU temp detection and showed way too high cpu temp, so this fix is
-fairly important since new kernels may have this new sensors hwmon syntax.
-4. Sensors: IPMI alternate syntax found, also case with no data in expected columns,
-just N/A, so now the ipmi sensor logic skips all lines with non numeric values in
-the values column. This is what it should have done all along, it was trusting
-that values would always exist for the field names it looks for.
-
-Fixes:
-1. ARM networking fix. ARM devices like rasberry pi that use usb bus for networking
-showed the no data message even though usb networking was right below it. This is
-corrected, and now that only shows if both main and usb networking failed for ARM.
-2. Big repo fix: while testing distro and Trinity live cds, I discovered that apt is
-sometimes used with rpms, which made PCLinuxOS and ALT-Linux Repos item show the
-apt files but no data since the pattern was looking for start with deb. Added rpm
-to pattern, so all distros that use apt running rpms should now 'just work'.
-3. Fixed more distro id things, PCLinuxOS should now show its full distro string.
-4. Debugger: Filtered out more blocks of /proc, that data is bloated and messy, found
-another case where it collected a vast amount of junk system data from zfs in that
-case, just blocked the entire range. I had no idea /proc had so much junk data in it!
-5. As noted above, IPMI, yet another alternate syntax for field names. My hope that
-IPMI software and sensors will be more logical and consistent than lm-sensors output
-is proving to be merely wishful thinking, I think now out of 3 datasets I've gotten,
-I've seen 3 variants for syntax, not to mention the ipmi-tool vs ipmi-sensors
-differences. So IPMI will be like all sensors stuff, a work in progress, to
-be updated with every newly discovered alternate syntax and data set.
-
-Enhancements:
-1. Disk vendors, added some, improved pattern detections for others. This feature
-is getting better all the time. Thanks linuxlite hw db, easy to scan for missing
-vendors in their inxi data.
-2. Added more wm, budgie-wm, mwm, variants of kwin and Trinity's Twin, several others,
-more refactoring of core wm/desktop code.
-3. Added gpu ram and reworked memory logic for rasberry pi, which is the only SBC
-I am aware of that uses that tool. Now reports the actual total, and also gpu: for
-ram data, so you can tell that the gpu is using part of the total. Again, this comes
-from issue #153. Also added that info to man page for -I part.
+
+3. NEW: latest kernel can show hwmon data in sensors, for example from wifi
+chip. This broke CPU temp detection and showed way too high cpu temp, so this
+fix is fairly important since new kernels may have this new sensors hwmon
+syntax.
+
+4. Sensors: IPMI alternate syntax found, also case with no data in expected
+columns, just N/A, so now the ipmi sensor logic skips all lines with non numeric
+values in the values column. This is what it should have done all along, it was
+trusting that values would always exist for the field names it looks for.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. ARM networking fix. ARM devices like rasberry pi that use usb bus for
+networking showed the no data message even though usb networking was right below
+it. This is corrected, and now that only shows if both main and usb networking
+failed for ARM.
+
+2. Big repo fix: while testing distro and Trinity live cds, I discovered that
+apt is sometimes used with rpms, which made PCLinuxOS and ALT-Linux Repos item
+show the apt files but no data since the pattern was looking for start with deb.
+Added rpm to pattern, so all distros that use apt running rpms should now 'just
+work'.
+
+3. Fixed more distro id things, PCLinuxOS should now show its full distro
+string.
+
+4. Debugger: Filtered out more blocks of /proc, that data is bloated and messy,
+found another case where it collected a vast amount of junk system data from zfs
+in that case, just blocked the entire range. I had no idea /proc had so much
+junk data in it!
+
+5. As noted above, IPMI, yet another alternate syntax for field names. My hope
+that IPMI software and sensors will be more logical and consistent than
+lm-sensors output is proving to be merely wishful thinking, I think now out of 3
+datasets I've gotten, I've seen 3 variants for syntax, not to mention the
+ipmi-tool vs ipmi-sensors differences. So IPMI will be like all sensors stuff, a
+work in progress, to be updated with every newly discovered alternate syntax and
+data set.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Disk vendors, added some, improved pattern detections for others. This
+feature is getting better all the time. Thanks linuxlite hw db, easy to scan for
+missing vendors in their inxi data.
+
+2. Added more wm, budgie-wm, mwm, variants of kwin and Trinity's Twin, several
+others, more refactoring of core wm/desktop code.
+
+3. Added gpu ram and reworked memory logic for rasberry pi, which is the only
+SBC I am aware of that uses that tool. Now reports the actual total, and also
+gpu: for ram data, so you can tell that the gpu is using part of the total.
+Again, this comes from issue #153. Also added that info to man page for -I part.
+
4. Added more ARM and PCI cleaners for neater and more concise ARM/PCI output.
-5. Added Trinity support to Desktop section, this had at least two different detection
-methods, but since the first just shows KDE original data, only the second one proved
-to be Trinity specific. Happily, the full data is available, toolkit, desktop version,
-and wm (Twin).
+
+5. Added Trinity support to Desktop section, this had at least two different
+detection methods, but since the first just shows KDE original data, only the
+second one proved to be Trinity specific. Happily, the full data is available,
+toolkit, desktop version, and wm (Twin).
+
6. New -G,-A,-R -xxx feature: vendor:. Note that vendor data is very bloated and
-messy so it's trimmed down substantially, using a series of filters and rules, and
-thus it can contain the following: the actual vendor, like Dell, nothing, the
-motherboard vendor/product for board based PCI items, or a complete vendor/product
-string if it's unique. I couldn't think of a clean field name that meant:
-vendor OR vendor + basic product info OR motherboard + board version OR full
-product name, including vendor, so in the end, I just used vendor: but it's not
-quite the right term, but nothing else seemed to work better. Testers responded
+messy so it's trimmed down substantially, using a series of filters and rules,
+and thus it can contain the following: the actual vendor, like Dell, nothing,
+the motherboard vendor/product for board based PCI items, or a complete
+vendor/product string if it's unique. I couldn't think of a clean field name
+that meant: vendor OR vendor + basic product info OR motherboard + board version
+OR full product name, including vendor, so in the end, I just used vendor: but
+it's not quite the right term, but nothing else seemed to work better. Testers
+responded
very enthusiastically about this feature so I guess the vendor: feature is ok.
-Changes:
-1. Biggest change: Drives: HDD: total: the HDD: is now changed to: Local Storage:
-This was part of issue #153 and is a good suggestion because HDD generally was used to
-refer to hard disks, spinning, but with nvme, m.2, ssd, mmc, etc, that term is a bit
-dated. 'Local' is because inxi does not include detected remote storage in the totals.
-2. The recent --wm option which forced ps as data source for window manager detection
-has been reversed, now --wm forces wmctrl and ps aux is preferred. Still falls back
-to wmctrl in case the ps test is null, this is better because I have to add the wm
-data manually for each one, whereas wmctrl has an unknown set and probably variable
-set of wm. Note that I reversed this because I saw several cases where wmctrl was
-wrong, and reported a generic source wm instead of the real one. Since most users are
-not going to even be aware of the wm: feature as enhanced with --wm switch, this
-should have no impact on users in general. Since the detected wm name needs to be
-known and handled to get assigned to wm: and wm version data, I think it will work
-better to have the known variants match with the wm data values, then just fallback to
-unknown ones that can get filled in over time as we find wm that people actually
-use and that you can get version info on and detect.
-3. Moved help menu debugging options to bottom of help, which makes the option set
-more logical as you go down the list:
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. Biggest change: Drives: HDD: total: the HDD: is now changed to: Local
+Storage: This was part of issue #153 and is a good suggestion because HDD
+generally was used to refer to hard disks, spinning, but with nvme, m.2, ssd,
+mmc, etc, that term is a bit dated. 'Local' is because inxi does not include
+detected remote storage in the totals.
+
+2. The recent --wm option which forced ps as data source for window manager
+detection has been reversed, now --wm forces wmctrl and ps aux is preferred.
+Still falls back to wmctrl in case the ps test is null, this is better because I
+have to add the wm data manually for each one, whereas wmctrl has an unknown set
+and probably variable set of wm. Note that I reversed this because I saw several
+cases where wmctrl was wrong, and reported a generic source wm instead of the
+real one. Since most users are not going to even be aware of the wm: feature as
+enhanced with --wm switch, this should have no impact on users in general. Since
+the detected wm name needs to be known and handled to get assigned to wm: and wm
+version data, I think it will work better to have the known variants match with
+the wm data values, then just fallback to unknown ones that can get filled in
+over time as we find wm that people actually use and that you can get version
+info on and detect.
+
+3. Moved help menu debugging options to bottom of help, which makes the option
+set more logical as you go down the list:
+
Output Control Options:
Additional Options:
Advanced Options:
Debugging Options:
-Removed:
-1. Got rid of tests for GTK compiled with version for many desktops, that test
+4. Got rid of tests for GTK compiled with version for many desktops, that test
was always wrong because it did not have any necessary relation to the actual
gtk version the desktop was built out of, and it also almost always returned no
data. Since this is an expensive and slow test, and is always going to be wrong
-or empty anyway, I've removed it. My tests showed it taking about 300ms or so
-to generate no data, heh. That's the tk: feature in -S.
-Note I also found that gnome-shell takes an absurdly long time to give --version
-info, the slowest of all such things, 300ms again, just to show version? Someone
-should fix that, there's no possible reason why it should take 300 milliseconds
-to give a simple version string. Note that this returns tk: to only returning
-real data, which in this case means only xfce, kde, and trinity, which are the
-only desktops that actually report their toolkit data. I'll probably remove
-that code in the future unless I can think of some real use for gtk version
-elsewhere, but it's just junk data which doesn't even work.
-
-In the future, I will not try to emulate or guess at desktop toolkits, either they
-show the data in a direct form like XFCE or Trinity or KDE do, or I won't waste
-resources and execution time making bad guesses using inefficient code and logic.
-QT desktops like LXQt I'm leaving in because I believe those will tend to track
-more closely the QT version on the system, and the tests for QT version aren't
-huge ugly hacks the way they are for GTK, so they aren't as slow or intrusive, but
-those may also get removed since they almost never work either. But they are also
-slowing down the -Sx process so maybe they should be removed as well, I'll think
-about it. Since they only are used on LXQt and razer-qt, it probably isn't a big
-deal overall.
-
------------------------------------
+or empty anyway, I've removed it. My tests showed it taking about 300ms or so to
+generate no data, heh. That's the tk: feature in -S. Note I also found that
+gnome-shell takes an absurdly long time to give --version info, the slowest of
+all such things, 300ms again, just to show version? Someone should fix that,
+there's no possible reason why it should take 300 milliseconds to give a simple
+version string. Note that this returns tk: to only returning real data, which in
+this case means only xfce, kde, and trinity, which are the only desktops that
+actually report their toolkit data. I'll probably remove that code in the future
+unless I can think of some real use for gtk version elsewhere, but it's just
+junk data which doesn't even work.
+
+In the future, I will not try to emulate or guess at desktop toolkits, either
+they show the data in a direct form like XFCE or Trinity or KDE do, or I won't
+waste resources and execution time making bad guesses using inefficient code and
+logic. QT desktops like LXQt I'm leaving in because I believe those will tend to
+track more closely the QT version on the system, and the tests for QT version
+aren't huge ugly hacks the way they are for GTK, so they aren't as slow or
+intrusive, but those may also get removed since they almost never work either.
+But they are also slowing down the -Sx process so maybe they should be removed
+as well, I'll think about it. Since they only are used on LXQt and razer-qt, it
+probably isn't a big deal overall.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 12 Jul 2018 13:44:34 -0700
-=====================================================================================
+================================================================================
Version: 3.0.16
Patch: 00
Date: 2018-07-08
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man. Several bug fixes, enhancements, options.
-Bugs:
-1. In some cases, -S Desktop showed xfce when it wasn't xfce. This should be largely
-corrected now.
-2. Big bug: using lxqt-about for lxqt --version, now opens a dialog box, gui,
-so removed that, and now checking lxqt-session for version info instead.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. In some cases, -S Desktop showed xfce when it wasn't xfce. This should be
+largely corrected now.
+
+2. Big bug: using lxqt-about for lxqt --version, now opens a dialog box, gui, so
+removed that, and now checking lxqt-session for version info instead.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Now calling hitachi hgst drives vendor: HGST (Hitachi) to differentiate
+between regular Hitachi and HGST hitachi. Added a few more disk vendors.
-Fixes:
-1. Now calling hitachi hgst drives vendor: HGST (Hitachi) to differentiate between
-regular Hitachi and HGST hitachi. Added a few more disk vendors.
-2. Distro base and core: added linuxlite, elementary. Some distros use:
+2. Distro base and core: added linuxlite, elementary. Some distros use:
/etc/upstream-release/lsb-release so testing for that and os-release now too.
+
3. Extended qt detections, may catch a few stray ones now in non kde qt
desktops.
+
4. Complete refactor of desktop, desktop info, wm, and -G compositor, now much
-easier to extend each feature and add detections, move order around, etc.
-Also moved wm to -Sxx now that I use fallback ps aux tests, which were themselves
+easier to extend each feature and add detections, move order around, etc. Also
+moved wm to -Sxx now that I use fallback ps aux tests, which were themselves
also totally refactored and optimized. Fixed WindowMaker id, which is made more
-annoying because they are the only upper/lower case program name, but in at least
-debian, the actual program name is wmaker internally.
-Also tightened in particular gnome-shell, which was failing to show due to too
+annoying because they are the only upper/lower case program name, but in at
+least debian, the actual program name is wmaker internally.
+
+Also tightened in particular gnome-shell, which was failing to show due to too
restrictive filtering of desktop/vm repeats. Most wm do not contain the desktop
name in the string, gnome-shell does, only one I'm aware of.
+
5. Removed N/A from wmctrl output, which just means null, which is what we want.
-6. Removed gnome-shell from info: since it will now appear in wm: if found. Added
-a few -panel items to info:
-Enhancements:
+6. Removed gnome-shell from info: since it will now appear in wm: if found.
+Added a few -panel items to info:
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. Showing type: network bridge for -N when it's type 0680, which is an odd pci
type, generally it's a network bridge, but I figured it's best to show that
explicitly to avoid confusion. This extends the 'type:' from just USB.
-2. Added more window managers to wm, matchbox, flwm, fvwm2 (used to just use fvwm,
-this was wrong, it's its own thing), a few others.
+
+2. Added more window managers to wm, matchbox, flwm, fvwm2 (used to just use
+fvwm, this was wrong, it's its own thing), a few others.
+
3. Added a few more compositors to -Gxx. kwin_x11 should be the most noticeable,
but added some more obscure ones too. This feature requires more work.
+
4. Extended ARM syntax to support a new one, path to /sys/device... has an extra
-/soc/ in it, that is now handled, all are tested for. Confirmed working. Note that
-ARM has to be confirmed fixed on a device by device basis, since there are key
-syntax differences in the paths, but it will get easier the more variants that are
-discovered. Added another trimmer to cut off \x00|01|02|03 special non printing
-characters which show as weird jibbberish in output, for model/serial number.
-5. Refactored wm, info, desktop, compositor, now all use @ps_gui, which is all that
-is tested against, not the entire ps_cmd array. This drops the possible tests down
-massively since the only things in ps_gui will be the actual stuff found that matches
-all the patterns required for that system, not all ps items. Added marco, muffin
-fixes. Was showing wm: Metacity (Marco) that is not correct, now shows marco, which
-then allows to get version too.
-5. -Sxxx now shows wm: version as well, which can be of use now and then.
-6. --wm added to trip force using of ps data for wm, this can be useful because
+/soc/ in it, that is now handled, all are tested for. Confirmed working. Note
+that ARM has to be confirmed fixed on a device by device basis, since there are
+key syntax differences in the paths, but it will get easier the more variants
+that are discovered. Added another trimmer to cut off \x00|01|02|03 special non
+printing characters which show as weird jibbberish in output, for model/serial
+number.
+
+5. Refactored wm, info, desktop, compositor, now all use @ps_gui, which is all
+that is tested against, not the entire ps_cmd array. This drops the possible
+tests down massively since the only things in ps_gui will be the actual stuff
+found that matches all the patterns required for that system, not all ps items.
+Added marco, muffin fixes. Was showing wm: Metacity (Marco) that is not correct,
+now shows marco, which then allows to get version too.
+
+6. -Sxxx now shows wm: version as well, which can be of use now and then.
+
+7. --wm added to trip force using of ps data for wm, this can be useful because
I don't know all variants of wmctrl output, so that makes it easier to test.
-7. Added finally support for --debug 3, which now shows timers, functions, and args
-printed to screen.
-8. Added qmake --version to fallback qt detection.
+8. Added finally support for --debug 3, which now shows timers, functions, and
+args printed to screen.
------------------------------------
+9. Added qmake --version to fallback qt detection.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 08 Jul 2018 15:57:58 -0700
-=====================================================================================
+================================================================================
Version: 3.0.15
Patch: 00
Date: 2018-07-03
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man. Big bug fix, new features.
-Bugs:
-1. Finally tracked down and solved the Xorg drivers bug which was caused by
-Xorg checking its list of defaults 2 times, not 1, which resulted in failed
-status on second try since it was already loaded. Secondary bug was found that
-resulted in failing to show the failed, and only showing unloaded, which was also
-wrong. This finally fixes issue #134 item 5. Thanks Mint users for the help on
-that one.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Finally tracked down and solved the Xorg drivers bug which was caused by Xorg
+checking its list of defaults 2 times, not 1, which resulted in failed status on
+second try since it was already loaded. Secondary bug was found that resulted in
+failing to show the failed, and only showing unloaded, which was also wrong.
+This finally fixes issue #134 item 5. Thanks Mint users for the help on that
+one.
+
2. Small bug in Openbox version detection, typo.
+
3. fixed a small glitch in the dm: detection that on systems where /var/run
exists but is not linked to /run, the dm would fail to get detected.
-Fixes:
-1. Xfce when defaulting to no version found goes to 4, this is a bad idea, it's
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Xfce when defaulting to no version found goes to 4, this is a bad idea, it's
better to not show any version, since xfce could one day be 5.
+
2. Fixed Blackbox fallback detection, there were cases where Blackbox not found
in xprop -root, now it falls back to ps aux detection.
-3. For wm: tested all known variants, added support for things like Mutter (Marco)
-syntax. Note that bunsenlab uses XDG_CURRENT_DESKTOP=XFCE to work around some
-glitches, but it's actually Openbox. If run as root, it will show openbox correctly,
-otherwise -Sxxx will show wm: openbox, but that's due to bunsenlabs choices there.
-4. Rewrote a lot of DistroData to handle more dynamic testing of values, it's sad
-that at almost 2020 we are still stumbling around trying to find a consistent way
-to identify distros, and derived distros.
-5. Added more debugger data collectors in the logging, some data was not
-being tracked well during log process which made debugging harder.
-
-Enhancements:
-1. New feature, -Gxx now shows for Xorg drivers alternate: which are drivers that
-Xorg auto checks but which are not installed. Those were ignored in the past. This
-can be useful to see for example that there are other driver install options
-available. Thanks gm10 for that suggestion.
+
+3. For wm: tested all known variants, added support for things like Mutter
+(Marco) syntax. Note that bunsenlab uses XDG_CURRENT_DESKTOP=XFCE to work around
+some glitches, but it's actually Openbox. If run as root, it will show openbox
+correctly, otherwise -Sxxx will show wm: openbox, but that's due to bunsenlabs
+choices there.
+
+4. Rewrote a lot of DistroData to handle more dynamic testing of values, it's
+sad that at almost 2020 we are still stumbling around trying to find a
+consistent way to identify distros, and derived distros.
+
+5. Added more debugger data collectors in the logging, some data was not being
+tracked well during log process which made debugging harder.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. New feature, -Gxx now shows for Xorg drivers alternate: which are drivers
+that Xorg auto checks but which are not installed. Those were ignored in the
+past. This can be useful to see for example that there are other driver install
+options available. Thanks gm10 for that suggestion.
+
2. Tested and added the following explicit handlers for Distros: and base: in
-some cases:
-grml, peppermint, kali, siduction, aptosid, arco, manjaro, chakra, antergos,
-bunsenlabs, and a few others. These are a pain to add and test, basically I have
-to boot a live cd of each one, then test the files and ID methods, but the ID
-methods must also be as dynamic as possible because you never know when a distro
-is going to change how they use os-release vs issue vs lsb-release vs <name>-release.
-I would have tested a few more but their livecds failed to properly run on vbox.
+some cases: grml, peppermint, kali, siduction, aptosid, arco, manjaro, chakra,
+antergos, bunsenlabs, and a few others. These are a pain to add and test,
+basically I have to boot a live cd of each one, then test the files and ID
+methods, but the ID methods must also be as dynamic as possible because you
+never know when a distro is going to change how they use os-release vs issue vs
+lsb-release vs <name>-release. I would have tested a few more but their livecds
+failed to properly run on vbox.
+
3. Added a few more disk vendor IDs.
-4. Added some more programs to debugger data collector for future feature vdpau, but
-that needs more data because we don't really know the variants for example for
-dual card systems.
-5. Man page: changed extra options to use only one option name per list of options
-for that feature, each separate item is started as a new paragraph with -
-This makes it a bit more consistent and maybe slightly easier to read the man.
+
+4. Added some more programs to debugger data collector for future feature vdpau,
+but that needs more data because we don't really know the variants for example
+for dual card systems.
+
+5. Man page: changed extra options to use only one option name per list of
+options for that feature, each separate item is started as a new paragraph with
+- This makes it a bit more consistent and maybe slightly easier to read the man.
Added -Gxx item, updated -Sx item.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 03 Jul 2018 14:13:32 -0700
-=====================================================================================
+================================================================================
Version: 3.0.14
Patch: 00
Date: 2018-06-27
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version. Tiny bug fix, Ubuntu based distros only.
-The 3.0.13 system base feature had a small bug in the logic that was supposed to
-get the version id from codename, the bug made it never work. This is only relevant
-for Ubuntu based distros, so if you are on some other base like Debian or Arch, you
-can ignore this one, 3.0.13 will work fine.
+The 3.0.13 system base feature had a small bug in the logic that was supposed to
+get the version id from codename, the bug made it never work. This is only
+relevant for Ubuntu based distros, so if you are on some other base like Debian
+or Arch, you can ignore this one, 3.0.13 will work fine.
No other changes, this was mainly for Mint, and other Ubuntu derived distros in
the future.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 27 Jun 2018 16:50:30 -0700
-=====================================================================================
+================================================================================
Version: 3.0.13
Patch: 00
Date: 2018-06-23
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, man page. New features and fixes!
-Bugs:
+--------------------------------------------------------------------------------
+BUGS:
+
1. -I line, sometimes running in showed sudo. This is hopefully now corrected.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. CPU architectures, small reordering based on hopefully more reliable data
source, but these are hard to find conclusively.
+
2. -S Distro id: switched ordering of prefered os-release sources, PRETTY_NAME
is not being used consistently, too many distros leave out the distro id found
-in VERSION, so now it uses NAME + VERSION if both are there, then PRETTY_NAME
-as a fallback. That reverses how it was, but it will provide better results for
+in VERSION, so now it uses NAME + VERSION if both are there, then PRETTY_NAME as
+a fallback. That reverses how it was, but it will provide better results for
most distros. Distros that did this properly to begin with should see no change.
-3. Now that inxi is basically debugged and working, I've removed the output of
-'inxi' from the -t lines. It remains for the pinxi branch however so you can
-see how many resources pinxi uses to run.
+
+3. Now that inxi is basically debugged and working, I've removed the output of
+'inxi' from the -t lines. It remains for the pinxi branch however so you can see
+how many resources pinxi uses to run.
+
4. ipmi sensors data are proving to be as random as lm-sensors. Added another
alternate syntax for sensors.
+
5. CPU: found an alternate syntax, again, for IPMI and sensors data, added
support, I hope, for that.
-Enhancements:
-1. Added /proc debugger tool to debugger. Due to oddities with how the /proc file
-system is created, it will only run as user, not root, unless the --proc flag is
-used. More programs added to debugger commands.
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added /proc debugger tool to debugger. Due to oddities with how the /proc
+file system is created, it will only run as user, not root, unless the --proc
+flag is used. More programs added to debugger commands.
+
2. More disk vendor strings added, fine tuning of vendor detections. There is a
tendency in NVMe disk names to put the vendor name in the middle of the string.
That is now handled for a few key vendors.
-3. Added basic ARM SOC and server support. This will require more work in the future
-because the syntax used varies significantly device to device, but the featuers
-are now in place to add that support. Most SBC ARM devices should now at least show
-the model and details data in machine data, and some will show -G -A -N data as
-well.
+
+3. Added basic ARM SOC and server support. This will require more work in the
+future because the syntax used varies significantly device to device, but the
+featuers are now in place to add that support. Most SBC ARM devices should now
+at least show the model and details data in machine data, and some will show -G
+-A -N data as well.
+
4. ARM CPU: added first attempt to show the cpu variant as well as the more
-generic ARM data. This shows 1 or more variants, some ARM devices have two different
-cpu cores running at different speeds. Odroid for example.
-5. Added system 'base:' data for -Sx, that modifies Distro: in supported cases.
+generic ARM data. This shows 1 or more variants, some ARM devices have two
+different cpu cores running at different speeds. Odroid for example.
+
+5. Added system 'base:' data for -Sx, that modifies Distro: in supported cases.
Currently only Mint and MX/AntiX supported because each specific distro must be
-handled explicitly using empirical file based data tests. I decided against showing
-this for rolling release, since really everyone knows that Antergos is made from
-Arch Linux, so showing that does not provide much useful information, whereas
-showing the Ubuntu version Mint was made from does.
+handled explicitly using empirical file based data tests. I decided against
+showing this for rolling release, since really everyone knows that Antergos is
+made from Arch Linux, so showing that does not provide much useful information,
+whereas showing the Ubuntu version Mint was made from does.
Note that several derived distros are changing how they use os-release, so the
-tools had to be revised to be more dynamic, which is a pain, and makes it even
-more empirical and less predictable to print what should be trivially easy to
+tools had to be revised to be more dynamic, which is a pain, and makes it even
+more empirical and less predictable to print what should be trivially easy to
gather distro and derived source data.
-If your distro is not in this list and you want the base data to be present, please
-supply a --debug 22 dataset so I can check all the files required to make the
-detection work. If your distro has changed methods, please note which methods
-were used in the past, and which are used now.
+If your distro is not in this list and you want the base data to be present,
+please supply a --debug 22 dataset so I can check all the files required to make
+the detection work. If your distro has changed methods, please note which
+methods were used in the past, and which are used now.
+
6. Added Armbian distro detection, that's tricky. Added Rasbpian detections.
Added improved Antergos, Arco, and maybe Chakra, Arch detections.
+
7. Big one: Hardware RAID basic support added. Note that each vendor, and
-unfortunatley, often each product line, has its own raid status and drive
+unfortunatley, often each product line, has its own raid status and drive
reporting tools, which makes adding the actual drive/raid/status report part
-very time consuming to add. I may only support this if a certain software maker's
-raid tools are installed because they are much simpler to parse, but for now,
-it only shows the presence of the raid device itself, not disks, raid status, etc.
+very time consuming to add. I may only support this if a certain software
+maker's raid tools are installed because they are much simpler to parse, but for
+now, it only shows the presence of the raid device itself, not disks, raid
+status, etc.
-
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 23 Jun 2018 10:24:30 -0700
-=====================================================================================
+================================================================================
Version: 3.0.12
Patch: 00
Date: 2018-06-05
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version
-Bug fix, debugger when run as root hangs on proc traverse.
+--------------------------------------------------------------------------------
+BUGS:
------------------------------------
+1. debugger when run as root hangs on proc traverse.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 05 Jun 2018 01:18:18 -0700
-=====================================================================================
+================================================================================
Version: 3.0.11
Patch: 00
Date: 2018-06-04
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, man page. Features, bugs, fixes!
-Bugs:
+--------------------------------------------------------------------------------
+BUGS:
+
1. Color selector accepted '' as a value, which it would then write to config
file, creating errors since it's not an integer value.
-2. Corrected distro id error for last fallback case, making the distro ID out
-of the filename itself, that was missing the assignment to $distro.
-3. mmcblk0 was showing up as an unmounted partition, due to failing to filter
+
+2. Corrected distro id error for last fallback case, making the distro ID out of
+the filename itself, that was missing the assignment to $distro.
+
+3. mmcblk0 was showing up as an unmounted partition, due to failing to filter
mmcblk[0-9] in unmounted.
-Fixes:
+--------------------------------------------------------------------------------
+FIXES:
+
1. Added missing compositor kwin_wayland to compositor detections
+
2. For -M, on laptops, sometimes Type: would duplicate in Chassis: type: which
looks silly, so now it checks to make sure the two values are different before
using the Chassis: type: data.
-3. -D disk vendor, added GALAX, fixed Toshiba, which sometimes occurs other than
-start of disk id string, so now it checks the whole string. This seems particularly
-common in nvme devices from Toshiba. This is the only vendor I have found that
-puts the vendor string later in the device id string.
+
+3. -D disk vendor, added GALAX, fixed Toshiba, which sometimes occurs other than
+start of disk id string, so now it checks the whole string. This seems
+particularly common in nvme devices from Toshiba. This is the only vendor I have
+found that puts the vendor string later in the device id string.
+
4. Added protection against unreadable but present /etc/issue. This was caused
by a now fixed bug in OpenSuSe, which symbolically linked to create /etc/issue
-from /var/run/issue, but with 600 permissions, root read only, that is. Note that
-this bug has since been fixed (now has the correct 644 permissions), but I figured
-better safe than sorry in case anyone else decides that's a good idea in the future.
-Now only sends to reader if readable.
-5. Related to 4, made reader not exit on failure, now just prints error message and
-keeps going.
-6. Upped maximum distro string length to 60, from 50. AntiX for example was coming
-in at 48, so I decided to add some safe room now that inxi does dynamic sizing, it
-is not a big problem having very long distro id strings.
-
-Enhancements:
-1. Added basic /proc data parser to debugger. Can't get all the data or files because
-it's simply too big, but grabs the basics.
+from /var/run/issue, but with 600 permissions, root read only, that is. Note
+that this bug has since been fixed (now has the correct 644 permissions), but I
+figured better safe than sorry in case anyone else decides that's a good idea in
+the future. Now only sends to reader if readable.
+
+5. Related to 4, made reader not exit on failure, now just prints error message
+and keeps going.
+
+6. Upped maximum distro string length to 60, from 50. AntiX for example was
+coming in at 48, so I decided to add some safe room now that inxi does dynamic
+sizing, it is not a big problem having very long distro id strings.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added basic /proc data parser to debugger. Can't get all the data or files
+because it's simply too big, but grabs the basics.
+
2. Added vcgencmd for some ARM rasberry pi debugging.
+
3. ARM: add model if not found in /proc/cpuinfo, or if different.
-4. Added Tdie cpu sensor type, this is coming soon in latest kernels, so catching
-it early. Tdie will replace k10-temp sensor item temp1.
-5. Added --admin extra data option, and first set of extra data, -C, which will
-show CPU Errata (bugs), family, model-id, stepping (as hex (decimal) or hex if less
-than or equal to 9), microcode (as hex).
-6. Battery: added with -x option, if found, attached battery driven devices, like
-wifi keyboard, mouse. If upower is present, will also try to show battery charge
-percent for those devices. Note that -B only shows the Device-X items if -x is used,
-and will not show anything in -F unless there is a system, not device, battery
-present, or if -Fx is used and there is a Device battery detected.
-Added upower to recommends.
-7. Basic -Dxxx disk rotation speeds added. Requires udevadm. Not all spinning disks
-show rotation speeds, and it depends on udevadm, so if no rotation found, it shows
-nothing.
+
+4. Added Tdie cpu sensor type, this is coming soon in latest kernels, so
+catching it early. Tdie will replace k10-temp sensor item temp1.
+
+5. Added --admin extra data option, and first set of extra data, -C, which will
+show CPU Errata (bugs), family, model-id, stepping (as hex (decimal) or hex if
+less than or equal to 9), microcode (as hex).
+
+6. Battery: added with -x option, if found, attached battery driven devices,
+like wifi keyboard, mouse. If upower is present, will also try to show battery
+charge percent for those devices. Note that -B only shows the Device-X items if
+-x is used, and will not show anything in -F unless there is a system, not
+device, battery present, or if -Fx is used and there is a Device battery
+detected. Added upower to recommends.
+
+7. Basic -Dxxx disk rotation speeds added. Requires udevadm. Not all spinning
+disks show rotation speeds, and it depends on udevadm, so if no rotation found,
+it shows nothing.
+
8. Added explicit Arco Linux and Antergos distro ID support. This requires more
-checks, but in theory, both should now show Arco Linux or Antergos instead of default
-'Arch Linux' as before, plus extra data if found, like version.
+checks, but in theory, both should now show Arco Linux or Antergos instead of
+default 'Arch Linux' as before, plus extra data if found, like version.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 04 Jun 2018 16:48:53 -0700
-=====================================================================================
+================================================================================
Version: 3.0.10
Patch: 00
Date: 2018-05-21
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man page.
This version is very peaceful, no big changes, just a few fixes and small new
features added.
-This version corrects a few small glitches reported by users, and adds basic support
-for disk speed report. Note that this is not as accurate as I'd like, it tries, but
-there is not a lot of data to be had. Limits of disk speed seems to be, roughly:
+This version corrects a few small glitches reported by users, and adds basic
+support for disk speed report. Note that this is not as accurate as I'd like, it
+tries, but there is not a lot of data to be had. Limits of disk speed seems to
+be, roughly:
+
1. most speed is reported as max board can do, not max drive can support
-2. usually when speed is reported as lower than max board speed, it's correct, but,
-as usual, exceptions to this were found during testing.
-3. usually if drive is faster than board speed, it reports board speed, but, again,
-exceptions to this rule were found during testing.
-
-However, with this said, it's usually more or less right, at least right in terms
-of the fastest speed you can expect to get with your board. NVMe was also supported,
-that's much more complicated because NVMe has >= 1 lane, and each lane has up and
-down data. The reported speed is max in one direction, and is a function of the
-PCIe 1,2 20% overhead, and PCIe 3,4,5 ~1.5% overhead. inxi shows the actual usable
-data rate, not the GT/s rate, which is the total transfers per second the unit
-supports.
-
-So due to the unreliable nature of the data, this is only a -xx option. There is
+2. usually when speed is reported as lower than max board speed, it's correct,
+but, as usual, exceptions to this were found during testing.
+3. usually if drive is faster than board speed, it reports board speed, but,
+again, exceptions to this rule were found during testing.
+
+However, with this said, it's usually more or less right, at least right in
+terms of the fastest speed you can expect to get with your board. NVMe was also
+supported, that's much more complicated because NVMe has >= 1 lane, and each
+lane has up and down data. The reported speed is max in one direction, and is a
+function of the PCIe 1,2 20% overhead, and PCIe 3,4,5 ~1.5% overhead. inxi shows
+the actual usable data rate, not the GT/s rate, which is the total transfers per
+second the unit supports.
+
+So due to the unreliable nature of the data, this is only a -xx option. There is
also in general no data for USB, and none for mmcblk (sd cards usually).
-This feature may be enhanced with a C Perl XS library in the future, we'll see how
-that goes.
+This feature may be enhanced with a C Perl XS library in the future, we'll see
+how that goes.
+--------------------------------------------------------------------------------
FIXES:
-1. corrected an issue where a networking card of type Bridge failed to be detected.
-This is now handled. This was a PCI type I'd never seen before, but it exists, and
-a user had it, so now it will work as expected for this type.
-2. changed the default units in weather to be m (metric) imperial (i). While this is
-not very intuitive for me, it's easier to explain I think. The previous c / f
-syntax is supported internally, and inxi will just translate c to m and f to i, so
-it doesn't matter which is or was used on a config file or with the --weather-unit
-option.
-3. BSD uptime had a parsing glitch, there was a spelling variant I'd never seen in
-GNU/Linux that broke the regex. This is corrected now.
+
+1. corrected an issue where a networking card of type Bridge failed to be
+detected. This is now handled. This was a PCI type I'd never seen before, but it
+exists, and a user had it, so now it will work as expected for this type.
+
+2. changed the default units in weather to be m (metric) imperial (i). While
+this is not very intuitive for me, it's easier to explain I think. The previous
+c / f syntax is supported internally, and inxi will just translate c to m and f
+to i, so it doesn't matter which is or was used on a config file or with the
+--weather-unit option.
+
+3. BSD uptime had a parsing glitch, there was a spelling variant I'd never seen
+in GNU/Linux that broke the regex. This is corrected now.
+
4. Fixed a few small man page glitches, some ordering stuff, nothing major.
-5. Fixed BSD hostname issues. There was a case where a setup could have no hostname,
-inxi did not handle that correctly. This fix would have applied to gnu/linux as
-well.
-6. Fixed a few bsd, openbsd mostly, dm detections, there is a secondary path in
+
+5. Fixed BSD hostname issues. There was a case where a setup could have no
+hostname, inxi did not handle that correctly. This fix would have applied to
+gnu/linux as well.
+
+6. Fixed a few BSD, openBSD mostly, dm detections, there is a secondary path in
OpenBSD that was not checked. This also went along with refactoring the dm logic
to be much more efficient and optimized.
+
7. Fine tuned dmidecode error message.
+
8. Fixed PCI ID issue, it was failing to catch a certain bridged network type.
-9. A more global fix for unhandled tmpfs types, in this case, shm, but added a
+
+9. A more global fix for unhandled tmpfs types, in this case, shm, but added a
global test that will handle all tmpfs from now on, and exclude that data from
-p reports.
-NEW FEATURES:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. First attempt to add basic disk speed (Gb/s). Supported types: ATA, NVMe. No
speed data so far handled or found: mmcblk; USB. Also possibly older /dev/hda
-type devices (IDE bus) may not get handled in all cases. This may get more work
-in the future, but that's a long ways off. This case oddly was one where BSDs had
-support for basic disk speed reports before GNU/Linux, but that was really just
-because it was part of a single data line that inxi parsed for disk data anyway
-with BSDs.
+type devices (IDE bus) may not get handled in all cases. This may get more work
+in the future, but that's a long ways off. This case oddly was one where BSDs
+had support for basic disk speed reports before GNU/Linux, but that was really
+just because it was part of a single data line that inxi parsed for disk data
+anyway with BSDs.
+
2. Man items added for -Dxx disk speed options.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 21 May 2018 14:25:53 -0700
-=====================================================================================
+================================================================================
Version: 3.0.09
Patch: 00
Date: 2018-05-11
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man. Bug fixes, feature updates.
The main reason to release this earlier than I had hoped was because of the /sys
-permission change for serial/uuid file data. The earlier we can get this fix out,
-the better for end users, otherwise they will think they have no serial data when
-they really do.
+permission change for serial/uuid file data. The earlier we can get this fix
+out, the better for end users, otherwise they will think they have no serial
+data when they really do.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. A weather bug could result in odd or wrong data showing in weather output,
+this was due to a mistake in how the weather data was assembled internally. This
+error could lead to large datastore files, and odd output that is not all
+correct.
+
+2. More of an enhancement, but due to the way 'v' is used in version numbers,
+the program_version tool in some cases could have sliced out a 'v' in the wrong
+place in the version string, and also could have sliced out legitimate v values.
+This v issue also appeared in bios version, so now the new rule for
+program_version and certain other version results is to trim off starting v if
+and only if it is followed by a number.
+
+--------------------------------------------------------------------------------
FIXES:
+
1. this bug just came to my attention, apparently the (I assume) kernel people
-decided for us that we don't need to see our serial numbers in /sys unless we are
-root. This is an unfortunate but sadly predictable event. To work around this
-recent change (somewhere between 4.14 and 4.15 as far as I can tell), inxi -M and
--B now check for root read-only and show <root required> if the file exists but
-is not user readable. I wish, I really wish, that people could stop changing stuff
-for no good reason, but that's out of my control, all I can do is adjust inxi to
-this reality. But shame on whoever decided that was a good idea.
+decided for us that we don't need to see our serial numbers in /sys unless we
+are root. This is an unfortunate but sadly predictable event. To work around
+this recent change (somewhere between 4.14 and 4.15 as far as I can tell), inxi
+-M and -B now check for root read-only and show <root required> if the file
+exists but is not user readable. I wish, I really wish, that people could stop
+changing stuff for no good reason, but that's out of my control, all I can do is
+adjust inxi to this reality. But shame on whoever decided that was a good idea.
This is not technically an inxi bug, but rather a regression, since it's caused
by a change in /sys permissions, but users would see it as a bug so I consider
this an important fix.
-Note that the new /sys/class/dmi/id permissions result in various possible things:
+Note that the new /sys/class/dmi/id permissions result in various possible
+things:
1. serial/uuid file is empty but exists and is not readable by user
2. serial/uuid file is not empty and exists and is not readable by user
3. serial/uuid file does not exist
4. serial/uuid file exists, is not empty, and is readable by root
-Does this change make your life better? It doesn't make mine better, it makes
-it worse. Consider filing a bug report against whoever allowed this regression
-is my suggestion.
-
-BUGS:
-1. A weather bug could result in odd or wrong data showing in weather output, this
-was due to a mistake in how the weather data was assembled internally. This error
-could lead to large datastore files, and odd output that is not all correct.
-
-2. More of an enhancement, but due to the way 'v' is used in version numbers,
-the program_version tool in some cases could have sliced out a 'v' in the wrong
-place in the version string, and also could have sliced out legitimate v values.
+Does this change make your life better? It doesn't make mine better, it makes it
+worse. Consider filing a bug report against whoever allowed this regression is
+my suggestion.
-This v issue also appeared in bios version, so now the new rule for program_version
-and certain other version results is to trim off starting v if and only if it is
-followed by a number.
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
-FEATURES:
-1. Added in OpenBSD support for showing machine data without having to use dmidecode.
-This is a combination of systcl -a and dmesg.boot data, not very good quality data
-sources, but it is available as user, and it does work. Note that BIOS systems
-are the only ones tested, I don't know what the syntax for UEFI is for the field
-names and strings. Coming soon is Battery and Sensors data, from the same sources.
+1. Added in OpenBSD support for showing machine data without having to use
+dmidecode. This is a combination of systcl -a and dmesg.boot data, not very good
+quality data sources, but it is available as user, and it does work. Note that
+BIOS systems are the only ones tested, I don't know what the syntax for UEFI is
+for the field names and strings. Coming soon is Battery and Sensors data, from
+the same sources.
-Sadly as far as I know, OpenBSD is the only BSD that has such nice, usable (well,
-ok, dmesg.boot data is low quality strings, not really machine safe) data. I
-have no new datasets from the other BSDs so I don't know if they have decided to
-copy/emulate this method.
+Sadly as far as I know, OpenBSD is the only BSD that has such nice, usable
+(well, ok, dmesg.boot data is low quality strings, not really machine safe)
+data. I have no new datasets from the other BSDs so I don't know if they have
+decided to copy/emulate this method.
2. By request, and this was listed in issue #134, item no. 1, added in weather
switchable metric/imperial output. Also added an option, --weather-unit and
-configuration item: WEATHER_UNIT with possible values: cf|fc|c|f. The 2nd of
-two in cf/fc goes in () in the output. Note that windspeed is m/s or km/h as metric,
+configuration item: WEATHER_UNIT with possible values: cf|fc|c|f. The 2nd of two
+in cf/fc goes in () in the output. Note that windspeed is m/s or km/h as metric,
inxi shows m/s as default for metric and (km/h as secondary). Also fixed -w
-observation date to use local time formatting. That does not work in -W so it shows
-the default value.
+observation date to use local time formatting. That does not work in -W so it
+shows the default value.
3. Updated man to show new WEATHER_UNIT config option, and new --weather-unit
option. Also fixed some other small man glitches that I had missed.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 11 May 2018 13:29:06 -0700
-=====================================================================================
+================================================================================
Version: 3.0.08
Patch: 00
Date: 2018-05-06
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new tarball. New features, bug fixes.
This is a big one.
-NEW FEATURES:
-
-1. By Request: Disk vendor is now generally going to be shown. Since this uses
-empirical data to grab the vendor name, from the model string, it will not always
-find anything. When it fails to find vendor data, no vendor: item will show.
+--------------------------------------------------------------------------------
+BUGS:
-Note that some MMC devices will probably not show vendor data, but that's due to
-there being no data that reveals that.
+1. CRITICAL: /sys/block/xxx/device/model is in some cases truncating the disk
+model name to 16 characters. This is not an inxi bug, it's a bug with /sys
+itself.
-2. Extended -sx volts to also show voltage from lm-sensors if present. Many
-systems show no voltage data with lm-sensors, but now if any is found, it
-will show, same as impi.
+To fix this, inxi now uses for GNU/Linux /dev/disk/by-id data which does not
+ever do this truncation. It's also faster I believe to read that directory once,
+filter the results, then use the data for vendor/model/serial.
-3. Moved to lsblk as primary source for partition/unmounted filesystem, uuid, and
-label data.
+this was also part of the disk vendor data feature.
-Falls back to previous methods if lsblk does not return data. Some lsblk do not
-show complete data unless super user as well.
+2. OpenBSD networking fix. Was not showing IF data, now it does.
-4. Refactored code to be more logical and clear.
+3. Fixed bug with unmounted where sometimes md0 type partitions would show even
+though they are in a raid array.
-5. Added for OpenBSD -r: /etc/installurl file.
+4. Fixed disk rev, now it searches for 3 different files in /sys to get that
+data.
-BUG FIXES:
+5. Fixed bug with very old systems, with sudo 1.6 or older, for some reason that
+error did not get redirected to /dev/null, so now only using sudo -n after
+explicit version test, only if 1.7 or newer.
-1. CRITICAL: /sys/block/xxx/device/model is in some cases truncating the disk
-model name to 16 characters. This is not an inxi bug, it's a bug with /sys itself.
+6. Fixed a few null results in fringe cases for graphics. Resolution now shows
+NA for Hz if no hz data found. This was only present on a fringe user case which
+is unlikely to ever impact normal X installations.
-To fix this, inxi now uses for GNU/Linux /dev/disk/by-id data which does not
-ever do this truncation. It's also faster I believe to read that directory
-once, filter the results, then use the data for vendor/model/serial.
+7. Fixed BSD L2 cache, was showing MiB instead of KiB, wrong math.
-this was also part of the disk vendor data feature.
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
-2. Openbsd networking fix. Was not showing IF data, now it does.
+1. By Request: Disk vendor is now generally going to be shown. Since this uses
+empirical data to grab the vendor name, from the model string, it will not
+always find anything. When it fails to find vendor data, no vendor: item will
+show.
-3. Fixed bug with unmounted where sometimes md0 type partitions would show
-even though they are in a raid array.
+Note that some MMC devices will probably not show vendor data, but that's due to
+there being no data that reveals that.
-4. Fixed disk rev, now it searches for 3 different files in /sys to get that data.
+2. Extended -sx volts to also show voltage from lm-sensors if present. Many
+systems show no voltage data with lm-sensors, but now if any is found, it will
+show, same as impi.
-5. Fixed bug with very old systems, with sudo 1.6 or older, for some reason that
-error did not get redirected to /dev/null, so now only using sudo -n after explicit
-version test, only if 1.7 or newer.
+3. Moved to lsblk as primary source for partition/unmounted filesystem, uuid,
+and label data.
-6. Fixed a few null results in fringe cases for graphics. Resolution now shows
-NA for Hz if no hz data found. This was only present on a fringe user case
-which is unlikely to ever impact normal X installations.
+Falls back to previous methods if lsblk does not return data. Some lsblk do not
+show complete data unless super user as well.
-7. Fixed BSD L2 cache, was showing MiB instead of KiB, wrong math.
+4. Refactored code to be more logical and clear.
+5. Added for OpenBSD -r: /etc/installurl file.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 06 May 2018 20:23:30 -0700
-=====================================================================================
+================================================================================
Version: 3.0.07
Patch: 00
Date: 2018-04-17
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Bug fixes. BSD fixes.
-Bugs fixed:
-1. CPU: MT/HT was wrong for old xeon, made mt detection more robust and hopefully
-more reliable, removed all explicit b_xeon based tests.
-2. fixed /dev/mapper glitch, that make /dev/mapper links fail to get id'ed.
-3. openbsd: fixed memory handler; fixed cpu flags, fixed partitions handling.
-4. freebsd: fixed similar partition bugs, these were caused by the darwin patch.
-5. man page: fixed top synopis syntax, thanks ESR.
-6. partitions fs: fixed possible failures with lsblk fs. lsblk: added debuggers
+--------------------------------------------------------------------------------
+BUGS:
+
+1. CPU: MT/HT was wrong for old xeon, made mt detection more robust and
+hopefully more reliable, removed all explicit b_xeon based tests.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. fixed /dev/mapper glitch, that make /dev/mapper links fail to get id'ed.
+
+2. openBSD: fixed memory handler; fixed cpu flags, fixed partitions handling.
+
+3. freeBSD: fixed similar partition bugs, these were caused by the darwin patch.
+
+4. man page: fixed top synopis syntax, thanks ESR.
+
+5. partitions fs: fixed possible failures with lsblk fs. lsblk: added debuggers
so we can track down this failure in the future.
-7. added sshfs filter for disk used output, note, there is a possible syntax for
+
+6. added sshfs filter for disk used output, note, there is a possible syntax for
remote fs that isn't handled: AAA:BBB that is, no :/, only the :. This makes
explicit detection of still unknown remote fs very difficult since : is a legal
nix filename character.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 18 Apr 2018 19:29:02 -0700
-=====================================================================================
+================================================================================
Version: 3.0.06
Patch: 00
Date: 2018-04-17
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version. 2 bug fixes.
+--------------------------------------------------------------------------------
+FIXES:
+
1. -xtm was showing memory %, not cpu % in cpu item
+
2. -G compat-v was showing for nvidia, it's not supposed to, and was also wrong
for nvidia, they forgot to update one of their gl string numbers.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 17 Apr 2018 16:52:05 -0700
-=====================================================================================
+================================================================================
Version: 3.0.05
Patch: 00
Date: 2018-04-17
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Small new enhancements.
-1. Added to -s for ipmi, with -x: voltage 12v,5v,3.3v,vbat; for -xx, dimm/soc p1/p2
-voltages
-2. enhanced wm: feature, needed more filters and protection against redundant data
-3. basic apple osx fixes to keep it from crashing, but I'm not spending any more
-time on apple junk unless someone pays me for my time, I can't stand the product or
-company, it's the total antitheses of freedom or free software, or even openness.
-4. openbsd/bsd fixes: openbsd was failing to get cpu flags due to a small oversight
-5. -C now shows bits: for the true bits of cpu, not the kernel bits. This is not
+--------------------------------------------------------------------------------
+FIXES:
+
+1. basic apple osx fixes to keep it from crashing, but I'm not spending any more
+time on apple junk unless someone pays me for my time, I can't stand the product
+or company, it's the total antitheses of freedom or free software, or even
+openness.
+
+2. openBSD/BSD FIXES: openBSD was failing to get cpu flags due to a small
+oversight
+
+3. -C now shows bits: for the true bits of cpu, not the kernel bits. This is not
a reliable measurement but should be right about 95+ percent of the time, and
-basically all of the time for GNU/Linux on Intel/AMD, most of the time for ARM.
+basically all of the time for GNU/Linux on Intel/AMD, most of the time for ARM.
When it doesn't know it does not guess, and shows N/A.
-6. bsd fix for usb, was running numeric action on string value
-7. fixed stderr tool for program_version, now it's hard-coded in program_values
+
+4. BSD fix for usb, was running numeric action on string value
+
+5. fixed stderr tool for program_version, now it's hard-coded in program_values
which removes an unneeded regex search for every program version test.
-8. Mate detection, switched to using mate-sesssion instead of mate-about, the
+
+6. Mate detection, switched to using mate-sesssion instead of mate-about, the
latter is not getting updated and has the wrong version number on it.
------------------------------------
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Added to -s for ipmi, with -x: voltage 12v,5v,3.3v,vbat; for -xx, dimm/soc
+p1/p2 voltages
+
+2. enhanced wm: feature, needed more filters and protection against redundant
+data
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 17 Apr 2018 13:17:14 -0700
-=====================================================================================
+================================================================================
Version: 3.0.04
Patch: 00
Date: 2018-04-14
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version. Fixes several issues.
+--------------------------------------------------------------------------------
+FIXES:
+
1. issue #145 - corrects case with vm xeon where phys id skips numbers, creating
bad array looping error.
-2. for issue #143, added user PATH to static list of paths, this works around distros
-that have chosen to abandon the FSH standard, sigh... This adds to number of paths that
-have to be checked, but there was no clean way to handle it otherwise.
-3. For MATE, added new version source, mate-session, because mate-about was reporting
-a non-matching version number for current MATE.
------------------------------------
+2. for issue #143, added user PATH to static list of paths, this works around
+distros that have chosen to abandon the FSH standard, sigh... This adds to
+number of paths that have to be checked, but there was no clean way to handle it
+otherwise.
+
+3. For MATE, added new version source, mate-session, because mate-about was
+reporting a non-matching version number for current MATE.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 14 Apr 2018 17:52:33 -0700
-=====================================================================================
+================================================================================
Version: 3.0.03
Patch: 00
Date: 2018-04-12
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version. NBD network block device fixes
-Two enhancements/bug fixes:
+--------------------------------------------------------------------------------
+BUGS:
+
1. inxi did not have support for network block devices /dev/nbd0 type syntax in
disks.
-2. this caused a slight failure in lsblk output, so I switched to using lsblk -P
+
+2. this caused a slight failure in lsblk output, so I switched to using lsblk -P
to force paired key values, which are then put into an array of hashes.
-These both appeared on an ARM server system, but surprisingly, there were no ARM
+These both appeared on an ARM server system, but surprisingly, there were no ARM
specific issues at all on that system.
Both issues/enhancements tested and working fine.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 12 Apr 2018 19:22:27 -0700
-=====================================================================================
+================================================================================
Version: 3.0.02
Patch: 00
Date: 2018-04-12
------------------------------------
-Changes:
------------------------------------
-new version, new man.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new man.
Rolls up a few changes from the latest features:
-1. For -Dxxx, if root, will use fdisk to try to find partition table scheme (mbr/gpt)
-2. For Display: <protocol> server: will try to use loginctl if out of X and using
---display flag to force display data and not root.
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. For -Dxxx, if root, will use fdisk to try to find partition table scheme
+(mbr/gpt)
-This completes more or less the very last minute features added pre 3.0.0 version.
+2. For Display: <protocol> server: will try to use loginctl if out of X and
+using --display flag to force display data and not root.
-I wanted to get these in because the features were not super useful since they only
-worked on a few systems, particulary the scheme:
+This completes more or less the very last minute features added pre 3.0.0
+version.
------------------------------------
+I wanted to get these in because the features were not super useful since they
+only worked on a few systems, particulary the scheme:
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 12 Apr 2018 15:26:00 -0700
-=====================================================================================
+================================================================================
Version: 3.0.01
Patch: 00
Date: 2018-04-12
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Fine tunings.
-New features:
-1. for a very few systems that have wmctrl installed, shows with -xxxS, wm if present
-2. an attempt to get display protocol from out of X, using --display and loginctl
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
-Enhancements:
-1. made xorg display server and protocols show more consistently with other layout:
+1. for a very few systems that have wmctrl installed, shows with -xxxS, wm if
+present
+
+2. an attempt to get display protocol from out of X, using --display and
+loginctl
+
+3. made xorg display server and protocols show more consistently with other
+layout:
Display: x11 server: X.org 1.9.12 drivers: loaded: ...
+
if no display protocol found:
Display: server: X.org 1.9.12 drivers: loaded: ...
-This brings the -G in line with the other lines, of not putting different data types
-inside of parentheses as much as possible. -I still has two of these, but so far it's
-not clear how to otherwise show SSH or su/sudo/login in their respective spaces.
+This brings the -G in line with the other lines, of not putting different data
+types inside of parentheses as much as possible. -I still has two of these, but
+so far it's not clear how to otherwise show SSH or su/sudo/login in their
+respective spaces.
-Debugger data collector also has something I should have added ages ago, gz filename
-now includes the basic 2 digit inxi version number, like 3.0 at end, so I can readily
-determine the debugger inxi version, and thus avoid having to root through lots of
-versions to find new stuff.
+Debugger data collector also has something I should have added ages ago, gz
+filename now includes the basic 2 digit inxi version number, like 3.0 at end, so
+I can readily determine the debugger inxi version, and thus avoid having to root
+through lots of versions to find new stuff.
-These are all largely cosmetic improvements, or debugger adjustments, except for -Sxxx
-now offering wm: if present.
+These are all largely cosmetic improvements, or debugger adjustments, except for
+-Sxxx now offering wm: if present.
-Also changed Desktop: name... (toolkit data) to: Desktop: name... tk: toolkit data
-to be more consistent, while not adding great length to the output.
+Also changed Desktop: name... (toolkit data) to: Desktop: name... tk: toolkit
+data to be more consistent, while not adding great length to the output.
-These two changes should also help export to json/xml since that puts unique key/values
-back into key value pairs, not merging two together.
+These two changes should also help export to json/xml since that puts unique
+key/values back into key value pairs, not merging two together.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 12 Apr 2018 13:17:26 -0700
-=====================================================================================
+================================================================================
Version: 3.0.00
Patch: 00
Date: 2018-04-09
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Beta / 2.9 testing completed.
inxi 3.0 is now ready for prime time. No substantial issues have been found over
the past week. All outstanding issues and bugs have been corrected. The man page
-and help page have been edited fairly heavily to improve usability and readablity.
+and help page have been edited fairly heavily to improve usability and
+readablity.
All work and development and support for inxi 2.3.56 is ended. No issues for
-2.3.56 will be accepted since there is no way to support that version, it
-being in a different set of languages (Gawk/Bash) than inxi 2.9/3.0 (Perl 5).
-So the sooner you move your distro package pool to new inxi, the sooner your
-users can get support for any issues with current inxi.
+2.3.56 will be accepted since there is no way to support that version, it being
+in a different set of languages (Gawk/Bash) than inxi 2.9/3.0 (Perl 5). So the
+sooner you move your distro package pool to new inxi, the sooner your users can
+get support for any issues with current inxi.
-Beta and 2.9 prerelease testing is completed, and has resulted in a much
-better inxi than I could have hoped for.
+Beta and 2.9 prerelease testing is completed, and has resulted in a much better
+inxi than I could have hoped for.
There are so many new features and enhancements in the new inxi that it's hard
to list them all. See previous commits for a more in depth record.
+Anyway, the changelog will show better all the new features etc, I can't
+remember them all.
+
+All current issues and glitches have been fixed, any remaining are simply new
+issues, just as they would be in old inxi.
+
+Note that in the second and third weeks of beta testing a significant number of
+bugs that are in inxi 2.3.56 were fixed. 2.3.56 has been moth-balled into the
+inxi-legacy branch as binxi, to avoid mixing it up with inxi. The development
+branch is now permanently inxi-perl, aka, pinxi, since that worked so well for
+beta and pre-3.0 2.9 testing and development.
+
+This ends the pinxi/inxi development stage. All future development will proceed
+using the inxi-perl branch, and will be the same in terms of new features as pre
+inxi 2.9 was, they will be added, enhanced, as seems appropriate.
+
+Remember, inxi is a rolling release program, like Arch Linux, Gentoo, Debian
+Testing/Sid, and has no frozen release points, so this is simply the beginning
+of the 3.0 line of Perl inxi.
+
+Thanks to everyone who contributed time, energy, effort, ideas, testing,
+debugging, patience - inxi would not work without you.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. New options: --slots (PCI Slots); --usb
+
2. Exports to json/xml with --output options
+
3. Every line has been enhanced, with tighter output control, better key / value
pairings, more accurate values.
+
4. Line wrapping is now fully dynamic, which means inxi works down to 80 columns
and should basically never wrap (except for very long repo lines, but that's not
really fixable).
+
5. More controls, more user configuration options (see man page).
+
6. So many small new features that it's hard to list them all. Shows SSH in -I
-if SSH. Shows sudo/su/login in -I if relevant and detectable. Shows disk partioning
-scheme in some cases (more coming). Removes color codes if piped or redirected to
-file.
+if SSH. Shows sudo/su/login in -I if relevant and detectable. Shows disk
+partioning scheme in some cases (more coming). Removes color codes if piped or
+redirected to file.
+
7. All sizes are now shown in standardized KiB/MiB/GiB/TiB/PiB format, to avoid
ambiguity about whether M or MB or MiB is meant. All internal size math is done
using KiB, which further avoids confusion and error. Note that many disk makers
like using MB or GB instead of MiB or GiB because it makes their disks seem
'bigger'.
-8. Sensors -s now supports IPMI sensors, in tandem with lm-sensors.
-
-Anyway, the changelog will show better all the new features etc, I can't remember
-them all.
-
-All current issues and glitches have been fixed, any remaining are simply new issues,
-just as they would be in old inxi.
-Note that in the second and third weeks of beta testing a significant number of bugs
-that are in inxi 2.3.56 were fixed. 2.3.56 has been moth-balled into the inxi-legacy
-branch as binxi, to avoid mixing it up with inxi. The development branch is now
-permanently inxi-perl, aka, pinxi, since that worked so well for beta and pre-3.0
-2.9 testing and development.
-
-This ends the pinxi/inxi development stage. All future development will proceed
-using the inxi-perl branch, and will be the same in terms of new features as pre
-inxi 2.9 was, they will be added, enhanced, as seems appropriate.
-
-Remember, inxi is a rolling release program, like Arch Linux, Gentoo, Debian
-Testing/Sid, and has no frozen release points, so this is simply the beginning of the
-3.0 line of Perl inxi.
-
-Thanks to everyone who contributed time, energy, effort, ideas, testing, debugging,
-patience - inxi would not work without you.
+8. Sensors -s now supports IPMI sensors, in tandem with lm-sensors.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 09 Apr 2018 01:01:03 -0700
-=====================================================================================
+================================================================================
Version: 2.9.12
Patch: 00
Date: 2018-04-06
------------------------------------
-Changes:
------------------------------------
-New version, man page. Finished up main man edits. Set new defaults for some options,
-like --sleep and -t.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Edits to layout and language, removed some legacy options and language from man and
-inxi.
+New version, man page. Finished up main man edits. Set new defaults for some
+options, like --sleep and -t.
+
+Edits to layout and language, removed some legacy options and language from man
+and inxi.
-Added partition table detections, rough initial stage. Only works on systems with
-udev present currently, will be expanded as we find fast tools. Since the systemd
-method is literally up to 25x slower than the udev method, it's not being considered
-except maybe as a last, last resort, and probably will never be used.
+Added partition table detections, rough initial stage. Only works on systems
+with udev present currently, will be expanded as we find fast tools. Since the
+systemd method is literally up to 25x slower than the udev method, it's not
+being considered except maybe as a last, last resort, and probably will never be
+used.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 06 Apr 2018 15:49:02 -0700
-=====================================================================================
+================================================================================
Version: 2.9.11
Patch: 00
Date: 2018-04-03
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Completed man edits.
Many small bugs fixed.
-Enhancements:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
1. in some cases, will detect partition table type (GTP,MBR) either
with or without root. Uses fast method, which is not available on all systems.
@@ -3198,151 +12361,193 @@ use IPMI.
5. Gave more granular uptime output: like: uptime: 23d 5h 34m
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 03 Apr 2018 23:34:56 -0700
-=====================================================================================
+================================================================================
Version: 2.9.10
Patch: 00
Date: 2018-03-30
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, man page. Major man page edits. Bug fixes.
-Bugs fixed:
+--------------------------------------------------------------------------------
+BUGS:
+
1. RAID - both mdraid and zfs bugs corrected. Issue #135
+
2. EPYC cpu wrong die count corrected, and also added support for the EPYC type.
Issue #135
+
3. Possible ARM data glitch that made reader fail on a non-existent file.
-Man:
-Ongoing updates and edits and corrections and cleanup. Slowly but surely.
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+Ongoing updates and edits and corrections and cleanup of man page. Slowly but
+surely.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 30 Mar 2018 20:07:40 -0700
-=====================================================================================
+================================================================================
Version: 2.9.09
Patch: 00
Date: 2018-03-28
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Bug fixes, new features, enhancements
-1. Bug: cause unknown, but crashes on null file sent to reader, but all those files
-have been checked. For now added return if file null.
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Bug: cause unknown, but crashes on null file sent to reader, but all those
+files have been checked. For now added return if file null.
-2. Features: with -Ixxx: show Shell: csh (sudo|su|login) status; show
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. Features: with -Ixxx: show Shell: csh (sudo|su|login) status; show
running in: xfce-terminal (SSH)
ssh session active on remote system.
-Various help and man cleanups and additions.
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Various help and man cleanups and additions.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 28 Mar 2018 20:48:22 -0700
-=====================================================================================
+================================================================================
Version: 2.9.08
Patch: 00
Date: 2018-03-26
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man page. Bug fixes, feature/output tweaks.
-Bugs fixed:
+--------------------------------------------------------------------------------
+BUGS:
+
1. stray undefined value corrected
+
2. fixed BSD no pkg server case, now shows correctly that no pkg server files
were found, not that the OS is not supported.
-Features:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. -t c and m headers cleaned up and simplified
+
2. man page edits.
-3. more standarization of key names for fields, some spelling
-and upper/lower case corrections.
------------------------------------
+3. more standarization of key names for fields, some spelling and upper/lower
+case corrections.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 26 Mar 2018 14:59:11 -0700
-=====================================================================================
+================================================================================
Version: 2.9.07
Patch: 00
Date: 2018-03-25
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new man. Bug fixes, feature tweaks.
-Bugs fixed:
+--------------------------------------------------------------------------------
+BUGS:
+
1. json/xml outputter had a bug in it that made it validate path wrong.
+
2. -G -xx option: compositor: for gnome-shell had a bug that would make it show
-as running when it wasn't, other strings were tripping the match on systems with
+as running when it wasn't, other strings were tripping the match on systems with
gnome-shell installed but not running,
+
3. Finally fixed bug with manjaro full version distro string, and tweaked output
to show Manjaro Linux instead of given string.
-Features added:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
1. --no-man - this lets users turn off man installs. Only really useful for -U
-from master, since default is off for pinxi and dev 3 branch.
+from master, since default is off for pinxi and dev 3 branch.
Man page/help updated to add this option.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 25 Mar 2018 18:34:54 -0700
-=====================================================================================
+================================================================================
Version: 2.9.06
Patch: 0
Date: 2018-03-24
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man. Very new man.
-Man features new section, configuration options, which lists the main config options
-users would be likely to use.
+Special thanks to Manjaro for being as far as I know the first to package Perl
+inxi.
-This should help users who will never check the actual documentation web page
-realize that there are many internal configuration options available.
+Or was AntiX first? Well, it was close, thanks to both.
-Many edits in man, more to come I suspect.
+--------------------------------------------------------------------------------
+BUGS:
-Bug fixes in inxi:
1. removed a few stray debuggers that were creating debugging output
-2. fixed a usb driver bug that would create warning messages from Perl (thanks Manjaro
-for finding that one)
-New Option:
-1. Added: --indent-min - goes with the user configuration option: INDENT_MIN
-and allows users to experiment with different indent settings. This is what trips the
-auto line wrap of line starters. This may be revisited, and this switch will make it
-easier for users to see for themselves which they prefer, what trip point, etc.
+2. fixed a usb driver bug that would create warning messages from Perl (thanks
+Manjaro for finding that one)
-This will help determine pre 3.0.0 what the default auto wrap trip point, if any,
-will be.
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
-Added more data to debugger tool, more lsblk, which is going to need a lot more data
-to solve a new issue with dm/encrypt/lvm, initial $MANPAGE data, to see if anyone
-actually ever uses that environmental variable.
+1. Added: --indent-min - goes with the user configuration option: INDENT_MIN and
+allows users to experiment with different indent settings. This is what trips
+the auto line wrap of line starters. This may be revisited, and this switch will
+make it easier for users to see for themselves which they prefer, what trip
+point, etc.
-Special thanks to Manjaro for being as far as I know the first to package Perl inxi.
+This will help determine pre 3.0.0 what the default auto wrap trip point, if
+any, will be.
-Or was AntiX first? Well, it was close, thanks to both.
+Added more data to debugger tool, more lsblk, which is going to need a lot more
+data to solve a new issue with dm/encrypt/lvm, initial $MANPAGE data, to see if
+anyone actually ever uses that environmental variable.
------------------------------------
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Man features new section, configuration options, which lists the main config
+options users would be likely to use.
+
+This should help users who will never check the actual documentation web page
+realize that there are many internal configuration options available.
+
+2. Many edits in man, more to come I suspect.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 24 Mar 2018 18:06:33 -0700
-=====================================================================================
+================================================================================
Version: 2.9.05
Patch: 00
Date: 2018-03-24
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man. Options changes
@@ -3353,50 +12558,52 @@ This makes them easier to remember, hopefully.
Updated help, man pages to cover this change as well.
-Added some more lsblk debugger output to try to start building enough information to
-really figure out dm/encrypted/lvm and how those are actually handled internally in
-the system in terms of partitions, filesystems, etc.
+Added some more lsblk debugger output to try to start building enough
+information to really figure out dm/encrypted/lvm and how those are actually
+handled internally in the system in terms of partitions, filesystems, etc.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 24 Mar 2018 02:08:42 -0700
-=====================================================================================
+================================================================================
Version: 2.9.04
Patch: 00
Date: 2018-03-22
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man. Big update
-New features:
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
1. now does not require root or 'file' to get unmounted fs type. Also, for many
-mounted partitions, rather than showing the meaningless fuseblock it will usually
-get the filesystem right.
+mounted partitions, rather than showing the meaningless fuseblock it will
+usually get the filesystem right.
-2. -U now works with optional --man option to download man page for pinxi
-and -U 3 dev server updates. This gets around the fact I had to remove the gz files
+2. -U now works with optional --man option to download man page for pinxi and -U
+3 dev server updates. This gets around the fact I had to remove the gz files
from master to get the size small enough to make maintainers happy. Non branch
-inxi master works as before, updates both from github or from dev server, depending
-on your selection.
+inxi master works as before, updates both from github or from dev server,
+depending on your selection.
So now inxi and pinxi will grab the inxi.1 or pinxi.1 man file and install it on
systems that do not have -U blocked. The -U block of course remains the same.
3. Thanks very much to the people who have been contributing in a positve way,
helping to make inxi better. The untold number of small and large new features,
-small glitches, etc, that have been fixed this week are simply too many too list.
-Many to most were inxi bugs or weaknesses, now corrected.
+small glitches, etc, that have been fixed this week are simply too many too
+list. Many to most were inxi bugs or weaknesses, now corrected.
-4. binxi branch has now been made fully operational, though I do not plan on doing
-any work beyond the mothballing of that venerable program (gawk->bash inxi), it's
-fully operational, it updates, it gets its man page, but all as binxi, so you can,
-as with pinxi, run all of them separately. This officially terminates my support
-for Gawk/Bash inxi, which can be found as binxi in the inxi-legacy branch.
+4. binxi branch has now been made fully operational, though I do not plan on
+doing any work beyond the mothballing of that venerable program (gawk->bash
+inxi), it's fully operational, it updates, it gets its man page, but all as
+binxi, so you can, as with pinxi, run all of them separately. This officially
+terminates my support for Gawk/Bash inxi, which can be found as binxi in the
+inxi-legacy branch.
-5. pinxi has been promoted to permanent development branch, where bug fixes, new
+5. pinxi has been promoted to permanent development branch, where bug fixes, new
features, etc, will be tested, along with man page updates etc. This will help
reduce the number of commits to master branch.
@@ -3409,62 +12616,63 @@ eventually, well it already did, that was going to wait, but someone wanted it.
8. Apt repo handler now supports DEB822 format, which is not an easy format to
parse.
-==========================================================
+================================================================================
MAINTAINERS:
-Note the following: despite my strong dislike for tags, every commit that touches
-either inxi or inxi.1 man page will be tagged if I think they would be something
-relevant to distro packagers. While github insists on calling my tags releases,
-I want to be crystal clear: inxi has one and only one 'release', the current master
-branch version. The tagged commits that github calls releases are NOT releases,
-they are just tagged commits. The version I release tomorrow will be the current
-master, and all previous versions will be obsolete and will not be supported.
-
-The .gz files have been removed from the master branch history, thus shrinking it
-a lot. I have removed for this reason the master-plain branch, which mirrored
+Note the following: despite my strong dislike for tags, every commit that
+touches either inxi or inxi.1 man page will be tagged if I think they would be
+something relevant to distro packagers. While github insists on calling my tags
+releases, I want to be crystal clear: inxi has one and only one 'release', the
+current master branch version. The tagged commits that github calls releases are
+NOT releases, they are just tagged commits. The version I release tomorrow will
+be the current master, and all previous versions will be obsolete and will not
+be supported.
+
+The .gz files have been removed from the master branch history, thus shrinking
+it a lot. I have removed for this reason the master-plain branch, which mirrored
master and provided a gz free branch, but apparently this was simply ignored so
-there's no reason to keep it going. If you insist on grabbing all the branches and
-find more data in there, then please correct your practices, you are only getting
-the data from the master branch.
+there's no reason to keep it going. If you insist on grabbing all the branches
+and find more data in there, then please correct your practices, you are only
+getting the data from the master branch.
inxi is rolling release software and has no releases, so the tags are supposed
-to create some illusion that a tag actually means something. Since it doesn't,
-I decided to take the path of least resistance and just add an auto tagging tool
+to create some illusion that a tag actually means something. Since it doesn't, I
+decided to take the path of least resistance and just add an auto tagging tool
to my commit scripts and use it when it seems appropriate, like on this commit.
-All development work now will happen via the pinxi branch, so that makes the process
-a lot cleaner, since I can now basically beta test all new commmits to master.
-pinxi and binxi are both standalone versions of inxi, they have their own config
-and data directories, config files, man pages, etc.
+All development work now will happen via the pinxi branch, so that makes the
+process a lot cleaner, since I can now basically beta test all new commmits to
+master. pinxi and binxi are both standalone versions of inxi, they have their
+own config and data directories, config files, man pages, etc.
------------------------------------------------------
+--------------------------------------------------------------------------------
-New Perl inxi is already way ahead of Gawk/Bash inxi, more features, more accurate,
-and most bugs being fixed now are because a lot of people are contributing eyes and
-testing, and are finding stuff that was wrong, or simply missing, on old inxi as
-well as on Perl inxi. Fixes to Perl inxi (>2.9) will not be rolled into to binxi
-since the entire reason I spent over 4 months on this project was to never have to
-touch Gawk/Bash inxi again.
+New Perl inxi is already way ahead of Gawk/Bash inxi, more features, more
+accurate, and most bugs being fixed now are because a lot of people are
+contributing eyes and testing, and are finding stuff that was wrong, or simply
+missing, on old inxi as well as on Perl inxi. Fixes to Perl inxi (>2.9) will not
+be rolled into to binxi since the entire reason I spent over 4 months on this
+project was to never have to touch Gawk/Bash inxi again.
Most imporant, however, is that the simple fact was, Gawk/Bash inxi has been
nearly impossible to work on despite my following rigorous practices in coding,
-and I simply won't work with that type of stuff anymore. Perl 5.x is a true delight
-in comparison, and makes adding new features, enhancing others, far easier, or
-even possible, where it wasn't before.
+and I simply won't work with that type of stuff anymore. Perl 5.x is a true
+delight in comparison, and makes adding new features, enhancing others, far
+easier, or even possible, where it wasn't before.
On a technical level, I have tested Perl inxi heavily, and it will run on all
Perl 5.x versions back to 5.008, which is the cutoff point. This was not that
-hard to do, which is why I picked Perl 5.x as the language. This means that
-you can drop, just as with binxi, Perl inxi onto a 10 year old system, or
-older, and it will run fine, albeit a touch slowly, but much faster than binxi.
+hard to do, which is why I picked Perl 5.x as the language. This means that you
+can drop, just as with binxi, Perl inxi onto a 10 year old system, or older, and
+it will run fine, albeit a touch slowly, but much faster than binxi.
------------------------------------------------------
+--------------------------------------------------------------------------------
-So far users are really liking the new one, it's usually faster in most cases,
+So far users are really liking the new one, it's usually faster in most cases,
the output is cleaner, there's more data, more options, and basically it's
-gotten the thumbs up from all the testers, and there have been a LOT, who have
-helped. I want to give a special thanks to the following distros for their
+gotten the thumbs up from all the testers, and there have been a LOT, who have
+helped. I want to give a special thanks to the following distros for their
exceptional support and testing:
0. the people who hang out on irc.oftc.net #smxi. Very patient, will test things
@@ -3472,85 +12680,88 @@ with astounding patience, so thanks to them. Archerseven, iotaka and KittyKatt
have been been incredibly helpful when it comes to testing and debugging, and
finding corner cases that I would never have found.
-1. AntiX: they were the first to beta test pinxi, and found massive numbers of
-bugs, and stuck with the testing for a long time. They made testing possible for
+1. AntiX: they were the first to beta test pinxi, and found massive numbers of
+bugs, and stuck with the testing for a long time. They made testing possible for
the next wave of testers, my hats off to them, I've always liked them.
2. Manjaro also was very helpful, and found more issues and enhancements.
3. Ubuntu forums users found more, and helped enhance many features
-4. Mint users have been very helpful, and were the impetus for some nifty
-new features, ilke switching all color codes off when output is piped or sent
-to file. They have reminded me of how valuable people's views can be who may not
-share the same tech world view as you, but are still very talented and observant
+4. Mint users have been very helpful, and were the impetus for some nifty new
+features, ilke switching all color codes off when output is piped or sent to
+file. They have reminded me of how valuable people's views can be who may not
+share the same tech world view as you, but are still very talented and observant
individuals.
5. Slackware users provided some very thoughtful feedback, which was no surprise
but welcome nonetheless, thanks.
6. Same with Debian forums, again, some very useful and constructive ideas and
-observations, and some very arcane and odd hardware that exposed even more corner
-case bugs.
+observations, and some very arcane and odd hardware that exposed even more
+corner case bugs.
And several other distros were also helpful, each in their own way. Solus for
example now has their package manager added in repos.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 22 Mar 2018 22:18:24 -0700
-=====================================================================================
+================================================================================
Version: 2.9.03
Patch: 00
Date: 2018-03-21
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new man page. Updates:
-1. added tool lsblk, recommends, for -p and -o, shows better partition data than
+
+1. added tool lsblk, recommends, for -p and -o, shows better partition data than
df does. First choice for -p and -o, -p fall back df, -o fallback file.
-2. fixed a big bug with user configs, that would make the configs break every time
-the color editor was used.
+2. fixed a big bug with user configs, that would make the configs break every
+time the color editor was used.
3. Some smaller bugs.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 21 Mar 2018 21:44:04 -0700
-=====================================================================================
+================================================================================
Version: 2.9.02
Patch: 00
Date: 2018-03-20
------------------------------------
-Changes:
------------------------------------
-First small patch fix, corrected a few issues, one for apt deb822 output formatting,
-and a small bug for blank files there.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Second, made the --output error message more clear for bad file structure now lists
-the 3 requirements: must be full path, must be writeable directory, and must have
-a file in it.
+First small patch fix, corrected a few issues, one for apt deb822 output
+formatting, and a small bug for blank files there.
-Third, another subtle thing, after a lot of research, am trying the MiB GiB format
-because it's technically more accurate and less ambiguous than GB, which is used
-either to refer to 1000 bite blocks OR to 1024 blocks, depending on the platform etc.
+Second, made the --output error message more clear for bad file structure now
+lists the 3 requirements: must be full path, must be writeable directory, and
+must have a file in it.
-So rather than hope people get it, trying that slightly more wordy format, and maybe
-if people wonder what it is.
+Third, another subtle thing, after a lot of research, am trying the MiB GiB
+format because it's technically more accurate and less ambiguous than GB, which
+is used either to refer to 1000 bite blocks OR to 1024 blocks, depending on the
+platform etc.
------------------------------------
+So rather than hope people get it, trying that slightly more wordy format, and
+maybe if people wonder what it is.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 20 Mar 2018 22:02:39 -0700
-=====================================================================================
+================================================================================
Version: 2.9.01
Patch: 00
Date: 2018-03-20
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New inxi, new man, new tarball.
@@ -3558,57 +12769,78 @@ It's here! Perl inxi, first official release. So many changes, really too many
to list.
But here's a few:
-1. of course, full rewrite to Perl 5.x. Supports as old as 5.008, as new as current.
-2. Better line length nandlers. Fully dynamic, robust, shrinks and expands to fit
-either taste or viewport.
+1. of course, full rewrite to Perl 5.x. Supports as old as 5.008, as new as
+current.
+
+2. Better line length nandlers. Fully dynamic, robust, shrinks and expands to
+fit either taste or viewport.
+
3. Long options for all options now, plus of course the short options everyone
is used to.
-4. New options: --usb; --slots (pci slot report); --sleep (change cpu sleep time);
-and many more. Check --help or man page for details.
-5. Vastly improved --recommends, now does per distro package recommends, and shows
-only Linux data to Linux systems, and BSD data to BSD systems.
+
+4. New options: --usb; --slots (pci slot report); --sleep (change cpu sleep
+time); and many more. Check --help or man page for details.
+
+5. Vastly improved --recommends, now does per distro package recommends, and
+shows only Linux data to Linux systems, and BSD data to BSD systems.
+
6. Hugely improved debugger as well.
+
7. Far more accurate output, most output is now in key/value pairs, because:
+
8. inxi now exports to json and xml! See --output/--output-file for info.
+
9. Enhancedd repo output, added deb822 type, solus
-10. Radically enhanced network data, now shows all IP / IF devices connected to
+
+10. Radically enhanced network data, now shows all IP / IF devices connected to
each nic, not just one, both IP v4 and v6.
+
11. USB audio and network device actual drivers
+
12. better handling of compiler data.
+
13. Basic ARM machine data now, if present to inxi
+
14. Graphics: per card driver info alongside the original xorg drivers.
+
15. Better integration of partitions, RAID, unmounted partitions, and HDD data.
-16. Better sensors handling of free video driver sensor data, well, not better,
+
+16. Better sensors handling of free video driver sensor data, well, not better,
it's now there, along with fan speeds for gpus.
-17. RAID is enhanced, and now can show > 1 RAID type on a system, and the RAID
+
+17. RAID is enhanced, and now can show > 1 RAID type on a system, and the RAID
is improved.
+
18. Much improved disk/partition/memory sizing, inxi now always works internally
with KB units, and changes them on output to the appropriate units.
+
19. Fully redone man page for all the new options and the long options.
And so much more. Anyway, here it is, the first release.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 20 Mar 2018 02:54:05 -0700
-=====================================================================================
+================================================================================
Version: 2.3.56
Patch: 00
Date: 2018-02-26
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
Maintainer alert: Perl inxi 2.9.01 is looking good for maybe early week of
-2018-03-19 release. I'm putting the last issue requests on the last forums,
-so assuming no real further bugs found, expect Perl inxi 2.9.01 to hit around
+2018-03-19 release. I'm putting the last issue requests on the last forums, so
+assuming no real further bugs found, expect Perl inxi 2.9.01 to hit around
Monday or Tuesday. If any bugs are found, of course, those will be fixed before
release of the new Perl inxi.
-Basically, if you want to see if you can find bugs, this is the time to do it, not
-AFTER release. I've posted on many forums, and have given the various distros a
-chance to help squash the bugs their users might see, some have been fantastic
-(AntiX, you were the best by far), others, not so much. Their loss in the latter
-case since the purpose of beta testing is to find bugs before, not after, release.
+Basically, if you want to see if you can find bugs, this is the time to do it,
+not AFTER release. I've posted on many forums, and have given the various
+distros a chance to help squash the bugs their users might see, some have been
+fantastic (AntiX, you were the best by far), others, not so much. Their loss in
+the latter case since the purpose of beta testing is to find bugs before, not
+after, release.
If you want to see the differences in recommends, and dependencies, grab pinxi
development branch here:
@@ -3618,207 +12850,203 @@ git clone https://github.com/smxi/inxi --branch inxi-perl --single-branch
and run: pinxi --recommends
-The main thing I'd strongly urge all maintainers to add, for long term stability
-and speed and reliability, is dig, which can be used if present to get very fast,
-reliable, WAN IP information.
+The main thing I'd strongly urge all maintainers to add, for long term stability
+and speed and reliability, is dig, which can be used if present to get very
+fast, reliable, WAN IP information.
-All of the other recommends are pretty much the same, for graphics, xdpyinfo,
+All of the other recommends are pretty much the same, for graphics, xdpyinfo,
xrandr, and glxinfo. For networking, ip or ifconfig, along with dig. For all usb
-related identification, lsusb, unfortunately, I wish I could get rid of that tool,
-it's very slow, but I can't. The --recommends output shows the complete set.
+related identification, lsusb, unfortunately, I wish I could get rid of that
+tool, it's very slow, but I can't. The --recommends output shows the complete
+set.
Obviously, Bash and Gawk are no longer recommends, nor are the tools like grep,
-sed, tr, wc, etc, all those are done with Perl, so any shell plus Perl 5.08 or
+sed, tr, wc, etc, all those are done with Perl, so any shell plus Perl 5.08 or
newer Perl 5.x is all that's really required, beyond normal system reporting
tools like lspci etc.
For json/xml export, two Perl modules are needed, again, see --recommends
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 17 Mar 2018 16:44:07 -0700
-=====================================================================================
+================================================================================
Version: 2.3.56
Patch: 00
Date: 2018-02-26
------------------------------------
-Changes:
------------------------------------
-No real changes, this will probably be the very last Gawk->Bash inxi 2.3.x release.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+No real changes, this will probably be the very last Gawk->Bash inxi 2.3.x
+release.
Making sure tarball etc is up to date, so it can be stored in 'tarball's branch.
MAINTAINERS:
-Pinxi 2.9.00-xxx-p (inxi-perl branch) is nearing completion of its beta test cycle,
-and, barring any new issues or bugs (TEST IT NOW AND REPORT ISSUES NOW!), I expect
-to release pinxi 2.9.00 as inxi 2.9.01 shortly after I complete the advanced
-RAID feature, which should be this week.
+Pinxi 2.9.00-xxx-p (inxi-perl branch) is nearing completion of its beta test
+cycle, and, barring any new issues or bugs (TEST IT NOW AND REPORT ISSUES NOW!),
+I expect to release pinxi 2.9.00 as inxi 2.9.01 shortly after I complete the
+advanced RAID feature, which should be this week.
-If no real issues appear during the following week after the inxi 2.9.0 release, it
-will be moved to inxi 3.0.0, as the first stable Perl inxi release.
+If no real issues appear during the following week after the inxi 2.9.0 release,
+it will be moved to inxi 3.0.0, as the first stable Perl inxi release.
-There will be a new branch, inxi-legacy, that will have the Gawk->Bash inxi 2.3..56
-files for historical purposes only. No further work will be done on inxi 2.3 from
-now on.
+There will be a new branch, inxi-legacy, that will have the Gawk->Bash inxi
+2.3..56 files for historical purposes only. No further work will be done on inxi
+2.3 from now on.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 13 Mar 2018 11:29:40 -0700
-=====================================================================================
-Version: 2.3.56
-Patch: 00
-Date: 2018-02-26
------------------------------------
-Changes:
------------------------------------
-
-
------------------------------------
--- Harald Hope - Tue, 13 Mar 2018 11:29:37 -0700
-
-=====================================================================================
+================================================================================
Version: 2.3.56
Patch: 00
Date: 2018-02-26
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
Small cleanup release, no new version. New tarball, just to make sure I have any
changes included, comments, etc.
------------------------------------
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 26 Feb 2018 14:48:44 -0800
-=====================================================================================
+================================================================================
Version: 2.3.56
Patch: 00
Date: 2018-01-17
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball. Added an important debugger output, lsusb -v
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 17 Jan 2018 11:36:09 -0800
-=====================================================================================
+================================================================================
Version: 2.3.55
Patch: 00
Date: 2018-01-13
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, tarball. this is only for Manjaro, they seem to have not done the
/etc/os-release file pretty name correctly, so the bland name reports there.
Added manjoro-release to the lsb good list. No other changes.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 13 Jan 2018 16:28:09 -0800
-=====================================================================================
+================================================================================
Version: 2.3.54
Patch: 00
Date: 2018-01-13
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new tarball. Significant albeit small fix to the debugger tool.
Without this fix, newer kernels can hang on the data parsing.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 13 Jan 2018 11:51:50 -0800
-=====================================================================================
+================================================================================
Version: 2.3.53
Patch: 00
Date: 2017-12-07
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new tarball, new man page. This should fix the Rizen multithreaded
cpu output issues. Now inxi handles > 8 cores in terms of output filters,
descriptions, correctly noting that it's multithreaded.
Because AMD has entered the Multithreading game, I've changed the trade term:
-HT - HyperThreading to MT - MultiThreading to support both Intel and AMD variants.
+HT - HyperThreading to MT - MultiThreading to support both Intel and AMD
+variants.
Updated CPU output filters to also account for these very large core counts.
-I believe this commit now adds full support for the new Ryzen series, but I'll have
-to see when it comes to other variants that may appear. I've tried to future proof
-the MT tests, but I won't know of those are fully functional and accurate until
-inxi sees the real data.
+I believe this commit now adds full support for the new Ryzen series, but I'll
+have to see when it comes to other variants that may appear. I've tried to
+future proof the MT tests, but I won't know of those are fully functional and
+accurate until inxi sees the real data.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 07 Dec 2017 10:35:40 -0800
-=====================================================================================
+================================================================================
Version: 2.3.52
Patch: 00
Date: 2017-12-02
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-New version, new tarball. Maintainers, you can ignore this release, it's only
-a reshuffling and renaming of internal functions.
+New version, new tarball. Maintainers, you can ignore this release, it's only a
+reshuffling and renaming of internal functions.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 02 Dec 2017 17:24:43 -0800
-=====================================================================================
+================================================================================
Version: 2.3.51
Patch: 00
Date: 2017-11-31
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new tarball. This is an attempt at a fix for issue #129
-Because I don't want to break existing cpu logic, I just added in a rizen switch,
-which will just use cpu_core_count value, then trigger HT output.
+Because I don't want to break existing cpu logic, I just added in a rizen
+switch, which will just use cpu_core_count value, then trigger HT output.
-This fix may or may not work, but the issue poster vanished and has not followed up.
+This fix may or may not work, but the issue poster vanished and has not followed
+up.
-For now I'm keeping this a Ryzen specific adjustment, but it may be safe to extend
-it further, that is, if siblings > 1 && siblings = 2 * cores then it's HT.
+For now I'm keeping this a Ryzen specific adjustment, but it may be safe to
+extend it further, that is, if siblings > 1 && siblings = 2 * cores then it's
+HT.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 01 Dec 2017 13:21:13 -0800
-=====================================================================================
+================================================================================
Version: 2.3.50
Patch: 00
Date: 2017-11-28
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new tarball, bug fix for -R raid, zfs. Improved filters, clutter
cleaner, more likely to somewhat work with gnu/linux zfs.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 28 Nov 2017 19:41:30 -0800
-=====================================================================================
+================================================================================
Version: 2.3.49
Patch: 00
Date: 2017-11-28
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-New version, new tarball, new man page. This is the first attempt to correct an
-issue a forum poster raised, which is the fact that despite the fact that GNU/Linux
-has had reasonably ok zfs support for years now, inxi only tested for zfs on bsd
-systems.
+New version, new tarball, new man page. This is the first attempt to correct an
+issue a forum poster raised, which is the fact that despite the fact that
+GNU/Linux has had reasonably ok zfs support for years now, inxi only tested for
+zfs on BSD systems.
This has been corrected. Due to the complexity of handling software raid, inxi
will now test first for ZFS data, if none is found, it will then test for
@@ -3832,68 +13060,70 @@ all the key ingredients required to add that:
3. data collection for non mdraid and zfs software raid, including the values
possible to gather from all non software raid.
-Basically, the only way I'd extend -R raid option is if I get direct ssh access to
-a machine that uses the alternate software raid type, otherwise it would take
+Basically, the only way I'd extend -R raid option is if I get direct ssh access
+to a machine that uses the alternate software raid type, otherwise it would take
forever to figure out the options.
Since the number of people who might be actually running zfs and mdraid and
-using inxi probably numbers in the 10 globally, I figured this solution was a fine
-way to handle adding zfs without messing up mdraid, which is more common on linux.
+using inxi probably numbers in the 10 globally, I figured this solution was a
+fine way to handle adding zfs without messing up mdraid, which is more common on
+linux.
-It also does not break BSDs, since bsds as far as I know don't use mdraid, and don't
-have /proc/mdraid in the first place.
+It also does not break BSDs, since BSDs as far as I know don't use mdraid, and
+don't have /proc/mdraid in the first place.
Also redid the man page to add -! 41, -! 42, -! 43, -! 44 options, which bypass
-curl, fetch, wget, and all of them, respectively. Plus making the lines less wide.
+curl, fetch, wget, and all of them, respectively. Plus making the lines less
+wide.
That should make those people who actually use 80 column wide vi as an editor
happy, lol.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 28 Nov 2017 17:17:00 -0800
-=====================================================================================
+================================================================================
Version: 2.3.48
Patch: 00
Date: 2017-11-27
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-New version, new tarball. No external changes, full reordering of internals to be
-easier and more predictable to find. Better section headers, all ordering alpha
-by subsections.
+New version, new tarball. No external changes, full reordering of internals to
+be easier and more predictable to find. Better section headers, all ordering
+alpha by subsections.
Fixed some small debugger gatherer oversights as well.
-Note that I made the debugger stuff more portable, so I could use it in another
+Note that I made the debugger stuff more portable, so I could use it in another
program.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 27 Nov 2017 12:13:05 -0800
-=====================================================================================
+================================================================================
Version: 2.3.47
Patch: 00
Date: 2017-11-26
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new tarball. Bug fix for Curl, in some cases it may hit a redirect,
so I added the -L flag to follow redirects.
Make sure to update to this version or various downloader actions could fail.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 26 Nov 2017 18:30:35 -0800
-=====================================================================================
+================================================================================
Version: 2.3.46
Patch: 00
Date: 2017-11-26
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
New version, new tarball. Added an optional downloader: Perl HTTP::Tiny
@@ -3905,108 +13135,114 @@ Note that this is the last choice because it's slow, the order has been revised:
4. Perl 5 HTTP::Tiny
5. OpenBSD ftp
-wget has been downgraded due to the recent 1.19-2 bug with wget -O that did
-not get resolved quickly, and which should never have been released since
-that's a basic wget action, which means they aren't testing gnu wget the way
-they should be.
+wget has been downgraded due to the recent 1.19-2 bug with wget -O that did not
+get resolved quickly, and which should never have been released since that's a
+basic wget action, which means they aren't testing gnu wget the way they should
+be.
-All inxi downloaders can now use this option. However, in my tests it's signicantly
-slower to use HTTP::Tiny than curl or wget, so inxi will test for the downloaders
-in that order. While -i uses dig as it's primary IP tool, if dig is not installed,
-the IP will follow the same downloader priority. -U and -w/-W use downloaders.
+All inxi downloaders can now use this option. However, in my tests it's
+signicantly slower to use HTTP::Tiny than curl or wget, so inxi will test for
+the downloaders in that order. While -i uses dig as it's primary IP tool, if dig
+is not installed, the IP will follow the same downloader priority. -U and -w/-W
+use downloaders.
Because HTTP::Tiny is optional, and is merely used if wget/curl/fetch are not
-installed, I would not consider Perl to be a real dependency yet, just an option, so
-I guess for packager maintainers, Perl should be added as a recommends, or a
-dependency if you want to fully support the debugger options (Core Modules).
+installed, I would not consider Perl to be a real dependency yet, just an
+option, so I guess for packager maintainers, Perl should be added as a
+recommends, or a dependency if you want to fully support the debugger options
+(Core Modules).
While I'm still not sure which Perl modules I'm going to be using, I'm sticking
for now to Core Modules, the standard, with some experimental exceptions that
would only be used if the user had them present.
Long term the goal is to get rid of as many dependencies as possible, replacing
-them were possible with Perl tools, but this is going to take forever, if it
+them were possible with Perl tools, but this is going to take forever, if it
ever happens, so don't hold your breath.
-In the future, I expect more and more components that were gawk to be rewritten
+In the future, I expect more and more components that were gawk to be rewritten
to Perl (Core Modules), slowly, however, very slowly.
Updated --recommends to indicate the downloader options more clearly as well.
-Added new options for bypassing curl (-! 41), fetch (-! 42) wget (-! 43), or
+Added new options for bypassing curl (-! 41), fetch (-! 42) wget (-! 43), or
curl, fetch, and wget (-! 44) to disable all of them. This is in case one of
those is broken or you want to test Perl downloader, mostly.
Also cleaned up debugger output and made debugger portable to other scripts.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 26 Nov 2017 15:14:34 -0800
-=====================================================================================
+================================================================================
Version: 2.3.45
Patch: 00
Date: 2017-11-21
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball. Because it's kind of hard to read the per /sys sub
directory output, I split it into sections, and also have the full /sys tree
in case there are some subtle differences in how the paths interlink.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 21 Nov 2017 11:26:51 -0800
-=====================================================================================
+================================================================================
Version: 2.3.44
Patch: 00
Date: 2017-11-21
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-New version, new tarball. Added some critical debugger tools for ongoing issue # 128
-ARM data collection in /sys.
+New version, new tarball. Added some critical debugger tools for ongoing issue #
+128 ARM data collection in /sys.
-Using 'tree' now instead of ls if it is installed for debugger /sys tree listing.
-Added to recommends. Updated bluetooth recommends to note it's dev only. That
-should fix issue #127
+Using 'tree' now instead of ls if it is installed for debugger /sys tree
+listing. Added to recommends. Updated bluetooth recommends to note it's dev
+only. That should fix issue #127
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 21 Nov 2017 10:35:34 -0800
-=====================================================================================
+================================================================================
Version: 2.3.43
Patch: 00
Date: 2017-10-31
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, tarball. Small perl fix, nothing changes in output or function.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 31 Oct 2017 17:30:03 -0700
-=====================================================================================
+================================================================================
Version: 2.3.42
Patch: 00
Date: 2017-10-30
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
Removed xiin references, fully switched to perl sys traverse tool and uploader.
Renamed debugger sys files to sys-dir-[traverse|depth-[1-6]].txt
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 30 Oct 2017 12:04:02 -0700
-=====================================================================================
+================================================================================
Version: 2.3.41
Patch: 00
Date: 2017-10-29
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball. Updated the inxi upater options, removed some legacy
branches, simplified the options. This corresponds to updates on github where
I'm finally bringing the alternate location self updater back into operational
@@ -4023,200 +13259,216 @@ And that should only track the basic 3 files: inxi inxi.1 and inxi.changelog
This fixes issue #94
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 29 Oct 2017 09:47:28 -0700
-=====================================================================================
+================================================================================
Version: 2.3.40
Patch: 00
Date: 2017-09-21
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man page. This is a small update, moved http://smxi.org
-to https://smxi.org so updated the URLs in man page and inxi. Note that the URLs
-redirect to https: so this is not a very important update.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball, new man page. This is a small update, moved
+http://smxi.org to https://smxi.org so updated the URLs in man page and inxi.
+Note that the URLs redirect to https: so this is not a very important update.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 21 Sep 2017 17:11:23 -0700
-=====================================================================================
+================================================================================
Version: 2.3.39
Patch: 00
Date: 2017-09-20
------------------------------------
-Changes:
------------------------------------
-Small patch, no new version, new tarball. Fixed issue # 124 --recommends failed to
-show sed/perl version: the first was due to a syntax change in --version for sed,
-the second was a typo in inxi.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Small patch, no new version, new tarball. Fixed issue # 124 --recommends failed
+to show sed/perl version: the first was due to a syntax change in --version for
+sed, the second was a typo in inxi.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 20 Sep 2017 10:11:46 -0700
-=====================================================================================
+================================================================================
Version: 2.3.39
Patch: 00
Date: 2017-09-12
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Bug fix. Debug data collector using Perl requires
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Bug fix. Debug data collector using Perl requires
explicitly setting Passive => 1 (true) for some systems and firewall
configurations.
-This corrects a failure to upload issue I experienced for a test remote
-system that had a different firewall configuration than the dev system has.
-
+This corrects a failure to upload issue I experienced for a test remote system
+that had a different firewall configuration than the dev system has.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 12 Sep 2017 17:53:11 -0700
-=====================================================================================
+================================================================================
Version: 2.3.38
Patch: 00
Date: 2017-09-07
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. This closes issue #122. Adds support for including
-nvme disk capacity in full disk capacity listing. Adds nvme name/serial/firmware
-revision number. The latter is a new -Dxx output option. Note that as far as I could
-tell, so far, nvme is the only disk type that has firmware revision data.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Added support for nvme disk temperature as well, that requires the cli tool nvme.
+New version, tarball, man page. This closes issue #122. Adds support for
+including nvme disk capacity in full disk capacity listing. Adds nvme
+name/serial/firmware revision number. The latter is a new -Dxx output option.
+Note that as far as I could tell, so far, nvme is the only disk type that has
+firmware revision data.
-Updated AMD microarchitecture list to be more granular and complete. Added Intel
-microarch type. Note that they are releasing a few new microarchitectures soon but I
-was not able to find any model numbers for those.
+Added support for nvme disk temperature as well, that requires the cli tool
+nvme.
------------------------------------
+Updated AMD microarchitecture list to be more granular and complete. Added Intel
+microarch type. Note that they are releasing a few new microarchitectures soon
+but I was not able to find any model numbers for those.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 07 Sep 2017 10:00:06 -0700
-=====================================================================================
+================================================================================
Version: 2.3.37
Patch: 00
Date: 2017-08-23
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man page. Deprecated xiin uploader, which completes the deprecation
-of the xiin.py tool, which is going to become obsolete when python 3 fully replaces python 2.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball, new man page. Deprecated xiin uploader, which
+completes the deprecation of the xiin.py tool, which is going to become obsolete
+when python 3 fully replaces python 2.
-Since the odds of perl being around and stable are far higher than the odds of xiin.py
-even working on python 3, I'm getting ahead of the race. Plus Perl is nicer to work with.
+Since the odds of perl being around and stable are far higher than the odds of
+xiin.py even working on python 3, I'm getting ahead of the race. Plus Perl is
+nicer to work with.
And Perl is a lot faster. I mean, a lot. Not slightly.
-And it also works on much older systems, and does not have that Python version < 2.6
-failure due to changing Python syntax even between sub versions. xiin.py never ran on
-Python 2.5 even when it was relatively recent, which is one reason I'm removing all Python
-from inxi.
+And it also works on much older systems, and does not have that Python version <
+2.6 failure due to changing Python syntax even between sub versions. xiin.py
+never ran on Python 2.5 even when it was relatively recent, which is one reason
+I'm removing all Python from inxi.
Basically xiin.py worked only on Python 2.6 or 2.7, period.
Oh, and also handled issue #115 by not making -B show -M data.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 23 Aug 2017 15:06:22 -0700
-=====================================================================================
+================================================================================
Version: 2.3.36
Patch: 00
Date: 2017-08-16
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball. This fixes issue #119
-The issue was not so much with xiin.py as with some new values in /sys that would
-hang tree traverse, however, in order to remove the python dependency (except for
-uploading -xx@ debugger data, until I can figure out how to do it with Perl), I
-rewrote the tree traverse tool into Perl, which also makes it a lot faster and
-easier to work with.
+The issue was not so much with xiin.py as with some new values in /sys that
+would hang tree traverse, however, in order to remove the python dependency
+(except for uploading -xx@ debugger data, until I can figure out how to do it
+with Perl), I rewrote the tree traverse tool into Perl, which also makes it a
+lot faster and easier to work with.
-This issue appeared on kernel 4.11 as far as I can tell, some new values in /sys make
-the traverse hang if it tries to read the values, **/parameters/** and **/debug/** seem
-to be the main culprits, but inxi doesn't need that data anyway for debugging purposes
-so it's just excluded.
+This issue appeared on kernel 4.11 as far as I can tell, some new values in /sys
+make the traverse hang if it tries to read the values, **/parameters/** and
+**/debug/** seem to be the main culprits, but inxi doesn't need that data anyway
+for debugging purposes so it's just excluded.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 16 Aug 2017 00:34:43 -0700
-=====================================================================================
+================================================================================
Version: 2.3.35
Patch: 00
Date: 2017-08-11
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Fixed issue #120 where -z fails to anonymize serial numbers.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Fixed issue #120 where -z fails to anonymize serial
+numbers.
Also fixed a FreeBSD issue where I'd failed to update -G to show driver.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 11 Aug 2017 12:07:17 -0700
-=====================================================================================
+================================================================================
Version: 2.3.34
Patch: 00
Date: 2017-08-04
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, tarball. Added to cpu microarch lists.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 04 Aug 2017 16:11:59 -0700
-=====================================================================================
+================================================================================
Version: 2.3.33
Patch: 00
Date: 2017-08-04
------------------------------------
-Changes:
------------------------------------
-New version, tarball. This should finalize the mA / Wh conversion problems highlighted
-in issue #118
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. This should finalize the mA / Wh conversion problems
+highlighted in issue #118
-The data seems to suggest that using POWER_SUPPLY_VOLTAGE_MIN_DESIGN as the factor will
-be right more often than using POWER_SUPPLY_VOLTAGE_NOW.
+The data seems to suggest that using POWER_SUPPLY_VOLTAGE_MIN_DESIGN as the
+factor will be right more often than using POWER_SUPPLY_VOLTAGE_NOW.
Also optimized a bit more on the desktop id logic.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 04 Aug 2017 14:41:14 -0700
-=====================================================================================
+================================================================================
Version: 2.3.32
Patch: 00
Date: 2017-08-03
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This closes issue #118, inxi had failed all along to handle
-the conversion from mA hours to Wh, and had a math glitch too for charge (ma).
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Not sure how this went undetected during testing, oh well. I assume that mA h is not
-as common internally as Wh or something.
+New version, new tarball. This closes issue #118, inxi had failed all along to
+handle the conversion from mA hours to Wh, and had a math glitch too for charge
+(ma).
+
+Not sure how this went undetected during testing, oh well. I assume that mA h is
+not as common internally as Wh or something.
Anyway, it should be fixed.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 03 Aug 2017 21:44:13 -0700
-=====================================================================================
+================================================================================
Version: 2.3.31
Patch: 00
Date: 2017-07-30
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. This corrects many 80 column width line wraps, including on:
--o, -p, -l, -u, -P, -S, -G, -N, -A
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball, man page. This corrects many 80 column width line wraps,
+including on: -o, -p, -l, -u, -P, -S, -G, -N, -A
-Now most output should tend to not wrap, though some strings are unpredictable and
-will have to be trimmed by adding them to the min size trimmers one by one.
+Now most output should tend to not wrap, though some strings are unpredictable
+and will have to be trimmed by adding them to the min size trimmers one by one.
But it's much better than it was.
@@ -4224,170 +13476,190 @@ Note the following changes required to make the wraps more consistent:
-S - the gcc/bits have been made separate, like: bits: 32 gcc: 5.3
-C - the new microarchitecture -x option now is: arch: K7 [for example]
- cache wraps to next line with arch. with -f, bmips now shows on same line as
- arch/cache
+ cache wraps to next line with arch. with -f, bmips now shows on same line
+ as arch/cache
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 30 Jul 2017 14:02:33 -0700
-=====================================================================================
+================================================================================
Version: 2.3.30
Patch: 00
Date: 2017-07-29
------------------------------------
-Changes:
------------------------------------
-New version, tarball. More optimizations, I'm not sure these will make a big difference
-but I believe the overall collection has dropped execution time by around 10% or so.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
--- Harald Hope - Sat, 29 Jul 2017 19:36:55 -0700
+New version, tarball. More optimizations, I'm not sure these will make a big
+difference but I believe the overall collection has dropped execution time by
+around 10% or so.
+--------------------------------------------------------------------------------
+-- Harald Hope - Sat, 29 Jul 2017 19:36:55 -0700
-=====================================================================================
+================================================================================
Version: 2.3.29
Patch:
Date: 2017-07-29
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. More optimizations, and fixed a bash 4 syntax regression that
-would have caused failure on older systems. Also added Bash version checker.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. More optimizations, and fixed a bash 4 syntax
+regression that would have caused failure on older systems. Also added Bash
+version checker.
-Most ps aux data is now searched using bash parameter expansion, and several functions
-that were in subshells are now printing to globals instead.
+Most ps aux data is now searched using bash parameter expansion, and several
+functions that were in subshells are now printing to globals instead.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 29 Jul 2017 16:37:01 -0700
-=====================================================================================
+================================================================================
Version: 2.3.28
Patch: 00
Date: 2017-07-29
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This fixes a subtle gawk issue that could in some systems make -G
-hang endlessly.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This fixes a subtle gawk issue that could in some
+systems make -G hang endlessly.
Also started on more optimizing, getting rid of as many subshells as possible.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 29 Jul 2017 12:37:27 -0700
-=====================================================================================
+================================================================================
Version: 2.3.27
Patch: 00
Date: 2017-07-28
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. More cpu arch fixes, and added stepping/release info
-as well so you can see which revision of the cpu microarchitecture your cpu has.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball, man page. More cpu arch fixes, and added stepping/release
+info as well so you can see which revision of the cpu microarchitecture your cpu
+has.
-Also fixed a few random vm id issues, I found cases where systemd believes it's bochs
-but it is actually kvm, so now the systemd data is not fully trusted, but is confirmed.
+Also fixed a few random vm id issues, I found cases where systemd believes it's
+bochs but it is actually kvm, so now the systemd data is not fully trusted, but
+is confirmed.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 28 Jul 2017 18:39:19 -0700
-=====================================================================================
+================================================================================
Version: 2.3.26
Patch: 00
Date: 2017-07-28
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man page. First attempt at adding cpu microarchitecture support.
-Will need some updates to bring the family/model ids to fully current, but should show data for most
-cpus. Next release will hopefully include latest model/family ids and microarchitecture names.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball, new man page. First attempt at adding cpu
+microarchitecture support. Will need some updates to bring the family/model ids
+to fully current, but should show data for most cpus. Next release will
+hopefully include latest model/family ids and microarchitecture names.
-Note that while /proc/cpuinfo has the family/model id in decimal, the values are actually generally
-found as hexadecimal, so inxi translates that interally so we can store the data the way it is presented.
+Note that while /proc/cpuinfo has the family/model id in decimal, the values are
+actually generally found as hexadecimal, so inxi translates that interally so we
+can store the data the way it is presented.
See issue #116 for ongoing additions to this feature.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 28 Jul 2017 00:12:56 -0700
-=====================================================================================
+================================================================================
Version: 2.3.25
Patch: 00
Date: 2017-07-24
------------------------------------
-Changes:
------------------------------------
-New version, tarball. This fixes a bug where if there is a remote filesystem mounted, the path
-would crash gawk when searching for unumounted file systems, eg:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. This fixes a bug where if there is a remote filesystem
+mounted, the path would crash gawk when searching for unumounted file systems,
+eg:
12.34.2.10:/remote/file/system
Fix is to escape '/'.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 24 Jul 2017 21:10:54 -0700
-=====================================================================================
+================================================================================
Version: 2.3.24
Patch: 00
Date: 2017-07-23
------------------------------------
-Changes:
------------------------------------
-New version, tarball. This corrects a case I'm seeing where wayland/mir are running desktop
-but Xorg has not started, which means inxi can't get the video driver from Xorg.0.log as with X.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. This corrects a case I'm seeing where wayland/mir are
+running desktop but Xorg has not started, which means inxi can't get the video
+driver from Xorg.0.log as with X.
-Added in extra data collection from lspci -v to include the driver for graphics card. this is
-only used, for now, if the initial Xorg based driver test works.
+Added in extra data collection from lspci -v to include the driver for graphics
+card. this is only used, for now, if the initial Xorg based driver test works.
-Note that this may also work for systems that have not yet started X out of X, in console, I'm
-not sure about that, but the graphics driver reporting should be improved.
+Note that this may also work for systems that have not yet started X out of X,
+in console, I'm not sure about that, but the graphics driver reporting should be
+improved.
-Note that I'm not yet linking the driver to the specific card/device, it's just going to show
-in a comma separated list, I couldn't find multi card systems where the card types are different,
-like amd gpu with nvidia card, for example.
+Note that I'm not yet linking the driver to the specific card/device, it's just
+going to show in a comma separated list, I couldn't find multi card systems
+where the card types are different, like amd gpu with nvidia card, for example.
-But this should correct an issue, at least to start, with expanding wayland support for systems
-that don't use or have not started the desktop with Xorg/X11 etc.
+But this should correct an issue, at least to start, with expanding wayland
+support for systems that don't use or have not started the desktop with Xorg/X11
+etc.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 23 Jul 2017 14:35:56 -0700
-=====================================================================================
+================================================================================
Version: 2.3.23
Patch: 00
Date: 2017-06-29
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. Added support for Alpine Linux apk package manager for
-the -r option. Fixed typos and glitches in man page as well.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New version, tarball, man page. Added support for Alpine Linux apk package
+manager for the -r option. Fixed typos and glitches in man page as well.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 29 Jun 2017 12:54:21 -0700
-=====================================================================================
+================================================================================
Version: 2.3.22
Patch: 00
Date: 2017-06-24
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Bug fix for GLX/OpenGL output. There was an unhandled case with
-core profile data being null, which in turn triggered a bash oddity, where if the IFS is
-\n for an array, and if the value of one element is '', then bash ignores that and does
-not simply set an empty array key as you'd expect. The correction was to change the IFS
-to ^, which worked fine for empty array values.
-
-However, since this bug will impact anyone with empty opengl core profile data, I recommend
-updating inxi.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Bug fix for GLX/OpenGL output. There was an unhandled case
+with core profile data being null, which in turn triggered a bash oddity, where
+if the IFS is \n for an array, and if the value of one element is '', then bash
+ignores that and does not simply set an empty array key as you'd expect. The
+correction was to change the IFS to ^, which worked fine for empty array values.
+
+However, since this bug will impact anyone with empty opengl core profile data,
+I recommend updating inxi.
Also, added support for two smaller wm, Sawfish and Afterstep.
-This is a good source for lists of wm: http://www.xwinman.org/ http://www.xwinman.org/others.php
+This is a good source for lists of wm: http://www.xwinman.org/
+http://www.xwinman.org/others.php
-However, that does not show how to ID it, so i have to do it on a case by case, but I'll
-add an issue for showing how to get your wm of choice if it's missing to inxi.
+However, that does not show how to ID it, so i have to do it on a case by case,
+but I'll add an issue for showing how to get your wm of choice if it's missing
+to inxi.
Also, changed the slightly inaccurate:
@@ -4397,756 +13669,859 @@ to
OpenGL: renderer: ...... version: .....
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 24 Jun 2017 18:00:21 -0700
-=====================================================================================
+================================================================================
Version: 2.3.21
Patch: 00
Date: 2017-06-13
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Fix for root graphics/desktop data when not available as root.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Was showing in -S line N/A instead of the fallback Console: tty 1 that would match the
--G no data for root when unavailable for root.
+New version, tarball. Fix for root graphics/desktop data when not available as
+root.
------------------------------------
+Was showing in -S line N/A instead of the fallback Console: tty 1 that would
+match the -G no data for root when unavailable for root.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 13 Jun 2017 10:59:41 -0700
-=====================================================================================
+================================================================================
Version: 2.3.20
Patch: 00
Date: 2017-06-12
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. Added floppy disk support, basic, for -d. Fixed a
-long-standing issue where /dev/ram.. data shows in unmounted disks output. This is
-now properly filtered out.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball, man page. Added floppy disk support, basic, for -d. Fixed
+a long-standing issue where /dev/ram.. data shows in unmounted disks output.
+This is now properly filtered out.
-Note that the floppy disk output has no information beyond it's /dev id, eg: /dev/fd0
+Note that the floppy disk output has no information beyond it's /dev id, eg:
+/dev/fd0
-I could find no meaningful data in /sys related to the floppy disk, not the model, etc, so
-I'm just showing presence of disk.
+I could find no meaningful data in /sys related to the floppy disk, not the
+model, etc, so I'm just showing presence of disk.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 12 Jun 2017 18:31:48 -0700
-=====================================================================================
+================================================================================
Version: 2.3.19
Patch: 00
Date: 2017-06-10
------------------------------------
-Changes:
------------------------------------
-New version, tarball. This version has some bug/edit fixes and a new distro id, mx-version.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. This version has some bug/edit fixes and a new distro id,
+mx-version.
Simple.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 10 Jun 2017 21:32:55 -0700
-=====================================================================================
+================================================================================
Version: 2.3.18
Patch: 00
Date: 2017-06-09
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-New version, tarball, man page. New option -! 34 - skip SSL certificate check on
-wget/fetch/curl. This allows systems with for example out of date certificate stores
-to still download without error. Also a legacy system fix where tty size failed to show.
+New version, tarball, man page. New option -! 34 - skip SSL certificate check on
+wget/fetch/curl. This allows systems with for example out of date certificate
+stores to still download without error. Also a legacy system fix where tty size
+failed to show.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 09 Jun 2017 11:52:26 -0700
-=====================================================================================
+================================================================================
Version: 2.3.17
Patch: 00
Date: 2017-06-09
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. Bug fix for issue #105, had core and compat versions reversed.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball, man page. Bug fix for issue #105, had core and compat
+versions reversed.
-Also cleaned up man page, slightly changed output for compat version to: (compat-v: 3.0)
+Also cleaned up man page, slightly changed output for compat version to:
+(compat-v: 3.0)
gfx variable name fixes to make more obvious the logic as well.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 09 Jun 2017 10:00:48 -0700
-=====================================================================================
+================================================================================
Version: 2.3.16
Patch: 00
Date: 2017-06-08
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
Tiny change, new version, tarball. Tumbleweed distro id fix.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 08 Jun 2017 21:02:53 -0700
-=====================================================================================
+================================================================================
Version: 2.3.15
Patch: 00
Date: 2017-06-08
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. New option -! 40 which lets you get gfx information out of X.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Default will get data from display :0, but if you append :[display-number] to -! 40, it will
-use that display instead, for example: inxi -! 40:1 would get information from display 1. Note
-that most multi-monitor setups use :0 for both monitors, depending on how it's setup.
+New version, tarball, man page. New option -! 40 which lets you get gfx
+information out of X.
-This will also let users see any desktop information based on xrop -root output, but it will
-depend how it works based on how environmental variables have been set. gnome and kde, which use XDG for
-primary detection would not work, for example.
+Default will get data from display :0, but if you append :[display-number] to -!
+40, it will use that display instead, for example: inxi -! 40:1 would get
+information from display 1. Note that most multi-monitor setups use :0 for both
+monitors, depending on how it's setup.
------------------------------------
+This will also let users see any desktop information based on xrop -root output,
+but it will depend how it works based on how environmental variables have been
+set. gnome and kde, which use XDG for primary detection would not work, for
+example.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 08 Jun 2017 19:25:21 -0700
-=====================================================================================
+================================================================================
Version: 2.3.14
Patch: 00
Date: 2017-06-08
------------------------------------
-Changes:
------------------------------------
-New version, tarball. This corrects an issue I noticed a while ago, glxinfo and xpdyinfo
-used to not work as root in X, but they do now. So I've removed the root tests for graphics
-output, and now only rely on the returned data to determine the output when in X. Out of X
-behavior remains the same.
-
-Note that at some point I'll have to see if wayland systems have usable reporting tools to get
-screen resolution, opengl info, and so on, but that will have to come one step at a time.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. This corrects an issue I noticed a while ago, glxinfo and
+xpdyinfo used to not work as root in X, but they do now. So I've removed the
+root tests for graphics output, and now only rely on the returned data to
+determine the output when in X. Out of X behavior remains the same.
+
+Note that at some point I'll have to see if wayland systems have usable
+reporting tools to get screen resolution, opengl info, and so on, but that will
+have to come one step at a time.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 08 Jun 2017 17:46:30 -0700
-=====================================================================================
+================================================================================
Version: 2.3.13
Patch: 00
Date: 2017-06-08
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. Shows as default OpenGL core profile version number.
--xx option will show OpenGL compatibility version number as well, though that's largely useless
-information for most users, thus the -xx. Note that this reverses the default, which previously
-showed OpenGL version, which is actually the compatibility version.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball, man page. Shows as default OpenGL core profile version
+number. -xx option will show OpenGL compatibility version number as well, though
+that's largely useless information for most users, thus the -xx. Note that this
+reverses the default, which previously showed OpenGL version, which is actually
+the compatibility version.
-This should resolve #105 pull request, though it does it differently, by switching the default
-output to what is more relevant, and offering the compatibility version as an optional output item.
+This should resolve #105 pull request, though it does it differently, by
+switching the default output to what is more relevant, and offering the
+compatibility version as an optional output item.
-Note that much of the glx information will probably change to more neutral terms once wayland support
-starts growing, and systems without xwayland etc libraries appear.
+Note that much of the glx information will probably change to more neutral terms
+once wayland support starts growing, and systems without xwayland etc libraries
+appear.
-Further note that non free drivers showed the OpenGL core profile version numbers all along, so really
-this simply corrects misleading output for free drivers.
+Further note that non free drivers showed the OpenGL core profile version
+numbers all along, so really this simply corrects misleading output for free
+drivers.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 08 Jun 2017 15:54:04 -0700
-=====================================================================================
+================================================================================
Version: 2.3.12
Patch: 00
Date: 2017-06-06
------------------------------------
-Changes:
------------------------------------
-New version, man page, tarball. ARM cpu core count bug fix. First attempt to add Wayland
-and compositor support.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-This finally implements a first try at mir/wayland detection, along with basic handling of actual
-display server type output.
+New version, man page, tarball. ARM cpu core count bug fix. First attempt to add
+Wayland and compositor support.
-New output for Display Server: Display Server: x11 (X.Org 1.19.0) driver: nvidia
+This finally implements a first try at mir/wayland detection, along with basic
+handling of actual display server type output.
-Note that since almost all current Wayland systems will have X.org also installed, for the time
-being, the data in the parentheses will be from X.org regardless of what display server is detected running
-the actual desktop. Out of the desktop, console, the only thing that will show is x data..
+New output for Display Server: Display Server: x11 (X.Org 1.19.0) driver:
+nvidia
-No other data is available to me yet until I get way more debugger data so I can see what information the various
-implementations of wayland without x tools actually makes available, my guess is it won't be much.
+Note that since almost all current Wayland systems will have X.org also
+installed, for the time being, the data in the parentheses will be from X.org
+regardless of what display server is detected running the actual desktop. Out of
+the desktop, console, the only thing that will show is x data..
-Also experimental -xx option: -G shows compositor, but only for wayland/mir currently.
+No other data is available to me yet until I get way more debugger data so I can
+see what information the various implementations of wayland without x tools
+actually makes available, my guess is it won't be much.
-I have no idea if this will work at all, but it's worth giving it a try as a rough beginning to
-start handling the wide range of wayland compositors being created.
+Also experimental -xx option: -G shows compositor, but only for wayland/mir
+currently.
+
+I have no idea if this will work at all, but it's worth giving it a try as a
+rough beginning to start handling the wide range of wayland compositors being
+created.
This feature will probably take several versions to get stable.
-Also added new debugger data collector data for wayland information, but the pickings are slim, to
-put it mildly.
+Also added new debugger data collector data for wayland information, but the
+pickings are slim, to put it mildly.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 06 Jun 2017 18:43:31 -0700
-=====================================================================================
+================================================================================
Version: 2.3.11
Patch: 00
Date: 2017-05-31
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man page. This corrects several oversights of the 2.3.10 IPv6 update.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball, new man page. This corrects several oversights of the
+2.3.10 IPv6 update.
-Now there is an -x option for -i that will show the additioanl IPv6 address data for scope global,
-temporary, and site. Also a fallback for unhandled scope: unknown. If the tool 'ip' is used, it will
-filter out the deprecated temp site/global addresses, ifconfig tool does not appear to offer this
-option.
+Now there is an -x option for -i that will show the additioanl IPv6 address data
+for scope global, temporary, and site. Also a fallback for unhandled scope:
+unknown. If the tool 'ip' is used, it will filter out the deprecated temp
+site/global addresses, ifconfig tool does not appear to offer this option.
-Also changed is that now ipv6 address always shows, it's not an -x option. Probably about time to
-start rolling out ip v6 data to users now that ip v6 is starting, slowly, to be used more.
+Also changed is that now ipv6 address always shows, it's not an -x option.
+Probably about time to start rolling out ip v6 data to users now that ip v6 is
+starting, slowly, to be used more.
-Another small change, the link address for ipv6 is changed from ip-v6: to ip-v6-link so that it's
-more clear which IP v6 address it is.
+Another small change, the link address for ipv6 is changed from ip-v6: to
+ip-v6-link so that it's more clear which IP v6 address it is.
-The last commit had a significant logic error in it that did not distinguish between the link address,
-which is what should have only shown, and the remaining possible addresses.
+The last commit had a significant logic error in it that did not distinguish
+between the link address, which is what should have only shown, and the
+remaining possible addresses.
-I've tried to get a basic bsd support, but it's difficult to know the variants of ifconfig output syntax
+I've tried to get a basic BSD support, but it's difficult to know the variants
+of ifconfig output syntax
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 31 May 2017 14:22:21 -0700
-=====================================================================================
+================================================================================
Version: 2.3.10
Patch: 00
Date: 2017-05-31
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball. Fixes issue #78 and issue #106
-Shows multiple ipv6 addresses, filters out ipv6 temp addresses and ipv6 local addresses.
+Shows multiple ipv6 addresses, filters out ipv6 temp addresses and ipv6 local
+addresses.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 31 May 2017 10:39:00 -0700
-=====================================================================================
+================================================================================
Version: 2.3.9
Patch: 00
Date: 2017-05-29
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Tiny fix, due to a data bug, changing ft to m in weather altitude.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Tiny fix, due to a data bug, changing ft to m in weather
+altitude.
-Note that this bug is not universal, but I believe this will make inxi more right than wrong
-as a general rule. Further note that altitude is NOT actually the altitude of the city/location
-requested, in most cases, but rather the altitude of the weather station data assigned to that
-location request.
+Note that this bug is not universal, but I believe this will make inxi more
+right than wrong as a general rule. Further note that altitude is NOT actually
+the altitude of the city/location requested, in most cases, but rather the
+altitude of the weather station data assigned to that location request.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 29 May 2017 12:40:12 -0700
-=====================================================================================
+================================================================================
Version: 2.3.8
Patch: 00
Date: 2017-01-14
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Tiny change, added sisimedia video driver to support list.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Tiny change, added sisimedia video driver to support
+list.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 14 Jan 2017 12:47:31 -0800
-=====================================================================================
+================================================================================
Version: 2.3.7
Patch: 00
Date: 2016-12-24
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This fixes an issue where sloppy regex was removing the BIOS
-from BIOSTAR. Also fixed a few other sloppy gsub, and fixed a few gensub errors as well.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Since BIOSTAR is a fairly common mobo, I'm surprised I haven't gotten this bug report
-before.
+New version, new tarball. This fixes an issue where sloppy regex was removing
+the BIOS from BIOSTAR. Also fixed a few other sloppy gsub, and fixed a few
+gensub errors as well.
+
+Since BIOSTAR is a fairly common mobo, I'm surprised I haven't gotten this bug
+report before.
This closes issue #102.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 24 Dec 2016 14:53:31 -0800
-=====================================================================================
+================================================================================
Version: 2.3.6
Patch: 00
Date: 2016-12-20
------------------------------------
-Changes:
------------------------------------
-No new version. New tarball, man. Small text changes and cleanup and updates in man page,
-but no actual meaningful changes. Feel free to ignore this one if you just did 2.3.6.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+No new version. New tarball, man. Small text changes and cleanup and updates in
+man page, but no actual meaningful changes. Feel free to ignore this one if you
+just did 2.3.6.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 20 Dec 2016 19:53:54 -0800
-=====================================================================================
+================================================================================
Version: 2.3.6
Patch: 00
Date: 2016-12-19
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This is a significant change, but inxi should handle it smoothly.
-
-While default configs remain in /etc/inxi.conf, the user overrides now use the following order of tests:
-
-1. XDG_CONFIG_HOME / XDG_DATA_HOME for the config and log/debugger data respectively.
-
-2. Since those will often be blank, it then uses a second priority check:
- $HOME/.config $HOME/.local/share to place the inxi data directory, which was previously here:
- $HOME/.inxi
-
-3. If neither of these cases are present, inxi will default to its legacy user data: $HOME/.inxi as before
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-In order to make this switch transparent to users, inxi will move the files from .inxi to the respective
-.config/ .local/share/inxi directories, and remove the .inxi directory after to cleanup.
+New version, new tarball. This is a significant change, but inxi should handle
+it smoothly.
-Also, since I was fixing some path stuff, I also did issue 77, manual inxi install not putting man pages in
-/usr/local/share/man/man1, which had caused an issue with Arch linux inxi installer. Note that I can't help
-users who had a manual inxi install with their man page in /usr/share/man/man1 already, because it's too risky
-to guess about user or system intentions, this man location correction will only apply if users have never
-installed inxi before manually, and have no distro version installed, unlike the config/data directory,
-which does update neatly with output letting users know the data was moved.
+While default configs remain in /etc/inxi.conf, the user overrides now use the
+following order of tests:
-Note that if users have man --path set up incorrectly, it's possible that the legacy man page would show up
-instead, which isn't good, but there was no perfect fix for the man issue so I just picked the easiest way,
-ignoring all man pages installed into /usr/share/man/man1 and treating them as final location, otherwise
-using if present the /usr/local/share/man/man1 location for new manual install users.
+1. XDG_CONFIG_HOME / XDG_DATA_HOME for the config and log/debugger data
+respectively.
-Also, for users with existing man locations and an inxi manually installed, you have to update to inxi current,
-then move your man file to /usr/local/share/man/man1, then update man with: mandb command (as root), after that
-inxi will update to the new man location.
+2. Since those will often be blank, it then uses a second priority check:
-Also added some more XDG debugger data as well to cover this for future debugger data.
+$HOME/.config $HOME/.local/share to place the inxi data directory, which was
+previously here:
+
+$HOME/.inxi
+
+3. If neither of these cases are present, inxi will default to its legacy user
+data: $HOME/.inxi as before
+
+In order to make this switch transparent to users, inxi will move the files from
+.inxi to the respective .config/ .local/share/inxi directories, and remove the
+.inxi directory after to cleanup.
+
+Also, since I was fixing some path stuff, I also did issue 77, manual inxi
+install not putting man pages in /usr/local/share/man/man1, which had caused an
+issue with Arch linux inxi installer. Note that I can't help users who had a
+manual inxi install with their man page in /usr/share/man/man1 already, because
+it's too risky to guess about user or system intentions, this man location
+correction will only apply if users have never installed inxi before manually,
+and have no distro version installed, unlike the config/data directory, which
+does update neatly with output letting users know the data was moved.
+
+Note that if users have man --path set up incorrectly, it's possible that the
+legacy man page would show up instead, which isn't good, but there was no
+perfect fix for the man issue so I just picked the easiest way, ignoring all man
+pages installed into /usr/share/man/man1 and treating them as final location,
+otherwise using if present the /usr/local/share/man/man1 location for new manual
+ install users.
+
+Also, for users with existing man locations and an inxi manually installed, you
+have to update to inxi current, then move your man file to
+/usr/local/share/man/man1, then update man with: mandb command (as root), after
+that inxi will update to the new man location.
+
+Also added some more XDG debugger data as well to cover this for future debugger
+data.
-This closes previous issue #77 (man page for manual inxi install does not go into /usr/local/share/man/man1) and
-issue 101, which I made today just to force the update.
+This closes previous issue #77 (man page for manual inxi install does not go
+into /usr/local/share/man/man1) and issue 101, which I made today just to force
+the update.
-Just as a side note, I find this absurd attempt at 'simplifying by making more complex and convoluted' re the XDG
-and .config and standard nix . file to be sort of tragic, because really, they've just made it all way more complicated,
-and since all 3 methods can be present, all the stuff has to be tested for anyway, so this doesn't make matters cleaner
-at all, it's just pointless busywork that makes some people happy since now there's even more rules to follow, sigh.
+Just as a side note, I find this absurd attempt at 'simplifying by making more
+complex and convoluted' re the XDG and .config and standard nix . file to be
+sort of tragic, because really, they've just made it all way more complicated,
+and since all 3 methods can be present, all the stuff has to be tested for
+anyway, so this doesn't make matters cleaner at all, it's just pointless
+busywork that makes some people happy since now there's even more rules to
+follow, sigh.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 19 Dec 2016 18:38:57 -0800
-=====================================================================================
+================================================================================
Version: 2.3.5
Patch: 00
Date: 2016-12-02
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This will matter to some users, inxi had failed to add 'modesetting'
-graphics driver, so it would not show in output, which causes support issues for users of that specific
-driver, like some cases of Intel. Also inxi would always have failed to show it unloaded in cases where
-radeon/nouveau were used but it had been loaded by xorg to begin with. So probably worth updating packages
-I'd say.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This will matter to some users, inxi had failed to add
+'modesetting' graphics driver, so it would not show in output, which causes
+support issues for users of that specific driver, like some cases of Intel. Also
+inxi would always have failed to show it unloaded in cases where radeon/nouveau
+were used but it had been loaded by xorg to begin with. So probably worth
+updating packages I'd say.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 02 Dec 2016 16:00:57 -0800
-=====================================================================================
+================================================================================
Version: 2.3.4
Patch: 00
Date: 2016-11-03
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
No new version, just fixed some unwanted executable bits in files.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 22 Nov 2016 11:13:15 -0800
-=====================================================================================
+================================================================================
Version: 2.3.4
Patch: 00
Date: 2016-11-03
------------------------------------
-Changes:
------------------------------------
-Squeezing in a last change for 2.3.4, added to -m if valid output, and if no -I or -tm
-triggers used, will show system ram used/total, from the -I line.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+Squeezing in a last change for 2.3.4, added to -m if valid output, and if no -I
+or -tm triggers used, will show system ram used/total, from the -I line.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 03 Nov 2016 20:20:37 -0700
-=====================================================================================
+================================================================================
Version: 2.3.4
Patch: 00
Date: 2016-11-03
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This improves -D output, now capacity is on its own line, and
-each disk is on its own line always, this makes it easier to read and/or parse.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This improves -D output, now capacity is on its own
+line, and each disk is on its own line always, this makes it easier to read
+and/or parse.
-Also, the lines now wrap nicely for extra data > console width, or -y 80 for example if
-you're trying to force most of the data to fit into 80 columns.
+Also, the lines now wrap nicely for extra data > console width, or -y 80 for
+example if you're trying to force most of the data to fit into 80 columns.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 03 Nov 2016 19:39:15 -0700
-=====================================================================================
+================================================================================
Version: 2.3.3
Patch: 00
Date: 2016-10-25
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
No version change, updated man page.
-This is a small syntax fix that will have essentially no impact on anyone. I've just cleaned
-up the man code to make it simple enough for roffit man to html conversion. There should be
-no real visible differences as far as I know.
+This is a small syntax fix that will have essentially no impact on anyone. I've
+just cleaned up the man code to make it simple enough for roffit man to html
+conversion. There should be no real visible differences as far as I know.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 29 Oct 2016 15:13:40 -0700
-=====================================================================================
+================================================================================
Version: 2.3.3
Patch: 00
Date: 2016-10-25
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Extended support and tests for vm id to include better BSD
-handling, and legacy linux. VM id will remain a work in progress, and will probably
-require a few fixes for fringe cases. Nice to have would be things like OpenBSD's
-vm which is difficult to detect. However, I believe this should handle roughly 99% of
-realworld vm id cases, except for some commercial stuff that will require more data.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Extended support and tests for vm id to include better
+BSD handling, and legacy linux. VM id will remain a work in progress, and will
+probably require a few fixes for fringe cases. Nice to have would be things like
+OpenBSD's vm which is difficult to detect. However, I believe this should handle
+roughly 99% of realworld vm id cases, except for some commercial stuff that will
+require more data.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 25 Oct 2016 12:17:46 -0700
-=====================================================================================
+================================================================================
Version: 2.3.2
Patch: 00
Date: 2016-10-23
------------------------------------
-Changes:
------------------------------------
-version number unchanged, just added a vm possible id, will impact few users, if you care, update.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+Version number unchanged, just added a vm possible id, will impact few users, if
+you care, update.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 23 Oct 2016 21:27:23 -0700
-=====================================================================================
+================================================================================
Version: 2.3.2
Patch: 00
Date: 2016-10-20
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New feature, new tarball, new version number.
-Now -M shows device type, like desktop, laptop, notebook, server, blade, vm (and tries to get vm type).
+Now -M shows device type, like desktop, laptop, notebook, server, blade, vm (and
+tries to get vm type).
-vm detection will take more work, for now I'm just going for the main ones used, but it will certainly
-miss some because it's hard to detect them in some cases unless you use root features. Also note, in
-most cases a container I believe will display as a vm, which is fine for now.
+vm detection will take more work, for now I'm just going for the main ones used,
+but it will certainly miss some because it's hard to detect them in some cases
+unless you use root features. Also note, in most cases a container I believe
+will display as a vm, which is fine for now.
For BSDs, and older linux, there is a dmidecode fallback detection as well.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 20 Oct 2016 18:03:54 -0700
-=====================================================================================
+================================================================================
Version: 2.3.1
Patch: 00
Date: 2016-08-25
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
Fixed typo in man page, no new version, just a fixed man page.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 09 Sep 2016 14:53:24 -0700
-=====================================================================================
+================================================================================
Version: 2.3.1
Patch: 00
Date: 2016-08-25
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball, new man page.
-Basic support added for Budgie desktop detection. This is waiting more data, so the support will be
-missing the version information. Go Budgie!!
+Basic support added for Budgie desktop detection. This is waiting more data, so
+the support will be missing the version information. Go Budgie!!
-Added /var/tmp and /var/log and /opt to basic partition data: -P
-This will probably not impact more than a handful of people in the world, but that's fine.
+Added /var/tmp and /var/log and /opt to basic partition data: -P This will
+probably not impact more than a handful of people in the world, but that's fine.
-Modified the static BIOS in -M to now show UEFI for actually UEFI booted systems, and, ideally,
-UEFI [Legacy] for UEFI booting in bios legacy mode, and BIOS for all others. Hopefully this will
-work ok, we'll see.
+Modified the static BIOS in -M to now show UEFI for actually UEFI booted
+systems, and, ideally, UEFI [Legacy] for UEFI booting in bios legacy mode, and
+BIOS for all others. Hopefully this will work ok, we'll see.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 25 Aug 2016 19:09:52 -0700
-=====================================================================================
+================================================================================
Version: 2.3.0
Patch: 00
Date: 2016-04-18
------------------------------------
-Changes:
------------------------------------
-New Feature, new version, new man page, new tarball. Laptop users should be happy,
--B option now shows, if available, battery data. Quite good data for systems
-with /sys battery data, only rudimentary for systems using dmidecode (BSDs).
-dmidecode has no current voltage/charge/current supported capacity.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New Feature, new version, new man page, new tarball. Laptop users should be
+happy, -B option now shows, if available, battery data. Quite good data for
+systems with /sys battery data, only rudimentary for systems using dmidecode
+(BSDs). dmidecode has no current voltage/charge/current supported capacity.
Main row shows charge and condition. Condition shows you have much capacity the
battery currently has vs its design capacity. Charge shows the Wh/percent of
current capacity of battery (NOT the rated design capacity).
--x adds battery vendor/model info, and battery status (like, charging, discharging,
-full).
+-x adds battery vendor/model info, and battery status (like, charging,
+discharging, full).
--xx adds battery serial number and voltage information. Note that voltage information
-is presented as Current Voltage / Designed minimum voltage.
+-xx adds battery serial number and voltage information. Note that voltage
+information is presented as Current Voltage / Designed minimum voltage.
--xxx adds battery chemistry (like Li-ion), cycles (note: there's a bug somewhere in
-that makes the cycle count always be 0, I don't know if that's in the batteries,
-the linux kernel, but it's not inxi, just FYI, the data is simply 0 always in all
-my datasets so far.
+-xxx adds battery chemistry (like Li-ion), cycles (note: there's a bug somewhere
+in that makes the cycle count always be 0, I don't know if that's in the
+batteries, the linux kernel, but it's not inxi, just FYI, the data is simply 0
+always in all my datasets so far.
For dmidecode output, the location of the batter is also shown in -xxx
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 18 Apr 2016 16:55:12 -0700
-=====================================================================================
+================================================================================
Version: 2.2.38
Patch: 00
Date: 2016-03-31
------------------------------------
-Changes:
------------------------------------
-URGENT BUG FIX! This fixes a bug introduced in 2.2.36 2016-03-21. New version, new tarball.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+URGENT BUG FIX! This fixes a bug introduced in 2.2.36 2016-03-21. New version,
+new tarball.
A sloppy unescaped / triggered a failure I didn't notice in partition info.
-Please update your inxi packages immediately if your version is 2016-03-21 or newer.
+Please update your inxi packages immediately if your version is 2016-03-21 or
+newer.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 31 Mar 2016 15:08:54 -0700
-=====================================================================================
+================================================================================
Version: 2.2.37
Patch: 00
Date: 2016-03-30
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Tiny fix in distro detection, will now default in sequence
-on /etc/issue step to first test for os release and not mint, then lsb verison and
-not mint, then /etc/issue. This should keep the mint detection working well, as long
-as they keep mint string in the /etc/issue file, that is, but that's out of our control.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Tiny fix in distro detection, will now default in
+sequence on /etc/issue step to first test for os release and not mint, then lsb
+verison and not mint, then /etc/issue. This should keep the mint detection
+working well, as long as they keep mint string in the /etc/issue file, that is,
+but that's out of our control.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 30 Mar 2016 13:28:40 -0700
-=====================================================================================
+================================================================================
Version: 2.2.36
Patch: 00
Date: 2016-03-21
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. A tiny bug fix for kfreebsd, I know, right, nobody uses that.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. A tiny bug fix for kfreeBSD, I know, right, nobody
+uses that.
-Also added in some more script color options however, which might be of use. These are
-aimed more at light terminal backgrounds.
+Also added in some more script color options however, which might be of use.
+These are aimed more at light terminal backgrounds.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 21 Mar 2016 16:04:33 -0700
-=====================================================================================
+================================================================================
Version: 2.2.35
Patch: 00
Date: 2016-02-29
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. A tiny, but meaningful, fix. inxi had not been updated to
-test for the non deprecated battery test, /sys/class/power_supply/BAT0 existence.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. A tiny, but meaningful, fix. inxi had not been updated
+to test for the non deprecated battery test, /sys/class/power_supply/BAT0
+existence.
This resulted in failure to indicate 'portable' where applicable.
-I may also now add battery information where applicable since that's easy to get from
-/sys
+I may also now add battery information where applicable since that's easy to get
+from /sys
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 29 Feb 2016 12:21:09 -0800
-=====================================================================================
+================================================================================
Version: 2.2.34
Patch: 00
Date: 2016-02-21
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball. This closes two issues:
1. Add amdgpu to possible xorg drivers list (and gpu sensors data)
-2. switch to default dig command to get WAN ip. This is usually but not always faster than
-the http method. Because the IP source is not truly trustworthy (run by cisco), I'm keeping a
-fallback mode on 1 second time out failure of the previous http based methods. Added dig
-to recommended tools list.
+2. switch to default dig command to get WAN ip. This is usually but not always
+faster than the http method. Because the IP source is not truly trustworthy (run
+by cisco), I'm keeping a fallback mode on 1 second time out failure of the
+previous http based methods. Added dig to recommended tools list.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 21 Feb 2016 11:18:54 -0800
-=====================================================================================
+================================================================================
Version: 2.2.33
Patch: 00
Date: 2016-01-30
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
No version change, new tarball. Someone spotted a small glitch in -W help menu.
Says latitude/longtitude instead of latitude,longtitude
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 09 Feb 2016 11:20:03 -0800
-=====================================================================================
+================================================================================
Version: 2.2.33
Patch: 00
Date: 2016-01-30
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Bug fix: added basic support for NVMe M2 disk storage type.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-NOTE: missing product name/serial info, because it's not being treated by linux kernel
-as a standard disk. Could not find that data anywhere in the system debugger dump.
+New version, new tarball. Bug fix: added basic support for NVMe M2 disk storage
+type.
+
+NOTE: missing product name/serial info, because it's not being treated by linux
+kernel as a standard disk. Could not find that data anywhere in the system
+debugger dump.
If you know how to find the model name/number and or serial, let me know.
-Also small fix, as noted: ip: should be ip-v4 to match with ip-v6, thanks mikaela.
+Also small fix, as noted: ip: should be ip-v4 to match with ip-v6, thanks
+mikaela.
Also some debugger fixes and updates.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 30 Jan 2016 17:07:42 -0800
-=====================================================================================
+================================================================================
Version: 2.2.32
Patch: 00
Date: 2016-01-03
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Finalized the * expansion fix for arrays. This is a significant
-bug fix, so while the bug almost never appears, if it does, the inxi output can get completely
-corrupted.
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Finalized the * expansion fix for arrays. This is a
+significant bug fix, so while the bug almost never appears, if it does, the inxi
+output can get completely corrupted.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 03 Jan 2016 14:08:04 -0800
-=====================================================================================
+================================================================================
Version: 2.2.31
Patch: 00
Date: 2015-12-29
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
No version change, new tarball.
Cleaned up some logging glitches.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 29 Dec 2015 14:01:07 -0800
-=====================================================================================
+================================================================================
Version: 2.2.31
Patch: 00
Date: 2015-11-15
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Try 2 at mmcblk support. I had mmcblock, thats not how it's
-reported to the system.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Try 2 at mmcblk support. I had mmcblock, thats not how
+it's reported to the system.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 15 Nov 2015 17:25:10 -0800
-=====================================================================================
+================================================================================
Version: 2.2.30
Patch: 00
Date: 2015-11-13
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Added tentative support for /dev/blcmmc0p12 type partitions
-and drive identifiers. This will probably require more fixes.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New version, new tarball. Added tentative support for /dev/blcmmc0p12 type
+partitions and drive identifiers. This will probably require more fixes.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 13 Nov 2015 11:58:17 -0800
-=====================================================================================
+================================================================================
Version: 2.2.29
Patch: 00
Date: 2015-11-09
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. A subtle issue pointed out by a user, inxi is limited to
-26 drives, and fails to handle the linux > 26 options:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. A subtle issue pointed out by a user, inxi is limited
+to 26 drives, and fails to handle the linux > 26 options:
-https://rwmj.wordpress.com/2011/01/09/how-are-linux-drives-named-beyond-drive-26-devsdz/
+https://rwmj.wordpress.com/2011/01/09/how-are-linux-drives-named-beyond-drive-\
+26-devsdz/
That article explains the failing well.
-Note that because I have neither user data sets or > 26 hdd systems available, I cannot
-verify that my fix works. It may work, that's all I can say.
+Note that because I have neither user data sets or > 26 hdd systems available, I
+cannot verify that my fix works. It may work, that's all I can say.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 09 Nov 2015 19:00:08 -0800
-=====================================================================================
+================================================================================
Version: 2.2.28
Patch: 00
Date: 2015-08-20
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
No version change, new tarball. Man page link fixes, that's all.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 28 Aug 2015 12:44:43 -0700
-=====================================================================================
+================================================================================
Version: 2.2.28
Patch: 00
Date: 2015-08-20
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball:
-Changes: updated inxi updaters to use github locations.
+RELEASE NOTES: updated inxi updaters to use github locations.
I will do this commit once for googlecode, and once for github, after that,
all commits will go only to github.
-inxi moves to github, despite my dislike of for profit source repos, and git,
-I decided that I just don't have the time or energy to do it right, so I'm going
+inxi moves to github, despite my dislike of for profit source repos, and git, I
+decided that I just don't have the time or energy to do it right, so I'm going
to use github.
The project is already moved, though I have left inxi up for the time being on
@@ -5170,1380 +14545,1566 @@ https://github.com/smxi/inxi
And that's about it.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 20 Aug 2015 16:01:32 -0700
-=====================================================================================
+================================================================================
Version: 2.2.27
Patch: 00
Date: 2015-08-02
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Trivial wget/curl change, nothing else. No need to upgrade packages.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Trivial wget/curl change, nothing else. No need to upgrade
+packages.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 02 Aug 2015 14:18:45 -0700
-=====================================================================================
+================================================================================
Version: 2.2.26
Patch: 00
Date: 2015-07-06
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This fixes a bug with the last fix for KDE Plasma version. It was
-showing Frameworks version, which is apparently NOT the same as the plasma version.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Also added debugger kde versioning to make this stuff less of an ordeal for data collection.
+New version, new tarball. This fixes a bug with the last fix for KDE Plasma
+version. It was showing Frameworks version, which is apparently NOT the same as
+the plasma version.
------------------------------------
+Also added debugger kde versioning to make this stuff less of an ordeal for data
+collection.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 06 Jul 2015 15:51:51 -0700
-=====================================================================================
+================================================================================
Version: 2.2.25
Patch: 00
Date: 2015-06-15
------------------------------------
-Changes:
------------------------------------
-Same version, new tarball, I'm tossing this in with the other release, changing for kde >= 4,
-changing simple KDE to KDE Plasma, which keeps it clear and simple.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Same version, new tarball, I'm tossing this in with the other release, changing
+for kde >= 4, changing simple KDE to KDE Plasma, which keeps it clear and
+simple.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 15 Jun 2015 18:00:42 -0700
-=====================================================================================
+================================================================================
Version: 2.2.25
Patch: 00
Date: 2015-06-15
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Got a good fix for the kde version issue from the lads at
-#kde-devel, now using kf5-config --version which gives similar output to kded4 --version
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Got a good fix for the kde version issue from the lads
+at #kde-devel, now using kf5-config --version which gives similar output to
+kded4 --version
-I use this for both 4 and 5, but since 4 has worked fine for years, I'll just use this for 5
-and later.
+I use this for both 4 and 5, but since 4 has worked fine for years, I'll just
+use this for 5 and later.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 15 Jun 2015 17:49:56 -0700
-=====================================================================================
+================================================================================
Version: 2.2.24
Patch: 00
Date: 2015-06-15
------------------------------------
-Changes:
------------------------------------
-new version, new tarball. Adapted to deal with yet another silly pointless change from
-normal, in this case, sddm decided that using a .pid or .lock file in /run was too easy
-so they changed to some session id type string in the /run/sddm/ directory.
-
-Speaking for myself, I find such pointless changes from anything resembling normal behaviors
-to the reason that gnu freedesktop systems will never achieve significant desktop use globally.
-
-Also, in the same vein, added debuggers to try to figure out what plasma5/kde 5 is using
-internally to give command line version information. Again, something pointless internally
-was changed, thus breaking something that had faintly resembled an api, which is of course
-why desktop gnu linux will never actually take off, developers in the real world have no
-interest in chasing after such pointless and never ending churn in even the most trivial
-areas of the OS, let alone the core.
-
-inxi remains however as a log of this ongoing churn and lack of discipline, and so remains
-an interesting process of observation, and a way for users to try to avoid the constant
-changes in simple system queries that should really never change, so I can see a reason
-to keep it going since it's obvious that the actual foss ecosystem itself will not and apparently
-cannot grasp that it is the lack of stable apis, methods, etc, that has kept desktop gnu linux
-from achieving any actual real world success or popularity, and that is the actual problem
-that should be fixed, not some pointless internal change to something.
-
-On the source repo front, maintainers, I still can't find an acceptable alternative to the
-impending shutdown of googlecode. github is a for profit venture that people who seem totally
-void of any sense of history believe is actually going to be around longer than say, sourceforge,
-or googlecode, as a legitimate source hosting site.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Adapted to deal with yet another silly pointless
+change from normal, in this case, sddm decided that using a .pid or .lock file
+in /run was too easy so they changed to some session id type string in the
+/run/sddm/ directory.
+
+Speaking for myself, I find such pointless changes from anything resembling
+normal behaviors to the reason that gnu freedesktop systems will never achieve
+significant desktop use globally.
+
+Also, in the same vein, added debuggers to try to figure out what plasma5/kde 5
+is using internally to give command line version information. Again, something
+pointless internally was changed, thus breaking something that had faintly
+resembled an api, which is of course why desktop gnu linux will never actually
+take off, developers in the real world have no interest in chasing after such
+pointless and never ending churn in even the most trivial areas of the OS, let
+alone the core.
+
+inxi remains however as a log of this ongoing churn and lack of discipline, and
+so remains an interesting process of observation, and a way for users to try to
+avoid the constant changes in simple system queries that should really never
+change, so I can see a reason to keep it going since it's obvious that the
+actual foss ecosystem itself will not and apparently cannot grasp that it is the
+lack of stable apis, methods, etc, that has kept desktop gnu linux from
+achieving any actual real world success or popularity, and that is the actual
+problem that should be fixed, not some pointless internal change to something.
+
+On the source repo front, maintainers, I still can't find an acceptable
+alternative to the impending shutdown of googlecode. github is a for profit
+venture that people who seem totally void of any sense of history believe is
+actually going to be around longer than say, sourceforge, or googlecode, as a
+legitimate source hosting site.
I'd welcome any suggestions. So far all the options are bad that I can find.
-Top preference is svn, but if git is the absolute only other choice for an otherwise good option,
-I'd consider git, but it's a horrible option for inxi because of how inxi development and debugging
-works, vs how git works. ie, svn branches are perfect, git branches are totally wrong.
-
-I may end up just hosting the svn on my own servers to avoid having to move yet again when the next
-for profit flakey site decides to close up or monetize the source hosting.
-
-The original idea of googlecode was for google to 'pay its dues to the foss community', but apparently
-they got bored with that idea, plus of course, the ongoing total failure of google to deal with
-automated spam, which has always been a huge bug in the core google corporate culture. But googlecode
-was by far the best option I've come across, it was done by a deep pocketed corporation not for profit
-for pretty good reasons, and was never intended to be a profit center, which is the closest I could
-see for a non free option.
-
-Setting up svn gui stuff however is a royal pain and requires ongoing maintainance for the life of
-the software, which is NOT fun, nor will I sign up for that obligation.
-
-I may end up moving to github anyway, even though git truly sucks for inxi and myself, but it's an
-idea I find fairly vile, apparently free software (sic) authors seem to have no grasp of the concept
-of fredom when it comes to source code hosting, judging by the absurd popularity of github as the
-default go to source repo. Their website is pathetic as well, which isn't very promising.
-
-So we'll see where it goes, I think I have until august to decide what to do for source hosting.
-
-Since I'm old enough to have seen sourceforge and now googlecode do the same thing, along with a lot
-of other options, to say github won't do this too is delusional, what you can almost certainly say is it
-will do it, the only question is when. But, just as Linus did with his non free linux kernel version
-control, people will stick with the non free stuff until you realize you can't use it anymore, because
-it is non free. Free software hosted on non free source repos is to me one of the most absurd and
-stupid things I've ever heard of to be honest.
-
------------------------------------
+Top preference is svn, but if git is the absolute only other choice for an
+otherwise good option, I'd consider git, but it's a horrible option for inxi
+because of how inxi development and debugging works, vs how git works. ie, svn
+branches are perfect, git branches are totally wrong.
+
+I may end up just hosting the svn on my own servers to avoid having to move yet
+again when the next for profit flakey site decides to close up or monetize the
+source hosting.
+
+The original idea of googlecode was for google to 'pay its dues to the foss
+community', but apparently they got bored with that idea, plus of course, the
+ongoing total failure of google to deal with automated spam, which has always
+been a huge bug in the core google corporate culture. But googlecode was by far
+the best option I've come across, it was done by a deep pocketed corporation not
+for profit for pretty good reasons, and was never intended to be a profit
+center, which is the closest I could see for a non free option.
+
+Setting up svn gui stuff however is a royal pain and requires ongoing
+maintainance for the life of the software, which is NOT fun, nor will I sign up
+for that obligation.
+
+I may end up moving to github anyway, even though git truly sucks for inxi and
+myself, but it's an idea I find fairly vile, apparently free software (sic)
+authors seem to have no grasp of the concept of fredom when it comes to source
+code hosting, judging by the absurd popularity of github as the default go to
+source repo. Their website is pathetic as well, which isn't very promising.
+
+So we'll see where it goes, I think I have until august to decide what to do for
+source hosting.
+
+Since I'm old enough to have seen sourceforge and now googlecode do the same
+thing, along with a lot of other options, to say github won't do this too is
+delusional, what you can almost certainly say is it will do it, the only
+question is when. But, just as Linus did with his non free linux kernel version
+control, people will stick with the non free stuff until you realize you can't
+use it anymore, because it is non free. Free software hosted on non free source
+repos is to me one of the most absurd and stupid things I've ever heard of to be
+honest.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 15 Jun 2015 15:19:02 -0700
-=====================================================================================
+================================================================================
Version: 2.2.23
Patch: 00
Date: 2015-06-08
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Tiny change. Added /etc/devuan_version file to distro id to handle
-the switched file name. Kudos to anyone out there fighting to create a working alternative
-to the unreliable and buggy and windows emulating systemd, I wish devuan luck. Maybe between
-devuan and gentoo and slackware we can save the free software core systems before it's too late.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Tiny change. Added /etc/devuan_version file to distro id
+to handle the switched file name. Kudos to anyone out there fighting to create a
+working alternative to the unreliable and buggy and windows emulating systemd, I
+wish devuan luck. Maybe between devuan and gentoo and slackware we can save the
+free software core systems before it's too late.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 08 Jun 2015 15:43:52 -0700
-=====================================================================================
+================================================================================
Version: 2.2.22
Patch: 00
Date: 2015-05-30
------------------------------------
-Changes:
------------------------------------
-New version, new man page, new tarball. Modified slightly -tc and -tm output to fix a
-pet peeve of mine. Now, if -I, -b, -F, or anything that can trigger the memory: used/total
-in Information line is not used, -tm will always show the system used/total ram data on the
-first line of the Memory item of -t output.
-
-Also, if -xtc (trigger ram data in cpu output) is used, and -I is not triggered, and -tm is
-not triggered, will also show system used/total ram data on the cpu first line.
-
-I'd found it odd that this data did not appear when -tcm or -tm or -xtc were used, so this is
-now fixed. I used the -t option a fair amount to find memory/cpu use issues, and usually I
-don't use the option with other options, so the lack of total system ram data was odd.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new man page, new tarball. Modified slightly -tc and -tm output to
+fix a pet peeve of mine. Now, if -I, -b, -F, or anything that can trigger the
+memory: used/total in Information line is not used, -tm will always show the
+system used/total ram data on the first line of the Memory item of -t output.
+
+Also, if -xtc (trigger ram data in cpu output) is used, and -I is not triggered,
+and -tm is not triggered, will also show system used/total ram data on the cpu
+first line.
+
+I'd found it odd that this data did not appear when -tcm or -tm or -xtc were
+used, so this is now fixed. I used the -t option a fair amount to find
+memory/cpu use issues, and usually I don't use the option with other options, so
+the lack of total system ram data was odd.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 30 May 2015 11:50:56 -0700
-=====================================================================================
+================================================================================
Version: 2.2.21
Patch: 00
Date: 2015-05-13
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. A desktop id fix, Mate id failed, mate moved to a more
-long term solution to identify itself, so the hack I had in place fails on new MATE.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. A desktop id fix, Mate id failed, mate moved to a more
+long term solution to identify itself, so the hack I had in place fails on new
+MATE.
-We'll see if this does it for various glitches, now quassel and mate latest should
-again be working.
+We'll see if this does it for various glitches, now quassel and mate latest
+should again be working.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 13 May 2015 13:15:59 -0700
-=====================================================================================
+================================================================================
Version: 2.2.20
Patch: 00
Date: 2015-05-11
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, tarball. This fixes a qt5 glitch with Quassel id, hopefully anyway.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 11 May 2015 15:08:30 -0700
-=====================================================================================
+================================================================================
Version: 2.2.19
Patch: 00
Date: 2015-02-15
------------------------------------
-Changes:
------------------------------------
-No version change, new tarball. Fixed the repo error message to be more accurate, since
-a system could be supported but have no repo data, like on some livecds etc. Also made it
-better for BSD or GNU/linux.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+No version change, new tarball. Fixed the repo error message to be more
+accurate, since a system could be supported but have no repo data, like on some
+livecds etc. Also made it better for BSD or GNU/linux.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 15 Feb 2015 19:13:25 -0800
-=====================================================================================
+================================================================================
Version: 2.2.19
Patch: 00
Date: 2015-02-14
------------------------------------
-Changes:
------------------------------------
-New version, updated man page, new tarball. Updated -r to for portage gentoo sources. This should work
-fine for all derived distros like Sabayon as well. The test looks for:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, updated man page, new tarball. Updated -r to for portage gentoo
+sources. This should work fine for all derived distros like Sabayon as well. The
+test looks for:
+
/etc/portage/repos.conf/ and type -p emerge
+
if found will then grab the repos from the source files found.
-Note that the logic for this was almost identical to that used for rpm so it was an
-easy addon. Please let us know if you have an issue and provide data samples of relevant
-files.
+Note that the logic for this was almost identical to that used for rpm so it was
+an easy addon. Please let us know if you have an issue and provide data samples
+of relevant files.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 15 Feb 2015 18:02:16 -0800
-=====================================================================================
+================================================================================
Version: 2.2.18
Patch: 00
Date: 2015-01-24
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, new tarball. Two great bug report, issues.
-1. Tightened runit init detection to use proc, note that if runit works on BSDs inxi will
- require more data to properly detect it on BSDs..
+1. Tightened runit init detection to use proc, note that if runit works on BSDs
+inxi will require more data to properly detect it on BSDs..
+
2. Use openrc runlevel tests natively if openrc detected.
+
3. Fixed subtle issue with alias to inxi file and paths.
-4. Added rc-status data collection for debugger, improved debugger data collector handling
- of bsd and other tests to note absent if not there in file names.
------------------------------------
+4. Added rc-status data collection for debugger, improved debugger data
+collector handling of BSD and other tests to note absent if not there in file
+names.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 24 Jan 2015 10:25:43 -0800
-=====================================================================================
+================================================================================
Version: 2.2.17
Patch: 00
Date: 2015-01-14
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New Version, new tarball.
-Fixed bugs in Epoch init system detection, caused false positives in systems booted on
-SysVinit, but with Epoch installed. Epoch turns out to be in PID 1 == epoch (/proc/1/comm)
-so that's easy to fix.
+Fixed bugs in Epoch init system detection, caused false positives in systems
+booted on SysVinit, but with Epoch installed. Epoch turns out to be in PID 1 ==
+epoch (/proc/1/comm) so that's easy to fix.
Also fixed spacing isxue with OpenRC output in -I line.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 14 Jan 2015 12:28:00 -0800
-=====================================================================================
+================================================================================
Version: 2.2.16
Patch: 00
Date: 2014-11-03
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Very small update, added sddm id to dm detecfion. Because Arch linux,
-at least on the system I got data from, is not using .pid/.lock extensions, but other systems
-are, I'm adding sddm AND sddm.pid detection. This required changing the id to use explicit -f
-for test, not the previous -e, which will force only files, not directories, to trigger yes case.
-
-No other changes, but it's worth updating to this because distros may start using sddm in the not so
-distant future, it's beta currently though.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Very small update, added sddm id to dm detecfion. Because
+Arch linux, at least on the system I got data from, is not using .pid/.lock
+extensions, but other systems are, I'm adding sddm AND sddm.pid detection. This
+required changing the id to use explicit -f for test, not the previous -e, which
+will force only files, not directories, to trigger yes case.
+
+No other changes, but it's worth updating to this because distros may start
+using sddm in the not so distant future, it's beta currently though.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 03 Nov 2014 19:26:22 -0800
-=====================================================================================
+================================================================================
Version: 2.2.15
Patch: 00
Date: 2014-10-12
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Debian has for some reason broken procps / uptime support, for
-as of yet unknown reasons, so rather than wait to see the bug resolved, I'm just removing
-uptime as a depenendency, though this is a short term hack only because we don't know
-why it was removed from procps or if that was just a mistake, or if other things as well might
-be vanishing from procps. Am leaving in however uname as dependency because inxi cannot
-determine what platform it is when it starts without that.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Debian has for some reason broken procps / uptime support,
+for as of yet unknown reasons, so rather than wait to see the bug resolved, I'm
+just removing uptime as a depenendency, though this is a short term hack only
+because we don't know why it was removed from procps or if that was just a
+mistake, or if other things as well might be vanishing from procps. Am leaving
+in however uname as dependency because inxi cannot determine what platform it is
+when it starts without that.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 12 Oct 2014 12:07:03 -0700
-=====================================================================================
+================================================================================
Version: 2.2.14
Patch: 00
Date: 2014-09-26
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Bug fix for regression introduced in last versions. Double
-output for apt repos. Also refactored duplicated code into a function, no other changes.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Bug fix for regression introduced in last versions.
+Double output for apt repos. Also refactored duplicated code into a function, no
+other changes.
-Note that this version features the repo debugger tool as well, which is very helpful in
-particularly non apt systems to fix issues with its handling of repo formats etc.
+Note that this version features the repo debugger tool as well, which is very
+helpful in particularly non apt systems to fix issues with its handling of repo
+formats etc.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 27 Sep 2014 00:09:07 -0700
-=====================================================================================
+================================================================================
Version: 2.2.13
Patch: 00
Date: 2014-09-25
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Added slackpkgplus support, added freebsd pkg servers,
-added netbsd pkg servers, all to -r.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New version, new tarball. Added slackpkgplus support, added freeBSD pkg servers,
+added netBSD pkg servers, all to -r.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 25 Sep 2014 21:39:07 -0700
-=====================================================================================
+================================================================================
Version: 2.2.12
Patch: 00
Date: 2014-09-24
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. For some weird reason rpm query didn't work with gawk all
-on one line, moved to separate lines. Who knows why? This only impacts rpm distros.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. For some weird reason rpm query didn't work with gawk
+all on one line, moved to separate lines. Who knows why? This only impacts rpm
+distros.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 25 Sep 2014 00:19:06 -0700
-=====================================================================================
+================================================================================
Version: 2.2.11
Patch: 00
Date: 2014-09-24
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This fixes broken slackpkg handling in -r, and, using the same fix,
-fixes a single scenario with apt, where there is only sources.list, no .d/*.list files.
-I was assuming that the file name would print out in the output of single file grep,
-but that only happens with multiple files.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This fixes broken slackpkg handling in -r, and, using
+the same fix, fixes a single scenario with apt, where there is only
+sources.list, no .d/*.list files. I was assuming that the file name would print
+out in the output of single file grep, but that only happens with multiple
+files.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 24 Sep 2014 13:18:41 -0700
-=====================================================================================
+================================================================================
Version: 2.2.10
Patch: 00
Date: 2014-09-24
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Added slackpkg support -R; added rpm support for gtk version (-Sx).
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Added slackpkg support -R; added rpm support for gtk
+version (-Sx).
-bsds: removed dragonly specific used mem hack, now will work for any bsd, if avm in vmstat is 0
-adds a flag to value, and removes it when used.
+BSDs: removed dragonly specific used mem hack, now will work for any BSD, if avm
+in vmstat is 0 adds a flag to value, and removes it when used.
Nothing else of note.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 24 Sep 2014 10:23:31 -0700
-=====================================================================================
+================================================================================
Version: 2.2.9
Patch: 00
Date: 2014-09-22
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This is only for bsds. Added hack to get dragonfly used ram,
-added dragonfly/freebsd repos full support.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This is only for BSDs. Added hack to get dragonfly
+used ram, added dragonfly/freeBSD repos full support.
Added sort of drives order to get around gawk pseudo array hash issues.
And that's that.
------------------------------------
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 22 Sep 2014 16:06:00 -0700
-=====================================================================================
+================================================================================
Version: 2.2.8
Patch: 00
Date: 2014-09-21
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Added lxqt desktop id that is not dependent on openbox detection.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Fixed some bugs. Added a pciconf class for audio. Added support for bsds running lspci, which
-lets openbsd show card info for -A,-G,-N
+New version, new tarball. Added lxqt desktop id that is not dependent on openbox
+detection.
------------------------------------
+Fixed some bugs. Added a pciconf class for audio. Added support for BSDs running
+lspci, which lets openBSD show card info for -A,-G,-N
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 21 Sep 2014 17:37:23 -0700
-=====================================================================================
+================================================================================
Version: 2.2.7
Patch: 00
Date: 2014-09-19
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Mostly bsd fixes, a few for linux disk info.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Mostly BSD fixes, a few for linux disk info.
-Added support, basic, for bsd hard disks, and optical disks.
+Added support, basic, for BSD hard disks, and optical disks.
Added hard disk total/percent used for BSDs, sort of.
-These are mostly just hacks since the data isn't easily available from system
-standard tools, though I could on freebsd use gpart I guess but that's another tool
-needed, and another method, too much work imo for small results.
+These are mostly just hacks since the data isn't easily available from system
+standard tools, though I could on freeBSD use gpart I guess but that's another
+tool needed, and another method, too much work imo for small results.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 19 Sep 2014 19:52:10 -0700
-=====================================================================================
+================================================================================
Version: 2.2.6
Patch: 00
Date: 2014-09-17
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Cleaned up and made more consistent the cpu max/min output.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Cleaned up and made more consistent the cpu max/min
+output.
Now the short form, the -b/-v1 form, and the -C forms are all similar.
-Also, added a few hacks to try to extract cpu max speed from cpu model string in
-either sysctl -a OR /var/run/dmesg.boot data in freebsd/openbsd. Sometimes it may
-work if that data was in the model string. It's a hack, but will do until we get
-better data sources or they update their sources to list more data.
+Also, added a few hacks to try to extract cpu max speed from cpu model string in
+either sysctl -a OR /var/run/dmesg.boot data in freeBSD/openBSD. Sometimes it
+may work if that data was in the model string. It's a hack, but will do until we
+get better data sources or they update their sources to list more data.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 17 Sep 2014 21:24:41 -0700
-=====================================================================================
+================================================================================
Version: 2.2.5
Patch: 00
Date: 2014-09-16
------------------------------------
-Changes:
------------------------------------
-New tarball, same version. This adds UP support for -Cxx, showing min cpu speed as well.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New tarball, same version. This adds UP support for -Cxx, showing min cpu speed
+as well.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 16 Sep 2014 21:35:06 -0700
-=====================================================================================
+================================================================================
Version: 2.2.5
Patch: 00
Date: 2014-09-16
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This fixes a long standing weakness with min/max cpu speed
-handling. Or rather, non handling, since that data only showed in rare cases on short form
-(inxi no args) output. Now it uses /sys query to determine min/max speed of cpu, and uses
-that data to override any other min/max data discovered.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This fixes a long standing weakness with min/max cpu
+speed handling. Or rather, non handling, since that data only showed in rare
+cases on short form (inxi no args) output. Now it uses /sys query to determine
+min/max speed of cpu, and uses that data to override any other min/max data
+discovered.
-Still uses /proc/cpuinfo for actual speeds per core. The assumption in this is that all
-cares will have the same min/max speeds, which is generally going to be a safe assumption.
+Still uses /proc/cpuinfo for actual speeds per core. The assumption in this is
+that all cares will have the same min/max speeds, which is generally going to be
+a safe assumption.
-Now in short form, inxi, output, it will show actual speed then (max speed) or just (max)
-if actual speed matches max speed. Same for -b short CPU output.
+Now in short form, inxi, output, it will show actual speed then (max speed) or
+just (max) if actual speed matches max speed. Same for -b short CPU output.
-For long, -C output, shows max speed before the actual cpu core speeds per core.
+For long, -C output, shows max speed before the actual cpu core speeds per
+core.
With -xx, and in multi cpu/core systems only, shows if available min/max speeds.
-Note that not all /sys have this data, so it doesn't show any N/A if it's missing.
+Note that not all /sys have this data, so it doesn't show any N/A if it's
+missing.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 16 Sep 2014 20:26:19 -0700
-=====================================================================================
+================================================================================
Version: 2.2.4
Patch: 00
Date: 2014-09-10
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Mostly bsd changes, except for downloader options, which now
-permit wget/curl/(openbsd ftp)/(bsd fetch) interchangeably.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Mostly BSD changes, except for downloader options,
+which now permit wget/curl/(openBSD ftp)/(BSD fetch) interchangeably.
-This lets more standard downloader defaults in bsds, as well as curl on gnu/linux systems
-without triggering an error of missing wget.
+This lets more standard downloader defaults in BSDs, as well as curl on
+gnu/linux systems without triggering an error of missing wget.
-1. Fixed cpu core issues on bsds, now shows core count + if > 1, cpus total.
+1. Fixed cpu core issues on BSDs, now shows core count + if > 1, cpus total.
-2. Now shows OS instead of Distro on short/long output, since each bsd is an OS.
+2. Now shows OS instead of Distro on short/long output, since each BSD is an OS.
3. fixed vmstat issues for used memory outputs
-Also fixed potential failures with cpu core count array by making it a ',' separated array.
+Also fixed potential failures with cpu core count array by making it a ','
+separated array.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 11 Sep 2014 18:15:10 -0700
-=====================================================================================
+================================================================================
Version: 2.2.3
Patch: 00
Date: 2014-09-03
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Contains a major bug fix for a regression introduced in 2.2.2
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Contains a major bug fix for a regression introduced
+in 2.2.2
--m/-M would always show requires root for dmidecode no matter what. Also improved dmidecode
-error messages/handling.
+-m/-M would always show requires root for dmidecode no matter what. Also
+improved dmidecode error messages/handling.
Also, a fix for no display card data, now shows as expected no card data
-Most other fixes are for bsd, mostly openbsd.
+Most other fixes are for BSD, mostly openBSD.
-1. Added a class for network devices in freebsd pciconf
+1. Added a class for network devices in freeBSD pciconf
-2. Added -r support for openbsd
+2. Added -r support for openBSD
-3. Fixed some cpu issues for openbsd
+3. Fixed some cpu issues for openBSD
-4. Fixed an issue in openbsd/freebsd where client version data failed to get cleaned
+4. Fixed an issue in openBSD/freeBSD where client version data failed to get
+cleaned
-5. Changed inxi short form output for bsds to show OS data instead of kernel data.
+5. Changed inxi short form output for BSDs to show OS data instead of kernel
+data.
-6. BSDs, maybe all, different syntax in xorg.0.log made unloaded gfx drivers not show,
- that is fixed now.
+6. BSDs, maybe all, different syntax in xorg.0.log made unloaded gfx drivers not
+show, that is fixed now.
--p fixed file system type in -p/-P for openbsd, now shows.
+-p fixed file system type in -p/-P for openBSD, now shows.
--I / inxi short - fixed used memory, did not show in openbsd, now does.
+-I / inxi short - fixed used memory, did not show in openBSD, now does.
--f fixed cpu flags in openbsd, now works
+-f fixed cpu flags in openBSD, now works
--C corrected corrupted cpu data outputs, in openbsd at least, maybe also freebsd
+-C corrected corrupted cpu data outputs, in openBSD at least, maybe also freeBSD
--C added an openbsd hack to sometimes show cpu L2 cache
+-C added an openBSD hack to sometimes show cpu L2 cache
-m/-M fixed/improved dmidecode error handling for all systems
modified handling of dmesg.boot data, synched so gawk can parse better.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 03 Sep 2014 12:00:04 -0700
-=====================================================================================
+================================================================================
Version: 2.2.2
Patch: 00
Date: 2014-09-01
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This version fixes an issue with a white space at the end of lines.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This version fixes an issue with a white space at the
+end of lines.
Now all lines are stripped of ending whitespaces automatically.
-Also a dmidecode error handler correction, that was not working right in bsd systems.
+Also a dmidecode error handler correction, that was not working right in BSD
+systems.
-Added some debuggers for bsd systems.
+Added some debuggers for BSD systems.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 01 Sep 2014 16:09:23 -0700
-=====================================================================================
+================================================================================
Version: 2.2.1
Patch: 00
Date: 2014-08-20
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Some systems are showing a new xfce syntax in the xrop -root
-output, like so, instead of the old quotes "XFCE4" it shows like this:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Some systems are showing a new xfce syntax in the xrop
+-root output, like so, instead of the old quotes "XFCE4" it shows like this:
XFCE_DESKTOP_WINDOW(WINDOW): window id # 0x1000003
Updated and added a much less strict fallback test case.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 20 Aug 2014 19:43:59 -0700
-=====================================================================================
+================================================================================
Version: 2.2.00
Patch: 00
Date: 2014-08-18
------------------------------------
-Changes:
------------------------------------
-New version, tarball, man page. Maintainers, this is the official release of -m feature.
-
-I have collected enough datasamples to allow for reasonably fine grained corrections, estimates,
-warnings about unreliable capacity now, and have fixed all major failures.
-
-Also, because this stuff is filled out by people somewhere, or not, some fields often are just
-empty, or contain the default values, ie, they are worthless. inxi shows N/A for those situations,
-it means there is really no actual data to show you.
-
-This feature, sadly, well never be totally reliable, because dmi data is frankly junk, especially
-dmi type 5 and 16, which is what is supposed to tell you total capacity of memory array, and the
-maximum module size (type 5). However, this data is totally random, often it is right, sometimes
-it is wrong. Sometimes type 5 is right and type 16 is wrong, sometimes the other way. And since
-type 5 is only present in some systems, it's not reliable anyway.
-
-What is reliable and always right is the actually installed memory per device, ie, sticks. I have
-not seen any errors in that, so that seems to be actually coming from the system itself. type 5 / 16
-sadly are clearly entered in manually by some poorly paid engineers out there in the world, and are
-often total fictions, either far too small, or far too big, or whatever.
-
-inxi will attempt to correct all clear logic errors, and whenever it changes the listed data from
-type 5/16, it notes either (est) or (check). (est) means it is a good guess, one I am comfortable making,
-(check) means it is either an unreliable guess, or that what the system is reporting is so unlikely that
-even though inxi is showing it, it doubts it could actually be true, or at least, it thinks you
-should check this yourself.
-
--m has 3 extra data options, -x prints the part number, if found, and the max module size, if type 5
-is present. inxi does NOT attempt to guess at max module size based on what is installed, it only will
-correct a listed max module size if installed modules are > than listed max size. Usually part numbers,
-if present, are all you need to order a new stick.
-
--xx shows serial number, manufacturer (often empty, or just random alphanumeric identifiers, but sometimes
-they list the actual company name, which is helpful. It also shows, if type 5 data is present, single/double
-bank.
-
--xxx as usual shows largely useless data that may be of interest to soemone, like if ram type is synchronous,
-memory bus width data, and module voltage (type 5 data).
-
-This feature will never be reliable I am sad to say because the source data itself is random and much
-has been filled out, or not filled out, by engineering drones somewhere out there in the underpaid
-world. The ranges of errors are so wide that inxi just has to check what is possible, reasonable, unlikely,
-etc, to generate its numbers. In other words, this is NOT just parsing dmidecode output, that is the raw
-material only, sad to say.
-
-So this is it, for better or worse. All bug / issue reports with this MUST come with a full:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball, man page. Maintainers, this is the official release of -m
+feature.
+
+I have collected enough datasamples to allow for reasonably fine grained
+corrections, estimates, warnings about unreliable capacity now, and have fixed
+all major failures.
+
+Also, because this stuff is filled out by people somewhere, or not, some fields
+often are just empty, or contain the default values, ie, they are worthless.
+inxi shows N/A for those situations, it means there is really no actual data to
+show you.
+
+This feature, sadly, well never be totally reliable, because dmi data is frankly
+junk, especially dmi type 5 and 16, which is what is supposed to tell you total
+capacity of memory array, and the maximum module size (type 5). However, this
+data is totally random, often it is right, sometimes it is wrong. Sometimes type
+5 is right and type 16 is wrong, sometimes the other way. And since type 5 is
+only present in some systems, it's not reliable anyway.
+
+What is reliable and always right is the actually installed memory per device,
+ie, sticks. I have not seen any errors in that, so that seems to be actually
+coming from the system itself. type 5 / 16 sadly are clearly entered in manually
+by some poorly paid engineers out there in the world, and are often total
+fictions, either far too small, or far too big, or whatever.
+
+inxi will attempt to correct all clear logic errors, and whenever it changes the
+listed data from type 5/16, it notes either (est) or (check). (est) means it is
+a good guess, one I am comfortable making, (check) means it is either an
+unreliable guess, or that what the system is reporting is so unlikely that even
+though inxi is showing it, it doubts it could actually be true, or at least, it
+thinks you should check this yourself.
+
+-m has 3 extra data options, -x prints the part number, if found, and the max
+module size, if type 5 is present. inxi does NOT attempt to guess at max module
+size based on what is installed, it only will correct a listed max module size
+if installed modules are > than listed max size. Usually part numbers, if
+present, are all you need to order a new stick.
+
+-xx shows serial number, manufacturer (often empty, or just random alphanumeric
+identifiers, but sometimes they list the actual company name, which is helpful.
+It also shows, if type 5 data is present, single/double bank.
+
+-xxx as usual shows largely useless data that may be of interest to soemone,
+like if ram type is synchronous, memory bus width data, and module voltage (type
+5 data).
+
+This feature will never be reliable I am sad to say because the source data
+itself is random and much has been filled out, or not filled out, by engineering
+drones somewhere out there in the underpaid world. The ranges of errors are so
+wide that inxi just has to check what is possible, reasonable, unlikely, etc, to
+generate its numbers. In other words, this is NOT just parsing dmidecode output,
+that is the raw material only, sad to say.
+
+So this is it, for better or worse. All bug / issue reports with this MUST come
+with a full:
inxi -xx@14
hardware data upload, run as root.
-Also, much to my annoyance, this feature requires root, since /dev/mem needs root to be read, and I assume
-the dmi table, so that is a departure from normal inxi standards, as is the low quality input, and thus,
-output, data, though I can guarantee that what inxi tells you is in most cases on average more accurate than
-what dmidecode tells you, since dmidecode simply prints out what it finds in the dmi table, and nothing else,
-in whatever order it finds it, from what I can see, ie, you also cannot trust the order of dmidecode output.
-
-I had been hoping that /sys would start to contain memory data like it does mobo/system data, but it never
-happened so I finally decided to just do the ram thing, require dmidecode, require root/sudo, and that's
-that.
-
-There will be issue reports, you can help them by looking up the mobo stats/specs yourself and listing them
-in the issue, so I don't have to do it. I use the tool at crucial.com which is very accurate and also very
-complete in terms of all possible hardware out there.
-
-I would trust that tool before trusting the companies that have the least reliable data, like ASUS.
-
-Much thanks to everyone who is contributing datasets, and the distros, particularly siduction, that really
-were very helpful in this process, by finding more and more failure cases that helped me start to tighten
-the logic, and make it more and more robust. Special thanks to Mikaela, of #smxi irc.oftc.net, who came up
-with two systems that both required a full redo of the logic, and thus who helped a lot in this process.
-
------------------------------------
+Also, much to my annoyance, this feature requires root, since /dev/mem needs
+root to be read, and I assume the dmi table, so that is a departure from normal
+inxi standards, as is the low quality input, and thus, output, data, though I
+can guarantee that what inxi tells you is in most cases on average more accurate
+than what dmidecode tells you, since dmidecode simply prints out what it finds
+in the dmi table, and nothing else, in whatever order it finds it, from what I
+can see, ie, you also cannot trust the order of dmidecode output.
+
+I had been hoping that /sys would start to contain memory data like it does
+mobo/system data, but it never happened so I finally decided to just do the ram
+thing, require dmidecode, require root/sudo, and that's that.
+
+There will be issue reports, you can help them by looking up the mobo
+stats/specs yourself and listing them in the issue, so I don't have to do it. I
+use the tool at crucial.com which is very accurate and also very complete in
+terms of all possible hardware out there.
+
+I would trust that tool before trusting the companies that have the least
+reliable data, like ASUS.
+
+Much thanks to everyone who is contributing datasets, and the distros,
+particularly siduction, that really were very helpful in this process, by
+finding more and more failure cases that helped me start to tighten the logic,
+and make it more and more robust. Special thanks to Mikaela, of #smxi
+irc.oftc.net, who came up with two systems that both required a full redo of the
+logic, and thus who helped a lot in this process.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 18 Aug 2014 15:07:36 -0700
-=====================================================================================
+================================================================================
Version: 2.1.98
Patch: 01
Date: 2014-08-17
------------------------------------
-Changes:
------------------------------------
-New patch version, new tarball. Another error case dataset, wrong cap, wrong max mod
-size, derived mod size 2gb, listed cap 8, but 2 slots, ie, 2gb x 2 == 4. Made this
-retain the listed size, but adds (check) to it because either max mod size is wrong
-or cap is wrong.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New patch version, new tarball. Another error case dataset, wrong cap, wrong max
+mod size, derived mod size 2gb, listed cap 8, but 2 slots, ie, 2gb x 2 == 4.
+Made this retain the listed size, but adds (check) to it because either max mod
+size is wrong or cap is wrong.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 17 Aug 2014 19:40:46 -0700
-=====================================================================================
+================================================================================
Version: 2.1.98
Patch: 00
Date: 2014-08-17
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Fixed bad assumption, DMI type 0 is not always before other
-types, in at least one case, it is last, so can't use that as trigger to start loop.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Fixed bad assumption, DMI type 0 is not always before
+other types, in at least one case, it is last, so can't use that as trigger to
+start loop.
Now using: Table at .. which is always at start of dmi output.
-Also, changed size output per module to be in MB GB TB instead of all mB, since modules
-are sold by GB or MB, the data should show that as well. Also shortens output.
+Also, changed size output per module to be in MB GB TB instead of all mB, since
+modules are sold by GB or MB, the data should show that as well. Also shortens
+output.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 17 Aug 2014 12:01:38 -0700
-=====================================================================================
+================================================================================
Version: 2.1.97
Patch: 00
Date: 2014-08-16
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Another logic redo to handle a fringe case (dmidecode places
-type 17 in front of type 16), now each array is created as a multidimenstional, 2x array,
-and each device is a 3 dimensional array. This seems to clean up the problems with bad
-ordering of dmidecode data.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Another logic redo to handle a fringe case (dmidecode
+places type 17 in front of type 16), now each array is created as a
+multidimenstional, 2x array, and each device is a 3 dimensional array. This
+seems to clean up the problems with bad ordering of dmidecode data.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 16 Aug 2014 16:22:17 -0700
-=====================================================================================
+================================================================================
Version: 2.1.96
Patch: 02
Date: 2014-08-15
------------------------------------
-Changes:
------------------------------------
-forgot to remove debugger on switch
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Forgot to remove debugger on switch.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 15 Aug 2014 16:55:04 -0700
-=====================================================================================
+================================================================================
Version: 2.1.96
Patch: 01
Date: 2014-08-15
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
Small change, forgot to add -m to the debugger inxi output.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 15 Aug 2014 16:43:47 -0700
-=====================================================================================
+================================================================================
Version: 2.1.96
Patch: 00
Date: 2014-08-14
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man page. This version hopefully brings inxi closer to
-at least making good guesses when the data is bad for ram, and hopefully will not break
-too many cases where it was actually right but seemed wrong.
-
-Unfortunately, dmidecode data simply cannot be relied on, and is FAR inferior to the type
-of data inxi tries in general to present users, ie, taken directly from the system, and,
-ideally, more accurate than most other tools. But in this case, there is just no way to get
-the data truly accurate no matter how many hacks I add.
-
-But if you have bad data, then submit: inxi -xx@ 14 so I can take a look at the system,
-and see if I can modify the hacks to improve that data.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball, new man page. This version hopefully brings inxi
+closer to at least making good guesses when the data is bad for ram, and
+hopefully will not break too many cases where it was actually right but seemed
+wrong.
+
+Unfortunately, dmidecode data simply cannot be relied on, and is FAR inferior to
+the type of data inxi tries in general to present users, ie, taken directly from
+the system, and, ideally, more accurate than most other tools. But in this case,
+there is just no way to get the data truly accurate no matter how many hacks I
+add.
+
+But if you have bad data, then submit: inxi -xx@ 14 so I can take a look at the
+system, and see if I can modify the hacks to improve that data.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 14 Aug 2014 17:41:42 -0700
-=====================================================================================
+================================================================================
Version: 2.1.95
Patch: 04
Date: 2014-08-14
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New patch version, tarball. Fixed a few small oversights, more debugging added.
Will next try to handle the remaining corner cases if possible.
------------------------------------
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 14 Aug 2014 12:23:38 -0700
-=====================================================================================
+================================================================================
Version: 2.1.95
Patch: 01
Date: 2014-08-13
------------------------------------
-Changes:
------------------------------------
-patch version, trying to fix a small glitch with gawk wanting to change integers to strings.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Patch version, trying to fix a small glitch with gawk wanting to change integers
+to strings.
-forcing int() on relevant items.
+Forcing int() on relevant items.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 13 Aug 2014 21:28:46 -0700
-=====================================================================================
+================================================================================
Version: 2.1.95
Patch: 00
Date: 2014-08-13
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Attempting to handle bad extra data for max module size, sometimes
-it is too big, and sometimes too small. Changed data gathering to use arrays, then print/process
-the arrays once they are assembled.
-
-Now it will get rid of any max module size if it's greater than the calculated capacity, and it
-will generate an estimated capacity/max module size if they are clearly wrong because actual
-module sizes are greater than listed max size, or capacity is less than greatest module sizes times
-number of devices.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Attempting to handle bad extra data for max module
+size, sometimes it is too big, and sometimes too small. Changed data gathering
+to use arrays, then print/process the arrays once they are assembled.
+
+Now it will get rid of any max module size if it's greater than the calculated
+capacity, and it will generate an estimated capacity/max module size if they are
+clearly wrong because actual module sizes are greater than listed max size, or
+capacity is less than greatest module sizes times number of devices.
Not perfect, but it never is, this covers more cases now correctly than before.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 13 Aug 2014 20:42:00 -0700
-=====================================================================================
+================================================================================
Version: 2.1.94
Patch: 00
Date: 2014-08-13
------------------------------------
-Changes:
------------------------------------
-New version, new man page, new tarball. Realized that I can on some systems also add
-maximum supported module size, and module voltage. Most systems do not have this data,
-but some do. It's Type 5 item in dmidecode.
-
-Getting the type 6 data however is too hard, and even using type 5 assumes that the
-system only has one physical memory array, but that's fine given how few systems
-probably will have this information in the first place.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new man page, new tarball. Realized that I can on some systems also
+add maximum supported module size, and module voltage. Most systems do not have
+this data, but some do. It's Type 5 item in dmidecode.
+
+Getting the type 6 data however is too hard, and even using type 5 assumes that
+the system only has one physical memory array, but that's fine given how few
+systems probably will have this information in the first place.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 13 Aug 2014 14:03:03 -0700
-=====================================================================================
+================================================================================
Version: 2.1.93
Patch: 00
Date: 2014-08-13
------------------------------------
-Changes:
------------------------------------
-New version, new man page. Fixed man page errors, improved man page explanations of -m
-features. Changed output syntax to be more consistent, now each main array line starts with:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new man page. Fixed man page errors, improved man page explanations
+of -m features. Changed output syntax to be more consistent, now each main array
+line starts with:
Array-X capacity: (where X is an integer, counting from 1)
and each device line starts with:
-Device-X: (where X is an integer incremented by 1 for each device, and starting at 1
-for each array. I have no data sets that contain > 1 physical memory array, if one appears,
-I may need to patch the output to link the array handles with the device handles explicitly.
-Made memory bus width output more clear, and added in a hack to correct dmidecode output errors,
-sometimes total width > data width, and sometimes data width is > total width, so using always
-greatest value for total if not equal to other width.
+Device-X: (where X is an integer incremented by 1 for each device, and starting
+at 1 for each array. I have no data sets that contain > 1 physical memory array,
+if one appears, I may need to patch the output to link the array handles with
+the device handles explicitly.
+
+Made memory bus width output more clear, and added in a hack to correct
+dmidecode output errors, sometimes total width > data width, and sometimes data
+width is > total width, so using always greatest value for total if not equal to
+other width.
-I think this will be close to it barring any user feedback or bugs, if nothing comes to
-mind within a few days, I'll move the number to the new major version, 2.2.0
+I think this will be close to it barring any user feedback or bugs, if nothing
+comes to mind within a few days, I'll move the number to the new major version,
+2.2.0
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 13 Aug 2014 12:12:23 -0700
-=====================================================================================
+================================================================================
Version: 2.1.92
Patch: 00
Date: 2014-08-12
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This is closer to final release. Removed Bank/Slot separate
-items and am now just generating one: Locator item, usually from Slot/DIMM locator info,
-but sometimes from Bank Locator info when it is more reliable based on my data samples.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Updated help menu, updated man page, now shows working -x -xx -xxx extra data. This may
-change slightly over time.
+New version, new tarball. This is closer to final release. Removed Bank/Slot
+separate items and am now just generating one: Locator item, usually from
+Slot/DIMM locator info, but sometimes from Bank Locator info when it is more
+reliable based on my data samples.
-Also removed speed output when No Module Installed is returned for device size. This
-also wills switch off width if both total/data are empty.
+Updated help menu, updated man page, now shows working -x -xx -xxx extra data.
+This may change slightly over time.
-This is much closer now to live 2.2.0, but I'll leave a few more tests before putting
-it at 2.2.0.
+Also removed speed output when No Module Installed is returned for device size.
+This also wills switch off width if both total/data are empty.
------------------------------------
+This is much closer now to live 2.2.0, but I'll leave a few more tests before
+putting it at 2.2.0.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 12 Aug 2014 20:16:04 -0700
-=====================================================================================
+================================================================================
Version: 2.1.91
Patch: 00
Date: 2014-08-12
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This is a transitional version, most -x/-xx/-xxx data is now
-working, but help/man does not have that yet, until I finalize the order.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This is a transitional version, most -x/-xx/-xxx data
+is now working, but help/man does not have that yet, until I finalize the order.
-Fixed dmidecode issues, showing extra data types for -m, added line length handling
-so -m is properly integrated with rest of inxi re max line lengths.
+Fixed dmidecode issues, showing extra data types for -m, added line length
+handling so -m is properly integrated with rest of inxi re max line lengths.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 12 Aug 2014 18:11:29 -0700
-=====================================================================================
+================================================================================
Version: 2.1.90
Patch: 00
Date: 2014-08-11
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man page. Finally, after all these years, initial memory/ram
-support. This feature requires dmidecode, and usually that needs to be run as root.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball, new man page. Finally, after all these years, initial
+memory/ram support. This feature requires dmidecode, and usually that needs to
+be run as root.
-Significantly improved dmidecode error handling and output, and have as 2.1.90 testing/initial
-release basic ram data.
+Significantly improved dmidecode error handling and output, and have as 2.1.90
+testing/initial release basic ram data.
-In subsequent releases, extra info for -x and -xx and -xxx will be added as well to the output.
+In subsequent releases, extra info for -x and -xx and -xxx will be added as well
+to the output.
-For those who want to jump on board early for ram data, update your repos, for those who want to
-wait for the full featured version, with -x type data, wait for 2.2.0
+For those who want to jump on board early for ram data, update your repos, for
+those who want to wait for the full featured version, with -x type data, wait
+for 2.2.0
And that's that.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 11 Aug 2014 22:23:18 -0700
-=====================================================================================
+================================================================================
Version: 2.1.29
Patch: 00
Date: 2014-08-08
------------------------------------
-Changes:
------------------------------------
-No version change, this only will impact ancient systems, cleans up a data error message
-and restores N/A to IF id in networking. No functional change, and won't be seen on any
-non ancient systems.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+No version change, this only will impact ancient systems, cleans up a data error
+message and restores N/A to IF id in networking. No functional change, and won't
+be seen on any non ancient systems.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 11 Aug 2014 16:10:03 -0700
-=====================================================================================
+================================================================================
Version: 2.1.29
Patch: 00
Date: 2014-08-08
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Big update/fix to -n/-i/-N. Now supports infiniband devices, which
-have the odd feature in our test data of having > 1 IF id, like ib0 ib1 per pcibusid.
-
-Added support for virtual nics as well. This required refactoring the networking functions
-significantly, so hopefully nothing breaks for existing systems. It should in theory be more
-robust now than it was before, with more accurate output, particularly with multiple port
-devices, like two port nics etc.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Big update/fix to -n/-i/-N. Now supports infiniband
+devices, which have the odd feature in our test data of having > 1 IF id, like
+ib0 ib1 per pcibusid.
+
+Added support for virtual nics as well. This required refactoring the networking
+functions significantly, so hopefully nothing breaks for existing systems. It
+should in theory be more robust now than it was before, with more accurate
+output, particularly with multiple port devices, like two port nics etc.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 08 Aug 2014 10:17:52 -0700
-=====================================================================================
+================================================================================
Version: 2.1.28
Patch: 00
Date: 2014-05-05
------------------------------------
-Changes:
------------------------------------
-new version, new tarball. Adding tentative desktop id for LXQt, but I don't think
-that this method will be super long lived, I expect LXDE to change how it shows itself
-to the system when the gtk variant goes away. Good for lxde by the way in dumping gtk.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Adding tentative desktop id for LXQt, but I don't
+think that this method will be super long lived, I expect LXDE to change how it
+shows itself to the system when the gtk variant goes away. Good for lxde by the
+way in dumping gtk.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 05 May 2014 12:11:27 -0700
-=====================================================================================
+================================================================================
Version: 2.1.27
Patch: 00
Date: 2014-05-02
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Should be almost no changes for linux platforms, though I
-added in an abstracted kernel_compiler method, not just gcc, that may work on freebsd,
-and in the future, it may also work if distros or kernel people start using either
-clang or LLVM-GCC or LLVM for compiling linux kernels. I'd need some data sets to
-show that however before adding that full linux kernel support, but the framework
-is now there.
-
-That continues the abstraction of certain features, like kernel compiler, init system,
-display server. Display server still needs full data sets from mir/wayland, at least
-wayland, and the bsd display servers as well, I have no idea how to get that data
-at this point, but the starting framework is present anyway for that time I get
-those datasets.
-
-Almost all these changes are for darwin osx, and that is about all I will do for that
-junky broken platform, they have no tools, they have no discipline when it comes to
-following unix like conventions, they even use spaces in program names, like windows.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Should be almost no changes for linux platforms,
+though I added in an abstracted kernel_compiler method, not just gcc, that may
+work on freeBSD, and in the future, it may also work if distros or kernel people
+start using either clang or LLVM-GCC or LLVM for compiling linux kernels. I'd
+need some data sets to show that however before adding that full linux kernel
+support, but the framework is now there.
+
+That continues the abstraction of certain features, like kernel compiler, init
+system, display server. Display server still needs full data sets from
+mir/wayland, at least wayland, and the BSD display servers as well, I have no
+idea how to get that data at this point, but the starting framework is present
+anyway for that time I get those datasets.
+
+Almost all these changes are for darwin osx, and that is about all I will do for
+that junky broken platform, they have no tools, they have no discipline when it
+comes to following unix like conventions, they even use spaces in program names,
+like windows.
Given it has no native lspci or pciconf tool that I am aware of, or dmesg.boot,
-there's little point in putting more time into it. dmidecode does not run on darwin,
-so there's nothing to learn there either, you can get a silly 3rd party program to
-generate a dmidecode.bin data file that dmidecode can then read, but since that
-requires not one, but two third party programs be installed, that's not going to
-happen.
+there's little point in putting more time into it. dmidecode does not run on
+darwin, so there's nothing to learn there either, you can get a silly 3rd party
+program to generate a dmidecode.bin data file that dmidecode can then read, but
+since that requires not one, but two third party programs be installed, that's
+not going to happen.
Next time an osx user calls this system 'unix' I will laugh.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 02 May 2014 12:44:38 -0700
-=====================================================================================
+================================================================================
Version: 2.1.26
Patch: 00
Date: 2014-05-01
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Maintainer: this is only for bsd darwin (aka osx, it's an
-experiment, just to get it running, so you can all ignore this release.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Maintainer: this is only for BSD darwin (aka osx, it's
+an experiment, just to get it running, so you can all ignore this release.
-Added in darwin cpu, init, distro version support, and updated inxi to support
+Added in darwin cpu, init, distro version support, and updated inxi to support
darwin/osx without exiting.
No linux changes.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 01 May 2014 13:32:21 -0700
-=====================================================================================
+================================================================================
Version: 2.1.25
Patch: 00
Date: 2014-04-28
------------------------------------
-Changes:
------------------------------------
-no version change, new tarball. On consideration, I'm not using temp3, that is simply
-not reliable enough and leads I think to more false readings than right ones.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+No version change, new tarball. On consideration, I'm not using temp3, that is
+simply not reliable enough and leads I think to more false readings than right
+ones.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 28 Apr 2014 14:47:41 -0700
-=====================================================================================
+================================================================================
Version: 2.1.25
Patch: 00
Date: 2014-04-28
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This fixes a possible bug with using --total to calculate disk
-used percentage, there are too many possible remote file systems to safely exclude, so
-sticking with using the test that partition is /dev mounted.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Howeve, did add excludes of nfs/smbfs types, as well as future bsd excludes of those.
+New version, new tarball. This fixes a possible bug with using --total to
+calculate disk used percentage, there are too many possible remote file systems
+to safely exclude, so sticking with using the test that partition is /dev
+mounted.
------------------------------------
+Howeve, did add excludes of nfs/smbfs types, as well as future BSD excludes of
+those.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 28 Apr 2014 14:23:39 -0700
-=====================================================================================
+================================================================================
Version: 2.1.24
Patch: 00
Date: 2014-04-28
------------------------------------
-Changes:
------------------------------------
-Quick fix, new tarball, no new version. This fixes a -D size used error, if nfs, nfs4, smbfs
-are mounted, inxi included those in the disk space used, creating insane used errors.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Quick fix, new tarball, no new version. This fixes a -D size used error, if nfs,
+nfs4, smbfs are mounted, inxi included those in the disk space used, creating
+insane used errors.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 28 Apr 2014 14:12:50 -0700
-=====================================================================================
+================================================================================
Version: 2.1.24
Patch: 00
Date: 2014-04-28
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This is an attempt to make -s accurate more of the time,
-particularly with fringe or broken sensors outputs. See inxi issue 58 for details.
-http://code.google.com/p/inxi/issues/detail?id=58
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Added temp3, and an override to capture cases where temp3 is the actual cpu temp.
+New version, new tarball. This is an attempt to make -s accurate more of the
+time, particularly with fringe or broken sensors outputs. See inxi issue 58 for
+details. http://code.google.com/p/inxi/issues/detail?id=58
-Added PECI overrides for cases like msi/asus mobos have defective CPUTIN return data.
+Added temp3, and an override to capture cases where temp3 is the actual cpu
+temp.
+
+Added PECI overrides for cases like msi/asus mobos have defective CPUTIN return
+data.
Added core0 overrides as well, for cases where the temp returned is too low.
-It is absolutely 100% guaranteed that these changes will break some outputs that were
-working, but it's also certain that I believe that more wrong outputs will be corrected.
+It is absolutely 100% guaranteed that these changes will break some outputs that
+were working, but it's also certain that I believe that more wrong outputs will
+be corrected.
-With sensors, really the only way you can get reliable sensors is to use the lm-sensors
-config files for your motherboard, then set: CPU: temp and MB: temp explicitly.
+With sensors, really the only way you can get reliable sensors is to use the
+lm-sensors config files for your motherboard, then set: CPU: temp and MB: temp
+explicitly.
inxi will always use CPU: or MB: to override anything found.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 28 Apr 2014 13:17:53 -0700
-=====================================================================================
+================================================================================
Version: 2.1.23
Patch: 00
Date: 2014-04-27
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man. Found a pesky bug with false disk used results.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-It turns out I'd neglected to include /dev/disk partitions, oops, in the df data.
+New version, new tarball, new man. Found a pesky bug with false disk used
+results.
+
+It turns out I'd neglected to include /dev/disk partitions, oops, in the df
+data.
Since this is a long time bug, it warrants a new release even though I just did
2.1.22.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 27 Apr 2014 15:55:20 -0700
-=====================================================================================
+================================================================================
Version: 2.1.22
Patch: 00
Date: 2014-04-27
------------------------------------
-Changes:
------------------------------------
-Quick update to -D, now inxi uses the total partition swap space to calculate the
-disk used percentage as well. Since swap space is not available as disk space, it
-makes sense to me to count it as used. -P/-p show the percent of swap used as well.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Quick update to -D, now inxi uses the total partition swap space to calculate
+the disk used percentage as well. Since swap space is not available as disk
+space, it makes sense to me to count it as used. -P/-p show the percent of swap
+used as well.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 27 Apr 2014 14:41:06 -0700
-=====================================================================================
+================================================================================
Version: 2.1.22
Patch: 00
Date: 2014-04-27
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. A bug fix for btrfs, which does not internally use /dev/sdx[number]
-to identify a partition, but rather the basic /dev/sdc for example.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. A bug fix for btrfs, which does not internally use
+/dev/sdx[number] to identify a partition, but rather the basic /dev/sdc for
+example.
This made -D show wrong disk used percentage.
-Also, I added --total for df that have that supported, there is however an oddity which you
-can see here:
+Also, I added --total for df that have that supported, there is however an
+oddity which you can see here:
-df --total -P -T --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs \
---exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs \
---exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs | \
+df --total -P -T --exclude-type=aufs --exclude-type=devfs \
+--exclude-type=devtmpfs --exclude-type=fdescfs --exclude-type=iso9660 \
+--exclude-type=linprocfs --exclude-type=procfs --exclude-type=squashfs \
+--exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs | \
awk 'BEGIN {total=0} !/total/ {total = total + $4 }END {print total}'
result:
614562236
-df --total -P -T --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs \
---exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs \
---exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs | \
+df --total -P -T --exclude-type=aufs --exclude-type=devfs \
+--exclude-type=devtmpfs --exclude-type=fdescfs --exclude-type=iso9660 \
+--exclude-type=linprocfs --exclude-type=procfs --exclude-type=squashfs \
+--exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs | \
awk 'BEGIN {total=0} /^total/ {total = total + $4 }END {print total}'
result:
614562228
df -P -T --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs \
- --exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs \
- --exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs | \
- awk 'BEGIN {total=0} {total = total + $4 }END {print total}'
+ --exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs \
+ --exclude-type=procfs --exclude-type=squashfs --exclude-type=sysfs \
+ --exclude-type=tmpfs --exclude-type=unionfs | awk 'BEGIN {total=0} \
+ {total = total + $4 }END {print total}'
result:
614562236
- In my tests, using --total gives a greater disk user percentage than adding the results
- up manually, as inxi did before, and still does for systems without --total for df.
+ In my tests, using --total gives a greater disk user percentage than adding the
+results up manually, as inxi did before, and still does for systems without
+--total for df.
- df --total -P -T --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs \
- --exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs \
- --exclude-type=procfs --exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs \
- --exclude-type=unionfs
+ df --total -P -T --exclude-type=aufs --exclude-type=devfs \
+ --exclude-type=devtmpfs --exclude-type=fdescfs --exclude-type=iso9660 \
+ --exclude-type=linprocfs --exclude-type=procfs --exclude-type=squashfs \
+ --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs
-Filesystem Type 1024-blocks Used Available Capacity Mounted on
-/dev/disk/by-label/root-data ext3 12479556 12015624 335816 98% /
-/dev/sdc9 ext3 20410156 18013360 1979432 91% /home
-/dev/sdc7 ext3 4904448 3785460 1016672 79% /media/sdb2
-/dev/sdc5 ext3 30382896 27467220 2295720 93% /var/www/m
-/dev/sdc8 ext3 61294356 41849300 18196972 70% /home/me/1
-/dev/sdb1 ext3 307532728 285159432 20810456 94% /home/me/2
-/dev/sdd1 ext3 26789720 18153076 7542620 71% /home/me/3
-/dev/sdd2 ext3 213310776 206932912 2040960 100% /home/me/4
-/dev/sda7 ext3 10138204 1185772 8434348 13% /home/me/5
-total - 687242840 614562156 62652996 91% -
-
-Strange, no? the data is in blocks, and it should of course in theory add up to exactly the
-same thing. However, because --total lets df do the math, I'm going to use that for now,
-unless someone can show it's not good.
-
-inxi still falls back for bsds and older df to the standard method.
------------------------------------
+Filesystem Type 1024-blocks Used Available Capacity Mounted on
+/dev/disk/by-label/root-data\
+ ext3 12479556 12015624 335816 98% /
+/dev/sdc9 ext3 20410156 18013360 1979432 91% /home
+/dev/sdc7 ext3 4904448 3785460 1016672 79% /media/sdb2
+/dev/sdc5 ext3 30382896 27467220 2295720 93% /var/www/m
+/dev/sdc8 ext3 61294356 41849300 18196972 70% /home/me/1
+/dev/sdb1 ext3 307532728 285159432 20810456 94% /home/me/2
+/dev/sdd1 ext3 26789720 18153076 7542620 71% /home/me/3
+/dev/sdd2 ext3 213310776 206932912 2040960 100% /home/me/4
+/dev/sda7 ext3 10138204 1185772 8434348 13% /home/me/5
+total - 687242840 614562156 62652996 91% -
+
+Strange, no? the data is in blocks, and it should of course in theory add up to
+exactly the same thing. However, because --total lets df do the math, I'm going
+to use that for now, unless someone can show it's not good.
+
+inxi still falls back for BSDs and older df to the standard method.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 27 Apr 2014 12:49:06 -0700
-=====================================================================================
+================================================================================
Version: 2.1.21
Patch: 00
Date: 2014-04-24
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New tarball, small update, added hopefully firewire support to drive type id.
That's searching for ieee1394- hopefully that will do it.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 24 Apr 2014 13:22:51 -0700
-=====================================================================================
+================================================================================
Version: 2.1.21
Patch: 00
Date: 2014-04-24
------------------------------------
-Changes:
------------------------------------
-New version, tarball. This fixes one small oversight, placing USB in front of ID-[x]
-of disk drive lists. Was showing USB ID-1: /dev/sde now shows: ID-1: USB /dev/sde
-that is more intuitive and keeps the columns in alignment more or less, easier
-to read.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. This fixes one small oversight, placing USB in front of
+ID-[x] of disk drive lists. Was showing USB ID-1: /dev/sde now shows: ID-1: USB
+/dev/sde that is more intuitive and keeps the columns in alignment more or less,
+easier to read.
Second, fixes a bug with some file systems / usb drives
where they do not use usb- in the /dev/disk/by-id line but only wwn-
-https://access.redhat.com/site/documentation/en
--US/Red_Hat_Enterprise_Linux/5/html/Online_Storage_Reconfiguration_Guide/persistent_naming.html
+
+https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/5/\
+html/Online_Storage_Reconfiguration_Guide/persistent_naming.html
+
explains it somewhat.
-the fix is adding a second if null test of the device /dev/sdx in by-path, that seems
-to fix the issue. by-path does have the usb- item, though it does not have the name
-so it's not as reliable in absolute terms, but it's fine as a second step fallback
-option.
+the fix is adding a second if null test of the device /dev/sdx in by-path, that
+seems to fix the issue. by-path does have the usb- item, though it does not have
+the name so it's not as reliable in absolute terms, but it's fine as a second
+step fallback option.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 24 Apr 2014 11:47:08 -0700
-=====================================================================================
+================================================================================
Version: 2.1.20
Patch: 00
Date: 2014-04-08
------------------------------------
-Changes:
------------------------------------
-While this release has some new features, they are all intended for development use
-for the next major feature, -m / memory, so there is no particular reason to package
-this release. There is a new development option, -! 33, which lets me override /sys
-data use for -M, which is useful to debug dmidecode output for -m and other features.
-
-No new version, new man. There may be a few more of these releases, but functionally
-there is no particular reason to make a new package if you are a maintainer, so there
-is no new version number. This release is a preparation for some branches/one/inxi
-tests that will be run in the future.
-
-The man/help document -! 33 just to have it there, but it should make no difference
-to anyone but me at this stage.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+While this release has some new features, they are all intended for development
+use for the next major feature, -m / memory, so there is no particular reason to
+package this release. There is a new development option, -! 33, which lets me
+override /sys data use for -M, which is useful to debug dmidecode output for -m
+and other features.
+
+No new version, new man. There may be a few more of these releases, but
+functionally there is no particular reason to make a new package if you are a
+maintainer, so there is no new version number. This release is a preparation for
+some branches/one/inxi tests that will be run in the future.
+
+The man/help document -! 33 just to have it there, but it should make no
+difference to anyone but me at this stage.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 14 Apr 2014 13:31:24 -0700
-=====================================================================================
+================================================================================
Version: 2.1.20
Patch: 00
Date: 2014-04-08
------------------------------------
-Changes:
------------------------------------
-A few fixes to 2.1.20, bmips broke in some cases, that's fixed now. Also changed the
-way to handle bad ARM data, when bogomips are too low, < 50, we try to get the data
-from /sys, but now this runs on all the cores, so it may work as well on the multicore
-arm if the /proc/cpuinfo has bogomip that is too low and no cpu frequency.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+A few fixes to 2.1.20, bmips broke in some cases, that's fixed now. Also changed
+the way to handle bad ARM data, when bogomips are too low, < 50, we try to get
+the data from /sys, but now this runs on all the cores, so it may work as well
+on the multicore arm if the /proc/cpuinfo has bogomip that is too low and no cpu
+frequency.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 09 Apr 2014 00:09:49 -0700
-=====================================================================================
+================================================================================
Version: 2.1.20
Patch: 00
Date: 2014-04-08
------------------------------------
-Changes:
------------------------------------
-New version, tarball, ARM cpu /proc/cpuinfo has broken the bogomips output, since this
-is an upstream bug, I'm adding in a quick hack that will work maybe for single core
-ARM cpus, but NOT for multicores that have the same issue.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball, ARM cpu /proc/cpuinfo has broken the bogomips output,
+since this is an upstream bug, I'm adding in a quick hack that will work maybe
+for single core ARM cpus, but NOT for multicores that have the same issue.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 08 Apr 2014 17:15:41 -0700
-=====================================================================================
+================================================================================
Version: 2.1.19
Patch: 00
Date: 2014-04-06
------------------------------------
-Changes:
------------------------------------
-New version, tarball, correction of loop counts for -p/-P ID-<number>, this requires
-a third counter to get all the stuff right. Sorry about the extra release, that's life.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball, correction of loop counts for -p/-P ID-<number>, this
+requires a third counter to get all the stuff right. Sorry about the extra
+release, that's life.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 06 Apr 2014 14:33:46 -0700
-=====================================================================================
+================================================================================
Version: 2.1.18
Patch: 00
Date: 2014-04-04
------------------------------------
-Changes:
------------------------------------
-New version/tarball. This completes, I think, the line wrap update. -o is now handled,
-unmounted drives.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version/tarball. This completes, I think, the line wrap update. -o is now
+handled, unmounted drives.
-IMPORTANT: some distros use inxi for detecting partitions, the syntax on the following
-have changed slightly:
+IMPORTANT: some distros use inxi for detecting partitions, the syntax on the
+following have changed slightly:
HDD: per drive changes from: 1: id: to ID-1:
Partitions: per partition changes from ID: to ID-1:
Unmounted partitions: per unmounted changes from ID: to ID-1
-You see the pattern, they are all the same now, and they are all numbered. I think this
-is easier to read when scanning long lines of drives/partitions, or even short ones.
+You see the pattern, they are all the same now, and they are all numbered. I
+think this is easier to read when scanning long lines of drives/partitions, or
+even short ones.
-Also fixed a long standing oddity, not a bug, but for some weird reason, -p did not
-include the location, like /dev/sda1, unless -l or -u were used. That makes no sense
-so I have moved the dev/remote location output to standard -p/-P
+Also fixed a long standing oddity, not a bug, but for some weird reason, -p did
+not include the location, like /dev/sda1, unless -l or -u were used. That makes
+no sense so I have moved the dev/remote location output to standard -p/-P
-Except for bug fixes, this completes the overally line wrap update, all lines wrap,
-you can set widths with -y now, and the old issue of not fitting nicely into 80 column
-wide widths is solved. Note that in some areas, p/P for example, at times if the mount
-point or remote location is very long the line may still wrap, but making this perfect
-is too convoluted so I'm calling it good enough now, all lines are handled reasonably well,
-certainly radically better than before 2.1.0.
+Except for bug fixes, this completes the overally line wrap update, all lines
+wrap, you can set widths with -y now, and the old issue of not fitting nicely
+into 80 column wide widths is solved. Note that in some areas, p/P for example,
+at times if the mount point or remote location is very long the line may still
+wrap, but making this perfect is too convoluted so I'm calling it good enough
+now, all lines are handled reasonably well, certainly radically better than
+before 2.1.0.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 04 Apr 2014 11:08:25 -0700
-=====================================================================================
+================================================================================
Version: 2.1.17
Patch: 00
Date: 2014-04-03
------------------------------------
-Changes:
------------------------------------
-New version, new man page, new tarball. Added -y [integer >= 80] option. This allows for absolute override
-of width settings. This overrides any dynamically detected widths, as well as the globals:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new man page, new tarball. Added -y [integer >= 80] option. This
+allows for absolute override of width settings. This overrides any dynamically
+detected widths, as well as the globals:
+
COLS_MAX_CONSOLE='115'
COLS_MAX_IRC='105'
-Now that inxi widths are largely dynamic in terminal, with a few lingering exceptions, it made sense
-to also allow for overrides of this. This is useful in cases where for example you want to output
-inxi to text file or for other purposes, or if you just want to test the widths, as in my case.
--y cannot be used with --recommends, but otherwise it works fine, with --help/-c 94-99 you have to
-put -y first in the list of options.
+Now that inxi widths are largely dynamic in terminal, with a few lingering
+exceptions, it made sense to also allow for overrides of this. This is useful in
+cases where for example you want to output inxi to text file or for other
+purposes, or if you just want to test the widths, as in my case.
-Example: inxi -v7 -y150 > inxi.txt will ignore the terminal settings and output the lines at basically
-max length.
+-y cannot be used with --recommends, but otherwise it works fine, with --help/-c
+94-99 you have to put -y first in the list of options.
------------------------------------
+Example: inxi -v7 -y150 > inxi.txt will ignore the terminal settings and output
+the lines at basically max length.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 03 Apr 2014 10:41:07 -0700
-=====================================================================================
+================================================================================
Version: 2.1.16
Patch: 00
Date: 2014-04-02
------------------------------------
-Changes:
------------------------------------
-New version, tarball. This fix only impacts bsd sed, but it fixes the line length failure
-issue because bsd sed doesn't work with \x1b, but it does when you do:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. This fix only impacts BSD sed, but it fixes the line
+length failure issue because BSD sed doesn't work with \x1b, but it does when
+you do:
+
ESC=$(echo | tr '\n' '\033' )
+
I found this trick on:
-http://unix.stackexchange.com/questions/42321/how-can-i-instruct-bsd-sed-to-interpret-escape-sequences-like-n-and-t
+http://unix.stackexchange.com/questions/42321/how-can-i-instruct-BSD-sed-to-\
+interpret-escape-sequences-like-n-and-t
-No other changes. Non bsd users, you can ignore this.
+No other changes. Non BSD users, you can ignore this.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 02 Apr 2014 21:24:52 -0700
-=====================================================================================
+================================================================================
Version: 2.1.15
Patch: 00
Date: 2014-04-01
------------------------------------
-Changes:
------------------------------------
-new version/tarball. This corrects some subtle issues with line wraps:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version/tarball. This corrects some subtle issues with line wraps:
-Audio -A - now wrap is fully dynamic down to 80 characters, and also the expansion of ALSA
-to Advanced Linux Sound System only happens if that fits in the display width.
+Audio -A - now wrap is fully dynamic down to 80 characters, and also the
+expansion of ALSA to Advanced Linux Sound System only happens if that fits in
+the display width.
-N/-n/-i - Most networking/ip address stuff wraps now.
@@ -6551,1279 +16112,1435 @@ to Advanced Linux Sound System only happens if that fits in the display width.
This more or less completes the line wrap redo.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 01 Apr 2014 12:39:44 -0700
-=====================================================================================
+================================================================================
Version: 2.1.14
Patch: 00
Date: 2014-03-31
------------------------------------
-Changes:
------------------------------------
-Forgot, added slitaz-release to distros derived. that's as slackware derived one.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+Forgot, added slitaz-release to distros derived. that's as slackware derived
+one.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 31 Mar 2014 18:10:02 -0700
-=====================================================================================
+================================================================================
Version: 2.1.14
Patch: 00
Date: 2014-03-31
------------------------------------
-Changes:
------------------------------------
-new version/tarball. Tiny fix in debugger, it turns out that in some systems, the command:
-strings --version used in the debugger results in a hang, which you can duplicate with:
-strings
-alone, without any argument or info, that will hang too, so I assume if the system doesn't
-have the --version parameter, strings ignores that, and basically just does what it would do
-with no option, hang.
-
-Thanks for user ypharis persistence in tracking down this issue. So far only appeared on slackware
-based distros, but since the debugger should 'just work', removing the version test.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version/tarball. Tiny fix in debugger, it turns out that in some systems,
+the command: strings --version used in the debugger results in a hang, which you
+can duplicate with: "strings" alone, without any argument or info, that will
+hang too, so I assume if the system doesn't have the --version parameter,
+strings ignores that, and basically just does what it would do with no option,
+hang.
+
+Thanks for user ypharis persistence in tracking down this issue. So far only
+appeared on slackware based distros, but since the debugger should 'just work',
+removing the version test.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 31 Mar 2014 17:49:48 -0700
-=====================================================================================
+================================================================================
Version: 2.1.13
Patch: 00
Date: 2014-03-30
------------------------------------
-Changes:
------------------------------------
-New version, only relevant to Porteus distro, a slackware derived distro, should now id it
-correctly. No other changes.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, only relevant to Porteus distro, a slackware derived distro, should
+now id it correctly. No other changes.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 30 Mar 2014 11:54:12 -0700
-=====================================================================================
+================================================================================
Version: 2.1.12
Patch: 00
Date: 2014-03-27
------------------------------------
-Changes:
------------------------------------
-new version, fixed zfs raid failure to report raid devices on some systems. Added wrapping
-for -D disk option. Note that -d is not correctly wrapping because the lines are too long with
-extra data, but it's ok for now.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, fixed zfs raid failure to report raid devices on some systems.
+Added wrapping for -D disk option. Note that -d is not correctly wrapping
+because the lines are too long with extra data, but it's ok for now.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 27 Mar 2014 15:33:33 -0700
-=====================================================================================
+================================================================================
Version: 2.1.11
Patch: 00
Date: 2014-03-26
------------------------------------
-Changes:
------------------------------------
-Ignore change 2.1.12, the speed data was too inconsistent, using >>> since it's cleaner
-and seems to be faster on some cpus, slower on others.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Ignore change 2.1.12, the speed data was too inconsistent, using >>> since it's
+cleaner and seems to be faster on some cpus, slower on others.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 26 Mar 2014 15:28:08 -0700
-=====================================================================================
+================================================================================
Version: 2.1.12
Patch: 00
Date: 2014-03-26
------------------------------------
-Changes:
------------------------------------
-new version: this is only an optimization release, testing some slightly more efficient
-methods:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version: this is only an optimization release, testing some slightly more
+efficient methods:
something <<< $variable is signficantly slower than: echo $variable | something
so I replaced almost all instances of <<< with echo ...|
-I've seen speed differences of up to 10% but it's not consistent, so this is just
-something to boost performance slightly on older systems I'd guess.
+I've seen speed differences of up to 10% but it's not consistent, so this is
+just something to boost performance slightly on older systems I'd guess.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 26 Mar 2014 14:54:39 -0700
-=====================================================================================
+================================================================================
Version: 2.1.11
Patch: 00
Date: 2014-03-26
------------------------------------
-Changes:
------------------------------------
-New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes were
-not set to null, which results in some cases with red output, along with turning
-terminal/console font color red.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes
+were not set to null, which results in some cases with red output, along with
+turning terminal/console font color red.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 26 Mar 2014 12:44:53 -0700
-=====================================================================================
+================================================================================
Version: 2.1.10
Patch: 00
Date: 2014-03-25
------------------------------------
-Changes:
------------------------------------
-New version; added supybot/limnoria/gribble support. This only works when the supybot
-'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are
-not detectable.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version; added supybot/limnoria/gribble support. This only works when the
+supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and
+supybot etc are not detectable.
Fine tuned some error message lengths so they fit into 80 columns or so.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 25 Mar 2014 13:55:13 -0700
-=====================================================================================
+================================================================================
Version: 2.1.9
Patch: 00
Date: 2014-03-24
------------------------------------
-Changes:
------------------------------------
-New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines
-will still be too long, but not as many.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though
+some lines will still be too long, but not as many.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 24 Mar 2014 18:42:06 -0700
-=====================================================================================
+================================================================================
Version: 2.1.8
Patch: 00
Date: 2014-03-24
------------------------------------
-Changes:
------------------------------------
-New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds,
-for systems with a lot of them, that will clean up the output.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu
+cores speeds, for systems with a lot of them, that will clean up the output.
Added dynamic wrapping to --recommends and -c 94-99.
-These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but
-those will noly really show with full output and it takes a while to get this stuff stable
-so maybe some other time, but it's ok for now.
+These are the main things, there's a few smaller issues with -xx output on
+-N/-n/-i but those will noly really show with full output and it takes a while
+to get this stuff stable so maybe some other time, but it's ok for now.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 24 Mar 2014 16:58:33 -0700
-=====================================================================================
+================================================================================
Version: 2.1.7
Patch: 00
Date: 2014-03-18
------------------------------------
-Changes:
------------------------------------
-new version, attempt 2 at detecting all possible syntaxes for cards. Now using
-the bus id itself to determine if the
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, attempt 2 at detecting all possible syntaxes for cards. Now using
+the bus id itself to determine if the:
VGA compatible controller
3D controller
Display Controller
refer to separate chips or the same one.
-Bus id gives the data needed, because the video chip, the real card, that is,
-is on for example 00:05.0 the trailing .0 is the key, that's the actual card.
+Bus id gives the data needed, because the video chip, the real card, that is, is
+on for example 00:05.0 the trailing .0 is the key, that's the actual card.
The audio or display controller for the same card would be for example: 00:05.1
-I don't know if this is fully reliable, but it will have to do, either some cards
-as is get missed, or some cards get double id'ed, unless I use a hack like this.
+I don't know if this is fully reliable, but it will have to do, either some
+cards as is get missed, or some cards get double id'ed, unless I use a hack like
+this.
-There's nothing else I can find but the bus id to determine that it's the same
+There's nothing else I can find but the bus id to determine that it's the same
physical device or not.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 18 Mar 2014 21:18:27 -0700
-=====================================================================================
+================================================================================
Version: 2.1.6
Patch: 00
Date: 2014-03-18
------------------------------------
-Changes:
------------------------------------
-new version, bug fix, adding 3D controller to output causes doubled card id in some cases.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, bug fix, adding 3D controller to output causes doubled card id in
+some cases.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 18 Mar 2014 19:17:55 -0700
-=====================================================================================
+================================================================================
Version: 2.1.5
Patch: 00
Date: 2014-03-17
------------------------------------
-Changes:
------------------------------------
-New version, serious bug fix, do NOT use 2.1.4, it will fail to start. Bad copy/paste.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New version, serious bug fix, do NOT use 2.1.4, it will fail to start. Bad
+copy/paste.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 18 Mar 2014 01:30:53 -0700
-=====================================================================================
+================================================================================
Version: 2.1.4
Patch: 00
Date: 2014-03-17
------------------------------------
-Changes:
------------------------------------
-New version. Some BSD fixes, and a more important fix, added 'display controller'
-to graphics card detection, that's a new one on me. Dual card systems might use this.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version. Some BSD fixes, and a more important fix, added 'display
+controller' to graphics card detection, that's a new one on me. Dual card
+systems might use this.
-00:02.0 Display controller: Intel Corporation 82865G Integrated Graphics Controller (rev 02)
+00:02.0 Display controller: Intel Corporation 82865G Integrated Graphics
+Controller (rev 02)
-01:00.0 VGA compatible controller: NVIDIA Corporation NV44A [GeForce 6200] (rev a1)
+01:00.0 VGA compatible controller: NVIDIA Corporation NV44A [GeForce 6200] (rev
+a1)
Some more switches to bash native methods as well.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 17 Mar 2014 19:23:42 -0700
-=====================================================================================
+================================================================================
Version: 2.1.3
Patch: 00
Date: 2014-03-15
------------------------------------
-Changes:
------------------------------------
-New version. Big set of changes: changed all ver: and version: to v:; changed all bash
-${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename'
-and replaced with ${path##*/} which avoids unnessary subshells.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well
-down to 80 cols.
+New version. Big set of RELEASE NOTES: changed all ver: and version: to v:; changed
+all bash ${var} to $var where appropriate to avoid extra overhead of ${..};
+removed 'basename' and replaced with ${path##*/} which avoids unnessary
+subshells.
-Fixed bug in optical drives, at some point in the last few years, the kernel in /sys
-changed the path to the optical drive data, added in /ata8/ (example) so both methods
-are now handled. This should fix a lot of failures to show optical drive brand name etc.
+Fixed dynamic line wraps on -I and -S lines, now those in most cases will work
+well down to 80 cols.
-Added weechat detection, trying also supybot/limnoria detection in irc client version.
-There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is
-a fork of supybot but still uses the supybot program name, but added in limnoria too
-if they get around to changing that.
+Fixed bug in optical drives, at some point in the last few years, the kernel in
+/sys changed the path to the optical drive data, added in /ata8/ (example) so
+both methods are now handled. This should fix a lot of failures to show optical
+drive brand name etc.
-More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk
-is almost 250x more expensive in terms of execution time than using bash variable.
-Will change to use bash directly as time goes along where it's safe and accurate.
+Added weechat detection, trying also supybot/limnoria detection in irc client
+version. There was weechat-curses, but I guess they finally dropped the -curses.
+Limnoria is a fork of supybot but still uses the supybot program name, but added
+in limnoria too if they get around to changing that.
-Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
+More dynamic sizing tweaks, more optimization of code. Discovered that dipping
+into gawk is almost 250x more expensive in terms of execution time than using
+bash variable. Will change to use bash directly as time goes along where it's
+safe and accurate.
------------------------------------
+Added handling to support /run paths using directories, like /run/gdm/gdm.pid
+for dm data.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 16 Mar 2014 15:09:40 -0700
-=====================================================================================
+================================================================================
Version: 2.1.2
Patch: 00
Date: 2014-03-14
------------------------------------
-Changes:
------------------------------------
-no version change, just added wrapper around tput cols so only use it if in terminal
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+No version change, just added wrapper around tput cols so only use it if in
+terminal
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 15 Mar 2014 10:53:17 -0700
-=====================================================================================
+================================================================================
Version: 2.1.2
Patch: 00
Date: 2014-03-14
------------------------------------
-Changes:
------------------------------------
-New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in
-cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for
-counting.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed
+bugs in cpu main. Cleaned up a few more variable and width issues. Used a few
+more ${#var} for counting.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 14 Mar 2014 20:39:13 -0700
-=====================================================================================
+================================================================================
Version: 2.1.1
Patch: 00
Date: 2014-03-14
------------------------------------
-Changes:
------------------------------------
-New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a
-time to make it easier to test stuff one by one.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New Version, new man. This continues the dyanamic line sizing, I'm doing these
+one at a time to make it easier to test stuff one by one.
-Full refactoring/reordering of top global variables, moved user/maintainer set variables
-to top, and clearly identify all globals.
+Full refactoring/reordering of top global variables, moved user/maintainer set
+variables to top, and clearly identify all globals.
-Changed LINE_MAX to COL_MAX but all user configuration files will stay working since
-inxi now will check for that and translate them to the new variable names.
+Changed LINE_MAX to COL_MAX but all user configuration files will stay working
+since inxi now will check for that and translate them to the new variable names.
-New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to
-display screen in terminal/console. Moved cpu short flags to -x because it's not that
-important in general and just clutters things up in my opinion.
+New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully
+dynamic to display screen in terminal/console. Moved cpu short flags to -x
+because it's not that important in general and just clutters things up in my
+opinion.
Print flags/bogomips on separate line if line greater than display width.
-The rest of the lines will get a similar treatment, but it takes a bit of trial and error
-for each line to get it working right.
+The rest of the lines will get a similar treatment, but it takes a bit of trial
+and error for each line to get it working right.
-Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column
-width of irc clients, but that won't be accurate since fonts vary in widths for each character.
+Note that IRC line lengths are NOT dyanamic unless I can find a way to determine
+the column width of irc clients, but that won't be accurate since fonts vary in
+widths for each character.
-CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily,
-next will be the things with ports/chip id/card id.
+CPU was the worst offender in my opinion in terms of regular output wrapping to
+new line messily, next will be the things with ports/chip id/card id.
Tightened up a bit more the dyanamic help / version output handler.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 14 Mar 2014 13:14:51 -0700
-=====================================================================================
+================================================================================
Version: 2.1.0
Patch: 00
Date: 2014-03-13
------------------------------------
-Changes:
------------------------------------
-New version, new man page. Finally, after all these years, dynamically resized to terminal
-window column width help/version outputs. There is a significant slowdown to achieve this,
-but I've optimized it as much as I could so it should be acceptable for most users now.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new man page. Finally, after all these years, dynamically resized
+to terminal window column width help/version outputs. There is a significant
+slowdown to achieve this, but I've optimized it as much as I could so it should
+be acceptable for most users now.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 13 Mar 2014 19:26:32 -0700
-=====================================================================================
+================================================================================
Version: 2.0.0
Patch: 00
Date: 2014-03-12
------------------------------------
-Changes:
------------------------------------
-New feature, not new line option though. Now shows init type with -x (also shows rc
-type if openrc). -xx shows init / rc version number. Change runlevel to target if
-systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit
-sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but
-really just exchanged Runlevel: for Init: v: Runlevel: default:
-
-This is the first step, some of the init system ID methods are weak and non robust
-and this may need to be revised, but it should for now identify systemd/upstart quite
-accurately, and in most cases sysvinit. Note that to get sysvinit version number requires
-tool: strings which in debian/ubuntu is in package binutils. I don't know the package names
-for arch/fedora/etc for the recommends check tool in inxi yet.
-
-I believe this will be good enough for a first draft version, but over time we'll get it
-more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New feature, not new line option though. Now shows init type with -x (also shows
+rc type if openrc). -xx shows init / rc version number. Change runlevel to
+target if systemd and if non numeric runlevel given. Should support
+systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's
+present. Rearranged -I line a bit but really just exchanged Runlevel: for Init:
+v: Runlevel: default:
+
+This is the first step, some of the init system ID methods are weak and non
+robust and this may need to be revised, but it should for now identify
+systemd/upstart quite accurately, and in most cases sysvinit. Note that to get
+sysvinit version number requires tool: strings which in debian/ubuntu is in
+package binutils. I don't know the package names for arch/fedora/etc for the
+recommends check tool in inxi yet.
+
+I believe this will be good enough for a first draft version, but over time
+we'll get it more fine tuned, but as it is now, it should cover at least 99% of
+users, which isn't bad.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 12 Mar 2014 17:12:11 -0700
-=====================================================================================
+================================================================================
Version: 1.9.19
Patch: 00
Date: 2014-03-03
------------------------------------
-Changes:
------------------------------------
-New version; updated man page. Changed slightly the output for x server, in preparation
-for adding alternate display servers, like Wayland or Mir. Rather than release all the
-stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso
-test cd that boots in virtual box so I will have to wait to really add support there.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version; updated man page. Changed slightly the output for x server, in
+preparation for adding alternate display servers, like Wayland or Mir. Rather
+than release all the stuff at once I'm going to do it bit by bit. Currently I
+have not found a wayland iso test cd that boots in virtual box so I will have to
+wait to really add support there.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 03 Mar 2014 15:27:05 -0800
-=====================================================================================
+================================================================================
Version: 1.9.18
Patch: 00
Date: 2014-01-13
------------------------------------
-Changes:
------------------------------------
-New version; new tarball; new man page. Added Unity desktop support; added -xx feature
-to show default runlevel, using systemd/upstart/sysvinit type default tests.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version; new tarball; new man page. Added Unity desktop support; added -xx
+feature to show default runlevel, using systemd/upstart/sysvinit type default
+tests.
-Fixed gtk library version detections, now will support dpkg/pacman version tests, which
-should give more data to more people than previously, where the old tests usually would
-return null unless gtk dev packages were installed on the system.
+Fixed gtk library version detections, now will support dpkg/pacman version
+tests, which should give more data to more people than previously, where the old
+tests usually would return null unless gtk dev packages were installed on the
+system.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 13 Jan 2014 14:57:38 -0800
-=====================================================================================
+================================================================================
Version: 1.9.17
Patch: 00
Date: 2013-12-02
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Fixed new gnome change, they, of course, removed gnome-about
-and so version numbers failed. Now first trying gnome-session to get version number.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Also, there's a bug in at least gtk detection in opensuse, not sure what it is, they could
-be using a different syntax for the test:
-pkg-config --modversion gtk+-3.0
+New version, new tarball. Fixed new gnome change, they, of course, removed
+gnome-about and so version numbers failed. Now first trying gnome-session to get
+version number.
-returns no such package on gnome 3.10 installs, but I have no idea what package name to
-test for there in this case.
+Also, there's a bug in at least gtk detection in opensuse, not sure what it is,
+they could be using a different syntax for the test: pkg-config --modversion
+gtk+-3.0
-So leaving gtk version bugs unhandled due to no user information or feedback, if you want
-it fixed or if it works for your distro, let me know and also if it does not work, tell
-me the correct commmand, with its output, to get gtk version.
+returns no such package on gnome 3.10 installs, but I have no idea what package
+name to test for there in this case.
+
+So leaving gtk version bugs unhandled due to no user information or feedback, if
+you want it fixed or if it works for your distro, let me know and also if it
+does not work, tell me the correct commmand, with its output, to get gtk
+version.
That's for inxi -Sx output that is.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 02 Dec 2013 13:48:35 -0800
-=====================================================================================
+================================================================================
Version: 1.9.16
Patch: 00
Date: October 6 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Only for uprmq distros, small update to add support for another
-repo type output, the initial listing was not complete of possible syntaxes. Now handles:
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Only for uprmq distros, small update to add support
+for another repo type output, the initial listing was not complete of possible
+syntaxes. Now handles:
-Nonfree Updates (Local19) /mnt/data/mirrors/mageia/distrib/cauldron/x86_64/media/nonfree/updates
+Nonfree Updates (Local19)
+/mnt/data/mirrors/mageia/distrib/cauldron/x86_64/media/nonfree/updates
-as well, apparently that is a possible output format in certain cases with urpmq.
+as well, apparently that is a possible output format in certain cases with
+urpmq.
Non urpmq distros ignore this update, there are no other actual changes.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 06 Oct 2013 11:06:36 -0700
-=====================================================================================
+================================================================================
Version: 1.9.15
Patch: 00
Date: October 4 2013
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, tarball. Added urpmq for -r.
-Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to.
+Other distros than Mandriva, Mageia, no other changes so no need to update
+unless you want to.
-This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
+This adds support for Mandriva, Mageia. urpmq parsing is similar but not
+identical to pisi.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 04 Oct 2013 18:24:55 -0700
-=====================================================================================
+================================================================================
Version: 1.9.14
Patch: 00
Date: September 10 2013
------------------------------------
-Changes:
------------------------------------
-This does not have a new version number (there is a new date), and is only for solusos,
-so all other distro maintainer can ignore this update. New tarball. Adds support for
-solusos-release distro file in /etc/.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+This does not have a new version number (there is a new date), and is only for
+solusos, so all other distro maintainer can ignore this update. New tarball.
+Adds support for solusos-release distro file in /etc/.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 10 Sep 2013 10:49:29 -0700
-=====================================================================================
+================================================================================
Version: 1.9.14
Patch: 00
Date: August 20 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Fixed a bug / issue with failed usb nic detection, amazingly, the regex
-in inxi failed to check for Ethernet.*Adapter, heh. Most usb nics are wifi, so I guess ethernet just
-escaped me.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Fixed a bug / issue with failed usb nic detection,
+amazingly, the regex in inxi failed to check for Ethernet.*Adapter, heh. Most
+usb nics are wifi, so I guess ethernet just escaped me.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 20 Aug 2013 12:26:10 -0700
-=====================================================================================
+================================================================================
Version: 1.9.13
Patch: 00
Date: August 12 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Fixed a bug in Xorg where it shows drivers as unloaded when they
-are actually loaded. Since we can't fix xorg, inxi will try to work around this bug by validating
-one step further in the Xorg.0.log data, to confirm that drivers noted as loaded/unloaded/failed are
-actually running the display(s) of the system.
-
-There is a possible case of error that might happen due to this change in the case of a system with
-a complex xorg that uses two drivers/modules to run two different displays, ie, nvidia on one, and amd
-on the other, for example, or intel/nvidia, etc. However, if that bug appears, we'll get that data set
-of debugging output and fix it at that point.
-
-This fix repairs an existing xorg bug that is unlikely to get fixed any time soon (the call to load the
-detected drivers, eg, vesa, intel, is repeated, causing a failure of driver already loaded on the second
-occurance.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Fixed a bug in Xorg where it shows drivers as unloaded
+when they are actually loaded. Since we can't fix xorg, inxi will try to work
+around this bug by validating one step further in the Xorg.0.log data, to
+confirm that drivers noted as loaded/unloaded/failed are actually running the
+display(s) of the system.
+
+There is a possible case of error that might happen due to this change in the
+case of a system with a complex xorg that uses two drivers/modules to run two
+different displays, ie, nvidia on one, and amd on the other, for example, or
+intel/nvidia, etc. However, if that bug appears, we'll get that data set of
+debugging output and fix it at that point.
+
+This fix repairs an existing xorg bug that is unlikely to get fixed any time
+soon (the call to load the detected drivers, eg, vesa, intel, is repeated,
+causing a failure of driver already loaded on the second occurance.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 12 Aug 2013 16:20:51 -0700
-=====================================================================================
+================================================================================
Version: 1.9.12
Patch: 00
Date: July 2 2013
------------------------------------
-Changes:
------------------------------------
-Tiny change, no new version, removed a stray 's' line 4306 that may have made certain distro
-ids get slightly corrupted, but this is so trivial just fixing it, new tarball.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Tiny change, no new version, removed a stray 's' line 4306 that may have made
+certain distro ids get slightly corrupted, but this is so trivial just fixing
+it, new tarball.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 13 Jul 2013 11:47:48 -0700
-=====================================================================================
+================================================================================
Version: 1.9.12
Patch: 00
Date: July 2 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Two new desktop/window managers added: spectrwm (similar to scrotwm) and
-herbstluftwm. Both tested and working, thanks anticap from Antix for doing the testing/issue report on this.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New version, new tarball. Two new desktop/window managers added: spectrwm
+(similar to scrotwm) and herbstluftwm. Both tested and working, thanks anticap
+from Antix for doing the testing/issue report on this.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 01 Jul 2013 15:13:24 -0700
-=====================================================================================
+================================================================================
Version: 1.9.11
Patch: 00
Date: June 19 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too,
-so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not
-show cache/flags for arm cpus becuase they don't have those features.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. The recent bug fixes reminded me to check for ARM
+working, that had some bugs too, so I've updated that. -f for ARM now shows
+features instead of flags, and the -C regular cpu output does not show
+cache/flags for arm cpus becuase they don't have those features.
-Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other
-issues that were not handled before as well, or at all.
+Added some flags passed to various cpu functions and better detections of ARM
+cpu to handle dual core and other issues that were not handled before as well,
+or at all.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 19 Jun 2013 19:14:10 -0700
-=====================================================================================
+================================================================================
Version: 1.9.10
Patch: 00
Date: June 19 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe
-cases. This required fixing some core logic assumptions that are not currently correct, particularly
-on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second,
-vm cpus do not show physical ids at all for at least intel, nor do they show core id.
-
-While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in
-that case if a core is attached to a physical core or a virtual one, all of them being virtual in that
-case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Another stab at finally fixing the cpu / core count
+failures on fringe cases. This required fixing some core logic assumptions that
+are not currently correct, particularly on two cases, some xeon cpus fail to
+show core id for each core, showing 0 for all of them, second, vm cpus do not
+show physical ids at all for at least intel, nor do they show core id.
+
+While we can't get HT totally reliable, particularly for vm xeon, since inxi has
+no way to know in that case if a core is attached to a physical core or a
+virtual one, all of them being virtual in that case, but still inxi is now
+reporting the correct number of cores, or threads in vm xeons, and is not
showing multicore cpus as single core, which was the main issue.
-This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently,
-and can handle any of the others not being set, without creating an error or failure condition.
+This required redoing the counter logic for the cpu/core/physical arrays, now
+they are set independently, and can handle any of the others not being set,
+without creating an error or failure condition.
-Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that
-now also shows the correct cpu / core count.
+Also added in last check for a certain intel case where core id is 0 but > 1
+physical cores exist, that now also shows the correct cpu / core count.
-While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have
-not seen that will trigger yet another unexpected behavior.
+While this is tested on many data sets of proc cpuinfo, it's still possible
+there is a fringe case I have not seen that will trigger yet another unexpected
+behavior.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 19 Jun 2013 17:22:42 -0700
-=====================================================================================
+================================================================================
Version: 1.9.9
Patch: 00
Date: June 16 2013
------------------------------------
-Changes:
------------------------------------
-new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's
-zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all,
-and no core_id, but does have physical id, it will use the count for physical id as a default for core count.
+New version, new tarball. Added support for openSUSE repo syntax/location, as
+long as it's zypp or yum it will work. If it's both then it will show only one I
+believe, if that's a possible scenario, no idea.
+
+Added one more fix for those pesky intel vm cpu core errors, now if
+/proc/cpuinfo shows no siblings at all, and no core_id, but does have physical
+id, it will use the count for physical id as a default for core count.
Not perfect, but better than calling a dual core cpu a single core.
-There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is
-that actually one core with ht, or two cores? There is no way to find that information out that I can see that is
+There's still a lot of mysteries with vm versions of kvm cpus, for example, if
+you see a dual core xeon, is that actually one core with ht, or two cores? There
+is no way to find that information out that I can see that is
reliable.
------------------------------------
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 16 Jun 2013 13:56:28 -0700
-=====================================================================================
+================================================================================
Version: 1.9.8
Patch: 00
Date: June 14 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in
-/proc/partitions of 253, which made the disk totals fail to show up at all. Added that in.
-
-Moved sourcing of configuration files to right after initialize_data so that some variables
-can be forced to different values before the next set of system/app checks.
-
-This is to allow specifically turning off, for some headless servers where $DISPLAY is not
-null due to a bash configuration bug, these:
-B_SHOW_X_DATA='false'
-B_RUNNING_IN_X='false'
-
-Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY
-is set to non null.
-
-Added in support for ksplice kernel version, requires installed uptrack-uname, if that is
-present and if uptrack-name kernel version is different from uname then it will add (ksplice)
-to kernel version string, and use ksplice kernel version. Also created a single function
-get_kernel_version for use by short form/long form inxi output.
-
-For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id
-or physical_id for cpus, using siblings / 2 for xeons with no actual core counts.
-
-Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support
-for also excluding single partitions mounted to different places.
-
-Also fixed grsec kernel different handling of partitions in /proc/partition and df -hTP, doesn't use
-standard partition numbering. This can't be perfect because inxi cannot know what the actual
-disk sizes are, but it's an ok guess. example: /dev/xvdac (uses 'c' instead of '3' for partition,
-and does not show anything for disk itself.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk
+id in /proc/partitions of 253, which made the disk totals fail to show up at
+all. Added that in.
+
+Moved sourcing of configuration files to right after initialize_data so that
+some variables can be forced to different values before the next set of
+system/app checks.
+
+This is to allow specifically turning off, for some headless servers where
+$DISPLAY is not null due to a bash configuration bug, these:
+B_SHOW_X_DATA='false' B_RUNNING_IN_X='false'
+
+Setting those two to false in inxi.conf will turn off all the X checks etc even
+if the $DISPLAY is set to non null.
+
+Added in support for ksplice kernel version, requires installed uptrack-uname,
+if that is present and if uptrack-name kernel version is different from uname
+then it will add (ksplice) to kernel version string, and use ksplice kernel
+version. Also created a single function get_kernel_version for use by short
+form/long form inxi output.
+
+For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails
+to show core_id or physical_id for cpus, using siblings / 2 for xeons with no
+actual core counts.
+
+Fixed a bug that made fixes for multimounted partitions fail for disk used.
+Added in support for also excluding single partitions mounted to different
+places.
+
+Also fixed grsec kernel different handling of partitions in /proc/partition and
+df -hTP, doesn't use standard partition numbering. This can't be perfect because
+inxi cannot know what the actual disk sizes are, but it's an ok guess. example:
+/dev/xvdac (uses 'c' instead of '3' for partition, and does not show anything
+for disk itself.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 14 Jun 2013 12:36:57 -0700
-=====================================================================================
+================================================================================
Version: 1.9.7
Patch: 00
Date: May 25 2013
------------------------------------
-Changes:
------------------------------------
-New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=..
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather
-output, depending on how much data is present, and how many x options are used.
+New tarball, version, man page. Improved remote weather, now it uses -W, and
+deprecated -! location=..
-Added error handling for generic deprecated options, and for options that do not have the correct
-syntax for OPTARG, like with -W.
+That was too hard to type and too hard to remember. Also do more dyanamic
+reordering of weather output, depending on how much data is present, and how
+many x options are used.
-This should about do it for the weather option for now unless I missed something somewhere.
+Added error handling for generic deprecated options, and for options that do not
+have the correct syntax for OPTARG, like with -W.
------------------------------------
+This should about do it for the weather option for now unless I missed something
+somewhere.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 25 May 2013 20:16:01 -0700
-=====================================================================================
+================================================================================
Version: 1.9.6
Patch: 00
Date: May 19 2013
------------------------------------
-Changes:
------------------------------------
-new version, tarball. Bug fix, overly loose regex removed na from country/state/city strings,
-like nashville.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Bug fix, overly loose regex removed na from country /
+state / city strings, like nashville.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sun, 19 May 2013 20:06:44 -0700
-=====================================================================================
+================================================================================
Version: 1.9.5
Patch: 00
Date: May 18 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Fixed some lintian issues in man page, changed man/help for
--! location= option, to indicate that users must replace space with + themselves.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Fixed some lintian issues in man page, changed
+man/help for -! location= option, to indicate that users must replace space with
++ themselves.
-Because of how bash handles these options, inxi cannot add in + signs itself automatically.
+Because of how bash handles these options, inxi cannot add in + signs itself
+automatically.
This should be closer to cleanup of this new feature.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 18 May 2013 10:50:06 -0700
-=====================================================================================
+================================================================================
Version: 1.9.04
Patch: 00
Date: May 17 2013
------------------------------------
-Changes:
------------------------------------
-new version, tarball. Fixed issue with spaces in names for cities/states/countries, added
-man and help instructions to remove spaces and examples.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New version, tarball. Fixed issue with spaces in names for cities / states /
+countries, added man and help instructions to remove spaces and examples.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 17 May 2013 22:35:59 -0700
-=====================================================================================
+================================================================================
Version: 1.9.03
Patch: 00
Date: May 17 2013
------------------------------------
-Changes:
------------------------------------
-new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added
-a global that can be set in user / system configs to make a longer wget time out. Default
-is 8 seconds.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New tarball, version, bug fixes on weather, also optimized speed for slow isps,
+and added a global that can be set in user / system configs to make a longer
+wget time out. Default is 8 seconds.
This should take care of the failure from slow load issue reported.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 17 May 2013 22:07:29 -0700
-=====================================================================================
+================================================================================
Version: 1.9.02
Patch: 00
Date: May 17 2013
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-new version, new tarball, bug fix for weather
------------------------------------
+New version, new tarball, bug fix for weather.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 17 May 2013 21:10:21 -0700
-=====================================================================================
+================================================================================
Version: 1.9.01
Patch: 00
Date: May 17 2013
------------------------------------
-Changes:
------------------------------------
-new tarball, version. Bug fix on -! location=, forgot to have it pack its own location
-array, that's now correct.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New tarball, version. Bug fix on -! location=, forgot to have it pack its own
+location array, that's now correct.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 17 May 2013 20:17:32 -0700
-=====================================================================================
+================================================================================
Version: 1.9.00
Patch: 00
Date: May 17 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man page. Unless disabled by distribution maintainers, offers
-weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather
-and system time there. -x adds time zone, which is useful for servers, particurly web servers.
--x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line,
-if data is available, heat index, wind chill, and dew point.
--xxx also adds a line for location (blocked by irc/-z) / weather observation time.
-
--z filter applies as usual to location data, removes it in irc by default. -Z overrides override.
-
-The api this uses is probably going to be dropped at some point, so this is just going to work
-while it works, then it will need to be updated at some point, so don't get very attached to it.
-
-Also adds option to, with -w: -! location=<location string>
-This lets users send an alternate location using either <city,state> or <postal code>
-or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order
-must be as listed.
-
-If There is a developer flag if distro maintainers do not want this enabled, simply set:
-B_ALLOW_WEATHER='false'
-before packaging and the weather feature will be disabled.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball, new man page. Unless disabled by distribution
+maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more
+information. Basic line is just weather and system time there. -x adds time
+zone, which is useful for servers, particurly web servers. -x also adds wind
+speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line,
+if data is available, heat index, wind chill, and dew point. -xxx also adds a
+line for location (blocked by irc/-z) / weather observation time.
+
+-z filter applies as usual to location data, removes it in irc by default. -Z
+overrides override.
+
+The api this uses is probably going to be dropped at some point, so this is just
+going to work while it works, then it will need to be updated at some point, so
+don't get very attached to it.
+
+Also adds option to, with -w: -! location=<location string> This lets users send
+an alternate location using either <city,state> or <postal code> or
+<latitude,longitude> (commas for city,state and latitude,longitude are not
+optional, and the order must be as listed.
+
+If There is a developer flag if distro maintainers do not want this enabled,
+simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature
+will be disabled.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 17 May 2013 18:47:24 -0700
-=====================================================================================
+================================================================================
Version: 1.8.47
Patch: 00
Date: May 3 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Made separators surround the partition id, that avoids any possible
-errors with detections, also added in missing detection for separator.
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Made separators surround the partition id, that avoids
+any possible errors with detections, also added in missing detection for
+separator.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 03 May 2013 15:41:26 -0700
-=====================================================================================
+================================================================================
Version: 1.8.46
Patch: 00
Date: May 3 2013
------------------------------------
-Changes:
------------------------------------
-New version, tarball. Fixed a small issue that would create a wrong reporting of disk
-useage if bind mounts are used, ie, multiple binds to a single mount. Now inxi will
-check a list of the previously used partitions before adding the size of the used space
-to the total used, if the partition has already been used it will skip it. This was/is
-a quick and dirty fix, but it's totally fine I believe and should resolve two separate
-issues:
-
-1. use of bind mount method, where multiple partition names are bound to the same partition
-2. accidental dual mounting to the same partition.
-
-partitions section will still show the same data, ie, if bind is used, it will show all
-the bind mounts even when they are attached/bound to a partition that is already listed.
-This seems useful information, though maybe we can get the key word 'bind' in there somehow,
-but for now I won't worry about that issue, that's just a nice to have, not a bug.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. Fixed a small issue that would create a wrong reporting of
+disk useage if bind mounts are used, ie, multiple binds to a single mount. Now
+inxi will check a list of the previously used partitions before adding the size
+of the used space to the total used, if the partition has already been used it
+will skip it. This was/is a quick and dirty fix, but it's totally fine I believe
+and should resolve two separate issues:
+
+1. use of bind mount method, where multiple partition names are bound to the
+same partition 2. accidental dual mounting to the same partition.
+
+partitions section will still show the same data, ie, if bind is used, it will
+show all the bind mounts even when they are attached/bound to a partition that
+is already listed. This seems useful information, though maybe we can get the
+key word 'bind' in there somehow, but for now I won't worry about that issue,
+that's just a nice to have, not a bug.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 03 May 2013 13:52:44 -0700
-=====================================================================================
+================================================================================
Version: 1.8.45
Patch: 00
Date: March 2 2013
------------------------------------
-Changes:
------------------------------------
-New version, tarball. As always with fixes, one thing creates a bug in another. Fixed
-linux driver version handling, now only trimming off number from bsd drivers.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, tarball. As always with fixes, one thing creates a bug in another.
+Fixed linux driver version handling, now only trimming off number from BSD
+drivers.
-Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is
-a bug fix for 1.8.44 release mainly.
+Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So
+this is a bug fix for 1.8.44 release mainly.
-Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
+Also includes openBSD initial fixes for some issues related to sysctl parsing
+for cpu and ram.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 02 Mar 2013 09:44:17 -0800
-=====================================================================================
+================================================================================
Version: 1.8.44
Patch: 00
Date: February 28 2013
------------------------------------
-Changes:
------------------------------------
-no version change, just added 'chipset' to banlist to filter out.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+No version change, just added 'chipset' to banlist to filter out.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 28 Feb 2013 22:14:33 -0800
-=====================================================================================
+================================================================================
Version: 1.8.44
Patch: 00
Date: February 28 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data
-to bsd. Using a pciconf parser to do most of the heavy lifting in this one.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to
+BSD. Using a pciconf parser to do most of the heavy lifting in this one.
-Two functions do the main pci card processing for audio, graphics, and networking.
+Two functions do the main pci card processing for audio, graphics, and
+networking.
-All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and
+All seems to be shipshape and working, tested on freeBSD 7.3, 9.0, and 9.1 and
the output is consistent.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 28 Feb 2013 21:50:57 -0800
-=====================================================================================
+================================================================================
Version: 1.8.43
Patch: 00
Date: February 28 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false,
-turns off all -h and -H menu options for updating. Also triggers an error message
-if you use -U or -! <10-16/http://>.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer
-need to change the code anywhere, the error messages and blocking the -h output for
-update features is automatic as soon as the flag is set to 'false'.
+New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to
+false, turns off all -h and -H menu options for updating. Also triggers an error
+message if you use -U or -! <10-16/http://>.
-I needed to change the -! handling because -! is now also being used for extra features
-like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by
-things like the inxi gui tool being worked on by trash80.
+Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no
+longer need to change the code anywhere, the error messages and blocking the -h
+output for update features is automatic as soon as the flag is set to 'false'.
-Also included in this version are more bsd changes, including initial function for pciconf
-data parsing, this will be used for -A, -G, and -N options for card data.
+I needed to change the -! handling because -! is now also being used for extra
+features like -! 31 and -! 32 and probably more stuff in the future, plus the -!
+30 used by things like the inxi gui tool being worked on by trash80.
-Further bsd improvements are better error/no data available messages for -D and -o.
+Also included in this version are more BSD changes, including initial function
+for pciconf data parsing, this will be used for -A, -G, and -N options for card
+data.
------------------------------------
+Further BSD improvements are better error/no data available messages for -D and
+-o.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 28 Feb 2013 15:30:07 -0800
-=====================================================================================
+================================================================================
Version: 1.8.42
Patch: 00
Date: February 27 2013
------------------------------------
-Changes:
------------------------------------
-New version, small bug fix, inxi failed to add in md raid partition size data to HDD used data.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, small bug fix, inxi failed to add in md raid partition size data to
+HDD used data.
-The hdd used still fails to properly calculate the actual raid sizes but that's a bit too tricky
-to do easily so will leave that for some other time.
+The hdd used still fails to properly calculate the actual raid sizes but that's
+a bit too tricky to do easily so will leave that for some other time.
-Also added in more hdd used partition types for bsds, wd and ad type drivers for disks.
+Also added in more hdd used partition types for BSDs, wd and ad type drivers for
+disks.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 27 Feb 2013 23:13:00 -0800
-=====================================================================================
+================================================================================
Version: 1.8.41
Patch: 00
Date: February 27 2013
------------------------------------
-Changes:
------------------------------------
-small change, new tarball, added some excludes items to unmounted list, scd, dvdrw, cdrw.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Small change, new tarball, added some excludes items to unmounted list, scd,
+dvdrw, cdrw.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 27 Feb 2013 22:26:32 -0800
-=====================================================================================
+================================================================================
Version: 1.8.41
Patch: 00
Date: February 27 2013
------------------------------------
-Changes:
------------------------------------
-New version, updated man page. A bug fix for an old time bug: with mdraid, -o (unmounted
-partitions) would show components of the md raid array as unmounted partitions.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, updated man page. A bug fix for an old time bug: with mdraid, -o
+(unmounted partitions) would show components of the md raid array as unmounted
+partitions.
This is of course incorrect, and is now fixed.
-Small update of man page as well to note that -o will not show components of mdraid arrays.
+Small update of man page as well to note that -o will not show components of
+mdraid arrays.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 27 Feb 2013 22:09:32 -0800
-=====================================================================================
+================================================================================
Version: 1.8.40
Patch: 00
Date: February 27 2013
------------------------------------
-Changes:
------------------------------------
-New version, bug fix for mdraid, and cleaned up some errors and weak spots in component
-output for mdraid. Certain conditions would trigger a false return for raid components, now
-it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for
-online if none are detected.
-
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, bug fix for mdraid, and cleaned up some errors and weak spots in
+component output for mdraid. Certain conditions would trigger a false return for
+raid components, now it shows more explicitly the online/spare/failed data so
+it's clear. Also shows 'none' for online if none are detected.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 27 Feb 2013 14:00:46 -0800
-=====================================================================================
+================================================================================
Version: 1.8.39
Patch: 00
Date: February 27 2013
------------------------------------
-Changes:
------------------------------------
-New version, updated man page. Completed zfs raid support for bsds, now include component
-status as with mdraid, will show offline/failed devices as well in standard output.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, updated man page. Completed zfs raid support for BSDs, now include
+component status as with mdraid, will show offline/failed devices as well in
+standard output.
-Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for
-zfs / mdraid.
+Updated help and man page to reflect the difference between -R, -Rx, and -Rxx
+output for zfs / mdraid.
-No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's
-a bug, please report it.
+No linux inxi changes, this should not alter any behaviors in -R for mdraid, if
+it does, it's a bug, please report it.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 27 Feb 2013 12:42:02 -0800
-=====================================================================================
+================================================================================
Version: 1.8.38
Patch: 00
Date: February 18 2013
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New version, updated man page, new tarball.
-Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs
+Fixed partition bug that could falsely identify a remote filesystem like nfs as
+/dev fs
-Added two options:
--! 31 - Turns off Host section of System line. This is useful if you want to post output
-from server without posting its name.
--! 32 - Turns on Host section if it has been disabled by user configuration file
+Added two options: -! 31 - Turns off Host section of System line. This is useful
+if you want to post output from server without posting its name. -! 32 - Turns
+on Host section if it has been disabled by user configuration file
B_SHOW_HOST='false'
-Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off
-bogomips if null for bsd systems because bogomips is a linux kernel feature.
+Added missing CPU data message, fixed missing cpu cache/bogomips output, turned
+off bogomips if null for BSD systems because bogomips is a linux kernel feature.
-Added N/A for no memory report, this would mainly hit bsd systems where user has no
-permissions to use sysctl or has no read rights for /var/run/dmesg.boot.
+Added N/A for no memory report, this would mainly hit BSD systems where user has
+no permissions to use sysctl or has no read rights for /var/run/dmesg.boot.
-Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label
-Added support for raid file system syntax in bsd, now excludes main raid device name,
-and adds a flag to raiddevice/partitionname type so output can identify it as a raid
-slice/partition.
+Many fixes for partitions, now for BSD, if available, uses gpart list to get
+uuid/label Added support for raid file system syntax in BSD, now excludes main
+raid device name, and adds a flag to raiddevice/partitionname type so output can
+identify it as a raid slice/partition.
In man page, added -! 31 / -! 32 sections, and some other small edits.
-Added bsd raid line error message, added bsd sensors line error message.
+Added BSD raid line error message, added BSD sensors line error message.
-Many other small bug fixes that should make linux more robust in terms of missing
-data, and better/cleaner output for bsd.
+Many other small bug fixes that should make linux more robust in terms of
+missing data, and better/cleaner output for BSD.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 18 Feb 2013 12:24:39 -0800
-=====================================================================================
+================================================================================
Version: 1.8.37
Patch: 00
Date: February 11 2013
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New tarball. Tiny fix for an obscure fringe case, leaving numbering as is.
In some cases, dmidecode returns the grammatically wrong message:
-'No smbios nor dmi data' instead of 'No smbios or dmi data', corrected the search
-to look for simpler: 'no smbios ' to avoid that random error.
+'No smbios nor dmi data' instead of 'No smbios or dmi data', corrected the
+search to look for simpler: 'no smbios ' to avoid that random error.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 12 Feb 2013 09:54:51 -0800
-=====================================================================================
+================================================================================
Version: 1.8.37
Patch: 00
Date: February 11 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not
-properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine
-data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable
-for inxi purposes.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. This update fixes a recent bug report with ancient
+dmidecode versions, that do not properly support the -s option. Now -M uses only
+one method for dmidecode, manual construction of the Machine data from the raw
+dmidecode file. The file output is also parsed a bit to make it more
+consistently reliable for inxi purposes.
-This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which
-lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which
-means that now all the branches are the same, except the bsd branches will contain the most recent tests
-and bsd handling.
+This update also includes all recent BSD branch updates, including the new
+#!/usr/bin/env bash on top which lets inxi run in any environment without
+changes. Also for BSD, sets sed -i/sed -i '' global value, which means that now
+all the branches are the same, except the BSD branches will contain the most
+recent tests and BSD handling.
-As each step is reached, I'll release a new inxi that should be stable, this is the first one however that
-can be used as is, no changes, for bsd, debian kfreebsd, and linux systems.
+As each step is reached, I'll release a new inxi that should be stable, this is
+the first one however that can be used as is, no changes, for BSD, debian
+kfreeBSD, and linux systems.
-Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a
-start.
+Pleasen note that most BSD features are either incomplete or missing completely
+at this point, but it's a start.
-Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated
-as time permits, it is a long process.
+Some initial changes as well to help options to show more correct linux or BSD
+terms. These will be updated as time permits, it is a long process.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 11 Feb 2013 20:55:49 -0800
-=====================================================================================
+================================================================================
Version: 1.8.36
Patch: 00
Date: February 8 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Cleaned up patch number sed cleanup that didn't work in bsd.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New version, new tarball. Cleaned up patch number sed cleanup that didn't work
+in BSD.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 08 Feb 2013 20:50:23 -0800
-=====================================================================================
+================================================================================
Version: 1.8.36
Patch: 00
Date: February 8 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including
-kfreebsd from Debian.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. All bug fixes and cleanup preparing to support BSD
+systems, including kfreeBSD from Debian.
-Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types.
+Cleaned up all sed and grep that will be used by BSDs, added more granular flag
+for BSD types.
-Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error
-counts in bsds.
+Cleaned up and corrected issues between BSD/linux, more escapes and tests added
+to drop error counts in BSDs.
-Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i ''
-added, and has the proper #!/usr/local/bin/bash
+Please note that you must use the inxi from branches/BSD for true BSDs because
+sed has extra -i '' added, and has the proper #!/usr/local/bin/bash
-Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian.
+Added -! 16 for gnuBSD download/update, that's for gnu BSD systems like
+gnu/kfreeBSD from debian.
That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax.
-Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where
-it will be linux only, for example parsing a /proc file.
+Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving
+gnu grep where it will be linux only, for example parsing a /proc file.
-Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
+Fixed tty irc bugs for BSDs and linux, now should show the right console size
+for both, ideally.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Fri, 08 Feb 2013 20:36:02 -0800
-=====================================================================================
+================================================================================
Version: 1.8.35
Patch: 00
Date: February 7 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Note, this is a refactor release only, and features the core bsd
-support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed
-to #!/usr/local/bin/bash
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Note, this is a refactor release only, and features
+the core BSD support built in, although inxi will not run in BSD unless the top:
+#!/bin/bash is changed to #!/usr/local/bin/bash
-The actual bsd branch can be grabbed from:
-http://inxi.googlecode.com/svn/branches/bsd/inxi
-then you can keep that version updated using: inxi -! 15
-which will grab the latest bsd version from the svn server.
+The actual BSD branch can be grabbed from:
+http://inxi.googlecode.com/svn/branches/BSD/inxi then you can keep that version
+updated using: inxi -! 15 which will grab the latest BSD version from the svn
+server.
-This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally
-most people should see no difference, I just want to get this version up because there are
-so many small changes that it's worth having a release.
+This release also fixes a lot of small bugs that testing for BSD support
+exposed, but functionally most people should see no difference, I just want to
+get this version up because there are so many small changes that it's worth
+having a release.
-I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til
-1.8.36
+I was going to have the fixed dmidecode for old systems in 1.8.35 but that will
+have to wait til 1.8.36
-Linux users should see no real changes, except maybe a thing or two will work in certain circumstances
-when it didn't before, like showing MHz on ARM cpus on short inxi.
+Linux users should see no real changes, except maybe a thing or two will work in
+certain circumstances when it didn't before, like showing MHz on ARM cpus on
+short inxi.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Thu, 07 Feb 2013 19:56:19 -0800
-=====================================================================================
+================================================================================
Version: 1.8.34
Patch: 00
Date: January 28 2013
------------------------------------
-Changes:
------------------------------------
-new version, new tarball, new man page.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
-small change -Ixx will show running in tty if it's not in X, with tty number.
+New version, new tarball, new man page.
-sort of redundant to System: console: data, but that's ok, we'll live for now.
+Small change -Ixx will show running in tty if it's not in X, with tty number.
------------------------------------
+Sort of redundant to System: console: data, but that's ok, we'll live for now.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 28 Jan 2013 16:12:45 -0800
-=====================================================================================
+================================================================================
Version: 1.8.33
Patch: 00
Date: January 28 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball, new man page. Fixed an old bug where if you start inxi with
-an ssh command sometimes it will not show any client information, just the debugger
-PPID output. Now it will test as a final check to see if it can detect any parent to
-the process. Actually grandparent I believe. Seems to work, it's a fringe case but
-why not handle it?
-
-New -xx feature, for -I it will show, if inxi is not running in IRC client and if
-is running in X, and if the grandparent is not 'login', will show the application
-the shell is running in.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball, new man page. Fixed an old bug where if you start inxi
+with an ssh command sometimes it will not show any client information, just the
+debugger PPID output. Now it will test as a final check to see if it can detect
+any parent to the process. Actually grandparent I believe. Seems to work, it's a
+fringe case but why not handle it?
+
+New -xx feature, for -I it will show, if inxi is not running in IRC client and
+if is running in X, and if the grandparent is not 'login', will show the
+application the shell is running in.
Example:
Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3
Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6
Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 28 Jan 2013 15:57:15 -0800
-=====================================================================================
+================================================================================
Version: 1.8.32
Patch: 00
Date: January 23 2013
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
Small changes to man page, updated copyright date, added a patch contributor.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 26 Jan 2013 18:48:37 -0800
-=====================================================================================
+================================================================================
Version: 1.8.32
Patch: 00
Date: January 23 2013
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
No version change. New tarball, updated man page.
Some lintian changes for man page, escaped required -x type to \-x
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Sat, 26 Jan 2013 18:39:03 -0800
-=====================================================================================
+================================================================================
Version: 1.8.32
Patch: 00
Date: January 23 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Disabled -U in irc clients, with an exit error message.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
------------------------------------
+New version, new tarball. Disabled -U in irc clients, with an exit error
+message.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 23 Jan 2013 14:45:38 -0800
-=====================================================================================
+================================================================================
Version: 1.8.31
Patch: 00
Date: January 23 2013
------------------------------------
-Changes:
------------------------------------
-New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated
-and made cleaner the version data in verbose mode, non irc.
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+New version, new tarball. Fixed overly verbose output for --version/-V in irc.
+Also updated and made cleaner the version data in verbose mode, non irc.
-Fixed instance where program location would only show a dot . or relative path to inxi. Now
-in version full will show the full path, or should.
+Fixed instance where program location would only show a dot . or relative path
+to inxi. Now in version full will show the full path, or should.
Basic version line now show: inxi 1.8.30-00 (January 22 2013)
-The verbose information/version shows the license information, website/irc support info, and
-a few other changes.
+The verbose information/version shows the license information, website/irc
+support info, and a few other changes.
-Also fixed a small bug where the copyright shows current year, not the actual year of the inxi
-copyright contained in the top comment header.
+Also fixed a small bug where the copyright shows current year, not the actual
+year of the inxi copyright contained in the top comment header.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Wed, 23 Jan 2013 13:55:35 -0800
-=====================================================================================
+================================================================================
Version: 1.8.30
Patch: 00
Date: January 22 2013
------------------------------------
-Changes:
------------------------------------
-Changing compression of inxi.1.gz to gzip -9 to fit lintian tests. This won't matter to anyone
-at this point so no need to change anything.
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+Changing compression of inxi.1.gz to gzip -9 to fit lintian tests. This won't
+matter to anyone at this point so no need to change anything.
+
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 22 Jan 2013 19:27:54 -0800
-=====================================================================================
+================================================================================
Version: 1.8.30
Patch: 00
Date: January 22 2013
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
New Version, new tarball. Added inxi.changelog to tarball as well.
-Continuing fixes for ARM cpus, it was noted that short form inxi failed to show cpu speed
-derived from bogomips. That's because of the old min/max output that short form used.
+Continuing fixes for ARM cpus, it was noted that short form inxi failed to show
+cpu speed derived from bogomips. That's because of the old min/max output that
+short form used.
-Updated that section to now use N/A as flag, and if N/A for min/max speed, use the speed
-given from first cpu array index, the one derived from bogomips for ARM/razberry pi.
+Updated that section to now use N/A as flag, and if N/A for min/max speed, use
+the speed given from first cpu array index, the one derived from bogomips for
+ARM/razberry pi.
-Note that there is still no other ARM /proc/cpuinfo available to see if the razberry pi
-fixes work for all ARM cpus, but the fixes will stop hangs and endless loops at worst,
-and may also show some type of cpu speeds for ARM cpus that are not in razpi devices.
+Note that there is still no other ARM /proc/cpuinfo available to see if the
+razberry pi fixes work for all ARM cpus, but the fixes will stop hangs and
+endless loops at worst, and may also show some type of cpu speeds for ARM cpus
+that are not in razpi devices.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Tue, 22 Jan 2013 12:38:47 -0800
-====================================================================================
+================================================================================
Script Version: 1.8.29
Patch: 00
Date: January 21 2012
------------------------------------
-Changes:
------------------------------------
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
Bug fix, new version, new tarball.
-quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because
-it doesn't use the standard processor : [digit] format, but uses a string in the
-processor : field, which then hangs inxi which was expecting an integer.
+quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo
+because it doesn't use the standard processor : [digit] format, but uses a
+string in the processor : field, which then hangs inxi which was expecting an
+integer.
+
+Corrected this with a work around, but it will require a lot more ARM
+/proc/cpuinfo samples before the support for ARM can be considered stable.
-Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples
-before the support for ARM can be considered stable.
+For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed,
+to derive cpu speed.
-For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed.
+Better than nothing I guess, but will be wrong in other cases, particularly with
+dual core arm.
-Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
------------------------------------
+--------------------------------------------------------------------------------
-- Harald Hope - Mon, 21 Jan 2013 16:24:40 -0800