MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-07-05 01:58:35 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:vm: Add pointers to access the evaluation data at issue.

Browse source
This commit is contained in:
Jason Volk 2018-05-06 18:10:01 -07:00
parent 989441677f
commit a04a3e840e
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,9 @@ struct ircd::m::vm::eval
uint64_t id {++id_ctr}; uint64_t id {++id_ctr};
uint64_t sequence {0}; uint64_t sequence {0};
db::txn *txn {nullptr}; db::txn *txn {nullptr};
const json::iov *issue {nullptr};
const event *event_ {nullptr};
string_view room_id;
event::id::buf event_id; event::id::buf event_id;
operator const event::id::buf &() const; operator const event::id::buf &() const;

39
ircd/m/vm.cc
View file

@ -178,8 +178,20 @@ ircd::m::vm::eval::operator()(const room &room,
// Note that the regular opts is unconditionally overridden because the // Note that the regular opts is unconditionally overridden because the
// user should have provided copts instead. // user should have provided copts instead.
this->opts = copts; this->opts = copts;
const auto &opts(this->copts); const auto &opts(*this->copts);
// Set a member pointer to the json::iov currently being composed. This
// allows other parallel evals to have deep access to exactly what this
// eval is attempting to do.
this->issue = &event;
this->room_id = room.room_id;
const unwind ueiov{[this]
{
this->room_id = {};
this->issue = nullptr;
}};
assert(room.room_id);
const json::iov::push room_id const json::iov::push room_id
{ {
event, { "room_id", room.room_id } event, { "room_id", room.room_id }
@ -389,7 +401,21 @@ ircd::m::vm::eval::operator()(json::iov &event,
// user should have provided copts instead. // user should have provided copts instead.
assert(copts); assert(copts);
this->opts = copts; this->opts = copts;
const auto &opts(*this->copts); const auto &opts(*copts);
// Set a member pointer to the json::iov currently being composed. This
// allows other parallel evals to have deep access to exactly what this
// eval is up to. This function may have been called from another function
// which already set the pointer, so we are careful to not null it for them
// on the way out.
const bool issue{this->issue};
assert(!issue || this->issue == &event);
this->issue = &event;
const unwind null_issue{[this, &issue]
{
if(!issue)
this->issue = nullptr;
}};
const json::iov::add_if _origin const json::iov::add_if _origin
{ {
@ -483,6 +509,15 @@ enum ircd::m::vm::fault
ircd::m::vm::eval::operator()(const event &event) ircd::m::vm::eval::operator()(const event &event)
try try
{ {
// Set a member pointer to the event currently being evaluated. This
// allows other parallel evals to have deep access to exactly what this
// eval is working on. The pointer must be nulled on the way out.
this->event_= &event;
const unwind null_event{[this]
{
this->event_ = nullptr;
}};
if(copts) if(copts)
{ {
if(unlikely(!my_host(at<"origin"_>(event)))) if(unlikely(!my_host(at<"origin"_>(event))))