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

modified a bit addReply() to play better with copy on write now that we have a static buffer. Changed the name of a function from _ensureFileEvent() to _installWriteEvent().

Browse Source
This commit is contained in:
antirez 2010-09-16 13:08:40 +02:00
parent 83f39c7ab2
commit 4c2e506a39
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/networking.c
View File

@ -56,7 +56,7 @@ redisClient *createClient(int fd) {
return c; return c;
} }
int _ensureFileEvent(redisClient *c) { int _installWriteEvent(redisClient *c) {
if (c->fd <= 0) return REDIS_ERR; if (c->fd <= 0) return REDIS_ERR;
if (c->bufpos == 0 && listLength(c->reply) == 0 && if (c->bufpos == 0 && listLength(c->reply) == 0 &&
(c->replstate == REDIS_REPL_NONE || (c->replstate == REDIS_REPL_NONE ||
@ -160,21 +160,29 @@ void _addReplyStringToList(redisClient *c, char *s, size_t len) {
} }
void addReply(redisClient *c, robj *obj) { void addReply(redisClient *c, robj *obj) {
if (_ensureFileEvent(c) != REDIS_OK) return; if (_installWriteEvent(c) != REDIS_OK) return;
if (server.vm_enabled && obj->storage != REDIS_VM_MEMORY) { redisAssert(!server.vm_enabled || obj->storage == REDIS_VM_MEMORY);
/* Returns a new object with refcount 1 */
obj = dupStringObject(obj); /* This is an important place where we can avoid copy-on-write
* when there is a saving child running, avoiding touching the
* refcount field of the object if it's not needed.
*
* If the encoding is RAW and there is room in the static buffer
* we'll be able to send the object to the client without
* messing with its page. */
if (obj->encoding == REDIS_ENCODING_RAW) {
if (_addReplyToBuffer(c,obj->ptr,sdslen(obj->ptr)) != REDIS_OK)
_addReplyObjectToList(c,obj);
} else { } else {
/* This increments the refcount. */
obj = getDecodedObject(obj); obj = getDecodedObject(obj);
}
if (_addReplyToBuffer(c,obj->ptr,sdslen(obj->ptr)) != REDIS_OK) if (_addReplyToBuffer(c,obj->ptr,sdslen(obj->ptr)) != REDIS_OK)
_addReplyObjectToList(c,obj); _addReplyObjectToList(c,obj);
decrRefCount(obj); decrRefCount(obj);
} }
}
void addReplySds(redisClient *c, sds s) { void addReplySds(redisClient *c, sds s) {
if (_ensureFileEvent(c) != REDIS_OK) { if (_installWriteEvent(c) != REDIS_OK) {
/* The caller expects the sds to be free'd. */ /* The caller expects the sds to be free'd. */
sdsfree(s); sdsfree(s);
return; return;
@ -188,7 +196,7 @@ void addReplySds(redisClient *c, sds s) {
} }
void addReplyString(redisClient *c, char *s, size_t len) { void addReplyString(redisClient *c, char *s, size_t len) {
if (_ensureFileEvent(c) != REDIS_OK) return; if (_installWriteEvent(c) != REDIS_OK) return;
if (_addReplyToBuffer(c,s,len) != REDIS_OK) if (_addReplyToBuffer(c,s,len) != REDIS_OK)
_addReplyStringToList(c,s,len); _addReplyStringToList(c,s,len);
} }
@ -234,7 +242,10 @@ void addReplyStatusFormat(redisClient *c, const char *fmt, ...) {
/* Adds an empty object to the reply list that will contain the multi bulk /* Adds an empty object to the reply list that will contain the multi bulk
* length, which is not known when this function is called. */ * length, which is not known when this function is called. */
void *addDeferredMultiBulkLength(redisClient *c) { void *addDeferredMultiBulkLength(redisClient *c) {
if (_ensureFileEvent(c) != REDIS_OK) return NULL; /* Note that we install the write event here even if the object is not
* ready to be sent, since we are sure that before returning to the
* event loop setDeferredMultiBulkLength() will be called. */
if (_installWriteEvent(c) != REDIS_OK) return NULL;
listAddNodeTail(c->reply,createObject(REDIS_STRING,NULL)); listAddNodeTail(c->reply,createObject(REDIS_STRING,NULL));
return listLast(c->reply); return listLast(c->reply);
} }