Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
5d4e2cee
Commit
5d4e2cee
authored
Feb 15, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move VGZ entirely to busyobj instead of worker
parent
d387098f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
cache.h
bin/varnishd/cache/cache.h
+1
-1
cache_esi_fetch.c
bin/varnishd/cache/cache_esi_fetch.c
+2
-2
cache_gzip.c
bin/varnishd/cache/cache_gzip.c
+5
-5
No files found.
bin/varnishd/cache/cache.h
View file @
5d4e2cee
...
@@ -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
**
);
...
...
bin/varnishd/cache/cache_esi_fetch.c
View file @
5d4e2cee
...
@@ -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
);
...
...
bin/varnishd/cache/cache_gzip.c
View file @
5d4e2cee
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment