aboutsummaryrefslogtreecommitdiff
path: root/block/throttle-groups.c
diff options
context:
space:
mode:
authorManos Pitsidianakis <el13635@mail.ntua.gr>2017-08-25 16:20:27 +0300
committerKevin Wolf <kwolf@redhat.com>2017-09-06 10:12:02 +0200
commitd8e7d87ec49c1458f516d50d109b3f201da736a1 (patch)
tree79513899899eac436824afc1108b64953acc0cc7 /block/throttle-groups.c
parent432d889e55e2614bd0e8bb559af18a61ac217565 (diff)
block: add throttle block filter driver
block/throttle.c uses existing I/O throttle infrastructure inside a block filter driver. I/O operations are intercepted in the filter's read/write coroutines, and referred to block/throttle-groups.c The driver can be used with the syntax -drive driver=throttle,file.filename=foo.qcow2,throttle-group=bar which registers the throttle filter node with the ThrottleGroup 'bar'. The given group must be created beforehand with object-add or -object. Reviewed-by: Alberto Garcia <berto@igalia.com> Signed-off-by: Manos Pitsidianakis <el13635@mail.ntua.gr> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/throttle-groups.c')
-rw-r--r--block/throttle-groups.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index ed1817ec84..6ba992c8d7 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -101,6 +101,14 @@ static ThrottleGroup *throttle_group_by_name(const char *name)
return NULL;
}
+/* This function reads throttle_groups and must be called under the global
+ * mutex.
+ */
+bool throttle_group_exists(const char *name)
+{
+ return throttle_group_by_name(name) != NULL;
+}
+
/* Increments the reference count of a ThrottleGroup given its name.
*
* If no ThrottleGroup is found with the given name a new one is
@@ -543,6 +551,11 @@ void throttle_group_unregister_tgm(ThrottleGroupMember *tgm)
ThrottleGroupMember *token;
int i;
+ if (!ts) {
+ /* Discard already unregistered tgm */
+ return;
+ }
+
assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
@@ -709,7 +722,7 @@ static void throttle_group_obj_complete(UserCreatable *obj, Error **errp)
assert(tg->name);
/* error if name is duplicate */
- if (throttle_group_by_name(tg->name) != NULL) {
+ if (throttle_group_exists(tg->name)) {
error_setg(errp, "A group with this name already exists");
return;
}