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: don't parse partial JSON repeatedly.

Browse Source 
Tested on a test node which had made 50,000 payment, with no optimization.

For comparison, time for 'listsendpays' was 0.983s.

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

Before:
	real	0m52.415s
	user	0m0.127s
	sys	0m0.044s

After:
	real	0m42.741s
	user	0m0.149s
	sys	0m0.016s

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: libplugin: significant speedups for reading large JSON replies (e.g. calling listsendpays on large nodes, or listchannels / listnodes).
This commit is contained in:
Rusty Russell
2020-08-20 09:45:55 +09:30
parent 85a90b9e32
commit 40f17d994c
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/libplugin.c
View File

@@ -651,9 +651,11 @@ static bool rpc_read_response_one(struct plugin *plugin)
bool valid;
const jsmntok_t *toks, *jrtok;
/* FIXME: This could be done more efficiently by storing the
* toks and doing an incremental parse, like lightning-cli
* does. */
/* For our convenience, lightningd always ends JSON requests with
* \n\n. We can abuse that as an optimization here.*/
if (!memmem(plugin->rpc_buffer, plugin->rpc_used, "\n\n", 2))
return false;
toks = json_parse_input(NULL, plugin->rpc_buffer, plugin->rpc_used,
&valid);
if (!toks) {
@@ -681,10 +683,10 @@ static bool rpc_read_response_one(struct plugin *plugin)
handle_rpc_reply(plugin, toks);
/* Move this object out of the buffer */
memmove(plugin->rpc_buffer, plugin->rpc_buffer + toks[0].end,
tal_count(plugin->rpc_buffer) - toks[0].end);
plugin->rpc_used -= toks[0].end;
/* Move this object out of the buffer (+ 2 for \n\n)*/
memmove(plugin->rpc_buffer, plugin->rpc_buffer + toks[0].end + 2,
tal_count(plugin->rpc_buffer) - toks[0].end - 2);
plugin->rpc_used -= toks[0].end + 2;
tal_free(toks);
return true;