aboutsummaryrefslogtreecommitdiff
path: root/block/curl.c
diff options
context:
space:
mode:
authorNolan <nolan@sigbus.net>2009-07-01 17:16:52 -0700
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-09 16:06:40 -0500
commitc76f4952bbf47116255bc00780ceae3bc8a657c0 (patch)
tree72b57f54273b5c0b03d0cd7849b8606dbbdb63ff /block/curl.c
parent5f6504956066090d81936c1621750b397f444c7b (diff)
downloadqemu-c76f4952bbf47116255bc00780ceae3bc8a657c0.zip
qemu-c76f4952bbf47116255bc00780ceae3bc8a657c0.tar.gz
qemu-c76f4952bbf47116255bc00780ceae3bc8a657c0.tar.bz2
Allow adjustment of http block device's readahead size, via a new
":readahead=###:" suffix. Signed-off-by: Nolan Leake <nolan <at> sigbus.net> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block/curl.c')
-rw-r--r--block/curl.c50
1 files changed, 47 insertions, 3 deletions
diff --git a/block/curl.c b/block/curl.c
index e1a553f..9e21d4a 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -71,6 +71,7 @@ typedef struct BDRVCURLState {
size_t len;
CURLState states[CURL_NUM_STATES];
char *url;
+ size_t readahead_size;
} BDRVCURLState;
static void curl_clean_state(CURLState *s);
@@ -299,15 +300,57 @@ static int curl_open(BlockDriverState *bs, const char *filename, int flags)
BDRVCURLState *s = bs->opaque;
CURLState *state = NULL;
double d;
+
+ #define RA_OPTSTR ":readahead="
+ char *file;
+ char *ra;
+ const char *ra_val;
+ int parse_state = 0;
+
static int inited = 0;
+ file = strdup(filename);
+ s->readahead_size = READ_AHEAD_SIZE;
+
+ /* Parse a trailing ":readahead=#:" param, if present. */
+ ra = file + strlen(file) - 1;
+ while (ra >= file) {
+ if (parse_state == 0) {
+ if (*ra == ':')
+ parse_state++;
+ else
+ break;
+ } else if (parse_state == 1) {
+ if (*ra > '9' || *ra < '0') {
+ char *opt_start = ra - strlen(RA_OPTSTR) + 1;
+ if (opt_start > file &&
+ strncmp(opt_start, RA_OPTSTR, strlen(RA_OPTSTR)) == 0) {
+ ra_val = ra + 1;
+ ra -= strlen(RA_OPTSTR) - 1;
+ *ra = '\0';
+ s->readahead_size = atoi(ra_val);
+ break;
+ } else {
+ break;
+ }
+ }
+ }
+ ra--;
+ }
+
+ if ((s->readahead_size & 0x1ff) != 0) {
+ fprintf(stderr, "HTTP_READAHEAD_SIZE %Zd is not a multiple of 512\n",
+ s->readahead_size);
+ goto out_noclean;
+ }
+
if (!inited) {
curl_global_init(CURL_GLOBAL_ALL);
inited = 1;
}
- dprintf("CURL: Opening %s\n", filename);
- s->url = strdup(filename);
+ dprintf("CURL: Opening %s\n", file);
+ s->url = file;
state = curl_init_state(s);
if (!state)
goto out_noclean;
@@ -346,6 +389,7 @@ out:
curl_easy_cleanup(state->curl);
state->curl = NULL;
out_noclean:
+ qemu_free(file);
return -EINVAL;
}
@@ -401,7 +445,7 @@ static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs,
if (state->orig_buf)
qemu_free(state->orig_buf);
state->buf_start = start;
- state->buf_len = acb->end + READ_AHEAD_SIZE;
+ state->buf_len = acb->end + s->readahead_size;
end = MIN(start + state->buf_len, s->len) - 1;
state->orig_buf = qemu_malloc(state->buf_len);
state->acb[0] = acb;