From f340e4469258d400dcf5306eadd167376c6f66a2 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 28 Mar 2019 16:00:54 -0700 Subject: [PATCH] ircd::m::vm: Add event_id and share sequence to the loghead; minor cleanup. --- ircd/m.cc | 9 +++++++-- modules/vm.cc | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ircd/m.cc b/ircd/m.cc index 7f7b93100..df1c336ea 100644 --- a/ircd/m.cc +++ b/ircd/m.cc @@ -1076,12 +1076,17 @@ ircd::m::vm::loghead(const mutable_buffer &buf, { return fmt::sprintf { - buf, "vm[%lu:%lu:%lu] eval[%lu] id:%lu", + buf, "vm:%lu:%lu:%lu eval:%lu seq:%lu share:%lu:%lu] %s", sequence::uncommitted, sequence::committed, sequence::retired, - sequence::get(eval), eval.id, + sequence::get(eval), + eval.sequence_shared[0], + eval.sequence_shared[1], + eval.event_? + string_view{json::get<"event_id"_>(*eval.event_)}: + ""_sv, }; } diff --git a/modules/vm.cc b/modules/vm.cc index c6230d55b..a5dfc9521 100644 --- a/modules/vm.cc +++ b/modules/vm.cc @@ -673,7 +673,7 @@ ircd::m::vm::execute_edu(eval &eval, enum ircd::m::vm::fault ircd::m::vm::execute_pdu(eval &eval, - const event &event) + const event &event) { const scope_count pending {