Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
67180503
Commit
67180503
authored
Aug 13, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass a dstat arg to oc->updatemeta()
parent
4c9b521b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
cache.h
bin/varnishd/cache/cache.h
+2
-2
cache_ban.c
bin/varnishd/cache/cache_ban.c
+1
-1
cache_expire.c
bin/varnishd/cache/cache_expire.c
+1
-1
cache_obj.c
bin/varnishd/cache/cache_obj.c
+2
-2
storage_persistent_silo.c
bin/varnishd/storage/storage_persistent_silo.c
+2
-2
No files found.
bin/varnishd/cache/cache.h
View file @
67180503
...
...
@@ -373,7 +373,7 @@ struct storage {
*/
typedef
struct
object
*
getobj_f
(
struct
dstat
*
ds
,
struct
objcore
*
oc
);
typedef
void
updatemeta_f
(
struct
objcore
*
oc
);
typedef
void
updatemeta_f
(
struct
objcore
*
oc
,
struct
dstat
*
);
typedef
void
freeobj_f
(
struct
dstat
*
ds
,
struct
objcore
*
oc
);
typedef
struct
lru
*
getlru_f
(
const
struct
objcore
*
oc
);
...
...
@@ -1066,7 +1066,7 @@ void ObjTrimStore(struct objcore *, struct dstat *);
unsigned
ObjGetXID
(
struct
objcore
*
,
struct
dstat
*
);
uint64_t
ObjGetLen
(
struct
objcore
*
oc
,
struct
dstat
*
ds
);
struct
object
*
ObjGetObj
(
struct
objcore
*
,
struct
dstat
*
);
void
ObjUpdateMeta
(
struct
objcore
*
);
void
ObjUpdateMeta
(
struct
objcore
*
,
struct
dstat
*
);
void
ObjFreeObj
(
struct
objcore
*
,
struct
dstat
*
);
struct
lru
*
ObjGetLRU
(
const
struct
objcore
*
);
void
*
ObjGetattr
(
struct
objcore
*
oc
,
struct
dstat
*
ds
,
enum
obj_attr
attr
,
...
...
bin/varnishd/cache/cache_ban.c
View file @
67180503
...
...
@@ -963,7 +963,7 @@ BAN_CheckObject(struct worker *wrk, struct objcore *oc, struct req *req)
if
(
b
==
oc
->
ban
)
{
/* not banned */
oc
->
ban
=
b0
;
ObjUpdateMeta
(
oc
);
ObjUpdateMeta
(
oc
,
&
wrk
->
stats
);
return
(
0
);
}
else
{
oc
->
ban
=
NULL
;
...
...
bin/varnishd/cache/cache_expire.c
View file @
67180503
...
...
@@ -397,7 +397,7 @@ exp_inbox(struct exp_priv *ep, struct objcore *oc, double now)
o
=
ObjGetObj
(
oc
,
&
ep
->
wrk
->
stats
);
CHECK_OBJ_NOTNULL
(
o
,
OBJECT_MAGIC
);
oc
->
timer_when
=
EXP_When
(
&
oc
->
exp
);
ObjUpdateMeta
(
oc
);
ObjUpdateMeta
(
oc
,
&
ep
->
wrk
->
stats
);
}
VSLb
(
&
ep
->
vsl
,
SLT_ExpKill
,
"EXP_When p=%p e=%.9f f=0x%x"
,
oc
,
...
...
bin/varnishd/cache/cache_obj.c
View file @
67180503
...
...
@@ -184,12 +184,12 @@ ObjGetObj(struct objcore *oc, struct dstat *ds)
}
void
ObjUpdateMeta
(
struct
objcore
*
oc
)
ObjUpdateMeta
(
struct
objcore
*
oc
,
struct
dstat
*
ds
)
{
const
struct
objcore_methods
*
m
=
obj_getmethods
(
oc
);
if
(
m
->
updatemeta
!=
NULL
)
m
->
updatemeta
(
oc
);
m
->
updatemeta
(
oc
,
ds
);
}
void
...
...
bin/varnishd/storage/storage_persistent_silo.c
View file @
67180503
...
...
@@ -450,14 +450,14 @@ smp_oc_getobj(struct dstat *ds, struct objcore *oc)
}
static
void
smp_oc_updatemeta
(
struct
objcore
*
oc
)
smp_oc_updatemeta
(
struct
objcore
*
oc
,
struct
dstat
*
ds
)
{
struct
object
*
o
;
struct
smp_seg
*
sg
;
struct
smp_object
*
so
;
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
o
=
smp_oc_getobj
(
NULL
,
oc
);
o
=
smp_oc_getobj
(
ds
,
oc
);
AN
(
o
);
CAST_OBJ_NOTNULL
(
sg
,
oc
->
priv
,
SMP_SEG_MAGIC
);
...
...
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