OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

json: Unbox tokens queue in JSONMessageParser 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-51-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-08-23 18:40:17 +02:00
parent 8d3265b3d0
commit a2731e08ee
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qapi/qmp/json-streamer.h
View File

@ -31,7 +31,7 @@ typedef struct JSONMessageParser
JSONLexer lexer; JSONLexer lexer;
int brace_count; int brace_count;
int bracket_count; int bracket_count;
GQueue *tokens; GQueue tokens;
uint64_t token_size; uint64_t token_size;
} JSONMessageParser; } JSONMessageParser;

1
qobject/json-parser.c
View File

@ -552,7 +552,6 @@ QObject *json_parser_parse(GQueue *tokens, va_list *ap, Error **errp)
parser_context_pop_token(&ctxt); parser_context_pop_token(&ctxt);
} }
g_free(ctxt.current); g_free(ctxt.current);
g_queue_free(ctxt.buf);
return result; return result;
} }

30
qobject/json-streamer.c
View File

@ -22,17 +22,12 @@
#define MAX_TOKEN_COUNT (2ULL << 20) #define MAX_TOKEN_COUNT (2ULL << 20)
#define MAX_NESTING (1 << 10) #define MAX_NESTING (1 << 10)
static void json_message_free_token(void *token, void *opaque)
{
g_free(token);
}
static void json_message_free_tokens(JSONMessageParser *parser) static void json_message_free_tokens(JSONMessageParser *parser)
{ {
if (parser->tokens) { JSONToken *token;
g_queue_foreach(parser->tokens, json_message_free_token, NULL);
g_queue_free(parser->tokens); while ((token = g_queue_pop_head(&parser->tokens))) {
parser->tokens = NULL; g_free(token);
} }
} }
@ -61,11 +56,10 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
error_setg(&err, "JSON parse error, stray '%s'", input->str); error_setg(&err, "JSON parse error, stray '%s'", input->str);
goto out_emit; goto out_emit;
case JSON_END_OF_INPUT: case JSON_END_OF_INPUT:
if (g_queue_is_empty(parser->tokens)) { if (g_queue_is_empty(&parser->tokens)) {
return; return;
} }
json = json_parser_parse(parser->tokens, parser->ap, &err); json = json_parser_parse(&parser->tokens, parser->ap, &err);
parser->tokens = NULL;
goto out_emit; goto out_emit;
default: default:
break; break;
@ -79,7 +73,7 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
error_setg(&err, "JSON token size limit exceeded"); error_setg(&err, "JSON token size limit exceeded");
goto out_emit; goto out_emit;
} }
if (g_queue_get_length(parser->tokens) + 1 > MAX_TOKEN_COUNT) { if (g_queue_get_length(&parser->tokens) + 1 > MAX_TOKEN_COUNT) {
error_setg(&err, "JSON token count limit exceeded"); error_setg(&err, "JSON token count limit exceeded");
goto out_emit; goto out_emit;
} }
@ -97,21 +91,19 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
parser->token_size += input->len; parser->token_size += input->len;
g_queue_push_tail(parser->tokens, token); g_queue_push_tail(&parser->tokens, token);
if ((parser->brace_count > 0 || parser->bracket_count > 0) if ((parser->brace_count > 0 || parser->bracket_count > 0)
&& parser->bracket_count >= 0 && parser->bracket_count >= 0) { && parser->bracket_count >= 0 && parser->bracket_count >= 0) {
return; return;
} }
json = json_parser_parse(parser->tokens, parser->ap, &err); json = json_parser_parse(&parser->tokens, parser->ap, &err);
parser->tokens = NULL;
out_emit: out_emit:
parser->brace_count = 0; parser->brace_count = 0;
parser->bracket_count = 0; parser->bracket_count = 0;
json_message_free_tokens(parser); json_message_free_tokens(parser);
parser->tokens = g_queue_new();
parser->token_size = 0; parser->token_size = 0;
parser->emit(parser->opaque, json, err); parser->emit(parser->opaque, json, err);
} }
@ -126,7 +118,7 @@ void json_message_parser_init(JSONMessageParser *parser,
parser->ap = ap; parser->ap = ap;
parser->brace_count = 0; parser->brace_count = 0;
parser->bracket_count = 0; parser->bracket_count = 0;
parser->tokens = g_queue_new(); g_queue_init(&parser->tokens);
parser->token_size = 0; parser->token_size = 0;
json_lexer_init(&parser->lexer, !!ap); json_lexer_init(&parser->lexer, !!ap);
@ -141,7 +133,7 @@ void json_message_parser_feed(JSONMessageParser *parser,
void json_message_parser_flush(JSONMessageParser *parser) void json_message_parser_flush(JSONMessageParser *parser)
{ {
json_lexer_flush(&parser->lexer); json_lexer_flush(&parser->lexer);
assert(g_queue_is_empty(parser->tokens)); assert(g_queue_is_empty(&parser->tokens));
} }
void json_message_parser_destroy(JSONMessageParser *parser) void json_message_parser_destroy(JSONMessageParser *parser)