Author: brane
Date: Sun Feb 1 23:25:33 2015
New Revision: 1656376
URL: http://svn.apache.org/r1656376
Log:
On the reuse-ra-session branch: Fix end-of-line styles.
* subversion/libsvn_client/ra_cache.h,
subversion/libsvn_client/ra_cache.c: Set svn:eol-style to native.
Modified:
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
(contents, props changed)
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
(contents, props changed)
Modified:
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c?rev=1656376&r1=1656375&r2=1656376&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
Sun Feb 1 23:25:33 2015
@@ -1,418 +1,418 @@
-/*
- * ra_cache.c : RA session cache layer
- *
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- */
-
-#include <apr_pools.h>
-
-#include "svn_dirent_uri.h"
-#include "svn_private_config.h"
-
-#include "ra_cache.h"
-#include "private/svn_debug.h"
-
-#if 0
-#define RCTX_DBG(x) SVN_DBG(x)
-#else
-#define RCTX_DBG(x) while(0)
-#endif
-
-typedef struct cached_session_s
-{
- svn_ra_session_t *session;
-
- /* POOL that owns this session. NULL if session is not used. */
- apr_pool_t *owner_pool;
-
- /* Current callbacks table. */
- svn_ra_callbacks2_t *cb_table;
-
- /* Current callbacks table. */
- void *cb_baton;
-
- /* Repository root URL. */
- const char *root_url;
-
- /* ID of RA session. Used only for diagnostics purpose. */
- int id;
-
- /* Last progress reported by this session. */
- apr_off_t last_progress;
-
- /* Accumulated progress since last session open. */
- apr_off_t progress;
-} cached_session_t;
-
-struct svn_client__ra_cache_s
-{
- /* Hashtable of cached RA sessions. Keys are RA_SESSION_T and values
- * are CACHED_SESION_T pointers. */
- apr_hash_t *cached_session;
- apr_pool_t *pool;
- apr_hash_t *config;
-
- /* Next ID for RA sessions. Used only for diagnostics purpose. */
- int next_id;
-};
-
-static apr_status_t
-cleanup_session(void *data)
-{
- cached_session_t *cache_entry = data;
-
- cache_entry->owner_pool = NULL;
- cache_entry->cb_table = NULL;
- cache_entry->cb_baton = NULL;
-
- RCTX_DBG(("SESSION(%d): Released\r\n", cache_entry->id));
-
- return APR_SUCCESS;
-}
-
-svn_client__ra_cache_t *
-svn_client__ra_cache_create(apr_hash_t *config,
- apr_pool_t *pool)
-{
- svn_client__ra_cache_t *ctx = apr_pcalloc(pool, sizeof(*ctx));
-
- ctx->pool = pool;
- ctx->cached_session = apr_hash_make(pool);
- ctx->config = config;
-
- return ctx;
-}
-
-static svn_error_t *
-get_wc_contents(void *baton,
- svn_stream_t **contents,
- const svn_checksum_t *checksum,
- apr_pool_t *pool)
-{
- cached_session_t *b = baton;
-
- if (!b->cb_table->get_wc_contents)
- {
- *contents = NULL;
- return SVN_NO_ERROR;
- }
-
- return b->cb_table->get_wc_contents(b->cb_baton, contents, checksum, pool);
-}
-
-static svn_error_t *
-open_tmp_file(apr_file_t **fp,
- void *baton,
- apr_pool_t *pool)
-{
- cached_session_t *b = baton;
- return svn_error_trace(b->cb_table->open_tmp_file(fp, b->cb_baton, pool));
-}
-
-/* This implements the 'svn_ra_get_wc_prop_func_t' interface. */
-static svn_error_t *
-get_wc_prop(void *baton,
- const char *relpath,
- const char *name,
- const svn_string_t **value,
- apr_pool_t *pool)
-{
- cached_session_t *b = baton;
-
- if (b->cb_table->get_wc_prop)
- {
- return svn_error_trace(
- b->cb_table->get_wc_prop(b->cb_baton, relpath, name, value,
- pool));
- }
- else
- {
- *value = NULL;
- return SVN_NO_ERROR;
- }
-}
-
-/* This implements the 'svn_ra_push_wc_prop_func_t' interface. */
-static svn_error_t *
-push_wc_prop(void *baton,
- const char *relpath,
- const char *name,
- const svn_string_t *value,
- apr_pool_t *pool)
-{
- cached_session_t *b = baton;
-
- if (b->cb_table->push_wc_prop)
- {
- return svn_error_trace(
- b->cb_table->push_wc_prop(b->cb_baton, relpath, name, value,
- pool));
- }
- else
- {
- return SVN_NO_ERROR;
- }
-}
-
-
-/* This implements the 'svn_ra_set_wc_prop_func_t' interface. */
-static svn_error_t *
-set_wc_prop(void *baton,
- const char *path,
- const char *name,
- const svn_string_t *value,
- apr_pool_t *pool)
-{
- cached_session_t *b = baton;
- if (b->cb_table->set_wc_prop)
- {
- return svn_error_trace(
- b->cb_table->set_wc_prop(b->cb_baton, path, name, value,
- pool));
- }
- else
- {
- return SVN_NO_ERROR;
- }
-}
-
-/* This implements the `svn_ra_invalidate_wc_props_func_t' interface. */
-static svn_error_t *
-invalidate_wc_props(void *baton,
- const char *path,
- const char *prop_name,
- apr_pool_t *pool)
-{
- cached_session_t *b = baton;
-
- if (b->cb_table->invalidate_wc_props)
- {
- return svn_error_trace(
- b->cb_table->invalidate_wc_props(b->cb_baton, path,
- prop_name, pool));
- }
- else
- {
- return SVN_NO_ERROR;
- }
-}
-
-static svn_error_t *
-get_client_string(void *baton,
- const char **name,
- apr_pool_t *pool)
-{
- cached_session_t *b = baton;
-
- if (b->cb_table->get_client_string)
- {
- return svn_error_trace(
- b->cb_table->get_client_string(b->cb_baton, name, pool));
- }
- else
- {
- *name = NULL;
- return SVN_NO_ERROR;
- }
-}
-
-static svn_error_t *
-cancel_callback(void *baton)
-{
- cached_session_t *b = baton;
-
- if (b->cb_table->cancel_func)
- {
- return svn_error_trace(b->cb_table->cancel_func(b->cb_baton));
- }
- else
- {
- return SVN_NO_ERROR;
- }
-}
-
-static void
-progress_func(apr_off_t progress,
- apr_off_t total,
- void *baton,
- apr_pool_t *pool)
-{
- cached_session_t *b = baton;
-
- b->progress += (progress - b->last_progress);
- b->last_progress = progress;
-
- if (b->cb_table->progress_func)
- b->cb_table->progress_func(b->progress, -1, b->cb_table->progress_baton,
- pool);
-}
-
-static svn_error_t *
-find_session_by_url(cached_session_t **cache_entry_p,
- svn_client__ra_cache_t *ctx,
- const char *url,
- apr_pool_t *scratch_pool)
-{
- apr_hash_index_t *hi;
-
- for (hi = apr_hash_first(scratch_pool, ctx->cached_session);
- hi; hi = apr_hash_next(hi))
- {
- cached_session_t *cache_entry = apr_hash_this_val(hi);
-
- if (cache_entry->owner_pool == NULL &&
- svn_uri__is_ancestor(cache_entry->root_url, url))
- {
- *cache_entry_p = cache_entry;
- return SVN_NO_ERROR;
- }
- }
-
- *cache_entry_p = NULL;
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_client__ra_cache_open_session(svn_ra_session_t **session_p,
- const char **corrected_p,
- svn_client__ra_cache_t *ctx,
- const char *base_url,
- const char *uuid,
- svn_ra_callbacks2_t *cbtable,
- void *callback_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- cached_session_t *cache_entry;
-
- if (corrected_p)
- *corrected_p = NULL;
-
- SVN_ERR(find_session_by_url(&cache_entry, ctx, base_url, scratch_pool));
-
- if (cache_entry)
- {
- const char *session_url;
-
- /* Attach new callback table and baton. */
- cache_entry->cb_table = cbtable;
- cache_entry->cb_baton = callback_baton;
-
- SVN_ERR(svn_ra_get_session_url(cache_entry->session, &session_url,
- scratch_pool));
-
- if (strcmp(session_url, base_url) != 0)
- {
- SVN_ERR(svn_ra_reparent(cache_entry->session, base_url,
- scratch_pool));
- }
-
- /* We found existing applicable session. Check UUID if requested. */
- if (uuid)
- {
- const char *repository_uuid;
-
- SVN_ERR(svn_ra_get_uuid2(cache_entry->session, &repository_uuid,
- scratch_pool));
- if (strcmp(uuid, repository_uuid) != 0)
- {
- /* Duplicate the uuid as it is allocated in sesspool */
- return svn_error_createf(SVN_ERR_RA_UUID_MISMATCH, NULL,
- _("Repository UUID '%s' doesn't "
- "match expected UUID '%s'"),
- repository_uuid, uuid);
- }
- }
-
- RCTX_DBG(("SESSION(%d): Reused\n", cache_entry->id));
- }
- else
- {
- /* No existing RA session found. Open new one. */
- svn_ra_callbacks2_t *cbtable_sink;
- svn_ra_session_t *session;
-
- cache_entry = apr_pcalloc(ctx->pool, sizeof(*cache_entry));
-
- SVN_ERR(svn_ra_create_callbacks(&cbtable_sink, ctx->pool));
- cbtable_sink->open_tmp_file = open_tmp_file;
- cbtable_sink->get_wc_prop = get_wc_prop;
- cbtable_sink->set_wc_prop = set_wc_prop;
- cbtable_sink->push_wc_prop = push_wc_prop;
- cbtable_sink->invalidate_wc_props = invalidate_wc_props;
- cbtable_sink->auth_baton = cbtable->auth_baton; /* new-style */
- cbtable_sink->progress_func = progress_func;
- cbtable_sink->progress_baton = cache_entry;
- cbtable_sink->cancel_func = cancel_callback;
- cbtable_sink->get_client_string = get_client_string;
- cbtable_sink->get_wc_contents = get_wc_contents;
-
- cache_entry->owner_pool = result_pool;
- cache_entry->cb_table = cbtable;
- cache_entry->cb_baton = callback_baton;
- cache_entry->id = ctx->next_id;
-
- SVN_ERR(svn_ra_open4(&session, corrected_p, base_url, uuid, cbtable_sink,
- cache_entry, ctx->config, ctx->pool));
-
- if (corrected_p && *corrected_p)
- {
- /* Caller is ready to follow redirection and we got redirection.
- Just return corrected URL without RA session. */
- return SVN_NO_ERROR;
- }
-
- cache_entry->session = session;
-
- SVN_ERR(svn_ra_get_repos_root2(session, &cache_entry->root_url,
- ctx->pool));
-
- RCTX_DBG(("SESSION(%d): Open('%s')\n", cache_entry->id, base_url));
-
- apr_hash_set(ctx->cached_session, &cache_entry->session,
- sizeof(cache_entry->session), cache_entry);
- ctx->next_id++;
- }
-
- cache_entry->owner_pool = result_pool;
- cache_entry->cb_table = cbtable;
- cache_entry->cb_baton = callback_baton;
- cache_entry->progress = 0;
- apr_pool_cleanup_register(result_pool, cache_entry, cleanup_session,
- apr_pool_cleanup_null);
-
- *session_p = cache_entry->session;
-
- return SVN_NO_ERROR;
-}
-
-void
-svn_client__ra_cache_release_session(svn_client__ra_cache_t *ctx,
- svn_ra_session_t *session)
-{
- cached_session_t *cache_entry = apr_hash_get(ctx->cached_session,
- &session, sizeof(session));
-
- SVN_ERR_ASSERT_NO_RETURN(cache_entry != NULL);
- SVN_ERR_ASSERT_NO_RETURN(cache_entry->owner_pool != NULL);
-
- apr_pool_cleanup_run(cache_entry->owner_pool, cache_entry,
- cleanup_session);
-}
+/*
+ * ra_cache.c : RA session cache layer
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ */
+
+#include <apr_pools.h>
+
+#include "svn_dirent_uri.h"
+#include "svn_private_config.h"
+
+#include "ra_cache.h"
+#include "private/svn_debug.h"
+
+#if 0
+#define RCTX_DBG(x) SVN_DBG(x)
+#else
+#define RCTX_DBG(x) while(0)
+#endif
+
+typedef struct cached_session_s
+{
+ svn_ra_session_t *session;
+
+ /* POOL that owns this session. NULL if session is not used. */
+ apr_pool_t *owner_pool;
+
+ /* Current callbacks table. */
+ svn_ra_callbacks2_t *cb_table;
+
+ /* Current callbacks table. */
+ void *cb_baton;
+
+ /* Repository root URL. */
+ const char *root_url;
+
+ /* ID of RA session. Used only for diagnostics purpose. */
+ int id;
+
+ /* Last progress reported by this session. */
+ apr_off_t last_progress;
+
+ /* Accumulated progress since last session open. */
+ apr_off_t progress;
+} cached_session_t;
+
+struct svn_client__ra_cache_s
+{
+ /* Hashtable of cached RA sessions. Keys are RA_SESSION_T and values
+ * are CACHED_SESION_T pointers. */
+ apr_hash_t *cached_session;
+ apr_pool_t *pool;
+ apr_hash_t *config;
+
+ /* Next ID for RA sessions. Used only for diagnostics purpose. */
+ int next_id;
+};
+
+static apr_status_t
+cleanup_session(void *data)
+{
+ cached_session_t *cache_entry = data;
+
+ cache_entry->owner_pool = NULL;
+ cache_entry->cb_table = NULL;
+ cache_entry->cb_baton = NULL;
+
+ RCTX_DBG(("SESSION(%d): Released\r\n", cache_entry->id));
+
+ return APR_SUCCESS;
+}
+
+svn_client__ra_cache_t *
+svn_client__ra_cache_create(apr_hash_t *config,
+ apr_pool_t *pool)
+{
+ svn_client__ra_cache_t *ctx = apr_pcalloc(pool, sizeof(*ctx));
+
+ ctx->pool = pool;
+ ctx->cached_session = apr_hash_make(pool);
+ ctx->config = config;
+
+ return ctx;
+}
+
+static svn_error_t *
+get_wc_contents(void *baton,
+ svn_stream_t **contents,
+ const svn_checksum_t *checksum,
+ apr_pool_t *pool)
+{
+ cached_session_t *b = baton;
+
+ if (!b->cb_table->get_wc_contents)
+ {
+ *contents = NULL;
+ return SVN_NO_ERROR;
+ }
+
+ return b->cb_table->get_wc_contents(b->cb_baton, contents, checksum, pool);
+}
+
+static svn_error_t *
+open_tmp_file(apr_file_t **fp,
+ void *baton,
+ apr_pool_t *pool)
+{
+ cached_session_t *b = baton;
+ return svn_error_trace(b->cb_table->open_tmp_file(fp, b->cb_baton, pool));
+}
+
+/* This implements the 'svn_ra_get_wc_prop_func_t' interface. */
+static svn_error_t *
+get_wc_prop(void *baton,
+ const char *relpath,
+ const char *name,
+ const svn_string_t **value,
+ apr_pool_t *pool)
+{
+ cached_session_t *b = baton;
+
+ if (b->cb_table->get_wc_prop)
+ {
+ return svn_error_trace(
+ b->cb_table->get_wc_prop(b->cb_baton, relpath, name, value,
+ pool));
+ }
+ else
+ {
+ *value = NULL;
+ return SVN_NO_ERROR;
+ }
+}
+
+/* This implements the 'svn_ra_push_wc_prop_func_t' interface. */
+static svn_error_t *
+push_wc_prop(void *baton,
+ const char *relpath,
+ const char *name,
+ const svn_string_t *value,
+ apr_pool_t *pool)
+{
+ cached_session_t *b = baton;
+
+ if (b->cb_table->push_wc_prop)
+ {
+ return svn_error_trace(
+ b->cb_table->push_wc_prop(b->cb_baton, relpath, name, value,
+ pool));
+ }
+ else
+ {
+ return SVN_NO_ERROR;
+ }
+}
+
+
+/* This implements the 'svn_ra_set_wc_prop_func_t' interface. */
+static svn_error_t *
+set_wc_prop(void *baton,
+ const char *path,
+ const char *name,
+ const svn_string_t *value,
+ apr_pool_t *pool)
+{
+ cached_session_t *b = baton;
+ if (b->cb_table->set_wc_prop)
+ {
+ return svn_error_trace(
+ b->cb_table->set_wc_prop(b->cb_baton, path, name, value,
+ pool));
+ }
+ else
+ {
+ return SVN_NO_ERROR;
+ }
+}
+
+/* This implements the `svn_ra_invalidate_wc_props_func_t' interface. */
+static svn_error_t *
+invalidate_wc_props(void *baton,
+ const char *path,
+ const char *prop_name,
+ apr_pool_t *pool)
+{
+ cached_session_t *b = baton;
+
+ if (b->cb_table->invalidate_wc_props)
+ {
+ return svn_error_trace(
+ b->cb_table->invalidate_wc_props(b->cb_baton, path,
+ prop_name, pool));
+ }
+ else
+ {
+ return SVN_NO_ERROR;
+ }
+}
+
+static svn_error_t *
+get_client_string(void *baton,
+ const char **name,
+ apr_pool_t *pool)
+{
+ cached_session_t *b = baton;
+
+ if (b->cb_table->get_client_string)
+ {
+ return svn_error_trace(
+ b->cb_table->get_client_string(b->cb_baton, name, pool));
+ }
+ else
+ {
+ *name = NULL;
+ return SVN_NO_ERROR;
+ }
+}
+
+static svn_error_t *
+cancel_callback(void *baton)
+{
+ cached_session_t *b = baton;
+
+ if (b->cb_table->cancel_func)
+ {
+ return svn_error_trace(b->cb_table->cancel_func(b->cb_baton));
+ }
+ else
+ {
+ return SVN_NO_ERROR;
+ }
+}
+
+static void
+progress_func(apr_off_t progress,
+ apr_off_t total,
+ void *baton,
+ apr_pool_t *pool)
+{
+ cached_session_t *b = baton;
+
+ b->progress += (progress - b->last_progress);
+ b->last_progress = progress;
+
+ if (b->cb_table->progress_func)
+ b->cb_table->progress_func(b->progress, -1, b->cb_table->progress_baton,
+ pool);
+}
+
+static svn_error_t *
+find_session_by_url(cached_session_t **cache_entry_p,
+ svn_client__ra_cache_t *ctx,
+ const char *url,
+ apr_pool_t *scratch_pool)
+{
+ apr_hash_index_t *hi;
+
+ for (hi = apr_hash_first(scratch_pool, ctx->cached_session);
+ hi; hi = apr_hash_next(hi))
+ {
+ cached_session_t *cache_entry = apr_hash_this_val(hi);
+
+ if (cache_entry->owner_pool == NULL &&
+ svn_uri__is_ancestor(cache_entry->root_url, url))
+ {
+ *cache_entry_p = cache_entry;
+ return SVN_NO_ERROR;
+ }
+ }
+
+ *cache_entry_p = NULL;
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__ra_cache_open_session(svn_ra_session_t **session_p,
+ const char **corrected_p,
+ svn_client__ra_cache_t *ctx,
+ const char *base_url,
+ const char *uuid,
+ svn_ra_callbacks2_t *cbtable,
+ void *callback_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ cached_session_t *cache_entry;
+
+ if (corrected_p)
+ *corrected_p = NULL;
+
+ SVN_ERR(find_session_by_url(&cache_entry, ctx, base_url, scratch_pool));
+
+ if (cache_entry)
+ {
+ const char *session_url;
+
+ /* Attach new callback table and baton. */
+ cache_entry->cb_table = cbtable;
+ cache_entry->cb_baton = callback_baton;
+
+ SVN_ERR(svn_ra_get_session_url(cache_entry->session, &session_url,
+ scratch_pool));
+
+ if (strcmp(session_url, base_url) != 0)
+ {
+ SVN_ERR(svn_ra_reparent(cache_entry->session, base_url,
+ scratch_pool));
+ }
+
+ /* We found existing applicable session. Check UUID if requested. */
+ if (uuid)
+ {
+ const char *repository_uuid;
+
+ SVN_ERR(svn_ra_get_uuid2(cache_entry->session, &repository_uuid,
+ scratch_pool));
+ if (strcmp(uuid, repository_uuid) != 0)
+ {
+ /* Duplicate the uuid as it is allocated in sesspool */
+ return svn_error_createf(SVN_ERR_RA_UUID_MISMATCH, NULL,
+ _("Repository UUID '%s' doesn't "
+ "match expected UUID '%s'"),
+ repository_uuid, uuid);
+ }
+ }
+
+ RCTX_DBG(("SESSION(%d): Reused\n", cache_entry->id));
+ }
+ else
+ {
+ /* No existing RA session found. Open new one. */
+ svn_ra_callbacks2_t *cbtable_sink;
+ svn_ra_session_t *session;
+
+ cache_entry = apr_pcalloc(ctx->pool, sizeof(*cache_entry));
+
+ SVN_ERR(svn_ra_create_callbacks(&cbtable_sink, ctx->pool));
+ cbtable_sink->open_tmp_file = open_tmp_file;
+ cbtable_sink->get_wc_prop = get_wc_prop;
+ cbtable_sink->set_wc_prop = set_wc_prop;
+ cbtable_sink->push_wc_prop = push_wc_prop;
+ cbtable_sink->invalidate_wc_props = invalidate_wc_props;
+ cbtable_sink->auth_baton = cbtable->auth_baton; /* new-style */
+ cbtable_sink->progress_func = progress_func;
+ cbtable_sink->progress_baton = cache_entry;
+ cbtable_sink->cancel_func = cancel_callback;
+ cbtable_sink->get_client_string = get_client_string;
+ cbtable_sink->get_wc_contents = get_wc_contents;
+
+ cache_entry->owner_pool = result_pool;
+ cache_entry->cb_table = cbtable;
+ cache_entry->cb_baton = callback_baton;
+ cache_entry->id = ctx->next_id;
+
+ SVN_ERR(svn_ra_open4(&session, corrected_p, base_url, uuid, cbtable_sink,
+ cache_entry, ctx->config, ctx->pool));
+
+ if (corrected_p && *corrected_p)
+ {
+ /* Caller is ready to follow redirection and we got redirection.
+ Just return corrected URL without RA session. */
+ return SVN_NO_ERROR;
+ }
+
+ cache_entry->session = session;
+
+ SVN_ERR(svn_ra_get_repos_root2(session, &cache_entry->root_url,
+ ctx->pool));
+
+ RCTX_DBG(("SESSION(%d): Open('%s')\n", cache_entry->id, base_url));
+
+ apr_hash_set(ctx->cached_session, &cache_entry->session,
+ sizeof(cache_entry->session), cache_entry);
+ ctx->next_id++;
+ }
+
+ cache_entry->owner_pool = result_pool;
+ cache_entry->cb_table = cbtable;
+ cache_entry->cb_baton = callback_baton;
+ cache_entry->progress = 0;
+ apr_pool_cleanup_register(result_pool, cache_entry, cleanup_session,
+ apr_pool_cleanup_null);
+
+ *session_p = cache_entry->session;
+
+ return SVN_NO_ERROR;
+}
+
+void
+svn_client__ra_cache_release_session(svn_client__ra_cache_t *ctx,
+ svn_ra_session_t *session)
+{
+ cached_session_t *cache_entry = apr_hash_get(ctx->cached_session,
+ &session, sizeof(session));
+
+ SVN_ERR_ASSERT_NO_RETURN(cache_entry != NULL);
+ SVN_ERR_ASSERT_NO_RETURN(cache_entry->owner_pool != NULL);
+
+ apr_pool_cleanup_run(cache_entry->owner_pool, cache_entry,
+ cleanup_session);
+}
Propchange:
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h?rev=1656376&r1=1656375&r2=1656376&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
Sun Feb 1 23:25:33 2015
@@ -1,75 +1,75 @@
-/**
- * ra_cache.h : RA session abstraction layer
- *
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- */
-
-#ifndef SVN_LIBSVN_ra_cache_H
-#define SVN_LIBSVN_ra_cache_H
-
-#include <apr_pools.h>
-
-#include "svn_auth.h"
-#include "svn_ra.h"
-#include "svn_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct svn_client__ra_cache_s svn_client__ra_cache_t;
-
-/* Allocates ra_cache structure in POOL. Will use CONFIG for
- for RA sessions created in this context. */
-svn_client__ra_cache_t *
-svn_client__ra_cache_create(apr_hash_t *config,
- apr_pool_t *pool);
-
-/* Open new repository access session to the repository at BASE_URL or
- reuses existing session cached in CTX.
-
- The function behavior is the same as svn_ra_open4() with ability
- to reuse sessions for same repository.
-
- The created session will be automatically returned to CTX on RESULT_POOL
- cleanup or by explicit svn_client__ra_cache_release_session() call.
-
- Uses SCRATCH_POOL for temporary allocations. */
-svn_error_t *
-svn_client__ra_cache_open_session(svn_ra_session_t **session_p,
- const char **corrected_p,
- svn_client__ra_cache_t *ctx,
- const char *base_url,
- const char *uuid,
- svn_ra_callbacks2_t *cbtable,
- void *callback_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/* Returns RA SESSION back to CTX. */
-void
-svn_client__ra_cache_release_session(svn_client__ra_cache_t *ctx,
- svn_ra_session_t *session);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* SVN_LIBSVN_ra_cache_H */
+/**
+ * ra_cache.h : RA session abstraction layer
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ */
+
+#ifndef SVN_LIBSVN_ra_cache_H
+#define SVN_LIBSVN_ra_cache_H
+
+#include <apr_pools.h>
+
+#include "svn_auth.h"
+#include "svn_ra.h"
+#include "svn_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+typedef struct svn_client__ra_cache_s svn_client__ra_cache_t;
+
+/* Allocates ra_cache structure in POOL. Will use CONFIG for
+ for RA sessions created in this context. */
+svn_client__ra_cache_t *
+svn_client__ra_cache_create(apr_hash_t *config,
+ apr_pool_t *pool);
+
+/* Open new repository access session to the repository at BASE_URL or
+ reuses existing session cached in CTX.
+
+ The function behavior is the same as svn_ra_open4() with ability
+ to reuse sessions for same repository.
+
+ The created session will be automatically returned to CTX on RESULT_POOL
+ cleanup or by explicit svn_client__ra_cache_release_session() call.
+
+ Uses SCRATCH_POOL for temporary allocations. */
+svn_error_t *
+svn_client__ra_cache_open_session(svn_ra_session_t **session_p,
+ const char **corrected_p,
+ svn_client__ra_cache_t *ctx,
+ const char *base_url,
+ const char *uuid,
+ svn_ra_callbacks2_t *cbtable,
+ void *callback_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+/* Returns RA SESSION back to CTX. */
+void
+svn_client__ra_cache_release_session(svn_client__ra_cache_t *ctx,
+ svn_ra_session_t *session);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_LIBSVN_ra_cache_H */
Propchange:
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra_cache.h
------------------------------------------------------------------------------
svn:eol-style = native
