isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: Minimize deep_unpack() usage

Browse Source 
deep_unpack()[1] will unpack a variant and its children, but only up to one level.
lookup_value()[2] will directly search for a value with a linear scan.

Performing a deep_unpack() + lookup can be a more expensive operation when we are
looking for just a single value compared to just perform the lookup_value() directly
in C. Avoid the deep_unpack() usage when we perform a single check presence.

[1] https://gjs.guide/guides/glib/gvariant.html#deepunpack
[2] https://docs.gtk.org/glib/method.Variant.lookup_value.html

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2416>
This commit is contained in:
Alessandro Bono 2022-08-10 11:44:42 +02:00 committed by Marge Bot
parent 23bfd08b3c
commit ade4b23796
7 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/gdm/realmd.js
View File

@ -28,7 +28,8 @@ var Manager = class extends Signals.EventEmitter {
this._aggregateProvider.connectObject('g-properties-changed',
(proxy, properties) => {
if ('Realms' in properties.deep_unpack())
const realmsChanged = !!properties.lookup_value('Realms', null);
if (realmsChanged)
this._reloadRealms();
}, this);
}
@ -67,7 +68,8 @@ var Manager = class extends Signals.EventEmitter {
this._reloadRealm(realm);
realm.connect('g-properties-changed', (proxy, properties) => {
if ('Configured' in properties.deep_unpack())
const configuredChanged = !!properties.lookup_value('Configured', null);
if (configuredChanged)
this._reloadRealm(realm);
});
}

3
js/misc/modemManager.js
View File

@ -243,7 +243,8 @@ var BroadbandModem = GObject.registerClass({
this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
this._proxy.connect('g-properties-changed', (proxy, properties) => {
if ('SignalQuality' in properties.deep_unpack())
const signalQualityChanged = !!properties.lookup_value('SignalQuality', null);
if (signalQualityChanged)
this._reloadSignalQuality();
});
this._reloadSignalQuality();

3
js/misc/smartcardManager.js
View File

@ -73,7 +73,8 @@ var SmartcardManager = class extends Signals.EventEmitter {
this._updateToken(token);
token.connect('g-properties-changed', (proxy, properties) => {
if ('IsInserted' in properties.deep_unpack()) {
const isInsertedChanged = !!properties.lookup_value('IsInserted', null);
if (isInsertedChanged) {
this._updateToken(token);
if (token.IsInserted)

4
js/ui/status/location.js
View File

@ -181,8 +181,8 @@ var GeoclueAgent = GObject.registerClass({
}
_onGeocluePropsChanged(proxy, properties) {
let unpacked = properties.deep_unpack();
if ("InUse" in unpacked)
const inUseChanged = !!properties.lookup_value('InUse', null);
if (inUseChanged)
this.notify('in-use');
}

3
js/ui/status/nightLight.js
View File

@ -49,7 +49,8 @@ class Indicator extends SystemIndicator {
g_interface_info: colorInfo,
});
this._proxy.connect('g-properties-changed', (p, properties) => {
if ('NightLightActive' in properties.deep_unpack())
const nightLightActiveChanged = !!properties.lookup_value('NightLightActive', null);
if (nightLightActiveChanged)
this._sync();
});
this._proxy.init_async(GLib.PRIORITY_DEFAULT, null)

13
js/ui/status/powerProfiles.js
View File

@ -52,13 +52,12 @@ class PowerProfilesToggle extends QuickMenuToggle {
if (error) {
log(error.message);
} else {
this._proxy.connect('g-properties-changed',
(p, properties) => {
const propertyNames = properties.deep_unpack();
if ('Profiles' in propertyNames)
this._syncProfiles();
this._sync();
});
this._proxy.connect('g-properties-changed', (p, properties) => {
const profilesChanged = !!properties.lookup_value('Profiles', null);
if (profilesChanged)
this._syncProfiles();
this._sync();
});
this._syncProfiles();
}
this._sync();

11
js/ui/status/thunderbolt.js
View File

@ -83,12 +83,11 @@ var Client = class extends Signals.EventEmitter {
}
_onPropertiesChanged(proxy, properties) {
let unpacked = properties.deep_unpack();
if (!('Probing' in unpacked))
return;
this.probing = this._proxy.Probing;
this.emit('probing-changed', this.probing);
const probingChanged = !!properties.lookup_value('Probing', null);
if (probingChanged) {
this.probing = this._proxy.Probing;
this.emit('probing-changed', this.probing);
}
}
_onDeviceAdded(proxy, emitter, params) {