[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-123-g4616ee7

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  4616ee7b87f9afab5f5bd935fd8693308c9d4faf (commit)
      from  a0eaf78d2faad199085a7fb394491add8eb1380a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=4616ee7b87f9afab5f5bd935fd8693308c9d4faf


commit 4616ee7b87f9afab5f5bd935fd8693308c9d4faf
Author: Sandro Santilli <address@hidden>
Date:   Wed Feb 23 19:33:10 2011 +0100

    Don't use scoped_lock objects to hold locks requested by libcurl. Should 
fix bug #32579.

diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index bf5fa91..b1ca645 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -143,15 +143,12 @@ private:
 
     // mutex protecting share state
     boost::mutex _shareMutex;
-    boost::mutex::scoped_lock _shareMutexLock;
 
     // mutex protecting shared cookies
     boost::mutex _cookieMutex;
-    boost::mutex::scoped_lock _cookieMutexLock;
 
     // mutex protecting shared dns cache
     boost::mutex _dnscacheMutex;
-    boost::mutex::scoped_lock _dnscacheMutexLock;
 
     /// Import cookies, if requested
     //
@@ -238,11 +235,8 @@ CurlSession::CurlSession()
     :
     _shandle(0),
     _shareMutex(),
-    _shareMutexLock(_shareMutex, GNASH_DEFER_LOCK), // start unlocked
     _cookieMutex(),
-    _cookieMutexLock(_cookieMutex, GNASH_DEFER_LOCK), // start unlocked
-    _dnscacheMutex(),
-    _dnscacheMutexLock(_dnscacheMutex, GNASH_DEFER_LOCK) // start unlocked
+    _dnscacheMutex()
 {
     // TODO: handle an error here (throw an exception)
     curl_global_init(CURL_GLOBAL_ALL);
@@ -305,17 +299,17 @@ CurlSession::lockSharedHandle(CURL* handle, 
curl_lock_data data,
     switch (data) {
     case CURL_LOCK_DATA_DNS:
        //log_debug("Locking DNS cache mutex");
-       _dnscacheMutexLock.lock();
+       _dnscacheMutex.lock();
        //log_debug("DNS cache mutex locked");
        break;
     case CURL_LOCK_DATA_COOKIE:
        //log_debug("Locking cookies mutex");
-       _cookieMutexLock.lock(); 
+       _cookieMutex.lock(); 
        //log_debug("Cookies mutex locked");
             break;
     case CURL_LOCK_DATA_SHARE:
        //log_debug("Locking share mutex");
-       _shareMutexLock.lock(); 
+       _shareMutex.lock(); 
        //log_debug("Share mutex locked");
        break;
     case CURL_LOCK_DATA_SSL_SESSION:
@@ -344,15 +338,15 @@ CurlSession::unlockSharedHandle(CURL* handle, 
curl_lock_data data)
     switch (data) {
     case CURL_LOCK_DATA_DNS:
        //log_debug("Unlocking DNS cache mutex");
-       _dnscacheMutexLock.unlock();
+       _dnscacheMutex.unlock();
        break;
     case CURL_LOCK_DATA_COOKIE:
        //log_debug("Unlocking cookies mutex");
-       _cookieMutexLock.unlock();
+       _cookieMutex.unlock();
        break;
     case CURL_LOCK_DATA_SHARE:
        //log_debug("Unlocking share mutex");
-       _shareMutexLock.unlock();
+       _shareMutex.unlock();
        break;
     case CURL_LOCK_DATA_SSL_SESSION:
        log_error("unlockSharedHandle: SSL session locking "

-----------------------------------------------------------------------

Summary of changes:
 libbase/curl_adapter.cpp |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Gnash