subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r927873 - in /subversion/branches/1.6.x: ./ CHANGES STATUS subversion/libsvn_subr/atomic.c
Date Fri, 26 Mar 2010 14:35:16 GMT
Author: hwright
Date: Fri Mar 26 14:35:15 2010
New Revision: 927873

URL: http://svn.apache.org/viewvc?rev=927873&view=rev
Log:
Merge r927323, r927328 from trunk:

 * r927323, r927328
   Return all atomical initialization errors wrapped in a
   SVN_ERR_ATOMIC_INIT_FAILURE error, to make sure they are not
   misidentified as just some error.
   Justification:
     This fix helps identifying some errors that were previously ignored
     as just another error.
   Votes:
     +1: rhuijben, stylesen, pburba

Modified:
    subversion/branches/1.6.x/   (props changed)
    subversion/branches/1.6.x/CHANGES   (props changed)
    subversion/branches/1.6.x/STATUS
    subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c

Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 26 14:35:15 2010
@@ -65,4 +65,4 @@
 /subversion/branches/tc_url_rev:870696-870828
 /subversion/branches/tree-conflicts:864636-869499
 /subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,876862,877016,877203,877595,877597,877665,878216,878269,878321,878341,878343,878399,878423,878426,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,917640,918211,922516
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,876862,877016,877203,877595,877597,877665,878216,878269,878321,878341,878343,878399,878423,878426,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,917640,918211,922516,927323,927328

Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 26 14:35:15 2010
@@ -64,4 +64,4 @@
 /subversion/branches/tc_url_rev/CHANGES:870696-870828
 /subversion/branches/tree-conflicts/CHANGES:864636-869499
 /subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-901365,901752,904301,904394,904594,905303,905326,917640,918211,922516
+/subversion/trunk/CHANGES:875962-901365,901752,904301,904394,904594,905303,905326,917640,918211,922516,927323,927328

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=927873&r1=927872&r2=927873&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Mar 26 14:35:15 2010
@@ -213,13 +213,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r927323, r927328
-   Return all atomical initialization errors wrapped in a
-   SVN_ERR_ATOMIC_INIT_FAILURE error, to make sure they are not
-   misidentified as just some error.
-   Justification:
-     This fix helps identifying some errors that were previously ignored
-     as just another error.
-   Votes:
-     +1: rhuijben, stylesen, pburba

Modified: subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c?rev=927873&r1=927872&r2=927873&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c Fri Mar 26 14:35:15 2010
@@ -28,6 +28,10 @@ svn_error_t*
 svn_atomic__init_once(volatile svn_atomic_t *global_status,
                       svn_error_t *(*init_func)(apr_pool_t*), apr_pool_t* pool)
 {
+  /* !! Don't use localizable strings in this function, because these
+     !! might cause deadlocks. This function can be used to initialize
+     !! libraries that are used for generating error messages. */
+
   /* We have to call init_func exactly once.  Because APR
      doesn't have statically-initialized mutexes, we implement a poor
      man's spinlock using svn_atomic_cas. */
@@ -46,7 +50,8 @@ svn_atomic__init_once(volatile svn_atomi
                          SVN_ATOMIC_INIT_FAILED,
                          SVN_ATOMIC_START_INIT);
 #endif
-          return err;
+          return svn_error_create(SVN_ERR_ATOMIC_INIT_FAILURE, err,
+                                  "Couldn't perform atomic initialization");
         }
       svn_atomic_cas(global_status,
                      SVN_ATOMIC_INITIALIZED,



Mime
View raw message