luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

GSettings: rewrite memory backend

Browse Source 
Rewrite the memory backend using the new GSettingsBackend APIs.
This commit is contained in:
Allison Ryan Lortie
2016-04-25 16:46:45 +02:00
parent 82d582270c
commit 17cf54d338
1 changed files with 42 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
gio/gmemorysettingsbackend.c
View File

@@ -1,5 +1,6 @@
/* /*
* Copyright © 2010 Codethink Limited * Copyright © 2010 Codethink Limited
* Copyright © 2015 Canonical Limited
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@@ -14,7 +15,7 @@
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
* *
* Author: Ryan Lortie <desrt@desrt.ca> * Author: Allison Lortie <desrt@desrt.ca>
*/ */
#include "config.h" #include "config.h"
@@ -24,17 +25,16 @@
#include "giomodule.h" #include "giomodule.h"
#define G_TYPE_MEMORY_SETTINGS_BACKEND (g_memory_settings_backend_get_type()) #define G_TYPE_MEMORY_SETTINGS_BACKEND (g_memory_settings_backend_get_type ())
#define G_MEMORY_SETTINGS_BACKEND(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ G_DECLARE_FINAL_TYPE(GMemorySettingsBackend, g_memory_settings_backend, G, MEMORY_SETTINGS_BACKEND, GSettingsBackend)
G_TYPE_MEMORY_SETTINGS_BACKEND, \
GMemorySettingsBackend))
typedef GSettingsBackendClass GMemorySettingsBackendClass; struct _GMemorySettingsBackend
typedef struct
{ {
GSettingsBackend parent_instance; GSettingsBackend parent_instance;
GHashTable *table;
} GMemorySettingsBackend; GSettingsBackendChangeset *database;
GMutex lock;
};
G_DEFINE_TYPE_WITH_CODE (GMemorySettingsBackend, G_DEFINE_TYPE_WITH_CODE (GMemorySettingsBackend,
g_memory_settings_backend, g_memory_settings_backend,
@@ -43,21 +43,18 @@ G_DEFINE_TYPE_WITH_CODE (GMemorySettingsBackend,
g_define_type_id, "memory", 10)) g_define_type_id, "memory", 10))
static GVariant * static GVariant *
g_memory_settings_backend_read (GSettingsBackend *backend, g_memory_settings_backend_read_simple (GSettingsBackend *backend,
const gchar *key, const gchar *key,
const GVariantType *expected_type, const GVariantType *expected_type)
gboolean default_value)
{ {
GMemorySettingsBackend *memory = G_MEMORY_SETTINGS_BACKEND (backend); GMemorySettingsBackend *self = G_MEMORY_SETTINGS_BACKEND (backend);
GVariant *value; GVariant *value = NULL;
if (default_value) g_mutex_lock (&self->lock);
return NULL;
value = g_hash_table_lookup (memory->table, key); g_settings_backend_changeset_get (self->database, key, &value);
if (value != NULL) g_mutex_unlock (&self->lock);
g_variant_ref (value);
return value; return value;
} }
@@ -68,93 +65,53 @@ g_memory_settings_backend_write (GSettingsBackend *backend,
GVariant *value, GVariant *value,
gpointer origin_tag) gpointer origin_tag)
{ {
GMemorySettingsBackend *memory = G_MEMORY_SETTINGS_BACKEND (backend); GMemorySettingsBackend *self = G_MEMORY_SETTINGS_BACKEND (backend);
GVariant *old_value;
old_value = g_hash_table_lookup (memory->table, key); g_mutex_lock (&self->lock);
g_variant_ref_sink (value);
if (old_value == NULL || !g_variant_equal (value, old_value)) g_settings_backend_changeset_set (self->database, key, value);
{
g_hash_table_insert (memory->table, g_strdup (key), value); g_mutex_unlock (&self->lock);
g_settings_backend_changed (backend, key, origin_tag);
} g_settings_backend_changed (backend, key, origin_tag);
else
g_variant_unref (value);
return TRUE; return TRUE;
} }
static gboolean static gboolean
g_memory_settings_backend_write_one (gpointer key, g_memory_settings_backend_write_changeset (GSettingsBackend *backend,
gpointer value, GSettingsBackendChangeset *changeset,
gpointer data) gpointer origin_tag)
{ {
GMemorySettingsBackend *memory = data; GMemorySettingsBackend *self = G_MEMORY_SETTINGS_BACKEND (backend);
if (value != NULL) g_mutex_lock (&self->lock);
g_hash_table_insert (memory->table, g_strdup (key), g_variant_ref (value));
else
g_hash_table_remove (memory->table, key);
return FALSE; g_settings_backend_changeset_change (self->database, changeset);
}
static gboolean g_mutex_unlock (&self->lock);
g_memory_settings_backend_write_tree (GSettingsBackend *backend,
GTree *tree, g_settings_backend_changeset_applied (backend, changeset, origin_tag);
gpointer origin_tag)
{
g_tree_foreach (tree, g_memory_settings_backend_write_one, backend);
g_settings_backend_changed_tree (backend, tree, origin_tag);
return TRUE; return TRUE;
} }
static void
g_memory_settings_backend_reset (GSettingsBackend *backend,
const gchar *key,
gpointer origin_tag)
{
GMemorySettingsBackend *memory = G_MEMORY_SETTINGS_BACKEND (backend);
if (g_hash_table_lookup (memory->table, key))
{
g_hash_table_remove (memory->table, key);
g_settings_backend_changed (backend, key, origin_tag);
}
}
static gboolean
g_memory_settings_backend_get_writable (GSettingsBackend *backend,
const gchar *name)
{
return TRUE;
}
static GPermission *
g_memory_settings_backend_get_permission (GSettingsBackend *backend,
const gchar *path)
{
return g_simple_permission_new (TRUE);
}
static void static void
g_memory_settings_backend_finalize (GObject *object) g_memory_settings_backend_finalize (GObject *object)
{ {
GMemorySettingsBackend *memory = G_MEMORY_SETTINGS_BACKEND (object); GMemorySettingsBackend *self = G_MEMORY_SETTINGS_BACKEND (object);
g_hash_table_unref (memory->table); g_settings_backend_changeset_unref (self->database);
g_mutex_clear (&self->lock);
G_OBJECT_CLASS (g_memory_settings_backend_parent_class) G_OBJECT_CLASS (g_memory_settings_backend_parent_class)->finalize (object);
->finalize (object);
} }
static void static void
g_memory_settings_backend_init (GMemorySettingsBackend *memory) g_memory_settings_backend_init (GMemorySettingsBackend *self)
{ {
memory->table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, self->database = g_settings_backend_changeset_new_database (NULL);
(GDestroyNotify) g_variant_unref); g_mutex_init (&self->lock);
} }
static void static void
@@ -163,12 +120,9 @@ g_memory_settings_backend_class_init (GMemorySettingsBackendClass *class)
GSettingsBackendClass *backend_class = G_SETTINGS_BACKEND_CLASS (class); GSettingsBackendClass *backend_class = G_SETTINGS_BACKEND_CLASS (class);
GObjectClass *object_class = G_OBJECT_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class);
backend_class->read = g_memory_settings_backend_read; backend_class->read_simple = g_memory_settings_backend_read_simple;
backend_class->write = g_memory_settings_backend_write; backend_class->write = g_memory_settings_backend_write;
backend_class->write_tree = g_memory_settings_backend_write_tree; backend_class->write_changeset = g_memory_settings_backend_write_changeset;
backend_class->reset = g_memory_settings_backend_reset;
backend_class->get_writable = g_memory_settings_backend_get_writable;
backend_class->get_permission = g_memory_settings_backend_get_permission;
object_class->finalize = g_memory_settings_backend_finalize; object_class->finalize = g_memory_settings_backend_finalize;
} }