MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-29 00:03:45 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:vm: Rename eval.phase to eval.phase_hook.

Browse source
This commit is contained in:
Jason Volk 2020-05-11 19:25:07 -07:00
parent 91d1c8147d
commit a1708a687e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/m/vm.h
View file

@ -87,7 +87,7 @@ struct ircd::m::vm::eval
event::id::buf event_id;
event::conforms report;
string_view room_version;
const hook::base::site *phase {nullptr};
const hook::base::site *phase_hook {nullptr};
bool room_internal {false};
static bool for_each_pdu(const std::function<bool (const event &)> &);

4
matrix/vm_execute.cc
View file

@ -868,10 +868,10 @@ try
};
#endif
assert(!eval.phase);
assert(!eval.phase_hook);
const scope_restore hook_phase
{
eval.phase, std::addressof(hook)
eval.phase_hook, std::addressof(hook)
};
hook(event, std::forward<T>(data));

2
modules/console.cc
View file

@ -14942,7 +14942,7 @@ console_cmd__vm(opt &out, const string_view &line)
<< std::right << std::setw(5) << done << " "
<< std::right << std::setw(9) << eval->sequence << " "
<< std::right << std::setw(9) << std::max(eval->sequence_shared[0], eval->sequence_shared[1]) << " "
<< std::left << std::setw(9) << (eval->phase? eval->phase->name() : ""_sv) << " "
<< std::left << std::setw(9) << (eval->phase_hook? eval->phase_hook->name() : ""_sv) << " "
<< std::right << std::setw(6) << (eval->txn? eval->txn->bytes() : 0UL) << " "
<< std::right << std::setw(5) << (eval->txn? eval->txn->size() : 0UL) << " "
<< std::right << std::setw(8) << (eval->event_ && eval->event_id? long(json::get<"depth"_>(*eval->event_)) : -1L) << " "