From 55e7b83ca77a15f30d929143c274300a5a531367 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 28 Oct 2020 00:42:32 -0700 Subject: [PATCH] ircd::m::app: Improve stdout handler; member state off of worker stack. --- include/ircd/m/app.h | 5 ++ matrix/app.cc | 150 ++++++++++++++++++++++--------------------- 2 files changed, 81 insertions(+), 74 deletions(-) diff --git a/include/ircd/m/app.h b/include/ircd/m/app.h index 141847623..5b085a65c 100644 --- a/include/ircd/m/app.h +++ b/include/ircd/m/app.h @@ -28,9 +28,14 @@ struct ircd::m::app json::array arg; std::string binpath; std::vector argv; + unique_mutable_buffer outbuf; exec child; + id::user::buf user_id; + id::room::buf room_id; + id::event::buf event_id; context worker_context; + bool handle_stdout(); void worker(); app(const m::event::idx &); diff --git a/matrix/app.cc b/matrix/app.cc index 56aab2d75..1af78d548 100644 --- a/matrix/app.cc +++ b/matrix/app.cc @@ -228,10 +228,26 @@ ircd::m::app::app(const m::event::idx &event_idx) ret.at(0) = binpath; return ret; }()} +,outbuf +{ + 32_KiB +} ,child { argv } +,user_id +{ + m::get(event_idx, "sender") +} +,room_id +{ + m::room_id(event_idx) +} +,event_id +{ + m::event_id(event_idx) +} ,worker_context { "m.app", @@ -251,21 +267,6 @@ void ircd::m::app::worker() try { - const auto event_id - { - m::event_id(event_idx) - }; - - const auto room_id - { - m::room_id(event_idx) - }; - - const auto user_id - { - m::get(event_idx, "sender") - }; - child.dock.wait([this] { return child.pid >= 0; @@ -283,67 +284,12 @@ try child.pid, }; - char buf alignas(4096) [16_KiB]; - for(run::barrier{};;) + run::barrier{}; do { - window_buffer wb(buf); - wb([](const mutable_buffer &buf) - { - return copy(buf, "
"_sv);
-		});
-
-		bool eof {false};
-		wb([this, &eof](const mutable_buffer &buf)
-		{
-			const auto ret(read(this->child, buf));
-			eof = empty(ret);
-			return ret;
-		});
-
-		wb([](const mutable_buffer &buf)
-		{
-			return copy(buf, "
"_sv); - }); - - const string_view &output - { - wb.completed() - }; - - if(eof) - { - log::debug - { - log, "app:%lu :end of file", - event_idx, - }; - - return; - } - - const string_view alt - { - "no alt text" - }; - - const auto message_id - { - !ircd::write_avoid? - m::msghtml(room_id, user_id, output, alt, "m.notice"): - m::event::id::buf{} - }; - - log::debug - { - log, "app:%lu output %zu bytes in %s to %s :%s%s", - event_idx, - size(output), - string_view{message_id}, - string_view{room_id}, - trunc(output, 64), - size(output) > 64? "...": "", - }; + if(!handle_stdout()) + break; } + while(1); } catch(const std::exception &e) { @@ -359,3 +305,59 @@ catch(const std::exception &e) child.join(); return; } + +bool +ircd::m::app::handle_stdout() +{ + mutable_buffer buf(this->outbuf); + consume(buf, copy(buf, "
"_sv));
+	const string_view output
+	{
+		read(this->child, buf)
+	};
+
+	consume(buf, size(output));
+	if(empty(output))
+	{
+		log::debug
+		{
+			log, "app:%lu :end of file",
+			this->event_idx,
+		};
+
+		return false;
+	}
+
+	consume(buf, copy(buf, "
"_sv)); + const string_view &content + { + data(this->outbuf), data(buf) + }; + + const fmt::bsprintf<96> alt + { + "app:%lu wrote %zu bytes to stdout.", + this->event_idx, + size(output), + }; + + const auto message_id + { + !ircd::write_avoid? + m::msghtml(room_id, user_id, content, string_view{alt}, "m.notice"): + m::event::id::buf{} + }; + + log::debug + { + log, "app:%lu output %zu bytes in %s to %s :%s%s", + event_idx, + size(content), + string_view{message_id}, + string_view{room_id}, + trunc(content, 64), + size(content) > 64? "...": "", + }; + + return true; +}