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
12d4a11f
Commit
12d4a11f
authored
Oct 10, 2011
by
Tollef Fog Heen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WRK_Flush was renamed to WRW_Flush a long time ago; update some ifdefed code and comments to match
parent
b4ef285f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
cache.h
bin/varnishd/cache.h
+1
-1
cache_wrw.c
bin/varnishd/cache_wrw.c
+2
-2
No files found.
bin/varnishd/cache.h
View file @
12d4a11f
...
@@ -260,7 +260,7 @@ struct exp {
...
@@ -260,7 +260,7 @@ struct exp {
struct
wrw
{
struct
wrw
{
int
*
wfd
;
int
*
wfd
;
unsigned
werr
;
/* valid after WR
K
_Flush() */
unsigned
werr
;
/* valid after WR
W
_Flush() */
struct
iovec
*
iov
;
struct
iovec
*
iov
;
unsigned
siov
;
unsigned
siov
;
unsigned
niov
;
unsigned
niov
;
...
...
bin/varnishd/cache_wrw.c
View file @
12d4a11f
...
@@ -264,7 +264,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
...
@@ -264,7 +264,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
}
while
(
0
);
}
while
(
0
);
#elif defined(__linux__)
#elif defined(__linux__)
do
{
do
{
if
(
WR
K
_Flush
(
w
)
==
0
&&
if
(
WR
W
_Flush
(
w
)
==
0
&&
sendfile
(
*
wrw
->
wfd
,
fd
,
&
off
,
len
)
!=
len
)
sendfile
(
*
wrw
->
wfd
,
fd
,
&
off
,
len
)
!=
len
)
wrw
->
werr
++
;
wrw
->
werr
++
;
}
while
(
0
);
}
while
(
0
);
...
@@ -293,7 +293,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
...
@@ -293,7 +293,7 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
}
while
(
0
);
}
while
(
0
);
#elif defined(__sun) && defined(HAVE_SENDFILE)
#elif defined(__sun) && defined(HAVE_SENDFILE)
do
{
do
{
if
(
WR
K
_Flush
(
w
)
==
0
&&
if
(
WR
W
_Flush
(
w
)
==
0
&&
sendfile
(
*
wrw
->
wfd
,
fd
,
&
off
,
len
)
!=
len
)
sendfile
(
*
wrw
->
wfd
,
fd
,
&
off
,
len
)
!=
len
)
wrw
->
werr
++
;
wrw
->
werr
++
;
}
while
(
0
);
}
while
(
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