Changeset 3813

Timestamp:

11/19/08 15:45:25

Author:

svillar

Message:

Added some extra locking to prevent two sending threads running at the same time

Files:

• releases/modest/diablo-pe2/ChangeLog (modified) (1 diff)
• releases/modest/diablo-pe2/libtinymail-camel/tny-camel-send-queue-priv.h (modified) (1 diff)
• releases/modest/diablo-pe2/libtinymail-camel/tny-camel-send-queue.c (modified) (17 diffs)

releases/modest/diablo-pe2/ChangeLog

@@ -1 +1 @@
-2008-11-19  Sergio Villar Senin  <svillar@igalia.com>
-
+        * libtinymail-camel/tny-camel-send-queue.c
+        * libtinymail-camel/tny-camel-send-queue-priv.c:
+        added some extra locking to prevent two send queue threads running
+        at the same time
+
-        * libtinymail-camel/tny-camel-mime-part.c
- 
+
-        adds a reference to protect wrapper when decoding to a stream
-

releases/modest/diablo-pe2/libtinymail-camel/tny-camel-send-queue-priv.h

@@ -37 +37 @@
-        gboolean observer_attached;
-        gint pending_send_notifies;
+        GStaticMutex *running_lock; 
-};
-

releases/modest/diablo-pe2/libtinymail-camel/tny-camel-send-queue.c

@@ -69 +69 @@
-        gint i, total;
-        guint signal_id;
+        GCond *condition;
+        GMutex *mutex;
+        gboolean had_callback;
-} ControlInfo;
-
@@ -309 +312 @@
-                tny_lockable_unlock (apriv->session->priv->ui_lock);
-
+        if (info->mutex) {
+                g_mutex_lock (info->mutex);
+                g_cond_broadcast (info->condition);
+                info->had_callback = TRUE;
+                g_mutex_unlock (info->mutex);
+        }
+
-        return FALSE;
-}
@@ -568 +578 @@
-}
-
+static void
+wait_for_queue_start_notification (TnySendQueue *self)
+{
+        ControlInfo *info = g_slice_new0 (ControlInfo);
+
+        info->mutex = g_mutex_new ();
+        info->condition = g_cond_new ();
+        info->had_callback = FALSE;
+
+        info->self = g_object_ref (self);
+        info->signal_id = TNY_SEND_QUEUE_START;
+
+        g_idle_add (emit_queue_control_signals_on_mainloop, info);
+
+        g_mutex_lock (info->mutex);
+        if (!info->had_callback)
+                g_cond_wait (info->condition, info->mutex);
+        g_mutex_unlock (info->mutex);
+
+        g_mutex_free (info->mutex);
+        g_cond_free (info->condition);
+
+        g_slice_free (GetHeadersSync, info);
+}
+
+
-static gpointer
-thread_main (gpointer data)
@@ -579 +615 @@
-        GHashTable *failed_headers = NULL;
-
-
+
+
+
-        list = tny_simple_list_new ();
-
@@ -622 +660 @@
-                                get_headers_sync (info->outbox, headers, TRUE, &ferror);
-                        else {
-                                priv->is_running = FALSE;
-                                g_static_rec_mutex_unlock (priv->todo_lock);
-                                g_static_rec_mutex_unlock (priv->sending_lock);
@@ -630 +667 @@
-                        if (ferror != NULL)
-                        {
-                                priv->is_running = FALSE;
-                                emit_error (self, NULL, NULL, ferror, i, priv->total);
-                                g_error_free (ferror);
@@ -677 +713 @@
-                        if (length <= 0)
-                        {
-                                priv->is_running = FALSE;
-                                g_object_unref (headers);
-                                g_static_rec_mutex_unlock (priv->todo_lock);
@@ -766 +801 @@
-                } else 
-                {
-                        priv->is_running = FALSE;
-                        /* Not good, or we just went offline, let's just kill this thread */ 
-                        length = 0;
@@ -784 +818 @@
-errorhandler:
-
-        priv->is_running = FALSE;
-
-        if (failed_headers)
-                g_hash_table_destroy (failed_headers);
@@ -815 +847 @@
-        g_slice_free (MainThreadInfo, info);
-
+        g_static_mutex_lock (priv->running_lock);
+        priv->is_running = FALSE;
+        g_static_mutex_unlock (priv->running_lock);
+
-        /* Emit the queue-stop signal */
-        emit_queue_control_signals (self, TNY_SEND_QUEUE_STOP);
@@ -828 +864 @@
-        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (self);
-
+        g_static_mutex_lock (priv->running_lock);
-        if (!priv->is_running && priv->trans_account && TNY_IS_TRANSPORT_ACCOUNT (priv->trans_account))
-        {
@@ -872 +909 @@
-                        }
-
-
-
+
-                        priv->thread = g_thread_create (thread_main, info, FALSE, NULL);
-
-                        if (priv->thread == NULL) {
-
+
+
+
+
+
+
+
+
+
-                                if (TNY_IS_CAMEL_FOLDER (info->outbox)) {
-                                        TnyCamelFolderPriv *opriv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->outbox);
@@ -889 +933 @@
-                }
-        }
+        g_static_mutex_unlock (priv->running_lock);
-
-        return;
@@ -910 +955 @@
-        g_static_rec_mutex_lock (priv->sending_lock);
-
+        g_static_mutex_lock (priv->running_lock);
-        priv->is_running = FALSE;
+        g_static_mutex_unlock (priv->running_lock);
-
-        outbox = tny_send_queue_get_outbox (self);
@@ -992 +1039 @@
-                priv->total++;
-
- & !priv->is_running
+
-                create_worker (info->self, &new_err);
-
@@ -1271 +1318 @@
-        priv->sending_lock = NULL;
-
+        g_free (priv->running_lock);
+        priv->running_lock = NULL;
+
-        g_object_unref (priv->trans_account);
-
@@ -1442 +1492 @@
-        priv->sending_lock = g_new0 (GStaticRecMutex, 1);
-        g_static_rec_mutex_init (priv->sending_lock);
+        priv->running_lock = g_new0 (GStaticMutex, 1);
+        g_static_mutex_init (priv->running_lock);
-
-        priv->is_running = FALSE;