[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/9] tests/migration: fix unreachable path in stress test
From: |
Mao Zhongyi |
Subject: |
[PATCH 2/9] tests/migration: fix unreachable path in stress test |
Date: |
Wed, 3 Jun 2020 16:08:57 +0800 |
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>
---
tests/migration/stress.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/tests/migration/stress.c b/tests/migration/stress.c
index f9626d50ee..a062ef6b55 100644
--- a/tests/migration/stress.c
+++ b/tests/migration/stress.c
@@ -167,7 +167,7 @@ static unsigned long long now(void)
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;
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);
if (random_bytes(data, PAGE_SIZE) < 0) {
- return -1;
+ return;
}
before = now();
@@ -225,7 +225,7 @@ static void *stressthread(void *arg)
return NULL;
}
-static int stress(unsigned long long ramsizeGB, int ncpus)
+static void stress(unsigned long long ramsizeGB, int ncpus)
{
size_t i;
unsigned long long ramsizeMB = ramsizeGB * 1024 / ncpus;
@@ -238,8 +238,6 @@ static int stress(unsigned long long ramsizeGB, int ncpus)
}
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",
argv0, gettid(), ramsizeGB, ncpus);
- if (stress(ramsizeGB, ncpus) < 0)
- exit_failure();
+ stress(ramsizeGB, ncpus);
- exit_success();
+ exit_failure();
}
--
2.17.1
- [PATCH 0/9] monitor/hmp-cmds: small improvements for migration, Mao Zhongyi, 2020/06/03
- [PATCH 6/9] monitor/hmp-cmds: add 'goto end' to reduce duplicate code., Mao Zhongyi, 2020/06/03
- [PATCH 5/9] monitor/hmp-cmds: delete redundant Error check before invoke hmp_handle_error(), Mao Zhongyi, 2020/06/03
- [PATCH 4/9] monitor/hmp-cmds: don't silently output when running 'migrate_set_downtime' fails, Mao Zhongyi, 2020/06/03
- [PATCH 9/9] migration/ram: calculate un/encoded_size only when needed., Mao Zhongyi, 2020/06/03
- [PATCH 2/9] tests/migration: fix unreachable path in stress test,
Mao Zhongyi <=
- [PATCH 7/9] monitor/hmp-cmds: improvements for the 'info migrate', Mao Zhongyi, 2020/06/03
- [PATCH 3/9] monitor/hmp-cmds: add units for migrate_parameters, Mao Zhongyi, 2020/06/03
- [PATCH 8/9] docs/xbzrle: update 'cache miss rate' and 'encoding rate' to docs, Mao Zhongyi, 2020/06/03
- [PATCH 1/9] tests/migration: mem leak fix, Mao Zhongyi, 2020/06/03