[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/12] tests/migration: fix unreachable path in stress test
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 05/12] tests/migration: fix unreachable path in stress test |
Date: |
Wed, 17 Jun 2020 19:37:26 +0100 |
From: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
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>
---
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.26.2
- [PULL 00/12] migration, HMP and virtiofs queue, Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 01/12] virtiofsd: Whitelist fchmod, Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 04/12] tests/migration: mem leak fix, Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 03/12] hmp: Make json format optional for qom-set, Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 05/12] tests/migration: fix unreachable path in stress test,
Dr. David Alan Gilbert (git) <=
- [PULL 02/12] qom-hmp-cmds: fix a memleak in hmp_qom_get, Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 06/12] monitor/hmp-cmds: add units for migrate_parameters, Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 07/12] monitor/hmp-cmds: don't silently output when running 'migrate_set_downtime' fails, Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 08/12] monitor/hmp-cmds: delete redundant Error check before invoke hmp_handle_error(), Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 10/12] monitor/hmp-cmds: improvements for the 'info migrate', Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 09/12] monitor/hmp-cmds: add 'goto end' to reduce duplicate code., Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 11/12] docs/xbzrle: update 'cache miss rate' and 'encoding rate' to docs, Dr. David Alan Gilbert (git), 2020/06/17
- [PULL 12/12] migration: fix multifd_send_pages() next channel, Dr. David Alan Gilbert (git), 2020/06/17
- Re: [PULL 00/12] migration, HMP and virtiofs queue, no-reply, 2020/06/17
- Re: [PULL 00/12] migration, HMP and virtiofs queue, Peter Maydell, 2020/06/18