diff options
| -rw-r--r-- | src/nvim/event/rstream.c | 1 | ||||
| -rw-r--r-- | src/nvim/event/stream.c | 2 | ||||
| -rw-r--r-- | src/nvim/event/wstream.c | 2 | ||||
| -rw-r--r-- | src/nvim/msgpack_rpc/channel.c | 19 |
4 files changed, 13 insertions, 11 deletions
diff --git a/src/nvim/event/rstream.c b/src/nvim/event/rstream.c index 6304953029..2bcc4cf6be 100644 --- a/src/nvim/event/rstream.c +++ b/src/nvim/event/rstream.c @@ -184,6 +184,7 @@ static void read_event(void **argv) } stream->s.pending_reqs--; if (stream->s.closed && !stream->s.pending_reqs) { + // Last pending read; free the stream. stream_close_handle(&stream->s, true); } } diff --git a/src/nvim/event/stream.c b/src/nvim/event/stream.c index 3e32813e1c..4237219cb7 100644 --- a/src/nvim/event/stream.c +++ b/src/nvim/event/stream.c @@ -120,7 +120,7 @@ void stream_may_close(Stream *stream, bool rstream) if (!stream->pending_reqs) { stream_close_handle(stream, rstream); - } + } // Else: rstream.c:read_event() or wstream.c:write_cb() will call stream_close_handle(). } void stream_close_handle(Stream *stream, bool rstream) diff --git a/src/nvim/event/wstream.c b/src/nvim/event/wstream.c index 5005c4e84f..61dc2e752e 100644 --- a/src/nvim/event/wstream.c +++ b/src/nvim/event/wstream.c @@ -156,7 +156,7 @@ static void write_cb(uv_write_t *req, int status) data->stream->pending_reqs--; if (data->stream->closed && data->stream->pending_reqs == 0) { - // Last pending write, free the stream; + // Last pending write; free the stream. stream_close_handle(data->stream, false); } diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index edc4442785..fe480fff45 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -222,10 +222,9 @@ static size_t receive_msgpack(RStream *stream, const char *rbuf, size_t c, void } if (eof) { - channel_close(channel->id, kChannelPartRpc, NULL); char buf[256]; snprintf(buf, sizeof(buf), "ch %" PRIu64 " was closed by the peer", channel->id); - chan_close_with_error(channel, buf, LOGLVL_INF); + chan_close_on_err(channel, buf, LOGLVL_INF); } channel_decref(channel); @@ -268,7 +267,7 @@ static void parse_msgpack(Channel *channel) "ch %" PRIu64 " (type=%" PRIu32 ") returned a response with an unknown request " "id %" PRIu32 ". Ensure the client is properly synchronized", channel->id, (unsigned)channel->rpc.client_type, p->request_id); - chan_close_with_error(channel, buf, LOGLVL_ERR); + chan_close_on_err(channel, buf, LOGLVL_ERR); return; } frame->returned = true; @@ -292,7 +291,7 @@ static void parse_msgpack(Channel *channel) Object res = p->result; if (p->result.type != kObjectTypeArray) { - chan_close_with_error(channel, "msgpack-rpc request args must be an array", LOGLVL_ERR); + chan_close_on_err(channel, "msgpack-rpc request args must be an array", LOGLVL_ERR); return; } Array arg = res.data.array; @@ -301,7 +300,7 @@ static void parse_msgpack(Channel *channel) } if (unpacker_closed(p)) { - chan_close_with_error(channel, p->unpack_error.msg, LOGLVL_INF); + chan_close_on_err(channel, p->unpack_error.msg, LOGLVL_INF); api_clear_error(&p->unpack_error); } } @@ -419,7 +418,7 @@ static bool channel_write(Channel *channel, WBuffer *buffer) "ch %" PRIu64 ": stream write failed. " "RPC canceled; closing channel", channel->id); - chan_close_with_error(channel, buf, LOGLVL_ERR); + chan_close_on_err(channel, buf, LOGLVL_ERR); } return success; @@ -438,7 +437,7 @@ static void internal_read_event(void **argv) if (p->read_size) { // This should not happen, as WBuffer is one single serialized message. if (!channel->rpc.closed) { - chan_close_with_error(channel, "internal channel: internal error", LOGLVL_ERR); + chan_close_on_err(channel, "internal channel: internal error", LOGLVL_ERR); } } @@ -519,9 +518,9 @@ void rpc_free(Channel *channel) api_free_dict(channel->rpc.info); } -static void chan_close_with_error(Channel *channel, char *msg, int loglevel) +/// Logs a fatal error received from a channel, then closes the channel. +static void chan_close_on_err(Channel *channel, char *msg, int loglevel) { - LOG(loglevel, "RPC: %s", msg); for (size_t i = 0; i < kv_size(channel->rpc.call_stack); i++) { ChannelCallFrame *frame = kv_A(channel->rpc.call_stack, i); frame->returned = true; @@ -530,6 +529,8 @@ static void chan_close_with_error(Channel *channel, char *msg, int loglevel) } channel_close(channel->id, kChannelPartRpc, NULL); + + LOG(loglevel, "RPC: %s", msg); } static void serialize_request(Channel **chans, size_t nchans, uint32_t request_id, |