Skip to content

U
unique-xids
Commit 94c870bf authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

We always allocate an object entirely inside one stevedore now.

parent cd55687a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
bin/varnishd/stevedore.c
View file @ 94c870bf
...@@ -151,20 +151,15 @@ static struct storage * ...@@ -151,20 +151,15 @@ static struct storage *
stv_alloc(const struct sess *sp, size_t size) stv_alloc(const struct sess *sp, size_t size)
{ {
struct storage *st; struct storage *st;
struct stevedore *stv = NULL; struct stevedore *stv;
unsigned fail = 0; unsigned fail = 0;
/* /*
* Always try the stevedore which allocated the object in order to * Always use the stevedore which allocated the object in order to
* not needlessly split an object across multiple stevedores. * keep an object inside the same stevedore.
*/ */
if (sp->obj != NULL) { CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC); stv = sp->obj->objstore->stevedore;
stv = sp->obj->objstore->stevedore;
} else {
INCOMPL();
stv = stv_transient;
}
CHECK_OBJ_NOTNULL(stv, STEVEDORE_MAGIC); CHECK_OBJ_NOTNULL(stv, STEVEDORE_MAGIC);
if (size > (size_t)(params->fetch_maxchunksize) << 10) if (size > (size_t)(params->fetch_maxchunksize) << 10)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment