fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 08:41:04 +00:00
Code Issues Projects Releases Wiki Activity

added config.h for #ifdef business isolation, added fstat64 for Mac OS X

Browse Source
This commit is contained in:
antirez 2009-06-05 10:50:51 +02:00
parent ec93bba353
commit dde65f3f3c
4 changed files with 25 additions and 10 deletions

2
TODO

@ -1,12 +1,10 @@
BEFORE REDIS 1.0.0-rc1 BEFORE REDIS 1.0.0-rc1
* Add number of keys for every DB in INFO * Add number of keys for every DB in INFO
* maxmemory support
* Resize the expires and Sets hash tables if needed as well? For Sets the right moment to check for this is probably in SREM * Resize the expires and Sets hash tables if needed as well? For Sets the right moment to check for this is probably in SREM
* What happens if the saving child gets killed or segfaults instead of ending normally? Handle this. * What happens if the saving child gets killed or segfaults instead of ending normally? Handle this.
* check 'server.dirty' everywere. Make it proprotional to the number of objects modified. * check 'server.dirty' everywere. Make it proprotional to the number of objects modified.
* Shutdown must kill other background savings before to start saving. Otherwise the DB can get replaced by the child that rename(2) after the parent for some reason. Child should trap the signal and remove the temp file name. * Shutdown must kill other background savings before to start saving. Otherwise the DB can get replaced by the child that rename(2) after the parent for some reason. Child should trap the signal and remove the temp file name.
* Objects sharing configuration, add the directive `objectsharingpool <size>`
* Make sure to convert all the fstat() calls to 64bit versions. * Make sure to convert all the fstat() calls to 64bit versions.
* Cover most of the source code with test-redis.tcl * Cover most of the source code with test-redis.tcl

20
config.h Normal file

@ -0,0 +1,20 @@
#ifndef __CONFIG_H
#define __CONFIG_H
/* malloc_size() */
#ifdef __APPLE__
#include <malloc/malloc.h>
#define HAVE_MALLOC_SIZE
#define redis_malloc_size(p) malloc_size(p)
#endif
/* define redis_fstat to fstat or fstat64() */
#ifdef __APPLE__
#define redis_fstat fstat64
#define redis_stat stat64
#else
#define redis_fstat fstat
#define redis_stat stat
#endif
#endif

6
redis.c

@ -60,6 +60,8 @@
#include "lzf.h" /* LZF compression library */ #include "lzf.h" /* LZF compression library */
#include "pqsort.h" /* Partial qsort for SORT+LIMIT */ #include "pqsort.h" /* Partial qsort for SORT+LIMIT */
#include "config.h"
/* Error codes */ /* Error codes */
#define REDIS_OK 0 #define REDIS_OK 0
#define REDIS_ERR -1 #define REDIS_ERR -1
@ -3866,7 +3868,7 @@ static void updateSalvesWaitingBgsave(int bgsaveerr) {
startbgsave = 1; startbgsave = 1;
slave->replstate = REDIS_REPL_WAIT_BGSAVE_END; slave->replstate = REDIS_REPL_WAIT_BGSAVE_END;
} else if (slave->replstate == REDIS_REPL_WAIT_BGSAVE_END) { } else if (slave->replstate == REDIS_REPL_WAIT_BGSAVE_END) {
struct stat buf; struct redis_stat buf;
if (bgsaveerr != REDIS_OK) { if (bgsaveerr != REDIS_OK) {
freeClient(slave); freeClient(slave);
@ -3874,7 +3876,7 @@ static void updateSalvesWaitingBgsave(int bgsaveerr) {
continue; continue;
} }
if ((slave->repldbfd = open(server.dbfilename,O_RDONLY)) == -1 || if ((slave->repldbfd = open(server.dbfilename,O_RDONLY)) == -1 ||
fstat(slave->repldbfd,&buf) == -1) { redis_fstat(slave->repldbfd,&buf) == -1) {
freeClient(slave); freeClient(slave);
redisLog(REDIS_WARNING,"SYNC failed. Can't open/stat DB after BGSAVE: %s", strerror(errno)); redisLog(REDIS_WARNING,"SYNC failed. Can't open/stat DB after BGSAVE: %s", strerror(errno));
continue; continue;

7
zmalloc.c

@ -30,12 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "config.h"
#ifdef __APPLE__
#include <malloc/malloc.h>
#define HAVE_MALLOC_SIZE
#define redis_malloc_size(p) malloc_size(p)
#endif
static size_t used_memory = 0; static size_t used_memory = 0;