From patchwork Mon Mar 26 15:09:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 10308111 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE9DC600F6 for ; Mon, 26 Mar 2018 15:29:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE1D929513 for ; Mon, 26 Mar 2018 15:29:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A12AF295F2; Mon, 26 Mar 2018 15:29:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0358E29513 for ; Mon, 26 Mar 2018 15:29:44 +0000 (UTC) Received: from localhost ([::1]:57383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0U47-0006cm-6O for patchwork-qemu-devel@patchwork.kernel.org; Mon, 26 Mar 2018 11:29:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0TlT-0005zm-Mf for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0TlO-0003Ak-V9 for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:27 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36656 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f0TlO-0003AW-Pg for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:10:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 728DD4072CFD; Mon, 26 Mar 2018 15:10:22 +0000 (UTC) Received: from localhost (ovpn-112-61.ams2.redhat.com [10.36.112.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3301FD7DFA; Mon, 26 Mar 2018 15:10:17 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2018 17:09:01 +0200 Message-Id: <20180326150916.9602-24-marcandre.lureau@redhat.com> In-Reply-To: <20180326150916.9602-1-marcandre.lureau@redhat.com> References: <20180326150916.9602-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 26 Mar 2018 15:10:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 26 Mar 2018 15:10:22 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'marcandre.lureau@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 23/38] QmpSession: introduce QmpReturn X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Juan Quintela , Markus Armbruster , "Dr. David Alan Gilbert" , Gerd Hoffmann , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Roth Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP QmpReturn and associated functions are used internally for synchronous dispatch return for now. They will be used for returning in an asynchronous way, by holding the pre-prepared response, and having some bookkeeping in QmpSession. They also help to factor out a bit of code preparing the json reply and calling the return_cb. Signed-off-by: Marc-André Lureau --- include/qapi/qmp/dispatch.h | 33 +++++++++++++++++++ monitor.c | 7 +--- qapi/qmp-dispatch.c | 65 ++++++++++++++++++++++++------------- 3 files changed, 76 insertions(+), 29 deletions(-) diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h index 5329d0052a..7ca8ab17d9 100644 --- a/include/qapi/qmp/dispatch.h +++ b/include/qapi/qmp/dispatch.h @@ -17,6 +17,8 @@ #include "qemu/queue.h" #include "qapi/qmp/json-streamer.h" +typedef struct QmpReturn QmpReturn; + typedef void (QmpCommandFunc)(QDict *, QObject **, Error **); typedef enum QmpCommandOptions @@ -48,6 +50,37 @@ struct QmpSession { QmpCommandList *cmds; }; +struct QmpReturn { + QmpSession *session; + QDict *rsp; +}; + +/* + * @qmp_return_new: + * + * Allocates and initializes a QmpReturn. + */ +QmpReturn *qmp_return_new(QmpSession *session, const QDict *req); + +/* + * @qmp_return_free: + * + * Free a QmpReturn. This shouldn't be needed if you actually return + * with qmp_return{_error}. + */ +void qmp_return_free(QmpReturn *qret); + +/* + * @qmp_return{_error}: + * + * Construct the command reply, and call the + * return_cb() associated with the session. + * + * Finally, free the QmpReturn. + */ +void qmp_return(QmpReturn *qret, QObject *rsp); +void qmp_return_error(QmpReturn *qret, Error *err); + void qmp_register_command(QmpCommandList *cmds, const char *name, QmpCommandFunc *fn, QmpCommandOptions options); void qmp_unregister_command(QmpCommandList *cmds, const char *name); diff --git a/monitor.c b/monitor.c index 94ad366c2d..73a06d4156 100644 --- a/monitor.c +++ b/monitor.c @@ -4010,7 +4010,6 @@ static void monitor_qmp_bh_dispatcher(void *data) static void qmp_dispatch_cb(QmpSession *session, QDict *req) { - QDict *rsp; QObject *id; Monitor *mon = container_of(session, Monitor, qmp.session); Error *err = NULL; @@ -4081,11 +4080,7 @@ static void qmp_dispatch_cb(QmpSession *session, QDict *req) return; err: - rsp = qdict_new(); - qdict_put_obj(rsp, "error", qmp_build_error_object(err)); - error_free(err); - monitor_json_emitter(mon, QOBJECT(rsp)); - QDECREF(rsp); + qmp_return_error(qmp_return_new(session, req), err); } static void monitor_qmp_read(void *opaque, const uint8_t *buf, int size) diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 53d099d303..7b57fa7987 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -19,6 +19,42 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" +QmpReturn *qmp_return_new(QmpSession *session, const QDict *req) +{ + QmpReturn *qret = g_new0(QmpReturn, 1); + QObject *id = req ? qdict_get(req, "id") : NULL; + + qret->session = session; + qret->rsp = qdict_new(); + if (id) { + qobject_incref(id); + qdict_put_obj(qret->rsp, "id", id); + } + + return qret; +} + +void qmp_return_free(QmpReturn *qret) +{ + QDECREF(qret->rsp); + g_free(qret); +} + +void qmp_return(QmpReturn *qret, QObject *rsp) +{ + qdict_put_obj(qret->rsp, "return", rsp ?: QOBJECT(qdict_new())); + qret->session->return_cb(qret->session, qret->rsp); + qmp_return_free(qret); +} + +void qmp_return_error(QmpReturn *qret, Error *err) +{ + qdict_put_obj(qret->rsp, "error", qmp_build_error_object(err)); + error_free(err); + qret->session->return_cb(qret->session, qret->rsp); + qmp_return_free(qret); +} + QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) { const QDictEntry *ent; @@ -150,7 +186,7 @@ static void qmp_json_parser_emit(JSONMessageParser *parser, GQueue *tokens) { QmpSession *session = container_of(parser, QmpSession, parser); QObject *obj; - QDict *req; + QDict *req = NULL; Error *err = NULL; obj = json_parser_parse_err(tokens, NULL, &err); @@ -167,11 +203,7 @@ static void qmp_json_parser_emit(JSONMessageParser *parser, GQueue *tokens) end: if (err) { - QDict *rsp = qdict_new(); - qdict_put_obj(rsp, "error", qmp_build_error_object(err)); - error_free(err); - session->return_cb(session, rsp); - QDECREF(rsp); + qmp_return_error(qmp_return_new(session, req), err); } qobject_decref(obj); } @@ -204,28 +236,15 @@ void qmp_session_destroy(QmpSession *session) void qmp_dispatch(QmpSession *session, QDict *req) { + QmpReturn *qret = qmp_return_new(session, req); Error *err = NULL; QObject *ret; - QDict *rsp; - QObject *id = qdict_get(req, "id"); ret = do_qmp_dispatch(session->cmds, req, &err); - - rsp = qdict_new(); - if (id) { - qobject_incref(id); - qdict_put_obj(rsp, "id", id); - } if (err) { - qdict_put_obj(rsp, "error", qmp_build_error_object(err)); - error_free(err); + assert(!ret); + qmp_return_error(qret, err); } else if (ret) { - qdict_put_obj(rsp, "return", ret); - } else { - QDECREF(rsp); - return; + qmp_return(qret, ret); } - - session->return_cb(session, rsp); - QDECREF(rsp); }