starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

json-streamer: do not heap-allocate JSONToken

Browse Source 
This is not needed with a push parser.  Since it processes tokens
immediately, the JSONToken can be created directly on the stack
and does not need to copy the lexer's string data.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20260626101727.1727389-6-pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Paolo Bonzini
2026-06-26 12:17:25 +02:00
committed by Markus Armbruster
parent ddd1f36f81
commit 55320a2983
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qobject/json-parser-int.h
View File

@@ -35,7 +35,12 @@ typedef enum json_token_type {
JSON_MAX = JSON_END_OF_INPUT JSON_MAX = JSON_END_OF_INPUT
} JSONTokenType; } JSONTokenType;
typedef struct JSONToken JSONToken; typedef struct JSONToken {
JSONTokenType type;
int x;
int y;
char *str;
} JSONToken;
/* json-lexer.c */ /* json-lexer.c */
void json_lexer_init(JSONLexer *lexer, bool enable_interpolation); void json_lexer_init(JSONLexer *lexer, bool enable_interpolation);
@@ -48,7 +53,6 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
JSONTokenType type, int x, int y); JSONTokenType type, int x, int y);
/* json-parser.c */ /* json-parser.c */
JSONToken *json_token(JSONTokenType type, int x, int y, GString *tokstr);
void json_parser_init(JSONParserContext *ctxt, va_list *ap); void json_parser_init(JSONParserContext *ctxt, va_list *ap);
void json_parser_reset(JSONParserContext *ctxt); void json_parser_reset(JSONParserContext *ctxt);
QObject *json_parser_feed(JSONParserContext *ctxt, const JSONToken *token, Error **errp); QObject *json_parser_feed(JSONParserContext *ctxt, const JSONToken *token, Error **errp);

18
qobject/json-parser.c
View File

@@ -24,13 +24,6 @@
#include "qobject/qstring.h" #include "qobject/qstring.h"
#include "json-parser-int.h" #include "json-parser-int.h"
struct JSONToken {
JSONTokenType type;
int x;
int y;
char str[];
};
/* /*
* The JSON parser is a push parser, returning a completed top-level * The JSON parser is a push parser, returning a completed top-level
* object, an error, or NULL (if the object is incomplete and no error * object, an error, or NULL (if the object is incomplete and no error
@@ -624,17 +617,6 @@ static QObject *parse_token(JSONParserContext *ctxt, const JSONToken *token)
return NULL; return NULL;
} }
JSONToken *json_token(JSONTokenType type, int x, int y, GString *tokstr)
{
JSONToken *token = g_malloc(sizeof(JSONToken) + tokstr->len + 1);
token->type = type;
memcpy(token->str, tokstr->str, tokstr->len);
token->str[tokstr->len] = 0;
token->x = x;
token->y = y;
return token;
}
void json_parser_reset(JSONParserContext *ctxt) void json_parser_reset(JSONParserContext *ctxt)
{ {

9
qobject/json-streamer.c
View File

@@ -78,8 +78,13 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
} else if (parser->bracket_count + parser->brace_count > MAX_NESTING) { } else if (parser->bracket_count + parser->brace_count > MAX_NESTING) {
error_setg(&err, "JSON nesting depth limit exceeded"); error_setg(&err, "JSON nesting depth limit exceeded");
} else { } else {
g_autofree JSONToken *token = json_token(type, x, y, input); JSONToken token = (JSONToken) {
QObject *json = json_parser_feed(&parser->parser, token, &err); .type = type,
.x = x,
.y = y,
.str = input->str
};
QObject *json = json_parser_feed(&parser->parser, &token, &err);
if (json) { if (json) {
parser->emit(parser->opaque, json, NULL); parser->emit(parser->opaque, json, NULL);
} }