Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
9cf500a3
Commit
9cf500a3
authored
Apr 14, 2020
by
ShooterIT
Browse files
Implements sendfile for redis.
parent
7428f512
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/config.h
View file @
9cf500a3
...
@@ -133,6 +133,12 @@ void setproctitle(const char *fmt, ...);
...
@@ -133,6 +133,12 @@ void setproctitle(const char *fmt, ...);
/* Byte ordering detection */
/* Byte ordering detection */
#include <sys/types.h>
/* This will likely define BYTE_ORDER */
#include <sys/types.h>
/* This will likely define BYTE_ORDER */
/* Define redis_sendfile. */
#if defined(__linux__) || (defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_5))
#define HAVE_SENDFILE 1
ssize_t
redis_sendfile
(
int
out_fd
,
int
in_fd
,
off_t
offset
,
size_t
count
);
#endif
#ifndef BYTE_ORDER
#ifndef BYTE_ORDER
#if (BSD >= 199103)
#if (BSD >= 199103)
# include <machine/endian.h>
# include <machine/endian.h>
...
...
src/replication.c
View file @
9cf500a3
...
@@ -972,10 +972,41 @@ void removeRDBUsedToSyncReplicas(void) {
...
@@ -972,10 +972,41 @@ void removeRDBUsedToSyncReplicas(void) {
}
}
}
}
#if HAVE_SENDFILE
/* Implements redis_sendfile to transfer data between file descriptors and
* avoid transferring data to and from user space.
*
* The function prototype is just like sendfile(2) on Linux. in_fd is a file
* descriptor opened for reading and out_fd is a descriptor opened for writing.
* offset specifies where to start reading data from in_fd. count is the number
* of bytes to copy between the file descriptors.
*
* The return value is the number of bytes written to out_fd, if the transfer
* was successful. On error, -1 is returned, and errno is set appropriately. */
ssize_t
redis_sendfile
(
int
out_fd
,
int
in_fd
,
off_t
offset
,
size_t
count
)
{
#if defined(__linux__)
#include <sys/sendfile.h>
return
sendfile
(
out_fd
,
in_fd
,
&
offset
,
count
);
#elif defined(__APPLE__)
off_t
len
=
count
;
/* Notice that it may return -1 and errno is set to EAGAIN even if some
* bytes have been sent successfully and the len argument is set correctly
* when using a socket marked for non-blocking I/O. */
if
(
sendfile
(
in_fd
,
out_fd
,
offset
,
&
len
,
NULL
,
0
)
==
-
1
&&
errno
!=
EAGAIN
)
return
-
1
;
else
return
(
ssize_t
)
len
;
#endif
errno
=
ENOSYS
;
return
-
1
;
}
#endif
void
sendBulkToSlave
(
connection
*
conn
)
{
void
sendBulkToSlave
(
connection
*
conn
)
{
client
*
slave
=
connGetPrivateData
(
conn
);
client
*
slave
=
connGetPrivateData
(
conn
);
char
buf
[
PROTO_IOBUF_LEN
];
ssize_t
nwritten
;
ssize_t
nwritten
,
buflen
;
/* Before sending the RDB file, we send the preamble as configured by the
/* Before sending the RDB file, we send the preamble as configured by the
* replication process. Currently the preamble is just the bulk count of
* replication process. Currently the preamble is just the bulk count of
...
@@ -1001,6 +1032,21 @@ void sendBulkToSlave(connection *conn) {
...
@@ -1001,6 +1032,21 @@ void sendBulkToSlave(connection *conn) {
}
}
/* If the preamble was already transferred, send the RDB bulk data. */
/* If the preamble was already transferred, send the RDB bulk data. */
#if HAVE_SENDFILE
if
((
nwritten
=
redis_sendfile
(
conn
->
fd
,
slave
->
repldbfd
,
slave
->
repldboff
,
PROTO_IOBUF_LEN
))
==
-
1
)
{
if
(
errno
!=
EAGAIN
)
{
serverLog
(
LL_WARNING
,
"Sendfile error sending DB to replica: %s"
,
strerror
(
errno
));
freeClient
(
slave
);
}
return
;
}
#else
ssize_t
buflen
;
char
buf
[
PROTO_IOBUF_LEN
];
lseek
(
slave
->
repldbfd
,
slave
->
repldboff
,
SEEK_SET
);
lseek
(
slave
->
repldbfd
,
slave
->
repldboff
,
SEEK_SET
);
buflen
=
read
(
slave
->
repldbfd
,
buf
,
PROTO_IOBUF_LEN
);
buflen
=
read
(
slave
->
repldbfd
,
buf
,
PROTO_IOBUF_LEN
);
if
(
buflen
<=
0
)
{
if
(
buflen
<=
0
)
{
...
@@ -1017,6 +1063,7 @@ void sendBulkToSlave(connection *conn) {
...
@@ -1017,6 +1063,7 @@ void sendBulkToSlave(connection *conn) {
}
}
return
;
return
;
}
}
#endif
slave
->
repldboff
+=
nwritten
;
slave
->
repldboff
+=
nwritten
;
server
.
stat_net_output_bytes
+=
nwritten
;
server
.
stat_net_output_bytes
+=
nwritten
;
if
(
slave
->
repldboff
==
slave
->
repldbsize
)
{
if
(
slave
->
repldboff
==
slave
->
repldbsize
)
{
...
...
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