You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2012/03/21 05:41:11 UTC
svn commit: r1303280 - in /subversion/trunk/subversion/libsvn_ra_serf:
ra_serf.h util.c xml.c
Author: gstein
Date: Wed Mar 21 04:41:10 2012
New Revision: 1303280
URL: http://svn.apache.org/viewvc?rev=1303280&view=rev
Log:
Some general cleanup: remove the unused expand_string() function;
convert some functions to module-private; clarify some pool usage;
remove some custom request setup capability.
* subversion/libsvn_ra_serf/ra_serf.h:
(svn_ra_serf__accept_response): removed. made private.
(svn_ra_serf__setup_serf_req): removed. made private.
(svn_ra_serf__request_setup_t): removed. never used.
(svn_ra_serf__request_body_delegate_t,
svn_ra_serf__request_header_delegate_t): clarify pool param
(svn_ra_serf__handler_t): remove SETUP/SETUP_BATON. never used.
(svn_ra_serf__expand_string): removed. now unused.
* subversion/libsvn_ra_serf/xml.c:
(svn_ra_serf__expand_stirng): removed. now unused.
* subversion/libsvn_ra_serf/util.c:
(svn_ra_serf__accept_response): renamed to ...
(accept_response): ... this.
(accept_head): track rename to accept_response
(svn_ra_serf__setup_serf_req): renamed to ...
(setup_serf_req): ... this. added two pool parameters. HDRS_BKT is
now required (can't be NULL). use the request_pool rather than a
connection-level pool for the spillbuf and sb_bucket. for the
header values: stop copying them. their lifetime is fine.
(setup_request): rename POOL to REQUEST_POOL and add a SCRATCH_POOL
parameter. adjust docstring to note removal of CTX->setup(). pass
extra pool to setup_serf_req()
(setup_request_cb): pass a scratch_pool to setup_request().
Modified:
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/util.c
subversion/trunk/subversion/libsvn_ra_serf/xml.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1303280&r1=1303279&r2=1303280&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Wed Mar 21 04:41:10 2012
@@ -324,12 +324,6 @@ svn_ra_serf__conn_setup(apr_socket_t *so
void *baton,
apr_pool_t *pool);
-serf_bucket_t*
-svn_ra_serf__accept_response(serf_request_t *request,
- serf_bucket_t *stream,
- void *acceptor_baton,
- apr_pool_t *pool);
-
void
svn_ra_serf__conn_closed(serf_connection_t *conn,
void *closed_baton,
@@ -356,24 +350,6 @@ svn_ra_serf__handle_client_cert_pw(void
const char *cert_path,
const char **password);
-/*
- * Create a REQUEST with an associated REQ_BKT in the SESSION.
- *
- * If HDRS_BKT is not-NULL, it will be set to a headers_bucket that
- * corresponds to the new request.
- *
- * The request will be METHOD at URL.
- *
- * If BODY_BKT is not-NULL, it will be sent as the request body.
- *
- * If CONTENT_TYPE is not-NULL, it will be sent as the Content-Type header.
- */
-svn_error_t *
-svn_ra_serf__setup_serf_req(serf_request_t *request,
- serf_bucket_t **req_bkt, serf_bucket_t **hdrs_bkt,
- svn_ra_serf__connection_t *conn,
- const char *method, const char *url,
- serf_bucket_t *body_bkt, const char *content_type);
/*
* This function will run the serf context in SESS until *DONE is TRUE.
@@ -390,29 +366,20 @@ typedef svn_error_t *
void *handler_baton,
apr_pool_t *pool);
-/* Callback for setting up a complete serf request */
-typedef svn_error_t *
-(*svn_ra_serf__request_setup_t)(serf_request_t *request,
- void *setup_baton,
- serf_bucket_t **req_bkt,
- serf_response_acceptor_t *acceptor,
- void **acceptor_baton,
- svn_ra_serf__response_handler_t *handler,
- void **handler_baton,
- apr_pool_t *pool);
-
/* Callback for when a request body is needed. */
+/* ### should pass a scratch_pool */
typedef svn_error_t *
(*svn_ra_serf__request_body_delegate_t)(serf_bucket_t **body_bkt,
void *baton,
serf_bucket_alloc_t *alloc,
- apr_pool_t *pool);
+ apr_pool_t *request_pool);
/* Callback for when request headers are needed. */
+/* ### should pass a scratch_pool */
typedef svn_error_t *
(*svn_ra_serf__request_header_delegate_t)(serf_bucket_t *headers,
void *baton,
- apr_pool_t *pool);
+ apr_pool_t *request_pool);
/* Callback for when a response has an error. */
typedef svn_error_t *
@@ -446,15 +413,6 @@ typedef struct svn_ra_serf__handler_t {
svn_ra_serf__response_error_t response_error;
void *response_error_baton;
- /* This function and baton will be executed when the request is about
- * to be delivered by serf.
- *
- * This just passes through serf's raw request creation parameters.
- * None of the other parameters will be utilized if this field is set.
- */
- svn_ra_serf__request_setup_t setup;
- void *setup_baton;
-
/* This function and baton pair allows for custom request headers to
* be set.
*
@@ -534,8 +492,6 @@ typedef svn_error_t *
* of @a data with size @a len is encountered.
*
* This may be invoked multiple times for the same tag.
- *
- * @see svn_ra_serf__expand_string
*/
typedef svn_error_t *
(*svn_ra_serf__xml_cdata_chunk_handler_t)(svn_ra_serf__xml_parser_t *parser,
@@ -890,16 +846,6 @@ svn_ra_serf__expand_ns(svn_ra_serf__dav_
svn_ra_serf__ns_t *ns_list,
const char *name);
-/*
- * Expand the string represented by @a cur with a current size of @a
- * cur_len by appending @a new with a size of @a new_len.
- *
- * The reallocated string is made in @a pool.
- */
-void
-svn_ra_serf__expand_string(const char **cur, apr_size_t *cur_len,
- const char *new, apr_size_t new_len,
- apr_pool_t *pool);
/** PROPFIND-related functions **/
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1303280&r1=1303279&r2=1303280&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Wed Mar 21 04:41:10 2012
@@ -436,11 +436,13 @@ svn_ra_serf__conn_setup(apr_socket_t *so
return status;
}
-serf_bucket_t*
-svn_ra_serf__accept_response(serf_request_t *request,
- serf_bucket_t *stream,
- void *acceptor_baton,
- apr_pool_t *pool)
+
+/* Our default serf response acceptor. */
+static serf_bucket_t *
+accept_response(serf_request_t *request,
+ serf_bucket_t *stream,
+ void *acceptor_baton,
+ apr_pool_t *pool)
{
serf_bucket_t *c;
serf_bucket_alloc_t *bkt_alloc;
@@ -451,7 +453,9 @@ svn_ra_serf__accept_response(serf_reques
return serf_bucket_response_create(c, bkt_alloc);
}
-static serf_bucket_t*
+
+/* Custom response acceptor for HEAD requests. */
+static serf_bucket_t *
accept_head(serf_request_t *request,
serf_bucket_t *stream,
void *acceptor_baton,
@@ -459,8 +463,7 @@ accept_head(serf_request_t *request,
{
serf_bucket_t *response;
- response = svn_ra_serf__accept_response(request, stream, acceptor_baton,
- pool);
+ response = accept_response(request, stream, acceptor_baton, pool);
/* We know we shouldn't get a response body. */
serf_bucket_response_set_head(response);
@@ -630,23 +633,38 @@ apr_status_t svn_ra_serf__handle_client_
}
-svn_error_t *
-svn_ra_serf__setup_serf_req(serf_request_t *request,
- serf_bucket_t **req_bkt,
- serf_bucket_t **ret_hdrs_bkt,
- svn_ra_serf__connection_t *conn,
- const char *method, const char *url,
- serf_bucket_t *body_bkt, const char *content_type)
+/*
+ * Given a REQUEST on connection CONN, construct a request bucket for it,
+ * returning the bucket in *REQ_BKT.
+ *
+ * If HDRS_BKT is not-NULL, it will be set to a headers_bucket that
+ * corresponds to the new request.
+ *
+ * The request will be METHOD at URL.
+ *
+ * If BODY_BKT is not-NULL, it will be sent as the request body.
+ *
+ * If CONTENT_TYPE is not-NULL, it will be sent as the Content-Type header.
+ *
+ * REQUEST_POOL should live for the duration of the request. Serf will
+ * construct this and provide it to the request_setup callback, so we
+ * should just use that one.
+ */
+static svn_error_t *
+setup_serf_req(serf_request_t *request,
+ serf_bucket_t **req_bkt,
+ serf_bucket_t **hdrs_bkt,
+ svn_ra_serf__connection_t *conn,
+ const char *method, const char *url,
+ serf_bucket_t *body_bkt, const char *content_type,
+ apr_pool_t *request_pool,
+ apr_pool_t *scratch_pool)
{
serf_bucket_alloc_t *allocator = serf_request_get_alloc(request);
- serf_bucket_t *hdrs_bkt;
#if SERF_VERSION_AT_LEAST(1, 1, 0)
svn_spillbuf_t *buf;
- /* ### this should be passed */
- apr_pool_t *scratch_pool = conn->session->pool;
-
if (conn->http10 && body_bkt != NULL)
{
/* Ugh. Use HTTP/1.0 to talk to the server because we don't know if
@@ -657,19 +675,18 @@ svn_ra_serf__setup_serf_req(serf_request
then wrap a bucket around that spillbuf. The spillbuf will give
us the Content-Length value. */
SVN_ERR(svn_ra_serf__copy_into_spillbuf(&buf, body_bkt,
- conn->session->pool,
+ request_pool,
scratch_pool));
body_bkt = svn_ra_serf__create_sb_bucket(buf, allocator,
- conn->session->pool,
+ request_pool,
scratch_pool);
}
#endif
/* Create a request bucket. Note that this sucker is kind enough to
add a "Host" header for us. */
- *req_bkt =
- serf_request_bucket_request_create(request, method, url, body_bkt,
- allocator);
+ *req_bkt = serf_request_bucket_request_create(request, method, url,
+ body_bkt, allocator);
/* Set the Content-Length value. This will also trigger an HTTP/1.0
request (rather than the default chunked request). */
@@ -683,25 +700,24 @@ svn_ra_serf__setup_serf_req(serf_request
}
#endif
- hdrs_bkt = serf_bucket_request_get_headers(*req_bkt);
- serf_bucket_headers_setn(hdrs_bkt, "User-Agent", conn->useragent);
+ *hdrs_bkt = serf_bucket_request_get_headers(*req_bkt);
+
+ /* We use serf_bucket_headers_setn() because the string below have a
+ lifetime longer than this bucket. Thus, there is no need to copy
+ the header values. */
+ serf_bucket_headers_setn(*hdrs_bkt, "User-Agent", conn->useragent);
if (content_type)
{
- serf_bucket_headers_setn(hdrs_bkt, "Content-Type", content_type);
+ serf_bucket_headers_setn(*hdrs_bkt, "Content-Type", content_type);
}
/* These headers need to be sent with every request; see issue #3255
("mod_dav_svn does not pass client capabilities to start-commit
hooks") for why. */
- serf_bucket_headers_set(hdrs_bkt, "DAV", SVN_DAV_NS_DAV_SVN_DEPTH);
- serf_bucket_headers_set(hdrs_bkt, "DAV", SVN_DAV_NS_DAV_SVN_MERGEINFO);
- serf_bucket_headers_set(hdrs_bkt, "DAV", SVN_DAV_NS_DAV_SVN_LOG_REVPROPS);
-
- if (ret_hdrs_bkt)
- {
- *ret_hdrs_bkt = hdrs_bkt;
- }
+ serf_bucket_headers_setn(*hdrs_bkt, "DAV", SVN_DAV_NS_DAV_SVN_DEPTH);
+ serf_bucket_headers_setn(*hdrs_bkt, "DAV", SVN_DAV_NS_DAV_SVN_MERGEINFO);
+ serf_bucket_headers_setn(*hdrs_bkt, "DAV", SVN_DAV_NS_DAV_SVN_LOG_REVPROPS);
return SVN_NO_ERROR;
}
@@ -1986,40 +2002,26 @@ handle_response_cb(serf_request_t *reque
return serf_status;
}
-/* If the CTX->setup() callback is non-NULL, invoke it to carry out the
- majority of the serf_request_setup_t implementation. Otherwise, perform
- default setup, with special handling for HEAD requests, and finer-grained
- callbacks invoked (if non-NULL) to produce the request headers and
- body. */
+/* Perform basic request setup, with special handling for HEAD requests,
+ and finer-grained callbacks invoked (if non-NULL) to produce the request
+ headers and body. */
static svn_error_t *
setup_request(serf_request_t *request,
- svn_ra_serf__handler_t *ctx,
- serf_bucket_t **req_bkt,
- serf_response_acceptor_t *acceptor,
- void **acceptor_baton,
- serf_response_handler_t *handler,
- void **handler_baton,
- apr_pool_t *pool)
+ svn_ra_serf__handler_t *ctx,
+ serf_bucket_t **req_bkt,
+ serf_response_acceptor_t *acceptor,
+ void **acceptor_baton,
+ serf_response_handler_t *handler,
+ void **handler_baton,
+ apr_pool_t *request_pool,
+ apr_pool_t *scratch_pool)
{
serf_bucket_t *headers_bkt;
- *acceptor = svn_ra_serf__accept_response;
+ /* Default response acceptor. */
+ *acceptor = accept_response;
*acceptor_baton = ctx->session;
- if (ctx->setup)
- {
- svn_ra_serf__response_handler_t response_handler;
- void *response_baton;
-
- SVN_ERR(ctx->setup(request, ctx->setup_baton, req_bkt,
- acceptor, acceptor_baton,
- &response_handler, &response_baton,
- pool));
-
- ctx->response_handler = response_handler;
- ctx->response_baton = response_baton;
- }
- else
{
serf_bucket_t *body_bkt;
serf_bucket_alloc_t *bkt_alloc = serf_request_get_alloc(request);
@@ -2031,22 +2033,25 @@ setup_request(serf_request_t *request,
if (ctx->body_delegate)
{
+ /* ### should pass the scratch_pool */
SVN_ERR(ctx->body_delegate(&body_bkt, ctx->body_delegate_baton,
- bkt_alloc, pool));
+ bkt_alloc, request_pool));
}
else
{
body_bkt = NULL;
}
- SVN_ERR(svn_ra_serf__setup_serf_req(request, req_bkt, &headers_bkt,
- ctx->conn, ctx->method, ctx->path,
- body_bkt, ctx->body_type));
+ SVN_ERR(setup_serf_req(request, req_bkt, &headers_bkt,
+ ctx->conn, ctx->method, ctx->path,
+ body_bkt, ctx->body_type,
+ request_pool, scratch_pool));
if (ctx->header_delegate)
{
+ /* ### should pass the scratch_pool */
SVN_ERR(ctx->header_delegate(headers_bkt, ctx->header_delegate_baton,
- pool));
+ request_pool));
}
}
@@ -2072,11 +2077,15 @@ setup_request_cb(serf_request_t *request
svn_ra_serf__handler_t *ctx = setup_baton;
svn_error_t *err;
+ /* ### construct a scratch_pool? serf gives us a pool that will live for
+ ### the duration of the request. */
+ apr_pool_t *scratch_pool = pool;
+
err = setup_request(request, ctx,
req_bkt,
acceptor, acceptor_baton,
handler, handler_baton,
- pool);
+ pool /* request_pool */, scratch_pool);
if (err)
{
Modified: subversion/trunk/subversion/libsvn_ra_serf/xml.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/xml.c?rev=1303280&r1=1303279&r2=1303280&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/xml.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/xml.c Wed Mar 21 04:41:10 2012
@@ -124,34 +124,6 @@ svn_ra_serf__expand_ns(svn_ra_serf__dav_
return;
}
-void
-svn_ra_serf__expand_string(const char **cur, apr_size_t *cur_len,
- const char *new, apr_size_t new_len,
- apr_pool_t *pool)
-{
- if (!*cur)
- {
- *cur = apr_pstrmemdup(pool, new, new_len);
- *cur_len = new_len;
- }
- else
- {
- char *new_cur;
-
- /* append the data we received before. */
- new_cur = apr_palloc(pool, *cur_len + new_len + 1);
-
- memcpy(new_cur, *cur, *cur_len);
- memcpy(new_cur + *cur_len, new, new_len);
-
- /* NULL-term our new string */
- new_cur[*cur_len + new_len] = '\0';
-
- /* update our length */
- *cur_len += new_len;
- *cur = new_cur;
- }
-}
#define XML_HEADER "<?xml version=\"1.0\" encoding=\"utf-8\"?>"