[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [v8 12/14] migration: Use an array instead of 3 parameters
From: |
Liang Li |
Subject: |
[Qemu-devel] [v8 12/14] migration: Use an array instead of 3 parameters |
Date: |
Wed, 15 Apr 2015 17:26:21 +0800 |
Put the three parameters related to multiple thread (de)compression
into an int array, and use an enum type to index the parameter.
Signed-off-by: Liang Li <address@hidden>
Signed-off-by: Yang Zhang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
include/migration/migration.h | 4 +---
migration/migration.c | 31 +++++++++++++++++++------------
qapi-schema.json | 23 +++++++++++++++++++++++
3 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index d4a1062..a6e025a 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -50,9 +50,7 @@ struct MigrationState
QemuThread thread;
QEMUBH *cleanup_bh;
QEMUFile *file;
- int compress_thread_count;
- int decompress_thread_count;
- int compress_level;
+ int parameters[MIGRATION_PARAMETER_MAX];
int state;
MigrationParams params;
diff --git a/migration/migration.c b/migration/migration.c
index dc7db87..533717c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -60,9 +60,12 @@ MigrationState *migrate_get_current(void)
.bandwidth_limit = MAX_THROTTLE,
.xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE,
.mbps = -1,
- .compress_thread_count = DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT,
- .decompress_thread_count = DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT,
- .compress_level = DEFAULT_MIGRATE_COMPRESS_LEVEL,
+ .parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL] =
+ DEFAULT_MIGRATE_COMPRESS_LEVEL,
+ .parameters[MIGRATION_PARAMETER_COMPRESS_THREADS] =
+ DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT,
+ .parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
+ DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT,
};
return ¤t_migration;
@@ -406,9 +409,11 @@ static MigrationState *migrate_init(const MigrationParams
*params)
int64_t bandwidth_limit = s->bandwidth_limit;
bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
int64_t xbzrle_cache_size = s->xbzrle_cache_size;
- int compress_level = s->compress_level;
- int compress_thread_count = s->compress_thread_count;
- int decompress_thread_count = s->decompress_thread_count;
+ int compress_level = s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL];
+ int compress_thread_count =
+ s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS];
+ int decompress_thread_count =
+ s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS];
memcpy(enabled_capabilities, s->enabled_capabilities,
sizeof(enabled_capabilities));
@@ -419,9 +424,11 @@ static MigrationState *migrate_init(const MigrationParams
*params)
sizeof(enabled_capabilities));
s->xbzrle_cache_size = xbzrle_cache_size;
- s->compress_level = compress_level;
- s->compress_thread_count = compress_thread_count;
- s->decompress_thread_count = decompress_thread_count;
+ s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL] = compress_level;
+ s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS] =
+ compress_thread_count;
+ s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
+ decompress_thread_count;
s->bandwidth_limit = bandwidth_limit;
s->state = MIGRATION_STATUS_SETUP;
trace_migrate_set_state(MIGRATION_STATUS_SETUP);
@@ -624,7 +631,7 @@ int migrate_compress_level(void)
s = migrate_get_current();
- return s->compress_level;
+ return s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL];
}
int migrate_compress_threads(void)
@@ -633,7 +640,7 @@ int migrate_compress_threads(void)
s = migrate_get_current();
- return s->compress_thread_count;
+ return s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS];
}
int migrate_decompress_threads(void)
@@ -642,7 +649,7 @@ int migrate_decompress_threads(void)
s = migrate_get_current();
- return s->decompress_thread_count;
+ return s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS];
}
int migrate_use_xbzrle(void)
diff --git a/qapi-schema.json b/qapi-schema.json
index b117008..121fcc7 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -569,6 +569,29 @@
##
{ 'command': 'query-migrate-capabilities', 'returns':
['MigrationCapabilityStatus']}
+# @MigrationParameter
+#
+# Migration parameters enumeration
+#
+# @compress-level: Set the compression level to be used in live migration,
+# the compression level is an integer between 0 and 9, where 0 means
+# no compression, 1 means the best compression speed, and 9 means best
+# compression ratio which will consume more CPU.
+#
+# @compress-threads: Set compression thread count to be used in live migration,
+# the compression thread count is an integer between 1 and 255.
+#
+# @decompress-threads: Set decompression thread count to be used in live
+# migration, the decompression thread count is an integer between 1
+# and 255. Usually, decompression is at least 4 times as fast as
+# compression, so setting the decompress-threads to the number about
+# 1/4 of compress-threads is adequate.
+#
+# Since: 2.3
+##
+{ 'enum': 'MigrationParameter',
+ 'data': ['compress-level', 'compress-threads', 'decompress-threads'] }
+
##
# @MouseInfo:
#
--
1.9.1
- [Qemu-devel] [v8 02/14] migration: Add the framework of multi-thread compression, (continued)
- [Qemu-devel] [v8 02/14] migration: Add the framework of multi-thread compression, Liang Li, 2015/04/15
- [Qemu-devel] [v8 04/14] qemu-file: Add compression functions to QEMUFile, Liang Li, 2015/04/15
- [Qemu-devel] [v8 05/14] arch_init: Alloc and free data struct for compression, Liang Li, 2015/04/15
- [Qemu-devel] [v8 03/14] migration: Add the framework of multi-thread decompression, Liang Li, 2015/04/15
- [Qemu-devel] [v8 06/14] arch_init: Add and free data struct for decompression, Liang Li, 2015/04/15
- [Qemu-devel] [v8 08/14] migration: Add the core code of multi-thread compression, Liang Li, 2015/04/15
- [Qemu-devel] [v8 07/14] migration: Split save_zero_page from ram_save_page, Liang Li, 2015/04/15
- [Qemu-devel] [v8 10/14] migration: Add the core code for decompression, Liang Li, 2015/04/15
- [Qemu-devel] [v8 09/14] migration: Make compression co-work with xbzrle, Liang Li, 2015/04/15
- [Qemu-devel] [v8 11/14] migration: Add interface to control compression, Liang Li, 2015/04/15
- [Qemu-devel] [v8 12/14] migration: Use an array instead of 3 parameters,
Liang Li <=
- [Qemu-devel] [v8 13/14] migration: Add qmp commands to set and query parameters, Liang Li, 2015/04/15
- [Qemu-devel] [v8 14/14] migration: Add hmp interface to set and query parameters, Liang Li, 2015/04/15