colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keep-alive: cache the alive-state and only emit the signal when it changed

Browse Source 
The alive state is composed from various parts, let's only emit
a _notify (self, PROP_ALIVE) when it actually changes.

For that, cache the alive state and let _notify_alive() determine
whether it changed and possibly emit the signal.
This commit is contained in:
Thomas Haller
2018-11-17 13:07:22 +01:00
parent 58923de4e4
commit be91d1cc4e
1 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/nm-keep-alive.c
View File

@@ -42,6 +42,7 @@ typedef struct {
bool floating:1; bool floating:1;
bool forced:1; bool forced:1;
bool alive:1;
} NMKeepAlivePrivate; } NMKeepAlivePrivate;
struct _NMKeepAlive { struct _NMKeepAlive {
@@ -64,8 +65,8 @@ G_DEFINE_TYPE (NMKeepAlive, nm_keep_alive, G_TYPE_OBJECT)
/*****************************************************************************/ /*****************************************************************************/
gboolean static gboolean
nm_keep_alive_is_alive (NMKeepAlive *self) _is_alive (NMKeepAlive *self)
{ {
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self); NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
@@ -84,14 +85,34 @@ nm_keep_alive_is_alive (NMKeepAlive *self)
return FALSE; return FALSE;
} }
static void
_notify_alive (NMKeepAlive *self)
{
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
if (priv->alive == _is_alive (self))
return;
priv->alive = !priv->alive;
_notify (self, PROP_ALIVE);
}
gboolean
nm_keep_alive_is_alive (NMKeepAlive *self)
{
return NM_KEEP_ALIVE_GET_PRIVATE (self)->alive;
}
/*****************************************************************************/
void void
nm_keep_alive_sink (NMKeepAlive *self) nm_keep_alive_sink (NMKeepAlive *self)
{ {
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self); NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
priv->floating = FALSE; if (priv->floating) {
priv->floating = FALSE;
_notify (self, PROP_ALIVE); _notify_alive (self);
}
} }
void void
@@ -99,9 +120,10 @@ nm_keep_alive_set_forced (NMKeepAlive *self, gboolean forced)
{ {
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self); NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
priv->forced = forced; if (priv->forced != (!!forced)) {
priv->forced = forced;
_notify (self, PROP_ALIVE); _notify_alive (self);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -110,7 +132,7 @@ static void
connection_flags_changed (NMSettingsConnection *connection, connection_flags_changed (NMSettingsConnection *connection,
NMKeepAlive *self) NMKeepAlive *self)
{ {
_notify (self, PROP_ALIVE); _notify_alive (self);
} }
void void
@@ -128,7 +150,7 @@ nm_keep_alive_set_settings_connection_watch_visible (NMKeepAlive *self,
g_signal_connect_object (priv->connection, NM_SETTINGS_CONNECTION_FLAGS_CHANGED, g_signal_connect_object (priv->connection, NM_SETTINGS_CONNECTION_FLAGS_CHANGED,
G_CALLBACK (connection_flags_changed), self, 0); G_CALLBACK (connection_flags_changed), self, 0);
_notify (self, PROP_ALIVE); _notify_alive (self);
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -168,7 +190,7 @@ name_owner_changed_cb (GDBusConnection *connection,
_LOGD ("DBus client for keep alive disappeared from bus"); _LOGD ("DBus client for keep alive disappeared from bus");
cleanup_dbus_watch (self); cleanup_dbus_watch (self);
_notify (self, PROP_ALIVE); _notify_alive (self);
} }
void void
@@ -224,17 +246,19 @@ get_property (GObject *object,
static void static void
nm_keep_alive_init (NMKeepAlive *self) nm_keep_alive_init (NMKeepAlive *self)
{ {
nm_assert (NM_KEEP_ALIVE_GET_PRIVATE (self)->alive == _is_alive (self));
} }
NMKeepAlive * NMKeepAlive *
nm_keep_alive_new (gboolean floating) nm_keep_alive_new (gboolean floating)
{ {
NMKeepAlive *res = g_object_new (NM_TYPE_KEEP_ALIVE, NULL); NMKeepAlive *self = g_object_new (NM_TYPE_KEEP_ALIVE, NULL);
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (res); NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
priv->floating = floating; priv->floating = floating;
priv->alive = TRUE;
return res; nm_assert (priv->alive == _is_alive (self));
return self;
} }
static void static void