Replace the contents of the tokens GQueue with a simple struct. This cuts the amount of memory allocated by tests/check-qjson from ~500MB to ~20MB, and the execution time from 600ms to 80ms on my laptop. Still a lot (some could be saved by using an intrusive list, such as QSIMPLEQ, instead of the GQueue), but the savings are already massive and the right thing to do would probably be to get rid of json-streamer completely. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1448300659-23559-5-git-send-email-pbonzini@redhat.com> [Straightforwardly rebased on my patches] Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
49 lines
1.1 KiB
C
49 lines
1.1 KiB
C
/*
|
|
* JSON streaming support
|
|
*
|
|
* Copyright IBM, Corp. 2009
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* 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 <stdint.h>
|
|
#include "glib-compat.h"
|
|
#include "qapi/qmp/json-lexer.h"
|
|
|
|
typedef struct JSONToken {
|
|
int type;
|
|
int x;
|
|
int y;
|
|
char str[];
|
|
} JSONToken;
|
|
|
|
typedef struct JSONMessageParser
|
|
{
|
|
void (*emit)(struct JSONMessageParser *parser, GQueue *tokens);
|
|
JSONLexer lexer;
|
|
int brace_count;
|
|
int bracket_count;
|
|
GQueue *tokens;
|
|
uint64_t token_size;
|
|
} JSONMessageParser;
|
|
|
|
void json_message_parser_init(JSONMessageParser *parser,
|
|
void (*func)(JSONMessageParser *, GQueue *));
|
|
|
|
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
|