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
7703a5f8
Commit
7703a5f8
authored
Feb 15, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lend busyobj the workers dstat for the duration of Fetch_Body()
parent
b5f18785
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
cache.h
bin/varnishd/cache/cache.h
+1
-0
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+10
-0
No files found.
bin/varnishd/cache/cache.h
View file @
7703a5f8
...
...
@@ -494,6 +494,7 @@ struct busyobj {
double
between_bytes_timeout
;
struct
vsl_log
vsl
[
1
];
struct
dstat
*
stats
;
};
/* Object structure --------------------------------------------------*/
...
...
bin/varnishd/cache/cache_fetch.c
View file @
7703a5f8
...
...
@@ -506,6 +506,13 @@ FetchBody(struct worker *wrk, struct object *obj)
CHECK_OBJ_NOTNULL
(
obj
,
OBJECT_MAGIC
);
CHECK_OBJ_NOTNULL
(
obj
->
http
,
HTTP_MAGIC
);
/*
* XXX: The busyobj needs a dstat, but it is not obvious which one
* XXX: it should be (own/borrowed). For now borrow the wrk's.
*/
AZ
(
bo
->
stats
);
bo
->
stats
=
&
wrk
->
stats
;
htc
=
&
bo
->
htc
;
if
(
bo
->
vfp
==
NULL
)
...
...
@@ -578,6 +585,7 @@ FetchBody(struct worker *wrk, struct object *obj)
if
(
bo
->
body_status
==
BS_ERROR
)
{
VDI_CloseFd
(
wrk
,
&
bo
->
vbc
);
bo
->
stats
=
NULL
;
return
(
__LINE__
);
}
...
...
@@ -585,6 +593,7 @@ FetchBody(struct worker *wrk, struct object *obj)
wrk
->
stats
.
fetch_failed
++
;
VDI_CloseFd
(
wrk
,
&
bo
->
vbc
);
obj
->
len
=
0
;
bo
->
stats
=
NULL
;
return
(
__LINE__
);
}
AZ
(
bo
->
fetch_failed
);
...
...
@@ -619,6 +628,7 @@ FetchBody(struct worker *wrk, struct object *obj)
else
VDI_RecycleFd
(
wrk
,
&
bo
->
vbc
);
bo
->
stats
=
NULL
;
return
(
0
);
}
...
...
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