From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 02/32] monitor: Spell "I/O thread" consistently in comments
Date: Tue, 3 Jul 2018 17:36:58 +0200 [thread overview]
Message-ID: <20180703153728.2175-3-armbru@redhat.com> (raw)
In-Reply-To: <20180703153728.2175-1-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-3-armbru@redhat.com>
---
monitor.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/monitor.c b/monitor.c
index 208d7c7cfd..4f4f309d45 100644
--- a/monitor.c
+++ b/monitor.c
@@ -243,7 +243,7 @@ struct Monitor {
/* Let's add monitor global variables to this struct. */
static struct {
IOThread *mon_iothread;
- /* Bottom half to dispatch the requests received from IO thread */
+ /* Bottom half to dispatch the requests received from I/O thread */
QEMUBH *qmp_dispatcher_bh;
/* Bottom half to deliver the responses back to clients */
QEMUBH *qmp_respond_bh;
@@ -518,7 +518,7 @@ static void monitor_json_emitter(Monitor *mon, QObject *data)
{
if (mon->use_io_thr) {
/*
- * If using IO thread, we need to queue the item so that IO
+ * If using I/O thread, we need to queue the item so that I/O
* thread will do the rest for us. Take refcount so that
* caller won't free the data (which will be finally freed in
* responder thread).
@@ -529,7 +529,7 @@ static void monitor_json_emitter(Monitor *mon, QObject *data)
qemu_bh_schedule(mon_global.qmp_respond_bh);
} else {
/*
- * If not using monitor IO thread, then we are in main thread.
+ * If not using monitor I/O thread, then we are in main thread.
* Do the emission right away.
*/
monitor_json_emitter_raw(mon, data);
@@ -1269,7 +1269,7 @@ static void qmp_caps_check(Monitor *mon, QMPCapabilityList *list,
if (!mon->use_io_thr) {
/*
* Out-of-band only works with monitors that are
- * running on dedicated IOThread.
+ * running on dedicated I/O thread.
*/
error_setg(errp, "This monitor does not support "
"out-of-band (OOB)");
@@ -4403,7 +4403,7 @@ int monitor_suspend(Monitor *mon)
if (monitor_is_qmp(mon)) {
/*
- * Kick iothread to make sure this takes effect. It'll be
+ * Kick I/O thread to make sure this takes effect. It'll be
* evaluated again in prepare() of the watch object.
*/
aio_notify(iothread_get_aio_context(mon_global.mon_iothread));
@@ -4422,7 +4422,7 @@ void monitor_resume(Monitor *mon)
if (atomic_dec_fetch(&mon->suspend_cnt) == 0) {
if (monitor_is_qmp(mon)) {
/*
- * For QMP monitors that are running in IOThread, let's
+ * For QMP monitors that are running in I/O thread, let's
* kick the thread in case it's sleeping.
*/
if (mon->use_io_thr) {
@@ -4446,7 +4446,7 @@ static QObject *get_qmp_greeting(Monitor *mon)
for (cap = 0; cap < QMP_CAPABILITY__MAX; cap++) {
if (!mon->use_io_thr && cap == QMP_CAPABILITY_OOB) {
- /* Monitors that are not using IOThread won't support OOB */
+ /* Monitors that are not using I/O thread won't support OOB */
continue;
}
qlist_append_str(cap_list, QMPCapability_str(cap));
@@ -4587,9 +4587,9 @@ static void monitor_iothread_init(void)
NULL);
/*
- * Unlike the dispatcher BH, this must be run on the monitor IO
- * thread, so that monitors that are using IO thread will make
- * sure read/write operations are all done on the IO thread.
+ * Unlike the dispatcher BH, this must be run on the monitor I/O
+ * thread, so that monitors that are using I/O thread will make
+ * sure read/write operations are all done on the I/O thread.
*/
mon_global.qmp_respond_bh = aio_bh_new(monitor_get_aio_context(),
monitor_qmp_bh_responder,
@@ -4661,7 +4661,7 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)
if (mon->use_io_thr) {
/*
* When use_io_thr is set, we use the global shared dedicated
- * IO thread for this monitor to handle input/output.
+ * I/O thread for this monitor to handle input/output.
*/
context = monitor_get_io_context();
/* We should have inited globals before reaching here. */
@@ -4718,7 +4718,7 @@ void monitor_init(Chardev *chr, int flags)
/*
* We can't call qemu_chr_fe_set_handlers() directly here
* since during the procedure the chardev will be active
- * and running in monitor iothread, while we'll still do
+ * and running in monitor I/O thread, while we'll still do
* something before returning from it, which is a possible
* race too. To avoid that, we just create a BH to setup
* the handlers.
@@ -4745,16 +4745,16 @@ void monitor_cleanup(void)
Monitor *mon, *next;
/*
- * We need to explicitly stop the iothread (but not destroy it),
- * cleanup the monitor resources, then destroy the iothread since
+ * We need to explicitly stop the I/O thread (but not destroy it),
+ * cleanup the monitor resources, then destroy the I/O thread since
* we need to unregister from chardev below in
* monitor_data_destroy(), and chardev is not thread-safe yet
*/
iothread_stop(mon_global.mon_iothread);
/*
- * After we have IOThread to send responses, it's possible that
- * when we stop the IOThread there are still replies queued in the
+ * After we have I/O thread to send responses, it's possible that
+ * when we stop the I/O thread there are still replies queued in the
* responder queue. Flush all of them. Note that even after this
* flush it's still possible that out buffer is not flushed.
* It'll be done in below monitor_flush() as the last resort.
@@ -4770,7 +4770,7 @@ void monitor_cleanup(void)
}
qemu_mutex_unlock(&monitor_lock);
- /* QEMUBHs needs to be deleted before destroying the IOThread. */
+ /* QEMUBHs needs to be deleted before destroying the I/O thread */
qemu_bh_delete(mon_global.qmp_dispatcher_bh);
mon_global.qmp_dispatcher_bh = NULL;
qemu_bh_delete(mon_global.qmp_respond_bh);
--
2.17.1
next prev parent reply other threads:[~2018-07-03 15:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-03 15:36 [Qemu-devel] [PULL 00/32] Monitor patches for 2018-07-03 Markus Armbruster
2018-07-03 15:36 ` [Qemu-devel] [PULL 01/32] qmp: Say "out-of-band" instead of "Out-Of-Band" Markus Armbruster
2018-07-03 15:36 ` Markus Armbruster [this message]
2018-07-03 15:36 ` [Qemu-devel] [PULL 03/32] docs/interop/qmp: Improve OOB documentation Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 04/32] qmp: Document COMMAND_DROPPED design flaw Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 05/32] qmp: Get rid of x-oob-test command Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 06/32] tests/qmp-test: Test in-band command doesn't overtake Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 07/32] qmp: Make "id" optional again even in "oob" monitors Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 08/32] tests/test-qga: Demonstrate the guest-agent ignores "id" Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 09/32] qmp qemu-ga: Revert change that accidentally made qemu-ga accept "id" Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 10/32] tests/test-qga: Demonstrate the guest-agent ignores "control" Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 11/32] qmp qemu-ga: Fix qemu-ga not to accept "control" Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 12/32] qmp: Redo how the client requests out-of-band execution Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 13/32] qmp: Revert change to handle_qmp_command tracepoint Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 14/32] qmp: Always free QMPRequest with qmp_request_free() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 15/32] qmp: Simplify code around monitor_qmp_dispatch_one() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 16/32] tests/qmp-test: Demonstrate QMP errors jumping the queue Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 17/32] qmp: Don't let malformed in-band commands jump " Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 18/32] qmp: Don't let JSON errors " Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 19/32] monitor: Rename use_io_thr to use_io_thread Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 20/32] monitor: Peel off @mon_global wrapper Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 21/32] qobject: New qdict_from_jsonf_nofail() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 22/32] qmp: De-duplicate error response building Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 23/32] qmp: Use QDict * instead of QObject * for response objects Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 24/32] qmp: Replace monitor_json_emitter{, raw}() by qmp_{queue, send}_response() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 25/32] qmp: Replace get_qmp_greeting() by qmp_greeting() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 26/32] qmp: Simplify monitor_qmp_respond() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 27/32] qmp: Add some comments around null responses Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 28/32] qmp: Switch timestamp_put() to qdict_from_jsonf_nofail() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 29/32] qobject: Let qobject_from_jsonf() fail instead of abort Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 30/32] qmp: Clean up capability negotiation after commit 02130314d8c Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 31/32] monitor: Improve some comments Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 32/32] qapi: Polish command flags documentation in qapi-code-gen.txt Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180703153728.2175-3-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).