[tracker/wip/carlosg/update-perf: 28/61] libtracker-data/core: Plug leaks on TrackerData updates object finalization




commit fd3f070aa9211b2a088bb841392d4617fc4558aa
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jul 31 22:49:25 2022 +0200

    libtracker-data/core: Plug leaks on TrackerData updates object finalization
    
    And hook TrackerData finalization from TrackerDataManager dispose. As we want
    to keep compiled statements around, we will want to properly finalize all
    these before attempting to close the database interfaces.

 src/libtracker-sparql/core/tracker-data-manager.c |  3 ++-
 src/libtracker-sparql/core/tracker-data-update.c  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/src/libtracker-sparql/core/tracker-data-manager.c 
b/src/libtracker-sparql/core/tracker-data-manager.c
index 3b3ac3011..12b7411c1 100644
--- a/src/libtracker-sparql/core/tracker-data-manager.c
+++ b/src/libtracker-sparql/core/tracker-data-manager.c
@@ -4963,6 +4963,8 @@ tracker_data_manager_dispose (GObject *object)
        GError *error = NULL;
        gboolean readonly = TRUE;
 
+       g_clear_object (&manager->data_update);
+
        if (manager->db_manager) {
                readonly = (tracker_db_manager_get_flags (manager->db_manager, NULL, NULL) & 
TRACKER_DB_MANAGER_READONLY) != 0;
 
@@ -4995,7 +4997,6 @@ tracker_data_manager_finalize (GObject *object)
        TrackerDataManager *manager = TRACKER_DATA_MANAGER (object);
 
        g_clear_object (&manager->ontologies);
-       g_clear_object (&manager->data_update);
        g_clear_pointer (&manager->graphs, g_hash_table_unref);
        g_free (manager->status);
        g_mutex_clear (&manager->connections_lock);
diff --git a/src/libtracker-sparql/core/tracker-data-update.c 
b/src/libtracker-sparql/core/tracker-data-update.c
index b0980ae66..b48c4242e 100644
--- a/src/libtracker-sparql/core/tracker-data-update.c
+++ b/src/libtracker-sparql/core/tracker-data-update.c
@@ -484,6 +484,23 @@ tracker_data_get_property (GObject    *object,
        }
 }
 
+static void
+tracker_data_finalize (GObject *object)
+{
+       TrackerData *data = TRACKER_DATA (object);
+
+       g_clear_pointer (&data->update_buffer.graphs, g_ptr_array_unref);
+       g_clear_pointer (&data->update_buffer.new_resources, g_hash_table_unref);
+       g_clear_pointer (&data->update_buffer.resource_cache, g_hash_table_unref);
+
+       g_clear_pointer (&data->insert_callbacks, g_ptr_array_unref);
+       g_clear_pointer (&data->delete_callbacks, g_ptr_array_unref);
+       g_clear_pointer (&data->commit_callbacks, g_ptr_array_unref);
+       g_clear_pointer (&data->rollback_callbacks, g_ptr_array_unref);
+
+       G_OBJECT_CLASS (tracker_data_parent_class)->finalize (object);
+}
+
 static void
 tracker_data_class_init (TrackerDataClass *klass)
 {
@@ -491,6 +508,7 @@ tracker_data_class_init (TrackerDataClass *klass)
 
        object_class->set_property = tracker_data_set_property;
        object_class->get_property = tracker_data_get_property;
+       object_class->finalize = tracker_data_finalize;
 
        g_object_class_install_property (object_class,
                                         PROP_MANAGER,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]