falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: Adjust sleeps for migration test 

Also reorder code to not sleep when event already happened.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2018-01-05 13:56:48 +01:00 committed by Dr. David Alan Gilbert
parent eb665d7d92
commit 6a7724e9a2
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/migration-test.c
View File

@ -268,10 +268,9 @@ static uint64_t get_migration_pass(QTestState *who)
static void wait_for_migration_complete(QTestState *who) static void wait_for_migration_complete(QTestState *who)
{ {
QDict *rsp, *rsp_return; while (true) {
bool completed; QDict *rsp, *rsp_return;
bool completed;
do {
const char *status; const char *status;
rsp = wait_command(who, "{ 'execute': 'query-migrate' }"); rsp = wait_command(who, "{ 'execute': 'query-migrate' }");
@ -280,8 +279,11 @@ static void wait_for_migration_complete(QTestState *who)
completed = strcmp(status, "completed") == 0; completed = strcmp(status, "completed") == 0;
g_assert_cmpstr(status, !=, "failed"); g_assert_cmpstr(status, !=, "failed");
QDECREF(rsp); QDECREF(rsp);
usleep(1000 * 100); if (completed) {
} while (!completed); return;
}
usleep(1000);
}
} }
static void wait_for_migration_pass(QTestState *who) static void wait_for_migration_pass(QTestState *who)
@ -290,16 +292,13 @@ static void wait_for_migration_pass(QTestState *who)
uint64_t pass; uint64_t pass;
/* Wait for the 1st sync */ /* Wait for the 1st sync */
do { while (!got_stop && !initial_pass) {
usleep(1000);
initial_pass = get_migration_pass(who); initial_pass = get_migration_pass(who);
if (got_stop || initial_pass) { }
break;
}
usleep(1000 * 100);
} while (true);
do { do {
usleep(1000 * 100); usleep(1000);
pass = get_migration_pass(who); pass = get_migration_pass(who);
} while (pass == initial_pass && !got_stop); } while (pass == initial_pass && !got_stop);
} }
@ -489,13 +488,13 @@ static void test_migrate_end(QTestState *from, QTestState *to)
/* Destination still running, wait for a byte to change */ /* Destination still running, wait for a byte to change */
do { do {
qtest_memread(to, start_address, &dest_byte_b, 1); qtest_memread(to, start_address, &dest_byte_b, 1);
usleep(10 * 1000); usleep(1000 * 10);
} while (dest_byte_a == dest_byte_b); } while (dest_byte_a == dest_byte_b);
qtest_qmp_discard_response(to, "{ 'execute' : 'stop'}"); qtest_qmp_discard_response(to, "{ 'execute' : 'stop'}");
/* With it stopped, check nothing changes */ /* With it stopped, check nothing changes */
qtest_memread(to, start_address, &dest_byte_c, 1); qtest_memread(to, start_address, &dest_byte_c, 1);
sleep(1); usleep(1000 * 200);
qtest_memread(to, start_address, &dest_byte_d, 1); qtest_memread(to, start_address, &dest_byte_d, 1);
g_assert_cmpint(dest_byte_c, ==, dest_byte_d); g_assert_cmpint(dest_byte_c, ==, dest_byte_d);