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

serious performance enhancement of diskstore

Browse Source
This commit is contained in:
antirez 2011-01-03 17:27:47 +01:00
parent 5d46e370b7
commit 9b24d8adbe
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dscache.c
View File

@ -587,6 +587,8 @@ void dsCreateIOJob(int type, redisDb *db, robj *key, robj *val) {
#define REDIS_IO_LOADINPROG 4 #define REDIS_IO_LOADINPROG 4
#define REDIS_IO_SAVEINPROG 8 #define REDIS_IO_SAVEINPROG 8
void cacheScheduleIOPushJobs(int onlyloads);
void cacheScheduleIOAddFlag(redisDb *db, robj *key, long flag) { void cacheScheduleIOAddFlag(redisDb *db, robj *key, long flag) {
struct dictEntry *de = dictFind(db->io_queued,key); struct dictEntry *de = dictFind(db->io_queued,key);
@ -647,6 +649,7 @@ void cacheScheduleIO(redisDb *db, robj *key, int type) {
* in queue for the same key. */ * in queue for the same key. */
if (type == REDIS_IO_LOAD && !(flags & REDIS_IO_SAVE)) { if (type == REDIS_IO_LOAD && !(flags & REDIS_IO_SAVE)) {
listAddNodeHead(server.cache_io_queue, op); listAddNodeHead(server.cache_io_queue, op);
cacheScheduleIOPushJobs(1);
} else { } else {
/* FIXME: probably when this happens we want to at least move /* FIXME: probably when this happens we want to at least move
* the write job about this queue on top, and set the creation time * the write job about this queue on top, and set the creation time
@ -655,17 +658,25 @@ void cacheScheduleIO(redisDb *db, robj *key, int type) {
} }
} }
void cacheCron(void) { /* Push scheduled IO operations into IO Jobs that the IO thread can process.
* If 'onlyloads' is true only IO_LOAD jobs are processed: this is useful
* since it's save to push LOAD IO jobs from any place of the code, while
* SAVE io jobs should never be pushed while we are processing a command
* (not protected by lookupKey() that will block on keys in IO_SAVEINPROG
* state. */
#define MAX_IO_JOBS_QUEUE 100
void cacheScheduleIOPushJobs(int onlyloads) {
time_t now = time(NULL); time_t now = time(NULL);
listNode *ln; listNode *ln;
int jobs, topush = 0; int jobs, topush = 0;
/* Sync stuff on disk, but only if we have less than 100 IO jobs */ /* Sync stuff on disk, but only if we have less
* than MAX_IO_JOBS_QUEUE IO jobs. */
lockThreadedIO(); lockThreadedIO();
jobs = listLength(server.io_newjobs); jobs = listLength(server.io_newjobs);
unlockThreadedIO(); unlockThreadedIO();
topush = 100-jobs; topush = MAX_IO_JOBS_QUEUE-jobs;
if (topush < 0) topush = 0; if (topush < 0) topush = 0;
if (topush > (signed)listLength(server.cache_io_queue)) if (topush > (signed)listLength(server.cache_io_queue))
topush = listLength(server.cache_io_queue); topush = listLength(server.cache_io_queue);
@ -677,7 +688,7 @@ void cacheCron(void) {
topush--; topush--;
if (op->type == REDIS_IO_LOAD || if (op->type == REDIS_IO_LOAD ||
(now - op->ctime) >= server.cache_flush_delay) (!onlyloads && (now - op->ctime) >= server.cache_flush_delay))
{ {
struct dictEntry *de; struct dictEntry *de;
robj *val; robj *val;
@ -732,6 +743,11 @@ void cacheCron(void) {
break; /* too early */ break; /* too early */
} }
} }
}
void cacheCron(void) {
/* Push jobs */
cacheScheduleIOPushJobs(0);
/* Reclaim memory from the object cache */ /* Reclaim memory from the object cache */
while (server.ds_enabled && zmalloc_used_memory() > while (server.ds_enabled && zmalloc_used_memory() >