You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2011/05/20 00:58:39 UTC

svn commit: r1125162 - /subversion/trunk/subversion/libsvn_subr/cache-membuffer.c

Author: ivan
Date: Thu May 19 22:58:38 2011
New Revision: 1125162

URL: http://svn.apache.org/viewvc?rev=1125162&view=rev
Log:
Simplify and optimize membuffer cache.

* subversion/libsvn_subr/cache-membuffer.c
  (svn_cache__membuffer_cache_create): Use apr_pcalloc() for allocate and 
   initialize 'directory' and 'group_initialized' objects. Do not initialize
   'initialize_group' twice.

Modified:
    subversion/trunk/subversion/libsvn_subr/cache-membuffer.c

Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1125162&r1=1125161&r2=1125162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Thu May 19 22:58:38 2011
@@ -1047,13 +1047,13 @@ svn_cache__membuffer_cache_create(svn_me
       c[seg].segment_count = segment_count;
 
       c[seg].group_count = group_count;
-      c[seg].directory =
-          secure_aligned_alloc(pool,
-                               group_count * sizeof(entry_group_t),
-                               FALSE);
-      c[seg].group_initialized = secure_aligned_alloc(pool, 
-                                                      group_init_size, 
-                                                      FALSE);
+      c[seg].directory = apr_pcalloc(pool,
+                                     group_count * sizeof(entry_group_t));
+
+      /* Allocate and initialize directory entries as "not initialized",
+         hence "unused" */
+      c[seg].group_initialized = apr_pcalloc(pool, group_init_size);
+
       c[seg].first = NO_INDEX;
       c[seg].last = NO_INDEX;
       c[seg].next = NO_INDEX;
@@ -1079,10 +1079,6 @@ svn_cache__membuffer_cache_create(svn_me
           return svn_error_wrap_apr(APR_ENOMEM, _("OOM"));
         }
 
-      /* initialize directory entries as "not initialized", hence "unused"
-       */
-      memset(c[seg].group_initialized, 0, group_init_size);
-
 #if APR_HAS_THREADS
       /* A lock for intra-process synchronization to the cache, or NULL if
        * the cache's creator doesn't feel the cache needs to be