Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package btop for openSUSE:Factory checked in
at 2022-05-12 23:01:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btop (Old)
and /work/SRC/openSUSE:Factory/.btop.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btop"
Thu May 12 23:01:04 2022 rev:18 rq:976929 version:1.2.6+git20220505.841941a
Changes:
--------
--- /work/SRC/openSUSE:Factory/btop/btop.changes 2022-04-20
16:57:26.470629277 +0200
+++ /work/SRC/openSUSE:Factory/.btop.new.1538/btop.changes 2022-05-12
23:02:05.976936914 +0200
@@ -2 +2,14 @@
-Tue Apr 19 15:04:27 UTC 2022 - scott.bradn...@suse.com
+Thu May 05 18:56:57 UTC 2022 - scott.bradn...@suse.com
+
+- Update to version 1.2.6+git20220505.841941a:
+ * Include ZFS ARC in cached/available memory on Linux
+ * Fixed: Disk IO stats for individual partitions instead of whole disk
+ * Update snapcraft.yaml
+ * Update snapcraft.yaml
+ * Update snapcraft.yaml
+ * Update snapcraft.yaml
+ * Update snapcraft.yaml
+ * removed unneeded plugin
+
+-------------------------------------------------------------------
+Thu Apr 14 17:03:31 UTC 2022 - scott.bradn...@suse.com
@@ -8 +21 @@
-Wed Apr 13 15:54:02 UTC 2022 - scott.bradn...@suse.com
+Wed Apr 13 15:59:21 UTC 2022 - scott.bradn...@suse.com
@@ -10 +23 @@
-- Update to version v1.2.6+git20220413.4bae3c4:
+- Update to version 1.2.6+git20220413.4bae3c4:
@@ -17,3 +29,0 @@
- * v1.2.5 Bug fixes
- * Fixed: Mouse mappings for net box
- * fix: title_left symbol between auto and zero in the net box is not
displayed
@@ -22 +32 @@
-Mon Mar 7 16:21:05 UTC 2022 - scott.bradn...@suse.com
+Mon Mar 7 16:21:05 UTC 2022 - Scott Bradnick <scott.bradn...@suse.com>
@@ -34 +44 @@
-Mon Feb 28 16:23:44 UTC 2022 - scott.bradn...@suse.com
+Mon Feb 28 16:23:44 UTC 2022 - Scott Bradnick <scott.bradn...@suse.com>
@@ -44 +54 @@
-Tue Feb 15 18:31:34 UTC 2022 - scott.bradn...@suse.com
+Tue Feb 15 18:31:34 UTC 2022 - Scott Bradnick <scott.bradn...@suse.com>
@@ -53 +63 @@
-Mon Feb 14 20:32:36 UTC 2022 - scott.bradn...@suse.com
+Mon Feb 14 20:32:36 UTC 2022 - Scott Bradnick <scott.bradn...@suse.com>
@@ -62 +72 @@
-Fri Feb 11 19:13:10 UTC 2022 - scott.bradn...@suse.com
+Fri Feb 11 19:13:10 UTC 2022 - Scott Bradnick <scott.bradn...@suse.com>
@@ -75 +85 @@
-Tue Jan 18 15:13:31 UTC 2022 - scott.bradn...@suse.com
+Tue Jan 18 15:13:31 UTC 2022 - Scott Bradnick <scott.bradn...@suse.com>
@@ -84 +94 @@
-Wed Dec 29 21:39:39 UTC 2021 - scott.bradn...@suse.com
+Wed Dec 29 21:39:39 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -93 +103 @@
-Mon Dec 13 15:14:51 UTC 2021 - scott.bradn...@suse.com
+Mon Dec 13 15:14:51 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -104 +114 @@
-Sun Nov 28 21:25:30 UTC 2021 - scott.bradn...@suse.com
+Sun Nov 28 21:25:30 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -115 +125 @@
-Tue Nov 16 16:47:50 UTC 2021 - scott.bradn...@suse.com
+Tue Nov 16 16:47:50 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -123 +133 @@
-Mon Nov 15 21:11:28 UTC 2021 - scott.bradn...@suse.com
+Mon Nov 15 21:11:28 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -129 +139 @@
-Tue Nov 9 14:57:37 UTC 2021 - scott.bradn...@suse.com
+Tue Nov 9 14:57:37 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -143 +153 @@
-Thu Nov 4 14:31:35 UTC 2021 - scott.bradn...@suse.com
+Thu Nov 4 14:31:35 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -149 +159 @@
-Tue Nov 2 20:43:52 UTC 2021 - scott.bradn...@suse.com
+Tue Nov 2 20:43:52 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -157 +167 @@
-Wed Oct 27 15:15:27 UTC 2021 - scott.bradn...@suse.com
+Wed Oct 27 15:15:27 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -166 +176 @@
-Thu Oct 21 16:03:46 UTC 2021 - scott.bradn...@suse.com
+Thu Oct 21 16:03:46 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -172 +182 @@
-Tue Oct 19 15:40:53 UTC 2021 - scott.bradn...@suse.com
+Tue Oct 19 15:40:53 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -184 +194 @@
-Mon Oct 18 17:33:44 UTC 2021 - scott.bradn...@suse.com
+Mon Oct 18 17:33:44 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -189 +199 @@
-Wed Oct 13 15:50:02 UTC 2021 - scott.bradn...@suse.com
+Wed Oct 13 15:50:02 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -194 +204 @@
-Thu Oct 7 13:57:15 UTC 2021 - scott.bradn...@suse.com
+Thu Oct 7 13:57:15 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -205 +215 @@
-Wed Sep 29 20:57:08 UTC 2021 - scott.bradn...@suse.com
+Wed Sep 29 20:57:08 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -210 +220 @@
-Tue Sep 28 18:07:45 UTC 2021 - scott.bradn...@suse.com
+Tue Sep 28 18:07:45 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -215 +225 @@
-Tue Sep 28 13:36:12 UTC 2021 - scott.bradn...@suse.com
+Tue Sep 28 13:36:12 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -220 +230 @@
-Mon Sep 27 12:34:55 UTC 2021 - scott.bradn...@suse.com
+Mon Sep 27 12:34:55 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -225 +235 @@
-Fri Sep 24 14:28:18 UTC 2021 - scott.bradn...@suse.com
+Fri Sep 24 14:28:18 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -230 +240 @@
-Thu Sep 23 14:05:47 UTC 2021 - scott.bradn...@suse.com
+Thu Sep 23 14:05:47 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -235 +245 @@
-Wed Sep 22 15:19:38 UTC 2021 - scott.bradn...@suse.com
+Wed Sep 22 15:19:38 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -240 +250 @@
-Tue Sep 21 14:59:00 UTC 2021 - scott.bradn...@suse.com
+Tue Sep 21 14:59:00 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
@@ -245 +255 @@
-Mon Sep 20 14:35:47 UTC 2021 - scott.bradn...@suse.com
+Mon Sep 20 14:35:47 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com>
Old:
----
btop-1.2.6+git20220414.9abf849.tar.gz
New:
----
btop-1.2.6+git20220505.841941a.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ btop.spec ++++++
--- /var/tmp/diff_new_pack.mx1O2c/_old 2022-05-12 23:02:06.476937585 +0200
+++ /var/tmp/diff_new_pack.mx1O2c/_new 2022-05-12 23:02:06.480937590 +0200
@@ -17,7 +17,7 @@
Name: btop
-Version: 1.2.6+git20220414.9abf849
+Version: 1.2.6+git20220505.841941a
Release: 0
Summary: Usage and stats for processor, memory, disks, network and
processes
License: Apache-2.0
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.mx1O2c/_old 2022-05-12 23:02:06.532937660 +0200
+++ /var/tmp/diff_new_pack.mx1O2c/_new 2022-05-12 23:02:06.536937665 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/aristocratos/btop</param>
- <param
name="changesrevision">9abf84938348e4746e1f139c46d063b617011e61</param></service></servicedata>
+ <param
name="changesrevision">a7384483a4e9bc99009cfbf1f2898394ad4222ac</param></service></servicedata>
(No newline at EOF)
++++++ btop-1.2.6+git20220414.9abf849.tar.gz ->
btop-1.2.6+git20220505.841941a.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btop-1.2.6+git20220414.9abf849/snap/snapcraft.yaml
new/btop-1.2.6+git20220505.841941a/snap/snapcraft.yaml
--- old/btop-1.2.6+git20220414.9abf849/snap/snapcraft.yaml 2022-04-14
14:45:06.000000000 +0200
+++ new/btop-1.2.6+git20220505.841941a/snap/snapcraft.yaml 2022-05-05
17:49:01.000000000 +0200
@@ -14,7 +14,10 @@
architectures:
- build-on: amd64
- run-on: [amd64, armhf, arm64, ppc64el, s390x]
+ - build-on: arm64
+ - build-on: armhf
+ - build-on: ppc64el
+ - build-on: s390x
package-repositories:
- type: apt
@@ -33,7 +36,6 @@
- hardware-observe
- network
- network-observe
- # - physical-memory-observe
- home
- removable-media
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btop-1.2.6+git20220414.9abf849/src/btop_config.cpp
new/btop-1.2.6+git20220505.841941a/src/btop_config.cpp
--- old/btop-1.2.6+git20220414.9abf849/src/btop_config.cpp 2022-04-14
14:45:06.000000000 +0200
+++ new/btop-1.2.6+git20220505.841941a/src/btop_config.cpp 2022-05-05
17:49:01.000000000 +0200
@@ -141,6 +141,8 @@
{"mem_below_net", "#* Show mem box below net box
instead of above."},
+ {"zfs_arc_cached", "#* Count ZFS ARC in cached and
available memory."},
+
{"show_swap", "#* If swap memory should be
shown in memory box."},
{"swap_disk", "#* Show swap as a disk,
ignores show_swap value above, inserts itself after first disk."},
@@ -230,6 +232,7 @@
{"background_update", true},
{"mem_graphs", true},
{"mem_below_net", false},
+ {"zfs_arc_cached", true},
{"show_swap", true},
{"swap_disk", true},
{"show_disks", true},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btop-1.2.6+git20220414.9abf849/src/btop_menu.cpp
new/btop-1.2.6+git20220505.841941a/src/btop_menu.cpp
--- old/btop-1.2.6+git20220414.9abf849/src/btop_menu.cpp 2022-04-14
14:45:06.000000000 +0200
+++ new/btop-1.2.6+git20220505.841941a/src/btop_menu.cpp 2022-05-05
17:49:01.000000000 +0200
@@ -490,6 +490,15 @@
"",
"Example:",
"\"exclude=/boot /home/user\""},
+ {"zfs_arc_cached",
+ "(Linux) Count ZFS ARC as cached memory.",
+ "",
+ "Add ZFS ARC used to cached memory and",
+ "ZFS ARC available to available memory.",
+ "These are otherwise reported by the Linux",
+ "kernel as used memory.",
+ "",
+ "True or False."},
},
{
{"graph_symbol_net",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/btop-1.2.6+git20220414.9abf849/src/linux/btop_collect.cpp
new/btop-1.2.6+git20220505.841941a/src/linux/btop_collect.cpp
--- old/btop-1.2.6+git20220414.9abf849/src/linux/btop_collect.cpp
2022-04-14 14:45:06.000000000 +0200
+++ new/btop-1.2.6+git20220505.841941a/src/linux/btop_collect.cpp
2022-05-05 17:49:01.000000000 +0200
@@ -732,6 +732,7 @@
fs::file_time_type fstab_time;
int disk_ios = 0;
vector<string> last_found;
+ const std::regex zfs_size_regex("^size\\s+\\d\\s+(\\d+)");
mem_info current_mem {};
@@ -754,11 +755,28 @@
auto& show_swap = Config::getB("show_swap");
auto& swap_disk = Config::getB("swap_disk");
auto& show_disks = Config::getB("show_disks");
+ auto& zfs_arc_cached = Config::getB("zfs_arc_cached");
auto totalMem = get_totalMem();
auto& mem = current_mem;
mem.stats.at("swap_total") = 0;
+ //? Read ZFS ARC info from /proc/spl/kstat/zfs/arcstats
+ uint64_t arc_size = 0;
+ if (zfs_arc_cached) {
+ ifstream arcstats(Shared::procPath /
"spl/kstat/zfs/arcstats");
+ if (arcstats.good()) {
+ std::string line;
+ while (std::getline(arcstats, line)) {
+ std::smatch match;
+ if (std::regex_match(line, match,
zfs_size_regex) && match.size() == 2) {
+ arc_size = stoull(match.str(1));
+ }
+ }
+ }
+ arcstats.close();
+ }
+
//? Read memory info from /proc/meminfo
ifstream meminfo(Shared::procPath / "meminfo");
if (meminfo.good()) {
@@ -790,6 +808,10 @@
meminfo.ignore(SSmax, '\n');
}
if (not got_avail) mem.stats.at("available") =
mem.stats.at("free") + mem.stats.at("cached");
+ if (zfs_arc_cached) {
+ mem.stats.at("cached") += arc_size;
+ mem.stats.at("available") += arc_size;
+ }
mem.stats.at("used") = totalMem -
mem.stats.at("available");
if (mem.stats.at("swap_total") > 0)
mem.stats.at("swap_used") = mem.stats.at("swap_total") -
mem.stats.at("swap_free");
}
@@ -911,12 +933,17 @@
#endif
if
(disks.at(mountpoint).name.empty()) disks.at(mountpoint).name = (mountpoint ==
"/" ? "root" : mountpoint);
string devname
= disks.at(mountpoint).dev.filename();
+ int c = 0;
while
(devname.size() >= 2) {
if
(fs::exists("/sys/block/" + devname + "/stat", ec) and
access(string("/sys/block/" + devname + "/stat").c_str(), R_OK) == 0) {
-
disks.at(mountpoint).stat = "/sys/block/" + devname + "/stat";
+
if (c > 0 and fs::exists("/sys/block/" + devname + '/' +
disks.at(mountpoint).dev.filename().string() + "/stat", ec))
+
disks.at(mountpoint).stat = "/sys/block/" + devname + '/' +
disks.at(mountpoint).dev.filename().string() + "/stat";
+
else
+
disks.at(mountpoint).stat = "/sys/block/" + devname + "/stat";
break;
}
devname.resize(devname.size() - 1);
+ c++;
}
}
++++++ btop.obsinfo ++++++
--- /var/tmp/diff_new_pack.mx1O2c/_old 2022-05-12 23:02:06.680937859 +0200
+++ /var/tmp/diff_new_pack.mx1O2c/_new 2022-05-12 23:02:06.680937859 +0200
@@ -1,5 +1,5 @@
name: btop
-version: 1.2.6+git20220414.9abf849
-mtime: 1649940306
-commit: 9abf84938348e4746e1f139c46d063b617011e61
+version: 1.2.6+git20220505.841941a
+mtime: 1651765741
+commit: 841941afbac20e9379375b300d54b0039d715cec
