mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: Use GString instead of QString for output buffer

Browse Source 
GString has a richer set of string operations than QString.  It should
be preferred to QString except where we need a QObject or reference
counting.  We don't here.  Switch to GString, and put its richer
interface to use.

Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201211171152.146877-3-armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Markus Armbruster 2020-12-11 18:11:34 +01:00
parent 436054e22f
commit 20076f4a8c
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor/misc.c
View File

@ -136,7 +136,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
handle_hmp_command(&hmp, command_line); handle_hmp_command(&hmp, command_line);
WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) { WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {
output = g_strdup(qstring_get_str(hmp.common.outbuf)); output = g_strdup(hmp.common.outbuf->str);
} }
out: out:

2
monitor/monitor-internal.h
View File

@ -105,7 +105,7 @@ struct Monitor {
* Members that are protected by the per-monitor lock * Members that are protected by the per-monitor lock
*/ */
QLIST_HEAD(, mon_fd_t) fds; QLIST_HEAD(, mon_fd_t) fds;
QString *outbuf; GString *outbuf;
guint out_watch; guint out_watch;
/* Read under either BQL or mon_lock, written with BQL+mon_lock. */ /* Read under either BQL or mon_lock, written with BQL+mon_lock. */
int mux_out; int mux_out;

20
monitor/monitor.c
View File

@ -29,7 +29,6 @@
#include "qapi/qapi-emit-events.h" #include "qapi/qapi-emit-events.h"
#include "qapi/qapi-visit-control.h" #include "qapi/qapi-visit-control.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
@ -181,22 +180,19 @@ static void monitor_flush_locked(Monitor *mon)
return; return;
} }
buf = qstring_get_str(mon->outbuf); buf = mon->outbuf->str;
len = qstring_get_length(mon->outbuf); len = mon->outbuf->len;
if (len && !mon->mux_out) { if (len && !mon->mux_out) {
rc = qemu_chr_fe_write(&mon->chr, (const uint8_t *) buf, len); rc = qemu_chr_fe_write(&mon->chr, (const uint8_t *) buf, len);
if ((rc < 0 && errno != EAGAIN) || (rc == len)) { if ((rc < 0 && errno != EAGAIN) || (rc == len)) {
/* all flushed or error */ /* all flushed or error */
qobject_unref(mon->outbuf); g_string_truncate(mon->outbuf, 0);
mon->outbuf = qstring_new();
return; return;
} }
if (rc > 0) { if (rc > 0) {
/* partial write */ /* partial write */
QString *tmp = qstring_from_str(buf + rc); g_string_erase(mon->outbuf, 0, rc);
qobject_unref(mon->outbuf);
mon->outbuf = tmp;
} }
if (mon->out_watch == 0) { if (mon->out_watch == 0) {
mon->out_watch = mon->out_watch =
@ -223,9 +219,9 @@ int monitor_puts(Monitor *mon, const char *str)
for (i = 0; str[i]; i++) { for (i = 0; str[i]; i++) {
c = str[i]; c = str[i];
if (c == '\n') { if (c == '\n') {
qstring_append_chr(mon->outbuf, '\r'); g_string_append_c(mon->outbuf, '\r');
} }
qstring_append_chr(mon->outbuf, c); g_string_append_c(mon->outbuf, c);
if (c == '\n') { if (c == '\n') {
monitor_flush_locked(mon); monitor_flush_locked(mon);
} }
@ -602,7 +598,7 @@ void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush,
} }
qemu_mutex_init(&mon->mon_lock); qemu_mutex_init(&mon->mon_lock);
mon->is_qmp = is_qmp; mon->is_qmp = is_qmp;
mon->outbuf = qstring_new(); mon->outbuf = g_string_new(NULL);
mon->skip_flush = skip_flush; mon->skip_flush = skip_flush;
mon->use_io_thread = use_io_thread; mon->use_io_thread = use_io_thread;
} }
@ -616,7 +612,7 @@ void monitor_data_destroy(Monitor *mon)
} else { } else {
readline_free(container_of(mon, MonitorHMP, common)->rs); readline_free(container_of(mon, MonitorHMP, common)->rs);
} }
qobject_unref(mon->outbuf); g_string_free(mon->outbuf, true);
qemu_mutex_destroy(&mon->mon_lock); qemu_mutex_destroy(&mon->mon_lock);
} }