caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 16:48:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:antirez/redis

Browse Source
This commit is contained in:
antirez 2010-04-21 10:30:36 +02:00
commit 0040fa253f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.h
View File

@ -35,4 +35,9 @@
#define HAVE_KQUEUE 1 #define HAVE_KQUEUE 1
#endif #endif
/* test for O_DIRECT */
#ifdef __linux__
#define HAVE_O_DIRECT 1
#endif
#endif #endif

12
redis.c
View File

@ -54,6 +54,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/stat.h> #include <sys/stat.h>
#define __USE_GNU
#include <fcntl.h> #include <fcntl.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
@ -1673,7 +1674,16 @@ static void initServer() {
acceptHandler, NULL) == AE_ERR) oom("creating file event"); acceptHandler, NULL) == AE_ERR) oom("creating file event");
if (server.appendonly) { if (server.appendonly) {
server.appendfd = open(server.appendfilename,O_WRONLY|O_APPEND|O_CREAT,0644); int flags = O_WRONLY|O_APPEND|O_CREAT;
#ifdef HAVE_O_DIRECT
if (server.appendfsync == APPENDFSYNC_ALWAYS) {
flags |= O_DIRECT;
server.appendfsync = APPENDFSYNC_NO;
}
#endif
server.appendfd = open(server.appendfilename,flags,0644);
if (server.appendfd == -1) { if (server.appendfd == -1) {
redisLog(REDIS_WARNING, "Can't open the append-only file: %s", redisLog(REDIS_WARNING, "Can't open the append-only file: %s",
strerror(errno)); strerror(errno));