Add Meter Choice framework by cgzones · Pull Request #200 · htop-dev/htop

cgzones · 2020-10-01T12:49:29Z

Add the possibility for meters to have selectable choices, so they can display more exact information the user is interested in.

As examples the following meters are added:

Hostname: show the IP address based on the selected network interface
DiskUsage: show the space utilization based on the selected mountpoint
NetworkIO: show the IO usage based on the selected network interface
LibSensorsFan: show the speed based on the selected libsensors provided sensor
LibSensorsTemp: show the temperature based on the selected libsensors provided sensor

Data is only available on Linux for now.

BenBE · 2020-10-01T15:09:45Z

Not tested, but does this list all local IP addresses, or does it select one? Like: Waht happens on a multihomed system with e.g. LAN+wireless+VPN?

cgzones · 2020-10-01T15:19:58Z

Only the the first (whatever the kernel decides to be first) non-loopback link-local IP address is displayed.

Maybe in the future Meters can have runtime options, which can be set per enabled-meter (like display-mode).
Than one can select which IP to display.

BenBE · 2020-10-01T18:21:59Z

$ ip a s
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default qlen 1000
    inet 127.0.0.1/8 scope host lo
    inet6 ::1/128 scope host 
2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state UP group default qlen 1000
    inet 10.116.112.196/24 brd 10.116.112.255 scope global dynamic noprefixroute eth0
    inet6 fe80::fedc:ba98:7654:3210/64 scope link noprefixroute 
3: wlan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP group default qlen 1000
    inet 10.116.128.196/17 brd 10.116.255.255 scope global dynamic noprefixroute wlan0
    inet6 2a07:1:9:6:7:7:5:e/64 scope global temporary dynamic 
    inet6 2a07:1:9:6:e:0:a:f/64 scope global dynamic mngtmpaddr noprefixroute 
    inet6 fc00::4242:9:a:1:a/64 scope global temporary dynamic 
    inet6 fc00::4242:8:7:e:4/64 scope global dynamic mngtmpaddr noprefixroute 
    inet6 fe80::e:a:6:2/64 scope link noprefixroute 
4: br-lxc: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN group default qlen 1000
    inet 192.168.254.1/24 brd 192.168.254.255 scope global br-lxc
    inet6 fe80::c000:8000:4000:23/64 scope link 
5: virbr0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN group default qlen 1000
    inet 192.168.122.1/24 brd 192.168.122.255 scope global virbr0
7: lxcbr0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN group default qlen 1000
    inet 10.0.3.1/24 scope global lxcbr0

$ ip r s
default via 10.116.112.254 dev eth0 proto dhcp metric 100 
default via 10.116.128.6 dev wlan0 proto dhcp metric 600 
10.0.3.0/24 dev lxcbr0 proto kernel scope link src 10.0.3.1 linkdown 
10.116.112.0/24 dev eth0 proto kernel scope link src 10.116.112.196 metric 100 
10.116.128.0/17 dev wlan0 proto kernel scope link src 10.116.128.196 metric 600 
192.168.122.0/24 dev virbr0 proto kernel scope link src 192.168.122.1 linkdown 
192.168.254.0/24 dev br-lxc proto kernel scope link src 192.168.254.1 

$ ip -6 r s
::1 dev lo proto kernel metric 256 pref medium
2a07:1:9:6::/64 dev wlan0 proto ra metric 600 pref medium
fc00:0:0:4242::/64 dev wlan0 proto ra metric 600 pref medium
fe80::/64 dev eth0 proto kernel metric 100 pref medium
fe80::/64 dev br-lxc proto kernel metric 256 pref medium
fe80::/64 dev wlan0 proto kernel metric 600 pref medium
default via fe80::cafe:beef:beef:1 dev wlan0 proto ra metric 600 pref medium

Expected behaviour:
IPv4: 10.116.112.196 (Default with lowest metric)
IPv6: 2a07:1:9:6:e:0:a:f (Routable global network address on default-routed interface)

While fc00::4242:8:7:e:4 would be correct too, it's an ULA, and thus not globally routable.

For the difference between dynamic mngtmpaddr noprefixroute and temporary dynamic see the docs ;-)

ghost · 2020-10-14T15:54:04Z

Congratulations 🎉. DeepCode analyzed your code in 2.417 seconds and we found no issues. Enjoy a moment of no bugs ☀️.

👉 View analysis in DeepCode’s Dashboard | Configure the bot

BenBE

General issue with IPv6 is if the interface has multiple temporary+dynamic addresses than you might end up showing deprecated addresses or addresses only intended for outgoing connections. E.g. right now my wifi interface shows 1 address scoped link, 6 scoped global, of which 5 are temporary dynamic (4 of which deprecated). The last one is dynamic mngtmpaddr noprefixroute … If only one is shown it should most likely be that one.

Header.c

Settings.c

BenBE · 2020-10-14T16:35:42Z

Settings.c

+      } else if (String_eq(option[0], "left_meter_choices")) {
+         Settings_readMeterChoices(this, option[1], 0);
+         didReadMeters = true;
+      } else if (String_eq(option[0], "right_meter_choices")) {
+         Settings_readMeterChoices(this, option[1], 1);
+         didReadMeters = true;


Does it cope with just reading Meter Choices, but no associated/non-matching meters?
Does it properly auto-upgrade from existing config?

i hope; i tested several cases

Vector.c

linux/Platform.c

Meter.c

Settings.c

linux/Platform.c

Use a meter attached data structure instead of static variables, to uncouple different meters for choice support.

Display the network usage based on the selected network interface. Currently only implemented on Linux and FreeBSD.

Show the input and maximum temperature of any available libsensors temperature sensor. Related: htop-dev#610

Show the input, minimum and maximum fan speed of any available libsensors fan sensor.

BenBE · 2022-08-22T18:40:40Z

linux/LibSensors.c

+      }
+   }
+
+  out:


Suggested change

out:

out:

BenBE · 2022-08-22T18:41:05Z

linux/LibSensors.c

+      }
+   }
+
+   out:


Suggested change

out:

out:

BenBE · 2022-08-22T18:43:58Z

linux/Platform.c

+   unsigned int ifs = ifconf.ifc_len / sizeof(*ifr);
+   for (unsigned int i = 0; i < ifs; i++) {


Suggested change

unsigned int ifs = ifconf.ifc_len / sizeof(*ifr);

for (unsigned int i = 0; i < ifs; i++) {

size_t ifs = ifconf.ifc_len / sizeof(*ifr);

for (size_t i = 0; i < ifs; i++) {

BenBE · 2022-08-22T18:44:34Z

linux/Platform.c

+
+   struct in6_addr s6;
+   char ifName[16];
+   unsigned int count = 0;


Suggested change

unsigned int count = 0;

size_t count = 0;

BenBE · 2022-08-22T19:04:46Z

Testing the Disk Usage meter the UX is not the best. Especially as it does not filter /snap, /run and several other memory FS. Furthermore the UI hangs if the filesystem is not reachable (e.g. with CIFS).

For the Hostname meter I'd like to have a combined Host IPv4/IPv6 meter to reduce information duplication. Or just have a blank IP address meter.

htop-dev#669) Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

…v#669) Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

BenBE · 2022-09-12T09:37:52Z

Wondering if choices should have a preferred sorting order (either enforced by the "choice provider" or by the "meter framework".

natoscott

@cgzones strictly, DiskUsage file names and associated code function/variable naming should be FilesystemUsage ... can we rename this?

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

ChillarAnand · 2024-07-15T06:42:02Z

Do you have any plans on merging this? I am new to this code base, but can push minor changes/features.

BenBE · 2024-07-15T07:47:15Z

There are still 3 major issues with this PR, that need to be resolved, before it can be merged:

Rebase to current main to resolve merge conflicts
Find a better solution to the UI side of things for choosing the item from the available list of options
Test things to work properly and stable

While item 1 can be resolved quite easily, it's mostly item 2 on the list, that still needs experimentation. If you happen to have some ideas that are intuitive, comfortable to use and easily discoverable we'd be glad to hear about them. The current solution in this PR horribly fails on the "comfortable to use" side of things …

cgzones added the RFE label Oct 1, 2020

cgzones force-pushed the ip branch 3 times, most recently from 1571ee6 to 931f16e Compare October 1, 2020 13:01

cgzones force-pushed the ip branch from 931f16e to 43b251f Compare October 1, 2020 19:23

cgzones force-pushed the ip branch 2 times, most recently from a3894b0 to 6b5a5f4 Compare October 14, 2020 15:04

BenBE reviewed Oct 14, 2020

View reviewed changes

cgzones force-pushed the ip branch 2 times, most recently from 626d34c to 5117731 Compare October 19, 2020 19:48

fasterit removed the RFE label Nov 18, 2020

cgzones force-pushed the ip branch from 5117731 to f6a2756 Compare December 10, 2020 17:08

BenBE requested changes Dec 10, 2020

View reviewed changes

cgzones force-pushed the ip branch from f6a2756 to f443fc6 Compare December 11, 2020 10:53

BenBE added the feature request Completely new feature requested label Mar 23, 2021

cgzones force-pushed the ip branch 4 times, most recently from 07e5760 to ec88ab7 Compare May 2, 2021 15:21

BenBE mentioned this pull request May 5, 2021

Provide a way to select which sensor to use for CPU temperature #538

Closed

BenBE mentioned this pull request Jun 3, 2021

Feature request: Network stats per-interface (or choose a single interface) #646

Open

cgzones force-pushed the ip branch 3 times, most recently from 2b13f33 to 8120b82 Compare June 3, 2021 13:43

cgzones changed the title ~~Add Hostname meters with local IP address~~ Add Meter Choice framework Jun 3, 2021

cgzones marked this pull request as ready for review June 3, 2021 16:16

cgzones added 4 commits August 22, 2022 20:34

NetworkIOMeter: choice preparations

10356d1

Use a meter attached data structure instead of static variables, to uncouple different meters for choice support.

NetworkIOMeter: add choice support

53038fd

Display the network usage based on the selected network interface. Currently only implemented on Linux and FreeBSD.

Add meter to display any libsensors temperature

17572dd

Show the input and maximum temperature of any available libsensors temperature sensor. Related: htop-dev#610

Add meter to display any libsensors fan speed

337ea9e

Show the input, minimum and maximum fan speed of any available libsensors fan sensor.

cgzones force-pushed the ip branch from cb2ad52 to 337ea9e Compare August 22, 2022 18:34

BenBE reviewed Aug 22, 2022

View reviewed changes

smalinux added a commit to smalinux/htop that referenced this pull request Sep 11, 2022

PCP: Integrate Meter Choice framework (htop-dev#200) for DynamicMeters (

8c16a04

htop-dev#669) Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 11, 2022

PCP: Meter Choice framework (htop-dev#200) for DynamicMeters (htop-de…

ec98906

…v#669) Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 11, 2022

PCP: Meter Choice framework (htop-dev#200) for DynamicMeters (htop-de…

c12928e

…v#669) Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 11, 2022

PCP: Meter Choice framework (htop-dev#200) for DynamicMeters (htop-de…

c23f246

…v#669) Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 11, 2022

PCP: Meter Choice framework (htop-dev#200) for DynamicMeters (htop-de…

8000526

…v#669) Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 11, 2022

PCP: Meter Choice framework (htop-dev#200) for DynamicMeters (htop-de…

de2d644

…v#669) Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 12, 2022

PCP: Add Meter Choice framework for DynamicMeters

2695481

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux mentioned this pull request Sep 12, 2022

PCP: DynamicMeters: Add Meter Choice framework #1081

Open

smalinux added a commit to smalinux/htop that referenced this pull request Sep 12, 2022

PCP: DynamicMeters: Add Meter Choice framework

44790f4

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 12, 2022

PCP: DynamicMeters: Add Meter Choice framework

b6aeeba

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 12, 2022

PCP: DynamicMeters: Add Meter Choice framework

7d6d345

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

natoscott reviewed Sep 13, 2022

View reviewed changes

smalinux added a commit to smalinux/htop that referenced this pull request Sep 13, 2022

PCP: DynamicMeters: Add Meter Choice framework

c869583

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 15, 2022

PCP: DynamicMeters: Add Meter Choice framework

bc54719

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

smalinux added a commit to smalinux/htop that referenced this pull request Sep 15, 2022

PCP: DynamicMeters: Add Meter Choice framework

24fd998

Related: htop-dev#200 && htop-dev#669 Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>

BenBE modified the milestones: 3.3.0, 3.4.0 Dec 26, 2023

cgzones removed this from the 3.4.0 milestone Apr 13, 2024

cgzones marked this pull request as draft April 13, 2024 19:40

BenBE mentioned this pull request May 3, 2024

Htop counting network traffic twice on bonded interface #1469

Open

+                    }
+                 }
+                out:

		unsigned int ifs = ifconf.ifc_len / sizeof(*ifr);
		for (unsigned int i = 0; i < ifs; i++) {

Uh oh!

Conversation

cgzones commented Oct 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BenBE commented Oct 1, 2020

Uh oh!

cgzones commented Oct 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BenBE commented Oct 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Oct 14, 2020 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

👉 View analysis in DeepCode’s Dashboard | Configure the bot

Uh oh!

BenBE left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BenBE Oct 14, 2020

Choose a reason for hiding this comment

Uh oh!

cgzones Oct 19, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BenBE Aug 22, 2022

Choose a reason for hiding this comment

Uh oh!

BenBE Aug 22, 2022

Choose a reason for hiding this comment

Uh oh!

BenBE Aug 22, 2022

Choose a reason for hiding this comment

Uh oh!

BenBE Aug 22, 2022

Choose a reason for hiding this comment

Uh oh!

BenBE commented Aug 22, 2022

Uh oh!

BenBE commented Sep 12, 2022

Uh oh!

natoscott left a comment

Choose a reason for hiding this comment

Uh oh!

ChillarAnand commented Jul 15, 2024

Uh oh!

BenBE commented Jul 15, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

cgzones commented Oct 1, 2020 •

edited

Loading

cgzones commented Oct 1, 2020 •

edited

Loading

BenBE commented Oct 1, 2020 •

edited

Loading

ghost commented Oct 14, 2020 •

edited by ghost

Loading