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

swap file name pid expansion removed. Not suited for mission critical software...

Browse Source
This commit is contained in:
antirez
2010-05-07 09:36:37 +02:00
parent 8b5bb414f1
commit a0e7e5f516
3 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
redis.c
View File

@ -4485,7 +4485,6 @@ static void shutdownCommand(redisClient *c) {
unlink(server.pidfile);
redisLog(REDIS_WARNING,"%zu bytes used at exit",zmalloc_used_memory());
redisLog(REDIS_WARNING,"Server exit now, bye bye...");
if (server.vm_enabled) unlink(server.vm_swap_file);
exit(0);
} else {
/* Ooops.. error saving! The best we can do is to continue
@ -8584,22 +8583,6 @@ static void aofRemoveTempFile(pid_t childpid) {
/* =================== Virtual Memory - Blocking Side ====================== */
/* substitute the first occurrence of '%p' with the process pid in the
* swap file name. */
static void expandVmSwapFilename(void) {
char *p = strstr(server.vm_swap_file,"%p");
sds new;
if (!p) return;
new = sdsempty();
*p = '\0';
new = sdscat(new,server.vm_swap_file);
new = sdscatprintf(new,"%ld",(long) getpid());
new = sdscat(new,p+2);
zfree(server.vm_swap_file);
server.vm_swap_file = new;
}
static void vmInit(void) {
off_t totsize;
int pipefds[2];
@ -8609,7 +8592,6 @@ static void vmInit(void) {
if (server.vm_max_threads != 0)
zmalloc_enable_thread_safeness(); /* we need thread safe zmalloc() */
expandVmSwapFilename();
redisLog(REDIS_NOTICE,"Using '%s' as swap file",server.vm_swap_file);
/* Try to open the old swap file, otherwise create it */
if ((server.vm_fp = fopen(server.vm_swap_file,"r+b")) == NULL) {