From 89717011bc83fcf86467544aa8ba43de13e22657 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 3 Jun 2010 23:29:35 +0300 Subject: [PATCH] gcrypt: use vlc_global_mutex This saves a few mutexes, but it does not really solve gcrypt reentrancy. gcry_control() should only be called once for all per copy of gcrypt in the memory. This is hard to conciliate with dlopen(). --- include/vlc_gcrypt.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/vlc_gcrypt.h b/include/vlc_gcrypt.h index eec15c220f..4bb14f760a 100644 --- a/include/vlc_gcrypt.h +++ b/include/vlc_gcrypt.h @@ -1,7 +1,7 @@ /***************************************************************************** * 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 @@ -90,14 +90,13 @@ static inline void vlc_gcrypt_init (void) * 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 vlc_mutex_t lock = VLC_STATIC_MUTEX; static bool done = false; - vlc_mutex_lock (&lock); + vlc_global_lock (VLC_GCRYPT_MUTEX); if (!done) { gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc); done = true; } - vlc_mutex_unlock (&lock); + vlc_global_unlock (VLC_GCRYPT_MUTEX); } -- 2.39.2