Skip to content

V
varnish-cache
Commit 8fce2ca7 authored by Federico G. Schwindt's avatar Federico G. Schwindt
Browse files
Options

Polish

parent bd33cab5
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
bin/varnishd/storage/storage_simple.c
View file @ 8fce2ca7
...@@ -54,6 +54,7 @@ sml_stv_alloc(const struct stevedore *stv, size_t size, int flags) ...@@ -54,6 +54,7 @@ sml_stv_alloc(const struct stevedore *stv, size_t size, int flags)
struct storage *st; struct storage *st;
CHECK_OBJ_NOTNULL(stv, STEVEDORE_MAGIC); CHECK_OBJ_NOTNULL(stv, STEVEDORE_MAGIC);
AN(stv->sml_alloc);
if (!(flags & LESS_MEM_ALLOCED_IS_OK)) { if (!(flags & LESS_MEM_ALLOCED_IS_OK)) {
if (size > cache_param->fetch_maxchunksize) if (size > cache_param->fetch_maxchunksize)
...@@ -70,7 +71,6 @@ sml_stv_alloc(const struct stevedore *stv, size_t size, int flags) ...@@ -70,7 +71,6 @@ sml_stv_alloc(const struct stevedore *stv, size_t size, int flags)
for (;;) { for (;;) {
/* try to allocate from it */ /* try to allocate from it */
assert(size > 0); assert(size > 0);
AN(stv->sml_alloc);
st = stv->sml_alloc(stv, size); st = stv->sml_alloc(stv, size);
if (st != NULL) if (st != NULL)
break; break;
...@@ -138,11 +138,14 @@ SML_allocobj(struct worker *wrk, const struct stevedore *stv, ...@@ -138,11 +138,14 @@ SML_allocobj(struct worker *wrk, const struct stevedore *stv,
unsigned ltot; unsigned ltot;
CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC); CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
CHECK_OBJ_NOTNULL(stv, STEVEDORE_MAGIC);
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC); CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
AN(stv->sml_alloc);
assert(nuke_limit >= 0); assert(nuke_limit >= 0);
ltot = sizeof(struct object) + PRNDUP(wsl); ltot = sizeof(struct object) + PRNDUP(wsl);
for (; nuke_limit >= 0; nuke_limit--) { for (; nuke_limit >= 0; nuke_limit--) {
AN(stv->sml_alloc);
st = stv->sml_alloc(stv, ltot); st = stv->sml_alloc(stv, ltot);
if (st != NULL && st->space < ltot) { if (st != NULL && st->space < ltot) {
stv->sml_free(st); stv->sml_free(st);
...@@ -153,7 +156,7 @@ SML_allocobj(struct worker *wrk, const struct stevedore *stv, ...@@ -153,7 +156,7 @@ SML_allocobj(struct worker *wrk, const struct stevedore *stv,
if (!nuke_limit || !LRU_NukeOne(wrk, stv->lru)) if (!nuke_limit || !LRU_NukeOne(wrk, stv->lru))
return (0); return (0);
} }
AN(st); CHECK_OBJ_NOTNULL(st, STORAGE_MAGIC);
o = SML_MkObject(stv, oc, st->ptr); o = SML_MkObject(stv, oc, st->ptr);
CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC); CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
st->len = sizeof(*o); st->len = sizeof(*o);
......
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