Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON optimizations, cleanups and listsendpays optimizations #3957

Merged
merged 10 commits into from
Aug 21, 2020
Merged

JSON optimizations, cleanups and listsendpays optimizations #3957

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a94573a
libplugin: don't parse partial JSON repeatedly.
rustyrussell Aug 20, 2020
5756685
common: add simple json parse wrapper for the complete cases.
rustyrussell Aug 20, 2020
837d731
plugins/bcli: use simplified parser, unify bad JSON paths.
rustyrussell Aug 20, 2020
484a8d4
common: make json_parse_input API retry friendly.
rustyrussell Aug 20, 2020
7ee5f42
lightningd: always do incremental parsing of JSON inputs.
rustyrussell Aug 20, 2020
3b8eb19
libplugin: do incremental parsing on lightningd commands.
rustyrussell Aug 20, 2020
beada37
libplugin: do partial parsing instead of memmem hack.
rustyrussell Aug 20, 2020
c4d65cf
plugins/pay: iterate the htable properly, not from start each time.
rustyrussell Aug 20, 2020
56987a1
plugins/pay: don't bother parsing nodeid for summary.
rustyrussell Aug 20, 2020
e264e9f
db: remove assertion on validity of node_ids read from db.
rustyrussell Aug 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions plugins/libplugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
ZmnSCPxj marked this conversation as resolved.
Show resolved Hide resolved
* \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) {
Expand Down Expand Up @@ -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;
Expand Down