svn commit: r1299176 - /subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c

[st...@apache.org]

Author: stefan2
Date: Sat Mar 10 10:31:44 2012
New Revision: 1299176

URL: http://svn.apache.org/viewvc?rev=1299176&view=rev
Log:
On the revprop-cache branch: the file node that backs our
SHM must have a global path to be a) creatable, b) unique
and c) visible / known to all processes.

* subversion/libsvn_subr/svn_named_atomic.c
  (initialize): use a file in TMP instead of a local one

Modified:
    subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c

Modified: subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c?rev=1299176&r1=1299175&r2=1299176&view=diff
==============================================================================
--- subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c (original)
+++ subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c Sat Mar 10 10:31:44 2012
@@ -29,6 +29,8 @@
 #include "svn_private_config.h"
 #include "private/svn_atomic.h"
 #include "svn_pools.h"
+#include "svn_dirent_uri.h"
+#include "svn_io.h"
 
 /* Implementation aspects.
  * 
@@ -241,6 +243,7 @@ static svn_error_t *
 initialize(void *baton, apr_pool_t *pool)
 {
   apr_status_t apr_err;
+  const char *temp_dir, *shm_name;
   struct shared_mem_access_t *access = baton;
 
   /* Since this function will be called through svn_atomic__init_once,
@@ -249,6 +252,10 @@ initialize(void *baton, apr_pool_t *pool
    */
   access->pool = svn_pool_create(NULL);
 
+  /* construct the name of the SHM file */
+  SVN_ERR(svn_io_temp_dir(&temp_dir, access->pool));
+  shm_name = svn_dirent_join(temp_dir, SHM_NAME, access->pool);
+
   /* Next, we must ensure that no-one else tries to initialize the shared
    * memory while we are about to do the same.
    */
@@ -265,12 +272,12 @@ initialize(void *baton, apr_pool_t *pool
   /* First, look for an existing shared memory object.  If it doesn't
    * exist, create one.
    */
-  apr_err = apr_shm_attach(&access->shared_mem, SHM_NAME, access->pool);
+  apr_err = apr_shm_attach(&access->shared_mem, shm_name, access->pool);
   if (apr_err)
     {
       apr_err = apr_shm_create(&access->shared_mem,
                                sizeof(*access->data),
-                               SHM_NAME,
+                               shm_name,
                                access->pool);
       if (apr_err)
         return unlock(access, svn_error_wrap_apr(apr_err,