api/nvim_get_mode: Use child-queue instead of "priority".

This commit is contained in:
Justin M. Keyes
2017-04-27 13:54:54 +02:00
parent acfd2a2a29
commit f17a818519
6 changed files with 11 additions and 12 deletions

View File

@@ -28,7 +28,6 @@
#include "nvim/map.h"
#include "nvim/log.h"
#include "nvim/misc1.h"
#include "nvim/state.h"
#include "nvim/lib/kvec.h"
#include "nvim/os/input.h"
@@ -91,6 +90,7 @@ static msgpack_sbuffer out_buffer;
/// Initializes the module
void channel_init(void)
{
ch_before_blocking_events = multiqueue_new_child(main_loop.events);
channels = pmap_new(uint64_t)();
event_strings = pmap_new(cstr_t)();
msgpack_sbuffer_init(&out_buffer);
@@ -446,9 +446,8 @@ static void handle_request(Channel *channel, msgpack_object *request)
&& !strncmp("nvim_get_mode", method->via.bin.ptr, method->via.bin.size);
if (is_get_mode && !input_blocking()) {
// Schedule on the main loop with special priority. #6247
Event ev = event_create(kEvPriorityAsync, on_request_event, 1, evdata);
multiqueue_put_event(channel->events, ev);
// Defer the event to a special queue used by os/input.c. #6247
multiqueue_put(ch_before_blocking_events, on_request_event, 1, evdata);
} else {
// Invoke immediately.
on_request_event((void **)&evdata);

View File

@@ -11,6 +11,11 @@
#define METHOD_MAXLEN 512
/// HACK: os/input.c drains this queue immediately before blocking for input.
/// Events on this queue are async-safe, but they need the resolved state
/// of os_inchar(), so they are processed "just-in-time".
MultiQueue *ch_before_blocking_events;
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "msgpack_rpc/channel.h.generated.h"
#endif