[tracker/signal-enhancements: 1/2] tracker-store: Enhance signal behaviour for batch updates
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/signal-enhancements: 1/2] tracker-store: Enhance signal behaviour for batch updates
- Date: Wed, 15 Dec 2010 15:33:35 +0000 (UTC)
commit 6df9ef13245ec9cc6f20fc015909382dbdfdbf64
Author: Philip Van Hoof <philip codeminded be>
Date: Tue Dec 14 14:21:56 2010 +0100
tracker-store: Enhance signal behaviour for batch updates
src/tracker-store/tracker-resources.c | 102 ++++++++++++++++++++++++++++-----
src/tracker-store/tracker-store.c | 15 +++++
src/tracker-store/tracker-store.h | 63 ++++++++++----------
3 files changed, 134 insertions(+), 46 deletions(-)
---
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index e775e3a..8533563 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -85,12 +85,15 @@ enum {
typedef struct {
DBusConnection *connection;
guint signal_timeout;
+ gboolean freeze_emission;
+ gpointer signal_user_data;
} TrackerResourcesPrivate;
typedef struct {
DBusGMethodInvocation *context;
guint request_id;
DBusMessage *reply;
+ TrackerResources *self;
} TrackerDBusMethodInfo;
typedef struct {
@@ -100,6 +103,8 @@ typedef struct {
} InThreadPtr;
static void tracker_resources_finalize (GObject *object);
+static gboolean on_emit_signals (gpointer user_data);
+
static guint signals[LAST_SIGNAL] = { 0 };
static void
@@ -384,15 +389,69 @@ update_callback (GError *error, gpointer user_data)
dbus_g_method_return (info->context);
}
+static void
+freeze_signal_emission (TrackerResourcesPrivate *priv)
+{
+ g_source_remove (priv->signal_timeout);
+ priv->signal_timeout = 0;
+ priv->freeze_emission = TRUE;
+}
+
+static void
+thaw_signal_emission (TrackerResourcesPrivate *priv,
+ gboolean restart,
+ gboolean with_user_data,
+ gpointer user_data)
+{
+ if (restart && priv->signal_timeout == 0) {
+ if (with_user_data) {
+ priv->signal_user_data = user_data;
+ }
+ priv->signal_timeout = g_timeout_add_seconds (TRACKER_SIGNALS_SECONDS_PER_EMIT,
+ on_emit_signals,
+ priv->signal_user_data);
+ }
+ priv->freeze_emission = FALSE;
+}
+
+static void
+update_batch_callback (GError *error, gpointer user_data)
+{
+ TrackerDBusMethodInfo *info = user_data;
+
+ if (tracker_store_get_queue_size_for_priority (TRACKER_STORE_PRIORITY_LOW) == 0) {
+ TrackerResourcesPrivate *priv = TRACKER_RESOURCES_GET_PRIVATE (info->self);
+
+ thaw_signal_emission (priv, TRUE, FALSE, NULL);
+ }
+
+ g_object_unref (info->self);
+
+ if (error) {
+ tracker_dbus_request_failed (info->request_id,
+ info->context,
+ &error,
+ NULL);
+ dbus_g_method_return_error (info->context, error);
+ return;
+ }
+
+ tracker_dbus_request_success (info->request_id,
+ info->context);
+ dbus_g_method_return (info->context);
+}
+
+
void
tracker_resources_sparql_update (TrackerResources *self,
const gchar *update,
DBusGMethodInvocation *context,
GError **error)
{
- TrackerDBusMethodInfo *info;
- guint request_id;
- gchar *sender;
+ TrackerDBusMethodInfo *info;
+ guint request_id;
+ gchar *sender;
+ TrackerResourcesPrivate *priv;
request_id = tracker_dbus_get_next_request_id ();
@@ -411,6 +470,10 @@ tracker_resources_sparql_update (TrackerResources *self,
sender = dbus_g_method_get_sender (context);
+ priv = TRACKER_RESOURCES_GET_PRIVATE (self);
+
+ thaw_signal_emission (priv, FALSE, FALSE, NULL);
+
tracker_store_sparql_update (update, TRACKER_STORE_PRIORITY_HIGH,
update_callback, sender,
info, destroy_method_info);
@@ -443,9 +506,10 @@ tracker_resources_sparql_update_blank (TrackerResources *self,
DBusGMethodInvocation *context,
GError **error)
{
- TrackerDBusMethodInfo *info;
- guint request_id;
- gchar *sender;
+ TrackerDBusMethodInfo *info;
+ guint request_id;
+ gchar *sender;
+ TrackerResourcesPrivate *priv;
request_id = tracker_dbus_get_next_request_id ();
@@ -464,6 +528,10 @@ tracker_resources_sparql_update_blank (TrackerResources *self,
sender = dbus_g_method_get_sender (context);
+ priv = TRACKER_RESOURCES_GET_PRIVATE (self);
+
+ thaw_signal_emission (priv, FALSE, FALSE, NULL);
+
tracker_store_sparql_update_blank (update, TRACKER_STORE_PRIORITY_HIGH,
update_blank_callback, sender,
info, destroy_method_info);
@@ -497,9 +565,10 @@ tracker_resources_batch_sparql_update (TrackerResources *self,
DBusGMethodInvocation *context,
GError **error)
{
- TrackerDBusMethodInfo *info;
- guint request_id;
- gchar *sender;
+ TrackerDBusMethodInfo *info;
+ guint request_id;
+ gchar *sender;
+ TrackerResourcesPrivate *priv;
request_id = tracker_dbus_get_next_request_id ();
@@ -511,15 +580,22 @@ tracker_resources_batch_sparql_update (TrackerResources *self,
__FUNCTION__,
update);
+ priv = TRACKER_RESOURCES_GET_PRIVATE (self);
+
info = g_slice_new (TrackerDBusMethodInfo);
info->request_id = request_id;
info->context = context;
+ info->self = g_object_ref (self);
sender = dbus_g_method_get_sender (context);
+ if (!priv->freeze_emission && priv->signal_timeout != 0) {
+ freeze_signal_emission (priv);
+ }
+
tracker_store_sparql_update (update, TRACKER_STORE_PRIORITY_LOW,
- update_callback, sender,
+ update_batch_callback, sender,
info, destroy_method_info);
g_free (sender);
@@ -662,11 +738,7 @@ on_statements_committed (gpointer user_data)
tracker_class_transact_events (class);
}
- if (priv->signal_timeout == 0) {
- priv->signal_timeout = g_timeout_add_seconds (TRACKER_SIGNALS_SECONDS_PER_EMIT,
- on_emit_signals,
- user_data);
- }
+ thaw_signal_emission (priv, !priv->freeze_emission, TRUE, user_data);
/* Writeback feature */
tracker_writeback_transact ();
diff --git a/src/tracker-store/tracker-store.c b/src/tracker-store/tracker-store.c
index 7e8228b..c5250e2 100644
--- a/src/tracker-store/tracker-store.c
+++ b/src/tracker-store/tracker-store.c
@@ -566,6 +566,21 @@ tracker_store_get_queue_size (void)
return result;
}
+guint
+tracker_store_get_queue_size_for_priority (TrackerStorePriority priority)
+{
+ TrackerStorePrivate *private;
+ guint result = 0;
+
+ private = g_static_private_get (&private_key);
+ g_return_val_if_fail (private != NULL, 0);
+
+ result += g_queue_get_length (private->query_queues[priority]);
+ result += g_queue_get_length (private->update_queues[priority]);
+
+ return result;
+}
+
static void
unreg_task (TrackerStoreTask *task,
GError *error)
diff --git a/src/tracker-store/tracker-store.h b/src/tracker-store/tracker-store.h
index 46a6704..a6c9f89 100644
--- a/src/tracker-store/tracker-store.h
+++ b/src/tracker-store/tracker-store.h
@@ -52,40 +52,41 @@ typedef void (* TrackerStoreSparqlUpdateBlankCallback) (GPtrArray *blank_n
typedef void (* TrackerStoreTurtleCallback) (GError *error,
gpointer user_data);
-void tracker_store_init (void);
-void tracker_store_shutdown (void);
-void tracker_store_sparql_query (const gchar *sparql,
- TrackerStorePriority priority,
- TrackerStoreSparqlQueryInThread in_thread,
- TrackerStoreSparqlQueryCallback callback,
- const gchar *client_id,
- gpointer user_data,
- GDestroyNotify destroy);
-void tracker_store_sparql_update (const gchar *sparql,
- TrackerStorePriority priority,
- TrackerStoreSparqlUpdateCallback callback,
- const gchar *client_id,
- gpointer user_data,
- GDestroyNotify destroy);
-void tracker_store_sparql_update_blank (const gchar *sparql,
- TrackerStorePriority priority,
- TrackerStoreSparqlUpdateBlankCallback callback,
- const gchar *client_id,
- gpointer user_data,
- GDestroyNotify destroy);
-void tracker_store_queue_turtle_import (GFile *file,
- TrackerStoreTurtleCallback callback,
- const gchar *client_id,
- gpointer user_data,
- GDestroyNotify destroy);
+void tracker_store_init (void);
+void tracker_store_shutdown (void);
+void tracker_store_sparql_query (const gchar *sparql,
+ TrackerStorePriority priority,
+ TrackerStoreSparqlQueryInThread in_thread,
+ TrackerStoreSparqlQueryCallback callback,
+ const gchar *client_id,
+ gpointer user_data,
+ GDestroyNotify destroy);
+void tracker_store_sparql_update (const gchar *sparql,
+ TrackerStorePriority priority,
+ TrackerStoreSparqlUpdateCallback callback,
+ const gchar *client_id,
+ gpointer user_data,
+ GDestroyNotify destroy);
+void tracker_store_sparql_update_blank (const gchar *sparql,
+ TrackerStorePriority priority,
+ TrackerStoreSparqlUpdateBlankCallback callback,
+ const gchar *client_id,
+ gpointer user_data,
+ GDestroyNotify destroy);
+void tracker_store_queue_turtle_import (GFile *file,
+ TrackerStoreTurtleCallback callback,
+ const gchar *client_id,
+ gpointer user_data,
+ GDestroyNotify destroy);
-guint tracker_store_get_queue_size (void);
+guint tracker_store_get_queue_size (void);
+guint tracker_store_get_queue_size_for_priority (TrackerStorePriority priority);
-void tracker_store_unreg_batches (const gchar *client_id);
+void tracker_store_unreg_batches (const gchar *client_id);
-void tracker_store_set_active (gboolean active,
- GDestroyNotify callback,
- gpointer user_data);
+void tracker_store_set_active (gboolean active,
+ GDestroyNotify callback,
+ gpointer user_data);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
