OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/migration: fix unreachable path in stress test

Browse Source 
If stressone() or stress() exits it's because of a failure
because the test runs forever otherwise, so change stressone
and stress type to void to make the exit_failure() as the exit
function of main().

Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200603080904.997083-3-maozhongyi@cmss.chinamobile.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Mao Zhongyi 2020-06-03 16:08:57 +08:00 committed by Dr. David Alan Gilbert
parent f663492f40
commit 71cfce73f4
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/migration/stress.c
View File

@ -167,7 +167,7 @@ static unsigned long long now(void)
return (tv.tv_sec * 1000ull) + (tv.tv_usec / 1000ull); return (tv.tv_sec * 1000ull) + (tv.tv_usec / 1000ull);
} }
static int stressone(unsigned long long ramsizeMB) static void stressone(unsigned long long ramsizeMB)
{ {
size_t pagesPerMB = 1024 * 1024 / PAGE_SIZE; size_t pagesPerMB = 1024 * 1024 / PAGE_SIZE;
g_autofree char *ram = g_malloc(ramsizeMB * 1024 * 1024); g_autofree char *ram = g_malloc(ramsizeMB * 1024 * 1024);
@ -186,7 +186,7 @@ static int stressone(unsigned long long ramsizeMB)
memset(ram, 0xfe, ramsizeMB * 1024 * 1024); memset(ram, 0xfe, ramsizeMB * 1024 * 1024);
if (random_bytes(data, PAGE_SIZE) < 0) { if (random_bytes(data, PAGE_SIZE) < 0) {
return -1; return;
} }
before = now(); before = now();
@ -225,7 +225,7 @@ static void *stressthread(void *arg)
return NULL; return NULL;
} }
static int stress(unsigned long long ramsizeGB, int ncpus) static void stress(unsigned long long ramsizeGB, int ncpus)
{ {
size_t i; size_t i;
unsigned long long ramsizeMB = ramsizeGB * 1024 / ncpus; unsigned long long ramsizeMB = ramsizeGB * 1024 / ncpus;
@ -238,8 +238,6 @@ static int stress(unsigned long long ramsizeGB, int ncpus)
} }
stressone(ramsizeMB); stressone(ramsizeMB);
return 0;
} }
@ -335,8 +333,7 @@ int main(int argc, char **argv)
fprintf(stdout, "%s (%05d): INFO: RAM %llu GiB across %d CPUs\n", fprintf(stdout, "%s (%05d): INFO: RAM %llu GiB across %d CPUs\n",
argv0, gettid(), ramsizeGB, ncpus); argv0, gettid(), ramsizeGB, ncpus);
if (stress(ramsizeGB, ncpus) < 0) stress(ramsizeGB, ncpus);
exit_failure();
exit_success(); exit_failure();
} }