From 6a08085d2703d7d8e9fadf47a1f8187f23a3e706 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 4 Apr 2016 13:58:44 +0200
Subject: [PATCH] policy: embed pointer to private data into NMPolicy

Instead of a G_TYPE_INSTANCE_GET_PRIVATE() call every time,
fetching the private data becomes a pointer dereference.

As only one instance of NMPolicy exists, this costs us only
one additional pointer of memory.
---
 src/nm-policy.c | 17 +++++++++++++----
 src/nm-policy.h |  3 +++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/nm-policy.c b/src/nm-policy.c
index 6bea37282..9dedf2297 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -56,7 +56,9 @@
                 _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
     } G_STMT_END
 
-typedef struct {
+typedef struct _NMPolicyPrivate NMPolicyPrivate;
+
+struct _NMPolicyPrivate {
 	NMManager *manager;
 	NMFirewallManager *firewall_manager;
 	GSList *pending_activation_checks;
@@ -85,9 +87,14 @@ typedef struct {
 	char *orig_hostname; /* hostname at NM start time */
 	char *cur_hostname;  /* hostname we want to assign */
 	gboolean hostname_changed;  /* TRUE if NM ever set the hostname */
-} NMPolicyPrivate;
+};
 
-#define NM_POLICY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_POLICY, NMPolicyPrivate))
+static NMPolicyPrivate *
+NM_POLICY_GET_PRIVATE(NMPolicy *self)
+{
+	nm_assert (NM_IS_POLICY (self));
+	return self->priv;
+}
 
 G_DEFINE_TYPE (NMPolicy, nm_policy, G_TYPE_OBJECT)
 
@@ -1831,7 +1838,9 @@ _connect_settings_signal (NMPolicy *self, const char *name, gpointer callback)
 static void
 nm_policy_init (NMPolicy *self)
 {
-	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self);
+	NMPolicyPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NM_TYPE_POLICY, NMPolicyPrivate);
+
+	self->priv = priv;
 
 	priv->devices = g_hash_table_new (NULL, NULL);
 }
diff --git a/src/nm-policy.h b/src/nm-policy.h
index 4d504cdd9..476ddf1db 100644
--- a/src/nm-policy.h
+++ b/src/nm-policy.h
@@ -38,8 +38,11 @@
 #define NM_POLICY_ACTIVATING_IP4_DEVICE "activating-ip4-device"
 #define NM_POLICY_ACTIVATING_IP6_DEVICE "activating-ip6-device"
 
+struct _NMPolicyPrivate;
+
 struct _NMPolicy {
 	GObject parent;
+	struct _NMPolicyPrivate *priv;
 };
 
 typedef struct {