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

policy: embed pointer to private data into NMPolicy

Browse Source 
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.
This commit is contained in:
Thomas Haller
2016-04-04 13:58:44 +02:00
parent 7e3d090acb
commit 6a08085d27
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nm-policy.c
View File

@@ -56,7 +56,9 @@
_NM_UTILS_MACRO_REST (__VA_ARGS__)); \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
} G_STMT_END } G_STMT_END
typedef struct { typedef struct _NMPolicyPrivate NMPolicyPrivate;
struct _NMPolicyPrivate {
NMManager *manager; NMManager *manager;
NMFirewallManager *firewall_manager; NMFirewallManager *firewall_manager;
GSList *pending_activation_checks; GSList *pending_activation_checks;
@@ -85,9 +87,14 @@ typedef struct {
char *orig_hostname; /* hostname at NM start time */ char *orig_hostname; /* hostname at NM start time */
char *cur_hostname; /* hostname we want to assign */ char *cur_hostname; /* hostname we want to assign */
gboolean hostname_changed; /* TRUE if NM ever set the hostname */ 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) 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 static void
nm_policy_init (NMPolicy *self) 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); priv->devices = g_hash_table_new (NULL, NULL);
} }

3
src/nm-policy.h
View File

@@ -38,8 +38,11 @@
#define NM_POLICY_ACTIVATING_IP4_DEVICE "activating-ip4-device" #define NM_POLICY_ACTIVATING_IP4_DEVICE "activating-ip4-device"
#define NM_POLICY_ACTIVATING_IP6_DEVICE "activating-ip6-device" #define NM_POLICY_ACTIVATING_IP6_DEVICE "activating-ip6-device"
struct _NMPolicyPrivate;
struct _NMPolicy { struct _NMPolicy {
GObject parent; GObject parent;
struct _NMPolicyPrivate *priv;
}; };
typedef struct { typedef struct {