From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yvu28-0001r5-UD for qemu-devel@nongnu.org; Fri, 22 May 2015 16:59:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yvu24-0007Xo-IR for qemu-devel@nongnu.org; Fri, 22 May 2015 16:59:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yvu24-0007Xg-9d for qemu-devel@nongnu.org; Fri, 22 May 2015 16:59:04 -0400 From: John Snow Date: Fri, 22 May 2015 15:59:49 -0400 Message-Id: <1432324792-9373-17-git-send-email-jsnow@redhat.com> In-Reply-To: <1432324792-9373-1-git-send-email-jsnow@redhat.com> References: <1432324792-9373-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 16/19] qtest: pre-buffer hex nibs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com Instead of converting each byte one-at-a-time and then sending each byte over the wire, use sprintf() to pre-compute all of the hex nibs into a single buffer, then send the entire buffer all at once. This gives a moderate speed boost to memread() and memwrite() functions. Signed-off-by: John Snow Reviewed-by: Markus Armbruster Message-id: 1431021095-7558-2-git-send-email-jsnow@redhat.com --- qtest.c | 11 +++++++---- tests/libqtest.c | 8 +++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/qtest.c b/qtest.c index 04412dd..05cefd2 100644 --- a/qtest.c +++ b/qtest.c @@ -414,6 +414,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) } else if (strcmp(words[0], "read") == 0) { uint64_t addr, len, i; uint8_t *data; + char *enc; g_assert(words[1] && words[2]); addr = strtoull(words[1], NULL, 0); @@ -422,14 +423,16 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) data = g_malloc(len); cpu_physical_memory_read(addr, data, len); - qtest_send_prefix(chr); - qtest_send(chr, "OK 0x"); + enc = g_malloc(2 * len + 1); for (i = 0; i < len; i++) { - qtest_sendf(chr, "%02x", data[i]); + sprintf(&enc[i * 2], "%02x", data[i]); } - qtest_send(chr, "\n"); + + qtest_send_prefix(chr); + qtest_sendf(chr, "OK 0x%s\n", enc); g_free(data); + g_free(enc); } else if (strcmp(words[0], "b64read") == 0) { uint64_t addr, len; uint8_t *data; diff --git a/tests/libqtest.c b/tests/libqtest.c index 055aad6..e5188e0 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -730,13 +730,15 @@ void qtest_memwrite(QTestState *s, uint64_t addr, const void *data, size_t size) { const uint8_t *ptr = data; size_t i; + char *enc = g_malloc(2 * size + 1); - qtest_sendf(s, "write 0x%" PRIx64 " 0x%zx 0x", addr, size); for (i = 0; i < size; i++) { - qtest_sendf(s, "%02x", ptr[i]); + sprintf(&enc[i * 2], "%02x", ptr[i]); } - qtest_sendf(s, "\n"); + + qtest_sendf(s, "write 0x%" PRIx64 " 0x%zx 0x%s\n", addr, size, enc); qtest_rsp(s, 0); + g_free(enc); } void qtest_memset(QTestState *s, uint64_t addr, uint8_t pattern, size_t size) -- 2.1.0