/*****************************************************************************
* vlc_gcrypt.h: VLC thread support for gcrypt
*****************************************************************************
- * Copyright (C) 2004-2008 Rémi Denis-Courmont
+ * Copyright (C) 2004-2010 Rémi Denis-Courmont
*
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+/**
+ * \file
+ * This file implements gcrypt support functions in vlc
+ */
+
+#include <errno.h>
+
#ifdef LIBVLC_USE_PTHREAD
/**
* If possible, use gcrypt-provided thread implementation. This is so that
GCRY_THREAD_OPTION_PTHREAD_IMPL;
# define gcry_threads_vlc gcry_threads_pthread
#else
+
/**
* gcrypt thread option VLC implementation
*/
static int gcry_vlc_mutex_init( void **p_sys )
{
- int i_val;
vlc_mutex_t *p_lock = (vlc_mutex_t *)malloc( sizeof( vlc_mutex_t ) );
-
if( p_lock == NULL)
return ENOMEM;
- i_val = vlc_mutex_init( p_lock );
- if( i_val )
- free( p_lock );
- else
- *p_sys = p_lock;
- return i_val;
+ vlc_mutex_init( p_lock );
+ *p_sys = p_lock;
+ return VLC_SUCCESS;
}
static int gcry_vlc_mutex_destroy( void **p_sys )
return VLC_SUCCESS;
}
-static struct gcry_thread_cbs gcry_threads_vlc =
+static const struct gcry_thread_cbs gcry_threads_vlc =
{
GCRY_THREAD_OPTION_USER,
NULL,
/**
* Initializes gcrypt with proper locking.
- * @return VLC_SUCCESS on success, a VLC error code otherwise.
*/
static inline void vlc_gcrypt_init (void)
{
- vlc_mutex_t *lock = var_AcquireMutex ("gcrypt_mutex");
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
- vlc_mutex_unlock (lock);
+ /* This would need a process-wide static mutex with all libraries linking
+ * to a given instance of libgcrypt. We cannot do this as we have different
+ * plugins linking with gcrypt, and some underlying libraries may use it
+ * behind our back. Only way is to always link gcrypt statically (ouch!) or
+ * have upstream gcrypt provide one shared object per threading system. */
+ static bool done = false;
+
+ vlc_global_lock (VLC_GCRYPT_MUTEX);
+ if (!done)
+ {
+ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
+ done = true;
+ }
+ vlc_global_unlock (VLC_GCRYPT_MUTEX);
}