svn commit: r1576167 - /subversion/trunk/subversion/libsvn_fs_x/fs.c

[ko...@apache.org]

Author: kotkov
Date: Tue Mar 11 01:26:36 2014
New Revision: 1576167

URL: http://svn.apache.org/r1576167
Log:
Port the txn-list-lock fix (r1568953) from FSFS to FSX.  The txn-list-lock
mutex is just a regular mutex that is required to work with a non thread
safe object.  Hence it should always be enabled.
Also see http://svn.haxx.se/dev/archive-2014-02/0175.shtml

* subversion/libsvn_fs_x/fs.c
  (x_serialized_init): Unconditionally enable the TXN_LIST_LOCK mutex
    when using a threaded APR.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/fs.c

Modified: subversion/trunk/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.c?rev=1576167&r1=1576166&r2=1576167&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.c Tue Mar 11 01:26:36 2014
@@ -103,8 +103,11 @@ x_serialized_init(svn_fs_t *fs, apr_pool
       SVN_ERR(svn_mutex__init(&ffsd->txn_current_lock,
                               SVN_FS_X__USE_LOCK_MUTEX, common_pool));
 
+      /* We also need a mutex for synchronizing access to the active
+         transaction list and free transaction pointer.  This one is
+         enabled unconditionally. */
       SVN_ERR(svn_mutex__init(&ffsd->txn_list_lock,
-                              SVN_FS_X__USE_LOCK_MUTEX, common_pool));
+                              TRUE, common_pool));
 
       key = apr_pstrdup(common_pool, key);
       status = apr_pool_userdata_set(ffsd, key, NULL, common_pool);