fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-22 05:21:33 +00:00
Code Issues Projects Releases Wiki Activity

recent VM fixes backported to 2.0.0 branch

Browse Source
This commit is contained in:
antirez
2010-07-22 16:16:11 +02:00
parent d8f25ce3ac
commit dc44326f7a
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
redis.c
View File

@ -342,6 +342,7 @@ struct saveparam {
/* Global server state structure */ /* Global server state structure */
struct redisServer { struct redisServer {
pthread_t mainthread;
int port; int port;
int fd; int fd;
redisDb *db; redisDb *db;
@ -1725,6 +1726,7 @@ static void initServer() {
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
setupSigSegvAction(); setupSigSegvAction();
server.mainthread = pthread_self();
server.devnull = fopen("/dev/null","w"); server.devnull = fopen("/dev/null","w");
if (server.devnull == NULL) { if (server.devnull == NULL) {
redisLog(REDIS_WARNING, "Can't open /dev/null: %s", server.neterr); redisLog(REDIS_WARNING, "Can't open /dev/null: %s", server.neterr);
@ -2930,7 +2932,8 @@ static robj *createStringObject(char *ptr, size_t len) {
static robj *createStringObjectFromLongLong(long long value) { static robj *createStringObjectFromLongLong(long long value) {
robj *o; robj *o;
if (value >= 0 && value < REDIS_SHARED_INTEGERS) { if (value >= 0 && value < REDIS_SHARED_INTEGERS
pthread_equal(pthread_self(),server.mainthread)) {
incrRefCount(shared.integers[value]); incrRefCount(shared.integers[value]);
o = shared.integers[value]; o = shared.integers[value];
} else { } else {
@ -3182,8 +3185,15 @@ static robj *tryObjectEncoding(robj *o) {
/* Check if we can represent this string as a long integer */ /* Check if we can represent this string as a long integer */
if (isStringRepresentableAsLong(s,&value) == REDIS_ERR) return o; if (isStringRepresentableAsLong(s,&value) == REDIS_ERR) return o;
/* Ok, this object can be encoded */ /* Ok, this object can be encoded...
if (value >= 0 && value < REDIS_SHARED_INTEGERS) { *
* Can I use a shared object? Only if the object is inside a given
* range and if this is the main thread, since when VM is enabled we
* have the constraint that I/O thread should only handle non-shared
* objects, in order to avoid race conditions (we don't have per-object
* locking). */
if (value >= 0 && value < REDIS_SHARED_INTEGERS &&
pthread_equal(pthread_self(),server.mainthread)) {
decrRefCount(o); decrRefCount(o);
incrRefCount(shared.integers[value]); incrRefCount(shared.integers[value]);
return shared.integers[value]; return shared.integers[value];