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
789ccc4f
Commit
789ccc4f
authored
Apr 29, 2020
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws: Retire WS_Reserve()
parent
6e4099e8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
26 deletions
+1
-26
cache.h
bin/varnishd/cache/cache.h
+0
-2
cache_ws.c
bin/varnishd/cache/cache_ws.c
+0
-24
vrt.h
include/vrt.h
+1
-0
No files found.
bin/varnishd/cache/cache.h
View file @
789ccc4f
...
...
@@ -778,8 +778,6 @@ void WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func,
void
WS_Init
(
struct
ws
*
ws
,
const
char
*
id
,
void
*
space
,
unsigned
len
);
/* WS_Reserve(): Use WS_ReserveSize() or WS_ReserveAll() */
unsigned
WS_Reserve
(
struct
ws
*
ws
,
unsigned
bytes
)
v_deprecated_
;
unsigned
WS_ReserveSize
(
struct
ws
*
,
unsigned
);
unsigned
WS_ReserveAll
(
struct
ws
*
);
unsigned
WS_ReserveLumps
(
struct
ws
*
ws
,
size_t
sz
);
...
...
bin/varnishd/cache/cache_ws.c
View file @
789ccc4f
...
...
@@ -307,30 +307,6 @@ WS_ReserveSize(struct ws *ws, unsigned bytes)
return
(
pdiff
(
ws
->
f
,
ws
->
r
));
}
/* REL_20200915 remove */
unsigned
WS_Reserve
(
struct
ws
*
ws
,
unsigned
bytes
)
{
unsigned
b2
;
WS_Assert
(
ws
);
assert
(
ws
->
r
==
NULL
);
b2
=
PRNDDN
(
ws
->
e
-
ws
->
f
);
if
(
bytes
!=
0
&&
bytes
<
b2
)
b2
=
PRNDUP
(
bytes
);
if
(
ws
->
f
+
b2
>
ws
->
e
)
{
WS_MarkOverflow
(
ws
);
return
(
0
);
}
ws
->
r
=
ws
->
f
+
b2
;
DSL
(
DBG_WORKSPACE
,
0
,
"WS_Reserve(%p, %u/%u) = %u"
,
ws
,
b2
,
bytes
,
pdiff
(
ws
->
f
,
ws
->
r
));
WS_Assert
(
ws
);
return
(
pdiff
(
ws
->
f
,
ws
->
r
));
}
unsigned
WS_ReserveLumps
(
struct
ws
*
ws
,
size_t
sz
)
{
...
...
include/vrt.h
View file @
789ccc4f
...
...
@@ -55,6 +55,7 @@
* NEXT (2020-09-15)
* Added VRT_DirectorResolve()
* Added VCL_STRING VRT_BLOB_string(VRT_CTX, VCL_BLOB)
* [cache.h] WS_Reserve() removed
* 11.0 (2020-03-16)
* Changed type of vsa_suckaddr_len from int to size_t
* New prefix_{ptr|len} fields in vrt_backend
...
...
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