1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
/*
* sb_bucket.c : a serf bucket that wraps a spillbuf
*
* ====================================================================
* 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 <serf.h>
#include <serf_bucket_util.h>
#include "svn_private_config.h"
#include "private/svn_subr_private.h"
#include "ra_serf.h"
#define SB_BLOCKSIZE 1024
#define SB_MAXSIZE 32768
struct sbb_baton
{
svn_spillbuf_t *spillbuf;
const char *holding;
apr_size_t hold_len;
apr_pool_t *scratch_pool;
};
svn_error_t *
svn_ra_serf__copy_into_spillbuf(svn_spillbuf_t **spillbuf,
serf_bucket_t *bkt,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
*spillbuf = svn_spillbuf__create(SB_BLOCKSIZE, SB_MAXSIZE, result_pool);
/* Copy all data from the bucket into the spillbuf. */
while (TRUE)
{
apr_status_t status;
const char *data;
apr_size_t len;
status = serf_bucket_read(bkt, SERF_READ_ALL_AVAIL, &data, &len);
if (status != APR_SUCCESS && status != APR_EOF)
return svn_ra_serf__wrap_err(status, _("Failed to read the request"));
SVN_ERR(svn_spillbuf__write(*spillbuf, data, len, scratch_pool));
if (status == APR_EOF)
break;
}
return SVN_NO_ERROR;
}
static apr_status_t
sb_bucket_read(serf_bucket_t *bucket, apr_size_t requested,
const char **data, apr_size_t *len)
{
struct sbb_baton *sbb = bucket->data;
svn_error_t *err;
if (sbb->holding)
{
*data = sbb->holding;
if (requested < sbb->hold_len)
{
*len = requested;
sbb->holding += requested;
sbb->hold_len -= requested;
return APR_SUCCESS;
}
/* Return whatever we're holding, and then forget (consume) it. */
*len = sbb->hold_len;
sbb->holding = NULL;
return APR_SUCCESS;
}
err = svn_spillbuf__read(data, len, sbb->spillbuf, sbb->scratch_pool);
svn_pool_clear(sbb->scratch_pool);
/* ### do something with this */
svn_error_clear(err);
/* The spillbuf may have returned more than requested. Stash any extra
into our holding area. */
if (requested < *len)
{
sbb->holding = *data + requested;
sbb->hold_len = *len - requested;
*len = requested;
}
return *data == NULL ? APR_EOF : APR_SUCCESS;
}
static apr_status_t
sb_bucket_readline(serf_bucket_t *bucket, int acceptable,
int *found,
const char **data, apr_size_t *len)
{
/* ### for now, we know callers won't use this function. */
svn_error_clear(svn_error__malfunction(TRUE, __FILE__, __LINE__,
"Not implemented."));
return APR_ENOTIMPL;
}
static apr_status_t
sb_bucket_peek(serf_bucket_t *bucket,
const char **data, apr_size_t *len)
{
struct sbb_baton *sbb = bucket->data;
svn_error_t *err;
/* If we're not holding any data, then fill it. */
if (sbb->holding == NULL)
{
err = svn_spillbuf__read(&sbb->holding, &sbb->hold_len, sbb->spillbuf,
sbb->scratch_pool);
svn_pool_clear(sbb->scratch_pool);
/* ### do something with this */
svn_error_clear(err);
}
/* Return the data we are (now) holding. */
*data = sbb->holding;
*len = sbb->hold_len;
return *data == NULL ? APR_EOF : APR_SUCCESS;
}
static const serf_bucket_type_t sb_bucket_vtable = {
"SPILLBUF",
sb_bucket_read,
sb_bucket_readline,
serf_default_read_iovec,
serf_default_read_for_sendfile,
serf_default_read_bucket,
sb_bucket_peek,
serf_default_destroy_and_data,
};
serf_bucket_t *
svn_ra_serf__create_sb_bucket(svn_spillbuf_t *spillbuf,
serf_bucket_alloc_t *allocator,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
struct sbb_baton *sbb;
sbb = serf_bucket_mem_alloc(allocator, sizeof(*sbb));
sbb->spillbuf = spillbuf;
sbb->holding = NULL;
sbb->scratch_pool = svn_pool_create(result_pool);
return serf_bucket_create(&sb_bucket_vtable, allocator, sbb);
}
|
