diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-04-10 11:02:33 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-04-10 11:02:33 +0800 |
| commit | 35cd31644f6a1c44bfa54d12e199ec9e95edab6f (patch) | |
| tree | 8b1e2dc87bdf5f7729579c57e84376263bc0deea /camel/camel-private.h | |
| parent | 63a8a94536b64f931b64ac99e83de1f782cfcdf8 (diff) | |
| download | gsoc2013-evolution-35cd31644f6a1c44bfa54d12e199ec9e95edab6f.tar.gz gsoc2013-evolution-35cd31644f6a1c44bfa54d12e199ec9e95edab6f.tar.zst gsoc2013-evolution-35cd31644f6a1c44bfa54d12e199ec9e95edab6f.zip | |
Make the folder_lock recursive. See bug #22363 for details. Basically,
2002-04-09 Jeffrey Stedfast <fejj@ximian.com>
* camel-store.c (camel_store_init): Make the folder_lock
recursive. See bug #22363 for details. Basically,
get_folder_info() is requesting a diary folder which in turn
connects which requests then calls get_folder() but deadlocks
because get_folder_info already holds the lock.
svn path=/trunk/; revision=16419
Diffstat (limited to 'camel/camel-private.h')
| -rw-r--r-- | camel/camel-private.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camel/camel-private.h b/camel/camel-private.h index 78af7814b7..81cf2a4dad 100644 --- a/camel/camel-private.h +++ b/camel/camel-private.h @@ -59,16 +59,16 @@ struct _CamelFolderPrivate { struct _CamelStorePrivate { #ifdef ENABLE_THREADS - GMutex *folder_lock; /* for locking folder operations */ - GMutex *cache_lock; /* for locking access to the cache */ + EMutex *folder_lock; /* for locking folder operations */ + EMutex *cache_lock; /* for locking access to the cache */ #else gpointer dummy; #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)) +#define CAMEL_STORE_LOCK(f, l) (e_mutex_lock(((CamelStore *)f)->priv->l)) +#define CAMEL_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelStore *)f)->priv->l)) #else #define CAMEL_STORE_LOCK(f, l) #define CAMEL_STORE_UNLOCK(f, l) |