aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

libplugin: do partial parsing instead of memmem hack.

Browse Source 
memmem is also O(n^2), though it's faster.  Now we have infrastructure,
let's do incremental parsing.

time lightning-cli -R --network=regtest --lightning-dir /tmp/ltests-k8jhvtty/test_pay_stress_1/lightning-1/ listpays > /dev/null

Before:
	real	0m13.674s
	user	0m0.131s
	sys	0m0.024s

After:
	real	0m12.447s
	user	0m0.143s
	sys	0m0.008s

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-08-20 23:10:34 +09:30
parent 628ae0a15b
commit 05636e367e
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/libplugin.c
View File

@@ -51,6 +51,8 @@ struct plugin {
struct json_stream **rpc_js_arr; struct json_stream **rpc_js_arr;
char *rpc_buffer; char *rpc_buffer;
size_t rpc_used, rpc_len_read; size_t rpc_used, rpc_len_read;
jsmn_parser rpc_parser;
jsmntok_t *rpc_toks;
/* Tracking async RPC requests */ /* Tracking async RPC requests */
UINTMAP(struct out_req *) out_reqs; UINTMAP(struct out_req *) out_reqs;
u64 next_outreq_id; u64 next_outreq_id;
@@ -650,40 +652,44 @@ static void rpc_conn_finished(struct io_conn *conn,
static bool rpc_read_response_one(struct plugin *plugin) static bool rpc_read_response_one(struct plugin *plugin)
{ {
const jsmntok_t *toks, *jrtok; const jsmntok_t *jrtok;
bool complete;
/* For our convenience, lightningd always ends JSON requests with if (!json_parse_input(&plugin->rpc_parser, &plugin->rpc_toks,
* \n\n. We can abuse that as an optimization here.*/ plugin->rpc_buffer, plugin->rpc_used, &complete)) {
if (!memmem(plugin->rpc_buffer, plugin->rpc_used, "\n\n", 2))
return false;
toks = json_parse_simple(NULL, plugin->rpc_buffer, plugin->rpc_used);
if (!toks) {
plugin_err(plugin, "Failed to parse RPC JSON response '%.*s'", plugin_err(plugin, "Failed to parse RPC JSON response '%.*s'",
(int)plugin->rpc_used, plugin->rpc_buffer); (int)plugin->rpc_used, plugin->rpc_buffer);
return false; return false;
} }
/* Empty buffer? (eg. just whitespace). */ if (!complete) {
if (tal_count(toks) == 1) { /* We need more. */
plugin->rpc_used = 0;
return false; return false;
} }
jrtok = json_get_member(plugin->rpc_buffer, toks, "jsonrpc"); /* Empty buffer? (eg. just whitespace). */
if (tal_count(plugin->rpc_toks) == 1) {
plugin->rpc_used = 0;
jsmn_init(&plugin->rpc_parser);
toks_reset(plugin->rpc_toks);
return false;
}
jrtok = json_get_member(plugin->rpc_buffer, plugin->rpc_toks, "jsonrpc");
if (!jrtok) { if (!jrtok) {
plugin_err(plugin, "JSON-RPC message does not contain \"jsonrpc\" field: '%.*s'", plugin_err(plugin, "JSON-RPC message does not contain \"jsonrpc\" field: '%.*s'",
(int)plugin->rpc_used, plugin->rpc_buffer); (int)plugin->rpc_used, plugin->rpc_buffer);
return false; return false;
} }
handle_rpc_reply(plugin, toks); handle_rpc_reply(plugin, plugin->rpc_toks);
/* Move this object out of the buffer (+ 2 for \n\n)*/ /* Move this object out of the buffer */
memmove(plugin->rpc_buffer, plugin->rpc_buffer + toks[0].end + 2, memmove(plugin->rpc_buffer, plugin->rpc_buffer + plugin->rpc_toks[0].end,
tal_count(plugin->rpc_buffer) - toks[0].end - 2); tal_count(plugin->rpc_buffer) - plugin->rpc_toks[0].end);
plugin->rpc_used -= toks[0].end + 2; plugin->rpc_used -= plugin->rpc_toks[0].end;
tal_free(toks); jsmn_init(&plugin->rpc_parser);
toks_reset(plugin->rpc_toks);
return true; return true;
} }
@@ -1230,6 +1236,8 @@ static struct plugin *new_plugin(const tal_t *ctx,
p->rpc_js_arr = tal_arr(p, struct json_stream *, 0); p->rpc_js_arr = tal_arr(p, struct json_stream *, 0);
p->rpc_used = 0; p->rpc_used = 0;
p->rpc_len_read = 0; p->rpc_len_read = 0;
jsmn_init(&p->rpc_parser);
p->rpc_toks = toks_alloc(p);
p->next_outreq_id = 0; p->next_outreq_id = 0;
uintmap_init(&p->out_reqs); uintmap_init(&p->out_reqs);