Lock the command channel while searching. (imap_body_contains): If

2000-12-24  Not Zed  <NotZed@HelixCode.com>

        * providers/imap/camel-imap-search.c (imap_body_contains): Lock
        the command channel while searching.
        (imap_body_contains): If performing a whole uid search, then add
        references to our own summary items, dont look it up in the
        folder.  This way they can't vanish unexpectedly.

        * providers/imap/camel-imap-folder.h (CamelImapFolder): Added a
        private field.

        * providers/imap/camel-imap-private.h: Added lock for imap
        searches.

        * Merge from camel-mt-branch.

        * providers/imap/camel-imap-folder.c (imap_update_summary): Merge
        fix, use the folder->summary.
        (imap_get_message_flags, imap_set_message_flags,
        imap_get_message_user_flag, imap_set_message_user_flag): Removed
        again.
        (camel_imap_folder_init): Setup private data/lock.
        (imap_finalize): Free private data/search lock.
        (imap_search_free): Lock the search_lock.
        (imap_search_by_expression): Lock the search lock when using the
        search object.  Also copy/ref hte summary, rather than getting it
        directly.
        (imap_refresh_info): Free any info lookups.  Use folder->summary
        not imap_folder->summary.  And lock around commands.

svn path=/trunk/; revision=7150

1 files changed, 153 insertions, 0 deletions

diff --git a/camel/camel-private.h b/camel/camel-private.h
new file mode 100644
index 0000000000..cdfe878edd
--- /dev/null
+++ b/camel/camel-private.h
@@ -0,0 +1,153 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *  camel-private.h: Private info for class implementers.
+ *
+ * Authors: Michael Zucchi <notzed@helixcode.com>
+ *
+ * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License as 
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#ifndef CAMEL_PRIVATE_H
+#define CAMEL_PRIVATE_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus }*/
+
+/* need a way to configure and save this data, if this header is to
+   be installed.  For now, dont install it */
+
+#include "config.h"
+
+#ifdef ENABLE_THREADS
+#include <pthread.h>
+#include "e-util/e-msgport.h"
+#endif
+
+struct _CamelFolderPrivate {
+#ifdef ENABLE_THREADS
+	GMutex *lock;
+	GMutex *change_lock;
+#endif
+
+	/* must require the 'change_lock' to access this */
+	int frozen;
+	struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */
+};
+
+#ifdef ENABLE_THREADS
+#define CAMEL_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelFolder *)f)->priv->l))
+#define CAMEL_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelFolder *)f)->priv->l))
+#else
+#define CAMEL_FOLDER_LOCK(f, l)
+#define CAMEL_FOLDER_UNLOCK(f, l)
+#endif
+
+struct _CamelStorePrivate {
+#ifdef ENABLE_THREADS
+	GMutex *folder_lock;	/* for locking folder operations */
+	GMutex *cache_lock;	/* for locking access to the cache */
+#endif
+};
+
+#ifdef ENABLE_THREADS
+#define CAMEL_STORE_LOCK(f, l) (g_mutex_lock(((CamelStore *)f)->priv->l))
+#define CAMEL_STORE_UNLOCK(f, l) (g_mutex_unlock(((CamelStore *)f)->priv->l))
+#else
+#define CAMEL_STORE_LOCK(f, l)
+#define CAMEL_STORE_UNLOCK(f, l)
+#endif
+
+struct _CamelServicePrivate {
+#ifdef ENABLE_THREADS
+	EMutex *connect_lock;	/* for locking connection operations */
+#endif
+};
+
+#ifdef ENABLE_THREADS
+#define CAMEL_SERVICE_LOCK(f, l) (e_mutex_lock(((CamelService *)f)->priv->l))
+#define CAMEL_SERVICE_UNLOCK(f, l) (e_mutex_unlock(((CamelService *)f)->priv->l))
+#else
+#define CAMEL_SERVICE_LOCK(f, l)
+#define CAMEL_SERVICE_UNLOCK(f, l)
+#endif
+
+struct _CamelSessionPrivate {
+#ifdef ENABLE_THREADS
+	GMutex *lock;		/* for locking everything basically */
+#endif
+};
+
+#ifdef ENABLE_THREADS
+#define CAMEL_SESSION_LOCK(f, l) (g_mutex_lock(((CamelSession *)f)->priv->l))
+#define CAMEL_SESSION_UNLOCK(f, l) (g_mutex_unlock(((CamelSession *)f)->priv->l))
+#else
+#define CAMEL_SESSION_LOCK(f, l)
+#define CAMEL_SESSION_UNLOCK(f, l)
+#endif
+
+
+struct _CamelRemoteStorePrivate {
+#ifdef ENABLE_THREADS
+	EMutex *stream_lock;	/* for locking stream operations */
+#endif
+};
+
+#ifdef ENABLE_THREADS
+#define CAMEL_REMOTE_STORE_LOCK(f, l) (e_mutex_lock(((CamelRemoteStore *)f)->priv->l))
+#define CAMEL_REMOTE_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelRemoteStore *)f)->priv->l))
+#else
+#define CAMEL_REMOTE_STORE_LOCK(f, l)
+#define CAMEL_REMOTE_STORE_UNLOCK(f, l)
+#endif
+
+/* most of this stuff really is private, but the lock can be used by subordinate classes */
+struct _CamelFolderSummaryPrivate {
+	GHashTable *filter_charset;	/* CamelMimeFilterCharset's indexed by source charset */
+
+	CamelMimeFilterIndex *filter_index;
+	CamelMimeFilterBasic *filter_64;
+	CamelMimeFilterBasic *filter_qp;
+	CamelMimeFilterSave *filter_save;
+
+	struct ibex *index;
+
+#ifdef ENABLE_THREADS
+	GMutex *summary_lock;	/* for the summary hashtable/array */
+	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
+	GMutex *filter_lock;	/* for accessing any of the filtering/indexing stuff, since we share them */
+	GMutex *alloc_lock;	/* for setting up and using allocators */
+	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
+#endif
+};
+
+#ifdef ENABLE_THREADS
+#define CAMEL_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelFolderSummary *)f)->priv->l))
+#define CAMEL_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelFolderSummary *)f)->priv->l))
+#else
+#define CAMEL_SUMMARY_LOCK(f, l)
+#define CAMEL_SUMMARY_UNLOCK(f, l)
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* CAMEL_H */
+