GitLab

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

BUG:427204


(cherry picked from commit 57374fe5)

In instantiatePlugins the plugins are ordered according to the configured
libraries paths of the environment. When we load the plugins we are currently
doing the opposite of what we want. We load first the plugin from the directory
with the highest priority, some time later we load the same plugin from a
folder with a lower priority and then use the containers from this plugin and throw
the existing containers away!


(cherry picked from commit ee18830a)

We do not need the other ones and I had already removed it on other places of
this file but overlooked it here.


(cherry picked from commit 2abddc2d)

GIT_SILENT

GIT_SILENT

We update the network speed every 2s to match the daemon update rate.
However, this means that when calculating the difference between the
current and the previous, we get twice the amount since we are a
calculating the difference over 2s. So divide by 2 to get the byte rate
per second.


(cherry picked from commit cf19c92b)

GIT_SILENT

They were apparently missing units.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

ksystemstats expects sensors to consist of at least three parts:
subsystem, object, property. Sensors like "system/processors" break this
assumption, causing them to not be properly readable. Rather than trying
to come up with an elaborate way to handle this in ksystemstats, simply
expose them also as a three-part sensor so the mapping doesn't need to
change. These sensors are not very dynamic anyway so duplicating them
does not do much harm. The two-part version is kept around for backward
compatibility with the ksysguard UI.

Clients and plugins are both children of the daemon. The Client destructor
dereferences SensorProperties to unsubscribe from them. Because usually
the object tree looks something like plugin -> sensorcontainer -> sensorobject -> sensorproperty
we can not rely on the properties still being around when the clients are deleted.
This fixes the segfault in the unit test detected by the address sanitizer.

The label can be edited in the dialog, but this information
wasn't being set again on the footers in the graph display.

BUG: 373935

In the table of sensors (for bar charts) show the label in column 1
(second, right after host) rather than hiding it at the end; this
makes it easier to distinguish the sensors which are **typically**
all "localhost, System/CPU Lo.../, %" and then the UI is cut off
(scroll right to see the remaining columns, including label).

The returned map also contains infos about containers and objects.

GIT_SILENT

Saves parsing all these files in /proc/net. For now the old code path is
retained as fallback when there is some error communicating with the kernel.

Unconnected devices do not have any useful data we can expose, so simply
hide them completely instead of showing devices that do not provide
useful data.

The return value of compare is 0 if both strings match
https://en.cppreference.com/w/cpp/string/basic_string/compare

If ksgrd changes the monitors then all IDs are invalid.
This can happen when a new device is plugged in and removed.

SensorObjects can remain valid and are re-matched up.