fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

REDIS_MAX_COMPLETED_JOBS_PROCESSED is now in percentage, not number of jobs. Moved a debugging message a few lines forward as it was called where a few logged parameters where invalid, leading to a crash

Browse Source
This commit is contained in:
antirez 2010-01-21 07:27:32 -05:00
parent 76b7233adb
commit f6c0bba8bc
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
redis.c
View File

@ -165,11 +165,10 @@
#define REDIS_VM_MAX_RANDOM_JUMP 4096 #define REDIS_VM_MAX_RANDOM_JUMP 4096
#define REDIS_VM_MAX_THREADS 32 #define REDIS_VM_MAX_THREADS 32
#define REDIS_THREAD_STACK_SIZE (1024*1024*4) #define REDIS_THREAD_STACK_SIZE (1024*1024*4)
/* The following is the number of completed I/O jobs to process when the /* The following is the *percentage* of completed I/O jobs to process when the
* handelr is called. 1 is the minimum, and also the default, as it allows * handelr is called. While Virtual Memory I/O operations are performed by
* to block as little as possible other accessing clients. While Virtual * threads, this operations must be processed by the main thread when completed
* Memory I/O operations are performed by threads, this operations must * in order to take effect. */
* be processed by the main thread when completed to take effect. */
#define REDIS_MAX_COMPLETED_JOBS_PROCESSED 1 #define REDIS_MAX_COMPLETED_JOBS_PROCESSED 1
/* Client flags */ /* Client flags */
@ -7170,7 +7169,6 @@ static int vmFindContiguousPages(off_t *first, off_t n) {
while(offset < server.vm_pages) { while(offset < server.vm_pages) {
off_t this = base+offset; off_t this = base+offset;
redisLog(REDIS_DEBUG, "THIS: %lld (%c)\n", (long long) this, vmFreePage(this) ? 'F' : 'X');
/* If we overflow, restart from page zero */ /* If we overflow, restart from page zero */
if (this >= server.vm_pages) { if (this >= server.vm_pages) {
this -= server.vm_pages; this -= server.vm_pages;
@ -7180,6 +7178,7 @@ static int vmFindContiguousPages(off_t *first, off_t n) {
numfree = 0; numfree = 0;
} }
} }
redisLog(REDIS_DEBUG, "THIS: %lld (%c)\n", (long long) this, vmFreePage(this) ? 'F' : 'X');
if (vmFreePage(this)) { if (vmFreePage(this)) {
/* This is a free page */ /* This is a free page */
numfree++; numfree++;
@ -7503,6 +7502,7 @@ static void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
char buf[1]; char buf[1];
int retval; int retval;
int processed = 0; int processed = 0;
int toprocess = -1;
REDIS_NOTUSED(el); REDIS_NOTUSED(el);
REDIS_NOTUSED(mask); REDIS_NOTUSED(mask);
REDIS_NOTUSED(privdata); REDIS_NOTUSED(privdata);
@ -7520,6 +7520,10 @@ static void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
/* Get the processed element (the oldest one) */ /* Get the processed element (the oldest one) */
lockThreadedIO(); lockThreadedIO();
assert(listLength(server.io_processed) != 0); assert(listLength(server.io_processed) != 0);
if (toprocess == -1) {
toprocess = (listLength(server.io_processed)*REDIS_MAX_COMPLETED_JOBS_PROCESSED)/100;
if (toprocess <= 0) toprocess = 1;
}
ln = listFirst(server.io_processed); ln = listFirst(server.io_processed);
j = ln->value; j = ln->value;
listDelNode(server.io_processed,ln); listDelNode(server.io_processed,ln);
@ -7608,7 +7612,7 @@ static void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
} }
} }
processed++; processed++;
if (processed == REDIS_MAX_COMPLETED_JOBS_PROCESSED) return; if (processed == toprocess) return;
} }
if (retval < 0 && errno != EAGAIN) { if (retval < 0 && errno != EAGAIN) {
redisLog(REDIS_WARNING, redisLog(REDIS_WARNING,