Author: stsp
Date: Wed Oct 12 16:21:37 2011
New Revision: 1182459
URL: http://svn.apache.org/viewvc?rev=1182459&view=rev
Log:
Fix some test fallout with thread-less APR caused by the svn_mutex merge.
* subversion/libsvn_fs_fs/fs.c
(fs_serialized_init): Don't try to enable mutexes if APR is thread-less.
* subversion/libsvn_fs/fs-loader.c
(svn_fs_initialize): Same.
* subversion/tests/libsvn_subr/cache-test.c
(test_inprocess_cache_basic): Same.
Modified:
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/libsvn_fs_fs/fs.c
subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1182459&r1=1182458&r2=1182459&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Wed Oct 12 16:21:37 2011
@@ -265,8 +265,9 @@ svn_fs_initialize(apr_pool_t *pool)
return SVN_NO_ERROR;
common_pool = svn_pool_create(pool);
+#if APR_HAS_THREADS
SVN_ERR(svn_mutex__init(&common_pool_lock, TRUE, common_pool));
-
+#endif
/* ### This won't work if POOL is NULL and libsvn_fs is loaded as a DSO
### (via libsvn_ra_local say) since the global common_pool will live
### longer than the DSO, which gets unloaded when the pool used to
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.c?rev=1182459&r1=1182458&r2=1182459&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.c Wed Oct 12 16:21:37 2011
@@ -95,7 +95,8 @@ fs_serialized_init(svn_fs_t *fs, apr_poo
SVN_ERR(svn_mutex__init(&ffsd->txn_current_lock,
SVN_FS_FS__USE_LOCK_MUTEX, common_pool));
- SVN_ERR(svn_mutex__init(&ffsd->txn_list_lock, TRUE, common_pool));
+ SVN_ERR(svn_mutex__init(&ffsd->txn_list_lock,
+ SVN_FS_FS__USE_LOCK_MUTEX, common_pool));
key = apr_pstrdup(common_pool, key);
status = apr_pool_userdata_set(ffsd, key, NULL, common_pool);
Modified: subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/cache-test.c?rev=1182459&r1=1182458&r2=1182459&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/cache-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/cache-test.c Wed Oct 12
16:21:37 2011
@@ -135,7 +135,11 @@ test_inprocess_cache_basic(apr_pool_t *p
APR_HASH_KEY_STRING,
1,
1,
+#if APR_HAS_THREADS
TRUE,
+#else
+ FALSE,
+#endif
"",
pool));
