From patchwork Wed Nov 11 17:29:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 38156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 81857B7099 for ; Thu, 12 Nov 2009 04:52:23 +1100 (EST) Received: from localhost ([127.0.0.1]:42602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8HMi-0007Sp-Mr for incoming@patchwork.ozlabs.org; Wed, 11 Nov 2009 12:52:20 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8H0d-0006uN-1j for qemu-devel@nongnu.org; Wed, 11 Nov 2009 12:29:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8H0V-0006nl-42 for qemu-devel@nongnu.org; Wed, 11 Nov 2009 12:29:27 -0500 Received: from [199.232.76.173] (port=48457 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8H0U-0006nG-Ac for qemu-devel@nongnu.org; Wed, 11 Nov 2009 12:29:22 -0500 Received: from e31.co.us.ibm.com ([32.97.110.149]:42206) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N8H0T-00021T-T8 for qemu-devel@nongnu.org; Wed, 11 Nov 2009 12:29:22 -0500 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e31.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id nABHMH0w016288 for ; Wed, 11 Nov 2009 10:22:17 -0700 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nABHT8ew148892 for ; Wed, 11 Nov 2009 10:29:09 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nABHT8nZ007338 for ; Wed, 11 Nov 2009 10:29:08 -0700 Received: from localhost.localdomain (sig-9-65-32-87.mts.ibm.com [9.65.32.87]) by d03av03.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id nABHT43J007179; Wed, 11 Nov 2009 10:29:07 -0700 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Wed, 11 Nov 2009 11:29:00 -0600 Message-Id: <1257960543-26373-8-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1257960543-26373-1-git-send-email-aliguori@us.ibm.com> References: <1257960543-26373-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Anthony Liguori , Luiz Capitulino Subject: [Qemu-devel] [PATCH 08/11] Add a JSON message boundary identifier X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The second stage of our JSON parser is a simple state machine that identifies individual JSON values by counting the levels of nesting of tokens. It does not perform grammar validation. We use this to emit a full JSON value to the parser. Signed-off-by: Anthony Liguori --- Makefile | 1 + json-streamer.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ json-streamer.h | 39 ++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 0 deletions(-) create mode 100644 json-streamer.c create mode 100644 json-streamer.h diff --git a/Makefile b/Makefile index e5ab879..a2aab60 100644 --- a/Makefile +++ b/Makefile @@ -136,6 +136,7 @@ obj-y += qemu-char.o aio.o savevm.o obj-y += msmouse.o ps2.o obj-y += qdev.o qdev-properties.o obj-y += qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o json-lexer.o +obj-y += json-streamer.o obj-y += qemu-config.o obj-$(CONFIG_BRLAPI) += baum.o diff --git a/json-streamer.c b/json-streamer.c new file mode 100644 index 0000000..610ffea --- /dev/null +++ b/json-streamer.c @@ -0,0 +1,88 @@ +/* + * JSON streaming support + * + * Copyright IBM, Corp. 2009 + * + * Authors: + * Anthony Liguori + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#include "qlist.h" +#include "qint.h" +#include "qdict.h" +#include "qemu-common.h" +#include "json-lexer.h" +#include "json-streamer.h" + +static void json_message_process_token(JSONLexer *lexer, QString *token, JSONTokenType type, int x, int y) +{ + JSONMessageParser *parser = container_of(lexer, JSONMessageParser, lexer); + QDict *dict; + + if (type == JSON_OPERATOR) { + switch (qstring_get_str(token)[0]) { + case '{': + parser->brace_count++; + break; + case '}': + parser->brace_count--; + break; + case '[': + parser->bracket_count++; + break; + case ']': + parser->bracket_count--; + break; + default: + break; + } + } + + dict = qdict_new(); + qdict_put_obj(dict, "type", QOBJECT(qint_from_int(type))); + QINCREF(token); + qdict_put_obj(dict, "token", QOBJECT(token)); + qdict_put_obj(dict, "x", QOBJECT(qint_from_int(x))); + qdict_put_obj(dict, "y", QOBJECT(qint_from_int(y))); + + qlist_append(parser->tokens, dict); + + if (parser->brace_count == 0 && + parser->bracket_count == 0) { + parser->emit(parser, parser->tokens); + QDECREF(parser->tokens); + parser->tokens = qlist_new(); + } +} + +void json_message_parser_init(JSONMessageParser *parser, + void (*func)(JSONMessageParser *, QList *)) +{ + parser->emit = func; + parser->brace_count = 0; + parser->bracket_count = 0; + parser->tokens = qlist_new(); + + json_lexer_init(&parser->lexer, json_message_process_token); +} + +int json_message_parser_feed(JSONMessageParser *parser, + const char *buffer, size_t size) +{ + return json_lexer_feed(&parser->lexer, buffer, size); +} + +int json_message_parser_flush(JSONMessageParser *parser) +{ + return json_lexer_flush(&parser->lexer); +} + +void json_message_parser_destroy(JSONMessageParser *parser) +{ + json_lexer_destroy(&parser->lexer); + QDECREF(parser->tokens); +} diff --git a/json-streamer.h b/json-streamer.h new file mode 100644 index 0000000..09f3bd7 --- /dev/null +++ b/json-streamer.h @@ -0,0 +1,39 @@ +/* + * JSON streaming support + * + * Copyright IBM, Corp. 2009 + * + * Authors: + * Anthony Liguori + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#ifndef QEMU_JSON_STREAMER_H +#define QEMU_JSON_STREAMER_H + +#include "qlist.h" +#include "json-lexer.h" + +typedef struct JSONMessageParser +{ + void (*emit)(struct JSONMessageParser *parser, QList *tokens); + JSONLexer lexer; + int brace_count; + int bracket_count; + QList *tokens; +} JSONMessageParser; + +void json_message_parser_init(JSONMessageParser *parser, + void (*func)(JSONMessageParser *, QList *)); + +int json_message_parser_feed(JSONMessageParser *parser, + const char *buffer, size_t size); + +int json_message_parser_flush(JSONMessageParser *parser); + +void json_message_parser_destroy(JSONMessageParser *parser); + +#endif