apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stri...@apache.org
Subject cvs commit: apr/memory/unix apr_pools.c
Date Thu, 30 May 2002 00:20:56 GMT
striker     02/05/29 17:20:56

  Modified:    include  apr_allocator.h apr_pools.h
               memory/unix apr_pools.c
  Log:
  Renames:
  
    apr_allocator_set_owner -> apr_allocator_owner_set
    apr_allocator_get_owner -> apr_allocator_owner_get
    apr_allocator_set_mutex -> apr_allocator_mutex_set
    apr_allocator_get_mutex -> apr_allocator_mutex_get
  
  Suggested by: Cliff Woolley
  
  Revision  Changes    Path
  1.7       +4 -4      apr/include/apr_allocator.h
  
  Index: apr_allocator.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_allocator.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_allocator.h	26 May 2002 09:00:08 -0000	1.6
  +++ apr_allocator.h	30 May 2002 00:20:56 -0000	1.7
  @@ -144,14 +144,14 @@
    * you can make a pool an owner, but if the pool doesn't use the allocator
    * the allocator will never be destroyed.
    */
  -APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
  +APR_DECLARE(void) apr_allocator_owner_set(apr_allocator_t *allocator,
                                             apr_pool_t *pool);
   
   /**
    * Get the current owner of the allocator
    * @param allocator The allocator to get the owner from
    */
  -APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(apr_allocator_t *allocator);
  +APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator);
   
   
   /**
  @@ -171,14 +171,14 @@
    * @param allocator The allocator to set the mutex for
    * @param mutex The mutex
    */
  -APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
  +APR_DECLARE(void) apr_allocator_mutex_set(apr_allocator_t *allocator,
                                             apr_thread_mutex_t *mutex);
   
   /**
    * Get the mutex currently set for the allocator
    * @param allocator The allocator
    */
  -APR_DECLARE(apr_thread_mutex_t *) apr_allocator_get_mutex(
  +APR_DECLARE(apr_thread_mutex_t *) apr_allocator_mutex_get(
                                         apr_allocator_t *allocator);
   #endif /* APR_HAS_THREADS */
   
  
  
  
  1.94      +1 -1      apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_pools.h,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- apr_pools.h	25 May 2002 20:17:45 -0000	1.93
  +++ apr_pools.h	30 May 2002 00:20:56 -0000	1.94
  @@ -150,7 +150,7 @@
    *                                    combination with the verbose flag above,
    *                                    it will output OWNER in such an event
    *                                    prior to aborting.  Use the debug
  - *                                    function apr_pool_set_owner() to switch
  + *                                    function apr_pool_owner_set() to switch
    *                                    a pools ownership.
    *
    * When no debug level was specified, assume general debug mode.
  
  
  
  1.171     +13 -13    apr/memory/unix/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
  retrieving revision 1.170
  retrieving revision 1.171
  diff -u -r1.170 -r1.171
  --- apr_pools.c	29 May 2002 23:02:24 -0000	1.170
  +++ apr_pools.c	30 May 2002 00:20:56 -0000	1.171
  @@ -142,26 +142,26 @@
   }
   
   #if APR_HAS_THREADS
  -APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
  +APR_DECLARE(void) apr_allocator_mutex_set(apr_allocator_t *allocator,
                                             apr_thread_mutex_t *mutex)
   {
       allocator->mutex = mutex;
   }
   
  -APR_DECLARE(apr_thread_mutex_t *) apr_allocator_get_mutex(
  +APR_DECLARE(apr_thread_mutex_t *) apr_allocator_mutex_get(
                                         apr_allocator_t *allocator)
   {
       return allocator->mutex;
   }
   #endif /* APR_HAS_THREADS */
   
  -APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
  +APR_DECLARE(void) apr_allocator_owner_set(apr_allocator_t *allocator,
                                             apr_pool_t *pool)
   {
       allocator->owner = pool;
   }
   
  -APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(apr_allocator_t *allocator)
  +APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator)
   {
       return allocator->owner;
   }
  @@ -174,7 +174,7 @@
   #if APR_HAS_THREADS
       apr_thread_mutex_t *mutex;
   
  -    mutex = apr_allocator_get_mutex(allocator);
  +    mutex = apr_allocator_mutex_get(allocator);
       if (mutex != NULL)
           apr_thread_mutex_lock(mutex);
   #endif /* APR_HAS_THREADS */
  @@ -553,11 +553,11 @@
               return rv;
           }
   
  -        apr_allocator_set_mutex(global_allocator, mutex);
  +        apr_allocator_mutex_set(global_allocator, mutex);
       }
   #endif /* APR_HAS_THREADS */
   
  -    apr_allocator_set_owner(global_allocator, global_pool);
  +    apr_allocator_owner_set(global_allocator, global_pool);
   
       return APR_SUCCESS;
   }
  @@ -754,7 +754,7 @@
   #if APR_HAS_THREADS
           apr_thread_mutex_t *mutex;
   
  -        if ((mutex = apr_allocator_get_mutex(pool->parent->allocator)) != NULL)
  +        if ((mutex = apr_allocator_mutex_get(pool->parent->allocator)) != NULL)
               apr_thread_mutex_lock(mutex);
   #endif /* APR_HAS_THREADS */
   
  @@ -775,11 +775,11 @@
       *active->ref = NULL;
   
   #if APR_HAS_THREADS
  -    if (apr_allocator_get_owner(allocator) == pool) {
  +    if (apr_allocator_owner_get(allocator) == pool) {
           /* Make sure to remove the lock, since it is highly likely to
            * be invalid now.
            */
  -        apr_allocator_set_mutex(allocator, NULL);
  +        apr_allocator_mutex_set(allocator, NULL);
       }
   #endif /* APR_HAS_THREADS */
   
  @@ -793,7 +793,7 @@
        * and the allocator).  Don't worry about destroying the optional mutex
        * in the allocator, it will have been destroyed by the cleanup function.
        */
  -    if (apr_allocator_get_owner(allocator) == pool) {
  +    if (apr_allocator_owner_get(allocator) == pool) {
           apr_allocator_destroy(allocator);
       }
   }
  @@ -848,7 +848,7 @@
   #if APR_HAS_THREADS
           apr_thread_mutex_t *mutex;
   
  -        if ((mutex = apr_allocator_get_mutex(allocator)) != NULL)
  +        if ((mutex = apr_allocator_mutex_get(allocator)) != NULL)
               apr_thread_mutex_lock(mutex);
   #endif /* APR_HAS_THREADS */
   
  @@ -1421,7 +1421,7 @@
       }
   
       if (pool->allocator != NULL
  -        && apr_allocator_get_owner(pool->allocator) == pool) {
  +        && apr_allocator_owner_get(pool->allocator) == pool) {
           apr_allocator_destroy(pool->allocator);
       }
   
  
  
  

Mime
View raw message