fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 08:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: refactor reloading not to create a second NMConfig instance

Browse source
This commit is contained in:
Thomas Haller 2014-12-16 16:52:34 +01:00
parent 83996c621c
commit 699b12ddc9
3 changed files with 51 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nm-config-data.c
View file

@ -143,6 +143,28 @@ nm_config_data_init (NMConfigData *self)
{
}
NMConfigData *
nm_config_data_new (GKeyFile *keyfile)
{
char *connectivity_uri, *connectivity_response;
guint connectivity_interval;
NMConfigData *config_data;
connectivity_uri = g_key_file_get_value (keyfile, "connectivity", "uri", NULL);
connectivity_interval = g_key_file_get_integer (keyfile, "connectivity", "interval", NULL);
connectivity_response = g_key_file_get_value (keyfile, "connectivity", "response", NULL);
config_data = g_object_new (NM_TYPE_CONFIG_DATA,
NM_CONFIG_DATA_CONNECTIVITY_URI, connectivity_uri,
NM_CONFIG_DATA_CONNECTIVITY_INTERVAL, connectivity_interval,
NM_CONFIG_DATA_CONNECTIVITY_RESPONSE, connectivity_response,
NULL);
g_free (connectivity_uri);
g_free (connectivity_response);
return config_data;
}
static void
nm_config_data_class_init (NMConfigDataClass *config_class)
{

7
src/nm-config-data.h
View file

@ -50,15 +50,12 @@ typedef struct {
GType nm_config_data_get_type (void);
NMConfigData *nm_config_data_new (GKeyFile *keyfile);
const char *nm_config_data_get_connectivity_uri (const NMConfigData *config_data);
const guint nm_config_data_get_connectivity_interval (const NMConfigData *config_data);
const char *nm_config_data_get_connectivity_response (const NMConfigData *config_data);
#include "nm-config.h"
/* private function: internal use only */
void _nm_config_data_set_config (NMConfigData *config_data, NMConfig *config);
G_END_DECLS
#endif /* NM_CONFIG_DATA_H */

58
src/nm-config.c
View file

@ -707,36 +707,45 @@ void
nm_config_reload (NMConfig *self)
{
NMConfigPrivate *priv;
NMConfig *new;
GError *error = NULL;
GHashTable *changes;
GKeyFile *keyfile;
NMConfigData *old_data;
NMConfigData *new_data = NULL;
char *config_main_file = NULL;
char *config_description = NULL;
g_return_if_fail (NM_IS_CONFIG (self));
priv = NM_CONFIG_GET_PRIVATE (self);
/* pass on the original command line options. This means, that
* options specified at command line cannot ever be reloaded from
* file. That seems desirable.
*/
new = nm_config_new (&priv->cli, &error);
if (!new) {
keyfile = read_entire_config (&priv->cli,
priv->config_dir,
&config_main_file,
&config_description,
&error);
g_free (config_main_file);
g_free (config_description);
if (!keyfile) {
nm_log_err (LOGD_CORE, "Failed to reload the configuration: %s", error->message);
g_clear_error (&error);
return;
}
new_data = nm_config_data_new (keyfile);
g_key_file_free (keyfile);
old_data = priv->config_data;
new_data = nm_config_get_data (new);
changes = g_hash_table_new (g_str_hash, g_str_equal);
/* reloading configuration means we have to carefully check every single option
* that we want to support and take specific actions. */
old_data = priv->config_data;
if ( nm_config_data_get_connectivity_interval (old_data) != nm_config_data_get_connectivity_interval (new_data)
|| g_strcmp0 (nm_config_data_get_connectivity_uri (old_data), nm_config_data_get_connectivity_uri (new_data))
|| g_strcmp0 (nm_config_data_get_connectivity_response (old_data), nm_config_data_get_connectivity_response (new_data))) {
@ -744,20 +753,16 @@ nm_config_reload (NMConfig *self)
g_hash_table_insert (changes, NM_CONFIG_CHANGES_CONNECTIVITY, NULL);
}
if (g_hash_table_size (changes))
new_data = g_object_ref (new_data);
else
new_data = NULL;
g_object_unref (new);
if (new_data) {
old_data = priv->config_data;
priv->config_data = new_data;
g_signal_emit (self, signals[SIGNAL_CONFIG_CHANGED], 0, new_data, changes, old_data);
g_object_unref (old_data);
if (!g_hash_table_size (changes)) {
g_hash_table_destroy (changes);
g_object_unref (new_data);
return;
}
priv->config_data = new_data;
g_signal_emit (self, signals[SIGNAL_CONFIG_CHANGED], 0, new_data, changes, old_data);
g_object_unref (old_data);
g_hash_table_destroy (changes);
}
@ -787,8 +792,6 @@ nm_config_new (const NMConfigCmdLineOptions *cli, GError **error)
{
NMConfigPrivate *priv = NULL;
NMConfig *self;
char *connectivity_uri, *connectivity_response;
guint connectivity_interval;
GKeyFile *keyfile;
self = NM_CONFIG (g_object_new (NM_TYPE_CONFIG,
@ -841,18 +844,11 @@ nm_config_new (const NMConfigCmdLineOptions *cli, GError **error)
priv->configure_and_quit = _get_bool_value (priv->keyfile, "main", "configure-and-quit", FALSE);
connectivity_uri = g_key_file_get_value (priv->keyfile, "connectivity", "uri", NULL);
connectivity_interval = g_key_file_get_integer (priv->keyfile, "connectivity", "interval", NULL);
connectivity_response = g_key_file_get_value (priv->keyfile, "connectivity", "response", NULL);
priv->config_data_orig = nm_config_data_new (priv->keyfile);
priv->config_data = g_object_new (NM_TYPE_CONFIG_DATA,
NM_CONFIG_DATA_CONNECTIVITY_URI, connectivity_uri,
NM_CONFIG_DATA_CONNECTIVITY_INTERVAL, connectivity_interval,
NM_CONFIG_DATA_CONNECTIVITY_RESPONSE, connectivity_response,
NULL);
priv->config_data_orig = g_object_ref (priv->config_data);
g_free (connectivity_uri);
g_free (connectivity_response);
/* Initialize mutable members. */
priv->config_data = g_object_ref (priv->config_data_orig);
priv->no_auto_default = g_strdupv (priv->no_auto_default_orig);
merge_no_auto_default_state (self);