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
a34c900c
Commit
a34c900c
authored
Feb 19, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eliminate some wrk->sp usage.
parent
9a63616c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
23 deletions
+21
-23
cache.h
bin/varnishd/cache/cache.h
+1
-1
cache_acceptor.c
bin/varnishd/cache/cache_acceptor.c
+4
-4
cache_center.c
bin/varnishd/cache/cache_center.c
+3
-3
cache_hash.c
bin/varnishd/cache/cache_hash.c
+8
-9
cache_session.c
bin/varnishd/cache/cache_session.c
+4
-5
hash_slinger.h
bin/varnishd/hash/hash_slinger.h
+1
-1
No files found.
bin/varnishd/cache/cache.h
View file @
a34c900c
...
...
@@ -673,7 +673,7 @@ struct sess {
void
VCA_Init
(
void
);
void
VCA_Shutdown
(
void
);
int
VCA_Accept
(
struct
listen_sock
*
ls
,
struct
wrk_accept
*
wa
);
void
VCA_SetupSess
(
struct
worker
*
w
);
void
VCA_SetupSess
(
struct
worker
*
w
,
struct
sess
*
sp
);
void
VCA_FailSess
(
struct
worker
*
w
);
/* cache_backend.c */
...
...
bin/varnishd/cache/cache_acceptor.c
View file @
a34c900c
...
...
@@ -233,6 +233,7 @@ VCA_FailSess(struct worker *wrk)
AZ
(
close
(
wa
->
acceptsock
));
wrk
->
stats
.
sess_drop
++
;
vca_pace_bad
();
WS_Release
(
wrk
->
aws
,
0
);
}
/*--------------------------------------------------------------------
...
...
@@ -240,15 +241,13 @@ VCA_FailSess(struct worker *wrk)
*/
void
VCA_SetupSess
(
struct
worker
*
wrk
)
VCA_SetupSess
(
struct
worker
*
wrk
,
struct
sess
*
sp
)
{
struct
sess
*
sp
;
struct
wrk_accept
*
wa
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CAST_OBJ_NOTNULL
(
wa
,
(
void
*
)
wrk
->
aws
->
f
,
WRK_ACCEPT_MAGIC
);
sp
=
wrk
->
sp
;
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CAST_OBJ_NOTNULL
(
wa
,
(
void
*
)
wrk
->
aws
->
f
,
WRK_ACCEPT_MAGIC
);
sp
->
vxid
=
wa
->
vxid
;
sp
->
vseq
=
0
;
sp
->
fd
=
wa
->
acceptsock
;
...
...
@@ -262,6 +261,7 @@ VCA_SetupSess(struct worker *wrk)
sp
->
sockaddrlen
=
wa
->
acceptaddrlen
;
vca_pace_good
();
wrk
->
stats
.
sess_conn
++
;
WS_Release
(
wrk
->
aws
,
0
);
if
(
need_test
)
sock_test
(
sp
->
fd
);
...
...
bin/varnishd/cache/cache_center.c
View file @
a34c900c
...
...
@@ -285,7 +285,7 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
if
(
wrk
->
busyobj
!=
NULL
)
{
AN
(
wrk
->
busyobj
->
do_stream
);
VDI_CloseFd
(
wrk
,
&
wrk
->
busyobj
->
vbc
);
HSH_Drop
(
wrk
);
HSH_Drop
(
wrk
,
&
sp
->
req
->
obj
);
VBO_DerefBusyObj
(
wrk
,
&
wrk
->
busyobj
);
}
else
{
(
void
)
HSH_Deref
(
&
wrk
->
stats
,
NULL
,
&
req
->
obj
);
...
...
@@ -509,7 +509,7 @@ cnt_error(struct sess *sp, struct worker *wrk, struct req *req)
if
(
req
->
handling
==
VCL_RET_RESTART
&&
req
->
restarts
<
cache_param
->
max_restarts
)
{
HSH_Drop
(
wrk
);
HSH_Drop
(
wrk
,
&
sp
->
req
->
obj
);
VBO_DerefBusyObj
(
wrk
,
&
wrk
->
busyobj
);
req
->
director
=
NULL
;
req
->
restarts
++
;
...
...
@@ -892,7 +892,7 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
AN
(
req
->
director
);
if
(
i
)
{
HSH_Drop
(
wrk
);
HSH_Drop
(
wrk
,
&
sp
->
req
->
obj
);
VBO_DerefBusyObj
(
wrk
,
&
wrk
->
busyobj
);
AZ
(
req
->
obj
);
req
->
err_code
=
503
;
...
...
bin/varnishd/cache/cache_hash.c
View file @
a34c900c
...
...
@@ -577,18 +577,17 @@ HSH_Purge(const struct sess *sp, struct objhead *oh, double ttl, double grace)
*/
void
HSH_Drop
(
struct
worker
*
wrk
)
HSH_Drop
(
struct
worker
*
wrk
,
struct
object
**
oo
)
{
struct
object
*
o
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
o
=
wrk
->
sp
->
req
->
obj
;
CHECK_OBJ_NOTNULL
(
o
,
OBJECT_MAGIC
);
AssertObjCorePassOrBusy
(
o
->
objcore
);
o
->
exp
.
ttl
=
-
1
.;
if
(
o
->
objcore
!=
NULL
)
/* Pass has no objcore */
HSH_Unbusy
(
o
->
objcore
);
(
void
)
HSH_Deref
(
&
wrk
->
stats
,
NULL
,
&
wrk
->
sp
->
req
->
obj
);
AN
(
oo
)
;
CHECK_OBJ_NOTNULL
(
*
o
o
,
OBJECT_MAGIC
);
AssertObjCorePassOrBusy
(
(
*
oo
)
->
objcore
);
(
*
oo
)
->
exp
.
ttl
=
-
1
.;
if
(
(
*
oo
)
->
objcore
!=
NULL
)
/* Pass has no objcore */
HSH_Unbusy
(
(
*
oo
)
->
objcore
);
(
void
)
HSH_Deref
(
&
wrk
->
stats
,
NULL
,
oo
);
}
void
...
...
bin/varnishd/cache/cache_session.c
View file @
a34c900c
...
...
@@ -181,12 +181,11 @@ SES_pool_accept_task(struct worker *wrk, void *arg)
wrk
->
sp
=
ses_new
(
pp
);
if
(
wrk
->
sp
==
NULL
)
{
VCA_FailSess
(
wrk
);
return
;
}
VCA_SetupSess
(
wrk
);
}
else
{
VCA_SetupSess
(
wrk
,
wrk
->
sp
);
wrk
->
sp
->
step
=
STP_FIRST
;
WS_Release
(
wrk
->
aws
,
0
);
ses_pool_task
(
wrk
,
wrk
->
sp
);
}
}
/*--------------------------------------------------------------------
...
...
bin/varnishd/hash/hash_slinger.h
View file @
a34c900c
...
...
@@ -56,7 +56,7 @@ void HSH_Cleanup(struct worker *w);
struct
objcore
*
HSH_Lookup
(
struct
sess
*
sp
,
struct
objhead
**
poh
);
void
HSH_Unbusy
(
struct
objcore
*
);
void
HSH_Ref
(
struct
objcore
*
o
);
void
HSH_Drop
(
struct
worker
*
wrk
);
void
HSH_Drop
(
struct
worker
*
,
struct
object
**
);
void
HSH_Init
(
const
struct
hash_slinger
*
slinger
);
void
HSH_AddString
(
const
struct
sess
*
sp
,
const
char
*
str
);
struct
objcore
*
HSH_Insert
(
const
struct
sess
*
sp
);
...
...
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