Commit 5d4e2cee authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Move VGZ entirely to busyobj instead of worker

parent d387098f
...@@ -766,7 +766,7 @@ void VGZ_Ibuf(struct vgz *, const void *, ssize_t len); ...@@ -766,7 +766,7 @@ void VGZ_Ibuf(struct vgz *, const void *, ssize_t len);
int VGZ_IbufEmpty(const struct vgz *vg); int VGZ_IbufEmpty(const struct vgz *vg);
void VGZ_Obuf(struct vgz *, void *, ssize_t len); void VGZ_Obuf(struct vgz *, void *, ssize_t len);
int VGZ_ObufFull(const struct vgz *vg); int VGZ_ObufFull(const struct vgz *vg);
int VGZ_ObufStorage(struct worker *w, struct vgz *vg); int VGZ_ObufStorage(struct busyobj *, struct vgz *vg);
int VGZ_Gzip(struct vgz *, const void **, size_t *len, enum vgz_flag); int VGZ_Gzip(struct vgz *, const void **, size_t *len, enum vgz_flag);
int VGZ_Gunzip(struct vgz *, const void **, size_t *len); int VGZ_Gunzip(struct vgz *, const void **, size_t *len);
int VGZ_Destroy(struct vgz **); int VGZ_Destroy(struct vgz **);
......
...@@ -135,7 +135,7 @@ vfp_esi_bytes_gu(struct worker *wrk, const struct vef_priv *vef, ...@@ -135,7 +135,7 @@ vfp_esi_bytes_gu(struct worker *wrk, const struct vef_priv *vef,
VGZ_Ibuf(vg, vef->ibuf, wl); VGZ_Ibuf(vg, vef->ibuf, wl);
bytes -= wl; bytes -= wl;
} }
if (VGZ_ObufStorage(wrk, vg)) if (VGZ_ObufStorage(wrk->busyobj, vg))
return(-1); return(-1);
i = VGZ_Gunzip(vg, &dp, &dl); i = VGZ_Gunzip(vg, &dp, &dl);
xxxassert(i == VGZ_OK || i == VGZ_END); xxxassert(i == VGZ_OK || i == VGZ_END);
...@@ -211,7 +211,7 @@ vfp_vep_callback(struct worker *wrk, ssize_t l, enum vgz_flag flg) ...@@ -211,7 +211,7 @@ vfp_vep_callback(struct worker *wrk, ssize_t l, enum vgz_flag flg)
VGZ_Ibuf(vef->vgz, vef->ibuf_o, l); VGZ_Ibuf(vef->vgz, vef->ibuf_o, l);
do { do {
if (VGZ_ObufStorage(wrk, vef->vgz)) { if (VGZ_ObufStorage(wrk->busyobj, vef->vgz)) {
vef->error = ENOMEM; vef->error = ENOMEM;
vef->tot += l; vef->tot += l;
return (vef->tot); return (vef->tot);
......
...@@ -203,11 +203,11 @@ VGZ_ObufFull(const struct vgz *vg) ...@@ -203,11 +203,11 @@ VGZ_ObufFull(const struct vgz *vg)
*/ */
int int
VGZ_ObufStorage(struct worker *wrk, struct vgz *vg) VGZ_ObufStorage(struct busyobj *bo, struct vgz *vg)
{ {
struct storage *st; struct storage *st;
st = FetchStorage(wrk->busyobj, 0); st = FetchStorage(bo, 0);
if (st == NULL) if (st == NULL)
return (-1); return (-1);
...@@ -466,7 +466,7 @@ vfp_gunzip_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes) ...@@ -466,7 +466,7 @@ vfp_gunzip_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
bytes -= wl; bytes -= wl;
} }
if (VGZ_ObufStorage(wrk, vg)) if (VGZ_ObufStorage(wrk->busyobj, vg))
return(-1); return(-1);
i = VGZ_Gunzip(vg, &dp, &dl); i = VGZ_Gunzip(vg, &dp, &dl);
if (i != VGZ_OK && i != VGZ_END) if (i != VGZ_OK && i != VGZ_END)
...@@ -547,7 +547,7 @@ vfp_gzip_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes) ...@@ -547,7 +547,7 @@ vfp_gzip_bytes(struct worker *wrk, struct http_conn *htc, ssize_t bytes)
VGZ_Ibuf(vg, vg->m_buf, wl); VGZ_Ibuf(vg, vg->m_buf, wl);
bytes -= wl; bytes -= wl;
} }
if (VGZ_ObufStorage(wrk, vg)) if (VGZ_ObufStorage(wrk->busyobj, vg))
return(-1); return(-1);
i = VGZ_Gzip(vg, &dp, &dl, VGZ_NORMAL); i = VGZ_Gzip(vg, &dp, &dl, VGZ_NORMAL);
assert(i == Z_OK); assert(i == Z_OK);
...@@ -575,7 +575,7 @@ vfp_gzip_end(struct worker *wrk) ...@@ -575,7 +575,7 @@ vfp_gzip_end(struct worker *wrk)
} }
do { do {
VGZ_Ibuf(vg, "", 0); VGZ_Ibuf(vg, "", 0);
if (VGZ_ObufStorage(wrk, vg)) if (VGZ_ObufStorage(wrk->busyobj, vg))
return(-1); return(-1);
i = VGZ_Gzip(vg, &dp, &dl, VGZ_FINISH); i = VGZ_Gzip(vg, &dp, &dl, VGZ_FINISH);
wrk->busyobj->fetch_obj->len += dl; wrk->busyobj->fetch_obj->len += dl;
......
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