From 1a197a3c1ae8c1014ca3f5ce0b0e436c550b52bb Mon Sep 17 00:00:00 2001 From: antirez Date: Sun, 18 Mar 2012 17:24:48 +0100 Subject: [PATCH] Number of iteration of --test-memory is now 300 (several minutes per gigabyte). Memtest86 and Memtester links are also displayed while running the test. --- src/memtest.c | 6 ++++-- src/redis.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/memtest.c b/src/memtest.c index 56d566ab..18e2e6e8 100644 --- a/src/memtest.c +++ b/src/memtest.c @@ -24,11 +24,13 @@ void memtest_progress_start(char *title, int pass) { printf("\x1b[H\x1b[2J"); /* Cursor home, clear screen. */ /* Fill with dots. */ - for (j = 0; j < ws.ws_col*ws.ws_row; j++) printf("."); + for (j = 0; j < ws.ws_col*(ws.ws_row-2); j++) printf("."); + printf("Please keep the test running several minutes per GB of memory.\n"); + printf("Also check http://www.memtest86.com/ and http://pyropus.ca/software/memtester/"); printf("\x1b[H\x1b[2K"); /* Cursor home, clear current line. */ printf("%s [%d]\n", title, pass); /* Print title. */ progress_printed = 0; - progress_full = ws.ws_col*(ws.ws_row-1); + progress_full = ws.ws_col*(ws.ws_row-3); fflush(stdout); } diff --git a/src/redis.c b/src/redis.c index 60d45b5e..8e0b22eb 100644 --- a/src/redis.c +++ b/src/redis.c @@ -2313,7 +2313,7 @@ int main(int argc, char **argv) { strcmp(argv[1], "-h") == 0) usage(); if (strcmp(argv[1], "--test-memory") == 0) { if (argc == 3) { - memtest(atoi(argv[2]),10000); + memtest(atoi(argv[2]),300); exit(0); } else { fprintf(stderr,"Please specify the amount of memory to test in megabytes.\n");