xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a Timer for Shell waiting notification

Browse Source 
Without a timer we were relying on other event sources to wake us
up to display the information, which was usually a NormalIdle or
a filesystem check timer.
This commit is contained in:
Maxime Coste 2016-11-30 09:55:05 +00:00
parent 540e504e68
commit 61b3dfd184
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/shell_manager.cc
View File

@ -191,7 +191,14 @@ std::pair<String, int> ShellManager::eval(
using namespace std::chrono; using namespace std::chrono;
static constexpr seconds wait_timeout{1}; static constexpr seconds wait_timeout{1};
auto next_wait_notification = duration_cast<milliseconds>(wait_timeout); Timer wait_timer{wait_time + wait_timeout, [&](Timer& timer)
{
auto wait_duration = Clock::now() - wait_time;
context.print_status({ format("waiting for shell command to finish ({}s)",
duration_cast<seconds>(wait_duration).count()),
get_face("Information") }, true);
timer.set_next_date(Clock::now() + wait_timeout);
}, EventMode::Urgent};
while (not terminated or while (not terminated or
((flags & Flags::WaitForStdout) and ((flags & Flags::WaitForStdout) and
@ -200,15 +207,6 @@ std::pair<String, int> ShellManager::eval(
EventManager::instance().handle_next_events(EventMode::Urgent, &orig_mask); EventManager::instance().handle_next_events(EventMode::Urgent, &orig_mask);
if (not terminated) if (not terminated)
terminated = waitpid(pid, &status, WNOHANG); terminated = waitpid(pid, &status, WNOHANG);
auto wait_duration = Clock::now() - wait_time;
if (wait_duration > next_wait_notification)
{
next_wait_notification = duration_cast<milliseconds>(wait_duration + wait_timeout);
context.print_status({ format("waiting for shell command to finish ({}s)",
duration_cast<seconds>(wait_duration).count()),
get_face("Information") }, true);
}
} }
if (not stderr_contents.empty()) if (not stderr_contents.empty())