MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-16 15:00:51 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:vm: Minor merge branch sections.

Browse source
This commit is contained in:
Jason Volk 2020-08-28 02:14:46 -07:00
parent e6e5b14b93
commit 135d134c2c
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
matrix/vm_execute.cc
View file

@ -779,6 +779,11 @@ ircd::m::vm::execute_pdu(eval &eval,
// Allocate transaction; discover shared-sequenced evals.
if(likely(opts.phase[phase::INDEX]))
{
const scope_restore eval_phase
{
eval.phase, phase::INDEX
};
if(!eval.txn && parent_post)
eval.txn = eval.parent->txn;
@ -791,16 +796,8 @@ ircd::m::vm::execute_pdu(eval &eval,
0, // max_bytes (no max)
}
);
}
// Transaction composition.
if(likely(opts.phase[phase::INDEX]))
{
const scope_restore eval_phase
{
eval.phase, phase::INDEX
};
// Transaction composition.
write_append(eval, event);
}