Attachment 127862 Details for Bug 98653 – debug-sender: fix messages queue locking

[patch] debug-sender: fix messages queue locking

1000-debug-sender-fix-messages-queue-locking.patch (text/plain), 1.97 KB, created by Fabrice Bellet on 2016-11-09 09:58:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabrice Bellet

Created: 2016-11-09 09:58:25 UTC

Size: 1.97 KB

patch

obsolete

>From 2e6ad616770260801d8ad6fc61c21f98c616162d Mon Sep 17 00:00:00 2001
>From: Fabrice Bellet <fabrice@bellet.info>
>Date: Wed, 9 Nov 2016 10:49:27 +0100
>Subject: [PATCH] debug-sender: fix messages queue locking
>
>---
> telepathy-glib/debug-sender.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
>diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
>index 599d967..1a50471 100644
>--- a/telepathy-glib/debug-sender.c
>+++ b/telepathy-glib/debug-sender.c
>@@ -82,6 +82,7 @@ struct _TpDebugSenderPrivate
>   gboolean enabled;
>   gboolean timestamps;
>   GQueue *messages;
>+  GMutex messages_lock;
> };
> 
> typedef struct {
>@@ -192,7 +193,9 @@ tp_debug_sender_finalize (GObject *object)
> {
>   TpDebugSender *self = TP_DEBUG_SENDER (object);
> 
>+  g_mutex_lock (&self->priv->messages_lock);
>   g_queue_foreach (self->priv->messages, (GFunc) debug_message_free, NULL);
>+  g_mutex_unlock (&self->priv->messages_lock);
>   g_queue_free (self->priv->messages);
>   self->priv->messages = NULL;
> 
>@@ -288,6 +291,7 @@ get_messages (TpSvcDebug *self,
>   GList *i;
>   guint j;
> 
>+  g_mutex_lock (&dbg->priv->messages_lock);
>   messages = g_ptr_array_sized_new (g_queue_get_length (dbg->priv->messages));
> 
>   for (i = dbg->priv->messages->head; i; i = i->next)
>@@ -306,6 +310,7 @@ get_messages (TpSvcDebug *self,
>           G_MAXUINT);
>       g_ptr_array_add (messages, g_value_get_boxed (&gvalue));
>     }
>+  g_mutex_unlock (&dbg->priv->messages_lock);
> 
>   tp_svc_debug_return_from_get_messages (context, messages);
> 
>@@ -360,6 +365,7 @@ _tp_debug_sender_take (TpDebugSender *self,
>     DebugMessage *new_msg)
> {
> #ifdef ENABLE_DEBUG_CACHE
>+  g_mutex_lock (&self->priv->messages_lock);
>   if (g_queue_get_length (self->priv->messages) >= DEBUG_MESSAGE_LIMIT)
>     {
>       DebugMessage *old_head =
>@@ -369,6 +375,7 @@ _tp_debug_sender_take (TpDebugSender *self,
>     }
> 
>   g_queue_push_tail (self->priv->messages, new_msg);
>+  g_mutex_unlock (&self->priv->messages_lock);
> #endif
> 
>   if (self->priv->enabled)
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 98653: 127862

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.