max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(shell/server): set global ios in info and complete tasks

Browse source
This commit is contained in:
Gabriel Ebner 2017-03-17 19:13:11 +01:00
parent dfb5dad1a3
commit 5e29fe227e
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/shell/server.cpp
View file

@ -516,6 +516,7 @@ void server::handle_complete(cmd_req const & req) {
auto complete_gen_task =
task_builder<json>([=] { return autocomplete(mod_info, skip_completions, pos); })
.wrap(library_scopes(log_tree::node()))
.set_cancellation_token(m_bg_task_ctok)
.build();
@ -574,7 +575,8 @@ void server::handle_info(server::cmd_req const & req) {
auto info_gen_task = task_builder<json>([=] {
return info(mod_info, pos);
}).set_cancellation_token(m_bg_task_ctok).build();
}).wrap(library_scopes(log_tree::node()))
.set_cancellation_token(m_bg_task_ctok).build();
taskq().submit(task_builder<unit>([this, req, info_gen_task] {
try {

6
src/util/log_tree.cpp
View file

@ -333,12 +333,12 @@ log_tree::node & logtree() {
}
}
scope_log_tree::scope_log_tree(log_tree::node const & lt) : m_node(lt), m_scope(&m_node) {
m_node.clear_entries();
scope_log_tree::scope_log_tree(log_tree::node const & lt) : m_node(lt), m_scope(m_node ? &m_node : nullptr) {
if (m_node) m_node.clear_entries();
}
scope_log_tree::~scope_log_tree() {
logtree().finish();
if (m_node) m_node.finish();
}
scope_log_tree::scope_log_tree(std::string const & desc, pos_range const & pos) :