You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2011/08/28 19:52:45 UTC
svn commit: r1162565 - /httpd/httpd/trunk/modules/http/byterange_filter.c
Author: rpluem
Date: Sun Aug 28 17:52:44 2011
New Revision: 1162565
URL: http://svn.apache.org/viewvc?rev=1162565&view=rev
Log:
* Do a better estimation on how elements we should allocate:
Preallocate the number of ranges as number of elements as this works good
for well behaving clients which we assume to be the most cases, but do
cut this at the arbitrary number of 100 to avoid too large preallocations.
Modified:
httpd/httpd/trunk/modules/http/byterange_filter.c
Modified: httpd/httpd/trunk/modules/http/byterange_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/byterange_filter.c?rev=1162565&r1=1162564&r2=1162565&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/byterange_filter.c (original)
+++ httpd/httpd/trunk/modules/http/byterange_filter.c Sun Aug 28 17:52:44 2011
@@ -62,7 +62,7 @@
APLOG_USE_MODULE(http);
static int ap_set_byterange(request_rec *r, apr_off_t clength,
- apr_array_header_t *indexes);
+ apr_array_header_t **indexes);
/*
* Here we try to be compatible with clients that want multipart/x-byteranges
@@ -80,6 +80,7 @@ static int use_range_x(request_rec *r)
}
#define BYTERANGE_FMT "%" APR_OFF_T_FMT "-%" APR_OFF_T_FMT "/%" APR_OFF_T_FMT
+#define MAX_PREALLOC_RANGES 100
static apr_status_t copy_brigade_range(apr_bucket_brigade *bb,
apr_bucket_brigade *bbout,
@@ -274,8 +275,6 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
indexes_t *idx;
int i;
- indexes = apr_array_make(r->pool, 10, sizeof(indexes_t));
-
/*
* Iterate through the brigade until reaching EOS or a bucket with
* unknown length.
@@ -298,7 +297,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
return ap_pass_brigade(f->next, bb);
}
- num_ranges = ap_set_byterange(r, clength, indexes);
+ num_ranges = ap_set_byterange(r, clength, &indexes);
/* We have nothing to do, get out of the way. */
if (num_ranges == 0) {
@@ -415,7 +414,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
}
static int ap_set_byterange(request_rec *r, apr_off_t clength,
- apr_array_header_t *indexes)
+ apr_array_header_t **indexes)
{
const char *range, *or;
const char *if_range;
@@ -428,6 +427,8 @@ static int ap_set_byterange(request_rec
int in_merge = 0;
indexes_t *idx;
int overlaps = 0, reversals = 0;
+ int i, ranges = 1;
+ const char *it;
if (r->assbackwards) {
return 0;
@@ -484,7 +485,17 @@ static int ap_set_byterange(request_rec
range += 6;
or = apr_pstrdup(r->pool, range);
- merged = apr_array_make(r->pool, 10, sizeof(char *));
+ it = range;
+ for (i = 0; i < strlen(it); i++) {
+ if (*it == ',') {
+ ranges++;
+ }
+ }
+ if (ranges > MAX_PREALLOC_RANGES) {
+ ranges = MAX_PREALLOC_RANGES;
+ }
+ *indexes = apr_array_make(r->pool, ranges, sizeof(indexes_t));
+ merged = apr_array_make(r->pool, ranges, sizeof(char *));
while ((cur = ap_getword(r->pool, &range, ','))) {
char *dash;
char *errp;
@@ -560,7 +571,7 @@ static int ap_set_byterange(request_rec
new = (char **)apr_array_push(merged);
*new = apr_psprintf(r->pool, "%" APR_OFF_T_FMT "-%" APR_OFF_T_FMT,
ostart, oend);
- idx = (indexes_t *)apr_array_push(indexes);
+ idx = (indexes_t *)apr_array_push(*indexes);
idx->start = ostart;
idx->end = oend;
sum_lengths += oend - ostart + 1;
@@ -576,7 +587,7 @@ static int ap_set_byterange(request_rec
new = (char **)apr_array_push(merged);
*new = apr_psprintf(r->pool, "%" APR_OFF_T_FMT "-%" APR_OFF_T_FMT,
ostart, oend);
- idx = (indexes_t *)apr_array_push(indexes);
+ idx = (indexes_t *)apr_array_push(*indexes);
idx->start = ostart;
idx->end = oend;
sum_lengths += oend - ostart + 1;
Re: svn commit: r1162565 - /httpd/httpd/trunk/modules/http/byterange_filter.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Aug 28, 2011, at 1:52 PM, rpluem@apache.org wrote:
> + *indexes = apr_array_make(r->pool, ranges, sizeof(indexes_t));
> + merged = apr_array_make(r->pool, ranges, sizeof(char *));
> while ((cur = ap_getword(r->pool, &range, ','))) {
> char *dash;
> char *errp;
> @@ -560,7 +571,7 @@ static int ap_set_byterange(request_rec
> new = (char **)apr_array_push(merged);
> *new = apr_psprintf(r->pool, "%" APR_OFF_T_FMT "-%" APR_OFF_T_FMT,
> ostart, oend);
> - idx = (indexes_t *)apr_array_push(indexes);
> + idx = (indexes_t *)apr_array_push(*indexes);
> idx->start = ostart;
> idx->end = oend;
> sum_lengths += oend - ostart + 1;
If we wanted to get really fancy, we could just prealloc the
indexes array, and then then, at the end, create merged from
that…
Maybe an enhancement for trunk, but let's get 2.2 out first I guess !