Author: stefan2
Date: Tue Apr 10 15:49:38 2012
New Revision: 1311801
URL: http://svn.apache.org/viewvc?rev=1311801&view=rev
Log:
On the reprop-cache branch: rename parameter and variable names.
* subversion/include/private/svn_named_atomic.h
(svn_atomic_namespace__create): "anamespace" -> "ns",
"pool" -> "result_pool"
(svn_named_atomic__get): "anamespace" -> "ns"
* subversion/libsvn_subr/svn_named_atomic.c
(initialize): "anamespace" -> "ns", improve commentary
(svn_atomic_namespace__create): "anamespace" -> "ns",
"pool" -> "result_pool"
(svn_named_atomic__get): "anamespace" -> "ns"
* subversion/tests/libsvn_subr/named_atomic-test.c
(test_basics, test_bignums, test_multiple_atomics, init_test_shm,
test_pipeline_thread): "anamespace" -> "ns"
Suggested by: danielsh, philip
Modified:
subversion/branches/revprop-cache/subversion/include/private/svn_named_atomic.h
subversion/branches/revprop-cache/subversion/libsvn_subr/svn_named_atomic.c
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c
Modified:
subversion/branches/revprop-cache/subversion/include/private/svn_named_atomic.h
URL:
http://svn.apache.org/viewvc/subversion/branches/revprop-cache/subversion/include/private/svn_named_atomic.h?rev=1311801&r1=1311800&r2=1311801&view=diff
==============================================================================
---
subversion/branches/revprop-cache/subversion/include/private/svn_named_atomic.h
(original)
+++
subversion/branches/revprop-cache/subversion/include/private/svn_named_atomic.h
Tue Apr 10 15:49:38 2012
@@ -53,22 +53,22 @@ typedef struct svn_named_atomic__t svn_n
#define SVN_NAMED_ATOMIC__MAX_NAME_LENGTH 30
/** Create a namespace (i.e. access object) with the given @a name and
- * return it in @a *anamespace. If @a name is @c NULL, return the name
- * of the default namespace will be used.
+ * return it in @a *ns. If @a name is @c NULL, return the name of the
+ * default namespace will be used.
*
* Multiple access objects with the same name may be created. They access
* the same shared memory region but have independent lifetimes.
*
- * The access object will be allocated in @a pool and atomics gotten
+ * The access object will be allocated in @a result_pool and atomics gotten
* from this object will become invalid when the pool is being cleaned.
*/
svn_error_t *
-svn_atomic_namespace__create(svn_atomic_namespace__t **anamespace,
+svn_atomic_namespace__create(svn_atomic_namespace__t **ns,
const char *name,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
-/** Find the atomic with the specified @a name in @a anamespace and return
- * it in @a *atomic. If @a namespace is @c NULL, the default namespace
+/** Find the atomic with the specified @a name in namespace @a ns and
+ * return it in @a *atomic. If @a ns is @c NULL, the default namespace
* will be used. If no object with that name can be found, the behavior
* depends on @a auto_create. If it is @c FALSE, @a *atomic will be set
* to @c NULL. Otherwise, a new atomic will be created, its value set to 0
@@ -82,13 +82,13 @@ svn_atomic_namespace__create(svn_atomic_
* shared memory region. Therefore, this may fail with a variety of errors.
*
* Please note that the lifetime of the atomic is bound to the lifetime
- * of the @a anamespace object, i.e. the pool the latter was created in.
- * The default namespace (for @c anamespace=NULL) remains valid until APR
- * gets cleaned up.
+ * of the @a ns object, i.e. the pool the latter was created in.
+ * The default namespace (for @c ns = NULL) remains valid until APR gets
+ * cleaned up.
*/
svn_error_t *
svn_named_atomic__get(svn_named_atomic__t **atomic,
- svn_atomic_namespace__t *anamespace,
+ svn_atomic_namespace__t *ns,
const char *name,
svn_boolean_t auto_create);
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=1311801&r1=1311800&r2=1311801&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
Tue Apr 10 15:49:38 2012
@@ -276,7 +276,7 @@ initialize(void *baton, apr_pool_t *pool
{
apr_status_t apr_err;
const char *temp_dir, *shm_name;
- struct svn_atomic_namespace__t *anamespace = baton;
+ struct svn_atomic_namespace__t *ns = baton;
SVN_ERR(svn_atomic__init_once(&mutex_initialized,
init_mutex,
@@ -285,26 +285,26 @@ initialize(void *baton, apr_pool_t *pool
/* The namespace will use its own (sub-)pool for all allocations.
*/
- anamespace->pool = svn_pool_create(pool);
+ ns->pool = svn_pool_create(pool);
/* Use the default namespace if none has been given.
* All namespaces sharing the same name are equivalent and see
* the same data, even within the same process.
*/
- if (anamespace->name == NULL)
- anamespace->name = DEFAULT_NAMESPACE_NAME;
+ if (ns->name == NULL)
+ ns->name = DEFAULT_NAMESPACE_NAME;
/* Construct the name of the SHM file. If the namespace is not
* absolute, we put it into the temp dir.
*/
- shm_name = anamespace->name;
+ shm_name = ns->name;
if (!svn_dirent_is_absolute(shm_name))
{
- SVN_ERR(svn_io_temp_dir(&temp_dir, anamespace->pool));
- shm_name = svn_dirent_join(temp_dir, shm_name, anamespace->pool);
+ SVN_ERR(svn_io_temp_dir(&temp_dir, ns->pool));
+ shm_name = svn_dirent_join(temp_dir, shm_name, ns->pool);
}
- shm_name = apr_pstrcat(anamespace->pool, shm_name, SHM_NAME_SUFFIX, NULL);
+ shm_name = apr_pstrcat(ns->pool, shm_name, SHM_NAME_SUFFIX, NULL);
/* Prevent concurrent initialization.
*/
@@ -313,32 +313,33 @@ 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(&anamespace->shared_mem, shm_name,
anamespace->pool);
+ apr_err = apr_shm_attach(&ns->shared_mem, shm_name, ns->pool);
if (apr_err)
{
- apr_err = apr_shm_create(&anamespace->shared_mem,
- sizeof(*anamespace->data),
+ apr_err = apr_shm_create(&ns->shared_mem,
+ sizeof(*ns->data),
shm_name,
- anamespace->pool);
+ ns->pool);
if (apr_err)
return unlock(svn_error_wrap_apr(apr_err,
_("Can't get shared memory for named atomics")));
- anamespace->data = apr_shm_baseaddr_get(anamespace->shared_mem);
+ ns->data = apr_shm_baseaddr_get(ns->shared_mem);
/* Zero all counters, values and names.
*/
- memset(anamespace->data, 0, sizeof(*anamespace->data));
+ memset(ns->data, 0, sizeof(*ns->data));
}
else
- anamespace->data = apr_shm_baseaddr_get(anamespace->shared_mem);
+ ns->data = apr_shm_baseaddr_get(ns->shared_mem);
- /* Cache the number of existing, complete entries. There can't be incomplete
- * onces from other processes because we hold the mutex. Our process may
also
- * not access this information since we are being called from within
- * svn_atomic__init_once.
+ /* Cache the number of existing, complete entries. There can't be
+ * incomplete onces from other processes because we hold the mutex.
+ * Our process will also not access this information since we are
+ * wither being called from within svn_atomic__init_once or by
+ * svn_atomic_namespace__create for a new object.
*/
- anamespace->min_used = anamespace->data->count;
+ ns->min_used = ns->data->count;
/* Unlock to allow other processes may access the shared memory as well.
*/
@@ -358,24 +359,24 @@ validate(svn_named_atomic__t *atomic)
/* Implement API */
svn_error_t *
-svn_atomic_namespace__create(svn_atomic_namespace__t **anamespace,
+svn_atomic_namespace__create(svn_atomic_namespace__t **ns,
const char *name,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_atomic_namespace__t *new_namespace
= apr_pcalloc(pool, sizeof(*new_namespace));
- new_namespace->name = apr_pstrdup(pool, name);
- SVN_ERR(initialize(new_namespace, pool));
+ new_namespace->name = apr_pstrdup(result_pool, name);
+ SVN_ERR(initialize(new_namespace, result_pool));
- *anamespace = new_namespace;
+ *ns = new_namespace;
return SVN_NO_ERROR;
}
svn_error_t *
svn_named_atomic__get(svn_named_atomic__t **atomic,
- svn_atomic_namespace__t *anamespace,
+ svn_atomic_namespace__t *ns,
const char *name,
svn_boolean_t auto_create)
{
@@ -393,13 +394,13 @@ svn_named_atomic__get(svn_named_atomic__
/* Auto-initialize our access to the shared memory
*/
- if (anamespace == NULL)
+ if (ns == NULL)
{
SVN_ERR(svn_atomic__init_once(&default_namespace.initialized,
initialize,
&default_namespace,
NULL));
- anamespace = &default_namespace;
+ ns = &default_namespace;
}
/* Optimistic lookup.
@@ -407,27 +408,27 @@ svn_named_atomic__get(svn_named_atomic__
* append new ones, we can safely compare the name of existing ones
* with the name that we are looking for.
*/
- for (i = 0, count = svn_atomic_read(&anamespace->min_used); i < count; ++i)
- if (strncmp(anamespace->data->atomics[i].name, name, len + 1) == 0)
+ for (i = 0, count = svn_atomic_read(&ns->min_used); i < count; ++i)
+ if (strncmp(ns->data->atomics[i].name, name, len + 1) == 0)
{
- *atomic = &anamespace->data->atomics[i];
+ *atomic = &ns->data->atomics[i];
return SVN_NO_ERROR;
}
/* Try harder:
* Serialize all lookup and insert the item, if necessary and allowed.
*/
- SVN_ERR(lock(anamespace));
+ SVN_ERR(lock(ns));
/* We only need to check for new entries.
*/
- for (i = count; i < anamespace->data->count; ++i)
- if (strcmp(anamespace->data->atomics[i].name, name) == 0)
+ for (i = count; i < ns->data->count; ++i)
+ if (strcmp(ns->data->atomics[i].name, name) == 0)
{
- *atomic = &anamespace->data->atomics[i];
+ *atomic = &ns->data->atomics[i];
/* Update our cached number of complete entries. */
- svn_atomic_set(&anamespace->min_used, anamespace->data->count);
+ svn_atomic_set(&ns->min_used, ns->data->count);
return unlock(error);
}
@@ -436,15 +437,15 @@ svn_named_atomic__get(svn_named_atomic__
*/
if (auto_create)
{
- if (anamespace->data->count < MAX_ATOMIC_COUNT)
+ if (ns->data->count < MAX_ATOMIC_COUNT)
{
- anamespace->data->atomics[anamespace->data->count].value = 0;
- memcpy(anamespace->data->atomics[anamespace->data->count].name,
+ ns->data->atomics[ns->data->count].value = 0;
+ memcpy(ns->data->atomics[ns->data->count].name,
name,
len+1);
- *atomic = &anamespace->data->atomics[anamespace->data->count];
- ++anamespace->data->count;
+ *atomic = &ns->data->atomics[ns->data->count];
+ ++ns->data->count;
}
else
error = svn_error_create(SVN_ERR_BAD_ATOMIC, 0,
@@ -458,7 +459,7 @@ svn_named_atomic__get(svn_named_atomic__
/* Only now can we be sure that a full memory barrier has been set
* and that the new entry has been written to memory in full.
*/
- svn_atomic_set(&anamespace->min_used, anamespace->data->count);
+ svn_atomic_set(&ns->min_used, ns->data->count);
return SVN_NO_ERROR;
}
Modified:
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c?rev=1311801&r1=1311800&r2=1311801&view=diff
==============================================================================
---
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c
(original)
+++
subversion/branches/revprop-cache/subversion/tests/libsvn_subr/named_atomic-test.c
Tue Apr 10 15:49:38 2012
@@ -73,19 +73,19 @@ fail(apr_pool_t *pool, const char *fmt,
static svn_error_t *
test_basics(apr_pool_t *pool)
{
- svn_atomic_namespace__t *anamespace;
+ svn_atomic_namespace__t *ns;
svn_named_atomic__t *atomic;
apr_int64_t value;
/* Use a separate namespace for our tests isolate them from production */
- SVN_ERR(svn_atomic_namespace__create(&anamespace, TEST_NAMESPACE, pool));
+ SVN_ERR(svn_atomic_namespace__create(&ns, TEST_NAMESPACE, pool));
/* Test a non-exisiting atomic */
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME "x", FALSE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME "x", FALSE));
SVN_TEST_ASSERT(atomic == NULL);
/* Now, we auto-create it */
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME, TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME, TRUE));
SVN_TEST_ASSERT(atomic != NULL);
/* The default value should be 0 */
@@ -151,15 +151,15 @@ test_basics(apr_pool_t *pool)
static svn_error_t *
test_bignums(apr_pool_t *pool)
{
- svn_atomic_namespace__t *anamespace;
+ svn_atomic_namespace__t *ns;
svn_named_atomic__t *atomic;
apr_int64_t value;
/* Use a separate namespace for our tests isolate them from production */
- SVN_ERR(svn_atomic_namespace__create(&anamespace, TEST_NAMESPACE, pool));
+ SVN_ERR(svn_atomic_namespace__create(&ns, TEST_NAMESPACE, pool));
/* Auto-create our atomic variable */
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME, TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME, TRUE));
SVN_TEST_ASSERT(atomic != NULL);
/* Write should return the previous value. */
@@ -197,7 +197,7 @@ test_bignums(apr_pool_t *pool)
static svn_error_t *
test_multiple_atomics(apr_pool_t *pool)
{
- svn_atomic_namespace__t *anamespace;
+ svn_atomic_namespace__t *ns;
svn_named_atomic__t *atomic1;
svn_named_atomic__t *atomic2;
svn_named_atomic__t *atomic1_alias;
@@ -206,18 +206,18 @@ test_multiple_atomics(apr_pool_t *pool)
apr_int64_t value2;
/* Use a separate namespace for our tests isolate them from production */
- SVN_ERR(svn_atomic_namespace__create(&anamespace, TEST_NAMESPACE, pool));
+ SVN_ERR(svn_atomic_namespace__create(&ns, TEST_NAMESPACE, pool));
/* Create two atomics */
- SVN_ERR(svn_named_atomic__get(&atomic1, anamespace, ATOMIC_NAME "1", TRUE));
- SVN_ERR(svn_named_atomic__get(&atomic2, anamespace, ATOMIC_NAME "2", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic1, ns, ATOMIC_NAME "1", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic2, ns, ATOMIC_NAME "2", TRUE));
SVN_TEST_ASSERT(atomic1 != NULL);
SVN_TEST_ASSERT(atomic2 != NULL);
SVN_TEST_ASSERT(atomic1 != atomic2);
/* Get aliases to those */
- SVN_ERR(svn_named_atomic__get(&atomic1_alias, anamespace, ATOMIC_NAME "1",
TRUE));
- SVN_ERR(svn_named_atomic__get(&atomic2_alias, anamespace, ATOMIC_NAME "2",
TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic1_alias, ns, ATOMIC_NAME "1", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic2_alias, ns, ATOMIC_NAME "2", TRUE));
SVN_TEST_ASSERT(atomic1 == atomic1_alias);
SVN_TEST_ASSERT(atomic2 == atomic2_alias);
@@ -317,35 +317,35 @@ test_namespaces(apr_pool_t *pool)
static svn_error_t *
init_test_shm(apr_pool_t *pool)
{
- svn_atomic_namespace__t *anamespace;
+ svn_atomic_namespace__t *ns;
svn_named_atomic__t *atomic;
apr_pool_t *scratch = svn_pool_create(pool);
/* get the two I/O atomics for this thread */
- SVN_ERR(svn_atomic_namespace__create(&anamespace, TEST_NAMESPACE, scratch));
+ SVN_ERR(svn_atomic_namespace__create(&ns, TEST_NAMESPACE, scratch));
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME, TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME, TRUE));
SVN_ERR(svn_named_atomic__write(NULL, 0, atomic));
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME "0", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME "0", TRUE));
SVN_ERR(svn_named_atomic__write(NULL, 0, atomic));
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME "1", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME "1", TRUE));
SVN_ERR(svn_named_atomic__write(NULL, 0, atomic));
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME "2", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME "2", TRUE));
SVN_ERR(svn_named_atomic__write(NULL, 0, atomic));
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME "3", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME "3", TRUE));
SVN_ERR(svn_named_atomic__write(NULL, 0, atomic));
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, "counter", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, "counter", TRUE));
SVN_ERR(svn_named_atomic__write(NULL, 0, atomic));
apr_pool_clear(scratch);
- SVN_ERR(svn_atomic_namespace__create(&anamespace, TEST_NAMESPACE "1",
scratch));
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME, TRUE));
+ SVN_ERR(svn_atomic_namespace__create(&ns, TEST_NAMESPACE "1", scratch));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME, TRUE));
SVN_ERR(svn_named_atomic__write(NULL, 0, atomic));
apr_pool_clear(scratch);
- SVN_ERR(svn_atomic_namespace__create(&anamespace, TEST_NAMESPACE "2",
scratch));
- SVN_ERR(svn_named_atomic__get(&atomic, anamespace, ATOMIC_NAME, TRUE));
+ SVN_ERR(svn_atomic_namespace__create(&ns, TEST_NAMESPACE "2", scratch));
+ SVN_ERR(svn_named_atomic__get(&atomic, ns, ATOMIC_NAME, TRUE));
SVN_ERR(svn_named_atomic__write(NULL, 0, atomic));
apr_pool_clear(scratch);
@@ -445,7 +445,7 @@ run_threads(apr_pool_t *pool, int iterat
static svn_error_t *
test_pipeline_thread(int thread_no, int thread_count, int iterations,
apr_pool_t *pool)
{
- svn_atomic_namespace__t *anamespace;
+ svn_atomic_namespace__t *ns;
svn_named_atomic__t *atomicIn;
svn_named_atomic__t *atomicOut;
svn_named_atomic__t *atomicCounter;
@@ -453,9 +453,9 @@ test_pipeline_thread(int thread_no, int
apr_int64_t i, counter;
/* get the two I/O atomics for this thread */
- SVN_ERR(svn_atomic_namespace__create(&anamespace, TEST_NAMESPACE, pool));
+ SVN_ERR(svn_atomic_namespace__create(&ns, TEST_NAMESPACE, pool));
SVN_ERR(svn_named_atomic__get(&atomicIn,
- anamespace,
+ ns,
apr_pstrcat(pool,
ATOMIC_NAME,
apr_itoa(pool,
@@ -463,7 +463,7 @@ test_pipeline_thread(int thread_no, int
NULL),
TRUE));
SVN_ERR(svn_named_atomic__get(&atomicOut,
- anamespace,
+ ns,
apr_pstrcat(pool,
ATOMIC_NAME,
apr_itoa(pool,
@@ -471,7 +471,7 @@ test_pipeline_thread(int thread_no, int
NULL),
TRUE));
- SVN_ERR(svn_named_atomic__get(&atomicCounter, anamespace, "counter", TRUE));
+ SVN_ERR(svn_named_atomic__get(&atomicCounter, ns, "counter", TRUE));
if (thread_no == 0)
{
