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
27e11399
Commit
27e11399
authored
Aug 24, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move some asserts up in the code, to catch Kristians panic.
parent
d0dce476
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
cache.h
bin/varnishd/cache.h
+3
-3
cache_center.c
bin/varnishd/cache_center.c
+2
-0
cache_fetch.c
bin/varnishd/cache_fetch.c
+1
-1
cache_hash.c
bin/varnishd/cache_hash.c
+1
-1
cache_panic.c
bin/varnishd/cache_panic.c
+1
-1
No files found.
bin/varnishd/cache.h
View file @
27e11399
...
@@ -1005,8 +1005,8 @@ AssertObjBusy(const struct object *o)
...
@@ -1005,8 +1005,8 @@ AssertObjBusy(const struct object *o)
}
}
static
inline
void
static
inline
void
AssertObj
PassOrBusy
(
const
struct
object
*
o
)
AssertObj
CorePassOrBusy
(
const
struct
objcore
*
oc
)
{
{
if
(
o
->
objcore
!=
NULL
)
if
(
o
c
!=
NULL
)
AN
(
o
->
objcore
->
flags
&
OC_F_BUSY
);
AN
(
o
c
->
flags
&
OC_F_BUSY
);
}
}
bin/varnishd/cache_center.c
View file @
27e11399
...
@@ -578,6 +578,7 @@ cnt_fetch(struct sess *sp)
...
@@ -578,6 +578,7 @@ cnt_fetch(struct sess *sp)
sp
->
step
=
STP_FETCHBODY
;
sp
->
step
=
STP_FETCHBODY
;
return
(
0
);
return
(
0
);
case
VCL_RET_DELIVER
:
case
VCL_RET_DELIVER
:
AssertObjCorePassOrBusy
(
sp
->
objcore
);
sp
->
step
=
STP_FETCHBODY
;
sp
->
step
=
STP_FETCHBODY
;
return
(
0
);
return
(
0
);
default:
default:
...
@@ -817,6 +818,7 @@ cnt_fetchbody(struct sess *sp)
...
@@ -817,6 +818,7 @@ cnt_fetchbody(struct sess *sp)
sp
->
wrk
->
do_stream
=
0
;
sp
->
wrk
->
do_stream
=
0
;
if
(
sp
->
wrk
->
do_stream
)
{
if
(
sp
->
wrk
->
do_stream
)
{
AssertObjCorePassOrBusy
(
sp
->
obj
->
objcore
);
sp
->
step
=
STP_PREPRESP
;
sp
->
step
=
STP_PREPRESP
;
return
(
0
);
return
(
0
);
}
}
...
...
bin/varnishd/cache_fetch.c
View file @
27e11399
...
@@ -496,7 +496,7 @@ FetchBody(struct sess *sp)
...
@@ -496,7 +496,7 @@ FetchBody(struct sess *sp)
sp
->
wrk
->
vfp
=
&
vfp_nop
;
sp
->
wrk
->
vfp
=
&
vfp_nop
;
AN
(
sp
->
director
);
AN
(
sp
->
director
);
AssertObj
PassOrBusy
(
sp
->
obj
);
AssertObj
CorePassOrBusy
(
sp
->
obj
->
objcore
);
AZ
(
sp
->
wrk
->
vgz_rx
);
AZ
(
sp
->
wrk
->
vgz_rx
);
AZ
(
VTAILQ_FIRST
(
&
sp
->
obj
->
store
));
AZ
(
VTAILQ_FIRST
(
&
sp
->
obj
->
store
));
...
...
bin/varnishd/cache_hash.c
View file @
27e11399
...
@@ -588,7 +588,7 @@ HSH_Drop(struct sess *sp)
...
@@ -588,7 +588,7 @@ HSH_Drop(struct sess *sp)
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
o
=
sp
->
obj
;
o
=
sp
->
obj
;
CHECK_OBJ_NOTNULL
(
o
,
OBJECT_MAGIC
);
CHECK_OBJ_NOTNULL
(
o
,
OBJECT_MAGIC
);
AssertObj
PassOrBusy
(
o
);
AssertObj
CorePassOrBusy
(
o
->
objcore
);
o
->
exp
.
ttl
=
-
1
.;
o
->
exp
.
ttl
=
-
1
.;
if
(
o
->
objcore
!=
NULL
)
/* Pass has no objcore */
if
(
o
->
objcore
!=
NULL
)
/* Pass has no objcore */
HSH_Unbusy
(
sp
);
HSH_Unbusy
(
sp
);
...
...
bin/varnishd/cache_panic.c
View file @
27e11399
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
*/
*/
static
struct
vsb
vsps
,
*
vsp
;
static
struct
vsb
vsps
,
*
vsp
;
pthread_mutex_t
panicstr_mtx
=
PTHREAD_MUTEX_INITIALIZER
;
static
pthread_mutex_t
panicstr_mtx
=
PTHREAD_MUTEX_INITIALIZER
;
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
...
...
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