emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

server: support flushing the output 

So we can get some progress output
This commit is contained in:
Dirk-Jan C. Binnema 2022-02-03 22:58:53 +02:00
parent 05393ba797
commit b6d7d142f6
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mu-server.cc
View File

@ -78,12 +78,15 @@ struct Server::Private {
//
// output
//
void output_sexp(Sexp&& sexp) const
void output_sexp(Sexp&& sexp, bool flush = false) const
{
if (output_)
output_(std::move(sexp));
output_(std::move(sexp), flush);
}
void output_sexp(Sexp::List&& lst, bool flush = false) const
{
output_sexp(Sexp::make_list(std::move(lst)), flush);
}
void output_sexp(Sexp::List&& lst) const { output_sexp(Sexp::make_list(std::move(lst))); }
size_t output_results(const QueryResults& qres, size_t batch_size) const;
//

6
lib/mu-server.hh
View File

@ -33,8 +33,8 @@ namespace Mu {
*
*/
class Server {
public:
using Output = std::function<void(Sexp&& sexp)>;
public:
using Output = std::function<void(Sexp&& sexp, bool flush)>;
/**
* Construct a new server
@ -59,7 +59,7 @@ class Server {
*/
bool invoke(const std::string& expr) noexcept;
private:
private:
struct Private;
std::unique_ptr<Private> priv_;
};

7
mu/mu-cmd-server.cc
View File

@ -82,7 +82,7 @@ cookie(size_t n)
}
static void
output_sexp_stdout(Sexp&& sexp)
output_sexp_stdout(Sexp&& sexp, bool flush = false)
{
const auto str{sexp.to_sexp_string()};
cookie(str.size() + 1);
@ -90,6 +90,9 @@ output_sexp_stdout(Sexp&& sexp)
g_critical("failed to write output '%s'", str.c_str());
::raise(SIGTERM); /* terminate ourselves */
}
if (flush)
::fflush(::stdout);
}
static void
@ -100,7 +103,7 @@ report_error(const Mu::Error& err) noexcept
e.add_prop(":error", Sexp::make_number(static_cast<size_t>(err.code())));
e.add_prop(":message", Sexp::make_string(err.what()));
output_sexp_stdout(Sexp::make_list(std::move(e)));
output_sexp_stdout(Sexp::make_list(std::move(e)), true /*flush*/);
}
MuError